Support for 26.1 / unobfuscated Minecraft (#298)

Co-authored-by: Sebastian Hartte <[email protected]>

Author: Technici4n

src/generated/java/net/neoforged/moddevgradle/internal/generated/MinecraftVersionList.java

@@ -12,6 +12,10 @@ static ArtifactNamingStrategy createVanilla(String version) {
         };
     }
 
+    static ArtifactNamingStrategy createVanillaPatched(String loaderVersion) {
+        return artifact -> "minecraft-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/ArtifactNamingStrategy.java

@@ -123,6 +123,13 @@ public static ModDevArtifactsWorkflow create(Project project,
             task.getToolsJavaExecutable().set(javaToolchainService
                     .launcherFor(spec -> spec.getLanguageVersion().set(JavaLanguageVersion.of(versionCapabilities.javaVersion())))
                     .map(javaLauncher -> javaLauncher.getExecutablePath().getAsFile().getAbsolutePath()));
+            // NFRT itself needs to run with a newer version of the JDK to be able to compile with -release 25, for example
+            // It can however not run with Java 25 and compile Java 8 code while maintaining the same lambda naming.
+            if (versionCapabilities.javaVersion() > 21) {
+                task.getJavaExecutable().set(javaToolchainService
+                        .launcherFor(spec -> spec.getLanguageVersion().set(JavaLanguageVersion.of(versionCapabilities.javaVersion())))
+                        .map(javaLauncher -> javaLauncher.getExecutablePath().getAsFile().getAbsolutePath()));
+            }
 
             task.getAccessTransformers().from(accessTransformers);
             // If AT validation is enabled, add the user-supplied AT paths as files to be validated,
@@ -142,14 +149,17 @@ public static ModDevArtifactsWorkflow create(Project project,
 
             Function<WorkflowArtifact, Provider<RegularFile>> artifactPathStrategy = artifact -> artifactsBuildDir.map(dir -> dir.file(artifactNamingStrategy.getFilename(artifact)));
 
+            task.getIncludeNeoForgeInGameJar().set(versionCapabilities.needsNeoForgeInMinecraftJar());
             task.getGameJarArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED));
-            task.getResourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.CLIENT_RESOURCES));
             if (disableRecompilation) {
                 task.getDisableRecompilation().set(true);
             } else {
                 task.getGameJarWithSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.COMPILED_WITH_SOURCES));
                 task.getGameSourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.SOURCES));
             }
+            if (versionCapabilities.needsNeoForgeInMinecraftJar()) {
+                task.getResourcesArtifact().set(artifactPathStrategy.apply(WorkflowArtifact.CLIENT_RESOURCES));
+            }
 
             task.getNeoForgeArtifact().set(moddingDependencies.neoForgeDependencyNotation());
             task.getNeoFormArtifact().set(moddingDependencies.neoFormDependencyNotation());
@@ -188,7 +198,11 @@ 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 (versionCapabilities.needsNeoForgeInMinecraftJar()) {
+                config.getDependencies().addLater(createArtifacts.map(task -> project.files(task.getResourcesArtifact())).map(dependencyFactory::create));
+            } else if (moddingDependencies.neoForgeDependency() != null) {
+                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.
             config.getDependencies().add(moddingDependencies.gameLibrariesDependency());
@@ -202,6 +216,9 @@ public static ModDevArtifactsWorkflow create(Project project,
             config.setCanBeConsumed(false);
             config.getDependencies().addLater(minecraftClassesDependency);
             config.getDependencies().add(moddingDependencies.gameLibrariesDependency());
+            if (!versionCapabilities.needsNeoForgeInMinecraftJar() && moddingDependencies.neoForgeDependency() != null) {
+                config.getDependencies().add(moddingDependencies.neoForgeDependency());
+            }
         });
 
         // For IDEs that support it, link the source/binary artifacts if we use separated ones

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

@@ -73,19 +73,21 @@ public void enable(
         var versionCapabilities = neoForgeVersion != null ? VersionCapabilitiesInternal.ofNeoForgeVersion(neoForgeVersion)
                 : VersionCapabilitiesInternal.ofNeoFormVersion(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) {
+        if (neoForge == null) {
+            artifactNamingStrategy = ArtifactNamingStrategy.createVanilla(neoFormVersion);
+        } else if (versionCapabilities.needsNeoForgeInMinecraftJar()) {
             artifactNamingStrategy = ArtifactNamingStrategy.createNeoForge(versionCapabilities, "neoforge", neoForgeVersion);
         } else {
-            artifactNamingStrategy = ArtifactNamingStrategy.createVanilla(neoFormVersion);
+            artifactNamingStrategy = ArtifactNamingStrategy.createVanillaPatched(neoForgeVersion);
         }
 
-        var configurations = project.getConfigurations();
-
-        var dependencies = neoForge != null ? ModdingDependencies.create(neoForge, neoForgeNotation, neoForm, neoFormNotation, versionCapabilities)
-                : ModdingDependencies.createVanillaOnly(neoForm, neoFormNotation);
-
         var artifacts = ModDevArtifactsWorkflow.create(
                 project,
                 settings.getEnabledSourceSets(),

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

@@ -104,7 +104,9 @@ private ModDevRunWorkflow(Project project,
                 spec.setCanBeConsumed(false);
 
                 spec.getDependencies().add(gameLibrariesDependency);
-                addClientResources(project, spec, artifactsWorkflow.createArtifacts());
+                if (artifactsWorkflow.versionCapabilities().needsNeoForgeInMinecraftJar()) {
+                    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.versionCapabilities().needsNeoForgeInMinecraftJar()) {
+                            addClientResources(project, legacyClassPath, artifactsWorkflow.createArtifacts());
+                        }
                     },
                     artifactsWorkflow.downloadAssets().flatMap(DownloadAssets::getAssetPropertiesFile),
                     artifactsWorkflow.versionCapabilities());

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

@@ -10,29 +10,32 @@
 /**
  * Models the changing capabilities of the modding platform and Vanilla, which we tie to the Minecraft version.
  *
- * @param minecraftVersion The Minecraft version.
- * @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 minecraftVersion            The Minecraft version.
+ * @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);
 
-    private static final VersionCapabilitiesInternal LATEST = ofVersionIndex(0);
-
     private static final Pattern NEOFORGE_PATTERN = Pattern.compile("^(\\d+\\.\\d+)\\.\\d+(|-.*)$");
     // Strips NeoForm timestamp suffixes OR dynamic version markers
     private static final Pattern NEOFORM_PATTERN = Pattern.compile("^(.*)-(?:\\+|\\d{8}\\.\\d{6})$");
 
+    private static final int MC_1_21_11_INDEX = getReferenceVersionIndex("1.21.11");
     private static final int MC_1_21_9_INDEX = getReferenceVersionIndex("1.21.9");
     private static final int MC_24W45A_INDEX = getReferenceVersionIndex("24w45a");
     private static final int MC_1_20_5_INDEX = getReferenceVersionIndex("1.20.5");
     private static final int MC_24W14A_INDEX = getReferenceVersionIndex("24w14a");
     private static final int MC_1_20_4_INDEX = getReferenceVersionIndex("1.20.4");
     private static final int MC_1_18_PRE2_INDEX = getReferenceVersionIndex("1.18-pre2");
     private static final int MC_21W19A_INDEX = getReferenceVersionIndex("21w19a");
+
+    private static final VersionCapabilitiesInternal LATEST = ofVersionIndex(0);
     public static VersionCapabilitiesInternal latest() {
         return LATEST;
     }
@@ -58,12 +61,15 @@ 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) {
-        if (versionIndex <= MC_24W14A_INDEX) {
+        if (versionIndex < MC_1_21_11_INDEX) {
+            return 25;
+        } else if (versionIndex <= MC_24W14A_INDEX) {
             return 21;
         } else if (versionIndex <= MC_1_18_PRE2_INDEX) {
             return 17;
@@ -90,6 +96,10 @@ static boolean hasLegacyClasspath(int versionIndex) {
         return versionIndex > MC_1_21_9_INDEX;
     }
 
+    static boolean needsNeoForgeInMinecraftJar(int versionIndex) {
+        return versionIndex >= MC_1_21_11_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 +185,7 @@ public VersionCapabilitiesInternal withMinecraftVersion(String minecraftVersion)
                 splitDataRuns,
                 testFixtures,
                 modLocatorRework,
-                legacyClasspath);
+                legacyClasspath,
+                needsNeoForgeInMinecraftJar);
     }
 }

src/main/java/net/neoforged/moddevgradle/internal/utils/VersionCapabilitiesInternal.java

@@ -11,6 +11,7 @@
 import net.neoforged.problems.FileProblemReporter;
 import net.neoforged.problems.Problem;
 import org.gradle.api.GradleException;
+import org.gradle.api.InvalidUserCodeException;
 import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.problems.Problems;
@@ -43,6 +44,8 @@ public CreateMinecraftArtifacts() {
         getDisableRecompilation().convention(false);
         getValidateAccessTransformers().convention(false);
         getParchmentEnabled().convention(false);
+        getIncludeNeoForgeInGameJar().convention(true);
+        getIncludeResourcesInGameJar().convention(false);
     }
 
     /**
@@ -231,11 +234,35 @@ public RegularFileProperty getSourcesArtifact() {
         return getGameSourcesArtifact();
     }
 
+    /**
+     * Controls whether NeoForge classes and resources are included in {@link #getGameJarArtifact()}, if
+     * {@link #getNeoForgeArtifact()} is configured. Note that this option is mutually exclusive with {@link #getIncludeResourcesInGameJar()}.
+     * <p>
+     * Defaults to true.
+     */
+    @Input
+    @ApiStatus.Experimental
+    public abstract Property<Boolean> getIncludeNeoForgeInGameJar();
+
+    /**
+     * Controls whether the Minecraft resources (data, assets, etc.) are included in {@link #getGameJarArtifact()}
+     * and similar artifacts.
+     * <p>
+     * Defaults to false.
+     */
+    @Input
+    @ApiStatus.Experimental
+    public abstract Property<Boolean> getIncludeResourcesInGameJar();
+
     @Inject
     protected abstract Problems getProblems();
 
     @TaskAction
     public void createArtifacts() {
+        if (getIncludeNeoForgeInGameJar().get() && getIncludeResourcesInGameJar().get()) {
+            throw new InvalidUserCodeException("Cannot enable both includeNeoForgeInGameJar and includeResourcesInGameJar, since Minecraft and NeoForge resources clash.");
+        }
+
         var args = new ArrayList<String>();
         args.add("run");
 
@@ -319,9 +346,10 @@ public void createArtifacts() {
             requestedResults.add(new RequestedResult("clientResources", getResourcesArtifact().get().getAsFile()));
         }
 
+        boolean includeNeoForgeInGameJar = getIncludeNeoForgeInGameJar().get();
         if (getDisableRecompilation().get()) {
             if (getGameJarArtifact().isPresent()) {
-                if (getNeoForgeArtifact().isPresent()) {
+                if (getNeoForgeArtifact().isPresent() && includeNeoForgeInGameJar) {
                     requestedResults.add(new RequestedResult("gameJarNoRecompWithNeoForge", getGameJarArtifact().get().getAsFile()));
                 } else {
                     requestedResults.add(new RequestedResult("gameJarNoRecomp", getGameJarArtifact().get().getAsFile()));
@@ -333,7 +361,7 @@ public void createArtifacts() {
             if (getGameJarWithSourcesArtifact().isPresent()) {
                 throw new IllegalArgumentException("Cannot request game jar with sources if recompilation is disabled.");
             }
-        } else if (getNeoForgeArtifact().isPresent()) {
+        } else if (getNeoForgeArtifact().isPresent() && includeNeoForgeInGameJar) {
             if (getGameJarArtifact().isPresent()) {
                 requestedResults.add(new RequestedResult("gameJarWithNeoForge", getGameJarArtifact().get().getAsFile()));
             }

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

@@ -73,7 +73,7 @@ public abstract class NeoFormRuntimeTask extends DefaultTask {
      */
     @Input
     @ApiStatus.Internal
-    protected abstract Property<String> getJavaExecutable();
+    public abstract Property<String> getJavaExecutable();
 
     @Inject
     @ApiStatus.Internal

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

@@ -48,7 +48,7 @@ void testModdingCannotBeEnabledTwice() {
     @Test
     void testEnableForTestSourceSetOnly() {
         extension.enable(settings -> {
-            settings.setVersion("100.3.0"); // Needs to be at least 20.5 to use paths for newer FML
+            settings.setVersion("21.11.0"); // Needs to be at least 20.5 to use paths for newer FML
             settings.setEnabledSourceSets(Set.of(testSourceSet));
         });
 
@@ -57,25 +57,25 @@ void testEnableForTestSourceSetOnly() {
         assertThatDependencies(mainSourceSet.getRuntimeClasspathConfigurationName()).isEmpty();
 
         // While the test classpath should have modding dependencies
-        assertContainsModdingCompileDependencies("100.3.0", testSourceSet.getCompileClasspathConfigurationName());
-        assertContainsModdingRuntimeDependencies("100.3.0", testSourceSet.getRuntimeClasspathConfigurationName());
+        assertContainsModdingCompileDependencies("21.11.0", testSourceSet.getCompileClasspathConfigurationName());
+        assertContainsModdingRuntimeDependencies("21.11.0", testSourceSet.getRuntimeClasspathConfigurationName());
     }
 
     @Test
     void testAddModdingDependenciesTo() {
-        extension.setVersion("100.3.0"); // Needs to be at least 20.5 to use paths for newer FML
+        extension.setVersion("21.11.0"); // Needs to be at least 20.5 to use paths for newer FML
 
         // Initially, only the main source set should have the dependencies
-        assertContainsModdingCompileDependencies("100.3.0", mainSourceSet.getCompileClasspathConfigurationName());
-        assertContainsModdingRuntimeDependencies("100.3.0", mainSourceSet.getRuntimeClasspathConfigurationName());
+        assertContainsModdingCompileDependencies("21.11.0", mainSourceSet.getCompileClasspathConfigurationName());
+        assertContainsModdingRuntimeDependencies("21.11.0", mainSourceSet.getRuntimeClasspathConfigurationName());
         assertThatDependencies(testSourceSet.getCompileClasspathConfigurationName()).isEmpty();
         assertThatDependencies(testSourceSet.getRuntimeClasspathConfigurationName()).isEmpty();
 
         // Now add it to the test source set too
         extension.addModdingDependenciesTo(testSourceSet);
 
-        assertContainsModdingCompileDependencies("100.3.0", testSourceSet.getCompileClasspathConfigurationName());
-        assertContainsModdingRuntimeDependencies("100.3.0", testSourceSet.getRuntimeClasspathConfigurationName());
+        assertContainsModdingCompileDependencies("21.11.0", testSourceSet.getCompileClasspathConfigurationName());
+        assertContainsModdingRuntimeDependencies("21.11.0", testSourceSet.getRuntimeClasspathConfigurationName());
     }
 
     @Test

src/test/java/net/neoforged/moddevgradle/internal/ModDevPluginTest.java

@@ -16,15 +16,15 @@ public class VersionCapabilitiesInternalTest {
             "24w45a,21",
             "24w44a,21",
             "1.21.3-pre1,21",
-            "25w01a,21",
+            "25w46a,21",
             "23w07a,17",
             "1.20,17",
             "1.20-pre1,17",
             "1.21,21",
             "1.21-pre1-20240529.150918,21",
             "1.21-pre1,21",
-            "1.22,21",
-            "1.22-pre1,21",
+            "1.21.11,21",
+            "26.1-snapshot-1,25",
             "1.0,8",
             "1.14.2 Pre-Release 2,8",
             "21w19a,16",