Use Tool definition system from GradleUtils Shared

Author: Jonathing

settings.gradle

@@ -4,7 +4,7 @@ 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.2.5' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'net.minecraftforge.gradleutils' version '3.2.7' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
 }
 
 rootProject.name = 'forgegradle'
@@ -35,7 +35,7 @@ dependencyResolutionManagement {
         library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
 
         // GradleUtils Shared Base
-        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.2.5'
+        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.2.7'
 
         // AccessTransformers Gradle Plugin
         // https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers

src/main/java/net/minecraftforge/gradle/ForgeGradlePlugin.java

@@ -19,13 +19,12 @@ abstract class ForgeGradlePlugin extends EnhancedPlugin<ExtensionAware> {
 
     @Inject
     public ForgeGradlePlugin() {
-        super(NAME, DISPLAY_NAME);
+        super(NAME, DISPLAY_NAME, "fgtools");
     }
 
     @Override
     public void setup(ExtensionAware target) {
         ForgeGradleExtensionImpl.register(this, target);
-        ToolsExtensionImpl.register(this, target);
         MinecraftExtensionImpl.register(this, target);
     }
 }

src/main/java/net/minecraftforge/gradle/MinecraftDependencyWithAccessTransformers.java

@@ -13,6 +13,8 @@
 ///
 /// @see MinecraftDependency
 public sealed interface MinecraftDependencyWithAccessTransformers extends MinecraftDependency permits ClosureOwner.MinecraftDependencyWithAccessTransformers, MinecraftDependencyInternal.WithAccessTransformers {
+    /// The default path, from the source set's [resources][org.gradle.api.tasks.SourceSet#getResources()], for the
+    /// AccessTransformers config to be located in.
     String DEFAULT_PATH = "META-INF/accesstransformer.cfg";
 
     /// Gets the AccessTransformer configuration to use.

src/main/java/net/minecraftforge/gradle/SlimeLauncherExec.java

@@ -35,19 +35,10 @@
 
 abstract class SlimeLauncherExec extends ToolExec implements EnhancedTask, HasPublicType {
     static void register(Project project, SourceSet sourceSet, SlimeLauncherOptionsImpl options, Map<String, RunConfig> configs, Dependency dependency, Provider<RegularFile> metadataZip, boolean single) {
-        var tools = (ToolsExtensionImpl) project.getExtensions().getByType(ToolsExtension.class);
         var taskName = sourceSet.getTaskName("run", options.getName());
         project.getTasks().register(single ? taskName : taskName + Util.dependencyToCamelCase(dependency), SlimeLauncherExec.class, task -> {
             task.setDescription("Runs the '%s' Slime Launcher run configuration.".formatted(options.getName()));
 
-            // TOOL OVERRIDES
-            var classpathToolOverride = tools.getClasspath(Tools.SLIMELAUNCHER);
-            if (classpathToolOverride.isPresent())
-                task.setClasspath(classpathToolOverride.get());
-            var mainClassToolOverride = tools.getMainClass(Tools.SLIMELAUNCHER);
-            if (mainClassToolOverride.isPresent())
-                task.getMainClass().set(mainClassToolOverride);
-
             task.classpath(task.getObjectFactory().fileCollection().from(task.getProviderFactory().provider(sourceSet::getRuntimeClasspath)));
             task.getJavaLauncher().unset();
 

src/main/java/net/minecraftforge/gradle/SyncMinecraftMaven.java

@@ -20,9 +20,11 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.Internal;
+import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskProvider;
+import org.gradle.jvm.toolchain.JavaLauncher;
 import org.gradle.process.ExecOperations;
 
 import javax.inject.Inject;
@@ -64,10 +66,10 @@ public SyncMinecraftMaven() {
         this.setDescription("Syncs the Minecraft dependencies using Minecraft Mavenizer.");
 
         // JavaExec
-        var fgtools = (ToolsExtensionImpl) this.getProject().getExtensions().getByType(ToolsExtension.class);
-        this.getExecutable().convention(fgtools.getClasspath(Tools.MAVENIZER).map(Object.class::cast).orElse(this.getTool(Tools.MAVENIZER)));
-        this.getJavaLauncher().convention(fgtools.getJavaLauncher(Tools.MAVENIZER).orElse(Util.launcherForStrictly(this.getProject(), Tools.MAVENIZER.getJavaVersion()).map(j -> j.getExecutablePath().toString())));
-        this.getMainClass().convention(fgtools.getMainClass(Tools.MAVENIZER).orElse(Tools.MAVENIZER.getMainClass()));
+        var tool = this.getTool(Tools.MAVENIZER);
+        this.getExecutable().convention(tool.getClasspath());
+        this.getJavaLauncher().convention(tool.getJavaLauncher());
+        this.getMainClass().convention(tool.getMainClass());
 
         // Minecraft Maven
         var defaultDirectory = this.getObjects().directoryProperty().value(this.globalCaches().dir("mavenizer").map(this.problems.ensureFileLocation()));
@@ -102,7 +104,7 @@ public void exec() {
     private void exec(Request request) {
         this.getExecOperations().javaexec(spec -> {
             spec.setClasspath(this.getExecutable());
-            spec.setExecutable(this.getJavaLauncher().get());
+            spec.setExecutable(this.getJavaLauncher().get().getExecutablePath());
             spec.getMainClass().set(this.getMainClass());
 
             spec.setArgs(this.argsFor(request));
@@ -127,7 +129,7 @@ private List<String> argsFor(Request request) {
 
     // JavaExec
     protected abstract @Classpath ConfigurableFileCollection getExecutable();
-    protected abstract @Input Property<String> getJavaLauncher();
+    protected abstract @Nested Property<JavaLauncher> getJavaLauncher();
     protected abstract @Input Property<String> getMainClass();
 
     // Minecraft Mavenizer