idk

jrbudda · Jul 7, 2017 · 9bf3b48 · 9bf3b48
1 parent 53fc482
commit 9bf3b48
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/minecriftversion.py b/minecriftversion.py
@@ -4,7 +4,7 @@
 of_json_name = "1.7.10_HD_U_D1"
 of_file_md5 = "57c724fe8335c82aef8d54c101043e60"
 minecrift_version_num = "1.7.10"
-minecrift_build = "jrbudda-39final"
+minecrift_build = "jrbudda-39finalr1"
 of_file_extension = ".jar"
 mcp_version = "mcp908"
 mcp_uses_generics = False

diff --git a/patches/net/minecraft/client/Minecraft.java.patch b/patches/net/minecraft/client/Minecraft.java.patch
@@ -155,7 +155,7 @@
  import net.minecraft.world.EnumDifficulty;
  import net.minecraft.world.WorldProviderEnd;
  import net.minecraft.world.WorldProviderHell;
-@@ -150,2988 +226,4963 @@
+@@ -150,2988 +226,4964 @@
  import net.minecraft.world.storage.ISaveFormat;
  import net.minecraft.world.storage.ISaveHandler;
  import net.minecraft.world.storage.WorldInfo;
@@ -1246,7 +1246,7 @@
 +	 * The minecriftVerString will be automatically updated by the build scripts, do not modify here.
 +	 * Modify minecriftversion.py in root minecrift dir.
 +	 */
-+    public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-39final";
++    public final String minecriftVerString = "Vivecraft 1.7.10 jrbudda-39finalr1";
 +	private boolean trigger;
 +	/* end version */
 +	/** END MINECRIFT */
@@ -2176,6 +2176,7 @@
 +				GL11.glViewport(0, 0, this.displayWidth, this.displayHeight);
 +				GL11.glClearColor(0, 0, 0, 1);
 +				GL11.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
++				GL11.glEnable(GL11.GL_TEXTURE_2D);
 +				entityRenderer.displayNotificationText("Render Setup Failed " + " " + e.error, "", "", this.displayWidth, this.displayHeight, false, true);
 +				Display.update();
 +				return;

diff --git a/patches/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/net/minecraft/client/renderer/EntityRenderer.java.patch
@@ -98,7 +98,7 @@
  import net.minecraft.util.MathHelper;
  import net.minecraft.util.MouseFilter;
  import net.minecraft.util.MovingObjectPosition;
-@@ -61,2593 +104,5124 @@
+@@ -61,2593 +104,5126 @@
  import net.minecraft.world.World;
  import net.minecraft.world.WorldProvider;
  import net.minecraft.world.biome.BiomeGenBase;
@@ -4715,7 +4715,7 @@
 +						if(mc.currentPass == renderPass.Third){
 +							GL11.glEnable(GL11.GL_DEPTH_TEST);
 +						}
-+			
++						
 +						//Render framebuffer onto world projection
 +						ScaledResolution s = new ScaledResolution(mc, this.mc.guiFramebuffer.framebufferWidth, this.mc.guiFramebuffer.framebufferHeight);
 +						drawSizedQuad(s.getScaledWidth(), s.getScaledHeight(), 1.5f); //this.mc.vrSettings.hudScale);
@@ -4799,11 +4799,13 @@
 +					if (Reflector.ForgeGuiIngame_renderCrosshairs.exists()) {
 +						Reflector.ForgeGuiIngame_renderCrosshairs.setValue(false);
 +						Reflector.ForgeGuiIngame_renderHelmet.setValue(false);
++						if(this.getClass().getName().equals("com.bioxx.tfc.Render.EntityRendererTFC"))
++							Reflector.ForgeGuiIngame_renderCrosshairs.setValue(true);
 +					}
 +					/** END MINECRIFT FORGE **/
 +					//Draw in game HUD overlay
 +					GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
-+
++					
 +					Object fmlCommonHandler = null;
 +					if (Reflector.FMLCommonHandler_instance.exists()) {
 +						fmlCommonHandler = Reflector.call(Reflector.FMLCommonHandler_instance, new Object[0]);
@@ -4813,8 +4815,8 @@
 +							Reflector.callVoid(fmlCommonHandler, Reflector.FMLCommonHandler_onRenderTickStart, new Object[]{renderPartialTicks});
 +						}
 +					}
-+					
 +					//Render HUD elements
++
 +					this.mc.ingameGUI.renderGameOverlay(renderPartialTicks, this.mc.currentScreen != null, 0, 0);
 +
 +					mc.guiAchievement.updateAchievementWindow();