Update dependencies to fix resolution issues

Author: Jonathing

build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'idea'
     id 'eclipse'
     id 'maven-publish'
-    id 'io.freefair.javadoc-links'
+    //id 'io.freefair.javadoc-links'
     id 'net.minecraftforge.gradleutils'
     alias libs.plugins.gitversion
     alias libs.plugins.changelog

settings.gradle

@@ -1,10 +1,7 @@
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0' // https://plugins.gradle.org/plugin/org.gradle.toolchains.foojay-resolver-convention
-
-    // NOTE: We need to load this into the classpath before GradleUtils for the service to load correctly
-    id 'io.freefair.javadoc-links' version '8.14' apply false // https://plugins.gradle.org/plugin/io.freefair.javadoc-links
-
-    id 'net.minecraftforge.gradleutils' version '3.2.7' // https://plugins.gradle.org/plugin/net.minecraftforge.gradleutils
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
+    id 'io.freefair.javadoc-links' version '8.14' apply false
+    id 'net.minecraftforge.gradleutils' version '3.3.11'
 }
 
 rootProject.name = 'forgegradle'
@@ -15,6 +12,7 @@ dependencyResolutionManagement {
         mavenCentral()
         maven gradleutils.forgeMaven
         maven { url = 'https://maven.moddinglegacy.com/maven' } // Gradle API
+        mavenLocal()
     }
 
     //@formatter:off
@@ -35,11 +33,11 @@ dependencyResolutionManagement {
         library 'gradle', 'name.remal.gradle-api', 'gradle-api'  versionRef 'gradle'
 
         // GradleUtils Shared Base
-        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.2.7'
+        library 'gradleutils-shared', 'net.minecraftforge', 'gradleutils-shared' version '3.3.11'
 
         // AccessTransformers Gradle Plugin
         // https://plugins.gradle.org/plugin/net.minecraftforge.accesstransformers
-        library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '4.0.1'
+        library 'accesstransformers-gradle', 'net.minecraftforge.accesstransformers', 'net.minecraftforge.accesstransformers.gradle.plugin' version '4.0.2'
 
         library 'utils-data',     'net.minecraftforge', 'json-data-utils' version '0.2.1' // https://files.minecraftforge.net/net/minecraftforge/json-data-utils/index.html
         library 'utils-hash',     'net.minecraftforge', 'hash-utils'      version '0.1.9' // https://files.minecraftforge.net/net/minecraftforge/hash-utils/index.html

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

@@ -31,7 +31,7 @@ public ForgeGradleProblems() {
     //region Minecraft
     //region Mappings
     RuntimeException missingMappings(Throwable throwable) {
-        return this.getReporter().throwing(throwable, this.id("missing-mappings", "Missing Minecraft mappings"), spec -> spec
+        return this.throwing(throwable, "missing-mappings", "Missing Minecraft mappings", spec -> spec
             .details("""
                 Attempted to consume Minecraft mappings, but none were declared.
                 Minecraft dependencies cannot be resolved without mappings.""")
@@ -44,7 +44,7 @@ RuntimeException missingMappings(Throwable throwable) {
     }
 
     RuntimeException nullMappingsParam(String name) {
-        return this.getReporter().throwing(new IllegalArgumentException("Mappings %s cannot be null".formatted(name)), this.id("null-mappings-param", "Null mappings parameter"), spec -> spec
+        return this.throwing(new IllegalArgumentException("Mappings %s cannot be null".formatted(name)), "null-mappings-param", "Null mappings parameter", spec -> spec
             .details("""
                 Attempted to create a Mappings object, but the %s parameter was null.
                 The parameters for the Mappings object are not null.""".formatted(name))
@@ -61,7 +61,7 @@ void reportOverriddenMappings(MinecraftMappings original, MinecraftMappings repl
         var comparison = "Old: (channel: %s, version: %s), New: (channel: %s, version: %s)"
             .formatted(original.channel(), original.version(), replacement.channel(), replacement.version());
         LOGGER.warn("WARNING: Overriding previously declared mappings! {}", comparison);
-        this.getReporter().report(id("multiple-mappings", "Multiple mappings declared"), spec -> spec
+        this.report("multiple-mappings", "Multiple mappings declared", spec -> spec
             .details("""
                 Mappings are being set, even though they have already been declared.
                 This will cause the current mappings to be overridden, which may lead to unexpected behavior.
@@ -79,7 +79,7 @@ void reportMissingMinecraftDependency() {
         if (!this.test("net.minecraftforge.gradle.warnings.missingMinecraftDependency")) return;
 
         LOGGER.error("ERROR: No Minecraft dependency declared! Disabling ForgeGradle. See Problems report for details.");
-        this.getReporter().report(id("missing-dependency", "Missing Minecraft dependency"), spec -> spec
+        this.report("missing-dependency", "Missing Minecraft dependency", spec -> spec
             .details("""
                 ForgeGradle was applied, but no Minecraft dependency was declared.
                 ForgeGradle will now be disabled and stop all further registrations.""")
@@ -94,7 +94,7 @@ void reportMissingMinecraftDependency() {
     }
 
     RuntimeException invalidMinecraftDependencyType(Dependency dependency) {
-        return this.getReporter().throwing(new IllegalArgumentException("Minecraft dependency is not a module dependency"), this.id("unsupported-minecraft-dependency-type", "Non-module dependency used as Minecraft dependency"), spec -> spec
+        return this.throwing(new IllegalArgumentException("Minecraft dependency is not a module dependency"), "unsupported-minecraft-dependency-type", "Non-module dependency used as Minecraft dependency", spec -> spec
             .details("""
                 Attempted to use a non-module (or internal module) dependency as a Minecraft dependency.
                 The Minecraft dependency must be an external module dependency, as it is resolved from the Minecraft Maven.
@@ -111,7 +111,7 @@ RuntimeException invalidMinecraftDependencyType(Dependency dependency) {
 
     @Deprecated(forRemoval = true)
     void reportMissingMetadata(Throwable throwable) {
-        this.getReporter().report(id("missing-metadata", "Failed to extract metadata"), spec -> spec
+        this.report("missing-metadata", "Failed to extract metadata", spec -> spec
             .details("""
                 ForgeGradle failed to locate or extract the metadata generated for the Minecraft dependency.
                 This is expected if the Minecraft Maven has not yet been synced.
@@ -126,7 +126,7 @@ void reportMissingMetadata(Throwable throwable) {
     }
 
     RuntimeException changingMinecraftDependency(Dependency dependency) {
-        return this.getReporter().throwing(new IllegalArgumentException("Minecraft dependency cannot be changing"), this.id("changing-minecraft-dependency", "Minecraft dependency marked as changing"), spec -> spec
+        return this.throwing(new IllegalArgumentException("Minecraft dependency cannot be changing"), "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.
@@ -143,7 +143,7 @@ RuntimeException changingMinecraftDependency(Dependency dependency) {
     void reportMcMavenNotDeclared() {
         if (!this.test("net.minecraftforge.gradle.warnings.missingRepository.mcmaven")) return;
 
-        this.getReporter().report(id("minecraft-maven-not-declared", "Minecraft Maven not declared"), spec -> spec
+        this.report("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!
                 This will result in a "cannot resolve dependency" error.""")
@@ -156,7 +156,7 @@ void reportMcMavenNotDeclared() {
     void reportMcLibsMavenNotDeclared() {
         if (!this.test("net.minecraftforge.gradle.warnings.missingRepository.mclibs")) return;
 
-        this.getReporter().report(id("minecraft-libs-maven-not-declared", "Minecraft Libraries maven not declared"), spec -> spec
+        this.report("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!
                 The generated Minecraft artifact has dependencies from libraries that may only exist on there.
@@ -170,7 +170,7 @@ void reportMcLibsMavenNotDeclared() {
     void reportForgeMavenNotDeclared() {
         if (!this.test("net.minecraftforge.gradle.warnings.missingRepository.forge")) return;
 
-        this.getReporter().report(id("forge-maven-not-declared", "Forge maven not declared"), spec -> spec
+        this.report("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!
                 The generated Minecraft artifact has dependencies from libraries that may only exist on there.
@@ -184,7 +184,7 @@ void reportForgeMavenNotDeclared() {
     //endregion
 
     void reportAccessTransformersNotApplied(Throwable e) {
-        this.getReporter().report(this.id("access-transformers-not-applied", "AccessTransformers plugin not applied"), spec -> spec
+        this.report("access-transformers-not-applied", "AccessTransformers plugin not applied", spec -> spec
             .details("""
                 The build failed with an exception when trying to access access transformers.
                 The project using ForgeGradle does not have the AccessTransformers Gradle plugin applied, and thus it cannot be used.
@@ -198,7 +198,7 @@ void reportAccessTransformersNotApplied(Throwable e) {
     }
 
     RuntimeException accessTransformersNotOnClasspath(Throwable e) {
-        return this.getReporter().throwing(e, this.id("access-transformers-not-on-classpath", "AccessTransformers plugin not on classpath"), spec -> spec
+        return this.throwing(e, "access-transformers-not-on-classpath", "AccessTransformers plugin not on classpath", spec -> spec
             .details("""
                 The AccessTransformers plugin was not loaded in the classpath before ForgeGradle.
                 ForgeGradle cannot create the 'minecraft' extension without referencing classes from the plugin.

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

@@ -0,0 +1,18 @@
+package net.minecraftforge.gradle;
+
+import net.minecraftforge.gradleutils.shared.EnhancedPlugin;
+import net.minecraftforge.gradleutils.shared.EnhancedTask;
+import org.gradle.api.Project;
+import org.gradle.api.Task;
+
+interface ForgeGradleTask extends Task, EnhancedTask<ForgeGradleProblems> {
+    @Override
+    default Class<? extends EnhancedPlugin<? super Project>> pluginType() {
+        return ForgeGradlePlugin.class;
+    }
+
+    @Override
+    default Class<ForgeGradleProblems> problemsType() {
+        return ForgeGradleProblems.class;
+    }
+}

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

@@ -11,8 +11,12 @@
 import net.minecraftforge.accesstransformers.gradle.AccessTransformersContainer;
 import net.minecraftforge.gradleutils.shared.Closures;
 import org.gradle.api.Action;
+import org.gradle.api.InvalidUserDataException;
+import org.gradle.api.NamedDomainObjectProvider;
 import org.gradle.api.Project;
+import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
+import org.gradle.api.artifacts.DependencyScopeConfiguration;
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.file.ProjectLayout;
@@ -64,23 +68,6 @@ public Provider<ExternalModuleDependency> getDelegate() {
     }
 
     Provider<ExternalModuleDependency> setDelegate(Object dependencyNotation, Closure<?> closure) {
-        var hash = this.hashCode();
-
-        this.project.afterEvaluate(project -> project.getConfigurations().forEach(configuration -> {
-            configuration.getDependencies().matching(dependency -> {
-                var ext = ((ExtensionAware) dependency).getExtensions().getExtraProperties();
-                return ext.has("__mc_dep_hash") && (int) ext.get("__mc_dep_hash") == hash;
-            }).configureEach(dependency -> configuration.getDependencyConstraints().add(this.project.getDependencies().getConstraints().create(((ExternalModuleDependency) dependency).getModule().toString(), constraint -> {
-                constraint.because("Accounts for mappings used and natives variants");
-
-                constraint.attributes(attributes -> {
-                    attributes.attribute(MinecraftExtension.Attributes.os, this.getObjects().named(OperatingSystemFamily.class, OperatingSystem.current().getFamilyName()));
-                    attributes.attributeProvider(MinecraftExtension.Attributes.mappingsChannel, mappings.map(MinecraftMappings::channel));
-                    attributes.attributeProvider(MinecraftExtension.Attributes.mappingsVersion, mappings.map(MinecraftMappings::version));
-                });
-            })));
-        }));
-
         return this.delegate = this.getObjects().property(ExternalModuleDependency.class).value(this.getProviders().provider(
             () -> (ExternalModuleDependency) this.project.getDependencies().create(dependencyNotation, Closures.<Dependency, ExternalModuleDependency>function(dependency -> {
                 if (!(dependency instanceof ExternalModuleDependency module))
@@ -91,8 +78,6 @@ Provider<ExternalModuleDependency> setDelegate(Object dependencyNotation, Closur
 
                 Closures.invoke(this.closure(closure), module);
 
-                ((ExtensionAware) module).getExtensions().getExtraProperties().set("__mc_dep_hash", hash);
-
                 return module;
             }))
         ));
@@ -103,7 +88,32 @@ void resolve() {
     }
 
     @Override
-    public void handle(SourceSet sourceSet) { }
+    public void handle(SourceSet sourceSet) {
+        var configurations = this.project.getConfigurations();
+        var dependency = this.getDelegate().get();
+
+        NamedDomainObjectProvider<DependencyScopeConfiguration> minecraftDependencyConstraints;
+        try {
+            minecraftDependencyConstraints = configurations.dependencyScope("minecraftDependencyConstraints", configuration -> {
+                configuration.setDescription("Transient dependency constraints for Minecraft dependencies.");
+            });
+        } catch (InvalidUserDataException e) {
+            minecraftDependencyConstraints = configurations.named("minecraftDependencyConstraints", DependencyScopeConfiguration.class);
+        }
+
+        configurations.getByName(sourceSet.getCompileClasspathConfigurationName()).extendsFrom(minecraftDependencyConstraints.get());
+        configurations.getByName(sourceSet.getRuntimeClasspathConfigurationName()).extendsFrom(minecraftDependencyConstraints.get());
+
+        minecraftDependencyConstraints.get().getDependencyConstraints().add(this.project.getDependencies().getConstraints().create(dependency.getModule().toString(), constraint -> {
+            constraint.because("Accounts for mappings used and natives variants");
+
+            constraint.attributes(attributes -> {
+                attributes.attribute(MinecraftExtension.Attributes.os, this.getObjects().named(OperatingSystemFamily.class, OperatingSystem.current().getFamilyName()));
+                attributes.attributeProvider(MinecraftExtension.Attributes.mappingsChannel, mappings.map(MinecraftMappings::channel));
+                attributes.attributeProvider(MinecraftExtension.Attributes.mappingsVersion, mappings.map(MinecraftMappings::version));
+            });
+        }));
+    }
 
     @Override
     public MinecraftMappings getMappings() {
@@ -164,16 +174,15 @@ public Provider<ExternalModuleDependency> getDelegate() {
 
         @Override
         Provider<ExternalModuleDependency> setDelegate(Object dependencyNotation, Closure<?> closure) {
-            return this.delegate = this.getObjects().property(ExternalModuleDependency.class).value(this.getProviders().provider(() -> {
-                var dependency = super.setDelegate(dependencyNotation, closure);
-                return this.atPath.isPresent() || this.getAccessTransformer().isPresent() ? (ExternalModuleDependency) this.atContainer.dep(dependency).get() : dependency.get();
-            }));
+            var dependency = super.setDelegate(dependencyNotation, closure);
+            return this.delegate = this.atPath.map(path -> (ExternalModuleDependency) this.atContainer.dep(dependency).get()).orElse(dependency);
         }
 
         @Override
         public void handle(SourceSet sourceSet) {
             super.handle(sourceSet);
 
+            if (!Util.contains(project.getConfigurations(), sourceSet, false, this.getDelegate().get())) return;
             if (!this.atPath.isPresent()) return;
 
             var itor = sourceSet.getResources().getSrcDirs().iterator();

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

@@ -40,20 +40,14 @@
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
 import org.gradle.api.reflect.TypeOf;
-import org.gradle.api.tasks.SourceSet;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 abstract class MinecraftExtensionImpl implements MinecraftExtensionInternal {
     private static final String EXT_MAVEN_REPOS = "fg_mc_maven_repos";
@@ -267,8 +261,9 @@ void finish(Project project) {
             var sourceSetsDir = this.getObjects().directoryProperty().value(this.getProjectLayout().getBuildDirectory().dir("sourceSets"));
             sourceSets.configureEach(sourceSet -> {
                 for (var minecraftDependency : this.minecraftDependencies) {
-                    if (Util.contains(configurations, sourceSet, minecraftDependency.getDelegate().get()))
+                    if (Util.contains(configurations, sourceSet, true, minecraftDependency.getDelegate().get())) {
                         minecraftDependency.handle(sourceSet);
+                    }
                 }
 
                 if (this.problems.test("net.minecraftforge.gradle.mergeSourceSets")) {