Preliminary support for multiple MC deps

- The primary limitation is that run configurations cannot be generated
for source sets with more than one Minecraft dependency

Author: Jonathing

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

@@ -8,7 +8,7 @@
 import org.gradle.api.plugins.PluginAware;
 
 record ForgeGradleExtensionImpl() implements ForgeGradleExtension {
-    static <T extends ExtensionAware & PluginAware> void register(T target) {
+    static void register(ExtensionAware target) {
         target.getExtensions().add(
             ForgeGradleExtension.class,
             ForgeGradleExtension.NAME,

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

@@ -35,7 +35,7 @@ import javax.inject.Inject
  */
 @CompileStatic
 @PackageScope([PackageScopeTarget.CLASS, PackageScopeTarget.FIELDS])
-class ForgeGradlePlugin<T extends ExtensionAware & PluginAware> implements Plugin<T> {
+class ForgeGradlePlugin implements Plugin<ExtensionAware> {
     /** The global logger for ForgeGradle, mostly used within {@link ForgeGradleProblems}. */
     static final Logger LOGGER = Logging.getLogger("ForgeGradle")
 
@@ -62,7 +62,7 @@ class ForgeGradlePlugin<T extends ExtensionAware & PluginAware> implements Plugi
      * @param target The target to apply the plugin to
      */
     @Override
-    void apply(T target) {
+    void apply(ExtensionAware target) {
         this.globalCaches = this.objects.directoryProperty().convention(
             this.objects.directoryProperty().fileValue(this.getGradleUserHomeDir(target)).dir(Constants.CACHES_LOCATION).map(this.enhancedProblems.ensureDirectory())
         )
@@ -98,7 +98,7 @@ class ForgeGradlePlugin<T extends ExtensionAware & PluginAware> implements Plugi
     }
 
     @CompileDynamic
-    private File getGradleUserHomeDir(T target) {
+    private File getGradleUserHomeDir(ExtensionAware target) {
         try {
             target.gradle.startParameter.gradleUserHomeDir
         } catch (Throwable e) {

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

@@ -8,7 +8,6 @@
 import org.gradle.api.Transformer;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.ExternalModuleDependency;
-import org.gradle.api.artifacts.FileCollectionDependency;
 import org.gradle.api.file.Directory;
 import org.gradle.api.problems.Problem;
 import org.gradle.api.problems.ProblemGroup;
@@ -175,7 +174,7 @@ RuntimeException invalidMinecraftDependencyType(Dependency dependency) {
                 This means that it cannot be substituted with file or project dependencies.
                 Expected: (implementation of) %s, Actual: '%s
                 Dependency: '%s'"""
-                .formatted(ExternalModuleDependency.class.getName(), dependency.getClass().getName(), depToString(dependency)))
+                .formatted(ExternalModuleDependency.class.getName(), dependency.getClass().getName(), Util.toString(dependency)))
             .severity(Severity.ERROR)
             .stackLocation()
             .solution("Declare a module dependency instead.")
@@ -199,49 +198,24 @@ void reportMissingMetadata(Throwable throwable) {
         );
     }
 
-    RuntimeException multipleMinecraftDependencies(Dependency current, Dependency replacement) {
-        return this.getReporter().throwing(new IllegalArgumentException("Cannot have more than one Minecraft dependency"), id("multiple-minecraft-dependencies", "Multiple Minecraft dependencies declared"), spec -> spec
-            .details("""
-                Attempted to use multiple Minecraft dependencies. Only one can be declared
-                Current: %s, Replacement: '%s'"""
-                .formatted(depToString(current), depToString(replacement)))
-            .severity(Severity.ERROR)
-            .stackLocation()
-            .solution("Declare only one Minecraft dependency using `minecraft.dep(...)`.")
-            .solution(HELP_MESSAGE)
-        );
-    }
-
     RuntimeException changingMinecraftDependency(Dependency dependency) {
         return this.getReporter().throwing(new IllegalArgumentException("Minecraft dependency cannot be changing"), id("changing-minecraft-dependency", "Minecraft dependency marked as changing"), spec -> spec
             .details("""
                 Attempted to use a Minecraft dependency that was marked as changing.
                 This is currently unsupported.
                 Dependency: %s"""
-                .formatted(depToString(dependency)))
+                .formatted(Util.toString(dependency)))
             .severity(Severity.ERROR)
             .solution("Do not mark the Minecraft dependency as changing.")
             .solution(HELP_MESSAGE)
         );
     }
-
-    private static String depToString(Dependency dependency) {
-        var group = dependency.getGroup();
-        var version = dependency.getVersion();
-        var reason = dependency.getReason();
-        return "(%s) %s%s%s%s%s".formatted(
-            dependency.getClass().getName(),
-            group != null ? group + ':' : "",
-            dependency.getName(),
-            version != null ? ':' + version : "",
-            reason != null ? " (" + reason + ')' : "",
-            dependency instanceof FileCollectionDependency files ? " [%s]".formatted(String.join(", ", files.getFiles().getFiles().stream().map(File::getAbsolutePath).map(CharSequence.class::cast)::iterator)) : ""
-        );
-    }
     //endregion
 
     //region Minecraft Maven
     void reportMcMavenNotDeclared() {
+        if (!properties.test("net.minecraftforge.gradle.warnings.missingRepository.mcmaven")) return;
+
         this.getReporter().report(id("minecraft-maven-not-declared", "Minecraft Maven not declared"), spec -> spec
             .details("""
                 ForgeGradle was configured to sync the Minecraft Maven, but it was not declared as a repository!
@@ -253,6 +227,8 @@ void reportMcMavenNotDeclared() {
     }
 
     void reportMcLibsMavenNotDeclared() {
+        if (!properties.test("net.minecraftforge.gradle.warnings.missingRepository.mclibs")) return;
+
         this.getReporter().report(id("minecraft-libs-maven-not-declared", "Minecraft Libraries maven not declared"), spec -> spec
             .details("""
                 ForgeGradle was configured to sync the Minecraft Maven, but the Minecraft Libraries maven was not declared!
@@ -265,6 +241,8 @@ void reportMcLibsMavenNotDeclared() {
     }
 
     void reportForgeMavenNotDeclared() {
+        if (!properties.test("net.minecraftforge.gradle.warnings.missingRepository.forge")) return;
+
         this.getReporter().report(id("forge-maven-not-declared", "Forge maven not declared"), spec -> spec
             .details("""
                 ForgeGradle was configured to sync the Minecraft Maven, but the Forge maven was not declared!
@@ -275,26 +253,14 @@ void reportForgeMavenNotDeclared() {
             .solution(HELP_MESSAGE)
         );
     }
-
-    void reportMcMavenNotFound(Throwable e) {
-        this.getReporter().report(id("minecraft-maven-not-found", "Minecraft Maven not found"), spec -> spec
-            .details("""
-                Attempted to sync the Minecraft Maven, but the Minecraft Mavenizer tool was not found!""")
-            .withException(e)
-            .severity(Severity.ERROR)
-            .solution("Ensure that the Forge Maven (`fg.forgeMaven`) exists in your project/settings repositories.")
-            .solution("If you are using a custom tool, ensure that you added your repository and it is up and running.")
-            .solution(HELP_MESSAGE)
-        );
-    }
     //endregion
 
     //region Deobfuscation
     RuntimeException invalidDeobfDependencyType(Dependency dependency) {
-        return this.getReporter().throwing(new IllegalArgumentException("Non-module dependencies are not currently supported"), id("unsupported-dependency-type", "Non-module dependency used as Minecraft/deobf dependency"), spec -> spec
+        return this.getReporter().throwing(new IllegalArgumentException("Non-module deobf dependencies are not supported"), id("unsupported-dependency-type", "Non-module dependency used as Minecraft/deobf dependency"), spec -> spec
             .details("""
                 Attempted to use a non-module dependency as a deobf dependency, which is currently unsupported.
-                Support for file dependencies will come at a later time. Project dependencies are not supported.
+                Support for file dependencies may come at a later time. Project dependencies will not be supported.
                 Expected: (implementation of) %s, Actual: '%s
                 Dependency: '%s'"""
                 .formatted(ExternalModuleDependency.class.getName(), dependency.getClass().getName(), dependency.toString()))

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.gradle;
+
+import org.gradle.api.Task;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.provider.Provider;
+
+import java.io.File;
+
+interface ForgeGradleTask extends Task {
+    private ForgeGradlePlugin getPlugin() {
+        return this.getProject().getPlugins().getPlugin(ForgeGradlePlugin.class);
+    }
+
+    default Provider<File> getTool(Tools tool) {
+        return this.getPlugin().getTool(tool);
+    }
+
+    default DirectoryProperty getGlobalCaches() {
+        return this.getPlugin().getGlobalCaches();
+    }
+}

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

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) Forge Development LLC and contributors
+ * SPDX-License-Identifier: LGPL-2.1-only
+ */
+package net.minecraftforge.gradle;
+
+import groovy.lang.Closure;
+import groovy.lang.DelegatesTo;
+import groovy.transform.Generated;
+import groovy.transform.NamedParam;
+import groovy.transform.NamedParams;
+import groovy.transform.NamedVariant;
+import groovy.transform.stc.ClosureParams;
+import groovy.transform.stc.SimpleType;
+import net.minecraftforge.accesstransformers.gradle.AccessTransformersContainer;
+import org.gradle.api.Action;
+import org.gradle.api.artifacts.ExternalModuleDependency;
+import org.gradle.api.file.RegularFile;
+import org.gradle.api.provider.Provider;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.Map;
+
+public sealed interface MinecraftDependency extends ExternalModuleDependency permits MinecraftDependencyInternal {
+    @Nullable MinecraftExtension.Mappings getMappings();
+
+    /**
+     * Sets the mappings to use for the Minecraft Maven.
+     * <p>This method includes a generated named variant that can make declaration in your buildscript easier.</p>
+     * <pre><code>
+     * minecraft {
+     *     mappings channel: 'official', version: '1.21.5'
+     * }
+     * </code></pre>
+     *
+     * @param channel The mappings channel
+     * @param version The mappings version
+     * @throws IllegalArgumentException If any parameter is {@code null}
+     * @apiNote Mappings should only be declared once. A warning will be reported on re-declaration.
+     * @see <a href="https://docs.groovy-lang.org/latest/html/api/groovy/transform/NamedVariant.html">NamedVariant</a>
+     */
+    @NamedVariant
+    void mappings(String channel, String version);
+
+    /// Sets the mappings to use for the Minecraft Maven.
+    ///
+    /// This method is generated by Groovy in the implementing class, but has been included here for convenience and IDE
+    /// support.
+    ///
+    /// @param namedArgs The named arguments
+    /// @throws IllegalArgumentException If any parameter is `null`
+    /// @apiNote Mappings should only be declared once. A warning will be reported on re-declaration.
+    /// @see #mappings(String, String)
+    @Contract // empty contract so IDEs don't think this method always fails
+    @Generated
+    @SuppressWarnings("rawtypes")
+    default void mappings(
+        @NamedParams({
+            @NamedParam(
+                type = String.class,
+                value = "channel",
+                required = true
+            ),
+            @NamedParam(
+                type = String.class,
+                value = "version",
+                required = true
+            )
+        }) Map namedArgs
+    ) {
+        throw new IllegalStateException("Groovy did not generate MinecraftExtension.mappings(Map)");
+    }
+
+    /// Sets the AccessTransformer configuration to use.
+    ///
+    /// @param configFile The configuration file to use
+    void setAccessTransformer(RegularFile configFile);
+
+    /// Sets the AccessTransformer configuration to use.
+    ///
+    /// @param configFile The configuration file to use
+    void setAccessTransformer(File configFile);
+
+    /// Sets the AccessTransformer configuration to use.
+    ///
+    /// The given object is resolved using [org.gradle.api.Project#file(Object)].
+    ///
+    /// @param configFile The configuration file to use
+    void setAccessTransformer(Object configFile);
+
+    /// Sets the AccessTransformer configuration to use.
+    ///
+    /// If the given provider does not provide a [file][File] or [regular file][RegularFile], the result will be
+    /// resolved using [org.gradle.api.Project#file(Object)], similarly to [#setAccessTransformer(Object)].
+    ///
+    /// @param configFile The configuration file to use
+    void setAccessTransformer(Provider<?> configFile);
+
+    /// Configures the AccessTransformer options for this project.
+    ///
+    /// @param options The options to apply
+    default void accessTransformer(Action<? super AccessTransformersContainer.Options> options) {
+        this.accessTransformer(Closures.action(this, options));
+    }
+
+    /// Configures the AccessTransformer options for this project.
+    ///
+    /// @param options The options to apply
+    @SuppressWarnings("rawtypes") // public-facing closure
+    void accessTransformer(
+        @DelegatesTo(value = AccessTransformersContainer.Options.class, strategy = Closure.DELEGATE_FIRST)
+        @ClosureParams(value = SimpleType.class, options = "net.minecraftforge.accesstransformers.gradle.AccessTransformersContainer.Options")
+        Closure options
+    );
+
+
+    /* DEPENDENCY OVERRIDES */
+
+    @Override
+    default boolean isChanging() {
+        return false;
+    }
+
+    @Override
+    default MinecraftDependency setChanging(boolean changing) {
+        return this;
+    }
+
+    @Override
+    MinecraftDependency copy();
+}