[DO NOT MERGE] port/26.1 #2879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft

shartte wants to merge 84 commits into port/1.21.11_unobfuscated from port/26.1

+7,233 −6,701

.gitattributes

-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ @@
     *.bat text eol=crlf
     *.patch text eol=lf
     *.java text eol=lf
-    *.gradle text eol=crlf
     *.png binary
     *.gif binary
     *.exe binary
@@ Expand Down @@

.github/workflows/build-prs.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -22,10 +22,10 @@ jobs:
  
          - name: Checkout repository

            uses: neoforged/actions/checkout@main

          - name: Setup JDK 21

          - name: Setup JDK 25

            uses: neoforged/actions/setup-java@main

            with:

              java-version: 21

              java-version: 25

              # Exclude minecraft sources from emitting annotation warnings since we cannot point to them anyway

              warning-file-path: '(?!.+\/projects\/neoforge\/src\/)[^:]+'

.github/workflows/check-local-changes.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,10 +15,10 @@ jobs:
  
          - name: Checkout repository

            uses: neoforged/actions/checkout@main

          - name: Setup JDK 21

          - name: Setup JDK 25

            uses: neoforged/actions/setup-java@main

            with:

              java-version: 21

              java-version: 25

              problem-matcher: false

          - name: Setup Gradle

.github/workflows/release.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,6 +8,8 @@ on:
  
        branches:

          - '1.*'                 # Mainline release branches 

          - '[0-9][0-9]w14[a-z]+' # w14 April Fools Snapshots

        tags:

          - 'release/*'           # Manual releases

    permissions:

      contents: read

    @@ -17,10 +19,11 @@ jobs:
  
      release:

        uses: neoforged/actions/.github/workflows/gradle-publish.yml@main

        with:

          java: 21

          java: 25

          pre_gradle_tasks: setup

          gradle_tasks: publish '-Pneogradle.runtime.platform.installer.debug=false'

          gradle_tasks: publish

          version_labels: -beta, -stable

          set_project_version: true

        # We only publish the main repository. This way we avoid publishing Kits

        if: ${{ github.repository == 'neoforged/NeoForge' }}

.github/workflows/test-prs.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -19,10 +19,10 @@ jobs:
  
          - name: Checkout repository

            uses: neoforged/actions/checkout@main

          - name: Setup JDK 21

          - name: Setup JDK 25

            uses: neoforged/actions/setup-java@main

            with:

              java-version: 21

              java-version: 25

              problem-matcher: false

          - name: Setup Gradle

build.gradle

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,19 +3,29 @@ import java.util.regex.Pattern
  
    import net.neoforged.neodev.CheckSplitSources

    plugins {

        id 'net.neoforged.gradleutils' version '4.0.1'

        id 'net.neoforged.gradleutils' version '5.1.0'

        id 'dev.lukebemish.immaculate' version '0.1.6' apply false

        id 'net.neoforged.licenser' version '0.7.5'

        id 'neoforge.formatting-conventions'

        id 'neoforge.versioning'

    }

    ext.isPreReleaseVersion = project.minecraft_version.contains('w') || project.minecraft_version.contains('-')

    if (isPreReleaseVersion) {

        project.version = "${project.neoforge_snapshot_next_stable}.0-alpha.${project.minecraft_version}.${(new Date()).format('yyyyMMdd.HHmmss', TimeZone.getTimeZone('UTC'))}"

    // If an external version is defined, always use that

    ext.isPreReleaseVersion = false

    final fixedProjectVersion = project.providers.gradleProperty("version").getOrElse(null)

    if (fixedProjectVersion == null) {

        if (project.minecraft_version.contains('-')) {

            ext.isPreReleaseVersion = true

            // Match the manual snapshot release suffix (e.g. -alpha.M+snapshot-N) with M=0 and a suffixed .<timestamp>

            // Separate out the -snapshot-N or -rc-N suffix

            final preReleaseSuffix = project.minecraft_version.split("-", 2)[1]

            project.version = "${project.neoforge_snapshot_next_stable}.0-alpha.0+${preReleaseSuffix}.${(new Date()).format('yyyyMMdd.HHmmss', TimeZone.getTimeZone('UTC'))}"

        } else {

            project.version = gradleutils.version.toString()

        }

    } else {

        project.version = gradleutils.version.toString()

        project.version = fixedProjectVersion

    }

    // Print version, generally useful to know - also appears on CI

buildSrc/build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,7 @@ dependencies { @@
         // ../settings.gradle sets these version properties accordingly
         implementation "net.neoforged:moddev-gradle:${gradle.parent.ext.moddevgradle_plugin_version}"
-        implementation(platform("net.neoforged:minecraft-dependencies:${gradle.parent.ext.minecraft_dependencies_version}") {
+        implementation(platform("net.neoforged:minecraft-dependencies:${gradle.parent.ext.minecraft_version}") {
             exclude group: 'org.ow2.asm' // The platform requests a strictly lower version of ASM and we bump it
         })
@@ Expand Down @@

buildSrc/src/main/groovy/neoforge.formatting-conventions.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -70,6 +70,11 @@ immaculate { @@
                 fileContents.replace('javax.annotation.Nullable', 'org.jspecify.annotations.Nullable')
                 fileContents.replace('org.jetbrains.annotations.Nullable', 'org.jspecify.annotations.Nullable')
             }
+            // Bump the version of the google formatter to add Java 25 support.
+            steps.named { it == 'googleFixImports' }.configureEach {
+                it.version('1.33.0')
+            }
         }
     }
@@ Expand Down @@

buildSrc/src/main/java/net/neoforged/neodev/CreateCleanArtifacts.java

-Original file line number
+Diff line change
@@ Expand Up @@
         @OutputFile
         abstract RegularFileProperty getRawClientJar();
-        @OutputFile
-        abstract RegularFileProperty getCleanClientJar();
         /**
          * The unmodified downloaded server jar.
          */
         @OutputFile
         abstract RegularFileProperty getRawServerJar();
-        @OutputFile
-        abstract RegularFileProperty getCleanServerJar();
         @OutputFile
         abstract RegularFileProperty getCleanJoinedJar();
         @Inject
         public CreateCleanArtifacts() {
             getAdditionalResults().put("node.downloadClient.output.output", getRawClientJar().getAsFile());
-            getAdditionalResults().put("node.stripClient.output.output", getCleanClientJar().getAsFile());
             getAdditionalResults().put("node.downloadServer.output.output", getRawServerJar().getAsFile());
-            getAdditionalResults().put("node.stripServer.output.output", getCleanServerJar().getAsFile());
             getAdditionalResults().put("vanillaDeobfuscated", getCleanJoinedJar().getAsFile());
         }
     }

buildSrc/src/main/java/net/neoforged/neodev/CreateUserDevConfig.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -89,11 +89,6 @@ public void writeUserDevConfig() throws IOException { @@
                             "--assetsDir", "{assets_root}");
                 }
-                Collections.addAll(args,
-                        "--fml.mcVersion", getMinecraftVersion().get(),
-                        "--fml.neoForgeVersion", getNeoForgeVersion().get(),
-                        "--fml.neoFormVersion", getRawNeoFormVersion().get());
                 Map<String, String> systemProperties = new LinkedHashMap<>();
                 systemProperties.put("java.net.preferIPv6Addresses", "system");
@@ Expand All / @@ -107,6 +102,8 @@ public void writeUserDevConfig() throws IOException { @@
                         Objects.requireNonNullElse(runType.mainClass, "NONE"),
                         args,
                         List.of(
+                                "--sun-misc-unsafe-memory-access=allow",
+                                "--enable-native-access=ALL-UNNAMED",
                                 "--add-opens", "java.base/java.lang.invoke=ALL-UNNAMED",
                                 "--add-exports", "jdk.naming.dns/com.sun.jndi.dns=java.naming"),
                         runType == RunType.CLIENT || runType == RunType.JUNIT || runType == RunType.CLIENT_DATA,
@@ Expand Down @@

buildSrc/src/main/java/net/neoforged/neodev/GenerateBaseJar.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,6 +31,7 @@ public void exec() { @@
             }
             args("--output", getOutput().get().getAsFile().getAbsolutePath());
             args("--no-dist-annotation");
+            args("--no-mod-manifest");
             super.exec();
         }
     }

buildSrc/src/main/java/net/neoforged/neodev/GenerateResourcePatches.java

-Original file line number
+Diff line change
@@ -0,0 +1,62 @@
+    package net.neoforged.neodev;
+    import io.codechicken.diffpatch.cli.CliOperation;
+    import io.codechicken.diffpatch.cli.DiffOperation;
+    import io.codechicken.diffpatch.util.Input.MultiInput;
+    import io.codechicken.diffpatch.util.Output.MultiOutput;
+    import java.io.File;
+    import java.io.IOException;
+    import javax.inject.Inject;
+    import org.gradle.api.DefaultTask;
+    import org.gradle.api.file.DirectoryProperty;
+    import org.gradle.api.file.RegularFileProperty;
+    import org.gradle.api.tasks.InputDirectory;
+    import org.gradle.api.tasks.Optional;
+    import org.gradle.api.tasks.OutputDirectory;
+    import org.gradle.api.tasks.OutputFile;
+    import org.gradle.api.tasks.TaskAction;
+    /**
+     * Generates patch files for all resources found in a given folder to facilitate injecting them into
+     * the moddev environment.
+     */
+    abstract class GenerateResourcePatches extends DefaultTask {
+        @InputDirectory
+        public abstract DirectoryProperty getAdditionalResourcesDir();
+        @Optional
+        @OutputFile
+        public abstract RegularFileProperty getPatchesJar();
+        @Optional
+        @OutputDirectory
+        public abstract DirectoryProperty getPatchesFolder();
+        @Inject
+        public GenerateResourcePatches() {}
+        @TaskAction
+        public void generateSourcePatches() throws IOException {
+            var emptyFolder = new File(getTemporaryDir(), "empty");
+            emptyFolder.mkdir();
+            var builder = DiffOperation.builder()
+                    .logTo(getLogger()::lifecycle)
+                    .baseInput(MultiInput.folder(emptyFolder.toPath()))
+                    .changedInput(MultiInput.folder(getAdditionalResourcesDir().get().getAsFile().toPath()))
+                    .patchesOutput(getPatchesJar().isPresent() ? MultiOutput.detectedArchive(getPatchesJar().get().getAsFile().toPath()) : MultiOutput.folder(getPatchesFolder().getAsFile().get().toPath()))
+                    .autoHeader(true)
+                    .level(io.codechicken.diffpatch.util.LogLevel.WARN)
+                    .summary(false)
+                    .aPrefix("a/")
+                    .bPrefix("b/")
+                    .lineEnding("\n");
+            CliOperation.Result<DiffOperation.DiffSummary> result = builder.build().operate();
+            int exit = result.exit;
+            if (exit != 0 && exit != 1) {
+                throw new RuntimeException("DiffPatch failed with exit code: " + exit);
+            }
+        }
+    }

buildSrc/src/main/java/net/neoforged/neodev/NeoDevBasePlugin.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ public void apply(Project project) { @@
             tasks.register("setup", Sync.class, task -> {
                 task.setGroup(NeoDevPlugin.GROUP);
                 task.setDescription("Replaces the contents of the base project sources with the unpatched, decompiled Minecraft source code.");
-                task.from(project.zipTree(createSources.flatMap(CreateMinecraftArtifacts::getSourcesArtifact)));
+                task.from(project.zipTree(createSources.flatMap(CreateMinecraftArtifacts::getGameSourcesArtifact)));
                 task.into(project.file("src/main/java/"));
                 task.include("**/*.java");
             });
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[DO NOT MERGE] port/26.1 #2879

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

[DO NOT MERGE] port/26.1 #2879

Are you sure you want to change the base?

[DO NOT MERGE] port/26.1 #2879

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!