diff --git a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java index 5fee9445ec..7bc7fd6623 100644 --- a/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java +++ b/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java @@ -273,6 +273,7 @@ public class FMLDeobfuscatingRemapper extends Remapper { } public void mergeSuperMaps(String name, String superName, String[] interfaces) { +// System.out.printf("Computing super maps for %s: %s %s\n", name, superName, Arrays.asList(interfaces)); if (classNameBiMap == null || classNameBiMap.isEmpty()) { return; @@ -308,5 +309,6 @@ public class FMLDeobfuscatingRemapper extends Remapper { } methodNameMaps.put(name, ImmutableMap.copyOf(methodMap)); fieldNameMaps.put(name, ImmutableMap.copyOf(fieldMap)); +// System.out.printf("Maps: %s %s\n", name, methodMap); } } diff --git a/conf/joined.srg b/conf/joined.srg index fdd147424f..fb4ac461b6 100644 --- a/conf/joined.srg +++ b/conf/joined.srg @@ -12944,15 +12944,15 @@ MD: bjj/g ()V net/minecraft/src/TexturePackImplementation/func_77539_g ()V MD: bjk/a ()V net/minecraft/src/TexturePackDefault/func_77540_a ()V MD: bjk/b (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackDefault/func_98139_b (Ljava/lang/String;)Ljava/io/InputStream; MD: bjk/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackDefault/func_98140_c (Ljava/lang/String;)Z -MD: bjk/f ()Z net/minecraft/src/TexturePackDefault/func_94180_h ()Z +MD: bjk/f ()Z net/minecraft/src/TexturePackDefault/func_94179_g ()Z MD: bjl/a (Lbfy;)V net/minecraft/src/TexturePackCustom/func_77533_a (Lnet/minecraft/src/RenderEngine;)V MD: bjl/b (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackCustom/func_98139_b (Ljava/lang/String;)Ljava/io/InputStream; MD: bjl/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackCustom/func_98140_c (Ljava/lang/String;)Z -MD: bjl/f ()Z net/minecraft/src/TexturePackCustom/func_94180_h ()Z +MD: bjl/f ()Z net/minecraft/src/TexturePackCustom/func_94179_g ()Z MD: bjl/g ()V net/minecraft/src/TexturePackCustom/func_77549_g ()V MD: bjm/b (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackFolder/func_98139_b (Ljava/lang/String;)Ljava/io/InputStream; MD: bjm/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackFolder/func_98140_c (Ljava/lang/String;)Z -MD: bjm/f ()Z net/minecraft/src/TexturePackFolder/func_94180_h ()Z +MD: bjm/f ()Z net/minecraft/src/TexturePackFolder/func_94179_g ()Z MD: bjn/a (Lbfy;)V net/minecraft/src/ITexturePack/func_77533_a (Lnet/minecraft/src/RenderEngine;)V MD: bjn/a (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/ITexturePack/func_77532_a (Ljava/lang/String;)Ljava/io/InputStream; MD: bjn/a (Ljava/lang/String;Z)Ljava/io/InputStream; net/minecraft/src/ITexturePack/func_98137_a (Ljava/lang/String;Z)Ljava/io/InputStream; diff --git a/conf/patches/minecraft_ff.patch b/conf/patches/minecraft_ff.patch index d6e6a4e3af..de5b885b01 100644 --- a/conf/patches/minecraft_ff.patch +++ b/conf/patches/minecraft_ff.patch @@ -241,45 +241,6 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\ public void run() { try { Thread.sleep(5000L); -diff -r -U 3 minecraft\net\minecraft\src\TexturePackCustom.java minecraft_patched\net\minecraft\src\TexturePackCustom.java ---- minecraft\net\minecraft\src\TexturePackCustom.java Fri Mar 08 22:40:00 2013 -+++ minecraft_patched\net\minecraft\src\TexturePackCustom.java Fri Mar 08 22:41:28 2013 -@@ -77,4 +77,9 @@ - boolean var4 = this.func_98140_c("terrain.png") || this.func_98140_c("gui/items.png"); - return !var4; - } -+ -+ @Override -+ public boolean func_94179_g() { -+ return true; -+ } - } -diff -r -U 3 minecraft\net\minecraft\src\TexturePackDefault.java minecraft_patched\net\minecraft\src\TexturePackDefault.java ---- minecraft\net\minecraft\src\TexturePackDefault.java Fri Mar 08 22:40:00 2013 -+++ minecraft_patched\net\minecraft\src\TexturePackDefault.java Fri Mar 08 22:41:28 2013 -@@ -33,4 +33,9 @@ - return var2; - } - } -+ -+ @Override -+ public boolean func_94179_g() { -+ return true; -+ } - } -diff -r -U 3 minecraft\net\minecraft\src\TexturePackFolder.java minecraft_patched\net\minecraft\src\TexturePackFolder.java ---- minecraft\net\minecraft\src\TexturePackFolder.java Fri Mar 08 22:40:00 2013 -+++ minecraft_patched\net\minecraft\src\TexturePackFolder.java Fri Mar 08 22:41:28 2013 -@@ -35,4 +35,9 @@ - boolean var3 = this.func_98140_c("terrain.png") || this.func_98140_c("gui/items.png"); - return var2 || !var3; - } -+ -+ @Override -+ public boolean func_94179_g() { -+ return true; -+ } - } diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java --- minecraft\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 08 22:40:00 2013 +++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 08 22:41:28 2013 diff --git a/mc_versions.cfg b/mc_versions.cfg index aabc77d525..dbb965cc65 100644 --- a/mc_versions.cfg +++ b/mc_versions.cfg @@ -74,5 +74,5 @@ client_md5 = d39baadeeb124a29b2542d778713493f server_md5 = 22223b1d00b72cc51fdb8b7cdd45f9c1 mcp_ver = 7.42 mcp_url = http://mcp.ocean-labs.de/files/archive/mcp742.zip -mcp_md5 = 7124a50e282a7d706eb12807d26566ce +mcp_md5 = b8f1c8fd735439b9c94f0eb6f5499b09