From 8f18a3de9a02b003762dace891829ef64dfedf49 Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Thu, 26 Sep 2013 09:23:25 -0400
Subject: [PATCH] Separate deobf tweaker so it runs last. Should fix problems
 with cascaded tweakers expecting an obf environment.

---
 .../fml/common/launcher/FMLDeobfTweaker.java  | 58 +++++++++++++++++++
 .../mods/fml/relauncher/CoreModManager.java   | 25 ++------
 2 files changed, 62 insertions(+), 21 deletions(-)
 create mode 100644 common/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java

diff --git a/common/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java b/common/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java
new file mode 100644
index 0000000000..16d56f1940
--- /dev/null
+++ b/common/cpw/mods/fml/common/launcher/FMLDeobfTweaker.java
@@ -0,0 +1,58 @@
+package cpw.mods.fml.common.launcher;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.List;
+
+import cpw.mods.fml.relauncher.FMLInjectionData;
+import cpw.mods.fml.relauncher.FMLRelaunchLog;
+
+import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+public class FMLDeobfTweaker implements ITweaker {
+    @Override
+    public void acceptOptions(List<String> args, File gameDir, File assetsDir, String profile)
+    {
+    }
+
+    @Override
+    public void injectIntoClassLoader(LaunchClassLoader classLoader)
+    {
+        // Deobfuscation transformer, always last
+        if (!(Boolean)Launch.blackboard.get("fml.deobfuscatedEnvironment"))
+        {
+            classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.DeobfuscationTransformer");
+        }
+        try
+        {
+            FMLRelaunchLog.fine("Validating minecraft");
+            Class<?> loaderClazz = Class.forName("cpw.mods.fml.common.Loader", true, classLoader);
+            Method m = loaderClazz.getMethod("injectData", Object[].class);
+            m.invoke(null, (Object)FMLInjectionData.data());
+            m = loaderClazz.getMethod("instance");
+            m.invoke(null);
+            FMLRelaunchLog.fine("Minecraft validated, launching...");
+        }
+        catch (Exception e)
+        {
+            // Load in the Loader, make sure he's ready to roll - this will initialize most of the rest of minecraft here
+            System.out.println("A CRITICAL PROBLEM OCCURED INITIALIZING MINECRAFT - LIKELY YOU HAVE AN INCORRECT VERSION FOR THIS FML");
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public String getLaunchTarget()
+    {
+        return null;
+    }
+
+    @Override
+    public String[] getLaunchArguments()
+    {
+        return null;
+    }
+
+}
diff --git a/common/cpw/mods/fml/relauncher/CoreModManager.java b/common/cpw/mods/fml/relauncher/CoreModManager.java
index c5e450cc1a..d11c32f818 100644
--- a/common/cpw/mods/fml/relauncher/CoreModManager.java
+++ b/common/cpw/mods/fml/relauncher/CoreModManager.java
@@ -29,6 +29,7 @@ import java.util.jar.JarFile;
 import java.util.logging.Level;
 
 import net.minecraft.launchwrapper.ITweaker;
+import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 
 import com.google.common.base.Strings;
@@ -448,26 +449,8 @@ public class CoreModManager
                 FMLInjectionData.containers.add(modContainer);
             }
         }
-        // Deobfuscation transformer, always last
-        if (!deobfuscatedEnvironment)
-        {
-            classLoader.registerTransformer("cpw.mods.fml.common.asm.transformers.DeobfuscationTransformer");
-        }
-        try
-        {
-            FMLRelaunchLog.fine("Validating minecraft");
-            Class<?> loaderClazz = Class.forName("cpw.mods.fml.common.Loader", true, classLoader);
-            Method m = loaderClazz.getMethod("injectData", Object[].class);
-            m.invoke(null, (Object)FMLInjectionData.data());
-            m = loaderClazz.getMethod("instance");
-            m.invoke(null);
-            FMLRelaunchLog.fine("Minecraft validated, launching...");
-        }
-        catch (Exception e)
-        {
-            // Load in the Loader, make sure he's ready to roll - this will initialize most of the rest of minecraft here
-            System.out.println("A CRITICAL PROBLEM OCCURED INITIALIZING MINECRAFT - LIKELY YOU HAVE AN INCORRECT VERSION FOR THIS FML");
-            throw new RuntimeException(e);
-        }
+
+        Launch.blackboard.put("fml.deobfuscatedEnvironment", deobfuscatedEnvironment);
+        tweaker.injectCascadingTweak("cpw.mods.fml.launcher.FMLDeobfTweaker");
     }
 }