b18

jrbudda · Jul 27, 2020 · dcff3ed · dcff3ed
1 parent 0222ff1
commit dcff3ed
Show file tree

Hide file tree

Showing 71 changed files with 2,233 additions and 1,854 deletions.
diff --git a/installer/Installer.java b/installer/Installer.java
@@ -59,10 +59,10 @@ public class Installer extends JPanel  implements PropertyChangeListener
     private static final String MC_VERSION        = "1.16.1";
     private static final String MC_MD5            = "9b94beec05c9580343f663165fa53d3f";
 	private static final String OF_LIB_PATH       = "libraries/optifine/OptiFine/";
-    private static final String OF_FILE_NAME      = "1.16.1_HD_U_G2_pre3";
-    private static final String OF_MD5            = "e93ad02cc2a06ddbfb5843d9fba7c0a2";
+    private static final String OF_FILE_NAME      = "1.16.1_HD_U_G2_pre10";
+    private static final String OF_MD5            = "6addbd1d567a82a3545f079d2deb2a7c";
     private static final String OF_VERSION_EXT    = ".jar";
-    private static String FORGE_VERSION     = "32.0.63";
+    private static String FORGE_VERSION     = "32.0.75";
 	/* END OF DO NOT RENAME */
 
 	private static final String DEFAULT_PROFILE_NAME = "Vivecraft " + MINECRAFT_VERSION;
@@ -1629,7 +1629,7 @@ private void updateInstructions(){
 		ramAllocation.setEnabled(createProfile.isSelected());
 		txtCustomForgeVersion.setEnabled(optCustomForgeVersion.isSelected());
 		txtCustomForgeVersion.setVisible(useForge.isSelected());
-		optCustomForgeVersion.setVisible(false);
+		optCustomForgeVersion.setVisible(useForge.isSelected());
 		this.revalidate();		
 	}
 

diff --git a/installer/vivecraft-forge.json b/installer/vivecraft-forge.json
@@ -75,6 +75,28 @@
                 }
             }
         },
+        {
+            "name": "org.ow2.asm:asm-util:7.2",
+            "downloads": {
+                "artifact": {
+                    "path": "org/ow2/asm/asm-util/7.2/asm-util-7.2.jar",
+                    "url": "https://files.minecraftforge.net/maven/org/ow2/asm/asm-util/7.2/asm-util-7.2.jar",
+                    "sha1": "a3ae34e57fa8a4040e28247291d0cc3d6b8c7bcf",
+                    "size": 80707
+                }
+            }
+        },
+        {
+            "name": "org.ow2.asm:asm-analysis:7.2",
+            "downloads": {
+                "artifact": {
+                    "path": "org/ow2/asm/asm-analysis/7.2/asm-analysis-7.2.jar",
+                    "url": "https://files.minecraftforge.net/maven/org/ow2/asm/asm-analysis/7.2/asm-analysis-7.2.jar",
+                    "sha1": "b6e6abe057f23630113f4167c34bda7086691258",
+                    "size": 33444
+                }
+            }
+        },
         {
             "name": "cpw.mods:modlauncher:5.1.0",
             "downloads": {
@@ -250,6 +272,17 @@
                     "size": 78146
                 }
             }
+        },
+        {
+            "name": "org.spongepowered:mixin:0.8",
+            "downloads": {
+                "artifact": {
+                    "path": "org/spongepowered/mixin/0.8/mixin-0.8.jar",
+                    "url": "https://files.minecraftforge.net/maven/org/spongepowered/mixin/0.8/mixin-0.8.jar",
+                    "sha1": "dbe9e5db694a7c3cd644d5bb98f8a21295c75048",
+                    "size": 931239
+                }
+            }
         },
 		{
 			"name": "optifine:OptiFine:$OFVERSION"

diff --git a/mcppatches/patches/net/minecraft/client/gui/overlay/DebugOverlayGui.java.patch b/mcppatches/patches/net/minecraft/client/gui/overlay/DebugOverlayGui.java.patch
@@ -8,7 +8,7 @@
  import java.util.Map.Entry;
  import java.util.concurrent.CompletableFuture;
  import java.util.stream.Collectors;
-@@ -542,7 +543,7 @@
+@@ -565,7 +566,7 @@
          {
              list.add("");
 

diff --git a/mcppatches/patches/net/minecraft/client/renderer/FluidBlockRenderer.java.patch b/mcppatches/patches/net/minecraft/client/renderer/FluidBlockRenderer.java.patch
@@ -10,15 +10,15 @@
          try
          {
 @@ -139,7 +139,7 @@
-                 float f35 = (float)(i >> 16 & 255) / 255.0F;
+                 float f28 = (float)(i >> 16 & 255) / 255.0F;
                  float f1 = (float)(i >> 8 & 255) / 255.0F;
                  float f2 = (float)(i & 255) / 255.0F;
 -                boolean flag7 = false;
 +                flag7 = false;
                  float f3 = lightReaderIn.func_230487_a_(Direction.DOWN, true);
                  float f4 = lightReaderIn.func_230487_a_(Direction.UP, true);
                  float f5 = lightReaderIn.func_230487_a_(Direction.NORTH, true);
-@@ -405,7 +405,7 @@
+@@ -421,7 +421,7 @@
                  return flag7;
              }
 
@@ -27,7 +27,7 @@
          }
          finally
          {
-@@ -415,7 +415,7 @@
+@@ -431,7 +431,7 @@
              }
          }
 

diff --git a/mcppatches/patches/net/minecraft/client/renderer/RenderType.java.patch b/mcppatches/patches/net/minecraft/client/renderer/RenderType.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/client/renderer/RenderType.java
 +++ b/net/minecraft/client/renderer/RenderType.java
-@@ -120,9 +120,10 @@
+@@ -121,9 +121,10 @@
      public static RenderType func_239263_a_(ResourceLocation p_239263_0_)
      {
          p_239263_0_ = getCustomTexture(p_239263_0_);
@@ -12,7 +12,7 @@
              return makeType("armor_cutout_no_cull", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
          });
      }
-@@ -130,9 +131,10 @@
+@@ -131,9 +132,10 @@
      public static RenderType getEntitySolid(ResourceLocation locationIn)
      {
          locationIn = getCustomTexture(locationIn);
@@ -24,7 +24,7 @@
              return makeType("entity_solid", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
          });
      }
-@@ -140,9 +142,10 @@
+@@ -141,9 +143,10 @@
      public static RenderType getEntityCutout(ResourceLocation locationIn)
      {
          locationIn = getCustomTexture(locationIn);
@@ -36,7 +36,7 @@
              return makeType("entity_cutout", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
          });
      }
-@@ -150,9 +153,10 @@
+@@ -151,9 +154,10 @@
      public static RenderType func_230167_a_(ResourceLocation p_230167_0_, boolean p_230167_1_)
      {
          p_230167_0_ = getCustomTexture(p_230167_0_);
@@ -48,7 +48,7 @@
              return makeType("entity_cutout_no_cull", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
          });
      }
-@@ -165,9 +169,10 @@
+@@ -166,9 +170,10 @@
      public static RenderType func_239266_b_(ResourceLocation p_239266_0_, boolean p_239266_1_)
      {
          p_239266_0_ = getCustomTexture(p_239266_0_);
@@ -60,7 +60,7 @@
              return makeType("entity_cutout_no_cull_z_offset", DefaultVertexFormats.ENTITY, 7, 256, true, false, rendertype$state);
          });
      }
-@@ -180,9 +185,10 @@
+@@ -181,9 +186,10 @@
      public static RenderType func_239268_f_(ResourceLocation p_239268_0_)
      {
          p_239268_0_ = getCustomTexture(p_239268_0_);
@@ -72,7 +72,7 @@
              return makeType("item_entity_translucent_cull", DefaultVertexFormats.ENTITY, 7, 256, true, true, rendertype$state);
          });
      }
-@@ -190,19 +196,20 @@
+@@ -191,19 +197,20 @@
      public static RenderType getEntityTranslucentCull(ResourceLocation locationIn)
      {
          locationIn = getCustomTexture(locationIn);
@@ -97,7 +97,7 @@
              return makeType("entity_translucent", DefaultVertexFormats.ENTITY, 7, 256, true, true, rendertype$state);
          });
      }
-@@ -214,80 +221,80 @@
+@@ -215,80 +222,80 @@
 
      public static RenderType getEntitySmoothCutout(ResourceLocation locationIn)
      {

diff --git a/mcppatches/patches/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch b/mcppatches/patches/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java.patch
@@ -1,20 +1,11 @@
 --- a/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
 +++ b/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java
-@@ -986,7 +986,7 @@
+@@ -988,7 +988,7 @@
                      Random random = new Random();
                      BlockRendererDispatcher blockrendererdispatcher = Minecraft.getInstance().getBlockRendererDispatcher();
 
 -                    for (BlockPosM blockposm : BlockPosM.getAllInBoxMutable(blockpos, blockpos1))
 +                    for (BlockPosM blockposm : (Iterable<BlockPosM>)BlockPosM.getAllInBoxMutable(blockpos, blockpos1))
                      {
                          BlockState blockstate = chunkcacheof.getBlockState(blockposm);
-                         Block block = blockstate.getBlock();
-@@ -1093,7 +1093,7 @@
-
-                         if (ChunkRenderDispatcher.FORGE_SET_RENDER_LAYER)
-                         {
--                            Reflector.callVoid(Reflector.ForgeHooksClient_setRenderLayer, null);
-+                            Reflector.callVoid(Reflector.ForgeHooksClient_setRenderLayer, (Object[])null);
-                         }
-                     }
 
diff --git a/...hes/patches/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java.patch b/...hes/patches/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java.patch
@@ -1,11 +1,11 @@
 --- a/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java
 +++ b/net/minecraft/client/renderer/entity/layers/MooshroomMushroomLayer.java
 @@ -31,7 +31,7 @@
-     public MooshroomMushroomLayer(IEntityRenderer<T, CowModel<T>> p_i250_1_)
+     public MooshroomMushroomLayer(IEntityRenderer<T, CowModel<T>> p_i252_1_)
      {
-         super(p_i250_1_);
--        MooshroomRenderer mooshroomrenderer = (MooshroomRenderer)p_i250_1_;
-+        IEntityRenderer<T, CowModel<T>> mooshroomrenderer = p_i250_1_;
+         super(p_i252_1_);
+-        MooshroomRenderer mooshroomrenderer = (MooshroomRenderer)p_i252_1_;
++        IEntityRenderer<T, CowModel<T>> mooshroomrenderer = p_i252_1_;
          this.modelRendererMushroom = new ModelRenderer(mooshroomrenderer.getEntityModel());
          this.modelRendererMushroom.setTextureSize(16, 16);
          this.modelRendererMushroom.rotationPointX = -6.0F;
diff --git a/mcppatches/patches/net/minecraft/client/renderer/texture/AtlasTexture.java.patch b/mcppatches/patches/net/minecraft/client/renderer/texture/AtlasTexture.java.patch
@@ -18,7 +18,7 @@
                  {
                      TextureAtlasSprite textureatlassprite6 = textureatlassprite3.spriteSpecular;
 
-@@ -752,7 +752,7 @@
+@@ -778,7 +778,7 @@
                              }
                              else
                              {
@@ -27,7 +27,7 @@
                                  map.put(j, k + 1);
                              }
                          }
-@@ -765,12 +765,12 @@
+@@ -791,12 +791,12 @@
          }
 
          int l = 0;
@@ -43,7 +43,7 @@
              l += l1;
          }
 
-@@ -780,7 +780,7 @@
+@@ -806,7 +806,7 @@
 
          for (int j2 : set1)
          {

diff --git a/mcppatches/patches/net/minecraft/world/SerializableTickList.java.patch b/mcppatches/patches/net/minecraft/world/SerializableTickList.java.patch
@@ -2,10 +2,10 @@
 +++ b/net/minecraft/world/SerializableTickList.java
 @@ -18,7 +18,7 @@
      {
-         this(p_i2386_1_, p_i2386_2_.stream().map((p_234854_2_) ->
+         this(p_i2387_1_, p_i2387_2_.stream().map((p_234854_2_) ->
          {
--            return new SerializableTickList.TickHolder(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2386_3_), p_234854_2_.priority);
-+            return new SerializableTickList.TickHolder<>(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2386_3_), p_234854_2_.priority);
+-            return new SerializableTickList.TickHolder(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2387_3_), p_234854_2_.priority);
++            return new SerializableTickList.TickHolder<>(p_234854_2_.getTarget(), p_234854_2_.position, (int)(p_234854_2_.field_235017_b_ - p_i2387_3_), p_234854_2_.priority);
          }).collect(Collectors.toList()));
      }
 
diff --git a/mcppatches/patches/net/minecraft/world/biome/Biome.java.patch b/mcppatches/patches/net/minecraft/world/biome/Biome.java.patch
@@ -31,7 +31,7 @@
          }));
          private final String name;
 @@ -885,11 +880,6 @@
-             this.name = p_i1933_3_;
+             this.name = p_i1934_3_;
          }
 
 -        public String getName()

diff --git a/mcppatches/patches/net/optifine/Config.java.patch b/mcppatches/patches/net/optifine/Config.java.patch
@@ -1,6 +1,6 @@
 --- a/net/optifine/Config.java
 +++ b/net/optifine/Config.java
-@@ -1185,7 +1185,7 @@
+@@ -1188,7 +1188,7 @@
              }
          }
 
@@ -9,7 +9,7 @@
          return airesourcepack;
      }
 
-@@ -1510,7 +1510,7 @@
+@@ -1513,7 +1513,7 @@
              list.add(s);
          }
 
@@ -18,7 +18,7 @@
          return astring;
      }
 
-@@ -1642,7 +1642,7 @@
+@@ -1645,7 +1645,7 @@
 
              if (s == null)
              {
@@ -27,7 +27,7 @@
              }
 
              list.add(s);
-@@ -1938,7 +1938,7 @@
+@@ -1941,7 +1941,7 @@
          {
              int i = arr.length;
              int j = i + 1;
@@ -36,7 +36,7 @@
              System.arraycopy(arr, 0, aobject, 0, i);
              aobject[i] = obj;
              return aobject;
-@@ -1949,7 +1949,7 @@
+@@ -1952,7 +1952,7 @@
      {
          List list = new ArrayList<>(Arrays.asList(arr));
          list.add(index, obj);
@@ -45,7 +45,7 @@
          return list.toArray(aobject);
      }
 
-@@ -1967,7 +1967,7 @@
+@@ -1970,7 +1970,7 @@
          {
              int i = arr.length;
              int j = i + objs.length;
@@ -54,7 +54,7 @@
              System.arraycopy(arr, 0, aobject, 0, i);
              System.arraycopy(objs, 0, aobject, i, objs.length);
              return aobject;
-@@ -1997,7 +1997,7 @@
+@@ -2000,7 +2000,7 @@
          }
          else
          {

diff --git a/mcppatches/patches/net/optifine/ConnectedTextures.java.patch b/mcppatches/patches/net/optifine/ConnectedTextures.java.patch
@@ -1,6 +1,6 @@
 --- a/net/optifine/ConnectedTextures.java
 +++ b/net/optifine/ConnectedTextures.java
-@@ -2361,7 +2361,7 @@
+@@ -2309,7 +2309,7 @@
              }
          }
 
@@ -9,7 +9,7 @@
          Set set1 = new HashSet();
          Set set = new HashSet();
 
-@@ -2384,17 +2384,17 @@
+@@ -2332,17 +2332,17 @@
          return !set1.isEmpty();
      }
 
@@ -32,7 +32,7 @@
                  aconnectedproperties[i] = aconnectedproperties1;
              }
          }
-@@ -2458,15 +2458,15 @@
+@@ -2406,15 +2406,15 @@
              list.add((Object)null);
          }
 
@@ -53,7 +53,7 @@
      }
 
      private static String[] getDefaultCtmPaths()
-@@ -2487,7 +2487,7 @@
+@@ -2435,7 +2435,7 @@
              addDefaultLocation(list, "textures/block/" + s + "_stained_glass.png", s1 + "_glass_" + s + "/glass_pane_" + s + ".properties");
          }
 

diff --git a/mcppatches/patches/net/optifine/shaders/Shaders.java.patch b/mcppatches/patches/net/optifine/shaders/Shaders.java.patch
@@ -16,7 +16,7 @@
          boolean flag = shaderPackLoaded;
          boolean flag1 = isOldLighting();
 
-@@ -1095,7 +1097,7 @@
+@@ -1089,7 +1091,7 @@
          Set set = props.keySet();
          List<ICustomTexture> list = new ArrayList<>();
 
@@ -25,7 +25,7 @@
          {
              if (s1.startsWith(s))
              {
-@@ -2457,11 +2459,11 @@
+@@ -2451,11 +2453,11 @@
 
      private static int getDrawBuffer(Program p, String str, int i)
      {
@@ -39,7 +39,7 @@
          }
          else
          {
-@@ -4308,15 +4310,15 @@
+@@ -4302,15 +4304,15 @@
          GlStateManager.activeTexture(33984);
      }
 
@@ -61,7 +61,7 @@
 
              if (j != i)
              {
-@@ -5770,7 +5772,7 @@
+@@ -5764,7 +5766,7 @@
                          Lang.loadLocaleData(inputstream, properties);
                          inputstream.close();