Fix setup task not respecting fake mavens

Details for this are a little weird. See this (very small) conversation on Discord:
https://discord.com/channels/1129059589325852724/1129095235889270844/1447024598662119576

Author: Jonathing

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

@@ -34,9 +34,7 @@
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.file.Directory;
 import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.file.FileSystemLocationProperty;
 import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.JavaPluginExtension;
@@ -50,7 +48,6 @@
 import org.gradle.api.tasks.compile.JavaCompile;
 import org.gradle.language.base.plugins.LifecycleBasePlugin;
 import org.gradle.plugins.ide.eclipse.model.EclipseModel;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.VisibleForTesting;
 
 import javax.inject.Inject;
@@ -117,15 +114,11 @@ private void setup(ForgeDevPlugin plugin, Project project) {
         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);
-        var syncMappingsMaven = tasks.register("syncMappingsMaven", MavenizerSyncMappings.class);
-        Util.runFirst(project, syncMavenizer);
-        Util.runFirst(project, syncMavenizerForExtra);
-        Util.runFirst(project, syncMappingsMaven);
+        var syncMavenizer = Util.runFirst(project, tasks.register("syncMavenizer", MavenizerMCPMaven.class));
+        var syncMavenizerForExtra = Util.runFirst(project, tasks.register("syncMavenizerForExtra", MavenizerMCPMaven.class));
+        var syncMappingsMaven = Util.runFirst(project, tasks.register("syncMappingsMaven", MavenizerSyncMappings.class));
         var minecraftDepsConfiguration = project.getConfigurations().detachedConfiguration();
         var mappingsConfiguration = project.getConfigurations().detachedConfiguration();
-        var mappingsZipFile = this.getProviders().provider(mappingsConfiguration::getSingleFile);
 
         var applyPatches = tasks.register("applyPatches", ApplyPatches.class, task -> {
             final Provider<Directory> workDir = project.getLayout().getBuildDirectory().dir(task.getName());
@@ -144,8 +137,10 @@ private void setup(ForgeDevPlugin plugin, Project project) {
         });
 
         var toMCPConfig = tasks.register("srg2mcp", LegacyApplyMappings.class, task -> {
+            task.dependsOn(syncMappingsMaven);
+
             task.getInput().set(applyPatches.flatMap(ApplyPatches::getOutput));
-            task.getMappingsZip().fileProvider(mappingsZipFile);
+            task.getMappings().setFrom(mappingsConfiguration);
             task.getLambdas().set(false);
         });
         var extractMapped = tasks.register("extractMapped", LegacyExtractZip.class, task -> {
@@ -210,6 +205,8 @@ private void setup(ForgeDevPlugin plugin, Project project) {
         });
 
         var reobfJar = tasks.register("reobfJar", LegacyReobfuscateJar.class, task -> {
+            task.dependsOn(syncMavenizer);
+
             task.getInput().set(jar.flatMap(Jar::getArchiveFile));
             task.getLibraries().from(minecraftDepsConfiguration);
             task.getOutput().convention(task.getDefaultOutputFile());
@@ -367,7 +364,11 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             // This was actually filtering the PARENT jar file. Since we don't support parent Patchers anymore, this is not needed.
             //filterNew.configure(task -> task.getBlacklist().from(jar.flatMap(AbstractArchiveTask::getArchiveFile)));
 
-            tasks.withType(LegacyGenerateSRG.class, task -> task.getMappingsZip().fileProvider(mappingsZipFile));
+            tasks.withType(LegacyGenerateSRG.class, task -> {
+                task.dependsOn(syncMappingsMaven);
+
+                task.getMappings().setFrom(mappingsConfiguration);
+            });
 
             createMcp2Obf.configure(task -> task.getMcpSrgData().convention(createMcp2Srg.flatMap(LegacyGenerateSRG::getMcpSrgData)));
             createSrg2Mcp.configure(task -> task.getMcpSrgData().convention(createMcp2Srg.flatMap(LegacyGenerateSRG::getMcpSrgData)));
@@ -454,8 +455,10 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             } else {
                 // Remap the 'clean' with out mappings.
                 TaskProvider<LegacyApplyMappings> toMCPClean = tasks.register("srg2mcpClean", LegacyApplyMappings.class, task -> {
+                    task.dependsOn(syncMappingsMaven);
+
                     task.getInput().set(legacyPatcher.getCleanSrc());
-                    task.getMappingsZip().fileProvider(mappingsZipFile);
+                    task.getMappings().setFrom(mappingsConfiguration);
                     task.getLambdas().set(false);
                 });
 

src/main/groovy/net/minecraftforge/forgedev/tasks/mappings/LegacyApplyMappings.groovy

@@ -35,7 +35,7 @@ abstract class LegacyApplyMappings extends DefaultTask implements ForgeDevTask {
     abstract @Input Property<Boolean> getLambdas()
 
     abstract @InputFile RegularFileProperty getInput()
-    abstract @InputFile RegularFileProperty getMappingsZip()
+    abstract @InputFiles ConfigurableFileCollection getMappings()
     abstract @OutputFile RegularFileProperty getOutput()
 
     @Inject
@@ -62,7 +62,7 @@ abstract class LegacyApplyMappings extends DefaultTask implements ForgeDevTask {
             it.lambdas.set this.lambdas
 
             it.input.set this.input
-            it.mappingsZip.set this.mappingsZip
+            it.mappingsZip.set this.mappings.singleFile
             it.output.set this.output
         }
 

src/main/groovy/net/minecraftforge/forgedev/tasks/mappings/LegacyGenerateSRG.groovy

@@ -35,7 +35,7 @@ abstract class LegacyGenerateSRG extends DefaultTask implements ForgeDevTask {
     abstract @Input Property<Boolean> getReverse()
 
     abstract @InputFile RegularFileProperty getMcpSrgData()
-    abstract @InputFile RegularFileProperty getMappingsZip()
+    abstract @InputFile ConfigurableFileCollection getMappings()
     abstract @OutputFile RegularFileProperty getOutput()
 
     protected abstract @InputFiles @Classpath ConfigurableFileCollection getWorkerClasspath()
@@ -66,7 +66,7 @@ abstract class LegacyGenerateSRG extends DefaultTask implements ForgeDevTask {
             it.reverse.set this.reverse
 
             it.mcpSrgData.set this.mcpSrgData
-            it.mappingsZip.set this.mappingsZip
+            it.mappingsZip.set this.mappings.singleFile
             it.output.set this.output
         }