1.16.2v4

jrbudda · Sep 1, 2020 · a15dc01 · a15dc01
1 parent 5c091dc
commit a15dc01
Show file tree

Hide file tree

Showing 56 changed files with 1,024 additions and 431 deletions.
diff --git a/installer/Installer.java b/installer/Installer.java
@@ -47,10 +47,10 @@ public class Installer extends JPanel  implements PropertyChangeListener
     private static final String MINECRAFT_VERSION     = "1.16.2";
     private static final String MC_VERSION            = "1.16.2";
     private static final String MC_MD5                = "114f460c5ba72d0dd66a16ed399c0f6d";
-    private static final String OF_FILE_NAME          = "1.16.2_HD_U_G3_pre2";
-    private static final String OF_MD5                = "4a9988e83f85782cd40c80038c9b42b9";
+    private static final String OF_FILE_NAME          = "1.16.2_HD_U_G3";
+    private static final String OF_MD5                = "0ecd18144e547a40dfae70fa58edc842";
     private static final String OF_VERSION_EXT        = ".jar";
-    private static String FORGE_VERSION               = "33.0.5";
+    private static String FORGE_VERSION               = "33.0.22";
     private static final String HOMEPAGE_LINK         = "http://www.vivecraft.org";
     private static final String DONATION_LINK         = "https://www.patreon.com/jrbudda";
     private static final String PROJECT_NAME          = "Vivecraft";

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
@@ -8,4 +8,4 @@
 +        IEntityRenderer<T, CowModel<T>> mooshroomrenderer = rendererIn;
          this.modelRendererMushroom = new ModelRenderer(mooshroomrenderer.getEntityModel());
          this.modelRendererMushroom.setTextureSize(16, 16);
-         this.modelRendererMushroom.rotationPointX = -6.0F;
+         this.modelRendererMushroom.rotationPointX = 8.0F;
diff --git a/mcppatches/patches/net/minecraft/client/renderer/model/ModelBakery.java.patch b/mcppatches/patches/net/minecraft/client/renderer/model/ModelBakery.java.patch
@@ -8,7 +8,7 @@
  import java.util.function.Function;
  import java.util.function.Predicate;
  import java.util.function.Supplier;
-@@ -537,9 +538,9 @@
+@@ -538,9 +539,9 @@
 
                          try {
                              ModelBakery.ModelListWrapper modelbakery$modellistwrapper1 = pair2.getSecond().get();
@@ -20,7 +20,7 @@
                          }
                          catch (Exception exception11)
                          {
-@@ -548,7 +549,7 @@
+@@ -549,7 +550,7 @@
                      });
                      lvt_20_1_.forEach((p_lambda$loadBlockstate$26_1_, p_lambda$loadBlockstate$26_2_) ->
                      {
@@ -29,7 +29,7 @@
 
                          while (iterator.hasNext())
                          {
-@@ -561,9 +562,9 @@
+@@ -562,9 +563,9 @@
                              }
                          }
 

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;
 
-@@ -778,7 +778,7 @@
+@@ -779,7 +779,7 @@
                              }
                              else
                              {
@@ -27,7 +27,7 @@
                                  map.put(j, k + 1);
                              }
                          }
-@@ -791,12 +791,12 @@
+@@ -792,12 +792,12 @@
          }
 
          int l = 0;
@@ -43,7 +43,7 @@
              l += l1;
          }
 
-@@ -806,7 +806,7 @@
+@@ -807,7 +807,7 @@
 
          for (int j2 : set1)
          {

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
-@@ -1188,7 +1188,7 @@
+@@ -1187,7 +1187,7 @@
              }
          }
 
@@ -9,7 +9,7 @@
          return airesourcepack;
      }
 
-@@ -1513,7 +1513,7 @@
+@@ -1512,7 +1512,7 @@
              list.add(s);
          }
 
@@ -18,7 +18,7 @@
          return astring;
      }
 
-@@ -1645,7 +1645,7 @@
+@@ -1644,7 +1644,7 @@
 
              if (s == null)
              {
@@ -27,7 +27,7 @@
              }
 
              list.add(s);
-@@ -1941,7 +1941,7 @@
+@@ -1940,7 +1940,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;
-@@ -1952,7 +1952,7 @@
+@@ -1951,7 +1951,7 @@
      {
          List list = new ArrayList<>(Arrays.asList(arr));
          list.add(index, obj);
@@ -45,7 +45,7 @@
          return list.toArray(aobject);
      }
 
-@@ -1970,7 +1970,7 @@
+@@ -1969,7 +1969,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;
-@@ -2000,7 +2000,7 @@
+@@ -1999,7 +1999,7 @@
          }
          else
          {

diff --git a/mcppatches/patches/net/optifine/ConnectedProperties.java.patch b/mcppatches/patches/net/optifine/ConnectedProperties.java.patch
@@ -8,7 +8,7 @@
  import net.minecraft.block.Block;
  import net.minecraft.block.BlockState;
  import net.minecraft.block.Blocks;
-@@ -311,7 +312,7 @@
+@@ -312,7 +313,7 @@
                  list.add(s);
              }
 
@@ -17,7 +17,7 @@
 
              for (int i1 = 0; i1 < astring2.length; ++i1)
              {
-@@ -473,7 +474,7 @@
+@@ -474,7 +475,7 @@
 
      public static Property getProperty(String key, Collection properties)
      {
@@ -26,7 +26,7 @@
          {
              if (key.equals(property.getName()))
              {
-@@ -1226,7 +1227,7 @@
+@@ -1227,7 +1228,7 @@
                  }
              }
 

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
-@@ -2303,7 +2303,7 @@
+@@ -2304,7 +2304,7 @@
              }
          }
 
@@ -9,7 +9,7 @@
          Set set1 = new HashSet();
          Set set = new HashSet();
 
-@@ -2326,17 +2326,17 @@
+@@ -2327,17 +2327,17 @@
          return !set1.isEmpty();
      }
 
@@ -32,7 +32,7 @@
                  aconnectedproperties[i] = aconnectedproperties1;
              }
          }
-@@ -2400,15 +2400,15 @@
+@@ -2401,15 +2401,15 @@
              list.add((Object)null);
          }
 
@@ -53,7 +53,7 @@
      }
 
      private static String[] getDefaultCtmPaths()
-@@ -2429,7 +2429,7 @@
+@@ -2430,7 +2430,7 @@
              addDefaultLocation(list, "textures/block/" + s + "_stained_glass.png", s1 + "_glass_" + s + "/glass_pane_" + s + ".properties");
          }
 

diff --git a/mcppatches/patches/net/optifine/CustomColors.java.patch b/mcppatches/patches/net/optifine/CustomColors.java.patch
@@ -27,7 +27,7 @@
      }
 
      private static CustomColormap[][] readBlockColormaps(String[] basePaths, CustomColormap[] basePalettes, int width, int height)
-@@ -606,15 +606,15 @@
+@@ -607,15 +607,15 @@
              list.add((Object)null);
          }
 
@@ -48,7 +48,7 @@
      }
 
      private static CustomColormap[][] blockListToArray(List list)
-@@ -623,11 +623,11 @@
+@@ -624,11 +624,11 @@
 
          for (int i = 0; i < list.size(); ++i)
          {
@@ -63,7 +63,7 @@
                  acustomcolormap[i] = acustomcolormap1;
              }
          }
-@@ -1352,7 +1352,7 @@
+@@ -1353,7 +1353,7 @@
          Set set = props.keySet();
          int i = 0;
 
@@ -72,7 +72,7 @@
          {
              String s1 = props.getProperty(s);
 
-@@ -1498,7 +1498,7 @@
+@@ -1499,7 +1499,7 @@
          float[][] afloat1 = new float[adyecolor.length][];
          int k = 0;
 
@@ -81,7 +81,7 @@
          {
              String s1 = props.getProperty(s);
 
-@@ -1565,7 +1565,7 @@
+@@ -1566,7 +1566,7 @@
          Arrays.fill(aint, -1);
          int i = 0;
 
@@ -90,7 +90,7 @@
          {
              String s1 = props.getProperty(s);
 
-@@ -1621,7 +1621,7 @@
+@@ -1622,7 +1622,7 @@
          Arrays.fill(aint, -1);
          int i = 0;
 
@@ -99,7 +99,7 @@
          {
              String s1 = props.getProperty(s);
 
-@@ -1660,7 +1660,7 @@
+@@ -1661,7 +1661,7 @@
          Arrays.fill(aint, -1);
          int i = 0;
 

diff --git a/mcppatches/patches/net/optifine/CustomGuiProperties.java.patch b/mcppatches/patches/net/optifine/CustomGuiProperties.java.patch
@@ -8,7 +8,7 @@
  import java.util.Properties;
  import net.minecraft.block.BlockState;
  import net.minecraft.block.ChestBlock;
-@@ -204,7 +205,7 @@
+@@ -205,7 +206,7 @@
 
          String s5 = property + ".";
 

diff --git a/mcppatches/patches/net/optifine/CustomItems.java.patch b/mcppatches/patches/net/optifine/CustomItems.java.patch
@@ -1,6 +1,6 @@
 --- a/net/optifine/CustomItems.java
 +++ b/net/optifine/CustomItems.java
-@@ -519,11 +519,11 @@
+@@ -520,11 +520,11 @@
 
          for (int i = 0; i < list.size(); ++i)
          {
@@ -15,7 +15,7 @@
                  Arrays.sort(acustomitemproperties1, new CustomItemsComparator());
                  acustomitemproperties[i] = acustomitemproperties1;
              }
-@@ -595,15 +595,15 @@
+@@ -596,15 +596,15 @@
              list.add((List<CustomItemProperties>)null);
          }
 

diff --git a/mcppatches/patches/net/optifine/TextureAnimations.java.patch b/mcppatches/patches/net/optifine/TextureAnimations.java.patch
@@ -9,7 +9,7 @@
      }
 
      private static TextureAnimation[] getTextureAnimations(IResourcePack rp)
-@@ -143,7 +143,7 @@
+@@ -144,7 +144,7 @@
                  }
              }
 

diff --git a/mcppatches/patches/net/optifine/config/ConnectedParser.java.patch b/mcppatches/patches/net/optifine/config/ConnectedParser.java.patch
@@ -1,6 +1,6 @@
 --- a/net/optifine/config/ConnectedParser.java
 +++ b/net/optifine/config/ConnectedParser.java
-@@ -105,7 +105,7 @@
+@@ -104,7 +104,7 @@
                  }
              }
 
@@ -9,7 +9,7 @@
          }
      }
 
-@@ -376,7 +376,7 @@
+@@ -375,7 +375,7 @@
 
      public static Comparable getPropertyValue(String value, Collection propertyValues)
      {
@@ -18,12 +18,3 @@
          {
              if (getValueName(comparable).equals(value))
              {
-@@ -491,7 +491,7 @@
-                 list = list1;
-             }
-
--            return list.toArray(new Biome[list.size()]);
-+            return (Biome[]) list.toArray(new Biome[list.size()]);
-         }
-     }
-
diff --git a/mcppatches/patches/net/optifine/shaders/Shaders.java.patch b/mcppatches/patches/net/optifine/shaders/Shaders.java.patch
@@ -8,15 +8,15 @@
  import org.lwjgl.opengl.ARBGeometryShader4;
  import org.lwjgl.opengl.ARBShaderObjects;
  import org.lwjgl.opengl.ARBVertexShader;
-@@ -811,6 +812,7 @@
+@@ -812,6 +813,7 @@
 
      public static void loadShaderPack()
      {
 +    	mc = Minecraft.getInstance();
          boolean flag = shaderPackLoaded;
          boolean flag1 = isOldLighting();
 
-@@ -1090,7 +1092,7 @@
+@@ -1091,7 +1093,7 @@
          Set set = props.keySet();
          List<ICustomTexture> list = new ArrayList<>();
 
@@ -25,7 +25,7 @@
          {
              if (s1.startsWith(s))
              {
-@@ -2453,11 +2455,11 @@
+@@ -2454,11 +2456,11 @@
 
      private static int getDrawBuffer(Program p, String str, int i)
      {
@@ -39,7 +39,7 @@
          }
          else
          {
-@@ -4304,15 +4306,15 @@
+@@ -4307,15 +4309,15 @@
          GlStateManager.activeTexture(33984);
      }
 
@@ -61,7 +61,7 @@
 
              if (j != i)
              {
-@@ -5766,7 +5768,7 @@
+@@ -5789,7 +5791,7 @@
                          Lang.loadLocaleData(inputstream, properties);
                          inputstream.close();
 

diff --git a/mcppatches/patches/net/optifine/shaders/config/ShaderPackParser.java.patch b/mcppatches/patches/net/optifine/shaders/config/ShaderPackParser.java.patch
@@ -36,7 +36,7 @@
          {
              String[] astring = Config.tokenize(s, ".");
 
-@@ -922,7 +922,7 @@
+@@ -929,7 +929,7 @@
 
      public static void parseBlendStates(Properties props)
      {
@@ -45,7 +45,7 @@
          {
              String[] astring = Config.tokenize(s, ".");
 
-@@ -997,7 +997,7 @@
+@@ -1011,7 +1011,7 @@
 
      public static void parseRenderScales(Properties props)
      {
@@ -54,7 +54,7 @@
          {
              String[] astring = Config.tokenize(s, ".");
 
-@@ -1061,7 +1061,7 @@
+@@ -1075,7 +1075,7 @@
 
      public static void parseBuffersFlip(Properties props)
      {
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
          }
          private static TextureAnimation[] getTextureAnimations(IResourcePack rp)
-    @@ -143,7 +143,7 @@
+    @@ -144,7 +144,7 @@
                      }
                  }
@@ Expand Down @@