Support special case in mcp renaming

Author: LexManos

src/common/java/net/minecraftforge/gradle/common/task/TaskApplyMappings.java

@@ -23,14 +23,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
@@ -40,39 +33,17 @@
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
 
-import de.siegmar.fastcsv.reader.CsvContainer;
-import de.siegmar.fastcsv.reader.CsvReader;
-import de.siegmar.fastcsv.reader.CsvRow;
+import net.minecraftforge.gradle.common.util.McpNames;
 import net.minecraftforge.gradle.common.util.Utils;
 
 public class TaskApplyMappings extends DefaultTask {
-    private static final Pattern SRG = Pattern.compile("func_[0-9]+_[a-zA-Z_]+|field_[0-9]+_[a-zA-Z_]+|p_[\\w]+_\\d+_\\b");
-
     private File mappings;
     private File input;
     private File output = getProject().file("build/" + getName() + "/output.zip");
 
     @TaskAction
     public void apply() throws IOException {
-        Map<String, String> names = new HashMap<>();
-        try (ZipFile zip = new ZipFile(getMappings())) {
-            zip.stream().filter(e -> e.getName().endsWith(".csv")).forEach(e -> {
-                CsvReader reader = new CsvReader();
-                reader.setContainsHeader(true);
-                try {
-                    CsvContainer csv  = reader.read(new InputStreamReader(zip.getInputStream(e)));
-                    for (CsvRow row : csv.getRows()) {
-                        if (row.getField("searge") != null) {
-                            names.put(row.getField("searge"), row.getField("name"));
-                        } else {
-                            names.put(row.getField("param"), row.getField("name"));
-                        }
-                    }
-                } catch (IOException e1) {
-                    throw new RuntimeException(e1);
-                }
-            });
-        }
+        McpNames names = McpNames.load(getMappings());
 
         try (ZipFile zin = new ZipFile(getInput())) {
             try (FileOutputStream fos = new FileOutputStream(getOutput());
@@ -83,7 +54,7 @@ public void apply() throws IOException {
                         if (!e.getName().endsWith(".java")) {
                             IOUtils.copy(zin.getInputStream(e), out);
                         } else {
-                            out.write(replace(zin.getInputStream(e), names).getBytes(StandardCharsets.UTF_8));
+                            out.write(names.rename(zin.getInputStream(e), false).getBytes(StandardCharsets.UTF_8));
                         }
                         out.closeEntry();
                     } catch (IOException e1) {
@@ -94,20 +65,6 @@ public void apply() throws IOException {
         }
     }
 
-    private String replace(InputStream stream, Map<String, String> names) throws IOException {
-        StringWriter writer = new StringWriter();
-        IOUtils.copy(stream, writer, StandardCharsets.UTF_8);
-        StringBuffer buf = new StringBuffer();
-        Matcher matcher = SRG.matcher(writer.toString());
-        while (matcher.find()) {
-            String name = names.get(matcher.group());
-            matcher.appendReplacement(buf, name == null ? matcher.group() : name);
-        }
-        matcher.appendTail(buf);
-        return buf.toString();
-    }
-
-
     @InputFile
     public File getInput() {
         return input;

src/common/java/net/minecraftforge/gradle/common/util/McpNames.java

@@ -29,6 +29,7 @@
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -47,7 +48,7 @@
 
 public class McpNames {
     private static final String NEWLINE = System.getProperty("line.separator");
-    private static final Pattern SRG_FINDER             = Pattern.compile("func_[0-9]+_[a-zA-Z_]+|field_[0-9]+_[a-zA-Z_]+|p_[\\w]+_\\d+_\\b");
+    private static final Pattern SRG_FINDER             = Pattern.compile("[fF]unc_[0-9]+_[a-zA-Z_]+|[fF]ield_[0-9]+_[a-zA-Z_]+|p_[\\w]+_\\d+_\\b");
     private static final Pattern METHOD_JAVADOC_PATTERN = Pattern.compile("^(?<indent>(?: {3})+|\\t+)(?!return)(?:\\w+\\s+)*(?<generic><[\\w\\W]*>\\s+)?(?<return>\\w+[\\w$.]*(?:<[\\w\\W]*>)?[\\[\\]]*)\\s+(?<name>func_[0-9]+_[a-zA-Z_]+)\\(");
     private static final Pattern FIELD_JAVADOC_PATTERN  = Pattern.compile("^(?<indent>(?: {3})+|\\t+)(?!return)(?:\\w+\\s+)*(?:\\w+[\\w$.]*(?:<[\\w\\W]*>)?[\\[\\]]*)\\s+(?<name>field_[0-9]+_[a-zA-Z_]+) *(?:=|;)");
     private static final Pattern CLASS_JAVADOC_PATTERN  = Pattern.compile("^(?<indent>(?: )*|\\t*)([\\w|@]*\\s)*(class|interface|@interface|enum) (?<name>[\\w]+)");
@@ -180,11 +181,24 @@ private static void insertAboveAnnotations(List<String> list, String line) {
         list.add(list.size() - back, line);
     }
 
+    /*
+     * There are certain times, such as Mixin Accessors that we wish to have the name of this method with the first character upper case.
+     */
+    private String getMapped(String srg) {
+        boolean cap = srg.charAt(0) == 'F';
+        if (cap)
+            srg = 'f' + srg.substring(1);
+        String ret = names.getOrDefault(srg, srg);
+        if (cap)
+            ret = ret.substring(0, 1).toUpperCase(Locale.ENGLISH) + ret.substring(1);
+        return ret;
+    }
+
     private String replaceInLine(String line) {
         StringBuffer buf = new StringBuffer();
         Matcher matcher = SRG_FINDER.matcher(line);
         while (matcher.find())
-            matcher.appendReplacement(buf, names.getOrDefault(matcher.group(), matcher.group()));
+            matcher.appendReplacement(buf, getMapped(matcher.group()));
         matcher.appendTail(buf);
         return buf.toString();
     }