Put resources into the MC jar

Author: Technici4n

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

@@ -12,6 +12,10 @@ static ArtifactNamingStrategy createVanilla(String version) {
         };
     }
 
+    static ArtifactNamingStrategy createVanillaPatched(String loaderVersion) {
+        return artifact -> "vanilla-patched-%s%s.jar".formatted(loaderVersion, artifact.defaultSuffix);
+    }
+
     static ArtifactNamingStrategy createNeoForge(VersionCapabilitiesInternal versionCapabilities, String loader, String version) {
         return (artifact) -> {
             if (artifact != WorkflowArtifact.CLIENT_RESOURCES || versionCapabilities.modLocatorRework()) {

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

@@ -147,7 +147,9 @@ public static ModDevArtifactsWorkflow create(Project project,
             task.getCompiledArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED));
             task.getCompiledWithSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED_WITH_SOURCES));
             task.getSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.SOURCES));
-            task.getResourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.CLIENT_RESOURCES));
+            if (!moddingDependencies.gameLibrariesContainUniversalJar()) {
+                task.getResourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.CLIENT_RESOURCES));
+            }
 
             task.getNeoForgeArtifact().set(moddingDependencies.neoForgeDependencyNotation());
             task.getNeoFormArtifact().set(moddingDependencies.neoFormDependencyNotation());
@@ -186,7 +188,9 @@ public static ModDevArtifactsWorkflow create(Project project,
             config.setCanBeConsumed(false);
 
             config.getDependencies().addLater(minecraftClassesDependency);
-            config.getDependencies().addLater(createArtifacts.map(task -> project.files(task.getResourcesArtifact())).map(dependencyFactory::create));
+            if (!moddingDependencies.gameLibrariesContainUniversalJar()) {
+                config.getDependencies().addLater(createArtifacts.map(task -> project.files(task.getResourcesArtifact())).map(dependencyFactory::create));
+            }
             // 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.
             config.getDependencies().add(moddingDependencies.gameLibrariesDependency());

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

@@ -73,19 +73,21 @@ public void enable(
         var versionCapabilities = neoForgeVersion != null ? VersionCapabilitiesInternal.ofNeoForgeVersion(neoForgeVersion)
                 : VersionCapabilitiesInternal.ofNeoFormVersion(neoFormVersion);
 
-        ArtifactNamingStrategy artifactNamingStrategy;
-        // It's helpful to be able to differentiate the Vanilla jar and the NeoForge jar in classic multiloader setups.
-        if (neoForge != null) {
-            artifactNamingStrategy = ArtifactNamingStrategy.createNeoForge(versionCapabilities, "neoforge", neoForgeVersion);
-        } else {
-            artifactNamingStrategy = ArtifactNamingStrategy.createVanilla(neoFormVersion);
-        }
-
         var configurations = project.getConfigurations();
 
         var dependencies = neoForge != null ? ModdingDependencies.create(neoForge, neoForgeNotation, neoForm, neoFormNotation, versionCapabilities)
                 : ModdingDependencies.createVanillaOnly(neoForm, neoFormNotation);
 
+        ArtifactNamingStrategy artifactNamingStrategy;
+        // 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 {
+            artifactNamingStrategy = ArtifactNamingStrategy.createNeoForge(versionCapabilities, "neoforge", neoForgeVersion);
+        }
+
         var artifacts = ModDevArtifactsWorkflow.create(
                 project,
                 settings.getEnabledSourceSets(),

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

@@ -104,7 +104,9 @@ private ModDevRunWorkflow(Project project,
                 spec.setCanBeConsumed(false);
 
                 spec.getDependencies().add(gameLibrariesDependency);
-                addClientResources(project, spec, artifactsWorkflow.createArtifacts());
+                if (!artifactsWorkflow.dependencies().gameLibrariesContainUniversalJar()) {
+                    addClientResources(project, spec, artifactsWorkflow.createArtifacts());
+                }
                 if (!versionCapabilities.modLocatorRework()) {
                     // Forge expects to find the Forge and client-extra jar on the legacy classpath
                     // Newer FML versions also search for it on the java.class.path.
@@ -221,7 +223,9 @@ public void configureTesting(Provider<ModModel> testedMod, Provider<Set<ModModel
                     },
                     legacyClassPath -> {
                         legacyClassPath.getDependencies().add(gameLibrariesDependency);
-                        addClientResources(project, legacyClassPath, artifactsWorkflow.createArtifacts());
+                        if (!artifactsWorkflow.dependencies().gameLibrariesContainUniversalJar()) {
+                            addClientResources(project, legacyClassPath, artifactsWorkflow.createArtifacts());
+                        }
                     },
                     artifactsWorkflow.downloadAssets().flatMap(DownloadAssets::getAssetPropertiesFile),
                     artifactsWorkflow.versionCapabilities());

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

@@ -13,6 +13,7 @@ public record ModdingDependencies(
         @Nullable ModuleDependency neoFormDependency,
         @Nullable String neoFormDependencyNotation,
         ModuleDependency gameLibrariesDependency,
+        // TODO: terrible name
         boolean gameLibrariesContainUniversalJar,
         @Nullable ModuleDependency modulePathDependency,
         @Nullable ModuleDependency runTypesConfigDependency,
@@ -67,7 +68,7 @@ public static ModdingDependencies createVanillaOnly(ModuleDependency neoForm, St
                 neoForm,
                 neoFormNotation,
                 librariesDependency,
-                false,
+                true, // TODO: might not work on old NeoForm versions?
                 null,
                 null,
                 null);

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

@@ -298,14 +298,15 @@ public void createArtifacts() {
                 requestedResults.add(new RequestedResult("sourcesAndCompiledWithNeoForge", getCompiledWithSourcesArtifact().get().getAsFile()));
             }
         } else {
+            boolean withResources = !getPutNeoForgeInTheMcJar().get();
             if (getCompiledArtifact().isPresent()) {
-                requestedResults.add(new RequestedResult("compiled", getCompiledArtifact().get().getAsFile()));
+                requestedResults.add(new RequestedResult(withResources ? "compiledWithResources" : "compiled", getCompiledArtifact().get().getAsFile()));
             }
             if (getResourcesArtifact().isPresent()) {
                 requestedResults.add(new RequestedResult("sources", getSourcesArtifact().get().getAsFile()));
             }
             if (getCompiledWithSourcesArtifact().isPresent()) {
-                requestedResults.add(new RequestedResult("sourcesAndCompiled", getCompiledWithSourcesArtifact().get().getAsFile()));
+                requestedResults.add(new RequestedResult(withResources ? "sourcesAndCompiledWithResources" : "sourcesAndCompiled", getCompiledWithSourcesArtifact().get().getAsFile()));
             }
         }
 

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.43";
+    private static final String DEFAULT_NFRT_VERSION = "1.0.44-mc-resources-in-jar";
 
     @Inject
     public NeoFormRuntimeExtension(Project project) {