init

Author: wdog5

.gitattributes

@@ -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

.github/workflows/build.yml

@@ -41,6 +41,6 @@ jobs:
           allowUpdates: true
           makeLatest: true
           removeArtifacts: true
-          tag: "1.21.1-release"
+          tag: "1.21.11-release"
           artifacts: ./neotenetlauncher/build/libs/*.jar
           token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -44,4 +44,4 @@ build
 **/eclipse/
 **/runs/
 
-**/out/
+**/out/

README.md

@@ -1,3 +1,7 @@
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+import net.neoforged.neodev.CheckSplitSources
+
 plugins {
     id 'net.neoforged.gradleutils' version '4.0.1'
     id 'dev.lukebemish.immaculate' version '0.1.6' apply false
@@ -6,9 +10,13 @@ plugins {
     id 'neoforge.versioning'
 }
 
+ext.isPreReleaseVersion = project.minecraft_version.contains('w') || project.minecraft_version.contains('-')
 
-project.version = '21.1.217'
-
+if (isPreReleaseVersion) {
+    project.version = "${project.neoforge_snapshot_next_stable}.0-alpha.${project.minecraft_version}.${(new Date()).format('yyyyMMdd.HHmmss', TimeZone.getTimeZone('UTC'))}"
+} else {
+    project.version = gradleutils.version.toString()
+}
 
 // Print version, generally useful to know - also appears on CI
 System.out.println("NeoForge version ${project.version}")
@@ -20,7 +28,7 @@ allprojects {
     apply plugin: 'java'
 
     java.toolchain.languageVersion.set(JavaLanguageVersion.of(project.java_version))
-    
+
     // Suppress removal and deprecation warnings during compilation
     tasks.withType(JavaCompile) {
         options.compilerArgs << "-Xlint:-removal" << "-Xlint:-deprecation" << "-Xlint:-dep-ann" << "-Xlint:-varargs"

build.gradle

@@ -10,7 +10,7 @@ The project consists of a project tree with the following structure:
 | Folder Path                                                            | Gradle Project Path  | Applied Plugins                                             | Description                                                                                                                                                                   |
 |------------------------------------------------------------------------|----------------------|:------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [`/build.gradle`](../build.gradle)                                     | `:`                  | —                                                     | The root project. Since this project is reused for Kits, the root project name is based on the checkout folder, which actually can lead to issues if it is called `NeoForge`. |
-| [`/projects/neoforge/build.gradle`](../projects/neoforge/build.gradle) | `:neoforge`          | [NeoDevPlugin](#neodevplugin)                               | The core NeoForge project, which produces the artifacts that will be published.                                                                                               |
+| [`/projects/neoforge/build.gradle`](../projects/neotenet/build.gradle) | `:neoforge`          | [NeoDevPlugin](#neodevplugin)                               | The core NeoForge project, which produces the artifacts that will be published.                                                                                               |
 | [`/projects/base/build.gradle`](../projects/base/build.gradle)         | `:base`              | [NeoDevBasePlugin](#neodevbaseplugin)                       | A utility project that contains the Minecraft sources without any NeoForge additions. Can be used to quickly compare what NeoForge has changed.                               |
 | [`/tests/build.gradle`](../tests/build.gradle)                         | `:tests`             | [NeoDevExtraPlugin](#neodevextraplugin)                     | Contains the game and unit tests for NeoForge.                                                                                                                                |
 | [`/testframework/build.gradle`](../testframework/build.gradle)         | `:testframework`     | [MinecraftDependenciesPlugin](#minecraftdependenciesplugin) | A library providing support classes around writing game tests.                                                                                                                |

buildSrc/README.md

@@ -36,4 +36,6 @@ dependencies {
     implementation "io.codechicken:DiffPatch:${gradle.parent.ext.diffpatch_version}"
 
     implementation "org.ow2.asm:asm:${gradle.parent.ext.asm_version}"
+
+    implementation "org.apache.maven:maven-artifact:3.8.5"
 }

buildSrc/build.gradle

@@ -17,14 +17,10 @@ abstract class GeneratePackageInfos extends DefaultTask {
                 pkgName = pkgName.replaceAll('/', '.')
 
                 def pkgInfoText = """
-                    |@FieldsAreNonnullByDefault
-                    |@MethodsReturnNonnullByDefault
-                    |@ParametersAreNonnullByDefault
+                    |@NullMarked
                     |package $pkgName;
                     |
-                    |import javax.annotation.ParametersAreNonnullByDefault;
-                    |import net.minecraft.FieldsAreNonnullByDefault;
-                    |import net.minecraft.MethodsReturnNonnullByDefault;
+                    |import org.jspecify.annotations.NullMarked;
                 """.stripMargin().trim()
 
                 packageInfoFile.text = pkgInfoText
@@ -34,6 +30,12 @@ abstract class GeneratePackageInfos extends DefaultTask {
 }
 final generatePackageInfos = tasks.register('generatePackageInfos', GeneratePackageInfos) {
     it.files.from fileTree("src/main/java")
+    if (file("src/client/java").exists()) {
+        it.files.from fileTree("src/client/java")
+    }
+    if (file("src/junit/java").exists()) {
+        it.files.from fileTree("src/junit/java")
+    }
 }
 
 immaculate {
@@ -45,7 +47,7 @@ immaculate {
         toggleOff = 'spotless:off'
         toggleOn = 'spotless:on'
         eclipse {
-            version '3.37.0'
+            version project.jdt_core_version
             config = rootProject.file('codeformat/formatter-config.xml')
         }
 
@@ -59,13 +61,14 @@ immaculate {
         }
 
         custom 'noNotNull', { String fileContents ->
-            if (fileContents.contains('@NotNull') || fileContents.contains('@Nonnull')) {
-                throw new GradleException('@NotNull and @Nonnull are disallowed.')
+            if (fileContents.contains('@NotNull') || fileContents.contains('@Nonnull') || fileContents.contains('@NonNull')) {
+                throw new GradleException('Non-nullability annotations are disallowed.')
             }
         }
 
-        custom 'jetbrainsNullable', { String fileContents ->
-            fileContents.replace('javax.annotation.Nullable', 'org.jetbrains.annotations.Nullable')
+        custom 'jspecifyNullable', { String fileContents ->
+            fileContents.replace('javax.annotation.Nullable', 'org.jspecify.annotations.Nullable')
+            fileContents.replace('org.jetbrains.annotations.Nullable', 'org.jspecify.annotations.Nullable')
         }
     }
 }

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

@@ -4,6 +4,8 @@
 import io.codechicken.diffpatch.util.Input.MultiInput;
 import io.codechicken.diffpatch.util.Output.MultiOutput;
 import io.codechicken.diffpatch.util.PatchMode;
+import java.io.IOException;
+import javax.inject.Inject;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.Project;
 import org.gradle.api.file.DirectoryProperty;
@@ -19,9 +21,6 @@
 import org.gradle.api.tasks.TaskAction;
 import org.gradle.work.DisableCachingByDefault;
 
-import javax.inject.Inject;
-import java.io.IOException;
-
 /**
  * Applies Java source patches to a source jar and produces a patched source jar as an output.
  * It can optionally store rejected hunks into a given folder, which is primarily used for updating

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

@@ -0,0 +1,61 @@
+package net.neoforged.neodev;
+
+import java.io.File;
+import java.util.Arrays;
+import org.gradle.api.DefaultTask;
+import org.gradle.api.GradleException;
+import org.gradle.api.file.DirectoryProperty;
+import org.gradle.api.tasks.InputDirectory;
+import org.gradle.api.tasks.Optional;
+import org.gradle.api.tasks.TaskAction;
+
+/**
+ * This task fails the build if client classes are accidentally put into the common source-set
+ * and vice-versa.
+ */
+public abstract class CheckSplitSources extends DefaultTask {
+    /**
+     * Configures the folder in the server source-set where someone might accidentally place client classes. Any files placed in this location will fail the build.
+     */
+    @Optional
+    @InputDirectory
+    public abstract DirectoryProperty getServerClientFolder();
+
+    /**
+     * Configures the root folder of the package structure that should be exclusive to the client source-set. If this folder has any siblings, the build fails since it
+     * assumes someone accidentally added common code to the client source-set.
+     */
+    @Optional
+    @InputDirectory
+    public abstract DirectoryProperty getClientClientFolder();
+
+    @TaskAction
+    public void run() {
+        if (getServerClientFolder().isPresent()) {
+            var filesInServer = getServerClientFolder()
+                    .getAsFileTree()
+                    .filter(File::isFile)
+                    .getFiles()
+                    .stream()
+                    .map(File::toString)
+                    .sorted()
+                    .toList();
+
+            if (!filesInServer.isEmpty()) {
+                throw new GradleException("Found classes under the client package that are placed in the common sourceset: " + String.join(", ", filesInServer));
+            }
+        }
+
+        // Check that the client package has no sibling packages in the client source-set
+        if (getClientClientFolder().isPresent()) {
+            final File clientFolder = getClientClientFolder().getAsFile().get();
+            final File[] folders = clientFolder.getParentFile().listFiles();
+            if (folders != null && (folders.length != 1 || !folders[0].equals(clientFolder))) {
+                var siblings = Arrays.stream(folders).filter(f -> !f.equals(clientFolder)).map(File::getAbsolutePath).toList();
+
+                throw new GradleException("Found common files under the client sourceset: " + String.join(", ", siblings));
+            }
+
+        }
+    }
+}