Fix remapping of dependencies that have a classifier in the legacy plugin (#242)

Author: shartte

src/legacy/java/net/neoforged/moddevgradle/legacyforge/dsl/ObfuscationExtension.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Objects;
 import javax.inject.Inject;
+import net.neoforged.moddevgradle.legacyforge.internal.LegacyForgeModDevPlugin;
 import net.neoforged.moddevgradle.legacyforge.internal.MinecraftMappings;
 import net.neoforged.moddevgradle.legacyforge.internal.SrgMappingsRule;
 import net.neoforged.moddevgradle.legacyforge.tasks.RemapJar;
@@ -15,6 +16,7 @@
 import org.gradle.api.artifacts.ExternalModuleDependency;
 import org.gradle.api.artifacts.FileCollectionDependency;
 import org.gradle.api.artifacts.ProjectDependency;
+import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
 import org.gradle.api.attributes.Attribute;
 import org.gradle.api.component.AdhocComponentWithVariants;
 import org.gradle.api.component.ConfigurationVariantDetails;
@@ -175,6 +177,12 @@ public Configuration createRemappingConfiguration(Configuration parent) {
                 if (dep instanceof ExternalModuleDependency externalModuleDependency) {
                     externalModuleDependency.setTransitive(false);
 
+                    // artifact dependencies need to be forced to be from our custom artifact type to be able
+                    // to inherit the mapping attribute (and be remapped). Module metadata doesn't apply here.
+                    for (var artifact : externalModuleDependency.getArtifacts()) {
+                        artifact.setType(LegacyForgeModDevPlugin.ARTIFACT_TYPE_SRG_JAR);
+                    }
+
                     // This rule ensures that this external module will be enriched with the attribute MAPPINGS=SRG
                     project.getDependencies().getComponents().withModule(
                             dep.getGroup() + ":" + dep.getName(), SrgMappingsRule.class, cfg -> {
@@ -200,11 +208,12 @@ public Configuration createRemappingConfiguration(Configuration parent) {
         var remappedDep = project.getDependencyFactory().create(
                 remappingConfig.getIncoming().artifactView(view -> {
                     view.attributes(a -> a.attribute(MinecraftMappings.ATTRIBUTE, namedMappings));
+                    // Forcing resolution to JAR here allows our SRG_JAR artifact transform to work
+                    view.attributes(a -> a.attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.JAR_TYPE));
                 }).getFiles());
         remappedDep.because("Remapped mods from " + remappingConfig.getName());
 
-        parent.getDependencies().add(
-                remappedDep);
+        parent.getDependencies().add(remappedDep);
 
         return remappingConfig;
     }

src/legacy/java/net/neoforged/moddevgradle/legacyforge/internal/LegacyForgeModDevPlugin.java

@@ -44,6 +44,7 @@ public class LegacyForgeModDevPlugin implements Plugin<Project> {
 
     public static final String CONFIGURATION_TOOL_ART = "autoRenamingToolRuntime";
     public static final String CONFIGURATION_TOOL_INSTALLERTOOLS = "installerToolsRuntime";
+    public static final String ARTIFACT_TYPE_SRG_JAR = "srgJar";
 
     private final MinecraftMappings namedMappings;
     private final MinecraftMappings srgMappings;
@@ -220,6 +221,20 @@ public void enable(Project project, LegacyForgeModdingSettings settings, LegacyF
                     .attribute(MinecraftMappings.ATTRIBUTE, namedMappings)
                     .attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.JAR_TYPE);
         });
+        // This second copy of the transform is used for remapping artifact dependencies (i.e. on classifiers)
+        // that circumvent the variant system.
+        project.getDependencies().registerTransform(RemappingTransform.class, params -> {
+            params.parameters(parameters -> {
+                obf.configureSrgToNamedOperation(parameters.getRemapOperation());
+                parameters.getMinecraftDependencies().from(remapDeps);
+            });
+            params.getFrom()
+                    .attribute(MinecraftMappings.ATTRIBUTE, srgMappings)
+                    .attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ARTIFACT_TYPE_SRG_JAR);
+            params.getTo()
+                    .attribute(MinecraftMappings.ATTRIBUTE, namedMappings)
+                    .attribute(ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE, ArtifactTypeDefinition.JAR_TYPE);
+        });
     }
 
     private void configureDependencyRemapping(Project project, ObfuscationExtension obf) {
@@ -247,6 +262,10 @@ private void configureDependencyRemapping(Project project, ObfuscationExtension
             });
         });
 
+        // custom artifact type used to force remapping of artifact dependencies (which circumvent variant selection)
+        project.getDependencies().getArtifactTypes().create(ARTIFACT_TYPE_SRG_JAR, artifactType -> {
+            artifactType.getAttributes().attribute(MinecraftMappings.ATTRIBUTE, srgMappings);
+        });
         obf.createRemappingConfiguration(project.getConfigurations().getByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME));
         obf.createRemappingConfiguration(project.getConfigurations().getByName(JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME));
         obf.createRemappingConfiguration(project.getConfigurations().getByName(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME));