From 1bb895c165713e5c773c34bade1cbdeb2f438caf Mon Sep 17 00:00:00 2001 From: NanaChiyo0721 Date: Sun, 9 Aug 2026 14:57:32 +0800 Subject: [PATCH] Fix incorrect ticket lock size computing Yeah this would fully solve the issue of chunk unloading race condition The same fix was already initially added at "Force clamp grid-exponent to 1~6" --- ...incorrect-ticket-lock-size-computing.patch | 31 +++++++++++++++++++ ...25-Force-clamp-grid-exponent-to-1-6.patch} | 0 ...-Force-disable-builtin-spark-plugin.patch} | 0 ...nimals-check-can-teleport-in-an-unl.patch} | 0 ...zedTaskQueue-queue-TTL-optimization.patch} | 0 ...erations-in-nether-portal-searching.patch} | 0 ...cket-processing-queue-with-mt-queue.patch} | 0 ...0031-Reduce-allocation-in-PoiAccess.patch} | 0 ...2-Reduce-allocation-in-SignalGetter.patch} | 0 ...location-in-unlistened-spawn-events.patch} | 0 ...ync-protocol-switching-optimization.patch} | 0 ...0035-Improved-server-health-command.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 0 ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...-to-support-for-long-command-inputs.patch} | 0 ...0039-Add-config-for-server-mod-name.patch} | 0 ...=> 0040-Add-config-for-cpu-affinity.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ...042-Add-config-for-watchdog-timeout.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...44-Add-config-for-heightmap-warning.patch} | 0 ...atch => 0045-Add-config-gui-support.patch} | 0 ...e-data-command-to-be-enabled-config.patch} | 0 ...config-for-command-block-command-ex.patch} | 0 ...-config-to-modify-tripwire-behavior.patch} | 0 ... 0049-Add-config-for-item-multitask.patch} | 0 ...0-Add-config-to-enable-tick-command.patch} | 0 ...-for-whether-to-save-portal-tickets.patch} | 0 ...tch => 0052-Add-portal-rate-limiter.patch} | 0 ...us-bar.patch => 0053-Add-status-bar.patch} | 0 ...patch => 0054-Leaves-Vanilla-Hopper.patch} | 0 ...eaves-Lithium-Sleeping-Block-Entity.patch} | 0 ...ch => 0056-Petal-Reduce-sensor-work.patch} | 0 ...7-Purpur-Lobotomize-stuck-villagers.patch} | 0 ...ish-Reduce-projectile-chunk-loading.patch} | 0 ...le-goal-selector-during-inactive-ti.patch} | 0 ...Secure-seed-and-matter-seed-command.patch} | 0 ... => 0061-Secure-seed-V2-with-Blake3.patch} | 0 ...rain-maps-with-optimized-collection.patch} | 0 ...ss-creating-stats-json-bases-on-pla.patch} | 0 ...mize-PatchedDataComponentMap-equals.patch} | 0 ...r-checking-for-useless-move-packets.patch} | 0 ...ch => 0066-Leaf-fast-bit-radix-sort.patch} | 0 ...Configurable-vanilla-username-check.patch} | 0 ...68-Leaf-Lithium-faster-hash-palette.patch} | 0 ...cket-limit-Shiroha-Option-to-full-d.patch} | 0 ...ves-Configurable-collision-behavior.patch} | 0 ...071-Leaves-Optimized-dragon-respawn.patch} | 0 ...le-Variable-entity-wake-up-duration.patch} | 0 ...ttributes-with-optimized-collection.patch} | 0 ...kip-entity-move-if-movement-is-zero.patch} | 0 ...5-Gale-Store-mob-counts-in-an-array.patch} | 0 ...imize-random-calls-in-chunk-ticking.patch} | 0 ...uce-enderman-teleport-chunk-lookups.patch} | 0 ...> 0078-Gale-Cache-ShapePairKey-hash.patch} | 0 ...n-check-has-physics-before-same-veh.patch} | 0 ...ible-planar-movement-multiplication.patch} | 0 ...-Gale-Optimize-matching-item-checks.patch} | 0 ...a-and-Optional-allocation-in-Entity.patch} | 0 ... 0083-Gale-Reduce-array-allocations.patch} | 0 ...084-Some-optimizations-from-krypton.patch} | 0 ...imized-collections-for-WeightedList.patch} | 0 ...m-optimized-non-poi-block-searching.patch} | 0 ...p-unnecessary-secondary-poi-sensing.patch} | 0 64 files changed, 31 insertions(+) create mode 100644 shiroha-server/minecraft-patches/features/0024-Fix-incorrect-ticket-lock-size-computing.patch rename shiroha-server/minecraft-patches/features/{0024-Force-clamp-grid-exponent-to-1-6.patch => 0025-Force-clamp-grid-exponent-to-1-6.patch} (100%) rename shiroha-server/minecraft-patches/features/{0025-Force-disable-builtin-spark-plugin.patch => 0026-Force-disable-builtin-spark-plugin.patch} (100%) rename shiroha-server/minecraft-patches/features/{0026-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch => 0027-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch} (100%) rename shiroha-server/minecraft-patches/features/{0027-RegionizedTaskQueue-queue-TTL-optimization.patch => 0028-RegionizedTaskQueue-queue-TTL-optimization.patch} (100%) rename shiroha-server/minecraft-patches/features/{0028-Reduce-ticket-operations-in-nether-portal-searching.patch => 0029-Reduce-ticket-operations-in-nether-portal-searching.patch} (100%) rename shiroha-server/minecraft-patches/features/{0029-Replace-packet-processing-queue-with-mt-queue.patch => 0030-Replace-packet-processing-queue-with-mt-queue.patch} (100%) rename shiroha-server/minecraft-patches/features/{0030-Reduce-allocation-in-PoiAccess.patch => 0031-Reduce-allocation-in-PoiAccess.patch} (100%) rename shiroha-server/minecraft-patches/features/{0031-Reduce-allocation-in-SignalGetter.patch => 0032-Reduce-allocation-in-SignalGetter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0032-Reduce-allocation-in-unlistened-spawn-events.patch => 0033-Reduce-allocation-in-unlistened-spawn-events.patch} (100%) rename shiroha-server/minecraft-patches/features/{0033-Async-protocol-switching-optimization.patch => 0034-Async-protocol-switching-optimization.patch} (100%) rename shiroha-server/minecraft-patches/features/{0034-Improved-server-health-command.patch => 0035-Improved-server-health-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0035-Kaiiju-Entity-tick-and-removal-limiter.patch => 0036-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0036-Kaiiju-Vanilla-end-portal-teleportation.patch => 0037-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0037-Add-config-to-support-for-long-command-inputs.patch => 0038-Add-config-to-support-for-long-command-inputs.patch} (100%) rename shiroha-server/minecraft-patches/features/{0038-Add-config-for-server-mod-name.patch => 0039-Add-config-for-server-mod-name.patch} (100%) rename shiroha-server/minecraft-patches/features/{0039-Add-config-for-cpu-affinity.patch => 0040-Add-config-for-cpu-affinity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0040-Add-config-for-unsafe-teleportation.patch => 0041-Add-config-for-unsafe-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0041-Add-config-for-watchdog-timeout.patch => 0042-Add-config-for-watchdog-timeout.patch} (100%) rename shiroha-server/minecraft-patches/features/{0042-Add-config-to-disable-entity-tick-catchers.patch => 0043-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0043-Add-config-for-heightmap-warning.patch => 0044-Add-config-for-heightmap-warning.patch} (100%) rename shiroha-server/minecraft-patches/features/{0044-Add-config-gui-support.patch => 0045-Add-config-gui-support.patch} (100%) rename shiroha-server/minecraft-patches/features/{0045-Add-force-the-data-command-to-be-enabled-config.patch => 0046-Add-force-the-data-command-to-be-enabled-config.patch} (100%) rename shiroha-server/minecraft-patches/features/{0046-Add-experimental-config-for-command-block-command-ex.patch => 0047-Add-experimental-config-for-command-block-command-ex.patch} (100%) rename shiroha-server/minecraft-patches/features/{0047-Add-config-to-modify-tripwire-behavior.patch => 0048-Add-config-to-modify-tripwire-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0048-Add-config-for-item-multitask.patch => 0049-Add-config-for-item-multitask.patch} (100%) rename shiroha-server/minecraft-patches/features/{0049-Add-config-to-enable-tick-command.patch => 0050-Add-config-to-enable-tick-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0050-Add-config-for-whether-to-save-portal-tickets.patch => 0051-Add-config-for-whether-to-save-portal-tickets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0051-Add-portal-rate-limiter.patch => 0052-Add-portal-rate-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0052-Add-status-bar.patch => 0053-Add-status-bar.patch} (100%) rename shiroha-server/minecraft-patches/features/{0053-Leaves-Vanilla-Hopper.patch => 0054-Leaves-Vanilla-Hopper.patch} (100%) rename shiroha-server/minecraft-patches/features/{0054-Leaves-Lithium-Sleeping-Block-Entity.patch => 0055-Leaves-Lithium-Sleeping-Block-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0055-Petal-Reduce-sensor-work.patch => 0056-Petal-Reduce-sensor-work.patch} (100%) rename shiroha-server/minecraft-patches/features/{0056-Purpur-Lobotomize-stuck-villagers.patch => 0057-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0057-Pufferfish-Reduce-projectile-chunk-loading.patch => 0058-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename shiroha-server/minecraft-patches/features/{0058-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0059-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename shiroha-server/minecraft-patches/features/{0059-Leaf-Secure-seed-and-matter-seed-command.patch => 0060-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0060-Secure-seed-V2-with-Blake3.patch => 0061-Secure-seed-V2-with-Blake3.patch} (100%) rename shiroha-server/minecraft-patches/features/{0061-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0062-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0062-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0063-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename shiroha-server/minecraft-patches/features/{0063-Leaf-Optimize-PatchedDataComponentMap-equals.patch => 0064-Leaf-Optimize-PatchedDataComponentMap-equals.patch} (100%) rename shiroha-server/minecraft-patches/features/{0064-Leaf-Better-checking-for-useless-move-packets.patch => 0065-Leaf-Better-checking-for-useless-move-packets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0065-Leaf-fast-bit-radix-sort.patch => 0066-Leaf-fast-bit-radix-sort.patch} (100%) rename shiroha-server/minecraft-patches/features/{0066-Leaf-Configurable-vanilla-username-check.patch => 0067-Leaf-Configurable-vanilla-username-check.patch} (100%) rename shiroha-server/minecraft-patches/features/{0067-Leaf-Lithium-faster-hash-palette.patch => 0068-Leaf-Lithium-faster-hash-palette.patch} (100%) rename shiroha-server/minecraft-patches/features/{0068-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch => 0069-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch} (100%) rename shiroha-server/minecraft-patches/features/{0069-Leaves-Configurable-collision-behavior.patch => 0070-Leaves-Configurable-collision-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0070-Leaves-Optimized-dragon-respawn.patch => 0071-Leaves-Optimized-dragon-respawn.patch} (100%) rename shiroha-server/minecraft-patches/features/{0071-Gale-Variable-entity-wake-up-duration.patch => 0072-Gale-Variable-entity-wake-up-duration.patch} (100%) rename shiroha-server/minecraft-patches/features/{0072-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0073-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0073-Gale-Skip-entity-move-if-movement-is-zero.patch => 0074-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename shiroha-server/minecraft-patches/features/{0074-Gale-Store-mob-counts-in-an-array.patch => 0075-Gale-Store-mob-counts-in-an-array.patch} (100%) rename shiroha-server/minecraft-patches/features/{0075-Gale-Optimize-random-calls-in-chunk-ticking.patch => 0076-Gale-Optimize-random-calls-in-chunk-ticking.patch} (100%) rename shiroha-server/minecraft-patches/features/{0076-Gale-Reduce-enderman-teleport-chunk-lookups.patch => 0077-Gale-Reduce-enderman-teleport-chunk-lookups.patch} (100%) rename shiroha-server/minecraft-patches/features/{0077-Gale-Cache-ShapePairKey-hash.patch => 0078-Gale-Cache-ShapePairKey-hash.patch} (100%) rename shiroha-server/minecraft-patches/features/{0078-Gale-For-collision-check-has-physics-before-same-veh.patch => 0079-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename shiroha-server/minecraft-patches/features/{0079-Gale-Skip-negligible-planar-movement-multiplication.patch => 0080-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename shiroha-server/minecraft-patches/features/{0080-Gale-Optimize-matching-item-checks.patch => 0081-Gale-Optimize-matching-item-checks.patch} (100%) rename shiroha-server/minecraft-patches/features/{0081-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0082-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0082-Gale-Reduce-array-allocations.patch => 0083-Gale-Reduce-array-allocations.patch} (100%) rename shiroha-server/minecraft-patches/features/{0083-Some-optimizations-from-krypton.patch => 0084-Some-optimizations-from-krypton.patch} (100%) rename shiroha-server/minecraft-patches/features/{0084-Lithium-optimized-collections-for-WeightedList.patch => 0085-Lithium-optimized-collections-for-WeightedList.patch} (100%) rename shiroha-server/minecraft-patches/features/{0085-Lithium-optimized-non-poi-block-searching.patch => 0086-Lithium-optimized-non-poi-block-searching.patch} (100%) rename shiroha-server/minecraft-patches/features/{0086-Lithium-skip-unnecessary-secondary-poi-sensing.patch => 0087-Lithium-skip-unnecessary-secondary-poi-sensing.patch} (100%) diff --git a/shiroha-server/minecraft-patches/features/0024-Fix-incorrect-ticket-lock-size-computing.patch b/shiroha-server/minecraft-patches/features/0024-Fix-incorrect-ticket-lock-size-computing.patch new file mode 100644 index 0000000..bbdb346 --- /dev/null +++ b/shiroha-server/minecraft-patches/features/0024-Fix-incorrect-ticket-lock-size-computing.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NanaChiyo0721 +Date: Sun, 9 Aug 2026 14:35:48 +0800 +Subject: [PATCH] Fix incorrect ticket lock size computing + + +diff --git a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java +index 8b06d0c893e07c969d35c4d7528927552c27b48b..352325aeea9e4f797893911d81703262b198ecd5 100644 +--- a/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java ++++ b/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java +@@ -941,14 +941,18 @@ public final class ChunkHolderManager { + + final int lowerChunkX = CoordinateUtils.getChunkX(sectionKey) << sectionShift; + final int lowerChunkZ = CoordinateUtils.getChunkZ(sectionKey) << sectionShift; ++ // Shiroha start - Fix incorrect ticket lock size computing ++ final int upperChunkX = lowerChunkX + (1 << sectionShift) - 1; ++ final int upperChunkZ = lowerChunkZ + (1 << sectionShift) - 1; ++ // Shiroha end - Fix incorrect ticket lock size computing + + final int ticketShift = ThreadedTicketLevelPropagator.SECTION_SHIFT; + final int ticketMask = (1 << ticketShift) - 1; + final ReentrantAreaLock.Node ticketLock = this.ticketLockArea.lock( + ((lowerChunkX >> ticketShift) - 1) << ticketShift, + ((lowerChunkZ >> ticketShift) - 1) << ticketShift, +- (((lowerChunkX >> ticketShift) + 1) << ticketShift) | ticketMask, +- (((lowerChunkZ >> ticketShift) + 1) << ticketShift) | ticketMask ++ (((upperChunkX >> ticketShift) + 1) << ticketShift) | ticketMask, // Shiroha - Fix incorrect ticket lock size computing ++ (((upperChunkZ >> ticketShift) + 1) << ticketShift) | ticketMask // Shiroha - Fix incorrect ticket lock size computing + ); + + try { diff --git a/shiroha-server/minecraft-patches/features/0024-Force-clamp-grid-exponent-to-1-6.patch b/shiroha-server/minecraft-patches/features/0025-Force-clamp-grid-exponent-to-1-6.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0024-Force-clamp-grid-exponent-to-1-6.patch rename to shiroha-server/minecraft-patches/features/0025-Force-clamp-grid-exponent-to-1-6.patch diff --git a/shiroha-server/minecraft-patches/features/0025-Force-disable-builtin-spark-plugin.patch b/shiroha-server/minecraft-patches/features/0026-Force-disable-builtin-spark-plugin.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0025-Force-disable-builtin-spark-plugin.patch rename to shiroha-server/minecraft-patches/features/0026-Force-disable-builtin-spark-plugin.patch diff --git a/shiroha-server/minecraft-patches/features/0026-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch b/shiroha-server/minecraft-patches/features/0027-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0026-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch rename to shiroha-server/minecraft-patches/features/0027-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch diff --git a/shiroha-server/minecraft-patches/features/0027-RegionizedTaskQueue-queue-TTL-optimization.patch b/shiroha-server/minecraft-patches/features/0028-RegionizedTaskQueue-queue-TTL-optimization.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0027-RegionizedTaskQueue-queue-TTL-optimization.patch rename to shiroha-server/minecraft-patches/features/0028-RegionizedTaskQueue-queue-TTL-optimization.patch diff --git a/shiroha-server/minecraft-patches/features/0028-Reduce-ticket-operations-in-nether-portal-searching.patch b/shiroha-server/minecraft-patches/features/0029-Reduce-ticket-operations-in-nether-portal-searching.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0028-Reduce-ticket-operations-in-nether-portal-searching.patch rename to shiroha-server/minecraft-patches/features/0029-Reduce-ticket-operations-in-nether-portal-searching.patch diff --git a/shiroha-server/minecraft-patches/features/0029-Replace-packet-processing-queue-with-mt-queue.patch b/shiroha-server/minecraft-patches/features/0030-Replace-packet-processing-queue-with-mt-queue.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0029-Replace-packet-processing-queue-with-mt-queue.patch rename to shiroha-server/minecraft-patches/features/0030-Replace-packet-processing-queue-with-mt-queue.patch diff --git a/shiroha-server/minecraft-patches/features/0030-Reduce-allocation-in-PoiAccess.patch b/shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-PoiAccess.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0030-Reduce-allocation-in-PoiAccess.patch rename to shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-PoiAccess.patch diff --git a/shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-SignalGetter.patch b/shiroha-server/minecraft-patches/features/0032-Reduce-allocation-in-SignalGetter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-SignalGetter.patch rename to shiroha-server/minecraft-patches/features/0032-Reduce-allocation-in-SignalGetter.patch diff --git a/shiroha-server/minecraft-patches/features/0032-Reduce-allocation-in-unlistened-spawn-events.patch b/shiroha-server/minecraft-patches/features/0033-Reduce-allocation-in-unlistened-spawn-events.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0032-Reduce-allocation-in-unlistened-spawn-events.patch rename to shiroha-server/minecraft-patches/features/0033-Reduce-allocation-in-unlistened-spawn-events.patch diff --git a/shiroha-server/minecraft-patches/features/0033-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0034-Async-protocol-switching-optimization.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0033-Async-protocol-switching-optimization.patch rename to shiroha-server/minecraft-patches/features/0034-Async-protocol-switching-optimization.patch diff --git a/shiroha-server/minecraft-patches/features/0034-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0035-Improved-server-health-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0034-Improved-server-health-command.patch rename to shiroha-server/minecraft-patches/features/0035-Improved-server-health-command.patch diff --git a/shiroha-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0036-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0035-Kaiiju-Entity-tick-and-removal-limiter.patch rename to shiroha-server/minecraft-patches/features/0036-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0037-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0036-Kaiiju-Vanilla-end-portal-teleportation.patch rename to shiroha-server/minecraft-patches/features/0037-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0037-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0038-Add-config-to-support-for-long-command-inputs.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0037-Add-config-to-support-for-long-command-inputs.patch rename to shiroha-server/minecraft-patches/features/0038-Add-config-to-support-for-long-command-inputs.patch diff --git a/shiroha-server/minecraft-patches/features/0038-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0039-Add-config-for-server-mod-name.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0038-Add-config-for-server-mod-name.patch rename to shiroha-server/minecraft-patches/features/0039-Add-config-for-server-mod-name.patch diff --git a/shiroha-server/minecraft-patches/features/0039-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0040-Add-config-for-cpu-affinity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0039-Add-config-for-cpu-affinity.patch rename to shiroha-server/minecraft-patches/features/0040-Add-config-for-cpu-affinity.patch diff --git a/shiroha-server/minecraft-patches/features/0040-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0041-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0040-Add-config-for-unsafe-teleportation.patch rename to shiroha-server/minecraft-patches/features/0041-Add-config-for-unsafe-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0041-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0042-Add-config-for-watchdog-timeout.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0041-Add-config-for-watchdog-timeout.patch rename to shiroha-server/minecraft-patches/features/0042-Add-config-for-watchdog-timeout.patch diff --git a/shiroha-server/minecraft-patches/features/0042-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0043-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0042-Add-config-to-disable-entity-tick-catchers.patch rename to shiroha-server/minecraft-patches/features/0043-Add-config-to-disable-entity-tick-catchers.patch diff --git a/shiroha-server/minecraft-patches/features/0043-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0044-Add-config-for-heightmap-warning.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0043-Add-config-for-heightmap-warning.patch rename to shiroha-server/minecraft-patches/features/0044-Add-config-for-heightmap-warning.patch diff --git a/shiroha-server/minecraft-patches/features/0044-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0045-Add-config-gui-support.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0044-Add-config-gui-support.patch rename to shiroha-server/minecraft-patches/features/0045-Add-config-gui-support.patch diff --git a/shiroha-server/minecraft-patches/features/0045-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0046-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0045-Add-force-the-data-command-to-be-enabled-config.patch rename to shiroha-server/minecraft-patches/features/0046-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/shiroha-server/minecraft-patches/features/0046-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0047-Add-experimental-config-for-command-block-command-ex.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0046-Add-experimental-config-for-command-block-command-ex.patch rename to shiroha-server/minecraft-patches/features/0047-Add-experimental-config-for-command-block-command-ex.patch diff --git a/shiroha-server/minecraft-patches/features/0047-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0048-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0047-Add-config-to-modify-tripwire-behavior.patch rename to shiroha-server/minecraft-patches/features/0048-Add-config-to-modify-tripwire-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0048-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0049-Add-config-for-item-multitask.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0048-Add-config-for-item-multitask.patch rename to shiroha-server/minecraft-patches/features/0049-Add-config-for-item-multitask.patch diff --git a/shiroha-server/minecraft-patches/features/0049-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0050-Add-config-to-enable-tick-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0049-Add-config-to-enable-tick-command.patch rename to shiroha-server/minecraft-patches/features/0050-Add-config-to-enable-tick-command.patch diff --git a/shiroha-server/minecraft-patches/features/0050-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0051-Add-config-for-whether-to-save-portal-tickets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0050-Add-config-for-whether-to-save-portal-tickets.patch rename to shiroha-server/minecraft-patches/features/0051-Add-config-for-whether-to-save-portal-tickets.patch diff --git a/shiroha-server/minecraft-patches/features/0051-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0052-Add-portal-rate-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0051-Add-portal-rate-limiter.patch rename to shiroha-server/minecraft-patches/features/0052-Add-portal-rate-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0052-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0053-Add-status-bar.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0052-Add-status-bar.patch rename to shiroha-server/minecraft-patches/features/0053-Add-status-bar.patch diff --git a/shiroha-server/minecraft-patches/features/0053-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0054-Leaves-Vanilla-Hopper.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0053-Leaves-Vanilla-Hopper.patch rename to shiroha-server/minecraft-patches/features/0054-Leaves-Vanilla-Hopper.patch diff --git a/shiroha-server/minecraft-patches/features/0054-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0055-Leaves-Lithium-Sleeping-Block-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0054-Leaves-Lithium-Sleeping-Block-Entity.patch rename to shiroha-server/minecraft-patches/features/0055-Leaves-Lithium-Sleeping-Block-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0055-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0056-Petal-Reduce-sensor-work.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0055-Petal-Reduce-sensor-work.patch rename to shiroha-server/minecraft-patches/features/0056-Petal-Reduce-sensor-work.patch diff --git a/shiroha-server/minecraft-patches/features/0056-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0057-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0056-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-server/minecraft-patches/features/0057-Purpur-Lobotomize-stuck-villagers.patch diff --git a/shiroha-server/minecraft-patches/features/0057-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0058-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0057-Pufferfish-Reduce-projectile-chunk-loading.patch rename to shiroha-server/minecraft-patches/features/0058-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/shiroha-server/minecraft-patches/features/0058-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0059-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0058-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to shiroha-server/minecraft-patches/features/0059-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/shiroha-server/minecraft-patches/features/0059-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0060-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0059-Leaf-Secure-seed-and-matter-seed-command.patch rename to shiroha-server/minecraft-patches/features/0060-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/shiroha-server/minecraft-patches/features/0060-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0061-Secure-seed-V2-with-Blake3.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0060-Secure-seed-V2-with-Blake3.patch rename to shiroha-server/minecraft-patches/features/0061-Secure-seed-V2-with-Blake3.patch diff --git a/shiroha-server/minecraft-patches/features/0061-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0062-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0061-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0062-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0062-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0063-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0062-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to shiroha-server/minecraft-patches/features/0063-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/shiroha-server/minecraft-patches/features/0063-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0064-Leaf-Optimize-PatchedDataComponentMap-equals.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0063-Leaf-Optimize-PatchedDataComponentMap-equals.patch rename to shiroha-server/minecraft-patches/features/0064-Leaf-Optimize-PatchedDataComponentMap-equals.patch diff --git a/shiroha-server/minecraft-patches/features/0064-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0065-Leaf-Better-checking-for-useless-move-packets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0064-Leaf-Better-checking-for-useless-move-packets.patch rename to shiroha-server/minecraft-patches/features/0065-Leaf-Better-checking-for-useless-move-packets.patch diff --git a/shiroha-server/minecraft-patches/features/0065-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0066-Leaf-fast-bit-radix-sort.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0065-Leaf-fast-bit-radix-sort.patch rename to shiroha-server/minecraft-patches/features/0066-Leaf-fast-bit-radix-sort.patch diff --git a/shiroha-server/minecraft-patches/features/0066-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0067-Leaf-Configurable-vanilla-username-check.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0066-Leaf-Configurable-vanilla-username-check.patch rename to shiroha-server/minecraft-patches/features/0067-Leaf-Configurable-vanilla-username-check.patch diff --git a/shiroha-server/minecraft-patches/features/0067-Leaf-Lithium-faster-hash-palette.patch b/shiroha-server/minecraft-patches/features/0068-Leaf-Lithium-faster-hash-palette.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0067-Leaf-Lithium-faster-hash-palette.patch rename to shiroha-server/minecraft-patches/features/0068-Leaf-Lithium-faster-hash-palette.patch diff --git a/shiroha-server/minecraft-patches/features/0068-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch b/shiroha-server/minecraft-patches/features/0069-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0068-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch rename to shiroha-server/minecraft-patches/features/0069-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch diff --git a/shiroha-server/minecraft-patches/features/0069-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0070-Leaves-Configurable-collision-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0069-Leaves-Configurable-collision-behavior.patch rename to shiroha-server/minecraft-patches/features/0070-Leaves-Configurable-collision-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0070-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0071-Leaves-Optimized-dragon-respawn.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0070-Leaves-Optimized-dragon-respawn.patch rename to shiroha-server/minecraft-patches/features/0071-Leaves-Optimized-dragon-respawn.patch diff --git a/shiroha-server/minecraft-patches/features/0071-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0072-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0071-Gale-Variable-entity-wake-up-duration.patch rename to shiroha-server/minecraft-patches/features/0072-Gale-Variable-entity-wake-up-duration.patch diff --git a/shiroha-server/minecraft-patches/features/0072-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0073-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0072-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0073-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0073-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0074-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0073-Gale-Skip-entity-move-if-movement-is-zero.patch rename to shiroha-server/minecraft-patches/features/0074-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/shiroha-server/minecraft-patches/features/0074-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0075-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0074-Gale-Store-mob-counts-in-an-array.patch rename to shiroha-server/minecraft-patches/features/0075-Gale-Store-mob-counts-in-an-array.patch diff --git a/shiroha-server/minecraft-patches/features/0075-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0076-Gale-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0075-Gale-Optimize-random-calls-in-chunk-ticking.patch rename to shiroha-server/minecraft-patches/features/0076-Gale-Optimize-random-calls-in-chunk-ticking.patch diff --git a/shiroha-server/minecraft-patches/features/0076-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0077-Gale-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0076-Gale-Reduce-enderman-teleport-chunk-lookups.patch rename to shiroha-server/minecraft-patches/features/0077-Gale-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/shiroha-server/minecraft-patches/features/0077-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0078-Gale-Cache-ShapePairKey-hash.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0077-Gale-Cache-ShapePairKey-hash.patch rename to shiroha-server/minecraft-patches/features/0078-Gale-Cache-ShapePairKey-hash.patch diff --git a/shiroha-server/minecraft-patches/features/0078-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0079-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0078-Gale-For-collision-check-has-physics-before-same-veh.patch rename to shiroha-server/minecraft-patches/features/0079-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/shiroha-server/minecraft-patches/features/0079-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0080-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0079-Gale-Skip-negligible-planar-movement-multiplication.patch rename to shiroha-server/minecraft-patches/features/0080-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/shiroha-server/minecraft-patches/features/0080-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0081-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0080-Gale-Optimize-matching-item-checks.patch rename to shiroha-server/minecraft-patches/features/0081-Gale-Optimize-matching-item-checks.patch diff --git a/shiroha-server/minecraft-patches/features/0081-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0082-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0081-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to shiroha-server/minecraft-patches/features/0082-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0082-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0083-Gale-Reduce-array-allocations.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0082-Gale-Reduce-array-allocations.patch rename to shiroha-server/minecraft-patches/features/0083-Gale-Reduce-array-allocations.patch diff --git a/shiroha-server/minecraft-patches/features/0083-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0084-Some-optimizations-from-krypton.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0083-Some-optimizations-from-krypton.patch rename to shiroha-server/minecraft-patches/features/0084-Some-optimizations-from-krypton.patch diff --git a/shiroha-server/minecraft-patches/features/0084-Lithium-optimized-collections-for-WeightedList.patch b/shiroha-server/minecraft-patches/features/0085-Lithium-optimized-collections-for-WeightedList.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0084-Lithium-optimized-collections-for-WeightedList.patch rename to shiroha-server/minecraft-patches/features/0085-Lithium-optimized-collections-for-WeightedList.patch diff --git a/shiroha-server/minecraft-patches/features/0085-Lithium-optimized-non-poi-block-searching.patch b/shiroha-server/minecraft-patches/features/0086-Lithium-optimized-non-poi-block-searching.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0085-Lithium-optimized-non-poi-block-searching.patch rename to shiroha-server/minecraft-patches/features/0086-Lithium-optimized-non-poi-block-searching.patch diff --git a/shiroha-server/minecraft-patches/features/0086-Lithium-skip-unnecessary-secondary-poi-sensing.patch b/shiroha-server/minecraft-patches/features/0087-Lithium-skip-unnecessary-secondary-poi-sensing.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0086-Lithium-skip-unnecessary-secondary-poi-sensing.patch rename to shiroha-server/minecraft-patches/features/0087-Lithium-skip-unnecessary-secondary-poi-sensing.patch