fixed retroguard reobfuscation

Author: AbrarSyed

src/main/java/net/minecraftforge/gradle/tasks/user/reobf/ObfArtifact.java

@@ -14,6 +14,7 @@
 import net.md_5.specialsource.provider.ClassLoaderProvider;
 import net.md_5.specialsource.provider.JarProvider;
 import net.md_5.specialsource.provider.JointProvider;
+import net.minecraftforge.gradle.common.BasePlugin;
 import net.minecraftforge.gradle.common.Constants;
 import net.minecraftforge.gradle.delayed.DelayedFile;
 import net.minecraftforge.gradle.delayed.DelayedThingy;
@@ -27,8 +28,6 @@
 import org.gradle.api.internal.artifacts.publish.AbstractPublishArtifact;
 import org.gradle.api.tasks.bundling.AbstractArchiveTask;
 
-import COM.rl.NameProvider;
-
 import com.google.common.base.Joiner;
 import com.google.common.io.Files;
 
@@ -306,7 +305,7 @@ public void setClasspath(FileCollection classpath)
      * @throws IOException
      * @throws org.gradle.api.InvalidUserDataException if the there is insufficient information available to generate the signature.
      */
-    void generate() throws IOException
+    void generate() throws Exception
     {
         File toObf = getToObf();
         if (toObf == null)
@@ -350,31 +349,45 @@ private void applySpecialSource(File input, File output, File srg) throws IOExce
         remapper.remapJar(inputJar, output);
     }
 
-    private void applyRetroGuard(File input, File output, File srg) throws IOException
+    @SuppressWarnings({ "rawtypes", "unchecked", "static-access" })
+    private void applyRetroGuard(File input, File output, File srg) throws Exception
     {
-        File cfg = new File(caller.getTemporaryDir(), "retroguard.cfg");
-        generateRgConfig(cfg, input, output, srg);
+        File cfg =    new File(caller.getTemporaryDir(), "retroguard.cfg");
+        File log =    new File(caller.getTemporaryDir(), "retroguard.log");
+        File script = new File(caller.getTemporaryDir(), "retroguard.script");
+        
+        generateRgConfig(cfg, script, srg);
 
         String[] args = new String[] {
                 "-notch",
                 cfg.getCanonicalPath()
         };
 
-        NameProvider.parseCommandLine(args);
+        // load in classpath... ewww
+        ClassLoader loader = BasePlugin.class.getClassLoader(); // dunno.. maybe this will load the classes??
+        if (classpath != null)
+        {
+            loader = new URLClassLoader(ObfuscateTask.toUrls(classpath), BasePlugin.class.getClassLoader());
+        }
+        
+        // the name provider
+        Class clazz = getClass().forName("COM.rl.NameProvider", true, loader);
+        clazz.getMethod("parseCommandLine", String[].class).invoke(null, new Object[] { args });
+        
+        // actual retroguard
+        clazz = getClass().forName("COM.rl.obf.RetroGuardImpl", true, loader);
+        clazz.getMethod("obfuscate", File.class, File.class, File.class, File.class).invoke(null, input, output, script, log);
+        
+        loader = null; // if we are lucky.. this will be dropped...
+        System.gc(); // clean anything out.. I hope..
     }
 
-    private void generateRgConfig(File config, File in, File out, File srg) throws IOException
+    private void generateRgConfig(File config, File script, File srg) throws IOException
     {
-        String log = new File(caller.getTemporaryDir(), "retroguard.log").getCanonicalPath();
-        File script = new File(caller.getTemporaryDir(), "retroguard.script");
-        
         // the config
         String[] lines = new String[] {
-                "reobinput = "+in.getCanonicalPath(),
-                "reoboutput = "+out.getCanonicalPath(),
                 "reobf = "+srg.getCanonicalPath(),
                 "script = "+script.getCanonicalPath(),
-                "log = "+log,
                 "verbose = 0",
                 "quiet = 1",
                 "fullmap = 0",

src/main/java/net/minecraftforge/gradle/tasks/user/reobf/ReobfTask.java

@@ -216,10 +216,10 @@ public void execute(PublishArtifact artifact)
 
     /**
      * Generates the signature files.
-     * @throws IOException 
+     * @throws Exception 
      */
     @TaskAction
-    public void generate() throws IOException
+    public void generate() throws Exception
     {
         for (ObfArtifact obf : getObfuscated())
             obf.generate();