Fix various extraneous things

Author: Jonathing

settings.gradle

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

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

@@ -18,7 +18,7 @@ private Constants() { }
     static final int MAVENIZER_JAVA = 25;
 
     static final String DIFFPATCH_NAME = "diffpatch";
-    static final String DIFFPATCH_VERSION = "2.0.1.39";
+    static final String DIFFPATCH_VERSION = "2.1.0.42";
     static final String DIFFPATCH_DL_URL = MAVEN_CENTRAL + "io/codechicken/DiffPatch/" + DIFFPATCH_VERSION + "/DiffPatch-" + DIFFPATCH_VERSION + "-all.jar";
     static final String DIFFPATCH_MAIN = "io.codechicken.diffpatch.cli.DiffPatchCli";
     static final int DIFFPATCH_JAVA = 8;
@@ -30,7 +30,7 @@ private Constants() { }
     static final int BINPATCH_JAVA = 8;
 
     static final String FART_NAME = "fart";
-    static final String FART_VERSION = "1.1.0";
+    static final String FART_VERSION = "1.1.1";
     static final String FART_DL_URL = FORGE_MAVEN + "net/minecraftforge/ForgeAutoRenamingTool/" + FART_VERSION + "/ForgeAutoRenamingTool-" + FART_VERSION + "-all.jar";
     static final String FART_MAIN = "net.minecraftforge.fart.Main";
     static final int FART_JAVA = 8;

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

@@ -194,6 +194,7 @@ private void setup(ForgeDevPlugin plugin, Project project) {
             task.getInput().set(jar.flatMap(Jar::getArchiveFile));
             // TODO Optimize this to use a detached configuraiton
             task.getLibraries().from(project.getConfigurations().named(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME));
+            task.getOutput().convention(task.getDefaultOutputFile());
         });
 
         var genJoinedBinPatches = tasks.register("genJoinedBinPatches", CreateBinPatches.class, task -> {

src/main/groovy/net/minecraftforge/forgedev/tasks/obfuscation/LegacyReobfuscateJar.groovy

@@ -75,7 +75,7 @@ abstract class LegacyReobfuscateJar extends ToolExec {
 
         var argsList = [
             '--input', this.input.get().asFile.absolutePath,
-            '--srg', this.srg.get().asFile.absolutePath,
+            '--map', this.srg.get().asFile.absolutePath,
             '--output', this.temporaryOutput.absolutePath
         ]
 
@@ -92,7 +92,7 @@ abstract class LegacyReobfuscateJar extends ToolExec {
 
     @Override
     protected ExecResult exec() {
-        var result = super.exec()
+        var result = super.exec().rethrowFailure().assertNormalExitValue()
 
         final work = this.workerExecutor.classLoaderIsolation {
             it.classpath.from(this.workerActionClasspath)

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

@@ -28,9 +28,9 @@ abstract class ApplyRangeMap extends S2SExec {
     abstract @Input @Optional Property<Boolean> getKeepImports()
     abstract @Input @Optional @Deprecated Property<Boolean> getAnnotate()
 
-    abstract @Input Property<Boolean> getSortImports()
-    abstract @Input Property<Boolean> getGuessLambdas()
-    abstract @Input Property<Boolean> getGuessLocals()
+    abstract @Input @Optional Property<Boolean> getSortImports()
+    abstract @Input @Optional Property<Boolean> getGuessLambdas()
+    abstract @Input @Optional Property<Boolean> getGuessLocals()
 
     @Inject
     ApplyRangeMap() {

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

@@ -37,9 +37,9 @@ import javax.inject.Inject
     }
 
     protected final String parseSourceCompatibility(JavaVersion javaVersion) {
-        final version = javaVersion.toString()
-        final split = version.split('\\.')
-        if (split.length > 0 && split[1].toInteger() < SRC_COMPAT_MIN) {
+        int version = javaVersion.ordinal() + 1
+
+        if (version < SRC_COMPAT_MIN) {
             this.logger.warn('WARNING: {} source compatibility {} is lower than minimum of {}', this.identityPath, version, SRC_COMPAT_MIN_STR)
             return SRC_COMPAT_MIN_STR
         } else if (version.toInteger() > SRC_COMPAT_MAX) {