Attributes are now requested via constraints

Author: Jonathing

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

@@ -9,7 +9,7 @@
 /// Looking for attributes? They are in [MinecraftExtension.Attributes].
 final class Constants {
     // Caches -- BE CAREFUL when changing this
-    static final String CACHES_LOCATION = /* gradleUserHomeDir + */ "caches/forge_gradle_7";
+    static final String CACHES_LOCATION = /* gradleUserHomeDir + */ "caches/minecraftforge/forgegradle";
 
     static final String FORGE_MAVEN = "https://maven.minecraftforge.net/";
 

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

@@ -8,11 +8,13 @@
 import org.gradle.api.plugins.PluginAware;
 
 record ForgeGradleExtensionImpl() implements ForgeGradleExtension {
+    private static final ForgeGradleExtensionImpl INSTANCE = new ForgeGradleExtensionImpl();
+
     static void register(ExtensionAware target) {
         target.getExtensions().add(
             ForgeGradleExtension.class,
             ForgeGradleExtension.NAME,
-            new ForgeGradleExtensionImpl()
+            INSTANCE
         );
     }
 }

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

@@ -75,7 +75,7 @@ import java.util.function.Supplier
     private Util.ActionableLazy<AccessTransformersContainer> defaultAtContainer() {
         Util.lazy {
             this.project.pluginManager.apply('net.minecraftforge.accesstransformers')
-            AccessTransformersContainer.register(this.project, Attribute.of('net.minecraftforge.gradle.accesstransformed.' + this.atContainerCount++, Boolean)) { }
+            AccessTransformersContainer.register(this.project, Attribute.of('net.minecraftforge.gradle.accesstransformed.' + this.atContainerCount++, Boolean)) {}
         }
     }
 
@@ -94,11 +94,19 @@ 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())
 
-        this.attributes { attributes ->
-            attributes.attribute(MinecraftExtension.Attributes.os, objects.named(OperatingSystemFamily, OperatingSystem.current().familyName))
-            attributes.attribute(MinecraftExtension.Attributes.mappingsChannel, mappings.channel())
-            attributes.attribute(MinecraftExtension.Attributes.mappingsVersion, mappings.version())
+        this.project.configurations.forEach { configuration ->
+            if (!configuration.canBeDeclared) return
+
+            configuration.dependencyConstraints.add(this.project.dependencies.constraints.create(this.delegate) { constraint ->
+                constraint.attributes { attributes ->
+                    attributes.attribute(MinecraftExtension.Attributes.os, objects.named(OperatingSystemFamily, OperatingSystem.current().familyName))
+                    attributes.attribute(MinecraftExtension.Attributes.mappingsChannel, mappings.channel())
+                    attributes.attribute(MinecraftExtension.Attributes.mappingsVersion, mappings.version())
+                }
+            })
+        }
 
+        this.attributes { attributes ->
             this.atContainer.orElse(defaultATs).ifPresent { accessTransformers ->
                 attributes.attribute(accessTransformers.attribute, true)
             }

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

@@ -16,12 +16,9 @@ import net.minecraftforge.util.data.json.JsonData
 import net.minecraftforge.util.data.json.RunConfig
 import org.gradle.api.NamedDomainObjectContainer
 import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.Dependency
 import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository
 import org.gradle.api.attributes.Attribute
-import org.gradle.api.attributes.AttributeContainer
 import org.gradle.api.file.ArchiveOperations
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.FileSystemOperations
@@ -33,17 +30,12 @@ import org.gradle.api.initialization.Settings
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.plugins.ExtensionAware
 import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.plugins.PluginAware
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import org.gradle.api.provider.ProviderFactory
-import org.gradle.api.reflect.TypeOf
-import org.gradle.internal.os.OperatingSystem
-import org.gradle.nativeplatform.OperatingSystemFamily
 
 import java.util.concurrent.Callable
-import java.util.function.BiFunction
 
 @CompileStatic
 @PackageScope final class MinecraftExtensionImpl implements MinecraftExtension {
@@ -193,12 +185,6 @@ import java.util.function.BiFunction
             project.afterEvaluate { this.finish(it, flowScope, flowProviders, fileSystemOperations, archiveOperations) }
         }
 
-        private void applyAttributes(AttributeContainer a) {
-            a.attribute(Attributes.os, objects.named(OperatingSystemFamily, OperatingSystem.current().familyName))
-            a.attribute(Attributes.mappingsChannel, MinecraftExtensionImpl.this.mappings.channel())
-            a.attribute(Attributes.mappingsVersion, MinecraftExtensionImpl.this.mappings.version())
-        }
-
         private void finish(Project project, FlowScope flowScope, FlowProviders flowProviders, FileSystemOperations fileSystemOperations, ArchiveOperations archiveOperations) {
             if (this.minecraftDependencies.isEmpty()) {
                 MinecraftExtensionImpl.this.problems.reportMissingMinecraftDependency()
@@ -213,25 +199,12 @@ import java.util.function.BiFunction
                 }
             }
 
-            project.configurations.configureEach {
-                if (it.canBeResolved)
-                    it.attributes(this.&applyAttributes)
-            }
-
             SyncMinecraftMaven.register(project, this.minecraftDependencies)
 
-            var repositories = project.extensions.extraProperties.has(EXT_MAVEN_REPOS)
+            var appliedRepos = project.extensions.extraProperties.has(EXT_MAVEN_REPOS)
                 ? new AppliedRepos(project.extensions.extraProperties.get(EXT_MAVEN_REPOS) as List<? extends MavenArtifactRepository>)
                 : new AppliedRepos(project.repositories.withType(MavenArtifactRepository))
-
-            if (!repositories.mcmaven)
-                MinecraftExtensionImpl.this.problems.reportMcMavenNotDeclared()
-
-            if (!repositories.forge)
-                MinecraftExtensionImpl.this.problems.reportForgeMavenNotDeclared()
-
-            if (!repositories.mclibs)
-                MinecraftExtensionImpl.this.problems.reportMcLibsMavenNotDeclared()
+            appliedRepos.check()
 
             var sourceSetsDir = objects.directoryProperty().value(this.layout.buildDirectory.dir('sourceSets'))
             this.project.getExtensions().getByType(JavaPluginExtension).sourceSets.configureEach { sourceSet ->
@@ -364,6 +337,17 @@ import java.util.function.BiFunction
                 this.forge = contains 'maven.minecraftforge.net'
                 this.mclibs = contains 'libraries.minecraft.net'
             }
+
+            private void check() {
+                if (!this.mcmaven)
+                    MinecraftExtensionImpl.this.problems.reportMcMavenNotDeclared()
+
+                if (!this.forge)
+                    MinecraftExtensionImpl.this.problems.reportForgeMavenNotDeclared()
+
+                if (!this.mclibs)
+                    MinecraftExtensionImpl.this.problems.reportMcLibsMavenNotDeclared()
+            }
         }