diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 3abab08e6b..9e8b82a35a 100644 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -78,7 +78,7 @@ try { Display.setVSyncEnabled(this.field_71474_y.field_74352_v); -@@ -970,9 +979,11 @@ +@@ -971,9 +980,11 @@ if (!this.field_71454_w) { @@ -90,7 +90,7 @@ } GL11.glFlush(); -@@ -1554,6 +1565,8 @@ +@@ -1555,6 +1566,8 @@ --this.field_71467_ac; } @@ -99,7 +99,7 @@ this.field_71424_I.func_76320_a("gui"); if (!this.field_71445_n) -@@ -1698,6 +1711,7 @@ +@@ -1699,6 +1712,7 @@ this.field_71462_r.func_146274_d(); } } @@ -107,7 +107,7 @@ } if (this.field_71429_W > 0) -@@ -1834,6 +1848,7 @@ +@@ -1835,6 +1849,7 @@ } } } @@ -115,7 +115,7 @@ } } -@@ -2025,12 +2040,15 @@ +@@ -2026,12 +2041,15 @@ this.field_71453_ak.func_74428_b(); } @@ -131,7 +131,7 @@ this.func_71403_a((WorldClient)null); System.gc(); ISaveHandler isavehandler = this.field_71469_aa.func_75804_a(p_71371_1_, false); -@@ -2066,6 +2084,12 @@ +@@ -2067,6 +2085,12 @@ while (!this.field_71437_Z.func_71200_ad()) { @@ -144,7 +144,7 @@ String s2 = this.field_71437_Z.func_71195_b_(); if (s2 != null) -@@ -2141,6 +2165,7 @@ +@@ -2142,6 +2166,7 @@ this.field_110448_aq.func_148529_f(); this.func_71351_a((ServerData)null); this.field_71455_al = false; diff --git a/fml/patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch b/fml/patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch deleted file mode 100644 index 23a6fc0814..0000000000 --- a/fml/patches/minecraft/net/minecraft/util/AxisAlignedBB.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/util/AxisAlignedBB.java -+++ ../src-work/minecraft/net/minecraft/util/AxisAlignedBB.java -@@ -23,6 +23,7 @@ - return new AxisAlignedBB(p_72330_0_, p_72330_2_, p_72330_4_, p_72330_6_, p_72330_8_, p_72330_10_); - } - -+ @Deprecated /* This method has been deprecated as it no longer exists in 1.7.10. Use getBoundingBox directly. */ - public static AABBPool func_72332_a() - { - return (AABBPool)field_72335_g.get(); diff --git a/fml/patches/minecraft/net/minecraft/world/ChunkCache.java.patch b/fml/patches/minecraft/net/minecraft/world/ChunkCache.java.patch deleted file mode 100644 index 0a0c41eff2..0000000000 --- a/fml/patches/minecraft/net/minecraft/world/ChunkCache.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/ChunkCache.java -+++ ../src-work/minecraft/net/minecraft/world/ChunkCache.java -@@ -133,6 +133,7 @@ - return this.field_72815_e.func_72807_a(p_72807_1_, p_72807_2_); - } - -+ @Deprecated /* gone in 1.7.10, use direct access to Vec3.createVectorHelper instead */ - public Vec3Pool func_82732_R() - { - return this.field_72815_e.func_82732_R(); diff --git a/fml/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch b/fml/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch deleted file mode 100644 index c4fc18e77a..0000000000 --- a/fml/patches/minecraft/net/minecraft/world/IBlockAccess.java.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ../src-base/minecraft/net/minecraft/world/IBlockAccess.java -+++ ../src-work/minecraft/net/minecraft/world/IBlockAccess.java -@@ -30,6 +30,7 @@ - @SideOnly(Side.CLIENT) - boolean func_72806_N(); - -+ @Deprecated /* gone in 1.7.10, use direct access to Vec3.createVectorHelper instead */ - Vec3Pool func_82732_R(); - - int func_72879_k(int var1, int var2, int var3, int var4); diff --git a/fml/patches/minecraft/net/minecraft/world/World.java.patch b/fml/patches/minecraft/net/minecraft/world/World.java.patch index 5da4f19eae..516c116d5a 100644 --- a/fml/patches/minecraft/net/minecraft/world/World.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/World.java.patch @@ -26,11 +26,3 @@ } public CrashReportCategory func_72914_a(CrashReport p_72914_1_) -@@ -3615,6 +3615,7 @@ - } - } - -+ @Deprecated /* gone in 1.7.10, use direct access to Vec3.createVectorHelper instead */ - public Vec3Pool func_82732_R() - { - return this.field_82741_K;