Fix multiple mappings files with reobf

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

Author: SizableShrimp

build.gradle

@@ -81,7 +81,7 @@ dependencies {
     }
     commonImplementation 'org.apache.maven:maven-artifact:3.9.1'
     commonImplementation 'org.apache.httpcomponents:httpclient:4.5.14'
-    commonImplementation 'net.minecraftforge:srgutils:0.4.15'
+    commonImplementation 'net.minecraftforge:srgutils:0.5.2'
     commonImplementation 'net.minecraftforge:DiffPatch:2.0.7:all'
 
     mcpImplementation sourceSets.common.output

src/userdev/java/net/minecraftforge/gradle/userdev/tasks/RenameJar.java

@@ -8,18 +8,27 @@
 import net.minecraftforge.gradle.common.tasks.JarExec;
 import net.minecraftforge.gradle.common.util.Utils;
 
+import net.minecraftforge.srgutils.IMappingFile;
 import org.gradle.api.file.ConfigurableFileCollection;
+import org.gradle.api.file.RegularFile;
 import org.gradle.api.file.RegularFileProperty;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputFile;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
+import org.gradle.api.tasks.TaskAction;
+
+import java.io.File;
+import java.io.IOException;
 import java.util.List;
 
 public abstract class RenameJar extends JarExec {
+    private final Provider<RegularFile> tempMappings = this.workDir.map(s -> s.file("mappings.tsrg"));
+
     public RenameJar() {
         getTool().set(Utils.FART);
         getArgs().addAll("--input", "{input}", "--output", "{output}", "--names", "{mappings}", "--lib", "{libraries}");
@@ -29,15 +38,39 @@ public RenameJar() {
     protected List<String> filterArgs(List<String> args) {
         return replaceArgsMulti(args, ImmutableMap.of(
                         "{input}", getInput().get().getAsFile(),
-                        "{output}", getOutput().get().getAsFile()),
+                        "{output}", getOutput().get().getAsFile(),
+                        "{mappings}", this.tempMappings.get().getAsFile()),
                 ImmutableMultimap.<String, Object>builder()
-                        .put("{mappings}", getMappings().get().getAsFile())
-                        .putAll("{mappings}", getExtraMappings().getFiles())
                         .putAll("{libraries}", getLibraries().getFiles())
                         .build()
         );
     }
 
+    @TaskAction
+    @Override
+    public void apply() throws IOException {
+        File tempMappings = this.tempMappings.get().getAsFile();
+
+        if (tempMappings.getParentFile() != null && !tempMappings.getParentFile().exists() && !tempMappings.getParentFile().mkdirs())
+            getProject().getLogger().warn("Could not create parent directories for temp dir '{}'", tempMappings.getAbsolutePath());
+
+        if (tempMappings.exists() && !tempMappings.delete())
+            throw new IllegalStateException("Could not delete temp mappings file: " + tempMappings.getAbsolutePath());
+
+        IMappingFile mappings = IMappingFile.load(getMappings().get().getAsFile());
+
+        for (File file : getExtraMappings().getFiles()) {
+            mappings = mappings.merge(IMappingFile.load(file));
+        }
+
+        mappings.write(tempMappings.toPath(), IMappingFile.Format.TSRG2, false);
+
+        super.apply();
+
+        tempMappings.delete();
+    }
+
+
     // TODO: Make this a ConfigurableFileCollection? (then remove getExtraMappings())
     @InputFile
     public abstract RegularFileProperty getMappings();

src/userdev/java/net/minecraftforge/gradle/userdev/tasks/RenameJarInPlace.java

@@ -8,9 +8,9 @@
 import net.minecraftforge.gradle.common.tasks.JarExec;
 import net.minecraftforge.gradle.common.util.Utils;
 
+import net.minecraftforge.srgutils.IMappingFile;
 import org.apache.commons.io.FileUtils;
 import org.gradle.api.file.ConfigurableFileCollection;
-import org.gradle.api.file.Directory;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.provider.Provider;
@@ -26,8 +26,8 @@
 import java.util.List;
 
 public abstract class RenameJarInPlace extends JarExec {
-    private final Provider<Directory> workDir = getProject().getLayout().getBuildDirectory().dir(getName());
-    private final Provider<RegularFile> temp = workDir.map(s -> s.file("output.jar"));
+    private final Provider<RegularFile> tempOutput = this.workDir.map(s -> s.file("output.jar"));
+    private final Provider<RegularFile> tempMappings = this.workDir.map(s -> s.file("mappings.tsrg"));
 
     public RenameJarInPlace() {
         getTool().set(Utils.FART);
@@ -39,10 +39,9 @@ public RenameJarInPlace() {
     protected List<String> filterArgs(List<String> args) {
         return replaceArgsMulti(args, ImmutableMap.of(
                         "{input}", getInput().get().getAsFile(),
-                        "{output}", temp.get().getAsFile()),
+                        "{output}", tempOutput.get().getAsFile(),
+                        "{mappings}", this.tempMappings.get().getAsFile()),
                 ImmutableMultimap.<String, Object>builder()
-                        .put("{mappings}", getMappings().get().getAsFile())
-                        .putAll("{mappings}", getExtraMappings().getFiles())
                         .putAll("{libraries}", getLibraries().getFiles())
                         .build()
         );
@@ -51,14 +50,27 @@ protected List<String> filterArgs(List<String> args) {
     @Override
     @TaskAction
     public void apply() throws IOException {
-        File temp = this.temp.get().getAsFile();
-        if (temp.getParentFile() != null && !temp.getParentFile().exists() && !temp.getParentFile().mkdirs()) {
-            getProject().getLogger().warn("Could not create parent directories for temp dir '{}'", temp.getAbsolutePath());
+        File tempJar = this.tempOutput.get().getAsFile();
+        File tempMappings = this.tempMappings.get().getAsFile();
+
+        if (tempJar.getParentFile() != null && !tempJar.getParentFile().exists() && !tempJar.getParentFile().mkdirs()) {
+            getProject().getLogger().warn("Could not create parent directories for temp dir '{}'", tempJar.getAbsolutePath());
+        }
+
+        if (tempMappings.exists() && !tempMappings.delete())
+            throw new IllegalStateException("Could not delete temp mappings file: " + tempMappings.getAbsolutePath());
+
+        IMappingFile mappings = IMappingFile.load(getMappings().get().getAsFile());
+
+        for (File file : getExtraMappings().getFiles()) {
+            mappings = mappings.merge(IMappingFile.load(file));
         }
 
+        mappings.write(tempMappings.toPath(), IMappingFile.Format.TSRG2, false);
+
         super.apply();
 
-        FileUtils.copyFile(temp, getInput().get().getAsFile());
+        FileUtils.copyFile(tempJar, getInput().get().getAsFile());
     }
 
     // TODO: Make this a ConfigurableFileCollection? (then remove getExtraMappings())