Fixes after merge and bump NFRT to run with Java 25 for Minecraft 26.1

Author: shartte

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

@@ -327,9 +327,10 @@ public void createArtifacts() {
             requestedResults.add(new RequestedResult("clientResources", getResourcesArtifact().get().getAsFile()));
         }
 
+        boolean includeNeoForgeInGameJar = getIncludeNeoForgeInMainArtifact().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()));
@@ -341,7 +342,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/NeoFormRuntimeTask.java

@@ -111,9 +111,9 @@ public NeoFormRuntimeTask() {
         // Store temporary working directories in this projects build directory such that gradle clean removes them
         getWorkDirectory().convention(project.getLayout().getBuildDirectory().dir("tmp/neoformruntime"));
 
-        // Run NFRT itself with Java 21
+        // Run NFRT itself with Java 25
         getJavaExecutable().convention(getJavaToolchainService()
-                .launcherFor(spec -> spec.getLanguageVersion().set(JavaLanguageVersion.of(21)))
+                .launcherFor(spec -> spec.getLanguageVersion().set(JavaLanguageVersion.of(25)))
                 .map(javaLauncher -> javaLauncher.getExecutablePath().getAsFile().getAbsolutePath()));
 
         // We construct this here to keep them private from subclasses