spilt neoforge and neotenet patches

Author: wdog5

.gitignore

@@ -46,4 +46,4 @@ build
 
 **/out/
 /projects/cb-base/
-/projects/neotenet-server/src/
+/projects/neotenet-base/src/

build.gradle

@@ -154,16 +154,25 @@ tasks.register('applyCBPatches') {
     }
 }
 
+tasks.register('prepareNeoForgeBase', Copy) {
+    group = 'neotenet'
+
+    from('projects/neoforge/src/main/java')
+    into('projects/neotenet-base/src/main/java')
+
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}
+
 tasks.register('genNeoForgePatchesJar') {
     group = 'neotenet'
 
-    inputs.dir('projects/neotenet-server/src/main/java')
+    inputs.dir('projects/neotenet-base/src/main/java')
     inputs.dir('projects/neoforge/src/main/java')
     outputs.file('projects/neotenet/neoforge-patches.jar')
 
     doLast {
         def baseDir = new File(rootDir, 'projects/neoforge/src/main/java').toPath()
-        def modifiedDir = new File(rootDir, 'projects/neotenet-server/src/main/java').toPath()
+        def modifiedDir = new File(rootDir, 'projects/neotenet-base/src/main/java').toPath()
         def patchesJar = new File(rootDir, 'projects/neotenet/neoforge-patches.jar').toPath()
 
         java.nio.file.Files.deleteIfExists(patchesJar)
@@ -193,16 +202,16 @@ tasks.register('applyNeoForgePatches') {
     group = 'neotenet'
 
     inputs.file('projects/neotenet/neoforge-patches.jar')
-    outputs.dir('projects/neotenet-server/src/main/java')
+    outputs.dir('projects/neoforge/src/main/java')
 
     doLast {
         def patchesJar = new File(rootDir, 'projects/neotenet/neoforge-patches.jar')
         if (!patchesJar.exists()) {
             logger.lifecycle('neoforge-patches.jar Non Exist，Skip')
             return
         }
-        def baseDir = new File(rootDir, 'projects/neoforge/src/main/java').toPath()
-        def targetDir = new File(rootDir, 'projects/neotenet-server/src/main/java').toPath()
+        def baseDir = new File(rootDir, 'projects/neotenet-base/src/main/java').toPath()
+        def targetDir = new File(rootDir, 'projects/neoforge/src/main/java').toPath()
 
         def builder = PatchOperation.builder()
                 .logTo(logger::lifecycle)

patches/net/minecraft/server/MinecraftServer.java.patch

@@ -1,10 +1,26 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -190,7 +_,7 @@
+@@ -43,6 +_,8 @@
+ import java.util.function.Function;
+ import java.util.function.Supplier;
+ import java.util.stream.Collectors;
++
++import joptsimple.OptionSet;
+ import net.minecraft.CrashReport;
+ import net.minecraft.CrashReportCategory;
+ import net.minecraft.ReportType;
+@@ -186,11 +_,13 @@
+ import net.minecraft.world.phys.Vec2;
+ import net.minecraft.world.phys.Vec3;
+ import net.minecraft.world.scores.ScoreboardSaveData;
++import org.jline.terminal.Terminal;
+ import org.jspecify.annotations.Nullable;
  import org.slf4j.Logger;
++import org.teneted.neotenet.injection.server.MinecraftServerInjection;
 
- public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, ServerInfo, ChunkIOErrorReporter {
+-public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, ServerInfo, ChunkIOErrorReporter {
 -    public static final Logger LOGGER = LogUtils.getLogger();
++public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTask> implements CommandSource, ServerInfo, ChunkIOErrorReporter, MinecraftServerInjection {
 +    private static final Logger LOGGER = LogUtils.getLogger();
      public static final String VANILLA_BRAND = "vanilla";
      private static final float AVERAGE_TICK_TIME_SMOOTHING = 0.8F;
@@ -67,7 +83,21 @@
      private LevelData.RespawnData effectiveRespawnData = LevelData.RespawnData.DEFAULT;
      private final PotionBrewing potionBrewing;
      private FuelValues fuelValues;
-@@ -296,7 +_,7 @@
+@@ -293,10 +_,21 @@
+     private final PacketProcessor packetProcessor;
+     private final TimerQueue<MinecraftServer> scheduledEvents;
+     private final ServerClockManager clockManager;
++    // CraftBukkit start
++    public WorldLoader.DataLoadContext worldLoader;
++    public org.bukkit.craftbukkit.CraftServer server;
++    public OptionSet options;
++    public org.bukkit.command.ConsoleCommandSender console;
++    public Terminal terminal;
++    public static int currentTick = (int) (System.currentTimeMillis() / 50);
++    public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
++    public int autosavePeriod;
++    public Commands vanillaCommandDispatcher;
++    // CraftBukkit end
 
      public static <S extends MinecraftServer> S spin(Function<Thread, S> factory) {
          AtomicReference<S> serverReference = new AtomicReference<>();
@@ -364,6 +394,18 @@
      public RegistryAccess.Frozen registryAccess() {
          return this.registries.compositeAccess();
      }
+@@ -2065,6 +_,11 @@
+         }
+     }
+ 
++    // CraftBukkit start
++    public final java.util.concurrent.ExecutorService chatExecutor = java.util.concurrent.Executors.newCachedThreadPool(
++            new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").build());
++    // CraftBukkit end
++
+     public ChatDecorator getChatDecorator() {
+         return ChatDecorator.PLAIN;
+     }
 @@ -2073,6 +_,13 @@
          return true;
      }

projects/neoforge/build.gradle

@@ -20,13 +20,20 @@ evaluationDependsOn(":neoforge-coremods")
 
 gradleutils.setupSigning(project: project, signAllPublications: true)
 
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 25
+    options.encoding = 'UTF-8'
+    options.warnings = false
+    options.compilerArgs << "-Xlint:-removal" << "-Xlint:-deprecation" << "-Xlint:-dep-ann" << "-Xlint:-varargs" << "-Xdiags:verbose"
+}
+
 sourceSets {
     main {
         java {
-            srcDirs rootProject.file('src/main/java')
+            srcDirs rootProject.file('src/main/java'), rootProject.file('projects/neotenet/src/main/java')
         }
         resources {
-            srcDirs rootProject.file('src/main/resources'), rootProject.file('src/generated/resources')
+            srcDirs rootProject.file('src/main/resources'), rootProject.file('src/generated/resources'), rootProject.file('projects/neotenet/src/main/resources')
         }
     }
     client {
@@ -139,9 +146,51 @@ dependencies {
         exclude group: 'org.slf4j'
     }
 
+    // craftbukkit
+    libraries 'javax.inject:javax.inject:1'
+    libraries 'com.googlecode.json-simple:json-simple:1.1.1'
+    libraries 'org.xerial:sqlite-jdbc:3.51.3.0'
+    libraries 'com.mysql:mysql-connector-j:9.6.0'
+    libraries 'org.apache.logging.log4j:log4j-iostreams:2.26.0'
+    libraries 'org.apache.logging.log4j:log4j-core:2.26.0'
+    libraries 'org.apache.logging.log4j:log4j-slf4j2-impl:2.26.0'
+    libraries 'org.jline:jline:3.30.4'
+    // spigot
+    libraries 'commons-codec:commons-codec:1.22.0'
+    libraries 'commons-lang:commons-lang:2.6'
+    libraries 'org.apache.commons:commons-lang3:3.20.0'
+    libraries 'org.apache.httpcomponents:httpclient:4.5.14'
+    libraries 'org.apache.httpcomponents:httpcore:4.4.16'
+    libraries 'net.sf.jopt-simple:jopt-simple:5.0.4'
+    // bukkit
+    libraries 'org.yaml:snakeyaml:2.6'
+    // LibraryLoader start
+    libraries 'org.checkerframework:checker-qual:3.49.2'
+    libraries 'org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M2'
+    libraries 'org.codehaus.plexus:plexus-interpolation:1.26'
+    libraries 'org.codehaus.plexus:plexus-utils:4.0.3'
+    libraries 'com.google.protobuf:protobuf-java:4.28.2'
+    libraries "org.apache.maven:maven-artifact:3.9.9"
+    libraries 'org.apache.maven:maven-builder-support:3.9.6'
+    libraries 'org.apache.maven:maven-model:3.9.6'
+    libraries 'org.apache.maven:maven-model-builder:3.9.6'
+    libraries 'org.apache.maven:maven-repository-metadata:3.9.6'
+    libraries 'org.apache.maven:maven-resolver-provider:3.9.6'
+
+    libraries 'org.apache.maven.resolver:maven-resolver-api:1.9.18'
+    libraries 'org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18'
+    libraries 'org.apache.maven.resolver:maven-resolver-impl:1.9.18'
+    libraries 'org.apache.maven.resolver:maven-resolver-named-locks:1.9.18'
+    libraries 'org.apache.maven.resolver:maven-resolver-spi:1.9.18'
+    libraries 'org.apache.maven.resolver:maven-resolver-transport-http:1.9.18'
+    libraries 'org.apache.maven.resolver:maven-resolver-util:1.9.18'
+    // LibraryLoader end
+
     compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
 
-    userdevCompileOnly jarJar("io.github.llamalad7:mixinextras-neoforge:${project.mixin_extras_version}")
+    compileOnly(annotationProcessor("io.github.llamalad7:mixinextras-common:${project.mixin_extras_version}"))
+    implementation(jarJar("io.github.llamalad7:mixinextras-neoforge:${project.mixin_extras_version}"))
+    //userdevCompileOnly jarJar("io.github.llamalad7:mixinextras-neoforge:${project.mixin_extras_version}")
 
     userdevTestFixtures("net.neoforged.fancymodloader:junit-fml:${project.fancy_mod_loader_version}") {
         endorseStrictVersions()
@@ -474,6 +523,18 @@ configurations {
         }
         javaComponent.addVariantsFromConfiguration(it) {}
     }
+    changelog {
+        canBeDeclared = false
+        canBeResolved = false
+        attributes {
+            attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category, Category.DOCUMENTATION))
+            attribute(DocsType.DOCS_TYPE_ATTRIBUTE, objects.named(DocsType, "changelog"))
+        }
+        // Publish it, but only for release versions
+        if (!rootProject.isPreReleaseVersion) {
+            javaComponent.addVariantsFromConfiguration(it) {}
+        }
+    }
 }
 
 sourcesJar {
@@ -550,9 +611,4 @@ publishing {
     repositories {
         maven gradleutils.getPublishingMaven()
     }
-}
-
-
-tasks.withType(JavaCompile.class).configureEach(task -> {
-    Collections.addAll(task.getOptions().getCompilerArgs(), "-Xmaxerrs", "9999");
-});
+}

projects/neotenet-base/build.gradle

@@ -0,0 +1,115 @@
+plugins {
+    id 'java-library'
+    id 'maven-publish'
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs rootProject.file('src/main/java'), rootProject.file('projects/neotenet/src/main/java')
+        }
+        resources {
+            srcDirs rootProject.file('src/main/resources'), rootProject.file('src/generated/resources'), rootProject.file('projects/neotenet/src/main/resources')
+        }
+    }
+    client {
+        java {
+            srcDirs rootProject.file('src/client/java')
+        }
+    }
+}
+
+dependencies {
+    for (var asmModule : ["org.ow2.asm:asm", "org.ow2.asm:asm-commons", "org.ow2.asm:asm-tree", "org.ow2.asm:asm-util", "org.ow2.asm:asm-analysis"]) {
+        compileOnly(asmModule) {
+            // Vanilla ships with ASM 9.3 transitively (via their OpenID connect library dependency), we require
+            // ASM in a more recent version and have to strictly require this to override the strict Minecraft version.
+            version {
+                strictly project.asm_version
+            }
+        }
+    }
+    compileOnly ("net.neoforged.fancymodloader:loader:${project.fancy_mod_loader_version}") {
+        exclude group: 'org.slf4j'
+        exclude group: 'net.fabricmc'
+        // MC currently (as of 26.2-pre-1) uses the Unsafe-using artifact of LWJGL.
+        // To avoid overriding that artifact, exclude it from here and rely on minecraft-dependencies to provide it.
+        // We must specifically exclude the main LWJGL module, since FML depends on lwjgl-tinyfd.
+        exclude group: 'org.lwjgl', module: 'lwjgl'
+    }
+    compileOnly ("net.neoforged.fancymodloader:earlydisplay:${project.fancy_mod_loader_version}") {
+        exclude group: 'org.lwjgl'
+        exclude group: 'org.slf4j'
+        exclude group: 'net.fabricmc'
+    }
+    compileOnly "net.neoforged:accesstransformers:${project.accesstransformers_version}"
+    compileOnly "net.neoforged:bus:${project.eventbus_version}"
+    compileOnly "net.neoforged:mergetool:${project.mergetool_version}:api"
+    compileOnly "com.electronwill.night-config:core:${project.nightconfig_version}"
+    compileOnly "com.electronwill.night-config:toml:${project.nightconfig_version}"
+    compileOnly "org.apache.maven:maven-artifact:${project.apache_maven_artifact_version}"
+    compileOnly "net.jodah:typetools:${project.typetools_version}"
+    compileOnly "net.minecrell:terminalconsoleappender:${project.terminalconsoleappender_version}"
+    compileOnly("net.fabricmc:sponge-mixin:${project.mixin_version}") { transitive = false }
+    compileOnly ("net.neoforged:JarJarSelector:${project.jarjar_version}") {
+        exclude group: 'org.slf4j'
+    }
+    compileOnly ("net.neoforged:JarJarMetadata:${project.jarjar_version}") {
+        exclude group: 'org.slf4j'
+    }
+
+    // craftbukkit
+    compileOnly 'javax.inject:javax.inject:1'
+    compileOnly 'com.googlecode.json-simple:json-simple:1.1.1'
+    compileOnly 'org.xerial:sqlite-jdbc:3.51.3.0'
+    compileOnly 'com.mysql:mysql-connector-j:9.6.0'
+    compileOnly 'org.apache.logging.log4j:log4j-iostreams:2.26.0'
+    compileOnly 'org.apache.logging.log4j:log4j-core:2.26.0'
+    compileOnly 'org.apache.logging.log4j:log4j-slf4j2-impl:2.26.0'
+    compileOnly 'org.jline:jline:3.30.4'
+    // spigot
+    compileOnly 'commons-codec:commons-codec:1.22.0'
+    compileOnly 'commons-lang:commons-lang:2.6'
+    compileOnly 'org.apache.commons:commons-lang3:3.20.0'
+    compileOnly 'org.apache.httpcomponents:httpclient:4.5.14'
+    compileOnly 'org.apache.httpcomponents:httpcore:4.4.16'
+    compileOnly 'net.sf.jopt-simple:jopt-simple:5.0.4'
+    // bukkit
+    compileOnly 'org.yaml:snakeyaml:2.6'
+    // LibraryLoader start
+    compileOnly 'org.checkerframework:checker-qual:3.49.2'
+    compileOnly 'org.eclipse.sisu:org.eclipse.sisu.inject:0.9.0.M2'
+    compileOnly 'org.codehaus.plexus:plexus-interpolation:1.26'
+    compileOnly 'org.codehaus.plexus:plexus-utils:4.0.3'
+    compileOnly 'com.google.protobuf:protobuf-java:4.28.2'
+    compileOnly "org.apache.maven:maven-artifact:3.9.9"
+    compileOnly 'org.apache.maven:maven-builder-support:3.9.6'
+    compileOnly 'org.apache.maven:maven-model:3.9.6'
+    compileOnly 'org.apache.maven:maven-model-builder:3.9.6'
+    compileOnly 'org.apache.maven:maven-repository-metadata:3.9.6'
+    compileOnly 'org.apache.maven:maven-resolver-provider:3.9.6'
+
+    compileOnly 'org.apache.maven.resolver:maven-resolver-api:1.9.18'
+    compileOnly 'org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18'
+    compileOnly 'org.apache.maven.resolver:maven-resolver-impl:1.9.18'
+    compileOnly 'org.apache.maven.resolver:maven-resolver-named-locks:1.9.18'
+    compileOnly 'org.apache.maven.resolver:maven-resolver-spi:1.9.18'
+    compileOnly 'org.apache.maven.resolver:maven-resolver-transport-http:1.9.18'
+    compileOnly 'org.apache.maven.resolver:maven-resolver-util:1.9.18'
+    // LibraryLoader end
+
+    // Vanilla Lib Start
+    compileOnly 'com.mojang:authlib:9.0.75'
+    compileOnly 'com.mojang:datafixerupper:10.0.21'
+    compileOnly 'com.mojang:jtracy:1.0.37'
+    compileOnly 'it.unimi.dsi:fastutil:8.5.18'
+    // Vanilla Lib end
+    compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
+}
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 25
+    options.encoding = 'UTF-8'
+    options.warnings = false
+    options.compilerArgs << "-Xlint:-removal" << "-Xlint:-deprecation" << "-Xlint:-dep-ann" << "-Xlint:-varargs" << "-Xdiags:verbose"
+}