diff --git a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 21898e7e73..7d5d15805f 100644 --- a/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,12 +1,13 @@ --- ../src-base/minecraft/net/minecraft/client/Minecraft.java +++ ../src-work/minecraft/net/minecraft/client/Minecraft.java -@@ -1,7 +1,14 @@ +@@ -1,7 +1,15 @@ package net.minecraft.client; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; ++import cpw.mods.fml.common.registry.GameData; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.ItemData; +import cpw.mods.fml.relauncher.ArgsWrapper; @@ -15,7 +16,7 @@ import java.awt.BorderLayout; import java.awt.Canvas; import java.awt.Color; -@@ -120,6 +127,8 @@ +@@ -120,6 +128,8 @@ import org.lwjgl.opengl.PixelFormat; import org.lwjgl.util.glu.GLU; @@ -24,7 +25,7 @@ @SideOnly(Side.CLIENT) public abstract class Minecraft implements Runnable, IPlayerUsage { -@@ -302,6 +311,8 @@ +@@ -302,6 +312,8 @@ this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false); this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false); @@ -33,7 +34,7 @@ if (this.field_71474_y.field_74363_ab != null) { StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab); -@@ -346,6 +357,8 @@ +@@ -346,6 +358,8 @@ GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d); this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o); @@ -42,7 +43,7 @@ try { this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this); -@@ -374,6 +387,8 @@ +@@ -374,6 +388,8 @@ { this.func_71352_k(); } @@ -51,7 +52,7 @@ } private void func_71357_I() throws LWJGLException -@@ -732,9 +747,11 @@ +@@ -732,9 +748,11 @@ if (!this.field_71454_w) { @@ -63,7 +64,7 @@ } GL11.glFlush(); -@@ -1264,10 +1281,14 @@ +@@ -1264,10 +1282,14 @@ public void func_71407_l() { @@ -78,7 +79,7 @@ this.field_71424_I.func_76320_a("stats"); this.field_71413_E.func_77449_e(); -@@ -1724,6 +1745,8 @@ +@@ -1724,6 +1746,8 @@ this.field_71453_ak.func_74428_b(); } @@ -87,24 +88,24 @@ this.field_71424_I.func_76319_b(); this.field_71423_H = func_71386_F(); } -@@ -1762,8 +1785,27 @@ +@@ -1762,8 +1786,27 @@ } this.field_71413_E.func_77450_a(StatList.field_75936_f, 1); + -+ GameRegistry.initializeServerGate(2); ++ GameData.initializeServerGate(2); + this.field_71437_Z = new IntegratedServer(this, p_71371_1_, p_71371_2_, p_71371_3_); this.field_71437_Z.func_71256_s(); + -+ MapDifference idDifferences = GameRegistry.gateWorldLoadingForValidation(); ++ MapDifference idDifferences = GameData.gateWorldLoadingForValidation(); + if (idDifferences!=null) + { + FMLClientHandler.instance().warnIDMismatch(idDifferences, true); + } + else + { -+ GameRegistry.releaseGate(true); ++ GameData.releaseGate(true); + continueWorldLoading(); + } + @@ -115,7 +116,7 @@ this.field_71455_al = true; this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel")); -@@ -1978,6 +2020,12 @@ +@@ -1978,6 +2021,12 @@ public static void main(String[] p_main_0_) { diff --git a/fml/patches/minecraft/net/minecraft/item/Item.java.patch b/fml/patches/minecraft/net/minecraft/item/Item.java.patch index b09be1a938..2fc3cc027b 100644 --- a/fml/patches/minecraft/net/minecraft/item/Item.java.patch +++ b/fml/patches/minecraft/net/minecraft/item/Item.java.patch @@ -4,7 +4,7 @@ import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -+import cpw.mods.fml.common.registry.GameRegistry; ++import cpw.mods.fml.common.registry.GameData; + import java.util.List; import java.util.Random; @@ -14,7 +14,7 @@ field_77698_e[256 + p_i3659_1_] = this; + -+ GameRegistry.newItemAdded(this); ++ GameData.newItemAdded(this); } public Item func_77665_c(int p_77665_1_) diff --git a/fml/python/_ctypes.pyd b/fml/python/_ctypes.pyd index 5edc87c708..d05a84f3d5 100644 Binary files a/fml/python/_ctypes.pyd and b/fml/python/_ctypes.pyd differ diff --git a/fml/python/_elementtree.pyd b/fml/python/_elementtree.pyd index 0b0c3b1760..7833b6fb5b 100644 Binary files a/fml/python/_elementtree.pyd and b/fml/python/_elementtree.pyd differ diff --git a/fml/python/_hashlib.pyd b/fml/python/_hashlib.pyd index ba1421c20a..9cf823e475 100644 Binary files a/fml/python/_hashlib.pyd and b/fml/python/_hashlib.pyd differ diff --git a/fml/python/_multiprocessing.pyd b/fml/python/_multiprocessing.pyd index 22a4aae8ab..e897254b33 100644 Binary files a/fml/python/_multiprocessing.pyd and b/fml/python/_multiprocessing.pyd differ diff --git a/fml/python/_socket.pyd b/fml/python/_socket.pyd index dd81d555ff..023564443d 100644 Binary files a/fml/python/_socket.pyd and b/fml/python/_socket.pyd differ diff --git a/fml/python/_sqlite3.pyd b/fml/python/_sqlite3.pyd index c1a3c3c8ca..501da27c97 100644 Binary files a/fml/python/_sqlite3.pyd and b/fml/python/_sqlite3.pyd differ diff --git a/fml/python/_ssl.pyd b/fml/python/_ssl.pyd index 26c88e2df0..0cf8ed73a8 100644 Binary files a/fml/python/_ssl.pyd and b/fml/python/_ssl.pyd differ diff --git a/fml/python/bz2.pyd b/fml/python/bz2.pyd index 11c874a48d..b388111d6a 100644 Binary files a/fml/python/bz2.pyd and b/fml/python/bz2.pyd differ diff --git a/fml/python/pyexpat.pyd b/fml/python/pyexpat.pyd index 872fcb789a..3ebd2d0529 100644 Binary files a/fml/python/pyexpat.pyd and b/fml/python/pyexpat.pyd differ diff --git a/fml/python/python27.dll b/fml/python/python27.dll index e4f0aa40b1..e45374fb33 100644 Binary files a/fml/python/python27.dll and b/fml/python/python27.dll differ diff --git a/fml/python/python27.zip b/fml/python/python27.zip index c797a59172..06a1bd104a 100644 Binary files a/fml/python/python27.zip and b/fml/python/python27.zip differ diff --git a/fml/python/python_fml.exe b/fml/python/python_fml.exe index 27f355627e..f68a605bc8 100644 Binary files a/fml/python/python_fml.exe and b/fml/python/python_fml.exe differ diff --git a/fml/python/select.pyd b/fml/python/select.pyd index ee72f310d0..62104e489e 100644 Binary files a/fml/python/select.pyd and b/fml/python/select.pyd differ diff --git a/fml/python/sqlite3.dll b/fml/python/sqlite3.dll index faebb53772..9f0ccf0a7d 100644 Binary files a/fml/python/sqlite3.dll and b/fml/python/sqlite3.dll differ diff --git a/fml/python/unicodedata.pyd b/fml/python/unicodedata.pyd index 9927f9835b..f6a0f52561 100644 Binary files a/fml/python/unicodedata.pyd and b/fml/python/unicodedata.pyd differ diff --git a/fml/python/w9xpopen.exe b/fml/python/w9xpopen.exe new file mode 100644 index 0000000000..9303628363 Binary files /dev/null and b/fml/python/w9xpopen.exe differ