Automatically merge sourceSet destinations (can opt-out)

use net.minecraftforge.gradle.mergeSourceSets=false in gradle.properties
or as a system property

Author: Jonathing

settings.gradle

@@ -30,7 +30,7 @@ dependencyResolutionManagement {
 
         // AccessTransformers Gradle Plugin
         // https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
-        version 'accesstransformers', '1.0.0'
+        version 'accesstransformers', '1.0.1'
         library 'accesstransformers-plugin', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' versionRef 'accesstransformers'
         library 'accesstransformers-binary', 'net.minecraftforge', 'accesstransformers-gradle' versionRef 'accesstransformers'
         bundle 'accesstransformers', ['accesstransformers-plugin', 'accesstransformers-binary']

src/main/groovy/net/minecraftforge/gradle/ForgeGradleProblems.java

@@ -46,7 +46,7 @@ public ProblemReporter getReporter() {
     }
 
     ForgeGradleProblems(Problems problems, ProviderFactory providers) {
-        this(problems, property -> hasProperty(providers, property));
+        this(problems, property -> Util.isTrue(providers, property));
     }
 
     ForgeGradleProblems(Callable<? extends @UnknownNullability Problems> problems, Callable<? extends @UnknownNullability ProviderFactory> providers) {
@@ -61,17 +61,12 @@ private static Predicate<String> unwrapProperties(Callable<? extends @UnknownNul
         return Util.tryElse(
             () -> {
                 var providers = Objects.requireNonNull(supplier.call());
-                return property -> hasProperty(providers, property);
+                return property -> Util.isTrue(providers, property);
             },
             Boolean::getBoolean
         );
     }
 
-    private static boolean hasProperty(ProviderFactory providers, String property) {
-        return Util.isTrue(providers.gradleProperty(property))
-            || Util.isTrue(providers.systemProperty(property));
-    }
-
     private static ProblemId id(String name, String displayName) {
         return ProblemId.create(name, displayName, GROUP);
     }

src/main/groovy/net/minecraftforge/gradle/ForgeGradleTask.java

@@ -7,6 +7,7 @@
 import org.gradle.api.Task;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.tasks.Internal;
 
 import java.io.File;
 
@@ -15,10 +16,12 @@ private ForgeGradlePlugin getPlugin() {
         return this.getProject().getPlugins().getPlugin(ForgeGradlePlugin.class);
     }
 
+    @Internal
     default Provider<File> getTool(Tools tool) {
         return this.getPlugin().getTool(tool);
     }
 
+    @Internal
     default DirectoryProperty getGlobalCaches() {
         return this.getPlugin().getGlobalCaches();
     }

src/main/groovy/net/minecraftforge/gradle/MinecraftExtensionImpl.groovy

@@ -85,7 +85,7 @@ import java.util.function.BiFunction
         this.plugin = plugin
         this.objects = objects
 
-        this.output = objects.directoryProperty().convention(plugin.globalCaches.dir('mc-maven/output').map(problems.ensureDirectory()))
+        this.output = objects.directoryProperty().convention(plugin.globalCaches.dir('mavenizer/output').map(problems.ensureDirectory()))
 
         this.mappingsProp = objects.property(Mappings)
     }
@@ -233,8 +233,16 @@ import java.util.function.BiFunction
             if (!repositories.mclibs)
                 MinecraftExtensionImpl.this.problems.reportMcLibsMavenNotDeclared()
 
-            if (!this.runs.empty) {
-                this.project.getExtensions().getByType(JavaPluginExtension).sourceSets.forEach { sourceSet ->
+            var sourceSetsDir = objects.directoryProperty().value(this.layout.buildDirectory.dir('sourceSets'))
+            this.project.getExtensions().getByType(JavaPluginExtension).sourceSets.configureEach { sourceSet ->
+                if (!Util.isFalse(this.providers, 'net.minecraftforge.gradle.mergeSourceSets')) {
+                    // This is documented in SourceSetOutput's javadoc comment
+                    var unifiedDir = sourceSetsDir.dir(sourceSet.name)
+                    sourceSet.output.resourcesDir = unifiedDir
+                    sourceSet.java.destinationDirectory.set unifiedDir
+                }
+
+                if (!this.runs.empty) {
                     var allDependencies = this.project.configurations.findByName(sourceSet.runtimeClasspathConfigurationName)?.allDependencies?.findAll { this.minecraftDependencies.contains(it) }
 
                     if (allDependencies === null || allDependencies.empty) {

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

@@ -75,9 +75,9 @@ public SyncMinecraftMaven(Problems problems, ObjectFactory objects, ProviderFact
         this.getMainClass().convention(Constants.MCMAVEN_MAIN);
 
         // Minecraft Maven
-        var defaultDirectory = objects.directoryProperty().value(this.getGlobalCaches().dir("mcmaven"));
-        this.getCaches().convention(defaultDirectory.dir("cache"));
-        this.getOutput().convention(defaultDirectory.dir("output"));
+        var defaultDirectory = objects.directoryProperty().value(this.getGlobalCaches().dir("mavenizer").map(this.problems.ensureDirectory()));
+        this.getCaches().convention(defaultDirectory.dir("cache").map(this.problems.ensureDirectory()));
+        this.getOutput().convention(defaultDirectory.dir("output").map(this.problems.ensureDirectory()));
 
         this.onlyIf(
             "Minecraft Mavenizer will not run if no Minecraft dependencies are present.",
@@ -97,7 +97,7 @@ public void exec() {
     private void exec(Request request) {
         this.execOperations.javaexec(spec -> {
             spec.setClasspath(this.getExecutable());
-            spec.setExecutable(this.getJavaLauncher());
+            spec.setExecutable(this.getJavaLauncher().get());
             spec.getMainClass().set(this.getMainClass());
 
             spec.setArgs(this.argsFor(request));
@@ -108,6 +108,7 @@ private List<String> argsFor(Request request) {
         return List.of(
             "--maven",
             "--cache", this.getCaches().get().getAsFile().getAbsolutePath(),
+            "--output", this.getOutput().get().getAsFile().getAbsolutePath(),
             "--jdk-cache", this.getCaches().dir("jdks").get().getAsFile().getAbsolutePath(),
             "--artifact", request.module,
             "--version", request.version

src/main/groovy/net/minecraftforge/gradle/Util.java

@@ -13,6 +13,7 @@
 import org.gradle.api.artifacts.ModuleVersionSelector;
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.Provider;
+import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.tasks.TaskProvider;
 import org.gradle.jvm.toolchain.JavaLanguageVersion;
 import org.gradle.jvm.toolchain.JavaLauncher;
@@ -98,8 +99,35 @@ static String artifactPath(String group, String name, String version, @Nullable
         return s == null || s.isBlank() ? null : s;
     }
 
-    static boolean isTrue(Provider<? extends String> provider) {
-        return provider.map(Boolean::parseBoolean).getOrElse(false);
+    static @Nullable String getProperty(ProviderFactory providers, String property) {
+        return providers.gradleProperty(property).orElse(providers.systemProperty(property)).getOrNull();
+    }
+
+    static @Nullable Boolean getBoolean(ProviderFactory providers, String property) {
+        var gradleBoolean = getBoolean(providers.gradleProperty(property));
+        return gradleBoolean != null ? gradleBoolean : getBoolean(providers.systemProperty(property));
+    }
+
+    private static @Nullable Boolean getBoolean(Provider<? extends String> provider) {
+        if (Boolean.TRUE.equals(provider.map("true"::equalsIgnoreCase).getOrNull())) return true;
+        if (Boolean.FALSE.equals(provider.map("false"::equalsIgnoreCase).getOrNull())) return false;
+        return null;
+    }
+
+    static boolean isTrue(ProviderFactory providers, String property) {
+        return isTrue(providers.gradleProperty(property)) || isTrue(providers.systemProperty(property));
+    }
+
+    private static boolean isTrue(Provider<? extends String> provider) {
+        return Boolean.TRUE.equals(getBoolean(provider));
+    }
+
+    static boolean isFalse(ProviderFactory providers, String property) {
+        return isFalse(providers.gradleProperty(property)) || isFalse(providers.systemProperty(property));
+    }
+
+    private static boolean isFalse(Provider<? extends String> provider) {
+        return Boolean.FALSE.equals(getBoolean(provider));
     }
 
     static <T> T tryElse(Callable<? extends T> value, T orElse) {