Disable transitive dependencies on tools without main classes

Make log output slightly better

Author: LexManos

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

@@ -4,7 +4,6 @@
  */
 package net.minecraftforge.gradleutils.shared;
 
-import org.gradle.api.Action;
 import org.gradle.api.Named;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.file.ConfigurableFileCollection;

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

@@ -66,6 +66,7 @@
 /// should extend from.
 /// @see JavaExec
 /// @see Tool
+@SuppressWarnings("unused") // Imports for javadocs
 public abstract class ToolExecBase<P extends EnhancedProblems> extends DefaultTask implements EnhancedTask<P> {
     private final P problems = this.getObjects().newInstance(this.problemsType());
 
@@ -282,16 +283,8 @@ protected ExecResult exec() throws IOException {
                 log.println(spec.getWorkingDir().getAbsolutePath());
                 log.print("Main class: ");
                 log.println(spec.getMainClass().getOrElse("AUTOMATIC"));
-                log.println("Arguments:");
-                for (var s : spec.getArgs()) {
-                    log.print("  ");
-                    log.println(s);
-                }
-                log.println("JVM Arguments:");
-                for (var s : spec.getAllJvmArgs()) {
-                    log.print("  ");
-                    log.println(s);
-                }
+                logArgs(log, "Arguments: ", spec.getArgs());
+                logArgs(log, "JVM Arguments: ", spec.getAllJvmArgs());
                 log.println("Classpath:");
                 for (var f : getClasspath()) {
                     log.print("  ");
@@ -302,6 +295,21 @@ protected ExecResult exec() throws IOException {
         }
     }
 
+    private static void logArgs(PrintWriter log, String prefix, List<String> args) {
+        var padding = " ".repeat(prefix.length());
+        for (int x = 0; x < args.size(); x++) {
+            log.print(x == 0 ? prefix : padding);
+            var current = args.get(x);
+            var next = args.size() > x + 1 ? args.get(x + 1) : null;
+            var line = current;
+            if (current.startsWith("--") && next != null && !next.startsWith("--")) {
+                x++;
+                line += ' ' + next;
+            }
+            log.println(line);
+        }
+    }
+
     protected final void args(Object... args) {
         this.args(Arrays.asList(args));
     }

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

@@ -6,7 +6,6 @@
 
 import net.minecraftforge.util.download.DownloadUtils;
 import net.minecraftforge.util.hash.HashStore;
-import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.ModuleVersionIdentifier;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.Directory;
@@ -88,12 +87,13 @@ public Tool.Resolved get(Provider<? extends Directory> cachesDir, ProviderFactor
 
         FileCollection classpathFromGradle = toolsExt.getObjects().fileCollection();
         var classpathFromDownload = definition.getClasspath();
+        var mainClass = definition.getMainClass().orElse(providers.provider(this::getMainClass)).getOrNull();
 
         if (classpathFromDownload.isEmpty()) {
             var overrides = fillOverrides(definition);
             classpathFromGradle = toolsExt.getProject().getConfigurations().detachedConfiguration(
                 toolsExt.getDependencies().create(overrides.artifact)
-            );
+            ).setTransitive(mainClass != null);
             classpathFromDownload = toolsExt.getObjects().fileCollection().from(
                 providers.of(Source.class, spec -> spec.parameters(parameters -> {
                     parameters.getInputFile().set(cachesDir.map(d -> d.file("tools/" + overrides.fileName)));
@@ -106,7 +106,7 @@ public Tool.Resolved get(Provider<? extends Directory> cachesDir, ProviderFactor
             toolsExt.getObjects(),
             classpathFromGradle,
             classpathFromDownload,
-            definition.getMainClass().orElse(providers.provider(this::getMainClass)),
+            mainClass,
             definition.getJavaLauncher().orElse(providers.provider(() -> SharedUtil.launcherForStrictly(toolsExt.getJavaToolchains(), this.getJavaVersion()).get()))
         );
     }
@@ -161,15 +161,15 @@ public Property<String> getArtifact() {
     final class ResolvedImpl implements ToolInternal.Resolved {
         private final FileCollection classpathFromGradle;
         private final FileCollection classpathFromDownload;
-        private final Property<String> mainClass;
+        private final @Nullable String mainClass;
         private final Property<JavaLauncher> javaLauncher;
 
         private @Nullable Boolean useGradle = null;
 
-        private ResolvedImpl(ObjectFactory objects, FileCollection classpathFromGradle, FileCollection classpathFromDownload, Provider<? extends String> mainClass, Provider<? extends JavaLauncher> javaLauncher) {
+        private ResolvedImpl(ObjectFactory objects, FileCollection classpathFromGradle, FileCollection classpathFromDownload, @Nullable String mainClass, Provider<? extends JavaLauncher> javaLauncher) {
             this.classpathFromGradle = classpathFromGradle;
             this.classpathFromDownload = classpathFromDownload;
-            this.mainClass = objects.property(String.class).value(mainClass);
+            this.mainClass = mainClass;
             this.javaLauncher = objects.property(JavaLauncher.class).value(javaLauncher);
         }
 
@@ -208,7 +208,7 @@ public int getJavaVersion() {
 
         @Override
         public @Nullable String getMainClass() {
-            return this.mainClass.getOrNull();
+            return this.mainClass;
         }
     }