diff --git a/patches/server/0002-Kaiiju-Configuration.patch b/patches/server/0002-Kaiiju-Configuration.patch index 1f6083d..460efb6 100644 --- a/patches/server/0002-Kaiiju-Configuration.patch +++ b/patches/server/0002-Kaiiju-Configuration.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Kaiiju Configuration diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..ef48d534d239fc5fcfd1b0500cc7868c1cf63142 +index 0000000000000000000000000000000000000000..7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027 --- /dev/null +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -0,0 +1,194 @@ +@@ -0,0 +1,195 @@ +package dev.kaiijumc.kaiiju; + +import com.google.common.base.Throwables; @@ -38,7 +38,8 @@ index 0000000000000000000000000000000000000000..ef48d534d239fc5fcfd1b0500cc7868c + protected static final String HEADER = "This is the main configuration file for Kaiiju.\n" + + "Some options may impact gameplay, so use with caution.\n" + + "If you need help or have any questions related to Kaiiju,\n" -+ + "Join our Discord server: https://discord.com/invite/qagZRAepb7"; ++ + "Join our Discord server: https://discord.com/invite/qagZRAepb7\n" ++ + "Documentation: https://github.com/KaiijuMC/Kaiiju/wiki/Configuration"; + protected static File CONFIG_FILE; + public static YamlConfiguration config; + @@ -204,7 +205,6 @@ index 0000000000000000000000000000000000000000..ef48d534d239fc5fcfd1b0500cc7868c + return builder.build(); + } +} -\ No newline at end of file diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuWorldConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..dd4c3ca77acb3aeefc69b8eb948b8b202ff87a19 @@ -453,7 +453,7 @@ index a9289072b048095330ea32d7c965e8dda61a36fc..bffd82b3d89e12f2c3d6a7e89f5a8ecd this.generator = gen; this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index caf1237491649205f7b3c7ea4fe1d31d567bbafe..5fd8e45d9a982e4f6aad06440110bc3c9d00bd99 100644 +index 23f4edebbfa045716f956128703b58baced58f49..575df8eafbcd28df941810a0662f8f32005e6422 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -1032,6 +1032,7 @@ public final class CraftServer implements Server { diff --git a/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch b/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch index 5b336e7..ca9c948 100644 --- a/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch +++ b/patches/server/0003-Kaiiju-RegionFormat-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju RegionFormat Configuration diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index ef48d534d239fc5fcfd1b0500cc7868c1cf63142..328fbed775c26faa9a87171bfda68d8ee977a889 100644 +index 7da7e0aeb5eac9ac73a3570e716f1ceb11fd7027..09fb7dcc56d5e266c8a1719c696653f644e0cfc1 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -191,4 +191,16 @@ public class KaiijuConfig { +@@ -192,4 +192,16 @@ public class KaiijuConfig { } return builder.build(); } @@ -25,7 +25,6 @@ index ef48d534d239fc5fcfd1b0500cc7868c1cf63142..328fbed775c26faa9a87171bfda68d8e + } + } } -\ No newline at end of file diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 40b4bd2f1a61c2d9a59c9c09b72713401969460b..b9998c288c4e8b6a244722915e44250b6550fd7e 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java diff --git a/patches/server/0004-Kaiiju-RegionFormat-Linear.patch b/patches/server/0004-Kaiiju-RegionFormat-Linear.patch index e695ec3..5722793 100644 --- a/patches/server/0004-Kaiiju-RegionFormat-Linear.patch +++ b/patches/server/0004-Kaiiju-RegionFormat-Linear.patch @@ -8,7 +8,7 @@ Copyright xymb@endcrystal.me THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/build.gradle.kts b/build.gradle.kts -index c6a4c48b14a8c927284720b79b93ee1aa9df7da6..cc727f183e0a2058c0b785efa9a95545b5ceb32a 100644 +index 7f1f4988a25a5ebac36c25c045c51eefecab6862..09f9a12da1807dd72a95378b4824d9a09f7ccbfe 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,6 +13,10 @@ dependencies { @@ -38,10 +38,10 @@ index f2c27e0ac65be4b75c1d86ef6fd45fdb538d96ac..00724993d0448454d14a47652b039b88 public static final class InProgressWrite { public long writeCounter; diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 328fbed775c26faa9a87171bfda68d8ee977a889..f5c9a42b98dceda2355a28591c59c383e7906421 100644 +index 09fb7dcc56d5e266c8a1719c696653f644e0cfc1..2ae67b36a08688c3041635c2db04b05e295c4eea 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -192,8 +192,9 @@ public class KaiijuConfig { +@@ -193,8 +193,9 @@ public class KaiijuConfig { return builder.build(); } @@ -52,7 +52,7 @@ index 328fbed775c26faa9a87171bfda68d8ee977a889..f5c9a42b98dceda2355a28591c59c383 private static void regionFormatSettings() { regionFormatName = getString("region-format.format", regionFormatName).toUpperCase(); -@@ -202,5 +203,11 @@ public class KaiijuConfig { +@@ -203,5 +204,11 @@ public class KaiijuConfig { Bukkit.getLogger().log(Level.SEVERE, "Falling back to ANVIL region file format."); regionFormatName = "ANVIL"; } @@ -64,7 +64,6 @@ index 328fbed775c26faa9a87171bfda68d8ee977a889..f5c9a42b98dceda2355a28591c59c383 + } } } -\ No newline at end of file diff --git a/src/main/java/dev/kaiijumc/kaiiju/region/AbstractRegionFile.java b/src/main/java/dev/kaiijumc/kaiiju/region/AbstractRegionFile.java new file mode 100644 index 0000000000000000000000000000000000000000..70d53d80f474eb80acc93275ad6bf1da98ea8ae7 diff --git a/patches/server/0008-Kaiiju-Network-Configuration.patch b/patches/server/0008-Kaiiju-Network-Configuration.patch index d8e034f..950ef82 100644 --- a/patches/server/0008-Kaiiju-Network-Configuration.patch +++ b/patches/server/0008-Kaiiju-Network-Configuration.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Kaiiju Network Configuration diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index f5c9a42b98dceda2355a28591c59c383e7906421..3756ab4acf4487972fd065fe85ef7812605fda41 100644 +index 2ae67b36a08688c3041635c2db04b05e295c4eea..1fb42e9ead32ddd964b22cb1778ccf1bd8e43dbc 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -210,4 +210,7 @@ public class KaiijuConfig { +@@ -211,4 +211,7 @@ public class KaiijuConfig { regionFormatLinearCompressionLevel = 1; } } @@ -16,4 +16,3 @@ index f5c9a42b98dceda2355a28591c59c383e7906421..3756ab4acf4487972fd065fe85ef7812 + private static void networkSettings() { + } } -\ No newline at end of file diff --git a/patches/server/0009-Purpur-Network-Send-Null-Entity-Packets.patch b/patches/server/0009-Purpur-Network-Send-Null-Entity-Packets.patch index e952e10..5131275 100644 --- a/patches/server/0009-Purpur-Network-Send-Null-Entity-Packets.patch +++ b/patches/server/0009-Purpur-Network-Send-Null-Entity-Packets.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur Network Send Null Entity Packets diff --git a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -index 3756ab4acf4487972fd065fe85ef7812605fda41..c213726efa4dd95e6e731e9c7e75fb23c3c4763f 100644 +index 1fb42e9ead32ddd964b22cb1778ccf1bd8e43dbc..ea963a1d75c11e0e01b04adaea261a63b7a9a430 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -211,6 +211,8 @@ public class KaiijuConfig { +@@ -212,6 +212,8 @@ public class KaiijuConfig { } } @@ -17,7 +17,6 @@ index 3756ab4acf4487972fd065fe85ef7812605fda41..c213726efa4dd95e6e731e9c7e75fb23 + sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets); } } -\ No newline at end of file diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java index 0f9a3a6c05fee59c29764f0c0d7a6cb8a2a861b1..9d0a52bf600583ecbf80c2233a01ff43e609266f 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java diff --git a/patches/server/0010-Kaiiju-Lithium-Configuration.patch b/patches/server/0010-Kaiiju-Lithium-Configuration.patch index 9975a04..ad25cd8 100644 --- a/patches/server/0010-Kaiiju-Lithium-Configuration.patch +++ b/patches/server/0010-Kaiiju-Lithium-Configuration.patch @@ -5,10 +5,10 @@ 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 c213726efa4dd95e6e731e9c7e75fb23c3c4763f..e1fc127ac3fb47f3a4ad84d4b3f3ec25f40389f8 100644 +index ea963a1d75c11e0e01b04adaea261a63b7a9a430..0f214dc5f4c585911953c4aaaa54cf43f340e4eb 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -215,4 +215,9 @@ public class KaiijuConfig { +@@ -216,4 +216,9 @@ public class KaiijuConfig { private static void networkSettings() { sendNullEntityPackets = getBoolean("network.send-null-entity-packets", sendNullEntityPackets); } @@ -18,4 +18,3 @@ index c213726efa4dd95e6e731e9c7e75fb23c3c4763f..e1fc127ac3fb47f3a4ad84d4b3f3ec25 + lithiumEnable = getBoolean("lithium.enable", lithiumEnable); + } } -\ No newline at end of file diff --git a/patches/server/0011-Lithium-Math-FastUtil.patch b/patches/server/0011-Lithium-Math-FastUtil.patch index 1d802ff..742dffd 100644 --- a/patches/server/0011-Lithium-Math-FastUtil.patch +++ b/patches/server/0011-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 e1fc127ac3fb47f3a4ad84d4b3f3ec25f40389f8..ff45fefd7058673f0c79875854accd041bc0c3a1 100644 +index 0f214dc5f4c585911953c4aaaa54cf43f340e4eb..9020f9d2ce1a0612f21fb0ba25c07c752475bb5a 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -217,7 +217,9 @@ public class KaiijuConfig { +@@ -218,7 +218,9 @@ public class KaiijuConfig { } public static boolean lithiumEnable = true; @@ -20,7 +20,6 @@ index e1fc127ac3fb47f3a4ad84d4b3f3ec25f40389f8..ff45fefd7058673f0c79875854accd04 + lithiumMathFastUtil = getBoolean("lithium.math.fast-util", lithiumMathFastUtil) && lithiumEnable; } } -\ No newline at end of file diff --git a/src/main/java/net/minecraft/core/AxisCycle.java b/src/main/java/net/minecraft/core/AxisCycle.java index b5d8a60dc78a76c0a55bfc30cc49d26857bd914a..dd8d98acf21bb676e86f9befb45fd09e1b14a01d 100644 --- a/src/main/java/net/minecraft/core/AxisCycle.java diff --git a/patches/server/0012-Lithium-Math-SineLut.patch b/patches/server/0012-Lithium-Math-SineLut.patch index 3d7d322..7c96a85 100644 --- a/patches/server/0012-Lithium-Math-SineLut.patch +++ b/patches/server/0012-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 ff45fefd7058673f0c79875854accd041bc0c3a1..8105e2747ee784ba9dde2ddeb7bf7a29639337ee 100644 +index 9020f9d2ce1a0612f21fb0ba25c07c752475bb5a..dca9c796317b988ae5963dd2d452c2b8162a2249 100644 --- a/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java +++ b/src/main/java/dev/kaiijumc/kaiiju/KaiijuConfig.java -@@ -218,8 +218,10 @@ public class KaiijuConfig { +@@ -219,8 +219,10 @@ public class KaiijuConfig { public static boolean lithiumEnable = true; public static boolean lithiumMathFastUtil = true; @@ -21,7 +21,6 @@ index ff45fefd7058673f0c79875854accd041bc0c3a1..8105e2747ee784ba9dde2ddeb7bf7a29 + lithiumMathSineLut = getBoolean("lithium.math.sine-lut", lithiumMathSineLut) && lithiumEnable; } } -\ No newline at end of file diff --git a/src/main/java/me/jellysquid/mods/lithium/common/util/math/CompactSineLUT.java b/src/main/java/me/jellysquid/mods/lithium/common/util/math/CompactSineLUT.java new file mode 100644 index 0000000000000000000000000000000000000000..ccb45e94ea6d1a627df786fb88baec7edd1f2427