diff --git a/README.md b/README.md index 12fd979..bb5a1d2 100644 --- a/README.md +++ b/README.md @@ -65,4 +65,5 @@ Binaries are licensed under GPL-3.0. ## TODO check Simpler ShapelessRecipe comparison for vanilla patch check Cache CubeVoxelShape shape array (crash) -check executeMidTickTasks in Remove lambda from ticking guard patch \ No newline at end of file +check executeMidTickTasks in Remove lambda from ticking guard patch +check backupRegionFile() in Add xor-shift random patch \ No newline at end of file diff --git a/patches/work/server/0131-Add-xor-shift-random.patch b/patches/server/0124-Add-xor-shift-random.patch similarity index 94% rename from patches/work/server/0131-Add-xor-shift-random.patch rename to patches/server/0124-Add-xor-shift-random.patch index 659d0e4..f9b7943 100644 --- a/patches/work/server/0131-Add-xor-shift-random.patch +++ b/patches/server/0124-Add-xor-shift-random.patch @@ -39,24 +39,11 @@ index fea92d280c6817cee1f18379d5ed51a3a22ee344..fd5d7feb9670a14cc6f7daa8ce6ba6a2 private long lastFill = -1; private long nextRefill = -1; -diff --git a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -index 1362a47943cf1a51a185a15094b1f74c94bf40ef..0cf120199b92df68aa78373589ccdbcfbf940e3f 100644 ---- a/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -+++ b/src/main/java/net/minecraft/world/level/chunk/storage/RegionFile.java -@@ -110,7 +110,7 @@ public class RegionFile implements AutoCloseable { - } - - private void backupRegionFile() { -- Path backup = this.path.getParent().resolve(this.path.getFileName() + "." + new java.util.Random().nextLong() + ".backup"); -+ Path backup = this.path.getParent().resolve(this.path.getFileName() + "." + new org.galemc.gale.random.XorShiftRandom().nextLong() + ".backup"); // Gale - xor-shift random - this.backupRegionFile(backup); - } - diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index f2b20ed5063a293f0b464548f590d652170cd1d8..2abe6131cc04ed397446c2aa08f77f9da00ce8c5 100644 +index 8045d6c9398d1c88595da6e41aa1ed27fb6fbad0..f2aec38dc7a631e41983f2c21f93ee0b260058b0 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -252,7 +252,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -251,7 +251,7 @@ public class CraftWorld extends CraftRegionAccessor implements World { } // Paper end @@ -66,7 +53,7 @@ index f2b20ed5063a293f0b464548f590d652170cd1d8..2abe6131cc04ed397446c2aa08f77f9d public CraftWorld(ServerLevel world, ChunkGenerator gen, BiomeProvider biomeProvider, Environment env) { this.world = world; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java -index 95e35c223f2ad9b6de6749544abd68de71e4f1ab..4370c27e5b7ab52092e261581558d793516af21d 100644 +index 759b6e54db93792c9862b1f1625118ac6fa49d7a..4b5e9bc33c25ac98c32aff1bd13788edf0eeee8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java @@ -14,7 +14,7 @@ import org.bukkit.inventory.meta.FireworkMeta; @@ -79,7 +66,7 @@ index 95e35c223f2ad9b6de6749544abd68de71e4f1ab..4370c27e5b7ab52092e261581558d793 public CraftFirework(CraftServer server, FireworkRocketEntity entity) { diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index 67125bbf3e3b37968b02908d441b21474579ce77..8fc6330817d2b3188f479c6c6a381e4d4f9872d5 100644 +index c3df5278231e13c43e9ea0804d95bf0542f2560a..abb8ff945b13c2cf4926a2f047d0e8dd074cea8f 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java @@ -10,6 +10,7 @@ import org.spongepowered.configurate.objectmapping.meta.PostProcess; @@ -534,7 +521,7 @@ index 0000000000000000000000000000000000000000..60dc2c1deb0749168d03c5d94136e613 + } +} diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index 0a32b68ae0172fa637a37fcf82557ba799e3aee6..5e24b70b102cbf4dce2dec748dab1949a77b0d4d 100644 +index 86b678aa745e125ceaa271deec00d6290a02d88b..0b2f2fbe462ed628ef3d640824d4162e79279089 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -38,6 +38,7 @@ import co.aikar.timings.MinecraftTimings; diff --git a/patches/server/0124-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch b/patches/server/0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch similarity index 100% rename from patches/server/0124-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch rename to patches/server/0125-Reduce-skull-ItemStack-lookups-for-reduced-visibilit.patch diff --git a/patches/server/0125-Initialize-line-of-sight-cache-with-low-capacity.patch b/patches/server/0126-Initialize-line-of-sight-cache-with-low-capacity.patch similarity index 100% rename from patches/server/0125-Initialize-line-of-sight-cache-with-low-capacity.patch rename to patches/server/0126-Initialize-line-of-sight-cache-with-low-capacity.patch diff --git a/patches/server/0126-Reduce-line-of-sight-updates-and-cache-lookups.patch b/patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch similarity index 97% rename from patches/server/0126-Reduce-line-of-sight-updates-and-cache-lookups.patch rename to patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch index acfa35e..4577f56 100644 --- a/patches/server/0126-Reduce-line-of-sight-updates-and-cache-lookups.patch +++ b/patches/server/0127-Reduce-line-of-sight-updates-and-cache-lookups.patch @@ -115,10 +115,10 @@ index 57472cb54e9fd83e980e3c57f28d6e6643f422e8..ce50852a9b18679a80e9393e8d904935 return bl; } diff --git a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -index c3df5278231e13c43e9ea0804d95bf0542f2560a..9b82eb1cc56e3151ecbd526bb1064ab7ef32186b 100644 +index abb8ff945b13c2cf4926a2f047d0e8dd074cea8f..b4cca06a583fbb7918237de256f43ee61fd8ec6c 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleGlobalConfiguration.java -@@ -33,6 +33,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { +@@ -34,6 +34,7 @@ public class GaleGlobalConfiguration extends ConfigurationPart { public class ReducedIntervals extends ConfigurationPart { public int increaseTimeStatistics = 20; // Gale - Hydrinity - increase time statistics in intervals diff --git a/patches/server/0127-Server-thread-priority-environment-variable.patch b/patches/server/0128-Server-thread-priority-environment-variable.patch similarity index 100% rename from patches/server/0127-Server-thread-priority-environment-variable.patch rename to patches/server/0128-Server-thread-priority-environment-variable.patch diff --git a/patches/server/0128-Virtual-thread-support.patch b/patches/server/0129-Virtual-thread-support.patch similarity index 100% rename from patches/server/0128-Virtual-thread-support.patch rename to patches/server/0129-Virtual-thread-support.patch