Fix task logging issues

Jonathing · Jonathing · commit 308d4eece1d9 · 2025-09-25T09:59:59.000-04:00
diff --git a/settings.gradle b/settings.gradle
@@ -4,17 +4,17 @@ plugins {
     // NOTE: We need to load this into the classpath before GradleUtils for the service to load correctly
     id 'io.freefair.javadoc-links' version '8.14' apply false // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
 
-    id 'net.minecraftforge.gradleutils' version '3.3.2' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'net.minecraftforge.gradleutils' version '3.3.3' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
 }
 
 rootProject.name = 'forgedev'
 
 dependencyResolutionManagement {
     repositories {
-        //mavenLocal()
         mavenCentral()
         maven gradleutils.forgeMaven
         maven { url = 'https://maven.moddinglegacy.com/maven' } // Gradle API
+        //mavenLocal()
     }
 
     //@formatter:off
@@ -36,7 +36,7 @@ dependencyResolutionManagement {
         library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
 
         // GradleUtils Shared Base
-        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.2'
+        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.3'
 
         library 'srgutils',  'net.minecraftforge', 'srgutils'   version '0.5.14'
         library 'fastcsv',   'de.siegmar',         'fastcsv'    version '3.7.0'
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/compat/LegacyExtractExistingFiles.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/compat/LegacyExtractExistingFiles.groovy
@@ -31,7 +31,7 @@ abstract class LegacyExtractExistingFiles extends DefaultTask implements ForgeDe
     LegacyExtractExistingFiles() { }
 
     @TaskAction
-    void exec() {
+    protected void exec() {
         final zip = this.archiveOperations.zipTree(this.archive)
 
         for (var directory in this.targets) {
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/compat/LegacyExtractZip.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/compat/LegacyExtractZip.groovy
@@ -30,7 +30,7 @@ abstract class LegacyExtractZip extends DefaultTask implements ForgeDevTask {
     protected abstract @Inject ArchiveOperations getArchiveOperations()
 
     @TaskAction
-    void exec() {
+    protected void exec() {
         this.fileSystemOperations.copy(copy -> copy
             .from(this.archiveOperations.zipTree(this.input))
             .into(this.output)
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/compat/LegacyMergeFilesTask.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/compat/LegacyMergeFilesTask.groovy
@@ -49,7 +49,7 @@ abstract class LegacyMergeFilesTask extends DefaultTask implements ForgeDevTask
     }
 
     @TaskAction
-    void exec() {
+    protected void exec() {
         var buffer = new StringBuilder()
         for (var config in this.filesToMerge.files) {
             var entries = config.text
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/filtering/LegacyFilterNewJar.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/filtering/LegacyFilterNewJar.groovy
@@ -44,7 +44,7 @@ abstract class LegacyFilterNewJar extends DefaultTask implements ForgeDevTask {
     }
 
     @TaskAction
-    void exec() {
+    protected void exec() {
         final work = this.workerExecutor.classLoaderIsolation {
             it.classpath.from(this.workerClasspath)
         }
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/installertools/DownloadMappings.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/installertools/DownloadMappings.groovy
@@ -8,6 +8,7 @@ import groovy.transform.CompileStatic
 import net.minecraftforge.forgedev.Tools
 import net.minecraftforge.forgedev.tasks.ToolExec
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.logging.LogLevel
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.OutputFile
@@ -26,6 +27,7 @@ abstract class DownloadMappings extends ToolExec {
         super(Tools.INSTALLERTOOLS)
 
         this.output.convention(this.getDefaultOutputFile('tsrg'))
+        this.standardOutputLogLevel.set(LogLevel.INFO)
     }
 
     @Override
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/mappings/LegacyApplyMappings.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/mappings/LegacyApplyMappings.groovy
@@ -52,7 +52,7 @@ abstract class LegacyApplyMappings extends DefaultTask implements ForgeDevTask {
     protected abstract @Inject WorkerExecutor getWorkerExecutor()
 
     @TaskAction
-    void exec() {
+    protected void exec() {
         final work = this.workerExecutor.classLoaderIsolation {
             it.classpath.from(this.workerClasspath)
         }
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/mappings/LegacyGenerateSRG.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/mappings/LegacyGenerateSRG.groovy
@@ -55,7 +55,7 @@ abstract class LegacyGenerateSRG extends DefaultTask implements ForgeDevTask {
     }
 
     @TaskAction
-    void exec() {
+    protected void exec() {
         final work = this.workerExecutor.classLoaderIsolation {
             it.classpath.from(this.workerClasspath)
         }
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/mcp/MavenizerMCPDataTask.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/mcp/MavenizerMCPDataTask.groovy
@@ -11,6 +11,7 @@ import org.gradle.api.provider.Property
 import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
+import org.gradle.process.ExecResult
 
 import javax.inject.Inject
 import java.nio.file.Files
@@ -62,11 +63,13 @@ abstract class MavenizerMCPDataTask extends MavenizerExec {
     }
 
     @Override
-    void exec() {
-        super.exec()
+    protected ExecResult exec() {
+        var result = super.exec()
 
         if (!this.output.get().asFile.exists() && this.isAllowEmpty.getOrElse(false)) {
             Files.createFile(this.output.get().asFile.toPath())
         }
+
+        return result
     }
 }
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyRenameJar.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyRenameJar.groovy
@@ -11,6 +11,7 @@ import net.minecraftforge.forgedev.tasks.ToolExec
 import net.minecraftforge.srgutils.IMappingFile
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.logging.LogLevel
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.tasks.Classpath
@@ -19,6 +20,7 @@ import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
+import org.gradle.process.ExecResult
 import org.gradle.workers.WorkAction
 import org.gradle.workers.WorkParameters
 import org.gradle.workers.WorkerExecutor
@@ -54,17 +56,17 @@ abstract class LegacyRenameJar extends ToolExec {
         )
 
         this.temporaryMappings.convention(this.defaultOutputDirectory.map { it.file('mappings_temp.tsrg') })
-        this.setStandardOutput(Util.toLog(this.logger.&info))
+        this.standardOutputLogLevel.set(LogLevel.INFO)
     }
 
     @Override
     protected void addArguments() {
         super.addArguments()
 
         var argsList = [
-            '--input', this.input.get().asFile.absolutePath,
-            '--names', this.temporaryMappings.get().asFile.absolutePath,
-            '--output', this.output.get().asFile.absolutePath
+            '--input', this.input.asFile.get().absolutePath,
+            '--names', this.temporaryMappings.asFile.get().absolutePath,
+            '--output', this.output.asFile.get().absolutePath
         ]
 
         for (var library in this.libraries.files) {
@@ -79,7 +81,7 @@ abstract class LegacyRenameJar extends ToolExec {
     }
 
     @Override
-    void exec() {
+    protected ExecResult exec() {
         final work = this.workerExecutor.classLoaderIsolation {
             it.classpath.from(this.workerActionClasspath)
         }
@@ -92,7 +94,7 @@ abstract class LegacyRenameJar extends ToolExec {
 
         work.await()
 
-        super.exec()
+        return super.exec()
     }
 
     @CompileStatic
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyReobfuscateJar.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyReobfuscateJar.groovy
@@ -11,6 +11,7 @@ import net.minecraftforge.forgedev.tasks.ToolExec
 import net.minecraftforge.srgutils.IMappingFile
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.logging.LogLevel
 import org.gradle.api.logging.Logger
 import org.gradle.api.logging.Logging
 import org.gradle.api.provider.Property
@@ -20,6 +21,7 @@ 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 org.gradle.process.ExecResult
 import org.gradle.workers.WorkAction
 import org.gradle.workers.WorkParameters
 import org.gradle.workers.WorkerExecutor
@@ -57,7 +59,7 @@ abstract class LegacyReobfuscateJar extends ToolExec {
             this.getTool(Tools.SRGUTILS).classpath
         )
 
-        this.setStandardOutput(Util.toLog(this.logger.&info))
+        this.standardOutputLogLevel.set(LogLevel.INFO)
 
         this.keepPackages.convention(false)
         this.keepData.convention(false)
@@ -89,8 +91,8 @@ abstract class LegacyReobfuscateJar extends ToolExec {
     }
 
     @Override
-    void exec() {
-        super.exec()
+    protected ExecResult exec() {
+        var result = super.exec()
 
         final work = this.workerExecutor.classLoaderIsolation {
             it.classpath.from(this.workerActionClasspath)
@@ -106,6 +108,8 @@ abstract class LegacyReobfuscateJar extends ToolExec {
         }
 
         work.await()
+
+        return result
     }
 
     @CompileStatic
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/binary/BinaryPatcherExec.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/binary/BinaryPatcherExec.groovy
@@ -11,6 +11,7 @@ import net.minecraftforge.forgedev.Util
 import net.minecraftforge.forgedev.tasks.ToolExec
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.logging.LogLevel
 import org.gradle.api.problems.Problems
 import org.gradle.api.provider.ListProperty
 import org.gradle.api.provider.Property
@@ -39,7 +40,7 @@ import javax.inject.Inject
         this.pack200.convention(false)
         this.legacy.convention(false)
 
-        this.standardOutput = Util.toLog(this.logger.&info)
+        this.standardOutputLogLevel.set(LogLevel.INFO)
     }
 
     @Override
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/ApplyPatches.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/ApplyPatches.groovy
@@ -14,42 +14,37 @@ import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
+import org.gradle.process.ExecResult
 
 import javax.inject.Inject
 
 @CompileStatic
 abstract class ApplyPatches extends BasePatchTask {
     abstract @Input Property<Boolean> getFailOnError()
 
-    private final RegularFileProperty input
-    private final DirectoryProperty patches
-    private final RegularFileProperty output
+    private final RegularFileProperty input = this.objects.fileProperty()
+    private final DirectoryProperty patches = this.objects.directoryProperty()
+    private final RegularFileProperty output = this.objects.fileProperty()
 
     @InputFile RegularFileProperty getInput() { this.input }
     @InputDirectory @Optional DirectoryProperty getPatches() { this.patches }
     @OutputFile RegularFileProperty getOutput() { this.output }
 
     @Inject
     ApplyPatches() {
-        this.input = this.objectFactory.fileProperty()
-        this.patches = this.objectFactory.directoryProperty()
-        this.output = this.objectFactory.fileProperty()
-
         this.failOnError.convention(true)
 
         this.logLevel.convention('warn')
     }
 
     @Override
-    void exec() {
+    protected ExecResult exec() {
         if (!this.patches.isPresent()) {
             this.output.get().asFile.bytes = this.input.get().asFile.bytes
             return
         }
 
-        super.exec()
-
-        var result = this.executionResult.get()
+        var result = super.exec()
         var exitValue = result.exitValue
         if (exitValue !== 0) {
             // patches failed
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/BakePatches.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/BakePatches.groovy
@@ -11,30 +11,28 @@ import org.gradle.api.problems.Problems
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.OutputFile
+import org.gradle.process.ExecResult
 
 import javax.inject.Inject
 import java.util.zip.ZipOutputStream
 
 @CompileStatic
 abstract class BakePatches extends BasePatchBakingTask {
-    private final DirectoryProperty input
-    private final RegularFileProperty output
+    private final DirectoryProperty input = this.objects.directoryProperty()
+    private final RegularFileProperty output = this.objects.fileProperty()
 
     @InputDirectory @Optional DirectoryProperty getInput() { this.input }
     @OutputFile RegularFileProperty getOutput() { this.output }
 
     @Inject
-    BakePatches() {
-        this.input = this.objectFactory.directoryProperty()
-        this.output = this.objectFactory.fileProperty()
-    }
+    BakePatches() { }
 
     @Override
-    void exec() {
+    protected ExecResult exec() {
         if (!this.input.present) {
             // create empty zip for output
             new ZipOutputStream(new FileOutputStream(this.output.get().asFile)).close()
-            return
+            return null
         }
 
         super.exec()
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/BasePatchTask.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/BasePatchTask.groovy
@@ -54,29 +54,27 @@ import java.nio.file.Files
     }
 
     void setRejects(RegularFile rejects) {
-        this.rejects.set(this.providerFactory.provider {
+        this.rejects.set(this.providers.provider {
             rejects.asFile
         })
     }
 
     void setRejects(Directory rejects) {
-        this.rejects.set(this.providerFactory.provider {
+        this.rejects.set(this.providers.provider {
             rejects.asFile.tap {
                 Files.createDirectories(it.toPath())
             }
         })
     }
 
-    private final Property<File> rejects
+    private final Property<File> rejects = this.objects.property(File)
 
     @Inject
     BasePatchTask() {
         if (this.rejects instanceof DirectoryProperty)
             this.archiveRejects.unset().disallowChanges()
         if (this.patches instanceof DirectoryProperty)
             this.archivePatches.unset().disallowChanges()
-
-        this.rejects = this.objectFactory.property(File)
     }
 
     @Override
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/GeneratePatches.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/patching/diff/GeneratePatches.groovy
@@ -12,9 +12,9 @@ import org.gradle.api.tasks.OutputDirectory
 
 @CompileStatic
 abstract class GeneratePatches extends BaseDiffTask {
-    private final RegularFileProperty input = this.objectFactory.fileProperty()
-    private final RegularFileProperty modified = this.objectFactory.fileProperty()
-    private final DirectoryProperty output = this.objectFactory.directoryProperty()
+    private final RegularFileProperty input = this.objects.fileProperty()
+    private final RegularFileProperty modified = this.objects.fileProperty()
+    private final DirectoryProperty output = this.objects.directoryProperty()
 
     @InputFile RegularFileProperty getInput() { this.input }
     @InputFile RegularFileProperty getModified() { this.modified }
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/srg2source/ExtractRangeMap.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/srg2source/ExtractRangeMap.groovy
@@ -30,7 +30,7 @@ abstract class ExtractRangeMap extends S2SExec {
     abstract @Input @Optional Property<Boolean> getMixins()
     abstract @Input @Optional Property<Boolean> getMixinsFatal()
 
-    private final Property<JavaVersion> sourceCompatiblityProp
+    private final Property<JavaVersion> sourceCompatiblityProp = this.objects.property(JavaVersion)
 
     @Input @Optional Property<JavaVersion> getSourceCompatibility() {
         this.sourceCompatiblityProp
@@ -48,8 +48,6 @@ abstract class ExtractRangeMap extends S2SExec {
     ExtractRangeMap() {
         this.output.convention(this.defaultOutputFile)
 
-        this.sourceCompatiblityProp = this.objectFactory.property(JavaVersion)
-
         this.sourceCompatibility.convention(
             this.project.extensions.findByType(JavaPluginExtension).toolchain.languageVersion.map(JavaVersion.&toVersion)
         )
diff --git a/src/main/groovy/net/minecraftforge/forgedev/tasks/srg2source/S2SExec.groovy b/src/main/groovy/net/minecraftforge/forgedev/tasks/srg2source/S2SExec.groovy

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ abstract class LegacyMergeFilesTask extends DefaultTask implements ForgeDevTask`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@TaskAction`
`52`		`- void exec() {`
	`52`	`+ protected void exec() {`
`53`	`53`	`var buffer = new StringBuilder()`
`54`	`54`	`for (var config in this.filesToMerge.files) {`
`55`	`55`	`var entries = config.text`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ abstract class LegacyFilterNewJar extends DefaultTask implements ForgeDevTask {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@TaskAction`
`47`		`- void exec() {`
	`47`	`+ protected void exec() {`
`48`	`48`	`final work = this.workerExecutor.classLoaderIsolation {`
`49`	`49`	`it.classpath.from(this.workerClasspath)`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ abstract class LegacyApplyMappings extends DefaultTask implements ForgeDevTask {`
`52`	`52`	`protected abstract @Inject WorkerExecutor getWorkerExecutor()`
`53`	`53`
`54`	`54`	`@TaskAction`
`55`		`- void exec() {`
	`55`	`+ protected void exec() {`
`56`	`56`	`final work = this.workerExecutor.classLoaderIsolation {`
`57`	`57`	`it.classpath.from(this.workerClasspath)`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ abstract class LegacyGenerateSRG extends DefaultTask implements ForgeDevTask {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@TaskAction`
`58`		`- void exec() {`
	`58`	`+ protected void exec() {`
`59`	`59`	`final work = this.workerExecutor.classLoaderIsolation {`
`60`	`60`	`it.classpath.from(this.workerClasspath)`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ import org.gradle.api.provider.Property`
`11`	`11`	`import org.gradle.api.tasks.Input`
`12`	`12`	`import org.gradle.api.tasks.Optional`
`13`	`13`	`import org.gradle.api.tasks.OutputFile`
	`14`	`+import org.gradle.process.ExecResult`
`14`	`15`
`15`	`16`	`import javax.inject.Inject`
`16`	`17`	`import java.nio.file.Files`
`@@ -62,11 +63,13 @@ abstract class MavenizerMCPDataTask extends MavenizerExec {`
`62`	`63`	`}`
`63`	`64`
`64`	`65`	`@Override`
`65`		`- void exec() {`
`66`		`- super.exec()`
	`66`	`+ protected ExecResult exec() {`
	`67`	`+ var result = super.exec()`
`67`	`68`
`68`	`69`	`if (!this.output.get().asFile.exists() && this.isAllowEmpty.getOrElse(false)) {`
`69`	`70`	`Files.createFile(this.output.get().asFile.toPath())`
`70`	`71`	`}`
	`72`	`+`
	`73`	`+ return result`
`71`	`74`	`}`
`72`	`75`	`}`