WIP use universal jar in dev

Author: Technici4n

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

@@ -141,6 +141,9 @@ public static ModDevArtifactsWorkflow create(Project project,
 
             Function<WorkflowArtifact, Provider<RegularFile>> artifactPathStrategy = artifact -> artifactsBuildDir.map(dir -> dir.file(artifactNamingStrategy.getFilename(artifact)));
 
+            if (moddingDependencies.gameLibrariesContainUniversalJar()) {
+                task.getPutNeoForgeInTheMcJar().set(false);
+            }
             task.getCompiledArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED));
             task.getCompiledWithSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED_WITH_SOURCES));
             task.getSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.SOURCES));

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

@@ -2,7 +2,9 @@
 
 import java.util.Map;
 import net.neoforged.moddevgradle.internal.utils.VersionCapabilitiesInternal;
+import org.gradle.api.Project;
 import org.gradle.api.artifacts.ModuleDependency;
+import org.gradle.api.attributes.LibraryElements;
 import org.jetbrains.annotations.Nullable;
 
 public record ModdingDependencies(
@@ -11,6 +13,7 @@ public record ModdingDependencies(
         @Nullable ModuleDependency neoFormDependency,
         @Nullable String neoFormDependencyNotation,
         ModuleDependency gameLibrariesDependency,
+        boolean gameLibrariesContainUniversalJar,
         @Nullable ModuleDependency modulePathDependency,
         @Nullable ModuleDependency runTypesConfigDependency,
         @Nullable ModuleDependency testFixturesDependency) {
@@ -25,8 +28,16 @@ public static ModdingDependencies create(ModuleDependency neoForge,
                 .capabilities(caps -> caps.requireCapability("net.neoforged:neoforge-moddev-module-path"))
                 // TODO: this is ugly; maybe make the configuration transitive in neoforge, or fix the SJH dep.
                 .exclude(Map.of("group", "org.jetbrains", "module", "annotations"));
-        var librariesDependency = neoForge.copy()
-                .capabilities(c -> c.requireCapability("net.neoforged:neoforge-dependencies"));
+        // TODO: configure based on version
+        boolean gameLibrariesContainUniversalJar = true;
+        ModuleDependency librariesDependency;
+        if (gameLibrariesContainUniversalJar) {
+            librariesDependency = neoForge.copy()
+                    .capabilities(c -> c.requireCapability("net.neoforged:neoforge-universal-and-dependencies"));
+        } else {
+            librariesDependency = neoForge.copy()
+                    .capabilities(c -> c.requireCapability("net.neoforged:neoforge-dependencies"));
+        }
 
         ModuleDependency testFixturesDependency = null;
         if (versionCapabilities.testFixtures()) {
@@ -40,6 +51,7 @@ public static ModdingDependencies create(ModuleDependency neoForge,
                 neoForm,
                 neoFormNotation,
                 librariesDependency,
+                gameLibrariesContainUniversalJar,
                 modulePathDependency,
                 runTypesDataDependency,
                 testFixturesDependency);
@@ -55,6 +67,7 @@ public static ModdingDependencies createVanillaOnly(ModuleDependency neoForm, St
                 neoForm,
                 neoFormNotation,
                 librariesDependency,
+                false,
                 null,
                 null,
                 null);

src/main/java/net/neoforged/nfrtgradle/CreateMinecraftArtifacts.java

@@ -42,6 +42,7 @@ public CreateMinecraftArtifacts() {
         getAnalyzeCacheMisses().convention(false);
         getValidateAccessTransformers().convention(false);
         getParchmentEnabled().convention(false);
+        getPutNeoForgeInTheMcJar().convention(true);
     }
 
     /**
@@ -192,6 +193,11 @@ public CreateMinecraftArtifacts() {
     @Optional
     public abstract RegularFileProperty getResourcesArtifact();
 
+    // TODO: better name
+    // TODO: we should however put the resources in the MC jar
+    @Input
+    public abstract Property<Boolean> getPutNeoForgeInTheMcJar();
+
     @Inject
     protected abstract Problems getProblems();
 
@@ -281,7 +287,7 @@ public void createArtifacts() {
         }
 
         // NOTE: When we use NeoForm standalone, the result-ids also change, a.k.a. "Vanilla Mode"
-        if (getNeoForgeArtifact().isPresent()) {
+        if (getNeoForgeArtifact().isPresent() && getPutNeoForgeInTheMcJar().get()) {
             if (getCompiledArtifact().isPresent()) {
                 requestedResults.add(new RequestedResult("compiledWithNeoForge", getCompiledArtifact().get().getAsFile()));
             }

testproject/build.gradle

@@ -3,6 +3,12 @@ plugins {
     id 'maven-publish'
 }
 
+allprojects {
+    repositories {
+        mavenLocal()
+    }
+}
+
 evaluationDependsOn(":subproject") // Because of the sourceset reference
 
 tasks.named('wrapper') {

testproject/gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.configuration-cache=true
 
 # Dependency versions
-neoforge_version=21.10.49-beta
+neoforge_version=21.10.49-beta-more-caps