From 1faa336f5af6852b42a898540f616ef8c1497452 Mon Sep 17 00:00:00 2001
From: NanaChiyo0721 <nanachiyo0721@163.com>
Date: Sun, 26 Jul 2026 22:24:29 +0800
Subject: [PATCH] Fix wrong variable passing in ThreadedRegionizer

---
 ...riable-passing-in-ThreadedRegionizer.patch | 21 +++++++++++++++++++
 ...update-determination-in-RegionizedT.patch} |  0
 ...22-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
 ...cket-processing-queue-with-mt-queue.patch} |  0
 ...ync-protocol-switching-optimization.patch} |  0
 ...0027-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
 ...0031-Add-config-for-server-mod-name.patch} |  0
 ...=> 0032-Add-config-for-cpu-affinity.patch} |  0
 ...Add-config-for-unsafe-teleportation.patch} |  0
 ...034-Add-config-for-watchdog-timeout.patch} |  0
 ...fig-to-disable-entity-tick-catchers.patch} |  0
 ...36-Add-config-for-heightmap-warning.patch} |  0
 ...atch => 0037-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
 ... 0041-Add-config-for-item-multitask.patch} |  0
 ...2-Add-config-to-enable-tick-command.patch} |  0
 ...-for-whether-to-save-portal-tickets.patch} |  0
 ...tch => 0044-Add-portal-rate-limiter.patch} |  0
 ...us-bar.patch => 0045-Add-status-bar.patch} |  0
 ...patch => 0046-Leaves-Vanilla-Hopper.patch} |  0
 ...eaves-Lithium-Sleeping-Block-Entity.patch} |  0
 ...ch => 0048-Petal-Reduce-sensor-work.patch} |  0
 ...9-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
 ... => 0053-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 => 0058-Leaf-fast-bit-radix-sort.patch} |  0
 ...Configurable-vanilla-username-check.patch} |  0
 ...60-Leaf-Lithium-faster-hash-palette.patch} |  0
 ...cket-limit-Shiroha-Option-to-full-d.patch} |  0
 ...ves-Configurable-collision-behavior.patch} |  0
 ...063-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
 ...7-Gale-Store-mob-counts-in-an-array.patch} |  0
 ...imize-random-calls-in-chunk-ticking.patch} |  0
 ...uce-enderman-teleport-chunk-lookups.patch} |  0
 ...> 0070-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
 ... 0075-Gale-Reduce-array-allocations.patch} |  0
 ...076-Some-optimizations-from-krypton.patch} |  0
 ...h => 0077-Frustum-filtering-tracker.patch} |  0
 ...imized-collections-for-WeightedList.patch} |  0
 ...m-optimized-non-poi-block-searching.patch} |  0
 60 files changed, 21 insertions(+)
 create mode 100644 shiroha-server/minecraft-patches/features/0020-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch
 rename shiroha-server/minecraft-patches/features/{0020-Fix-wrong-ticket-update-determination-in-RegionizedT.patch => 0021-Fix-wrong-ticket-update-determination-in-RegionizedT.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0021-Force-clamp-grid-exponent-to-1-6.patch => 0022-Force-clamp-grid-exponent-to-1-6.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0022-Force-disable-builtin-spark-plugin.patch => 0023-Force-disable-builtin-spark-plugin.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0023-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch => 0024-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0024-Replace-packet-processing-queue-with-mt-queue.patch => 0025-Replace-packet-processing-queue-with-mt-queue.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0025-Async-protocol-switching-optimization.patch => 0026-Async-protocol-switching-optimization.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0026-Improved-server-health-command.patch => 0027-Improved-server-health-command.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0027-Kaiiju-Entity-tick-and-removal-limiter.patch => 0028-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0028-Kaiiju-Vanilla-end-portal-teleportation.patch => 0029-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0029-Add-config-to-support-for-long-command-inputs.patch => 0030-Add-config-to-support-for-long-command-inputs.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0030-Add-config-for-server-mod-name.patch => 0031-Add-config-for-server-mod-name.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0031-Add-config-for-cpu-affinity.patch => 0032-Add-config-for-cpu-affinity.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0032-Add-config-for-unsafe-teleportation.patch => 0033-Add-config-for-unsafe-teleportation.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0033-Add-config-for-watchdog-timeout.patch => 0034-Add-config-for-watchdog-timeout.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0034-Add-config-to-disable-entity-tick-catchers.patch => 0035-Add-config-to-disable-entity-tick-catchers.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0035-Add-config-for-heightmap-warning.patch => 0036-Add-config-for-heightmap-warning.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0036-Add-config-gui-support.patch => 0037-Add-config-gui-support.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0037-Add-force-the-data-command-to-be-enabled-config.patch => 0038-Add-force-the-data-command-to-be-enabled-config.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0038-Add-experimental-config-for-command-block-command-ex.patch => 0039-Add-experimental-config-for-command-block-command-ex.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0039-Add-config-to-modify-tripwire-behavior.patch => 0040-Add-config-to-modify-tripwire-behavior.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0040-Add-config-for-item-multitask.patch => 0041-Add-config-for-item-multitask.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0041-Add-config-to-enable-tick-command.patch => 0042-Add-config-to-enable-tick-command.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0042-Add-config-for-whether-to-save-portal-tickets.patch => 0043-Add-config-for-whether-to-save-portal-tickets.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0043-Add-portal-rate-limiter.patch => 0044-Add-portal-rate-limiter.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0044-Add-status-bar.patch => 0045-Add-status-bar.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0045-Leaves-Vanilla-Hopper.patch => 0046-Leaves-Vanilla-Hopper.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0046-Leaves-Lithium-Sleeping-Block-Entity.patch => 0047-Leaves-Lithium-Sleeping-Block-Entity.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0047-Petal-Reduce-sensor-work.patch => 0048-Petal-Reduce-sensor-work.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0048-Purpur-Lobotomize-stuck-villagers.patch => 0049-Purpur-Lobotomize-stuck-villagers.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0049-Pufferfish-Reduce-projectile-chunk-loading.patch => 0050-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0050-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0051-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0051-Leaf-Secure-seed-and-matter-seed-command.patch => 0052-Leaf-Secure-seed-and-matter-seed-command.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0052-Secure-seed-V2-with-Blake3.patch => 0053-Secure-seed-V2-with-Blake3.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0053-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0054-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0054-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0055-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0055-Leaf-Optimize-PatchedDataComponentMap-equals.patch => 0056-Leaf-Optimize-PatchedDataComponentMap-equals.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0056-Leaf-Better-checking-for-useless-move-packets.patch => 0057-Leaf-Better-checking-for-useless-move-packets.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0057-Leaf-fast-bit-radix-sort.patch => 0058-Leaf-fast-bit-radix-sort.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0058-Leaf-Configurable-vanilla-username-check.patch => 0059-Leaf-Configurable-vanilla-username-check.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0059-Leaf-Lithium-faster-hash-palette.patch => 0060-Leaf-Lithium-faster-hash-palette.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0060-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch => 0061-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0061-Leaves-Configurable-collision-behavior.patch => 0062-Leaves-Configurable-collision-behavior.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0062-Leaves-Optimized-dragon-respawn.patch => 0063-Leaves-Optimized-dragon-respawn.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0063-Gale-Variable-entity-wake-up-duration.patch => 0064-Gale-Variable-entity-wake-up-duration.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0064-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0065-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0065-Gale-Skip-entity-move-if-movement-is-zero.patch => 0066-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0066-Gale-Store-mob-counts-in-an-array.patch => 0067-Gale-Store-mob-counts-in-an-array.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0067-Gale-Optimize-random-calls-in-chunk-ticking.patch => 0068-Gale-Optimize-random-calls-in-chunk-ticking.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0068-Gale-Reduce-enderman-teleport-chunk-lookups.patch => 0069-Gale-Reduce-enderman-teleport-chunk-lookups.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0069-Gale-Cache-ShapePairKey-hash.patch => 0070-Gale-Cache-ShapePairKey-hash.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0070-Gale-For-collision-check-has-physics-before-same-veh.patch => 0071-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0071-Gale-Skip-negligible-planar-movement-multiplication.patch => 0072-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0072-Gale-Optimize-matching-item-checks.patch => 0073-Gale-Optimize-matching-item-checks.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0073-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0074-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0074-Gale-Reduce-array-allocations.patch => 0075-Gale-Reduce-array-allocations.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0075-Some-optimizations-from-krypton.patch => 0076-Some-optimizations-from-krypton.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0076-Frustum-filtering-tracker.patch => 0077-Frustum-filtering-tracker.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0077-Lithium-optimized-collections-for-WeightedList.patch => 0078-Lithium-optimized-collections-for-WeightedList.patch} (100%)
 rename shiroha-server/minecraft-patches/features/{0078-Lithium-optimized-non-poi-block-searching.patch => 0079-Lithium-optimized-non-poi-block-searching.patch} (100%)

diff --git a/shiroha-server/minecraft-patches/features/0020-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch b/shiroha-server/minecraft-patches/features/0020-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch
new file mode 100644
index 0000000..ae60ddc
--- /dev/null
+++ b/shiroha-server/minecraft-patches/features/0020-Fix-wrong-variable-passing-in-ThreadedRegionizer.patch
@@ -0,0 +1,21 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: NanaChiyo0721 <nanachiyo0721@163.com>
+Date: Sun, 26 Jul 2026 22:14:00 +0800
+Subject: [PATCH] Fix wrong variable passing in ThreadedRegionizer
+
+
+diff --git a/io/papermc/paper/threadedregions/ThreadedRegionizer.java b/io/papermc/paper/threadedregions/ThreadedRegionizer.java
+index 3449918b5001bb39c541ce1168eac4acf9144e1f..a8333bfa5951537621620658dcd9544a8aca6aff 100644
+--- a/io/papermc/paper/threadedregions/ThreadedRegionizer.java
++++ b/io/papermc/paper/threadedregions/ThreadedRegionizer.java
+@@ -752,8 +752,8 @@ public final class ThreadedRegionizer<R extends ThreadedRegionizer.ThreadedRegio
+                 final int x1 = CoordinateUtils.getChunkX(k1);
+                 final int x2 = CoordinateUtils.getChunkX(k2);
+ 
+-                final int z1 = CoordinateUtils.getChunkZ(x1);
+-                final int z2 = CoordinateUtils.getChunkZ(x2);
++                final int z1 = CoordinateUtils.getChunkZ(k1); // Shiroha - Fix wrong variable passing in ThreadedRegionizer
++                final int z2 = CoordinateUtils.getChunkZ(k2); // Shiroha - Fix wrong variable passing in ThreadedRegionizer
+ 
+                 final int zCompare = Integer.compare(z1, z2);
+                 if (zCompare != 0) {
diff --git a/shiroha-server/minecraft-patches/features/0020-Fix-wrong-ticket-update-determination-in-RegionizedT.patch b/shiroha-server/minecraft-patches/features/0021-Fix-wrong-ticket-update-determination-in-RegionizedT.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0020-Fix-wrong-ticket-update-determination-in-RegionizedT.patch
rename to shiroha-server/minecraft-patches/features/0021-Fix-wrong-ticket-update-determination-in-RegionizedT.patch
diff --git a/shiroha-server/minecraft-patches/features/0021-Force-clamp-grid-exponent-to-1-6.patch b/shiroha-server/minecraft-patches/features/0022-Force-clamp-grid-exponent-to-1-6.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0021-Force-clamp-grid-exponent-to-1-6.patch
rename to shiroha-server/minecraft-patches/features/0022-Force-clamp-grid-exponent-to-1-6.patch
diff --git a/shiroha-server/minecraft-patches/features/0022-Force-disable-builtin-spark-plugin.patch b/shiroha-server/minecraft-patches/features/0023-Force-disable-builtin-spark-plugin.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0022-Force-disable-builtin-spark-plugin.patch
rename to shiroha-server/minecraft-patches/features/0023-Force-disable-builtin-spark-plugin.patch
diff --git a/shiroha-server/minecraft-patches/features/0023-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch b/shiroha-server/minecraft-patches/features/0024-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0023-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch
rename to shiroha-server/minecraft-patches/features/0024-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch
diff --git a/shiroha-server/minecraft-patches/features/0024-Replace-packet-processing-queue-with-mt-queue.patch b/shiroha-server/minecraft-patches/features/0025-Replace-packet-processing-queue-with-mt-queue.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0024-Replace-packet-processing-queue-with-mt-queue.patch
rename to shiroha-server/minecraft-patches/features/0025-Replace-packet-processing-queue-with-mt-queue.patch
diff --git a/shiroha-server/minecraft-patches/features/0025-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0026-Async-protocol-switching-optimization.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0025-Async-protocol-switching-optimization.patch
rename to shiroha-server/minecraft-patches/features/0026-Async-protocol-switching-optimization.patch
diff --git a/shiroha-server/minecraft-patches/features/0026-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0027-Improved-server-health-command.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0026-Improved-server-health-command.patch
rename to shiroha-server/minecraft-patches/features/0027-Improved-server-health-command.patch
diff --git a/shiroha-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0027-Kaiiju-Entity-tick-and-removal-limiter.patch
rename to shiroha-server/minecraft-patches/features/0028-Kaiiju-Entity-tick-and-removal-limiter.patch
diff --git a/shiroha-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0028-Kaiiju-Vanilla-end-portal-teleportation.patch
rename to shiroha-server/minecraft-patches/features/0029-Kaiiju-Vanilla-end-portal-teleportation.patch
diff --git a/shiroha-server/minecraft-patches/features/0029-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0030-Add-config-to-support-for-long-command-inputs.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0029-Add-config-to-support-for-long-command-inputs.patch
rename to shiroha-server/minecraft-patches/features/0030-Add-config-to-support-for-long-command-inputs.patch
diff --git a/shiroha-server/minecraft-patches/features/0030-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0031-Add-config-for-server-mod-name.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0030-Add-config-for-server-mod-name.patch
rename to shiroha-server/minecraft-patches/features/0031-Add-config-for-server-mod-name.patch
diff --git a/shiroha-server/minecraft-patches/features/0031-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0032-Add-config-for-cpu-affinity.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0031-Add-config-for-cpu-affinity.patch
rename to shiroha-server/minecraft-patches/features/0032-Add-config-for-cpu-affinity.patch
diff --git a/shiroha-server/minecraft-patches/features/0032-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0032-Add-config-for-unsafe-teleportation.patch
rename to shiroha-server/minecraft-patches/features/0033-Add-config-for-unsafe-teleportation.patch
diff --git a/shiroha-server/minecraft-patches/features/0033-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0034-Add-config-for-watchdog-timeout.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0033-Add-config-for-watchdog-timeout.patch
rename to shiroha-server/minecraft-patches/features/0034-Add-config-for-watchdog-timeout.patch
diff --git a/shiroha-server/minecraft-patches/features/0034-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0035-Add-config-to-disable-entity-tick-catchers.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0034-Add-config-to-disable-entity-tick-catchers.patch
rename to shiroha-server/minecraft-patches/features/0035-Add-config-to-disable-entity-tick-catchers.patch
diff --git a/shiroha-server/minecraft-patches/features/0035-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0036-Add-config-for-heightmap-warning.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0035-Add-config-for-heightmap-warning.patch
rename to shiroha-server/minecraft-patches/features/0036-Add-config-for-heightmap-warning.patch
diff --git a/shiroha-server/minecraft-patches/features/0036-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0037-Add-config-gui-support.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0036-Add-config-gui-support.patch
rename to shiroha-server/minecraft-patches/features/0037-Add-config-gui-support.patch
diff --git a/shiroha-server/minecraft-patches/features/0037-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0038-Add-force-the-data-command-to-be-enabled-config.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0037-Add-force-the-data-command-to-be-enabled-config.patch
rename to shiroha-server/minecraft-patches/features/0038-Add-force-the-data-command-to-be-enabled-config.patch
diff --git a/shiroha-server/minecraft-patches/features/0038-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0039-Add-experimental-config-for-command-block-command-ex.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0038-Add-experimental-config-for-command-block-command-ex.patch
rename to shiroha-server/minecraft-patches/features/0039-Add-experimental-config-for-command-block-command-ex.patch
diff --git a/shiroha-server/minecraft-patches/features/0039-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0040-Add-config-to-modify-tripwire-behavior.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0039-Add-config-to-modify-tripwire-behavior.patch
rename to shiroha-server/minecraft-patches/features/0040-Add-config-to-modify-tripwire-behavior.patch
diff --git a/shiroha-server/minecraft-patches/features/0040-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0041-Add-config-for-item-multitask.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0040-Add-config-for-item-multitask.patch
rename to shiroha-server/minecraft-patches/features/0041-Add-config-for-item-multitask.patch
diff --git a/shiroha-server/minecraft-patches/features/0041-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0042-Add-config-to-enable-tick-command.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0041-Add-config-to-enable-tick-command.patch
rename to shiroha-server/minecraft-patches/features/0042-Add-config-to-enable-tick-command.patch
diff --git a/shiroha-server/minecraft-patches/features/0042-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0043-Add-config-for-whether-to-save-portal-tickets.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0042-Add-config-for-whether-to-save-portal-tickets.patch
rename to shiroha-server/minecraft-patches/features/0043-Add-config-for-whether-to-save-portal-tickets.patch
diff --git a/shiroha-server/minecraft-patches/features/0043-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0044-Add-portal-rate-limiter.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0043-Add-portal-rate-limiter.patch
rename to shiroha-server/minecraft-patches/features/0044-Add-portal-rate-limiter.patch
diff --git a/shiroha-server/minecraft-patches/features/0044-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0045-Add-status-bar.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0044-Add-status-bar.patch
rename to shiroha-server/minecraft-patches/features/0045-Add-status-bar.patch
diff --git a/shiroha-server/minecraft-patches/features/0045-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0046-Leaves-Vanilla-Hopper.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0045-Leaves-Vanilla-Hopper.patch
rename to shiroha-server/minecraft-patches/features/0046-Leaves-Vanilla-Hopper.patch
diff --git a/shiroha-server/minecraft-patches/features/0046-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0047-Leaves-Lithium-Sleeping-Block-Entity.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0046-Leaves-Lithium-Sleeping-Block-Entity.patch
rename to shiroha-server/minecraft-patches/features/0047-Leaves-Lithium-Sleeping-Block-Entity.patch
diff --git a/shiroha-server/minecraft-patches/features/0047-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0048-Petal-Reduce-sensor-work.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0047-Petal-Reduce-sensor-work.patch
rename to shiroha-server/minecraft-patches/features/0048-Petal-Reduce-sensor-work.patch
diff --git a/shiroha-server/minecraft-patches/features/0048-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0049-Purpur-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0048-Purpur-Lobotomize-stuck-villagers.patch
rename to shiroha-server/minecraft-patches/features/0049-Purpur-Lobotomize-stuck-villagers.patch
diff --git a/shiroha-server/minecraft-patches/features/0049-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0050-Pufferfish-Reduce-projectile-chunk-loading.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0049-Pufferfish-Reduce-projectile-chunk-loading.patch
rename to shiroha-server/minecraft-patches/features/0050-Pufferfish-Reduce-projectile-chunk-loading.patch
diff --git a/shiroha-server/minecraft-patches/features/0050-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0051-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0050-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
rename to shiroha-server/minecraft-patches/features/0051-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
diff --git a/shiroha-server/minecraft-patches/features/0051-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0052-Leaf-Secure-seed-and-matter-seed-command.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0051-Leaf-Secure-seed-and-matter-seed-command.patch
rename to shiroha-server/minecraft-patches/features/0052-Leaf-Secure-seed-and-matter-seed-command.patch
diff --git a/shiroha-server/minecraft-patches/features/0052-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0053-Secure-seed-V2-with-Blake3.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0052-Secure-seed-V2-with-Blake3.patch
rename to shiroha-server/minecraft-patches/features/0053-Secure-seed-V2-with-Blake3.patch
diff --git a/shiroha-server/minecraft-patches/features/0053-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0054-Leaf-Replace-brain-maps-with-optimized-collection.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0053-Leaf-Replace-brain-maps-with-optimized-collection.patch
rename to shiroha-server/minecraft-patches/features/0054-Leaf-Replace-brain-maps-with-optimized-collection.patch
diff --git a/shiroha-server/minecraft-patches/features/0054-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0055-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0054-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch
rename to shiroha-server/minecraft-patches/features/0055-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch
diff --git a/shiroha-server/minecraft-patches/features/0055-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0056-Leaf-Optimize-PatchedDataComponentMap-equals.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0055-Leaf-Optimize-PatchedDataComponentMap-equals.patch
rename to shiroha-server/minecraft-patches/features/0056-Leaf-Optimize-PatchedDataComponentMap-equals.patch
diff --git a/shiroha-server/minecraft-patches/features/0056-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0057-Leaf-Better-checking-for-useless-move-packets.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0056-Leaf-Better-checking-for-useless-move-packets.patch
rename to shiroha-server/minecraft-patches/features/0057-Leaf-Better-checking-for-useless-move-packets.patch
diff --git a/shiroha-server/minecraft-patches/features/0057-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0058-Leaf-fast-bit-radix-sort.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0057-Leaf-fast-bit-radix-sort.patch
rename to shiroha-server/minecraft-patches/features/0058-Leaf-fast-bit-radix-sort.patch
diff --git a/shiroha-server/minecraft-patches/features/0058-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0059-Leaf-Configurable-vanilla-username-check.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0058-Leaf-Configurable-vanilla-username-check.patch
rename to shiroha-server/minecraft-patches/features/0059-Leaf-Configurable-vanilla-username-check.patch
diff --git a/shiroha-server/minecraft-patches/features/0059-Leaf-Lithium-faster-hash-palette.patch b/shiroha-server/minecraft-patches/features/0060-Leaf-Lithium-faster-hash-palette.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0059-Leaf-Lithium-faster-hash-palette.patch
rename to shiroha-server/minecraft-patches/features/0060-Leaf-Lithium-faster-hash-palette.patch
diff --git a/shiroha-server/minecraft-patches/features/0060-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch b/shiroha-server/minecraft-patches/features/0061-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0060-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch
rename to shiroha-server/minecraft-patches/features/0061-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch
diff --git a/shiroha-server/minecraft-patches/features/0061-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0062-Leaves-Configurable-collision-behavior.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0061-Leaves-Configurable-collision-behavior.patch
rename to shiroha-server/minecraft-patches/features/0062-Leaves-Configurable-collision-behavior.patch
diff --git a/shiroha-server/minecraft-patches/features/0062-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0063-Leaves-Optimized-dragon-respawn.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0062-Leaves-Optimized-dragon-respawn.patch
rename to shiroha-server/minecraft-patches/features/0063-Leaves-Optimized-dragon-respawn.patch
diff --git a/shiroha-server/minecraft-patches/features/0063-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0064-Gale-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0063-Gale-Variable-entity-wake-up-duration.patch
rename to shiroha-server/minecraft-patches/features/0064-Gale-Variable-entity-wake-up-duration.patch
diff --git a/shiroha-server/minecraft-patches/features/0064-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0065-Gale-Replace-AI-attributes-with-optimized-collection.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0064-Gale-Replace-AI-attributes-with-optimized-collection.patch
rename to shiroha-server/minecraft-patches/features/0065-Gale-Replace-AI-attributes-with-optimized-collection.patch
diff --git a/shiroha-server/minecraft-patches/features/0065-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0066-Gale-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0065-Gale-Skip-entity-move-if-movement-is-zero.patch
rename to shiroha-server/minecraft-patches/features/0066-Gale-Skip-entity-move-if-movement-is-zero.patch
diff --git a/shiroha-server/minecraft-patches/features/0066-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0067-Gale-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0066-Gale-Store-mob-counts-in-an-array.patch
rename to shiroha-server/minecraft-patches/features/0067-Gale-Store-mob-counts-in-an-array.patch
diff --git a/shiroha-server/minecraft-patches/features/0067-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0068-Gale-Optimize-random-calls-in-chunk-ticking.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0067-Gale-Optimize-random-calls-in-chunk-ticking.patch
rename to shiroha-server/minecraft-patches/features/0068-Gale-Optimize-random-calls-in-chunk-ticking.patch
diff --git a/shiroha-server/minecraft-patches/features/0068-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0069-Gale-Reduce-enderman-teleport-chunk-lookups.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0068-Gale-Reduce-enderman-teleport-chunk-lookups.patch
rename to shiroha-server/minecraft-patches/features/0069-Gale-Reduce-enderman-teleport-chunk-lookups.patch
diff --git a/shiroha-server/minecraft-patches/features/0069-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0070-Gale-Cache-ShapePairKey-hash.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0069-Gale-Cache-ShapePairKey-hash.patch
rename to shiroha-server/minecraft-patches/features/0070-Gale-Cache-ShapePairKey-hash.patch
diff --git a/shiroha-server/minecraft-patches/features/0070-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0071-Gale-For-collision-check-has-physics-before-same-veh.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0070-Gale-For-collision-check-has-physics-before-same-veh.patch
rename to shiroha-server/minecraft-patches/features/0071-Gale-For-collision-check-has-physics-before-same-veh.patch
diff --git a/shiroha-server/minecraft-patches/features/0071-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0072-Gale-Skip-negligible-planar-movement-multiplication.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0071-Gale-Skip-negligible-planar-movement-multiplication.patch
rename to shiroha-server/minecraft-patches/features/0072-Gale-Skip-negligible-planar-movement-multiplication.patch
diff --git a/shiroha-server/minecraft-patches/features/0072-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0073-Gale-Optimize-matching-item-checks.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0072-Gale-Optimize-matching-item-checks.patch
rename to shiroha-server/minecraft-patches/features/0073-Gale-Optimize-matching-item-checks.patch
diff --git a/shiroha-server/minecraft-patches/features/0073-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0074-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0073-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch
rename to shiroha-server/minecraft-patches/features/0074-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch
diff --git a/shiroha-server/minecraft-patches/features/0074-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0075-Gale-Reduce-array-allocations.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0074-Gale-Reduce-array-allocations.patch
rename to shiroha-server/minecraft-patches/features/0075-Gale-Reduce-array-allocations.patch
diff --git a/shiroha-server/minecraft-patches/features/0075-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0076-Some-optimizations-from-krypton.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0075-Some-optimizations-from-krypton.patch
rename to shiroha-server/minecraft-patches/features/0076-Some-optimizations-from-krypton.patch
diff --git a/shiroha-server/minecraft-patches/features/0076-Frustum-filtering-tracker.patch b/shiroha-server/minecraft-patches/features/0077-Frustum-filtering-tracker.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0076-Frustum-filtering-tracker.patch
rename to shiroha-server/minecraft-patches/features/0077-Frustum-filtering-tracker.patch
diff --git a/shiroha-server/minecraft-patches/features/0077-Lithium-optimized-collections-for-WeightedList.patch b/shiroha-server/minecraft-patches/features/0078-Lithium-optimized-collections-for-WeightedList.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0077-Lithium-optimized-collections-for-WeightedList.patch
rename to shiroha-server/minecraft-patches/features/0078-Lithium-optimized-collections-for-WeightedList.patch
diff --git a/shiroha-server/minecraft-patches/features/0078-Lithium-optimized-non-poi-block-searching.patch b/shiroha-server/minecraft-patches/features/0079-Lithium-optimized-non-poi-block-searching.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0078-Lithium-optimized-non-poi-block-searching.patch
rename to shiroha-server/minecraft-patches/features/0079-Lithium-optimized-non-poi-block-searching.patch