Add support for extraParams.txt format

Author: JoJoDeveloping

src/patcher/java/net/minecraftforge/gradle/patcher/PatcherPlugin.java

@@ -342,12 +342,12 @@ public void apply(@Nonnull Project project) {
                         createExc.get().dependsOn(ext);
                     }
 
-                    if (createExc.get().getConstructors() == null) {
-                        TaskProvider<ExtractMCPData> ext = project.getTasks().register("extractConstructors", ExtractMCPData.class);
+                    if (createExc.get().getExtraParameters() == null) {
+                        TaskProvider<ExtractMCPData> ext = project.getTasks().register("extractExtraParams", ExtractMCPData.class);
                         ext.get().setConfig(mcpConfig);
-                        ext.get().setKey("constructors");
+                        ext.get().setKey("extraParams");
                         ext.get().setOutput(project.file("build/" + ext.get().getName() + "/output.txt"));
-                        createExc.get().setConstructors(ext.get().getOutput());
+                        createExc.get().setExtraParameters(ext.get().getOutput());
                         createExc.get().dependsOn(ext);
                     }
                 } else if (patcher != null) {
@@ -388,7 +388,7 @@ public void apply(@Nonnull Project project) {
                         createMcp2Obf.get().dependsOn(createMcp2Srg.get());
                     }
 
-                    if (createExc.get().getSrg() == null) { //TODO: Make a macro for Srg/Static/Constructors
+                    if (createExc.get().getSrg() == null) { //TODO: Make a macro for Srg/Static/ExtraParams
                         ExtractMCPData extract = ((ExtractMCPData) tasks.getByName("extractSrg"));
                         if (extract != null) {
                             createExc.get().setSrg(extract.getOutput());
@@ -410,14 +410,14 @@ public void apply(@Nonnull Project project) {
                             createExc.get().dependsOn(task);
                         }
                     }
-                    if (createExc.get().getConstructors() == null) {
-                        ExtractMCPData extract = ((ExtractMCPData) tasks.getByName("extractConstructors"));
+                    if (createExc.get().getExtraParameters() == null) {
+                        ExtractMCPData extract = ((ExtractMCPData) tasks.getByName("extractExtraParams"));
                         if (extract != null) {
-                            createExc.get().setConstructors(extract.getOutput());
+                            createExc.get().setExtraParameters(extract.getOutput());
                             createExc.get().dependsOn(extract);
                         } else {
                             TaskCreateExc task = (TaskCreateExc) tasks.getByName(createExc.get().getName());
-                            createExc.get().setConstructors(task.getConstructors());
+                            createExc.get().setExtraParameters(task.getExtraParameters());
                             createExc.get().dependsOn(task);
                         }
                     }

src/patcher/java/net/minecraftforge/gradle/patcher/task/TaskCreateExc.java

@@ -54,7 +54,7 @@ public class TaskCreateExc extends DefaultTask {
 
     private File srg;
     private File statics;
-    private File constructors;
+    private File extraParams;
     private File mappings;
     private File output = getProject().file("build/" + getName() + "/output.exc");
 
@@ -100,8 +100,11 @@ public void run() throws IOException {
             }
         }
 
-        Files.readLines(getConstructors(), StandardCharsets.UTF_8).stream().map(l -> l.split(" ")).forEach(pts -> {
-            out.add(pts[1] + ".<init>" + pts[2] + "=|" + String.join(",", buildArgs(pts[0], pts[2], false)));
+        Files.readLines(getExtraParameters(), StandardCharsets.UTF_8).stream().map(l -> l.split(" ")).forEach(pts -> {
+            if(pts.length == 3) //legacy constructors.txt format
+                out.add(pts[1] + ".<init>" + pts[2] + "=|" + String.join(",", buildArgs("i" + pts[0], pts[2], false)));
+            else if(pts.length == 4) //extraParams.txt format
+                out.add(pts[1] + "." + pts[2] + pts[3] + "=|" + String.join(",", buildArgs(pts[0], pts[3], pts[0].charAt(0) == 's')));
         });
 
         try (FileOutputStream fos = new FileOutputStream(getOutput())) {
@@ -110,7 +113,7 @@ public void run() throws IOException {
     }
 
     private List<String> buildArgs(String name, String desc, boolean isStatic) {
-        String prefix = "p_i" + name + "_";
+        String prefix = "p_" + name + "_";
         if (name.startsWith("func_")) {
             prefix = "p_" + name.split("_")[1] + "_";
         }
@@ -198,11 +201,11 @@ public void setStatics(File value) {
         this.statics = value;
     }
     @InputFile
-    public File getConstructors() {
-        return this.constructors;
+    public File getExtraParameters() {
+        return this.extraParams;
     }
-    public void setConstructors(File value) {
-        this.constructors = value;
+    public void setExtraParameters(File value) {
+        this.extraParams = value;
     }
     @InputFile
     public File getMappings() {