diff --git a/patches/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch b/patches/removed/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch similarity index 100% rename from patches/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch rename to patches/removed/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch diff --git a/patches/server/0052-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/patches/server/0051-Faster-sequencing-of-futures-for-chunk-structure-gen.patch similarity index 100% rename from patches/server/0052-Faster-sequencing-of-futures-for-chunk-structure-gen.patch rename to patches/server/0051-Faster-sequencing-of-futures-for-chunk-structure-gen.patch diff --git a/patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch b/patches/server/0052-Reduce-items-finding-hopper-nearby-check.patch similarity index 93% rename from patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch rename to patches/server/0052-Reduce-items-finding-hopper-nearby-check.patch index ff13d959..8b4cd2b6 100644 --- a/patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch +++ b/patches/server/0052-Reduce-items-finding-hopper-nearby-check.patch @@ -9,7 +9,7 @@ But still recommend to turn-off `checkForMinecartNearItemWhileActive` Since `Reduce-hopper-item-checks.patch` will cause lag under massive dropped items diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java -index 56f9b0c9277aeff3b2d3d7e44f8af6d8d6d23941..6ac7a5093a665553b34bfec5c5057e530277a959 100644 +index 00eb84726a6563ef1d7b29977566086df1bab090..056f3c234fc853a46f804d9d21f51eed47321e3f 100644 --- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java +++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java @@ -238,7 +238,9 @@ public class ItemEntity extends Entity implements TraceableEntity { @@ -24,7 +24,7 @@ index 56f9b0c9277aeff3b2d3d7e44f8af6d8d6d23941..6ac7a5093a665553b34bfec5c5057e53 } } diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java -index 5c047e57628626d4bccf98cfa34676b7b6657cd5..1d66b474a80514e694bbf7b5328986fe6d373348 100644 +index 356ec77bf63da9a218036c92bde9bf5fa006c1ac..0ac00c3c6aa6c5418b21a68e91520224d13a7b00 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -76,10 +76,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { diff --git a/patches/server/0054-LinearPurpur-Add-Linear-region-format.patch b/patches/server/0053-LinearPurpur-Add-Linear-region-format.patch similarity index 99% rename from patches/server/0054-LinearPurpur-Add-Linear-region-format.patch rename to patches/server/0053-LinearPurpur-Add-Linear-region-format.patch index 26909f02..6fca8703 100644 --- a/patches/server/0054-LinearPurpur-Add-Linear-region-format.patch +++ b/patches/server/0053-LinearPurpur-Add-Linear-region-format.patch @@ -17,7 +17,7 @@ This format saves about 50% of disk space. Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools diff --git a/build.gradle.kts b/build.gradle.kts -index 08194b0dce494013a9766e8c84b5697876c0d35f..d00d516b12f13c17e8313b3ebd4c56ef300b8d8a 100644 +index 00c01da244709b68448815e9188414d70440d59b..71f72777303cce3b94628f96c5877e75332cf4d8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,6 +32,8 @@ dependencies { @@ -27,7 +27,7 @@ index 08194b0dce494013a9766e8c84b5697876c0d35f..d00d516b12f13c17e8313b3ebd4c56ef + implementation("com.github.luben:zstd-jni:1.5.6-2") // LinearPurpur + implementation("org.lz4:lz4-java:1.8.0") // LinearPurpur implementation("org.jline:jline-terminal-jansi:3.26.0") // Leaf - Bump Dependencies - implementation("com.github.Dreeam-qwq:TerminalConsoleAppender:360a0759") // Leaf - Use own TerminalConsoleAppender fork to fix some issues under latest version of jline/log4j + implementation("net.minecrell:terminalconsoleappender:1.3.0") implementation("net.kyori:adventure-text-serializer-ansi:4.16.0") // Keep in sync with adventureVersion from Paper-API build file // Leaf - Bump Dependencies diff --git a/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java b/src/main/java/io/papermc/paper/chunk/system/io/RegionFileIOThread.java index 2934f0cf0ef09c84739312b00186c2ef0019a165..e67543ef424d448096379bef118b8cb24b938964 100644 @@ -118,7 +118,7 @@ index 8dffb330b474b830d2f816ecf8be2e8d2e4556cd..bed46642b59d38e58e6aa663a47cbfc9 long expectedChunks = (long)regionFiles.length * (32L * 32L); // Gale start - instantly continue on world upgrade finish diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e0ee41855a82008bf09de7222671a106073ec761..eadb2bc57b500805d4d8616df99a49a8ee503d8b 100644 +index c4ccba8e24c0511d81d0f138977c2621e34b888e..9ce81b482aacc71f2b610cc4926a5867ec48944e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -866,7 +866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop