Declare each individual setup file as an output

Author: Jonathing

src/main/groovy/net/minecraftforge/forgedev/Constants.java

@@ -12,10 +12,10 @@ private Constants() { }
     static final String MAVEN_CENTRAL = "https://repo1.maven.org/maven2/";
 
     static final String MAVENIZER_NAME = "mavenizer";
-    static final String MAVENIZER_VERSION = "0.3.15";
+    static final String MAVENIZER_VERSION = "0.4.1";
     static final String MAVENIZER_DL_URL = FORGE_MAVEN + "net/minecraftforge/minecraft-mavenizer/" + MAVENIZER_VERSION + "/minecraft-mavenizer-" + MAVENIZER_VERSION + ".jar";
     static final String MAVENIZER_MAIN = "net.minecraftforge.mcmaven.cli.Main";
-    static final int MAVENIZER_JAVA = 21;
+    static final int MAVENIZER_JAVA = 25;
 
     static final String DIFFPATCH_NAME = "diffpatch";
     static final String DIFFPATCH_VERSION = "2.0.1.39";

src/main/groovy/net/minecraftforge/forgedev/tasks/mcp/MCPSetupFiles.java

@@ -0,0 +1,13 @@
+package net.minecraftforge.forgedev.tasks.mcp;
+
+public class MCPSetupFiles {
+    public String versionManifest;
+    public String versionJson;
+    public String clientRaw;
+    public String clientMappings;
+    public String serverRaw;
+    public String serverExtracted;
+    public String serverMappings;
+    public String librariesList;
+    public String joinedSrgMappings;
+}

src/main/groovy/net/minecraftforge/forgedev/tasks/mcp/MavenizerMCPSetup.groovy

@@ -6,13 +6,17 @@ package net.minecraftforge.forgedev.tasks.mcp
 
 import groovy.transform.CompileStatic
 import net.minecraftforge.forgedev.ForgeDevTask
+import net.minecraftforge.util.data.json.JsonData
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.problems.Problems
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Optional
+import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.TaskAction
+import org.gradle.process.ExecResult
 
 import javax.inject.Inject
 
@@ -22,8 +26,30 @@ abstract class MavenizerMCPSetup extends MavenizerMCPTask {
     abstract @InputFile @Optional RegularFileProperty getSideAnnotationStripperConfig()
     abstract @Input @Optional Property<String> getParchment()
 
+    protected abstract @OutputFile RegularFileProperty getSetupFiles();
+
+    abstract @OutputFile RegularFileProperty getVersionManifest()
+    abstract @OutputFile RegularFileProperty getVersionJson()
+    abstract @OutputFile RegularFileProperty getClientRaw()
+    abstract @OutputFile RegularFileProperty getClientMappings()
+    abstract @OutputFile RegularFileProperty getServerRaw()
+    abstract @OutputFile RegularFileProperty getServerExtracted()
+    abstract @OutputFile RegularFileProperty getServerMappings()
+    abstract @OutputFile RegularFileProperty getLibrariesList()
+
     @Inject
-    MavenizerMCPSetup() {}
+    MavenizerMCPSetup() {
+        setupFiles.convention(this.defaultOutputDirectory.map { it.file('setup_files.json') })
+
+        versionManifest.convention(this.defaultOutputDirectory.map { it.file('manifest.json') })
+        versionJson.convention(this.defaultOutputDirectory.map { it.file('version.json') })
+        clientRaw.convention(this.defaultOutputDirectory.map { it.file('client.jar') })
+        clientMappings.convention(this.defaultOutputDirectory.map { it.file('client_mappings.txt') })
+        serverRaw.convention(this.defaultOutputDirectory.map { it.file('server_bundled.jar') })
+        serverExtracted.convention(this.defaultOutputDirectory.map { it.file('server.jar') })
+        serverMappings.convention(this.defaultOutputDirectory.map { it.file('server_mappings.txt') })
+        librariesList.convention(this.defaultOutputDirectory.map { it.file('libraries.txt') })
+    }
 
     @Override
     protected void addArguments() {
@@ -32,10 +58,29 @@ abstract class MavenizerMCPSetup extends MavenizerMCPTask {
         this.args('--mappings')
 
         if (this.accessTransformerConfig.present)
-            this.args('--at', this.accessTransformerConfig.get())
+            this.args('--at', this.accessTransformerConfig)
         if (this.sideAnnotationStripperConfig.present)
-            this.args('--sas', this.sideAnnotationStripperConfig.get())
+            this.args('--sas', this.sideAnnotationStripperConfig)
         if (this.parchment.present)
-            this.args('--parchment', this.parchment.get())
+            this.args('--parchment', this.parchment)
+
+        this.args('--output-files', this.setupFiles)
+    }
+
+    @Override
+    protected ExecResult exec() {
+        var result = super.exec()
+
+        var setupFiles = JsonData.fromJson(this.setupFiles.asFile.get(), MCPSetupFiles)
+        versionManifest.asFile.get().bytes = new File(setupFiles.versionManifest).bytes
+        versionJson.asFile.get().bytes = new File(setupFiles.versionJson).bytes
+        clientRaw.asFile.get().bytes = new File(setupFiles.clientRaw).bytes
+        clientMappings.asFile.get().bytes = new File(setupFiles.clientMappings).bytes
+        serverRaw.asFile.get().bytes = new File(setupFiles.serverRaw).bytes
+        serverExtracted.asFile.get().bytes = new File(setupFiles.serverExtracted).bytes
+        serverMappings.asFile.get().bytes = new File(setupFiles.serverMappings).bytes
+        librariesList.asFile.get().bytes = new File(setupFiles.librariesList).bytes
+
+        return result
     }
 }