Dependency constaints are now created using only the module

Author: Jonathing

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

@@ -7,6 +7,7 @@ package net.minecraftforge.gradle
 import groovy.transform.CompileStatic
 import groovy.transform.NamedVariant
 import groovy.transform.PackageScope
+import groovy.transform.PackageScopeTarget
 import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.SimpleType
 import net.minecraftforge.accesstransformers.gradle.AccessTransformersContainer
@@ -28,33 +29,32 @@ import org.jetbrains.annotations.Nullable
 import java.util.function.Supplier
 
 @CompileStatic
-@PackageScope final class MinecraftDependencyImpl implements MinecraftDependencyInternal {
+@PackageScope([PackageScopeTarget.CLASS, PackageScopeTarget.CONSTRUCTORS])
+final class MinecraftDependencyImpl implements MinecraftDependencyInternal {
     private static final String AT_COUNT_NAME = 'fg_minecraft_atcontainers'
 
     final ExternalModuleDependency delegate
 
     private final Project project
     private final ForgeGradleProblems problems
     private final ObjectFactory objects
+    private final ProviderFactory providers
 
     private final Property<MinecraftExtension.Mappings> mappingsProp
 
     private final Util.ActionableLazy<AccessTransformersContainer> atContainer
 
-    MinecraftDependencyImpl(Dependency dependency, Project project, Problems problems, ObjectFactory objects, ProviderFactory providers) {
-        this(dependency, project, new ForgeGradleProblems(problems, providers), objects)
+    MinecraftDependencyImpl(Dependency dependency, Project project, ForgeGradleProblems problems, ObjectFactory objects, ProviderFactory providers) {
+        this(dependency, project, problems, objects, providers, (Util.ActionableLazy<AccessTransformersContainer>) null)
     }
 
-    MinecraftDependencyImpl(Dependency dependency, Project project, ForgeGradleProblems problems, ObjectFactory objects) {
-        this(dependency, project, problems, objects, (Util.ActionableLazy<AccessTransformersContainer>) null)
-    }
-
-    MinecraftDependencyImpl(Dependency dependency, Project project, ForgeGradleProblems problems, ObjectFactory objects, @Nullable Util.ActionableLazy<AccessTransformersContainer> atContainer) {
+    MinecraftDependencyImpl(Dependency dependency, Project project, ForgeGradleProblems problems, ObjectFactory objects, ProviderFactory providers, @Nullable Util.ActionableLazy<AccessTransformersContainer> atContainer) {
         this.delegate = validateDependency(dependency, problems)
 
         this.project = project
         this.problems = problems
         this.objects = objects
+        this.providers = providers
 
         this.mappingsProp = objects.property(MinecraftExtension.Mappings)
 
@@ -92,12 +92,14 @@ import java.util.function.Supplier
     }
 
     @PackageScope void finish(Supplier<MinecraftExtension.Mappings> defaultMappings, Util.ActionableLazy<AccessTransformersContainer> defaultATs) {
-        var mappings = this.mappingsProp.tap { finalizeValue() }.getOrElse(defaultMappings.get())
+        var mappings = this.mappingsProp.convention(this.providers.provider { defaultMappings.get() }).tap { finalizeValue() } .get()
 
         this.project.configurations.forEach { configuration ->
             if (!configuration.canBeDeclared) return
 
-            configuration.dependencyConstraints.add(this.project.dependencies.constraints.create(this.delegate) { constraint ->
+            configuration.dependencyConstraints.add(this.project.dependencies.constraints.create(this.delegate.module.toString()) { constraint ->
+                constraint.because('Accounts for mappings used and natives variants')
+
                 constraint.attributes { attributes ->
                     attributes.attribute(MinecraftExtension.Attributes.os, objects.named(OperatingSystemFamily, OperatingSystem.current().familyName))
                     attributes.attribute(MinecraftExtension.Attributes.mappingsChannel, mappings.channel())
@@ -159,6 +161,6 @@ import java.util.function.Supplier
 
     @Override
     MinecraftDependency copy() {
-        new MinecraftDependencyImpl(this.delegate.copy(), this.project, this.problems, this.objects, this.atContainer.copy())
+        new MinecraftDependencyImpl(this.delegate.copy(), this.project, this.problems, this.objects, this.providers, this.atContainer.copy())
     }
 }

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

@@ -38,25 +38,23 @@ import java.nio.file.Files
  * configuration, so that the project's entire classpath can be used when starting the game.
  */
 @CompileStatic
-@PackageScope abstract class SlimeLauncherExec extends JavaExec {
+@PackageScope abstract class SlimeLauncherExec extends JavaExec implements ForgeGradleTask {
     @PackageScope static TaskProvider<SlimeLauncherExec> register(Project project, SourceSet sourceSet, SlimeLauncherOptions options, Map<String, RunConfig> configs, Dependency dependency, Provider<RegularFile> metadataZip) {
         project.tasks.register(sourceSet.getTaskName('run', options.name), SlimeLauncherExec) { task ->
-            final plugin = project.plugins.getPlugin(ForgeGradlePlugin)
-
             task.description = "Runs the '$options.name' Slime Launcher run configuration."
 
             task.classpath = task.objectFactory.fileCollection().from(
                 task.providerFactory.provider { sourceSet.runtimeClasspath }
             )
 
-            var caches = task.objectFactory.directoryProperty().value(plugin.globalCaches.dir("slime-launcher/cache/${dependency.group.replace('.', '/')}/${dependency.name}/${dependency.version}"))
+            var caches = task.objectFactory.directoryProperty().value(task.globalCaches.dir("slime-launcher/cache/${dependency.group.replace('.', '/')}/${dependency.name}/${dependency.version}"))
             task.cacheDir.set caches.map(task.problems.ensureDirectory())
             task.metadataZip.set metadataZip
 
             task.inherit(configs, options.name)
             options.apply(task)
 
-            task.classpath plugin.getTool(Tools.SLIME_LAUNCHER)
+            task.classpath task.getTool(Tools.SLIME_LAUNCHER)
 
             if (task.buildAllProjects)
                 task.dependsOn project.allprojects.collect { it.tasks.named(LifecycleBasePlugin.ASSEMBLE_TASK_NAME) }.toArray()

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

@@ -6,32 +6,23 @@
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
-import org.gradle.api.artifacts.ModuleVersionSelector;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.model.ObjectFactory;
-import org.gradle.api.plugins.JavaPlugin;
-import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.problems.Problems;
-import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
-import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.provider.SetProperty;
 import org.gradle.api.tasks.Classpath;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputDirectory;
-import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.api.tasks.TaskProvider;
-import org.gradle.jvm.toolchain.JavaLauncher;
 import org.gradle.jvm.toolchain.JavaToolchainService;
 import org.gradle.process.ExecOperations;
-import org.jetbrains.annotations.UnknownNullability;
 
 import javax.inject.Inject;
-import java.io.File;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -106,8 +97,7 @@ private void exec(Request request) {
     }
 
     private List<String> argsFor(Request request) {
-        var args = new ArrayList<String>();
-        args.addAll(List.of(
+        var args = new ArrayList<>(List.of(
             "--maven",
             "--cache", this.getCaches().get().getAsFile().getAbsolutePath(),
             "--output", this.getOutput().get().getAsFile().getAbsolutePath(),