diff --git a/patches/server/0006-Kaiiju-RegionFormat-Linear.patch b/patches/server/0006-Kaiiju-RegionFormat-Linear.patch index fea47c6..c3f3169 100644 --- a/patches/server/0006-Kaiiju-RegionFormat-Linear.patch +++ b/patches/server/0006-Kaiiju-RegionFormat-Linear.patch @@ -754,7 +754,7 @@ index dcfe090c269d4cbcc2eb1b6f85392848bb34656c..d42c320179ae055b8675d1ce6ce1788e try (DataInputStream out = new DataInputStream(new java.io.BufferedInputStream(new InflaterInputStream(Files.newInputStream(file))))) { return NbtIo.read((java.io.DataInput) out); diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java -index 9633b01d2d961fd1403e353484d336376ef009eb..e417076cda326a24148ad77ff7cbaf1a92d2163e 100644 +index 9633b01d2d961fd1403e353484d336376ef009eb..c9fbba6f709ed0540dcc22b41e50ce9d01a6381c 100644 --- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java +++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFileStorage.java @@ -22,9 +22,13 @@ public class RegionFileStorage implements AutoCloseable { @@ -872,7 +872,7 @@ index 9633b01d2d961fd1403e353484d336376ef009eb..e417076cda326a24148ad77ff7cbaf1a this.createRegionFile(regionPos); } + if (dev.kaiijumc.kaiiju.KaiijuConfig.regionFormatDebug) -+ org.bukkit.Bukkit.getLogger().info("[Region File Storage] Opening file " + path1 + " with format " + this.format + " (existingOnly = " + existingOnly + ")"); ++ org.bukkit.Bukkit.getLogger().info("Opening file " + path1 + " with format " + this.format + " (existingOnly = " + existingOnly + ")"); + // Paper end - cache regionfile does not exist state FileUtil.createDirectoriesSafe(this.folder); // Paper - only create directory if not existing only - moved from above diff --git a/patches/server/0010-Kaiiju-Multithreading-Configuration.patch b/patches/server/0010-Kaiiju-Multithreading-Configuration.patch new file mode 100644 index 0000000..da112e5 --- /dev/null +++ b/patches/server/0010-Kaiiju-Multithreading-Configuration.patch @@ -0,0 +1,18 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com> +Date: Fri, 31 Mar 2023 07:17:29 +0300 +Subject: [PATCH] Kaiiju Multithreading Configuration + + +diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +index e88e9197e99ac68fd58d48e7722eb6254ee75388..e33bd01e948308b479fd85715fff109a7d3c5081 100644 +--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java ++++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +@@ -209,4 +209,7 @@ public class KaiijuConfig { + sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets); + alternateKeepAlive = getBoolean("network.alternate-keepalive", sendNullEntityPackets); + } ++ ++ private static void multithreadingSettings() { ++ } + } diff --git a/patches/server/0011-Kaiiju-Multithreading-CustomTickThread.patch b/patches/server/0011-Kaiiju-Multithreading-CustomTickThread.patch new file mode 100644 index 0000000..0c37075 --- /dev/null +++ b/patches/server/0011-Kaiiju-Multithreading-CustomTickThread.patch @@ -0,0 +1,33 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Sofiane H. Djerbi" <46628754+kugge@users.noreply.github.com> +Date: Fri, 31 Mar 2023 07:25:58 +0300 +Subject: [PATCH] Kaiiju Multithreading CustomTickThread + + +diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +index e33bd01e948308b479fd85715fff109a7d3c5081..aa0acde41ec61d788d32f58f2583fbd0c610bb60 100644 +--- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java ++++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +@@ -210,6 +210,9 @@ public class KaiijuConfig { + alternateKeepAlive = getBoolean("network.alternate-keepalive", sendNullEntityPackets); + } + ++ public static int tickThreads = -1; ++ + private static void multithreadingSettings() { ++ tickThreads = getInt("multithreading.tick-threads", tickThreads); + } + } +diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegions.java b/src/main/java/io/papermc/paper/threadedregions/TickRegions.java +index 1cc7c32690ba7f7d7cdcbe239314f30f49ecb7bc..f7525293bd0fbb5ec9fff84117f9331616d704cd 100644 +--- a/src/main/java/io/papermc/paper/threadedregions/TickRegions.java ++++ b/src/main/java/io/papermc/paper/threadedregions/TickRegions.java +@@ -51,6 +51,8 @@ public final class TickRegions implements ThreadedRegionizer.RegionCallbacks 0) tickThreads = dev.kaiijumc.kaiiju.KaiijuConfig.tickThreads; // Kaiiju ++ + scheduler = new TickRegionScheduler(tickThreads); + LOGGER.info("Regionised ticking is enabled with " + tickThreads + " tick threads"); + } diff --git a/patches/server/0010-Kaiiju-Lithium-Configuration.patch b/patches/server/0012-Kaiiju-Lithium-Configuration.patch similarity index 65% rename from patches/server/0010-Kaiiju-Lithium-Configuration.patch rename to patches/server/0012-Kaiiju-Lithium-Configuration.patch index 62155ac..ef6c4fe 100644 --- a/patches/server/0010-Kaiiju-Lithium-Configuration.patch +++ b/patches/server/0012-Kaiiju-Lithium-Configuration.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Kaiiju Lithium Configuration diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index e88e9197e99ac68fd58d48e7722eb6254ee75388..4c9200e51ffc24b354d83822b78526d853ad4ddc 100644 +index aa0acde41ec61d788d32f58f2583fbd0c610bb60..712fcc3dfd1e363166caf7aa05927f2f9c998f91 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -209,4 +209,9 @@ public class KaiijuConfig { - sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets); - alternateKeepAlive = getBoolean("network.alternate-keepalive", sendNullEntityPackets); +@@ -215,4 +215,9 @@ public class KaiijuConfig { + private static void multithreadingSettings() { + tickThreads = getInt("multithreading.tick-threads", tickThreads); } + + public static boolean lithiumEnable = true; diff --git a/patches/server/0011-Lithium-Math-FastUtil.patch b/patches/server/0013-Lithium-Math-FastUtil.patch similarity index 97% rename from patches/server/0011-Lithium-Math-FastUtil.patch rename to patches/server/0013-Lithium-Math-FastUtil.patch index 00bec44..ae65ef0 100644 --- a/patches/server/0011-Lithium-Math-FastUtil.patch +++ b/patches/server/0013-Lithium-Math-FastUtil.patch @@ -7,10 +7,10 @@ Author: JellySquid Licence: LGPL-3.0 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 4c9200e51ffc24b354d83822b78526d853ad4ddc..48bf2e11a4d869aeef4ce7169636ff625555f7e1 100644 +index 712fcc3dfd1e363166caf7aa05927f2f9c998f91..529057fddb6c3bb5c8952e88da7e1f817db4c684 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -211,7 +211,9 @@ public class KaiijuConfig { +@@ -217,7 +217,9 @@ public class KaiijuConfig { } public static boolean lithiumEnable = true; diff --git a/patches/server/0012-Lithium-Math-SineLut.patch b/patches/server/0014-Lithium-Math-SineLut.patch similarity index 97% rename from patches/server/0012-Lithium-Math-SineLut.patch rename to patches/server/0014-Lithium-Math-SineLut.patch index 28b71cd..94977a3 100644 --- a/patches/server/0012-Lithium-Math-SineLut.patch +++ b/patches/server/0014-Lithium-Math-SineLut.patch @@ -7,10 +7,10 @@ Author: JellySquid Licence: LGPL-3.0 diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 48bf2e11a4d869aeef4ce7169636ff625555f7e1..46389c9cbc00ffa0303886cd6cba7df94777e0f1 100644 +index 529057fddb6c3bb5c8952e88da7e1f817db4c684..220a880226ca7c2c0939502fba21882920fa20f6 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -212,8 +212,10 @@ public class KaiijuConfig { +@@ -218,8 +218,10 @@ public class KaiijuConfig { public static boolean lithiumEnable = true; public static boolean lithiumMathFastUtil = true; diff --git a/patches/server/0013-Lithium-Entity-FastRetrieval.patch b/patches/server/0015-Lithium-Entity-FastRetrieval.patch similarity index 97% rename from patches/server/0013-Lithium-Entity-FastRetrieval.patch rename to patches/server/0015-Lithium-Entity-FastRetrieval.patch index 5ab0eb8..d58a725 100644 --- a/patches/server/0013-Lithium-Entity-FastRetrieval.patch +++ b/patches/server/0015-Lithium-Entity-FastRetrieval.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Lithium Entity FastRetrieval diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 46389c9cbc00ffa0303886cd6cba7df94777e0f1..8392dd45c0cfd13f3a1d4f3aeedb23b699eed8f9 100644 +index 220a880226ca7c2c0939502fba21882920fa20f6..b4cfb6f0c265af95b29683b61552ef9369ee5cea 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -213,9 +213,11 @@ public class KaiijuConfig { +@@ -219,9 +219,11 @@ public class KaiijuConfig { public static boolean lithiumEnable = true; public static boolean lithiumMathFastUtil = true; public static boolean lithiumMathSineLut = true;