Publish-related task fixes

Author: LexManos

settings.gradle

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

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

@@ -155,11 +155,18 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             task.getDependencies().from(compileJava.map(JavaCompile::getClasspath));
         });
 
-        var createMcp2Srg = tasks.register("createMcp2Srg", LegacyGenerateSRG.class, task -> task.getReverse().set(true));
-        var createSrg2Mcp = tasks.register("createSrg2Mcp", LegacyGenerateSRG.class, task -> task.getReverse().set(false));
+        var createMcp2Srg = tasks.register("createMcp2Srg", LegacyGenerateSRG.class, task -> {
+            task.getReverse().set(true);
+            task.getOutput().set(task.getOutputFile("mcp2srg.tsrg"));
+        });
+        var createSrg2Mcp = tasks.register("createSrg2Mcp", LegacyGenerateSRG.class, task -> {
+            task.getReverse().set(false);
+            task.getOutput().set(task.getOutputFile("srg2mcp.tsrg"));
+        });
         var createMcp2Obf = tasks.register("createMcp2Obf", LegacyGenerateSRG.class, task -> {
             task.getNotch().set(true);
             task.getReverse().set(true);
+            task.getOutput().set(task.getOutputFile("mcp2obf.tsrg"));
         });
 
         // TODO DOES NOTHING!
@@ -171,6 +178,7 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             task.getRangeMap().set(extractRangeMap.flatMap(ExtractRangeMap::getOutput));
             task.getSrgFiles().from(createMcp2Srg.flatMap(LegacyGenerateSRG::getOutput));
             task.getExcFiles().from(/*createExc.flatMap(CreateExc::getOutput), */legacyPatcher.getExcs());
+            task.getKeepImports().set(true);
         });
 
         var applyRangeMapBase = tasks.register("applyRangeMapBase", ApplyRangeMap.class, task -> {
@@ -179,6 +187,7 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             task.getRangeMap().set(extractRangeMap.flatMap(ExtractRangeMap::getOutput));
             task.getSrgFiles().from(createMcp2Srg.flatMap(LegacyGenerateSRG::getOutput));
             task.getExcFiles().from(/*createExc.flatMap(CreateExc::getOutput), */legacyPatcher.getExcs());
+            task.getKeepImports().set(true);
         });
 
         var userdevConfig = tasks.register("userdevConfig", GeneratePatcherConfigV2.class);
@@ -336,10 +345,14 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             applyPatches.configure(task -> task.getInput().convention(legacyPatcher.getCleanSrc()));
             genPatches.configure(task -> task.getInput().convention(legacyPatcher.getCleanSrc()));
 
-            var extractSrg = tasks.register("extractSrg", MavenizerMCPDataTask.class, task -> task.getArtifact().set(legacyMcp.getConfig()));
+            var extractSrg = tasks.register("extractSrg", MavenizerMCPDataTask.class, task -> {
+                task.getArtifact().set(legacyMcp.getConfig());
+                task.getOutput().convention(task.getOutputFile("obf2srg.tsrg"));
+            });
             createMcp2Srg.configure(task -> task.getMcpSrgData().convention(extractSrg.flatMap(MavenizerMCPDataTask::getOutput)));
 
-            filterNew.configure(task -> task.getBlacklist().from(jar.flatMap(AbstractArchiveTask::getArchiveFile)));
+            // 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));
 

src/main/groovy/net/minecraftforge/forgedev/tasks/filtering/LegacyFilterNewJar.groovy

@@ -102,7 +102,7 @@ abstract class LegacyFilterNewJar extends DefaultTask implements ForgeDevTask {
                 for (var entry in entries) {
                     if (entry.directory || filter.contains(entry.name) ||
                         (entry.name.endsWith(".class") && isVanilla(classes, entry.name.substring(0, entry.name.length() - 6)))) {
-                        return
+                        continue
                     }
                     out.putNextEntry(FileUtils.getStableEntry(entry.name))
                     zin.getInputStream(entry).transferTo(out)

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

@@ -51,7 +51,7 @@ abstract class LegacyGenerateSRG extends DefaultTask implements ForgeDevTask {
         this.notch.convention(false)
         this.reverse.convention(false)
 
-        this.output.convention(this.defaultOutputFile)
+        this.output.convention(this.getDefaultOutputFile('tsrg'))
     }
 
     @TaskAction
@@ -91,14 +91,16 @@ abstract class LegacyGenerateSRG extends DefaultTask implements ForgeDevTask {
 
         @Override
         void execute() {
-            var input = IMappingFile.load(this.parameters.mcpSrgData.get().asFile).with(true) {
-                boolean notch = this.parameters.notch.getOrElse(false)
+            // Obf -> Srg
+            var input = IMappingFile.load(this.parameters.mcpSrgData.get().asFile)
 
-                // Reverse makes SRG->OBF, chain makes SRG->SRG
-                return !notch ? it.reverse().chain(it) : it
-            }
+            // Srg->Obf->Srg = Srg->Srg
+            boolean notch = this.parameters.notch.getOrElse(false)
+            if (!notch)
+                input = input.reverse().chain(input)
 
             var map = MCPNames.load(this.parameters.mappingsZip.get().asFile)
+            // Srg->Mapped
             var ret = input.rename(renamer(map))
 
             ret.write(

src/main/groovy/net/minecraftforge/forgedev/tasks/srg2source/ExtractRangeMap.groovy

@@ -46,7 +46,7 @@ abstract class ExtractRangeMap extends S2SExec {
 
     @Inject
     ExtractRangeMap() {
-        this.output.convention(this.defaultOutputFile)
+        this.output.convention(this.getDefaultOutputFile('txt'))
 
         this.sourceCompatibility.convention(
             this.project.extensions.findByType(JavaPluginExtension).toolchain.languageVersion.map(JavaVersion.&toVersion)