Cleaned up EnhancedTask to fix some illegal access issues

Author: Jonathing

src/main/groovy/net/minecraftforge/gradleutils/shared/EnhancedProblems.java

@@ -22,7 +22,6 @@
 import org.gradle.api.reflect.TypeOf;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.VisibleForTesting;
 
 import javax.inject.Inject;
 import java.io.IOException;
@@ -165,6 +164,19 @@ Implementing subclass of ToolExecBase should also implement (a subclass of) Enha
             .solution("Double check your task implementation."));
     }
 
+    /// Reports an implementation of [EnhancedTask] that does not implement [EnhancedTask#pluginType()]
+    ///
+    /// @param task The affected task
+    public final void reportToolExecNotEnhanced(Class<?> task) {
+        this.getReporter().report(id("enhanced-task-no-plugin", "EnhancedTask doesn't implement #pluginType"), spec -> spec
+            .details("""
+                Implementation of EnhancedTask must implement #pluginType
+                Affected task type: %s""".formatted(task))
+            .severity(Severity.ERROR)
+            .stackLocation()
+            .solution("Double check your task implementation."));
+    }
+
     /// Reports an implementation of [ToolExecBase] that adds arguments without using [ToolExecBase#addArguments()]
     ///
     /// @param task The affected task

src/main/groovy/net/minecraftforge/gradleutils/shared/EnhancedTask.java

@@ -7,31 +7,44 @@
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.file.Directory;
+import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Internal;
 
+import java.io.File;
+
 /// The enhanced task contains a handful of helper methods to make working with the enhanced plugin and caches easier.
-///
-/// @param <T> The type of enhanced plugin
-public interface EnhancedTask<T extends EnhancedPlugin<? super Project>> extends Task {
+public interface EnhancedTask extends Task {
     /// The enhanced plugin type for this task.
     ///
     /// @return The plugin type
-    @Internal Class<T> getPluginType();
+    Class<? extends EnhancedPlugin<? super Project>> pluginType();
 
-    /// The enhanced plugin associated with this task.
-    ///
-    /// @return The plugin
-    default @Internal T getPlugin() {
-        return this.getProject().getPlugins().getPlugin(this.getPluginType());
+    private EnhancedPlugin<? super Project> getPlugin() {
+        return this.getProject().getPlugins().getPlugin(this.pluginType());
+    }
+
+    /// @see EnhancedPlugin#getTool(Tool)
+    default Provider<File> getTool(Tool tool) {
+        return this.getPlugin().getTool(tool);
+    }
+
+    /// @see EnhancedPlugin#globalCaches()
+    default DirectoryProperty globalCaches() {
+        return this.getPlugin().globalCaches();
+    }
+
+    /// @see EnhancedPlugin#localCaches()
+    default DirectoryProperty localCaches() {
+        return this.getPlugin().localCaches();
     }
 
     /// The default output directory to use for this task if it outputs a directory.
     ///
     /// @return A provider for the directory
     default @Internal Provider<Directory> getDefaultOutputDirectory() {
-        return this.getPlugin().localCaches().dir(this.getName()).map(this.getPlugin().getProblemsInternal().ensureFileLocation());
+        return this.localCaches().dir(this.getName()).map(this.getPlugin().getProblemsInternal().ensureFileLocation());
     }
 
     /// The default output file to use for this task if it outputs a file. Uses the `.jar` extension.
@@ -46,6 +59,6 @@ public interface EnhancedTask<T extends EnhancedPlugin<? super Project>> extends
     /// @param ext The extension to use for the file
     /// @return A provider for the file
     default Provider<RegularFile> getDefaultOutputFile(String ext) {
-        return this.getPlugin().localCaches().file("%s/output.%s".formatted(this.getName(), ext)).map(this.getPlugin().getProblemsInternal().ensureFileLocation());
+        return this.localCaches().file("%s/output.%s".formatted(this.getName(), ext)).map(this.getPlugin().getProblemsInternal().ensureFileLocation());
     }
 }

src/main/groovy/net/minecraftforge/gradleutils/shared/ToolExecBase.java

@@ -49,11 +49,11 @@ public abstract class ToolExecBase<P extends EnhancedProblems> extends JavaExec
     protected ToolExecBase(Class<P> problemsType, Tool tool) {
         this.problems = this.getObjectFactory().newInstance(problemsType);
 
-        if (this instanceof EnhancedTask<?> enhancedTask) {
+        if (this instanceof EnhancedTask enhancedTask) {
             this.defaultToolDir = this.getObjectFactory().directoryProperty().value(
-                enhancedTask.getPlugin().globalCaches().dir(tool.getName().toLowerCase(Locale.ENGLISH)).map(this.ensureFileLocationInternal())
+                enhancedTask.globalCaches().dir(tool.getName().toLowerCase(Locale.ENGLISH)).map(this.ensureFileLocationInternal())
             );
-            this.setClasspath(this.getObjectFactory().fileCollection().from(enhancedTask.getPlugin().getTool(tool)));
+            this.setClasspath(this.getObjectFactory().fileCollection().from(enhancedTask.getTool(tool)));
         } else {
             this.getProject().afterEvaluate(project -> this.problems.reportToolExecNotEnhanced(this));