Update Optifine to 1.7.10_HD_D1 WIP. Update base patches.

jrbudda · Feb 19, 2016 · 7384b7a · 7384b7a
1 parent 91268d7
commit 7384b7a
Show file tree

Hide file tree

Showing 23 changed files with 254 additions and 237 deletions.
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ optionsvrprofiles.txt
 crash-reports/
 saves/
 *.ex_
+mcppatches - Copy/
diff --git a/installer/1.7.10-forge-nohydra.json b/installer/1.7.10-forge-nohydra.json
@@ -6,14 +6,14 @@
   "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker --tweakClass optifine.OptiFineForgeTweaker --tweakClass com.mtbs3d.minecrift.tweaker.MinecriftForgeTweaker",
   "libraries": [
     {
-      "name": "optifine:OptiFine:1.7.10_HD_U_B7"
+      "name": "optifine:OptiFine:1.7.10_HD_D1"
     },
     {
       "name": "net.minecraftforge:forge:1.7.10-10.13.4.1614-1.7.10",
       "url": "http://files.minecraftforge.net/maven/"
     },
     {
-      "name": "net.minecraft:launchwrapper:1.12"
+      "name": "net.minecraft:launchwrapper:1.7"
     },
     {
       "name": "org.ow2.asm:asm-all:5.0.3"
@@ -263,5 +263,30 @@
   ],
   "mainClass": "net.minecraft.launchwrapper.Launch",
   "minimumLauncherVersion": 14,
-  "assets": "1.7.10"
+  "assets": "1.7.10",
+  "downloads": {
+    "client": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/client/e80d9b3bf5085002218d4be59e668bac718abbc6/client.jar",
+      "sha1": "e80d9b3bf5085002218d4be59e668bac718abbc6",
+      "size": 5256245
+    },
+    "server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/server/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar",
+      "sha1": "952438ac4e01b4d115c5fc38f891710c4941df29",
+      "size": 9605030
+    },
+    "windows_server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/windows_server/a79b91ef69b9b4af63d1c7007f60259106869b21/windows_server.exe",
+      "sha1": "a79b91ef69b9b4af63d1c7007f60259106869b21",
+      "size": 9999270
+    }
+  },
+  "assetIndex": {
+    "totalSize": 112220327,
+    "id": "1.7.10",
+    "known": true,
+    "url": "https://launchermeta.mojang.com/mc-staging/assets/1.7.10/f90ca2878ba3141d32d949ea7f665855dd073c65/1.7.10.json",
+    "sha1": "f90ca2878ba3141d32d949ea7f665855dd073c65",
+    "size": 88096
+  }  
 }
diff --git a/installer/1.7.10-forge.json b/installer/1.7.10-forge.json
@@ -6,14 +6,14 @@
   "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type} --tweakClass cpw.mods.fml.common.launcher.FMLTweaker --tweakClass optifine.OptiFineForgeTweaker --tweakClass com.mtbs3d.minecrift.tweaker.MinecriftForgeTweaker",
   "libraries": [
     {
-      "name": "optifine:OptiFine:1.7.10_HD_U_B7"
+      "name": "optifine:OptiFine:1.7.10_HD_D1"
     },
     {
       "name": "net.minecraftforge:forge:1.7.10-10.13.4.1614-1.7.10",
       "url": "http://files.minecraftforge.net/maven/"
     },
     {
-      "name": "net.minecraft:launchwrapper:1.12"
+      "name": "net.minecraft:launchwrapper:1.7"
     },
     {
       "name": "org.ow2.asm:asm-all:5.0.3"
@@ -281,5 +281,30 @@
   ],
   "mainClass": "net.minecraft.launchwrapper.Launch",
   "minimumLauncherVersion": 14,
-  "assets": "1.7.10"
+  "assets": "1.7.10",
+  "downloads": {
+    "client": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/client/e80d9b3bf5085002218d4be59e668bac718abbc6/client.jar",
+      "sha1": "e80d9b3bf5085002218d4be59e668bac718abbc6",
+      "size": 5256245
+    },
+    "server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/server/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar",
+      "sha1": "952438ac4e01b4d115c5fc38f891710c4941df29",
+      "size": 9605030
+    },
+    "windows_server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/windows_server/a79b91ef69b9b4af63d1c7007f60259106869b21/windows_server.exe",
+      "sha1": "a79b91ef69b9b4af63d1c7007f60259106869b21",
+      "size": 9999270
+    }
+  },
+  "assetIndex": {
+    "totalSize": 112220327,
+    "id": "1.7.10",
+    "known": true,
+    "url": "https://launchermeta.mojang.com/mc-staging/assets/1.7.10/f90ca2878ba3141d32d949ea7f665855dd073c65/1.7.10.json",
+    "sha1": "f90ca2878ba3141d32d949ea7f665855dd073c65",
+    "size": 88096
+  }
 }
diff --git a/installer/1.7.10-nohydra.json b/installer/1.7.10-nohydra.json
@@ -6,7 +6,7 @@
   "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}  --tweakClass optifine.OptiFineTweaker",
   "libraries": [
     {
-      "name": "optifine:OptiFine:1.7.10_HD_U_B7"
+      "name": "optifine:OptiFine:1.7.10_HD_D1"
     },
     {
       "name": "org.ow2.asm:asm-all:5.0.3"
@@ -228,5 +228,30 @@
   ],
   "mainClass": "net.minecraft.launchwrapper.Launch",
   "minimumLauncherVersion": 13,
-  "assets": "1.7.10"
+  "assets": "1.7.10",
+  "downloads": {
+    "client": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/client/e80d9b3bf5085002218d4be59e668bac718abbc6/client.jar",
+      "sha1": "e80d9b3bf5085002218d4be59e668bac718abbc6",
+      "size": 5256245
+    },
+    "server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/server/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar",
+      "sha1": "952438ac4e01b4d115c5fc38f891710c4941df29",
+      "size": 9605030
+    },
+    "windows_server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/windows_server/a79b91ef69b9b4af63d1c7007f60259106869b21/windows_server.exe",
+      "sha1": "a79b91ef69b9b4af63d1c7007f60259106869b21",
+      "size": 9999270
+    }
+  },
+  "assetIndex": {
+    "totalSize": 112220327,
+    "id": "1.7.10",
+    "known": true,
+    "url": "https://launchermeta.mojang.com/mc-staging/assets/1.7.10/f90ca2878ba3141d32d949ea7f665855dd073c65/1.7.10.json",
+    "sha1": "f90ca2878ba3141d32d949ea7f665855dd073c65",
+    "size": 88096
+  }
 }
diff --git a/installer/1.7.10.json b/installer/1.7.10.json
@@ -6,7 +6,7 @@
   "minecraftArguments": "--username ${auth_player_name} --version ${version_name} --gameDir ${game_directory} --assetsDir ${assets_root} --assetIndex ${assets_index_name} --uuid ${auth_uuid} --accessToken ${auth_access_token} --userProperties ${user_properties} --userType ${user_type}  --tweakClass optifine.OptiFineTweaker",
   "libraries": [
     {
-      "name": "optifine:OptiFine:1.7.10_HD_U_B7"
+      "name": "optifine:OptiFine:1.7.10_HD_D1"
     },
     {
       "name": "org.ow2.asm:asm-all:5.0.3"
@@ -228,5 +228,30 @@
   ],
   "mainClass": "net.minecraft.launchwrapper.Launch",
   "minimumLauncherVersion": 13,
-  "assets": "1.7.10"
+  "assets": "1.7.10",
+  "downloads": {
+    "client": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/client/e80d9b3bf5085002218d4be59e668bac718abbc6/client.jar",
+      "sha1": "e80d9b3bf5085002218d4be59e668bac718abbc6",
+      "size": 5256245
+    },
+    "server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/server/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar",
+      "sha1": "952438ac4e01b4d115c5fc38f891710c4941df29",
+      "size": 9605030
+    },
+    "windows_server": {
+      "url": "https://launcher.mojang.com/mc/game/1.7.10/windows_server/a79b91ef69b9b4af63d1c7007f60259106869b21/windows_server.exe",
+      "sha1": "a79b91ef69b9b4af63d1c7007f60259106869b21",
+      "size": 9999270
+    }
+  },
+  "assetIndex": {
+    "totalSize": 112220327,
+    "id": "1.7.10",
+    "known": true,
+    "url": "https://launchermeta.mojang.com/mc-staging/assets/1.7.10/f90ca2878ba3141d32d949ea7f665855dd073c65/1.7.10.json",
+    "sha1": "f90ca2878ba3141d32d949ea7f665855dd073c65",
+    "size": 88096
+  }
 }
diff --git a/mcppatches/patches/net/minecraft/client/entity/AbstractClientPlayer.java.patch b/mcppatches/patches/net/minecraft/client/entity/AbstractClientPlayer.java.patch
@@ -1,16 +1,16 @@
 --- a/net/minecraft/client/entity/AbstractClientPlayer.java
 +++ b/net/minecraft/client/entity/AbstractClientPlayer.java
-@@ -28,7 +28,6 @@
-     private ResourceLocation locationCape;
+@@ -29,7 +29,6 @@
      private static final String __OBFID = "CL_00000935";
      private ResourceLocation ofLocationCape = null;
+     private String nameClear = null;
 -    private static final String __OBFID = "CL_00000935";
 
      public AbstractClientPlayer(World p_i45074_1_, GameProfile p_i45074_2_)
      {
-@@ -163,7 +162,6 @@
+@@ -179,7 +178,6 @@
      {
-         static final int[] field_152630_a = new int[Type.values().length];
+         static final int[] SKIN_PART_TYPES = new int[Type.values().length];
          private static final String __OBFID = "CL_00001832";
 -        private static final String __OBFID = "CL_00001832";
 

diff --git a/mcppatches/patches/net/minecraft/client/gui/FontRenderer.java.patch b/mcppatches/patches/net/minecraft/client/gui/FontRenderer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/FontRenderer.java
 +++ b/net/minecraft/client/gui/FontRenderer.java
-@@ -104,7 +104,6 @@
+@@ -105,7 +105,6 @@
      public ResourceLocation locationFontTextureBase;
      public boolean enabled = true;
      public float scaleFactor = 1.0F;

diff --git a/mcppatches/patches/net/minecraft/client/gui/GuiVideoSettings.java.patch b/mcppatches/patches/net/minecraft/client/gui/GuiVideoSettings.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/gui/GuiVideoSettings.java
 +++ b/net/minecraft/client/gui/GuiVideoSettings.java
-@@ -19,7 +19,6 @@
+@@ -22,7 +22,6 @@
      private int lastMouseX = 0;
      private int lastMouseY = 0;
      private long mouseStillTime = 0L;

diff --git a/mcppatches/patches/net/minecraft/client/renderer/EntityRenderer.java.patch b/mcppatches/patches/net/minecraft/client/renderer/EntityRenderer.java.patch
@@ -8,7 +8,7 @@
 
      public EntityRenderer(Minecraft p_i45076_1_, IResourceManager p_i45076_2_)
      {
-@@ -1346,41 +1345,26 @@
+@@ -1390,41 +1389,26 @@
                      var11.addCrashSectionCallable("Screen name", new Callable()
                      {
                          private static final String __OBFID = "CL_00000948";

diff --git a/mcppatches/patches/net/minecraft/client/renderer/RenderBlocks.java.patch b/mcppatches/patches/net/minecraft/client/renderer/RenderBlocks.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/RenderBlocks.java
 +++ b/net/minecraft/client/renderer/RenderBlocks.java
-@@ -161,7 +161,6 @@
+@@ -325,7 +325,6 @@
      public float aoLightValueOpaque = 0.2F;
      public boolean betterSnowEnabled = true;
      private static RenderBlocks instance;

diff --git a/mcppatches/patches/net/minecraft/client/renderer/RenderGlobal.java.patch b/mcppatches/patches/net/minecraft/client/renderer/RenderGlobal.java.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/client/renderer/RenderGlobal.java
 +++ b/net/minecraft/client/renderer/RenderGlobal.java
-@@ -262,7 +262,6 @@
+@@ -264,7 +264,6 @@
      private long lastMovedTime = System.currentTimeMillis();
      private long lastActionTime = System.currentTimeMillis();
      private static AxisAlignedBB AABB_INFINITE = AxisAlignedBB.getBoundingBox(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY);
 -    private static final String __OBFID = "CL_00000954";
 
      public RenderGlobal(Minecraft par1Minecraft)
      {
-@@ -1805,7 +1804,7 @@
+@@ -1817,7 +1816,7 @@
                          float var19 = this.theWorld.provider.getCloudHeight() - var21 + 0.33F;
                          var19 += this.mc.gameSettings.ofCloudsHeight * 128.0F;
                          float var20 = (float)(dc * (double)var10);
@@ -17,7 +17,7 @@
                          var5.startDrawingQuads();
                          var5.setColorRGBA_F(exactPlayerX, var8, exactPlayerY, 0.8F);
 
-@@ -1813,10 +1812,10 @@
+@@ -1825,10 +1824,10 @@
                          {
                              for (int var23 = -var3 * var4; var23 < var3 * var4; var23 += var3)
                              {
@@ -32,7 +32,7 @@
                              }
                          }
 
-@@ -2493,15 +2492,10 @@
+@@ -2501,15 +2500,10 @@
              var16.addCrashSectionCallable("Position", new Callable()
              {
                  private static final String __OBFID = "CL_00000955";
@@ -48,26 +48,12 @@
              });
              throw new ReportedException(var15);
          }
-@@ -2530,19 +2524,19 @@
-             {
-                 if (Config.isAnimatedExplosion())
-                 {
--                    this.mc.effectRenderer.addEffect(var21 = new EntityHugeExplodeFX(this.theWorld, par2, par4, par6, par8, par10, par12));
-+                    this.mc.effectRenderer.addEffect((EntityFX)(var21 = new EntityHugeExplodeFX(this.theWorld, par2, par4, par6, par8, par10, par12)));
-                 }
-             }
-             else if (par1Str.equals("largeexplode"))
-             {
-                 if (Config.isAnimatedExplosion())
-                 {
--                    this.mc.effectRenderer.addEffect(var21 = new EntityLargeExplodeFX(this.renderEngine, this.theWorld, par2, par4, par6, par8, par10, par12));
-+                    this.mc.effectRenderer.addEffect((EntityFX)(var21 = new EntityLargeExplodeFX(this.renderEngine, this.theWorld, par2, par4, par6, par8, par10, par12)));
-                 }
-             }
-             else if (par1Str.equals("fireworksSpark"))
-             {
--                this.mc.effectRenderer.addEffect(var21 = new EntityFireworkSparkFX(this.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer));
-+                this.mc.effectRenderer.addEffect((EntityFX)(var21 = new EntityFireworkSparkFX(this.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer)));
-             }
+@@ -2532,7 +2526,7 @@
+             double var15 = this.mc.renderViewEntity.posX - par2;
+             double var17 = this.mc.renderViewEntity.posY - par4;
+             double var19 = this.mc.renderViewEntity.posZ - par6;
+-            Object var21 = null;
++            EntityFX var21 = null;
 
-             if (var21 != null)
+             if (par1Str.equals("hugeexplosion"))
+             {
diff --git a/mcppatches/patches/net/minecraft/client/renderer/ThreadDownloadImageData.java.patch b/mcppatches/patches/net/minecraft/client/renderer/ThreadDownloadImageData.java.patch
@@ -1,15 +1,15 @@
 --- a/net/minecraft/client/renderer/ThreadDownloadImageData.java
 +++ b/net/minecraft/client/renderer/ThreadDownloadImageData.java
-@@ -28,7 +28,6 @@
-     private boolean textureUploaded;
+@@ -37,7 +37,6 @@
      private static final String __OBFID = "CL_00001049";
      public Boolean imageFound = null;
+     public boolean pipeline = false;
 -    private static final String __OBFID = "CL_00001049";
 
      public ThreadDownloadImageData(File par1GuiCreateFlatWorld, String p_i1049_2_, ResourceLocation p_i1049_3_, IImageBuffer p_i1049_4_)
      {
-@@ -112,7 +111,6 @@
-         this.imageThread = new Thread("Texture Downloader #" + field_147643_d.incrementAndGet())
+@@ -121,7 +120,6 @@
+         this.imageThread = new Thread("Texture Downloader #" + threadDownloadCounter.incrementAndGet())
          {
              private static final String __OBFID = "CL_00001050";
 -            private static final String __OBFID = "CL_00001050";

diff --git a/mcppatches/patches/net/minecraft/client/renderer/WorldRenderer.java.patch b/mcppatches/patches/net/minecraft/client/renderer/WorldRenderer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/WorldRenderer.java
 +++ b/net/minecraft/client/renderer/WorldRenderer.java
-@@ -108,7 +108,6 @@
+@@ -110,7 +110,6 @@
      public RenderGlobal renderGlobal;
      public static int globalChunkOffsetX = 0;
      public static int globalChunkOffsetZ = 0;
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,3 +22,4 @@ optionsvrprofiles.txt @@
     crash-reports/
     saves/
     *.ex_
+    mcppatches - Copy/