fixed @killjoys broken stuff.. and reobf

AbrarSyed · AbrarSyed · commit 8dd9745f8786 · 2015-10-26T23:24:38.000-05:00
diff --git a/src/main/java/net/minecraftforge/gradle/user/IReobfuscator.java b/src/main/java/net/minecraftforge/gradle/user/IReobfuscator.java
@@ -20,7 +20,6 @@
 package net.minecraftforge.gradle.user;
 
 import java.io.File;
-import java.util.Collection;
 import java.util.List;
 
 import org.gradle.api.file.FileCollection;
@@ -31,7 +30,6 @@
  */
 public interface IReobfuscator
 {
-
     /**
      * Gets the mappings file used to reobfuscate. It should be either a
      * {@link File} or a String path for a DelayedFile.
@@ -66,36 +64,58 @@ public interface IReobfuscator
 
     /**
      * Gets the extra srg lines and files. Modders should prefer to use
-     * {@link #extra(Object...)} or {@code extra += []} instead of setting the
+     * {@link #extraLines(Object...)} or {@code extra += []} instead of setting the
+     * list manually.
+     * 
+     * @return The extra srg lines
+     */
+    List<Object> getExtraLines();
+
+    /**
+     * Sets the extra lines. Modders should prefer to use
+     * {@link #extraLines(Object...)} instead of setting the
      * list manually.
      * 
-     * @return The extra srg files or lines
+     * @param extra The list of srg lines
      */
-    List<Object> getExtra();
+    void setExtraLines(List<Object> extra);
 
     /**
-     * Sets the extra lines and files. Modders should prefer to use
-     * {@link #extra(Object...)} or {@code extra += []} instead of setting the
+     * Adds some additional srg lines for reobfuscating. These are resolved to strings.
+     * 
+     * @param o The array to add
+     */
+    void extraLines(Object... o);
+
+    /**
+     * Adds a collection of additional srg lines for reobfuscating.
+     * 
+     * @param o The collection to add
+     */
+    void extraLines(Iterable<Object> o);
+    
+    /**
+     * Gets the extra srg  files. Modders should prefer to use
+     * {@link #extraFiles(Object...)} instead of setting the
      * list manually.
      * 
-     * @param extra The list of srgs
+     * @return The extra srg files
      */
-    void setExtra(List<Object> extra);
+    List<Object> getExtraFiles();
 
     /**
-     * Adds some additional srg files or lines for reobfuscating. Should be a
-     * file or string path
+     * Adds some additional srg files for reobfuscating. These are resolved to files with {@link org.gradle.api.Project#file(Object)} 
      * 
      * @param o The array to add
      */
-    void extra(Object... o);
+    void extraFiles(Object... o);
 
     /**
-     * Adds a collection of additional srg files or lines for reobfuscating.
+     * Adds a collection of additional srg files for reobfuscating.
      * 
      * @param o The collection to add
      */
-    void extra(Collection<Object> o);
+    void extraFiles(Iterable<Object> o);
 
     /**
      * Sets the mappings to use Searge names. This is the default with the Forge
diff --git a/src/main/java/net/minecraftforge/gradle/user/ReobfTaskFactory.java b/src/main/java/net/minecraftforge/gradle/user/ReobfTaskFactory.java
@@ -19,10 +19,7 @@
  */
 package net.minecraftforge.gradle.user;
 
-import static net.minecraftforge.gradle.common.Constants.TASK_GENERATE_SRGS;
-
 import java.io.File;
-import java.util.Collection;
 import java.util.List;
 
 import org.gradle.api.Action;
@@ -32,7 +29,10 @@
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.tasks.bundling.Jar;
 
+import com.google.common.collect.Lists;
+
 import groovy.lang.Closure;
+import net.minecraftforge.gradle.common.Constants;
 import net.minecraftforge.gradle.util.GradleConfigurationException;
 
 public class ReobfTaskFactory implements NamedDomainObjectFactory<IReobfuscator>
@@ -51,7 +51,7 @@ public IReobfuscator create(final String jarName)
         String name = "reobf" + Character.toUpperCase(jarName.charAt(0)) + jarName.substring(1);
         final TaskSingleReobf task = plugin.maybeMakeTask(name, TaskSingleReobf.class);
 
-        task.dependsOn(TASK_GENERATE_SRGS, jarName);
+        task.dependsOn(Constants.TASK_GENERATE_SRGS, jarName);
         task.mustRunAfter("test");
         
         task.setJar(new Closure<File>(null) {
@@ -84,9 +84,9 @@ public void execute(Project arg0)
     class TaskWrapper implements IReobfuscator
     {
         private final String name;
-        private final IReobfuscator reobf;
+        private final TaskSingleReobf reobf;
 
-        public TaskWrapper(String name, IReobfuscator reobf)
+        public TaskWrapper(String name, TaskSingleReobf reobf)
         {
             this.name = name;
             this.reobf = reobf;
@@ -103,7 +103,7 @@ public String getName()
          *
          * @return The task
          */
-        public IReobfuscator getTask()
+        public TaskSingleReobf getTask()
         {
             return reobf;
         }
@@ -118,14 +118,14 @@ public boolean equals(Object obj)
             return false;
         }
 
-        public Object getMappings()
+        public File getMappings()
         {
-            return reobf.getMappings();
+            return reobf.getPrimarySrg();
         }
 
         public void setMappings(Object srg)
         {
-            reobf.setMappings(srg);
+            reobf.setPrimarySrg(srg);
         }
 
         public void setClasspath(FileCollection classpath)
@@ -137,35 +137,74 @@ public FileCollection getClasspath()
         {
             return reobf.getClasspath();
         }
+        
+        @Override
+        public void setExtraLines(List<Object> extra)
+        {
+            reobf.getExtraSrgLines().clear();
+            extraLines(extra);
+        }
 
-        public List<Object> getExtra()
+        @Override
+        public List<Object> getExtraLines()
         {
-            return reobf.getExtra();
+            List<Object> list = Lists.newArrayList();
+            list.addAll(reobf.getExtraSrgLines());
+            return list;
+        }
+
+        @Override
+        public void extraLines(Iterable<Object> o)
+        {
+            for (Object obj : o)
+            {
+                reobf.addExtraSrgLine(Constants.resolveString(obj));
+            }
         }
 
-        public void setExtra(List<Object> extra)
+        @Override
+        public void extraLines(Object... o)
         {
-            reobf.setExtra(extra);
+            for (Object obj : o)
+            {
+                reobf.addExtraSrgLine(Constants.resolveString(obj));
+            }
         }
 
-        public void extra(Object... o)
+        @Override
+        public List<Object> getExtraFiles()
         {
-            reobf.extra(o);
+            List<Object> list = Lists.newArrayList();
+            list.addAll(reobf.getSecondarySrgFiles().getFiles());
+            return list;
         }
 
-        public void extra(Collection<Object> o)
+        @Override
+        public void extraFiles(Iterable<Object> o)
         {
-            reobf.extra(o);
+            for (Object obj : o)
+            {
+                reobf.addSecondarySrgFile(obj);
+            }
         }
 
+        @Override
+        public void extraFiles(Object... o)
+        {
+            for (Object obj : o)
+            {
+                reobf.addSecondarySrgFile(obj);
+            }
+        }
+        
         public void useSrgSrg()
         {
-            reobf.useSrgSrg();
+            reobf.setPrimarySrg(Constants.SRG_MCP_TO_SRG);
         }
 
         public void useNotchSrg()
         {
-            reobf.useNotchSrg();
+            reobf.setPrimarySrg(Constants.SRG_MCP_TO_NOTCH);
         }
     }
 }
diff --git a/src/main/java/net/minecraftforge/gradle/user/TaskSingleReobf.java b/src/main/java/net/minecraftforge/gradle/user/TaskSingleReobf.java
@@ -45,7 +45,6 @@
 import com.google.common.io.Files;
 
 import groovy.lang.Closure;
-import groovy.lang.GString;
 import net.md_5.specialsource.Jar;
 import net.md_5.specialsource.JarMapping;
 import net.md_5.specialsource.JarRemapper;
@@ -54,7 +53,6 @@
 import net.md_5.specialsource.provider.JointProvider;
 import net.minecraftforge.gradle.common.Constants;
 import net.minecraftforge.gradle.util.GradleConfigurationException;
-import net.minecraftforge.gradle.util.delayed.DelayedFile;
 import net.minecraftforge.gradle.util.mcp.ReobfExceptor;
 
 /**
@@ -97,9 +95,8 @@
  *
  */
 @ParallelizableTask
-public class TaskSingleReobf extends DefaultTask implements IReobfuscator
+public class TaskSingleReobf extends DefaultTask
 {
-
     private Object                 jar;
     private FileCollection         classpath;
 
@@ -192,7 +189,7 @@ public void doTask() throws IOException
         // obfuscate
         File obfuscated = File.createTempFile("obfuscated", ".jar", getTemporaryDir());
         obfuscated.deleteOnExit();
-        applySpecialSource(tempIn, obfuscated, srg, srgLines, getExtraSrgFiles());
+        applySpecialSource(tempIn, obfuscated, srg, srgLines, getSecondarySrgFiles());
 
         // post transform
         transformers = getPostTransformers();
@@ -308,71 +305,6 @@ public File getPrimarySrg()
         return getProject().file(primarySrg);
     }
 
-    @Override
-    public void setMappings(Object srg)
-    {
-        setPrimarySrg(srg);
-    }
-
-    @Override
-    public Object getMappings()
-    {
-        return getPrimarySrg();
-    }
-
-    public void useSrgSrg()
-    {
-        setMappings(Constants.SRG_MCP_TO_SRG);
-    }
-
-    public void useNotchSrg()
-    {
-        setMappings(Constants.SRG_MCP_TO_NOTCH);
-    }
-
-    @Override
-    public void setExtra(List<Object> extra)
-    {
-        secondarySrgFiles.clear();
-        extraSrgLines.clear();
-        extra(extra);
-    }
-
-    @Override
-    public List<Object> getExtra()
-    {
-        List<Object> list = Lists.newArrayList();
-        list.addAll(secondarySrgFiles);
-        list.addAll(extraSrgLines);
-        return list;
-    }
-
-    @Override
-    public void extra(Collection<Object> o)
-    {
-        for (Object obj : o)
-        {
-            if (obj instanceof String || obj instanceof GString)
-            {
-                addExtraSrgLine(obj.toString());
-            }
-            else if (obj instanceof File || obj instanceof DelayedFile)
-            {
-                addSecondarySrgFile(obj);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Extra srgs must be a file or string. Found " + o.getClass());
-            }
-        }
-    }
-
-    @Override
-    public void extra(Object... o)
-    {
-        extra(Lists.newArrayList(o));
-    }
-
     public void setPrimarySrg(Object srg)
     {
         this.primarySrg = srg;
@@ -383,7 +315,7 @@ public void addSecondarySrgFile(Object thing)
         secondarySrgFiles.add(thing);
     }
 
-    public FileCollection getExtraSrgFiles()
+    public FileCollection getSecondarySrgFiles()
     {
         List<File> files = new ArrayList<File>(secondarySrgFiles.size());
 
diff --git a/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java b/src/main/java/net/minecraftforge/gradle/user/UserBasePlugin.java
@@ -283,7 +283,7 @@ protected void setupReobf(TaskSingleReobf reobf)
         reobf.setFieldCsv(delayedFile(CSV_FIELD));
         reobf.setMethodCsv(delayedFile(CSV_METHOD));
 
-        reobf.useNotchSrg();
+        reobf.setPrimarySrg(delayedFile(SRG_MCP_TO_NOTCH));
         JavaPluginConvention java = (JavaPluginConvention) project.getConvention().getPlugins().get("java");
         reobf.setClasspath(java.getSourceSets().getByName("main").getCompileClasspath());
     }
diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java
@@ -20,6 +20,7 @@
 package net.minecraftforge.gradle.user.patcherUser.forge;
 
 import static net.minecraftforge.gradle.common.Constants.REPLACE_MC_VERSION;
+import static net.minecraftforge.gradle.common.Constants.SRG_MCP_TO_SRG;
 import static net.minecraftforge.gradle.user.UserConstants.TASK_REOBF;
 
 import java.io.File;
@@ -121,7 +122,7 @@ public void execute(Object arg0)
     protected void setupReobf(TaskSingleReobf reobf)
     {
         super.setupReobf(reobf);
-        reobf.useSrgSrg();
+        reobf.setPrimarySrg(delayedFile(SRG_MCP_TO_SRG));
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,7 @@`
`19`	`19`	`*/`
`20`	`20`	`package net.minecraftforge.gradle.user;`
`21`	`21`
`22`		`-import static net.minecraftforge.gradle.common.Constants.TASK_GENERATE_SRGS;`
`23`		`-`
`24`	`22`	`import java.io.File;`
`25`		`-import java.util.Collection;`
`26`	`23`	`import java.util.List;`
`27`	`24`
`28`	`25`	`import org.gradle.api.Action;`
`@@ -32,7 +29,10 @@`
`32`	`29`	`import org.gradle.api.file.FileCollection;`
`33`	`30`	`import org.gradle.api.tasks.bundling.Jar;`
`34`	`31`
	`32`	`+import com.google.common.collect.Lists;`
	`33`	`+`
`35`	`34`	`import groovy.lang.Closure;`
	`35`	`+import net.minecraftforge.gradle.common.Constants;`
`36`	`36`	`import net.minecraftforge.gradle.util.GradleConfigurationException;`
`37`	`37`
`38`	`38`	`public class ReobfTaskFactory implements NamedDomainObjectFactory<IReobfuscator>`
`@@ -51,7 +51,7 @@ public IReobfuscator create(final String jarName)`
`51`	`51`	`String name = "reobf" + Character.toUpperCase(jarName.charAt(0)) + jarName.substring(1);`
`52`	`52`	`final TaskSingleReobf task = plugin.maybeMakeTask(name, TaskSingleReobf.class);`
`53`	`53`
`54`		`- task.dependsOn(TASK_GENERATE_SRGS, jarName);`
	`54`	`+ task.dependsOn(Constants.TASK_GENERATE_SRGS, jarName);`
`55`	`55`	`task.mustRunAfter("test");`
`56`	`56`
`57`	`57`	`task.setJar(new Closure<File>(null) {`
`@@ -84,9 +84,9 @@ public void execute(Project arg0)`
`84`	`84`	`class TaskWrapper implements IReobfuscator`
`85`	`85`	`{`
`86`	`86`	`private final String name;`
`87`		`- private final IReobfuscator reobf;`
	`87`	`+ private final TaskSingleReobf reobf;`
`88`	`88`
`89`		`- public TaskWrapper(String name, IReobfuscator reobf)`
	`89`	`+ public TaskWrapper(String name, TaskSingleReobf reobf)`
`90`	`90`	`{`
`91`	`91`	`this.name = name;`
`92`	`92`	`this.reobf = reobf;`
`@@ -103,7 +103,7 @@ public String getName()`
`103`	`103`	`*`
`104`	`104`	`* @return The task`
`105`	`105`	`*/`
`106`		`- public IReobfuscator getTask()`
	`106`	`+ public TaskSingleReobf getTask()`
`107`	`107`	`{`
`108`	`108`	`return reobf;`
`109`	`109`	`}`
`@@ -118,14 +118,14 @@ public boolean equals(Object obj)`
`118`	`118`	`return false;`
`119`	`119`	`}`
`120`	`120`
`121`		`- public Object getMappings()`
	`121`	`+ public File getMappings()`
`122`	`122`	`{`
`123`		`- return reobf.getMappings();`
	`123`	`+ return reobf.getPrimarySrg();`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`public void setMappings(Object srg)`
`127`	`127`	`{`
`128`		`- reobf.setMappings(srg);`
	`128`	`+ reobf.setPrimarySrg(srg);`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`public void setClasspath(FileCollection classpath)`
`@@ -137,35 +137,74 @@ public FileCollection getClasspath()`
`137`	`137`	`{`
`138`	`138`	`return reobf.getClasspath();`
`139`	`139`	`}`
	`140`	`+`
	`141`	`+ @Override`
	`142`	`+ public void setExtraLines(List<Object> extra)`
	`143`	`+ {`
	`144`	`+ reobf.getExtraSrgLines().clear();`
	`145`	`+ extraLines(extra);`
	`146`	`+ }`
`140`	`147`
`141`		`- public List<Object> getExtra()`
	`148`	`+ @Override`
	`149`	`+ public List<Object> getExtraLines()`
`142`	`150`	`{`
`143`		`- return reobf.getExtra();`
	`151`	`+ List<Object> list = Lists.newArrayList();`
	`152`	`+ list.addAll(reobf.getExtraSrgLines());`
	`153`	`+ return list;`
	`154`	`+ }`
	`155`	`+`
	`156`	`+ @Override`
	`157`	`+ public void extraLines(Iterable<Object> o)`
	`158`	`+ {`
	`159`	`+ for (Object obj : o)`
	`160`	`+ {`
	`161`	`+ reobf.addExtraSrgLine(Constants.resolveString(obj));`
	`162`	`+ }`
`144`	`163`	`}`
`145`	`164`
`146`		`- public void setExtra(List<Object> extra)`
	`165`	`+ @Override`
	`166`	`+ public void extraLines(Object... o)`
`147`	`167`	`{`
`148`		`- reobf.setExtra(extra);`
	`168`	`+ for (Object obj : o)`
	`169`	`+ {`
	`170`	`+ reobf.addExtraSrgLine(Constants.resolveString(obj));`
	`171`	`+ }`
`149`	`172`	`}`
`150`	`173`
`151`		`- public void extra(Object... o)`
	`174`	`+ @Override`
	`175`	`+ public List<Object> getExtraFiles()`
`152`	`176`	`{`
`153`		`- reobf.extra(o);`
	`177`	`+ List<Object> list = Lists.newArrayList();`
	`178`	`+ list.addAll(reobf.getSecondarySrgFiles().getFiles());`
	`179`	`+ return list;`
`154`	`180`	`}`
`155`	`181`
`156`		`- public void extra(Collection<Object> o)`
	`182`	`+ @Override`
	`183`	`+ public void extraFiles(Iterable<Object> o)`
`157`	`184`	`{`
`158`		`- reobf.extra(o);`
	`185`	`+ for (Object obj : o)`
	`186`	`+ {`
	`187`	`+ reobf.addSecondarySrgFile(obj);`
	`188`	`+ }`
`159`	`189`	`}`
`160`	`190`
	`191`	`+ @Override`
	`192`	`+ public void extraFiles(Object... o)`
	`193`	`+ {`
	`194`	`+ for (Object obj : o)`
	`195`	`+ {`
	`196`	`+ reobf.addSecondarySrgFile(obj);`
	`197`	`+ }`
	`198`	`+ }`
	`199`	`+`
`161`	`200`	`public void useSrgSrg()`
`162`	`201`	`{`
`163`		`- reobf.useSrgSrg();`
	`202`	`+ reobf.setPrimarySrg(Constants.SRG_MCP_TO_SRG);`
`164`	`203`	`}`
`165`	`204`
`166`	`205`	`public void useNotchSrg()`
`167`	`206`	`{`
`168`		`- reobf.useNotchSrg();`
	`207`	`+ reobf.setPrimarySrg(Constants.SRG_MCP_TO_NOTCH);`
`169`	`208`	`}`
`170`	`209`	`}`
`171`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ protected void setupReobf(TaskSingleReobf reobf)`
`283`	`283`	`reobf.setFieldCsv(delayedFile(CSV_FIELD));`
`284`	`284`	`reobf.setMethodCsv(delayedFile(CSV_METHOD));`
`285`	`285`
`286`		`- reobf.useNotchSrg();`
	`286`	`+ reobf.setPrimarySrg(delayedFile(SRG_MCP_TO_NOTCH));`
`287`	`287`	`JavaPluginConvention java = (JavaPluginConvention) project.getConvention().getPlugins().get("java");`
`288`	`288`	`reobf.setClasspath(java.getSourceSets().getByName("main").getCompileClasspath());`
`289`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`package net.minecraftforge.gradle.user.patcherUser.forge;`
`21`	`21`
`22`	`22`	`import static net.minecraftforge.gradle.common.Constants.REPLACE_MC_VERSION;`
	`23`	`+import static net.minecraftforge.gradle.common.Constants.SRG_MCP_TO_SRG;`
`23`	`24`	`import static net.minecraftforge.gradle.user.UserConstants.TASK_REOBF;`
`24`	`25`
`25`	`26`	`import java.io.File;`
`@@ -121,7 +122,7 @@ public void execute(Object arg0)`
`121`	`122`	`protected void setupReobf(TaskSingleReobf reobf)`
`122`	`123`	`{`
`123`	`124`	`super.setupReobf(reobf);`
`124`		`- reobf.useSrgSrg();`
	`125`	`+ reobf.setPrimarySrg(delayedFile(SRG_MCP_TO_SRG));`
`125`	`126`	`}`
`126`	`127`
`127`	`128`	`@Override`