Fix wrong mappings used for artifact remapping.

neoforged · Jan 15, 2025 · 2223cfb · 2223cfb
1 parent 603c135
commit 2223cfb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java
@@ -242,10 +242,11 @@ private void configureDependencyRemapping(Project project, ObfuscationExtension
         });
 
         project.getDependencies().attributesSchema(schema -> {
-            schema.attribute(MinecraftMappings.ATTRIBUTE)
-                    .getDisambiguationRules().add(MappingsDisambiguationRule.class, actionConfiguration -> {
-                        actionConfiguration.params(namedMappings);
-                    });
+            var attr = schema.attribute(MinecraftMappings.ATTRIBUTE);
+            attr.getDisambiguationRules().add(MappingsDisambiguationRule.class, actionConfiguration -> {
+                actionConfiguration.params(namedMappings);
+            });
+            attr.getCompatibilityRules().add(SrgCompatibilityRule.class);
         });
         project.getDependencies().getArtifactTypes().named("jar", a -> {
             // By default all produced artifacts are NAMED, this also applies a default value to incoming deps

diff --git a/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/SrgCompatibilityRule.java b/src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/SrgCompatibilityRule.java
@@ -0,0 +1,11 @@
+package net.neoforged.moddevgradle.legacyforge.internal;
+
+import org.gradle.api.attributes.AttributeCompatibilityRule;
+import org.gradle.api.attributes.CompatibilityCheckDetails;
+
+public class SrgCompatibilityRule implements AttributeCompatibilityRule<MinecraftMappings> {
+    @Override
+    public void execute(CompatibilityCheckDetails<MinecraftMappings> details) {
+        details.compatible();
+    }
+}