Add setupMCPSrg for non-renamed jar and downloadMapping tasks

Kind of scuffed, but uses caches to prevent duplicate work.

Author: Jonathing

settings.gradle

@@ -20,7 +20,7 @@ gradle.beforeProject { Project project ->
 
 //@formatter:off
 dependencyResolutionManagement.versionCatalogs.register('libs') {
-    version 'gradleutils', '3.3.26'
+    version 'gradleutils', '3.3.32'
 
     plugin 'licenser',       'net.minecraftforge.licenser'    version '1.2.0'
     plugin 'gradleutils',    'net.minecraftforge.gradleutils' versionRef 'gradleutils'

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

@@ -8,6 +8,7 @@
 import net.minecraftforge.forgedev.tasks.compat.LegacyMergeFilesTask;
 import net.minecraftforge.forgedev.tasks.filtering.LegacyFilterNewJar;
 import net.minecraftforge.forgedev.tasks.generation.GeneratePatcherConfigV2;
+import net.minecraftforge.forgedev.tasks.installertools.DownloadMappings;
 import net.minecraftforge.forgedev.tasks.launcher.SlimeLauncherExec;
 import net.minecraftforge.forgedev.tasks.mappings.LegacyApplyMappings;
 import net.minecraftforge.forgedev.tasks.mappings.LegacyGenerateSRG;
@@ -111,6 +112,10 @@ private void setup(ForgeDevPlugin plugin, Project project) {
         // needs to exist because it's currently referenced in the buildscript
         // TODO STOP DOING THAT SHIT
         var setupMCP = tasks.register("setupMCP", MavenizerMCPSetup.class);
+        var setupMCPSrg = tasks.register("setupMCPSrg", MavenizerMCPSetup.class, task -> task.getRename().set(false));
+
+        var downloadClientMappings = tasks.register("downloadClientMappings", DownloadMappings.class, task -> task.getSide().set("client"));
+        var downloadServerMappings = tasks.register("downloadServerMappings", DownloadMappings.class, task -> task.getSide().set("server"));
 
         var syncMavenizer = tasks.register("syncMavenizer", MavenizerMCPMaven.class);
         var syncMavenizerForExtra = tasks.register("syncMavenizerForExtra", MavenizerMCPMaven.class);
@@ -296,6 +301,9 @@ private void setup(ForgeDevPlugin plugin, Project project) {
         });
 
         project.afterEvaluate(p -> {
+            downloadClientMappings.configure(task -> task.getVersion().set(legacyPatcher.getMappingVersion()));
+            downloadServerMappings.configure(task -> task.getVersion().set(legacyPatcher.getMappingVersion()));
+
             // TODO Add mappings as a dependency to FG7???
             // Add mappings so that it can be used by reflection tools.
             // net.minecraft:mappings_CHANNEL:VERSION@zip
@@ -341,6 +349,10 @@ private void setup(ForgeDevPlugin plugin, Project project) {
                 task.getPipeline().set(legacyMcp.getPipeline());
                 task.getArtifact().set(legacyMcp.getConfig());
             });
+            setupMCPSrg.configure(task -> {
+                task.getPipeline().set(legacyMcp.getPipeline());
+                task.getArtifact().set(legacyMcp.getConfig());
+            });
             legacyPatcher.getCleanSrc().set(setupMCP.flatMap(MavenizerMCPSetup::getOutput));
             applyPatches.configure(task -> task.getInput().convention(legacyPatcher.getCleanSrc()));
             genPatches.configure(task -> task.getInput().convention(legacyPatcher.getCleanSrc()));
@@ -370,6 +382,10 @@ private void setup(ForgeDevPlugin plugin, Project project) {
                     task.dependsOn(mergeATs);
                     task.getAccessTransformerConfig().set(mergeATs.flatMap(LegacyMergeFilesTask::getOutput));
                 });
+                setupMCPSrg.configure(task -> {
+                    task.dependsOn(mergeATs);
+                    task.getAccessTransformerConfig().set(mergeATs.flatMap(LegacyMergeFilesTask::getOutput));
+                });
                 for (var f : legacyPatcher.getAccessTransformers()) {
                     userdevJar.configure(t -> t.from(f, e -> e.into("ats/")));
                     userdevConfig.configure(t -> t.getATs().from(f));
@@ -381,6 +397,10 @@ private void setup(ForgeDevPlugin plugin, Project project) {
                     // TODO do this better
                     task.getSideAnnotationStripperConfig().fileProvider(getProviders().provider(() -> legacyPatcher.getSideAnnotationStrippers().getSingleFile()));
                 });
+                setupMCPSrg.configure(task -> {
+                    // TODO do this better
+                    task.getSideAnnotationStripperConfig().fileProvider(getProviders().provider(() -> legacyPatcher.getSideAnnotationStrippers().getSingleFile()));
+                });
 
                 userdevConfig.configure(task -> task.getSASs().from(legacyPatcher.getSideAnnotationStrippers()));
                 for (var sas : legacyPatcher.getSideAnnotationStrippers()) {

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

@@ -24,9 +24,10 @@ import javax.inject.Inject
 abstract class MavenizerMCPSetup extends MavenizerMCPTask {
     abstract @InputFile @Optional RegularFileProperty getAccessTransformerConfig()
     abstract @InputFile @Optional RegularFileProperty getSideAnnotationStripperConfig()
+    abstract @Input Property<Boolean> getRename();
     abstract @Input @Optional Property<String> getParchment()
 
-    protected abstract @OutputFile RegularFileProperty getSetupFiles();
+    protected abstract @OutputFile RegularFileProperty getSetupFiles()
 
     abstract @OutputFile RegularFileProperty getVersionManifest()
     abstract @OutputFile RegularFileProperty getVersionJson()
@@ -39,6 +40,8 @@ abstract class MavenizerMCPSetup extends MavenizerMCPTask {
 
     @Inject
     MavenizerMCPSetup() {
+        rename.convention(true)
+
         setupFiles.convention(this.defaultOutputDirectory.map { it.file('setup_files.json') })
 
         versionManifest.convention(this.defaultOutputDirectory.map { it.file('manifest.json') })
@@ -55,14 +58,11 @@ abstract class MavenizerMCPSetup extends MavenizerMCPTask {
     protected void addArguments() {
         super.addArguments()
 
-        this.args('--mappings')
+        this.args('--mappings', this.rename)
 
-        if (this.accessTransformerConfig.present)
-            this.args('--at', this.accessTransformerConfig)
-        if (this.sideAnnotationStripperConfig.present)
-            this.args('--sas', this.sideAnnotationStripperConfig)
-        if (this.parchment.present)
-            this.args('--parchment', this.parchment)
+        this.args('--at', this.accessTransformerConfig)
+        this.args('--sas', this.sideAnnotationStripperConfig)
+        this.args('--parchment', this.parchment)
 
         this.args('--output-files', this.setupFiles)
     }