Continue working on using neoforge separately in dev.

shartte · shartte · commit 9d3a358da48c · 2025-11-26T03:19:18.000+01:00
diff --git a/src/main/java/net/neoforged/moddevgradle/internal/ArtifactNamingStrategy.java b/src/main/java/net/neoforged/moddevgradle/internal/ArtifactNamingStrategy.java
@@ -13,7 +13,7 @@ static ArtifactNamingStrategy createVanilla(String version) {
     }
 
     static ArtifactNamingStrategy createVanillaPatched(String loaderVersion) {
-        return artifact -> "vanilla-patched-%s%s.jar".formatted(loaderVersion, artifact.defaultSuffix);
+        return artifact -> "minecraft-patched-%s%s.jar".formatted(loaderVersion, artifact.defaultSuffix);
     }
 
     static ArtifactNamingStrategy createNeoForge(VersionCapabilitiesInternal versionCapabilities, String loader, String version) {
diff --git a/src/main/java/net/neoforged/moddevgradle/internal/ModDevArtifactsWorkflow.java b/src/main/java/net/neoforged/moddevgradle/internal/ModDevArtifactsWorkflow.java
@@ -141,13 +141,11 @@ 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.getIncludeNeoForgeInMainArtifact().set(versionCapabilities.needsNeoForgeInMinecraftJar());
             task.getCompiledArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED));
             task.getCompiledWithSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED_WITH_SOURCES));
             task.getSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.SOURCES));
-            if (!moddingDependencies.gameLibrariesContainUniversalJar()) {
+            if (versionCapabilities.needsNeoForgeInMinecraftJar()) {
                 task.getResourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.CLIENT_RESOURCES));
             }
 
@@ -188,8 +186,10 @@ public static ModDevArtifactsWorkflow create(Project project,
             config.setCanBeConsumed(false);
 
             config.getDependencies().addLater(minecraftClassesDependency);
-            if (!moddingDependencies.gameLibrariesContainUniversalJar()) {
+            if (versionCapabilities.needsNeoForgeInMinecraftJar()) {
                 config.getDependencies().addLater(createArtifacts.map(task -> project.files(task.getResourcesArtifact())).map(dependencyFactory::create));
+            } else {
+                config.getDependencies().add(moddingDependencies.neoForgeDependency());
             }
             // Technically, the Minecraft dependencies do not strictly need to be on the classpath because they are pulled from the legacy class path.
             // However, we do it anyway because this matches production environments, and allows launch proxies such as DevLogin to use Minecraft's libraries.
@@ -204,6 +204,9 @@ public static ModDevArtifactsWorkflow create(Project project,
             config.setCanBeConsumed(false);
             config.getDependencies().addLater(minecraftClassesDependency);
             config.getDependencies().add(moddingDependencies.gameLibrariesDependency());
+            if (!versionCapabilities.needsNeoForgeInMinecraftJar()) {
+                config.getDependencies().add(moddingDependencies.neoForgeDependency());
+            }
         });
 
         // For IDEs that support it, link the source/binary artifacts if we use separated ones
diff --git a/src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java b/src/main/java/net/neoforged/moddevgradle/internal/ModDevPlugin.java
@@ -82,10 +82,10 @@ public void enable(
         // It's helpful to be able to differentiate the Vanilla jar and the NeoForge jar in classic multiloader setups.
         if (neoForge == null) {
             artifactNamingStrategy = ArtifactNamingStrategy.createVanilla(neoFormVersion);
-        } else if (dependencies.gameLibrariesContainUniversalJar()) {
-            artifactNamingStrategy = ArtifactNamingStrategy.createVanillaPatched(neoForgeVersion);
-        } else {
+        } else if (versionCapabilities.needsNeoForgeInMinecraftJar()) {
             artifactNamingStrategy = ArtifactNamingStrategy.createNeoForge(versionCapabilities, "neoforge", neoForgeVersion);
+        } else {
+            artifactNamingStrategy = ArtifactNamingStrategy.createVanillaPatched(neoForgeVersion);
         }
 
         var artifacts = ModDevArtifactsWorkflow.create(
diff --git a/src/main/java/net/neoforged/moddevgradle/internal/ModDevRunWorkflow.java b/src/main/java/net/neoforged/moddevgradle/internal/ModDevRunWorkflow.java
@@ -104,7 +104,7 @@ private ModDevRunWorkflow(Project project,
                 spec.setCanBeConsumed(false);
 
                 spec.getDependencies().add(gameLibrariesDependency);
-                if (!artifactsWorkflow.dependencies().gameLibrariesContainUniversalJar()) {
+                if (artifactsWorkflow.versionCapabilities().needsNeoForgeInMinecraftJar()) {
                     addClientResources(project, spec, artifactsWorkflow.createArtifacts());
                 }
                 if (!versionCapabilities.modLocatorRework()) {
@@ -223,7 +223,7 @@ public void configureTesting(Provider<ModModel> testedMod, Provider<Set<ModModel
                     },
                     legacyClassPath -> {
                         legacyClassPath.getDependencies().add(gameLibrariesDependency);
-                        if (!artifactsWorkflow.dependencies().gameLibrariesContainUniversalJar()) {
+                        if (artifactsWorkflow.versionCapabilities().needsNeoForgeInMinecraftJar()) {
                             addClientResources(project, legacyClassPath, artifactsWorkflow.createArtifacts());
                         }
                     },
diff --git a/src/main/java/net/neoforged/moddevgradle/internal/ModdingDependencies.java b/src/main/java/net/neoforged/moddevgradle/internal/ModdingDependencies.java
@@ -2,9 +2,7 @@
 
 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(
@@ -13,8 +11,6 @@ public record ModdingDependencies(
         @Nullable ModuleDependency neoFormDependency,
         @Nullable String neoFormDependencyNotation,
         ModuleDependency gameLibrariesDependency,
-        // TODO: terrible name
-        boolean gameLibrariesContainUniversalJar,
         @Nullable ModuleDependency modulePathDependency,
         @Nullable ModuleDependency runTypesConfigDependency,
         @Nullable ModuleDependency testFixturesDependency) {
@@ -29,16 +25,9 @@ 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"));
-        // 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"));
-        }
+        librariesDependency = neoForge.copy()
+                .capabilities(c -> c.requireCapability("net.neoforged:neoforge-dependencies"));
 
         ModuleDependency testFixturesDependency = null;
         if (versionCapabilities.testFixtures()) {
@@ -52,7 +41,6 @@ public static ModdingDependencies create(ModuleDependency neoForge,
                 neoForm,
                 neoFormNotation,
                 librariesDependency,
-                gameLibrariesContainUniversalJar,
                 modulePathDependency,
                 runTypesDataDependency,
                 testFixturesDependency);
@@ -68,7 +56,6 @@ public static ModdingDependencies createVanillaOnly(ModuleDependency neoForm, St
                 neoForm,
                 neoFormNotation,
                 librariesDependency,
-                true, // TODO: might not work on old NeoForm versions?
                 null,
                 null,
                 null);
diff --git a/src/main/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilitiesInternal.java b/src/main/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilitiesInternal.java
@@ -14,9 +14,11 @@
  * @param javaVersion      Which Java version Vanilla uses to compile and run.
  * @param splitDataRuns    Whether Vanilla has separate main classes for generating client and server data.
  * @param testFixtures     If the NeoForge version for this Minecraft version supports test fixtures.
+ * @param needsNeoForgeInMinecraftJar The FML version shipped by NeoForge in this Minecraft version requires NeoForge
+ *                                    classes to be merged into the Minecraft jar to work.
  */
 public record VersionCapabilitiesInternal(String minecraftVersion, int javaVersion, boolean splitDataRuns,
-        boolean testFixtures, boolean modLocatorRework, boolean legacyClasspath) implements VersionCapabilities, Serializable {
+        boolean testFixtures, boolean modLocatorRework, boolean legacyClasspath, boolean needsNeoForgeInMinecraftJar) implements VersionCapabilities, Serializable {
 
     private static final Logger LOG = Logging.getLogger(VersionCapabilitiesInternal.class);
 
@@ -58,8 +60,9 @@ public static VersionCapabilitiesInternal ofVersionIndex(int versionIndex, Strin
         var testFixtures = hasTestFixtures(versionIndex);
         var modLocatorRework = hasModLocatorRework(versionIndex);
         var legacyClasspath = hasLegacyClasspath(versionIndex);
+        var needsNeoForgeInMinecraftJar = needsNeoForgeInMinecraftJar(versionIndex);
 
-        return new VersionCapabilitiesInternal(minecraftVersion, javaVersion, splitData, testFixtures, modLocatorRework, legacyClasspath);
+        return new VersionCapabilitiesInternal(minecraftVersion, javaVersion, splitData, testFixtures, modLocatorRework, legacyClasspath, needsNeoForgeInMinecraftJar);
     }
 
     static int getJavaVersion(int versionIndex) {
@@ -90,6 +93,10 @@ static boolean hasLegacyClasspath(int versionIndex) {
         return versionIndex > MC_1_21_9_INDEX;
     }
 
+    static boolean needsNeoForgeInMinecraftJar(int versionIndex) {
+        return versionIndex > MC_1_21_9_INDEX;
+    }
+
     static int indexOfNeoForgeVersion(String version) {
         // NeoForge omits the "1." at the start of the Minecraft version and just adds an incrementing last digit
         var matcher = NEOFORGE_PATTERN.matcher(version);
@@ -175,6 +182,7 @@ public VersionCapabilitiesInternal withMinecraftVersion(String minecraftVersion)
                 splitDataRuns,
                 testFixtures,
                 modLocatorRework,
-                legacyClasspath);
+                legacyClasspath,
+                needsNeoForgeInMinecraftJar);
     }
 }
diff --git a/src/main/java/net/neoforged/nfrtgradle/CreateMinecraftArtifacts.java b/src/main/java/net/neoforged/nfrtgradle/CreateMinecraftArtifacts.java
@@ -42,7 +42,8 @@ public CreateMinecraftArtifacts() {
         getAnalyzeCacheMisses().convention(false);
         getValidateAccessTransformers().convention(false);
         getParchmentEnabled().convention(false);
-        getPutNeoForgeInTheMcJar().convention(true);
+        getIncludeNeoForgeInMainArtifact().convention(true);
+        getIncludeResourcesInMainArtifact().convention(false);
     }
 
     /**
@@ -193,10 +194,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();
+    public abstract Property<Boolean> getIncludeNeoForgeInMainArtifact();
+
+    @Input
+    public abstract Property<Boolean> getIncludeResourcesInMainArtifact();
 
     @Inject
     protected abstract Problems getProblems();
@@ -287,7 +289,7 @@ public void createArtifacts() {
         }
 
         // NOTE: When we use NeoForm standalone, the result-ids also change, a.k.a. "Vanilla Mode"
-        if (getNeoForgeArtifact().isPresent() && getPutNeoForgeInTheMcJar().get()) {
+        if (getNeoForgeArtifact().isPresent() && getIncludeNeoForgeInMainArtifact().get()) {
             if (getCompiledArtifact().isPresent()) {
                 requestedResults.add(new RequestedResult("compiledWithNeoForge", getCompiledArtifact().get().getAsFile()));
             }
@@ -298,7 +300,7 @@ public void createArtifacts() {
                 requestedResults.add(new RequestedResult("sourcesAndCompiledWithNeoForge", getCompiledWithSourcesArtifact().get().getAsFile()));
             }
         } else {
-            boolean withResources = !getPutNeoForgeInTheMcJar().get();
+            boolean withResources = getIncludeResourcesInMainArtifact().get();
             if (getCompiledArtifact().isPresent()) {
                 requestedResults.add(new RequestedResult(withResources ? "compiledWithResources" : "compiled", getCompiledArtifact().get().getAsFile()));
             }
diff --git a/src/main/java/net/neoforged/nfrtgradle/NeoFormRuntimeExtension.java b/src/main/java/net/neoforged/nfrtgradle/NeoFormRuntimeExtension.java
@@ -12,7 +12,7 @@
 public abstract class NeoFormRuntimeExtension {
     public static final String NAME = "neoFormRuntime";
 
-    private static final String DEFAULT_NFRT_VERSION = "1.0.44-mc-resources-in-jar";
+    private static final String DEFAULT_NFRT_VERSION = "1.0.43";
 
     @Inject
     public NeoFormRuntimeExtension(Project project) {
diff --git a/testproject/gradle.properties b/testproject/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.configuration-cache=true
 
 # Dependency versions
-neoforge_version=21.10.49-beta-more-caps
+neoforge_version=21.10.48-beta
diff --git a/testproject/jijtest/src/main/java/jijtest/AccessPluginClass.java b/testproject/jijtest/src/main/java/jijtest/AccessPluginClass.java
@@ -1,7 +1,7 @@
 package jijtest;
 
-import cpw.mods.modlauncher.TransformingClassLoader;
 import jijtestplugin.Plugin;
+import net.neoforged.fml.classloading.transformation.TransformingClassLoader;
 import net.neoforged.fml.common.Mod;
 
 @Mod("jijtest")
diff --git a/testproject/src/test/java/testproject/TestTest.java b/testproject/src/test/java/testproject/TestTest.java
@@ -1,5 +1,6 @@
 package testproject;
 
+import net.minecraft.core.registries.Registries;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.Items;
@@ -13,8 +14,9 @@
 public class TestTest {
     @Test
     public void testIngredient(MinecraftServer server) { // required to load tags
+        var items = server.registryAccess().lookupOrThrow(Registries.ITEM);
         Assertions.assertTrue(
-                Ingredient.of(ItemTags.AXES).test(Items.DIAMOND_AXE.getDefaultInstance())
+                Ingredient.of(items.getOrThrow(ItemTags.AXES)).test(Items.DIAMOND_AXE.getDefaultInstance())
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ static ArtifactNamingStrategy createVanilla(String version) {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`static ArtifactNamingStrategy createVanillaPatched(String loaderVersion) {`
`16`		`- return artifact -> "vanilla-patched-%s%s.jar".formatted(loaderVersion, artifact.defaultSuffix);`
	`16`	`+ return artifact -> "minecraft-patched-%s%s.jar".formatted(loaderVersion, artifact.defaultSuffix);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`static ArtifactNamingStrategy createNeoForge(VersionCapabilitiesInternal versionCapabilities, String loader, String version) {`