backported extra srg lines

Author: AbrarSyed

src/main/java/net/minecraftforge/gradle/common/BaseExtension.java

@@ -1,5 +1,7 @@
 package net.minecraftforge.gradle.common;
 
+import java.util.LinkedList;
+
 import org.gradle.api.Project;
 
 public class BaseExtension
@@ -8,6 +10,7 @@ public class BaseExtension
     protected String version = "null";
     protected String mcpVersion = "unknown";
     protected String assetDir = "eclipse/assets";
+    private LinkedList<String> srgExtra = new LinkedList<String>();
 
     public BaseExtension(Project project)
     {
@@ -43,4 +46,14 @@ public String getAssetDir()
     {
         return this.assetDir;
     }
-}
+
+    public LinkedList<String> getSrgExtra()
+    {
+        return srgExtra;
+    }
+    
+    public void srgExtra(String in)
+    {
+        srgExtra.add(in);
+    }
+}

src/main/java/net/minecraftforge/gradle/dev/DevBasePlugin.java

@@ -30,6 +30,7 @@
 import net.minecraftforge.gradle.tasks.abstractutil.ExtractTask;
 import net.minecraftforge.gradle.tasks.dev.CompressLZMA;
 import net.minecraftforge.gradle.tasks.dev.MergeMappingsTask;
+import net.minecraftforge.gradle.tasks.dev.ObfuscateTask;
 
 import org.apache.shiro.util.AntPathMatcher;
 import org.gradle.api.Action;
@@ -221,6 +222,16 @@ public void afterEvaluate()
 
         configureLaunch4J();
 
+        // set obfuscate extras
+        Task t = project.getTasks().getByName("obfuscateJar");
+        if (t != null)
+        {
+            ObfuscateTask obf = ((ObfuscateTask)t);
+            obf.setExtraSrg(getExtension().getSrgExtra());
+            obf.configureProject(getExtension().getSubprojects());
+            obf.configureProject(getExtension().getDirtyProject());
+        }
+        
         try
         {
             Copy copyTask = makeTask("extractNatives", Copy.class);

src/main/java/net/minecraftforge/gradle/tasks/dev/ObfuscateTask.java

@@ -1,13 +1,16 @@
 package net.minecraftforge.gradle.tasks.dev;
 
+import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileNotFoundException;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.LinkedList;
 
 import net.md_5.specialsource.Jar;
 import net.md_5.specialsource.JarMapping;
@@ -18,6 +21,7 @@
 import net.minecraftforge.gradle.delayed.DelayedFile;
 import net.minecraftforge.gradle.dev.FmlDevPlugin;
 
+import org.gradle.api.Action;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileCollection;
@@ -33,21 +37,44 @@ public class ObfuscateTask extends DefaultTask
     private DelayedFile srg;
     private boolean     reverse;
     private DelayedFile buildFile;
+    private LinkedList<Action<Project>> configureProject = new LinkedList<Action<Project>>();
+    private LinkedList<String> extraSrg = new LinkedList<String>();
 
     @TaskAction
     public void doTask() throws IOException
     {
         getLogger().debug("Building child project model...");
         Project childProj = FmlDevPlugin.getProject(getBuildFile(), getProject());
+        for (Action<Project> act : configureProject)
+        {
+            if (act != null)
+                act.execute(childProj);
+        }
+        
         AbstractTask compileTask = (AbstractTask) childProj.getTasks().getByName("compileJava");
         AbstractTask jarTask = (AbstractTask) childProj.getTasks().getByName("jar");
 
         // executing jar task
         getLogger().debug("Executing child Jar task...");
         executeTask(jarTask);
+        
+        // copy srg
+        File tempSrg = File.createTempFile("obf", ".srg", this.getTemporaryDir());
+        Files.copy(getSrg(), tempSrg);
+        
+        // append SRG
+        BufferedWriter writer = new BufferedWriter(new FileWriter(tempSrg, true));
+        for (String line : extraSrg)
+        {
+            writer.write(line);
+            writer.newLine();
+        }
+        writer.flush();
+        writer.close();
+        
 
         getLogger().debug("Obfuscating jar...");
-        obfuscate((File)jarTask.property("archivePath"), (FileCollection)compileTask.property("classpath"));
+        obfuscate((File)jarTask.property("archivePath"),tempSrg,  (FileCollection)compileTask.property("classpath"));
     }
 
     private void executeTask(AbstractTask task)
@@ -64,11 +91,11 @@ private void executeTask(AbstractTask task)
         }
     }
 
-    private void obfuscate(File inJar, FileCollection classpath) throws FileNotFoundException, IOException
+    private void obfuscate(File inJar, File srg, FileCollection classpath) throws FileNotFoundException, IOException
     {
         // load mapping
         JarMapping mapping = new JarMapping();
-        mapping.loadMappings(Files.newReader(getSrg(), Charset.defaultCharset()), null, null, reverse);
+        mapping.loadMappings(Files.newReader(srg, Charset.defaultCharset()), null, null, reverse);
 
         // make remapper
         JarRemapper remapper = new JarRemapper(null, mapping);
@@ -144,6 +171,21 @@ public void setReverse(boolean reverse)
     {
         this.reverse = reverse;
     }
+    
+    public void configureProject(Action<Project> action)
+    {
+        configureProject.add(action);
+    }
+    
+    public LinkedList<String> getExtraSrg()
+    {
+        return extraSrg;
+    }
+
+    public void setExtraSrg(LinkedList<String> extraSrg)
+    {
+        this.extraSrg = extraSrg;
+    }
 
     public File getBuildFile()
     {