Fix bad patch files. Bad sync?

jrbudda · May 7, 2014 · 265b7b9 · 265b7b9
1 parent c63605d
commit 265b7b9
Show file tree

Hide file tree

Showing 12 changed files with 105 additions and 829 deletions.
diff --git a/patches/net/minecraft/src/Config.java.patch b/patches/net/minecraft/src/Config.java.patch
@@ -1,25 +1,5 @@
 --- a/net/minecraft/src/Config.java
 +++ b/net/minecraft/src/Config.java
-@@ -36,8 +36,8 @@
-     public static final String OF_NAME = "OptiFine";
-     public static final String MC_VERSION = "1.6.4";
-     public static final String OF_EDITION = "HD_U";
--    public static final String OF_RELEASE = "C6";
--    public static final String VERSION = "OptiFine_1.6.4_HD_U_C6";
-+    public static final String OF_RELEASE = "D1";
-+    public static final String VERSION = "OptiFine_1.6.4_HD_U_D1";
-     private static String newRelease = null;
-     private static GameSettings gameSettings = null;
-     private static Minecraft minecraft = null;
-@@ -67,7 +67,7 @@
-
-     public static String getVersion()
-     {
--        return "OptiFine_1.6.4_HD_U_C6";
-+        return "OptiFine_1.6.4_HD_U_D1";
-     }
-
-     public static void initGameSettings(GameSettings settings)
 @@ -1433,27 +1433,7 @@
                  }
 

diff --git a/patches/net/minecraft/src/CustomColorizer.java.patch b/patches/net/minecraft/src/CustomColorizer.java.patch
@@ -1,48 +1,8 @@
 --- a/net/minecraft/src/CustomColorizer.java
 +++ b/net/minecraft/src/CustomColorizer.java
-@@ -1053,4 +1053,45 @@
-             }
-         }
+@@ -1093,4 +1093,5 @@
+
+         return skyVec;
      }
-+
-+    public static Vec3 getWorldFogColor(Vec3 fogVec, WorldClient world, float partialTicks)
-+    {
-+        int worldType = world.provider.dimensionId;
-+
-+        switch (worldType)
-+        {
-+            case -1:
-+                fogVec = getFogColorNether(fogVec);
-+                break;
-+
-+            case 0:
-+                Minecraft mc = Minecraft.getMinecraft();
-+                fogVec = getFogColor(fogVec, mc.theWorld, mc.renderViewEntity.posX, mc.renderViewEntity.posY + 1.0D, mc.renderViewEntity.posZ);
-+                break;
-+
-+            case 1:
-+                fogVec = getFogColorEnd(fogVec);
-+        }
-+
-+        return fogVec;
-+    }
-+
-+    public static Vec3 getWorldSkyColor(Vec3 skyVec, WorldClient world, EntityLivingBase renderViewEntity, float partialTicks)
-+    {
-+        int worldType = world.provider.dimensionId;
-+
-+        switch (worldType)
-+        {
-+            case 0:
-+                Minecraft mc = Minecraft.getMinecraft();
-+                skyVec = getSkyColor(skyVec, mc.theWorld, mc.renderViewEntity.posX, mc.renderViewEntity.posY + 1.0D, mc.renderViewEntity.posZ);
-+                break;
-+
-+            case 1:
-+                skyVec = getSkyColorEnd(skyVec);
-+        }
-+
-+        return skyVec;
-+    }
 +
  }