Update to latest pre-release including features/fixes from unmerged PRs

build-logic/src/main/kotlin/java.gradle.kts

@@ -31,7 +31,7 @@ repositories {
 
 tasks {
     processResources {
-        val hytaleVersion = libs.findVersion("hytale").get().toString()
+        val hytaleVersion = rootProject.property("hytale_server_version") as String
 
         inputs.property("version", version)
         inputs.property("hytaleVersion", hytaleVersion)

build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
 /* Project Properties */
 val modGroup    = project.property("mod_group")     as String
 val modVersion  = project.property("mod_version")   as String
+val hytaleServerVersion = project.property("hytale_server_version") as String
 
 allprojects {
     group = modGroup
@@ -14,10 +15,13 @@ allprojects {
 tasks {
     register<Delete>("cleanBundle") {
         delete(layout.buildDirectory.dir("bundle"))
+        delete(layout.buildDirectory.dir("singlejar"))
     }
 
     register<Copy>("copyBundleManifest") {
         dependsOn("cleanBundle")
+        inputs.property("version", modVersion)
+        inputs.property("hytaleVersion", hytaleServerVersion)
         from("bundle") {
             include(
                 "manifest.json",
@@ -28,7 +32,7 @@ tasks {
         into(layout.buildDirectory.dir("bundle"))
         expand(
             "version" to modVersion,
-            "hytaleVersion" to libs.versions.hytale.get()
+            "hytaleVersion" to hytaleServerVersion
         )
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
@@ -53,4 +57,48 @@ tasks {
         destinationDirectory.set(file("bundle"))
         from(layout.buildDirectory.dir("bundle"))
     }
+
+    // Hyinit single-jar: one archive containing both Main plugin classes and Mixin
+    // configs, declared via `manifest-singlejar.json` (Main + Mixins). Drops in
+    // `earlyplugins/` and Hyinit auto-discovers both the runtime plugin and Mixins.
+    register<Copy>("copySingleJarManifest") {
+        dependsOn("cleanBundle")
+        inputs.property("modVersion", modVersion)
+        inputs.property("hytaleVersion", hytaleServerVersion)
+        from("bundle") {
+            include("manifest-singlejar.json")
+            rename("manifest-singlejar.json", "manifest.json")
+        }
+        into(layout.buildDirectory.dir("singlejar"))
+        expand(
+            "modVersion" to modVersion,
+            "hytaleVersion" to hytaleServerVersion
+        )
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    }
+
+    register<Jar>("singleJar") {
+        val earlyShadow = project(":early").tasks.named<Jar>("shadowJar")
+        val pluginShadow = project(":plugin").tasks.named<Jar>("shadowJar")
+        dependsOn(
+                "copySingleJarManifest",
+                earlyShadow,
+                pluginShadow,
+                project(":early").tasks.named("jar"),
+                project(":plugin").tasks.named("jar"))
+        archiveFileName.set("${project.name}-${version}.jar")
+        destinationDirectory.set(layout.buildDirectory.dir("bundle"))
+        // Per-module manifest.json is dropped; the merged manifest from copySingleJarManifest
+        // is added last and wins via DuplicatesStrategy.EXCLUDE (first-source-wins).
+        from(layout.buildDirectory.dir("singlejar")) {
+            include("manifest.json")
+        }
+        from(earlyShadow.flatMap { it.archiveFile }.map { zipTree(it) }) {
+            exclude("manifest.json", "META-INF/MANIFEST.MF")
+        }
+        from(pluginShadow.flatMap { it.archiveFile }.map { zipTree(it) }) {
+            exclude("manifest.json", "META-INF/MANIFEST.MF")
+        }
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
 }

bundle/manifest-singlejar.json

@@ -0,0 +1,20 @@
+{
+    "Group": "IroriPowered",
+    "Name": "Refixes",
+    "Version": "${modVersion}",
+    "Website": "https://www.irori.cc/",
+    "Description": "Patches and optimizations for Hytale server (single-jar build).",
+    "Main": "cc.irori.refixes.Refixes",
+    "Authors": [
+        {
+            "Name": "KabanFriends",
+            "Url": "https://github.com/KabanFriends"
+        }
+    ],
+    "ServerVersion": ">=${hytaleVersion}",
+    "Dependencies": {},
+    "OptionalDependencies": {},
+    "Mixins": [
+        "refixes.mixins.json"
+    ]
+}

bundle/manifest.json

@@ -10,7 +10,7 @@
             "Url": "https://github.com/KabanFriends"
         }
     ],
-    "ServerVersion": "${hytaleVersion}",
+    "ServerVersion": ">=${hytaleVersion}",
     "Dependencies": {},
     "OptionalDependencies": {},
     "SubPlugins": {

early/src/main/java/cc/irori/refixes/early/EarlyOptions.java

@@ -7,48 +7,37 @@ public final class EarlyOptions {
     private static boolean available = false;
 
     /* Force Skip Mod Validation */
-    public static final Value<Boolean> FORCE_SKIP_MOD_VALIDATION = new Value<>();
-
-    /* Fluid Pre-processing */
-    public static final Value<Boolean> DISABLE_FLUID_PRE_PROCESS = new Value<>();
-
-    /* Block Pre-processing */
-    public static final Value<Boolean> ASYNC_BLOCK_PRE_PROCESS = new Value<>();
+    public static final Value<Boolean> FORCE_SKIP_MOD_VALIDATION = new Value<>(false);
 
     /* Cylinder Visibility */
-    public static final Value<Boolean> CYLINDER_VISIBILITY_ENABLED = new Value<>();
-    public static final Value<Double> CYLINDER_VISIBILITY_HEIGHT_MULTIPLIER = new Value<>();
-
-    /* Parallel Entity Ticking */
-    public static final Value<Boolean> PARALLEL_ENTITY_TICKING = new Value<>();
+    public static final Value<Double> CYLINDER_VISIBILITY_HEIGHT_MULTIPLIER = new Value<>(2.0);
 
     /* ChunkTracker Rate Limits */
-    public static final Value<Integer> MAX_CHUNKS_PER_SECOND = new Value<>();
-    public static final Value<Integer> MAX_CHUNKS_PER_TICK = new Value<>();
+    public static final Value<Integer> MAX_CHUNKS_PER_SECOND = new Value<>(36);
+    public static final Value<Integer> MAX_CHUNKS_PER_TICK = new Value<>(4);
+    public static final Value<Integer> CHUNK_UNLOAD_OFFSET = new Value<>(4);
+    public static final Value<Boolean> VANILLA_KEEP_SPAWN_LOADED = new Value<>(true);
 
     /* KDTree Optimization */
-    public static final Value<Boolean> KDTREE_OPTIMIZATION_OPTIMIZE_SORT = new Value<>();
-    public static final Value<Integer> KDTREE_OPTIMIZATION_THRESHOLD = new Value<>();
+    public static final Value<Integer> KDTREE_OPTIMIZATION_THRESHOLD = new Value<>(64);
 
     /* Shared Instances */
-    public static final Value<Boolean> SHARED_INSTANCES_ENABLED = new Value<>();
-    public static final Value<String[]> SHARED_INSTANCES_EXCLUDED_PREFIXES = new Value<>();
+    public static final Value<String[]> SHARED_INSTANCES_EXCLUDED_PREFIXES = new Value<>(new String[0]);
 
     /* Block Entity Sleep */
-    public static final Value<Boolean> BLOCK_ENTITY_SLEEP_ENABLED = new Value<>();
-    public static final Value<Integer> BLOCK_ENTITY_SLEEP_INTERVAL = new Value<>();
+    public static final Value<Integer> BLOCK_ENTITY_SLEEP_INTERVAL = new Value<>(4);
 
     /* Stat Recalculation Throttle */
-    public static final Value<Boolean> STAT_RECALC_THROTTLE_ENABLED = new Value<>();
-    public static final Value<Integer> STAT_RECALC_INTERVAL = new Value<>();
+    public static final Value<Integer> STAT_RECALC_INTERVAL = new Value<>(4);
 
-    /* Block Section Cache */
-    public static final Value<Boolean> SECTION_CACHE_ENABLED = new Value<>();
+    /* Pathfinding */
+    public static final Value<Integer> PATHFINDING_MAX_PATH_LENGTH = new Value<>(200);
+    public static final Value<Integer> PATHFINDING_OPEN_NODES_LIMIT = new Value<>(80);
+    public static final Value<Integer> PATHFINDING_TOTAL_NODES_LIMIT = new Value<>(400);
 
-    /* Skip Empty Light Sections */
-    public static final Value<Boolean> SKIP_EMPTY_LIGHT_SECTIONS = new Value<>();
+    /* Parallel Steering Threshold */
+    public static final Value<Integer> PARALLEL_STEERING_THRESHOLD = new Value<>(64);
 
-    // Private constructor to prevent instantiation
     private EarlyOptions() {}
 
     public static void setAvailable(boolean available) {
@@ -61,19 +50,26 @@ public static boolean isAvailable() {
 
     public static final class Value<T> {
 
+        private final T defaultValue;
         private Supplier<T> supplier = null;
 
-        private Value() {}
+        private Value(T defaultValue) {
+            this.defaultValue = defaultValue;
+        }
 
         public void setSupplier(Supplier<T> supplier) {
             this.supplier = supplier;
         }
 
+        public boolean isSet() {
+            return supplier != null;
+        }
+
+        // Falls back to the default when no supplier was wired (e.g. classloader split
+        // between the early and main plugin halves means the main plugin's setSupplier
+        // wrote to a different copy of this class).
         public T get() {
-            if (supplier == null) {
-                throw new IllegalStateException("Value supplier has not been set");
-            }
-            return supplier.get();
+            return supplier != null ? supplier.get() : defaultValue;
         }
     }
 }