Merge fixes

Author: shartte

src/legacy/java/net/neoforged/moddevgradle/internal/LegacyInternal.java

@@ -5,6 +5,6 @@
 
 public class LegacyInternal {
     public static void configureRun(Project project, RunModel run) {
-        run.getEnvironment().put("MOD_CLASSES", RunUtils.getGradleModFoldersProvider(project, run.getMods(), false).getClassesArgument());
+        run.getEnvironment().put("MOD_CLASSES", RunUtils.getGradleModFoldersProvider(project, run.getLoadedMods(), false).getClassesArgument());
     }
 }

src/legacy/java/net/neoforged/moddevgradle/legacy/LegacyModDevPlugin.java

@@ -62,9 +62,9 @@ public void apply(Project project) {
             extension.getNeoForgeArtifact().set(extension.getVersion().map(version -> "net.minecraftforge:forge:" + version));
             extension.getNeoFormArtifact().set(extension.getNeoFormVersion().map(version -> "de.oceanlabs.mcp:mcp_config:" + version));
 
-            extension.getNeoFormRuntime().getAdditionalResults().put("namedToIntermediaryMapping", namedToIntermediate.map(RegularFile::getAsFile));
-            extension.getNeoFormRuntime().getAdditionalResults().put("intermediaryToNamedMapping", intermediateToNamed.map(RegularFile::getAsFile));
-            extension.getNeoFormRuntime().getAdditionalResults().put("csvMapping", mappingsCsv.map(RegularFile::getAsFile));
+            extension.getAdditionalMinecraftArtifacts().put("namedToIntermediaryMapping", namedToIntermediate.map(RegularFile::getAsFile));
+            extension.getAdditionalMinecraftArtifacts().put("intermediaryToNamedMapping", intermediateToNamed.map(RegularFile::getAsFile));
+            extension.getAdditionalMinecraftArtifacts().put("csvMapping", mappingsCsv.map(RegularFile::getAsFile));
 
             extension.getRuns().configureEach(run -> {
                 LegacyInternal.configureRun(project, run);

src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java

@@ -35,6 +35,7 @@
 import org.gradle.api.attributes.AttributeContainer;
 import org.gradle.api.attributes.Category;
 import org.gradle.api.attributes.DocsType;
+import org.gradle.api.attributes.LibraryElements;
 import org.gradle.api.attributes.Usage;
 import org.gradle.api.component.AdhocComponentWithVariants;
 import org.gradle.api.file.ConfigurableFileCollection;
@@ -558,8 +559,8 @@ private List<Configuration> configureArtifactManifestConfigurations(Project proj
             spec.attributes(attributes -> {
                 setNamedAttribute(attributes, Usage.USAGE_ATTRIBUTE, Usage.JAVA_RUNTIME);
                 setNamedAttribute(attributes, MinecraftDistribution.ATTRIBUTE, MinecraftDistribution.CLIENT);
-                setNamedAttribute(attributes, Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.LIBRARY));
-                setNamedAttribute(attributes, LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.getObjects().named(LibraryElements.class, LibraryElements.JAR));
+                setNamedAttribute(attributes, Category.CATEGORY_ATTRIBUTE, Category.LIBRARY);
+                setNamedAttribute(attributes, LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, LibraryElements.JAR);
             });
         });
 
@@ -763,7 +764,7 @@ private static void addIntelliJRunConfiguration(Project project,
         }
         appRun.setModuleName(RunUtils.getIntellijModuleName(project, sourceSet));
         appRun.setWorkingDirectory(run.getGameDirectory().get().getAsFile().getAbsolutePath());
-        appRun.setEnvs(RunUtils.replaceModClassesEnv(run, () -> RunUtils.getIdeaModFoldersProvider(project, outputDirectory, run.getMods(), false)));
+        appRun.setEnvs(RunUtils.replaceModClassesEnv(run, () -> RunUtils.getIdeaModFoldersProvider(project, outputDirectory, run.getLoadedMods(), false)));
 
         appRun.setJvmArgs(
                 RunUtils.escapeJvmArg(RunUtils.getArgFileParameter(prepareTask.getVmArgsFile().get()))
@@ -986,7 +987,7 @@ private static void addEclipseLaunchConfiguration(Project project,
                         RunUtils.escapeJvmArg(RunUtils.getEclipseModFoldersProvider(project, run.getLoadedMods(), false).getArgument())
                 )
                 .args(RunUtils.escapeJvmArg(RunUtils.getArgFileParameter(prepareTask.getProgramArgsFile().get())))
-                .envVar(RunUtils.replaceModClassesEnv(run, () -> RunUtils.getEclipseModFoldersProvider(project, run.getMods(), false)))
+                .envVar(RunUtils.replaceModClassesEnv(run, () -> RunUtils.getEclipseModFoldersProvider(project, run.getLoadedMods(), false)))
                 .workingDirectory(run.getGameDirectory().get().getAsFile().getAbsolutePath())
                 .build(RunUtils.DEV_LAUNCH_MAIN_CLASS);
         RunUtils.writeEclipseLaunchConfig(project, launchConfigName, config);