Fix mojmap generation on new MCPConfig

Signed-off-by: SizableShrimp <[email protected]>

Author: SizableShrimp

src/mcp/java/net/minecraftforge/gradle/mcp/MCPRepo.java

@@ -117,7 +117,7 @@ private MCPRepo(Project project, File cache, Logger log) {
         super(cache, log);
         this.project = project;
         this.repo = SimpleRepository.of(ArtifactProviderBuilder.begin(ArtifactIdentifier.class)
-            .provide(this)
+                .provide(this)
         );
     }
 
@@ -207,7 +207,7 @@ public File findFile(ArtifactIdentifier artifact) throws IOException {
 
     private HashStore commonHash(File mcp) {
         return new HashStore(this.getCacheRoot())
-            .add("mcp", mcp);
+                .add("mcp", mcp);
     }
 
     private File getMCP(String version) throws IOException {
@@ -497,12 +497,12 @@ private File findOfficialMapping(String version) throws IOException {
                     continue;
                 for (IField fld : cls.getFields()) {
                     String name = obf.remapField(fld.getMapped());
-                    if (name.startsWith("field_"))
+                    if (name.startsWith("field_") || name.startsWith("f_"))
                         cfields.put(name, fld.getOriginal());
                 }
                 for (IMethod mtd : cls.getMethods()) {
                     String name = obf.remapMethod(mtd.getMapped(), mtd.getMappedDescriptor());
-                    if (name.startsWith("func_"))
+                    if (name.startsWith("func_") || name.startsWith("m_"))
                         cmethods.put(name, mtd.getOriginal());
                 }
             }
@@ -512,12 +512,12 @@ private File findOfficialMapping(String version) throws IOException {
                     continue;
                 for (IField fld : cls.getFields()) {
                     String name = obf.remapField(fld.getMapped());
-                    if (name.startsWith("field_"))
+                    if (name.startsWith("field_") || name.startsWith("f_"))
                         sfields.put(name, fld.getOriginal());
                 }
                 for (IMethod mtd : cls.getMethods()) {
                     String name = obf.remapMethod(mtd.getMapped(), mtd.getMappedDescriptor());
-                    if (name.startsWith("func_"))
+                    if (name.startsWith("func_") || name.startsWith("m_"))
                         smethods.put(name, mtd.getOriginal());
                 }
             }
@@ -555,7 +555,7 @@ private File findOfficialMapping(String version) throws IOException {
                 mappings.getParentFile().mkdirs();
 
             try (FileOutputStream fos = new FileOutputStream(mappings);
-                 ZipOutputStream out = new ZipOutputStream(fos)) {
+                    ZipOutputStream out = new ZipOutputStream(fos)) {
 
                 out.putNextEntry(Utils.getStableEntry("fields.csv"));
                 try (CsvWriter writer = CsvWriter.builder().lineDelimiter(LineDelimiter.LF).build(new UncloseableOutputStreamWritter(out))) {