Allow external configuration for additional args in ToolExecBase

In case buildscripts need to define additional arguments that cannot be
added to the task itself.

Author: Jonathing

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

@@ -211,7 +211,7 @@ final void reportToolExecEagerArgs(Task task) {
         this.getReporter().report(id(String.format("%s-eager-args", className.toLowerCase(Locale.ROOT)), String.format("%s implementation adds arguments without using addArguments()", className)), spec -> spec
             .details(String.format(
                 "A ToolExecBase task is eagerly adding arguments using JavaExec#args without using ToolExecBase#addArguments.\n" +
-                    "This may cause implementations or superclasses to have their arguments ignored or missing.\n" +
+                    "This may cause unintended behavior as the arguemnts given to the tool will contain the arguments in both of these method calls.\n" +
                     "Affected task: %s (%s)", task, task.getClass()))
             .severity(Severity.WARNING)
             .stackLocation()

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

@@ -9,15 +9,20 @@
 import org.gradle.api.file.FileSystemLocation;
 import org.gradle.api.file.FileSystemLocationProperty;
 import org.gradle.api.file.ProjectLayout;
+import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.specs.Spec;
+import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.JavaExec;
+import org.gradle.api.tasks.Optional;
 import org.jetbrains.annotations.MustBeInvokedByOverriders;
 import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 import java.io.File;
+import java.util.Collections;
+import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 
@@ -34,6 +39,11 @@ public abstract class ToolExecBase<P extends EnhancedProblems> extends JavaExec
     /// The default tool directory (usage is not required).
     protected final DirectoryProperty defaultToolDir;
 
+    /// Additional arguments to use when invoking the tool. Use in configuration instead of [#args].
+    ///
+    /// @return The list property for the additional arguments
+    abstract @Input @Optional ListProperty<String> getAdditionalArgs();
+
     /// The project layout provided by Gradle services.
     ///
     /// @return The project layout
@@ -98,17 +108,19 @@ private <T extends FileSystemLocation> Transformer<T, T> ensureFileLocationInter
     /// This method should be overridden by subclasses to add arguments to this task via [JavaExec#args]. To preserve
     /// arguments added by superclasses, this method [must be invoked by overriders][MustBeInvokedByOverriders].
     @MustBeInvokedByOverriders
-    protected void addArguments() { }
+    protected void addArguments() {
+        this.args(this.getAdditionalArgs().getOrElse(Collections.emptyList()));
+    }
 
     /// @implNote Not invoking this method from an overriding method *will* result in the tool never being executed and
     /// [#addArguments()] never being run.
     @Override
     public void exec() {
-        if (this.getArgs().isEmpty())
-            this.addArguments();
-        else
+        if (!this.getArgs().isEmpty())
             this.getProblems().reportToolExecEagerArgs(this);
 
+        this.addArguments();
+
         this.getLogger().info("{} {}", this.getClasspath().getAsPath(), String.join(" ", this.getArgs()));
 
         super.exec();