From 3a2d167885c8403b7d22384d5d225726683894cc Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Sat, 2 Mar 2013 10:46:32 -0500
Subject: [PATCH] Fix up runtime deobfuscation. Working well now.

---
 fml/build.xml                                     |  2 +-
 .../deobf/FMLDeobfuscatingRemapper.java           |  8 ++++----
 .../fml/relauncher/RelaunchLibraryManager.java    | 15 ++++++++++-----
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/fml/build.xml b/fml/build.xml
index e08af069d..6356f3ebb 100644
--- a/fml/build.xml
+++ b/fml/build.xml
@@ -215,7 +215,7 @@
     <antcall target="writeversion"/>
   </target>
 
-  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-universal,build-source-pack,build-deobf-data" />
+  <target name="build" depends="buildenvsetup,merge-client,merge-common,build-deobf-data,build-universal,build-source-pack" />
 
   <target name="jenkinsbuild" depends="buildenvsetup,jenkinsfmldecompile,patch,build"/>
 
diff --git a/fml/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java b/fml/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
index 710787679..3bbfa9491 100644
--- a/fml/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
+++ b/fml/common/cpw/mods/fml/common/asm/transformers/deobf/FMLDeobfuscatingRemapper.java
@@ -144,7 +144,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
     @Override
     public String mapFieldName(String owner, String name, String desc)
     {
-        if (classNameBiMap == null)
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
         {
             return name;
         }
@@ -155,7 +155,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
     @Override
     public String map(String typeName)
     {
-        if (classNameBiMap == null)
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
         {
             return typeName;
         }
@@ -177,7 +177,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
     @Override
     public String mapMethodName(String owner, String name, String desc)
     {
-        if (classNameBiMap==null)
+        if (classNameBiMap==null || classNameBiMap.isEmpty())
         {
             return name;
         }
@@ -229,7 +229,7 @@ public class FMLDeobfuscatingRemapper extends Remapper {
     }
     public void mergeSuperMaps(String name, String superName, String[] interfaces)
     {
-        if (classNameBiMap == null)
+        if (classNameBiMap == null || classNameBiMap.isEmpty())
         {
             return;
         }
diff --git a/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java b/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
index e95e79e21..6f3bb7a15 100644
--- a/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
+++ b/fml/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java
@@ -42,16 +42,21 @@ public class RelaunchLibraryManager
         try
         {
             // Are we in a 'decompiled' environment?
-            actualClassLoader.getClassBytes("net.minecraft.world.World");
-            FMLRelaunchLog.info("Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation");
-            deobfuscatedEnvironment = true;
+            byte[] bs = actualClassLoader.getClassBytes("net.minecraft.world.World");
+            if (bs != null)
+            {
+                FMLRelaunchLog.info("Managed to load a deobfuscated Minecraft name- we are in a deobfuscated environment. Skipping runtime deobfuscation");
+                deobfuscatedEnvironment = true;
+            }
         }
         catch (IOException e1)
         {
-            FMLRelaunchLog.fine("Enabling runtime deobfuscation");
-            deobfuscatedEnvironment = false;
         }
 
+        if (!deobfuscatedEnvironment)
+        {
+            FMLRelaunchLog.fine("Enabling runtime deobfuscation");
+        }
         pluginLocations = new HashMap<IFMLLoadingPlugin, File>();
         loadPlugins = new ArrayList<IFMLLoadingPlugin>();
         libraries = new ArrayList<ILibrarySet>();