From f63190300007ec6c54b150197896cd3e94252163 Mon Sep 17 00:00:00 2001 From: NanaChiyo0721 Date: Wed, 5 Aug 2026 23:57:15 +0800 Subject: [PATCH] Reduce allocation in PoiAccess --- .../0030-Reduce-allocation-in-PoiAccess.patch | 110 ++++++++++++++++++ ...ync-protocol-switching-optimization.patch} | 0 ...0032-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 ...0036-Add-config-for-server-mod-name.patch} | 0 ...=> 0037-Add-config-for-cpu-affinity.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ...039-Add-config-for-watchdog-timeout.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...41-Add-config-for-heightmap-warning.patch} | 0 ...atch => 0042-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 ... 0046-Add-config-for-item-multitask.patch} | 0 ...7-Add-config-to-enable-tick-command.patch} | 0 ...-for-whether-to-save-portal-tickets.patch} | 0 ...tch => 0049-Add-portal-rate-limiter.patch} | 0 ...us-bar.patch => 0050-Add-status-bar.patch} | 0 ...patch => 0051-Leaves-Vanilla-Hopper.patch} | 0 ...eaves-Lithium-Sleeping-Block-Entity.patch} | 0 ...ch => 0053-Petal-Reduce-sensor-work.patch} | 0 ...4-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 ... => 0058-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 => 0063-Leaf-fast-bit-radix-sort.patch} | 0 ...Configurable-vanilla-username-check.patch} | 0 ...65-Leaf-Lithium-faster-hash-palette.patch} | 0 ...cket-limit-Shiroha-Option-to-full-d.patch} | 0 ...ves-Configurable-collision-behavior.patch} | 0 ...068-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 ...2-Gale-Store-mob-counts-in-an-array.patch} | 0 ...imize-random-calls-in-chunk-ticking.patch} | 0 ...uce-enderman-teleport-chunk-lookups.patch} | 0 ...> 0075-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 ... 0080-Gale-Reduce-array-allocations.patch} | 0 ...081-Some-optimizations-from-krypton.patch} | 0 ...h => 0082-Frustum-filtering-tracker.patch} | 0 ...imized-collections-for-WeightedList.patch} | 0 ...m-optimized-non-poi-block-searching.patch} | 0 55 files changed, 110 insertions(+) create mode 100644 shiroha-server/minecraft-patches/features/0030-Reduce-allocation-in-PoiAccess.patch rename shiroha-server/minecraft-patches/features/{0030-Async-protocol-switching-optimization.patch => 0031-Async-protocol-switching-optimization.patch} (100%) rename shiroha-server/minecraft-patches/features/{0031-Improved-server-health-command.patch => 0032-Improved-server-health-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0032-Kaiiju-Entity-tick-and-removal-limiter.patch => 0033-Kaiiju-Entity-tick-and-removal-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0033-Kaiiju-Vanilla-end-portal-teleportation.patch => 0034-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0034-Add-config-to-support-for-long-command-inputs.patch => 0035-Add-config-to-support-for-long-command-inputs.patch} (100%) rename shiroha-server/minecraft-patches/features/{0035-Add-config-for-server-mod-name.patch => 0036-Add-config-for-server-mod-name.patch} (100%) rename shiroha-server/minecraft-patches/features/{0036-Add-config-for-cpu-affinity.patch => 0037-Add-config-for-cpu-affinity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0037-Add-config-for-unsafe-teleportation.patch => 0038-Add-config-for-unsafe-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0038-Add-config-for-watchdog-timeout.patch => 0039-Add-config-for-watchdog-timeout.patch} (100%) rename shiroha-server/minecraft-patches/features/{0039-Add-config-to-disable-entity-tick-catchers.patch => 0040-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0040-Add-config-for-heightmap-warning.patch => 0041-Add-config-for-heightmap-warning.patch} (100%) rename shiroha-server/minecraft-patches/features/{0041-Add-config-gui-support.patch => 0042-Add-config-gui-support.patch} (100%) rename shiroha-server/minecraft-patches/features/{0042-Add-force-the-data-command-to-be-enabled-config.patch => 0043-Add-force-the-data-command-to-be-enabled-config.patch} (100%) rename shiroha-server/minecraft-patches/features/{0043-Add-experimental-config-for-command-block-command-ex.patch => 0044-Add-experimental-config-for-command-block-command-ex.patch} (100%) rename shiroha-server/minecraft-patches/features/{0044-Add-config-to-modify-tripwire-behavior.patch => 0045-Add-config-to-modify-tripwire-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0045-Add-config-for-item-multitask.patch => 0046-Add-config-for-item-multitask.patch} (100%) rename shiroha-server/minecraft-patches/features/{0046-Add-config-to-enable-tick-command.patch => 0047-Add-config-to-enable-tick-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0047-Add-config-for-whether-to-save-portal-tickets.patch => 0048-Add-config-for-whether-to-save-portal-tickets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0048-Add-portal-rate-limiter.patch => 0049-Add-portal-rate-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0049-Add-status-bar.patch => 0050-Add-status-bar.patch} (100%) rename shiroha-server/minecraft-patches/features/{0050-Leaves-Vanilla-Hopper.patch => 0051-Leaves-Vanilla-Hopper.patch} (100%) rename shiroha-server/minecraft-patches/features/{0051-Leaves-Lithium-Sleeping-Block-Entity.patch => 0052-Leaves-Lithium-Sleeping-Block-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0052-Petal-Reduce-sensor-work.patch => 0053-Petal-Reduce-sensor-work.patch} (100%) rename shiroha-server/minecraft-patches/features/{0053-Purpur-Lobotomize-stuck-villagers.patch => 0054-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0054-Pufferfish-Reduce-projectile-chunk-loading.patch => 0055-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename shiroha-server/minecraft-patches/features/{0055-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0056-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename shiroha-server/minecraft-patches/features/{0056-Leaf-Secure-seed-and-matter-seed-command.patch => 0057-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0057-Secure-seed-V2-with-Blake3.patch => 0058-Secure-seed-V2-with-Blake3.patch} (100%) rename shiroha-server/minecraft-patches/features/{0058-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0059-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0059-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0060-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename shiroha-server/minecraft-patches/features/{0060-Leaf-Optimize-PatchedDataComponentMap-equals.patch => 0061-Leaf-Optimize-PatchedDataComponentMap-equals.patch} (100%) rename shiroha-server/minecraft-patches/features/{0061-Leaf-Better-checking-for-useless-move-packets.patch => 0062-Leaf-Better-checking-for-useless-move-packets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0062-Leaf-fast-bit-radix-sort.patch => 0063-Leaf-fast-bit-radix-sort.patch} (100%) rename shiroha-server/minecraft-patches/features/{0063-Leaf-Configurable-vanilla-username-check.patch => 0064-Leaf-Configurable-vanilla-username-check.patch} (100%) rename shiroha-server/minecraft-patches/features/{0064-Leaf-Lithium-faster-hash-palette.patch => 0065-Leaf-Lithium-faster-hash-palette.patch} (100%) rename shiroha-server/minecraft-patches/features/{0065-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch => 0066-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch} (100%) rename shiroha-server/minecraft-patches/features/{0066-Leaves-Configurable-collision-behavior.patch => 0067-Leaves-Configurable-collision-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0067-Leaves-Optimized-dragon-respawn.patch => 0068-Leaves-Optimized-dragon-respawn.patch} (100%) rename shiroha-server/minecraft-patches/features/{0068-Gale-Variable-entity-wake-up-duration.patch => 0069-Gale-Variable-entity-wake-up-duration.patch} (100%) rename shiroha-server/minecraft-patches/features/{0069-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0070-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0070-Gale-Skip-entity-move-if-movement-is-zero.patch => 0071-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename shiroha-server/minecraft-patches/features/{0071-Gale-Store-mob-counts-in-an-array.patch => 0072-Gale-Store-mob-counts-in-an-array.patch} (100%) rename shiroha-server/minecraft-patches/features/{0072-Gale-Optimize-random-calls-in-chunk-ticking.patch => 0073-Gale-Optimize-random-calls-in-chunk-ticking.patch} (100%) rename shiroha-server/minecraft-patches/features/{0073-Gale-Reduce-enderman-teleport-chunk-lookups.patch => 0074-Gale-Reduce-enderman-teleport-chunk-lookups.patch} (100%) rename shiroha-server/minecraft-patches/features/{0074-Gale-Cache-ShapePairKey-hash.patch => 0075-Gale-Cache-ShapePairKey-hash.patch} (100%) rename shiroha-server/minecraft-patches/features/{0075-Gale-For-collision-check-has-physics-before-same-veh.patch => 0076-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename shiroha-server/minecraft-patches/features/{0076-Gale-Skip-negligible-planar-movement-multiplication.patch => 0077-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename shiroha-server/minecraft-patches/features/{0077-Gale-Optimize-matching-item-checks.patch => 0078-Gale-Optimize-matching-item-checks.patch} (100%) rename shiroha-server/minecraft-patches/features/{0078-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0079-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0079-Gale-Reduce-array-allocations.patch => 0080-Gale-Reduce-array-allocations.patch} (100%) rename shiroha-server/minecraft-patches/features/{0080-Some-optimizations-from-krypton.patch => 0081-Some-optimizations-from-krypton.patch} (100%) rename shiroha-server/minecraft-patches/features/{0081-Frustum-filtering-tracker.patch => 0082-Frustum-filtering-tracker.patch} (100%) rename shiroha-server/minecraft-patches/features/{0082-Lithium-optimized-collections-for-WeightedList.patch => 0083-Lithium-optimized-collections-for-WeightedList.patch} (100%) rename shiroha-server/minecraft-patches/features/{0083-Lithium-optimized-non-poi-block-searching.patch => 0084-Lithium-optimized-non-poi-block-searching.patch} (100%) diff --git a/shiroha-server/minecraft-patches/features/0030-Reduce-allocation-in-PoiAccess.patch b/shiroha-server/minecraft-patches/features/0030-Reduce-allocation-in-PoiAccess.patch new file mode 100644 index 0000000..a748b6b --- /dev/null +++ b/shiroha-server/minecraft-patches/features/0030-Reduce-allocation-in-PoiAccess.patch @@ -0,0 +1,110 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NanaChiyo0721 +Date: Wed, 5 Aug 2026 23:53:48 +0800 +Subject: [PATCH] Reduce allocation in PoiAccess + + +diff --git a/ca/spottedleaf/moonrise/patches/poi_lookup/PoiAccess.java b/ca/spottedleaf/moonrise/patches/poi_lookup/PoiAccess.java +index 85d80b3952a76b0ca7f67401a659cf35dd55b082..d4f95458d2e35aedb0fd5230fcd74b968437d8a5 100644 +--- a/ca/spottedleaf/moonrise/patches/poi_lookup/PoiAccess.java ++++ b/ca/spottedleaf/moonrise/patches/poi_lookup/PoiAccess.java +@@ -89,6 +89,23 @@ public final class PoiAccess { + return (centerDiffX * centerDiffX) + (centerDiffY * centerDiffY) + (centerDiffZ * centerDiffZ); + } + ++ // Shiroha start- Reduce allocation in PoiAccess ++ private static int getSectionIndex( ++ final int x, ++ final int y, ++ final int z, ++ final int lowerX, ++ final int lowerY, ++ final int lowerZ, ++ final int spanY, ++ final int spanZ ++ ) { ++ return (x - lowerX) * spanY * spanZ ++ + (y - lowerY) * spanZ ++ + (z - lowerZ); ++ } ++ // Shiroha end - Reduce allocation in PoiAccess ++ + public static void findClosestPoiDataRecords(final PoiManager poiStorage, + final Predicate> villagePlaceType, + // position predicate must not modify chunk POI +@@ -116,9 +133,15 @@ public final class PoiAccess { + final int centerZ = sourcePosition.getZ() >> 4; + final long centerKey = CoordinateUtils.getChunkSectionKey(centerX, centerY, centerZ); + ++ // Shiroha start - Reduce allocation in PoiAccess ++ final int spanX = upperX - lowerX + 1; ++ final int spanY = upperY - lowerY + 1; ++ final int spanZ = upperZ - lowerZ + 1; ++ // Shiroha end - Reduce allocation in PoiAccess ++ + final LongArrayFIFOQueue queue = new LongArrayFIFOQueue(); +- final LongOpenHashSet seen = new LongOpenHashSet(); +- seen.add(centerKey); ++ final java.util.BitSet seen = new java.util.BitSet(spanX * spanY * spanZ); // Shiroha - Reduce allocation in PoiAccess ++ seen.set(getSectionIndex(centerX, centerY, centerZ, lowerX, lowerY, lowerZ, spanY, spanZ)); // Shiroha - Reduce allocation in PoiAccess + queue.enqueue(centerKey); + + while (!queue.isEmpty()) { +@@ -159,8 +182,18 @@ public final class PoiAccess { + final int neighbourY = sectionY + dy; + final int neighbourZ = sectionZ + dz; + ++ // Shiroha start - Reduce allocation in PoiAccess ++ if (neighbourX < lowerX || neighbourX > upperX ++ || neighbourY < lowerY || neighbourY > upperY ++ || neighbourZ < lowerZ || neighbourZ > upperZ) { ++ continue; ++ } ++ ++ final int neighbourIndex = getSectionIndex(neighbourX, neighbourY, neighbourZ, lowerX, lowerY, lowerZ, spanY, spanZ); ++ // Shiroha end - Reduce allocation in PoiAccess + final long neighbourKey = CoordinateUtils.getChunkSectionKey(neighbourX, neighbourY, neighbourZ); +- if (seen.add(neighbourKey)) { ++ if (!seen.get(neighbourIndex)) { // Shiroha - Reduce allocation in PoiAccess ++ seen.set(neighbourIndex); // Shiroha - Reduce allocation in PoiAccess + queue.enqueue(neighbourKey); + } + } +@@ -359,9 +392,15 @@ public final class PoiAccess { + final int centerZ = sourcePosition.getZ() >> 4; + final long centerKey = CoordinateUtils.getChunkSectionKey(centerX, centerY, centerZ); + ++ // Shiroha start - Reduce allocation in PoiAccess ++ final int spanX = upperX - lowerX + 1; ++ final int spanY = upperY - lowerY + 1; ++ final int spanZ = upperZ - lowerZ + 1; ++ // Shiroha end - Reduce allocation in PoiAccess ++ + final LongArrayFIFOQueue queue = new LongArrayFIFOQueue(); +- final LongOpenHashSet seen = new LongOpenHashSet(); +- seen.add(centerKey); ++ final java.util.BitSet seen = new java.util.BitSet(spanX * spanY * spanZ); // Shiroha - Reduce allocation in PoiAccess ++ seen.set(getSectionIndex(centerX, centerY, centerZ, lowerX, lowerY, lowerZ, spanY, spanZ)); // Shiroha - Reduce allocation in PoiAccess + queue.enqueue(centerKey); + + while (!queue.isEmpty()) { +@@ -403,8 +442,18 @@ public final class PoiAccess { + final int neighbourY = sectionY + dy; + final int neighbourZ = sectionZ + dz; + ++ // Shiroha start - Reduce allocation in PoiAccess ++ if (neighbourX < lowerX || neighbourX > upperX ++ || neighbourY < lowerY || neighbourY > upperY ++ || neighbourZ < lowerZ || neighbourZ > upperZ) { ++ continue; ++ } ++ ++ final int neighbourIndex = getSectionIndex(neighbourX, neighbourY, neighbourZ, lowerX, lowerY, lowerZ, spanY, spanZ); ++ // Shiroha end - Reduce allocation in PoiAccess + final long neighbourKey = CoordinateUtils.getChunkSectionKey(neighbourX, neighbourY, neighbourZ); +- if (seen.add(neighbourKey)) { ++ if (!seen.get(neighbourIndex)) { // Shiroha - Reduce allocation in PoiAccess ++ seen.set(neighbourIndex); // Shiroha - Reduce allocation in PoiAccess + queue.enqueue(neighbourKey); + } + } diff --git a/shiroha-server/minecraft-patches/features/0030-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0031-Async-protocol-switching-optimization.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0030-Async-protocol-switching-optimization.patch rename to shiroha-server/minecraft-patches/features/0031-Async-protocol-switching-optimization.patch diff --git a/shiroha-server/minecraft-patches/features/0031-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0032-Improved-server-health-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0031-Improved-server-health-command.patch rename to shiroha-server/minecraft-patches/features/0032-Improved-server-health-command.patch diff --git a/shiroha-server/minecraft-patches/features/0032-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0033-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0032-Kaiiju-Entity-tick-and-removal-limiter.patch rename to shiroha-server/minecraft-patches/features/0033-Kaiiju-Entity-tick-and-removal-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0033-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0033-Kaiiju-Vanilla-end-portal-teleportation.patch rename to shiroha-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0034-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0035-Add-config-to-support-for-long-command-inputs.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0034-Add-config-to-support-for-long-command-inputs.patch rename to shiroha-server/minecraft-patches/features/0035-Add-config-to-support-for-long-command-inputs.patch diff --git a/shiroha-server/minecraft-patches/features/0035-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0036-Add-config-for-server-mod-name.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0035-Add-config-for-server-mod-name.patch rename to shiroha-server/minecraft-patches/features/0036-Add-config-for-server-mod-name.patch diff --git a/shiroha-server/minecraft-patches/features/0036-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0037-Add-config-for-cpu-affinity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0036-Add-config-for-cpu-affinity.patch rename to shiroha-server/minecraft-patches/features/0037-Add-config-for-cpu-affinity.patch diff --git a/shiroha-server/minecraft-patches/features/0037-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0038-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0037-Add-config-for-unsafe-teleportation.patch rename to shiroha-server/minecraft-patches/features/0038-Add-config-for-unsafe-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0038-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0039-Add-config-for-watchdog-timeout.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0038-Add-config-for-watchdog-timeout.patch rename to shiroha-server/minecraft-patches/features/0039-Add-config-for-watchdog-timeout.patch diff --git a/shiroha-server/minecraft-patches/features/0039-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0040-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0039-Add-config-to-disable-entity-tick-catchers.patch rename to shiroha-server/minecraft-patches/features/0040-Add-config-to-disable-entity-tick-catchers.patch diff --git a/shiroha-server/minecraft-patches/features/0040-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0041-Add-config-for-heightmap-warning.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0040-Add-config-for-heightmap-warning.patch rename to shiroha-server/minecraft-patches/features/0041-Add-config-for-heightmap-warning.patch diff --git a/shiroha-server/minecraft-patches/features/0041-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0042-Add-config-gui-support.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0041-Add-config-gui-support.patch rename to shiroha-server/minecraft-patches/features/0042-Add-config-gui-support.patch diff --git a/shiroha-server/minecraft-patches/features/0042-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0043-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0042-Add-force-the-data-command-to-be-enabled-config.patch rename to shiroha-server/minecraft-patches/features/0043-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/shiroha-server/minecraft-patches/features/0043-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0044-Add-experimental-config-for-command-block-command-ex.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0043-Add-experimental-config-for-command-block-command-ex.patch rename to shiroha-server/minecraft-patches/features/0044-Add-experimental-config-for-command-block-command-ex.patch diff --git a/shiroha-server/minecraft-patches/features/0044-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0045-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0044-Add-config-to-modify-tripwire-behavior.patch rename to shiroha-server/minecraft-patches/features/0045-Add-config-to-modify-tripwire-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0045-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0046-Add-config-for-item-multitask.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0045-Add-config-for-item-multitask.patch rename to shiroha-server/minecraft-patches/features/0046-Add-config-for-item-multitask.patch diff --git a/shiroha-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0047-Add-config-to-enable-tick-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0046-Add-config-to-enable-tick-command.patch rename to shiroha-server/minecraft-patches/features/0047-Add-config-to-enable-tick-command.patch diff --git a/shiroha-server/minecraft-patches/features/0047-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0048-Add-config-for-whether-to-save-portal-tickets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0047-Add-config-for-whether-to-save-portal-tickets.patch rename to shiroha-server/minecraft-patches/features/0048-Add-config-for-whether-to-save-portal-tickets.patch diff --git a/shiroha-server/minecraft-patches/features/0048-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0049-Add-portal-rate-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0048-Add-portal-rate-limiter.patch rename to shiroha-server/minecraft-patches/features/0049-Add-portal-rate-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0049-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0050-Add-status-bar.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0049-Add-status-bar.patch rename to shiroha-server/minecraft-patches/features/0050-Add-status-bar.patch diff --git a/shiroha-server/minecraft-patches/features/0050-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0051-Leaves-Vanilla-Hopper.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0050-Leaves-Vanilla-Hopper.patch rename to shiroha-server/minecraft-patches/features/0051-Leaves-Vanilla-Hopper.patch diff --git a/shiroha-server/minecraft-patches/features/0051-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0052-Leaves-Lithium-Sleeping-Block-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0051-Leaves-Lithium-Sleeping-Block-Entity.patch rename to shiroha-server/minecraft-patches/features/0052-Leaves-Lithium-Sleeping-Block-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0052-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0053-Petal-Reduce-sensor-work.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0052-Petal-Reduce-sensor-work.patch rename to shiroha-server/minecraft-patches/features/0053-Petal-Reduce-sensor-work.patch diff --git a/shiroha-server/minecraft-patches/features/0053-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0054-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0053-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-server/minecraft-patches/features/0054-Purpur-Lobotomize-stuck-villagers.patch diff --git a/shiroha-server/minecraft-patches/features/0054-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0055-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0054-Pufferfish-Reduce-projectile-chunk-loading.patch rename to shiroha-server/minecraft-patches/features/0055-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/shiroha-server/minecraft-patches/features/0055-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0056-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0055-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to shiroha-server/minecraft-patches/features/0056-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/shiroha-server/minecraft-patches/features/0056-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0057-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0056-Leaf-Secure-seed-and-matter-seed-command.patch rename to shiroha-server/minecraft-patches/features/0057-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/shiroha-server/minecraft-patches/features/0057-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0058-Secure-seed-V2-with-Blake3.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0057-Secure-seed-V2-with-Blake3.patch rename to shiroha-server/minecraft-patches/features/0058-Secure-seed-V2-with-Blake3.patch diff --git a/shiroha-server/minecraft-patches/features/0058-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0059-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0058-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0059-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0059-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0060-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0059-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to shiroha-server/minecraft-patches/features/0060-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/shiroha-server/minecraft-patches/features/0060-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0061-Leaf-Optimize-PatchedDataComponentMap-equals.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0060-Leaf-Optimize-PatchedDataComponentMap-equals.patch rename to shiroha-server/minecraft-patches/features/0061-Leaf-Optimize-PatchedDataComponentMap-equals.patch diff --git a/shiroha-server/minecraft-patches/features/0061-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0062-Leaf-Better-checking-for-useless-move-packets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0061-Leaf-Better-checking-for-useless-move-packets.patch rename to shiroha-server/minecraft-patches/features/0062-Leaf-Better-checking-for-useless-move-packets.patch diff --git a/shiroha-server/minecraft-patches/features/0062-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0063-Leaf-fast-bit-radix-sort.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0062-Leaf-fast-bit-radix-sort.patch rename to shiroha-server/minecraft-patches/features/0063-Leaf-fast-bit-radix-sort.patch diff --git a/shiroha-server/minecraft-patches/features/0063-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0064-Leaf-Configurable-vanilla-username-check.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0063-Leaf-Configurable-vanilla-username-check.patch rename to shiroha-server/minecraft-patches/features/0064-Leaf-Configurable-vanilla-username-check.patch diff --git a/shiroha-server/minecraft-patches/features/0064-Leaf-Lithium-faster-hash-palette.patch b/shiroha-server/minecraft-patches/features/0065-Leaf-Lithium-faster-hash-palette.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0064-Leaf-Lithium-faster-hash-palette.patch rename to shiroha-server/minecraft-patches/features/0065-Leaf-Lithium-faster-hash-palette.patch diff --git a/shiroha-server/minecraft-patches/features/0065-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch b/shiroha-server/minecraft-patches/features/0066-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0065-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch rename to shiroha-server/minecraft-patches/features/0066-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch diff --git a/shiroha-server/minecraft-patches/features/0066-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0067-Leaves-Configurable-collision-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0066-Leaves-Configurable-collision-behavior.patch rename to shiroha-server/minecraft-patches/features/0067-Leaves-Configurable-collision-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0067-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0068-Leaves-Optimized-dragon-respawn.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0067-Leaves-Optimized-dragon-respawn.patch rename to shiroha-server/minecraft-patches/features/0068-Leaves-Optimized-dragon-respawn.patch diff --git a/shiroha-server/minecraft-patches/features/0068-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0069-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0068-Gale-Variable-entity-wake-up-duration.patch rename to shiroha-server/minecraft-patches/features/0069-Gale-Variable-entity-wake-up-duration.patch diff --git a/shiroha-server/minecraft-patches/features/0069-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0070-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0069-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0070-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0070-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0071-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0070-Gale-Skip-entity-move-if-movement-is-zero.patch rename to shiroha-server/minecraft-patches/features/0071-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/shiroha-server/minecraft-patches/features/0071-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0072-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0071-Gale-Store-mob-counts-in-an-array.patch rename to shiroha-server/minecraft-patches/features/0072-Gale-Store-mob-counts-in-an-array.patch diff --git a/shiroha-server/minecraft-patches/features/0072-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0073-Gale-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0072-Gale-Optimize-random-calls-in-chunk-ticking.patch rename to shiroha-server/minecraft-patches/features/0073-Gale-Optimize-random-calls-in-chunk-ticking.patch diff --git a/shiroha-server/minecraft-patches/features/0073-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0074-Gale-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0073-Gale-Reduce-enderman-teleport-chunk-lookups.patch rename to shiroha-server/minecraft-patches/features/0074-Gale-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/shiroha-server/minecraft-patches/features/0074-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0075-Gale-Cache-ShapePairKey-hash.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0074-Gale-Cache-ShapePairKey-hash.patch rename to shiroha-server/minecraft-patches/features/0075-Gale-Cache-ShapePairKey-hash.patch diff --git a/shiroha-server/minecraft-patches/features/0075-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0076-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0075-Gale-For-collision-check-has-physics-before-same-veh.patch rename to shiroha-server/minecraft-patches/features/0076-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/shiroha-server/minecraft-patches/features/0076-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0077-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0076-Gale-Skip-negligible-planar-movement-multiplication.patch rename to shiroha-server/minecraft-patches/features/0077-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/shiroha-server/minecraft-patches/features/0077-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0078-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0077-Gale-Optimize-matching-item-checks.patch rename to shiroha-server/minecraft-patches/features/0078-Gale-Optimize-matching-item-checks.patch diff --git a/shiroha-server/minecraft-patches/features/0078-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0079-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0078-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to shiroha-server/minecraft-patches/features/0079-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0079-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0080-Gale-Reduce-array-allocations.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0079-Gale-Reduce-array-allocations.patch rename to shiroha-server/minecraft-patches/features/0080-Gale-Reduce-array-allocations.patch diff --git a/shiroha-server/minecraft-patches/features/0080-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0081-Some-optimizations-from-krypton.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0080-Some-optimizations-from-krypton.patch rename to shiroha-server/minecraft-patches/features/0081-Some-optimizations-from-krypton.patch diff --git a/shiroha-server/minecraft-patches/features/0081-Frustum-filtering-tracker.patch b/shiroha-server/minecraft-patches/features/0082-Frustum-filtering-tracker.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0081-Frustum-filtering-tracker.patch rename to shiroha-server/minecraft-patches/features/0082-Frustum-filtering-tracker.patch diff --git a/shiroha-server/minecraft-patches/features/0082-Lithium-optimized-collections-for-WeightedList.patch b/shiroha-server/minecraft-patches/features/0083-Lithium-optimized-collections-for-WeightedList.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0082-Lithium-optimized-collections-for-WeightedList.patch rename to shiroha-server/minecraft-patches/features/0083-Lithium-optimized-collections-for-WeightedList.patch diff --git a/shiroha-server/minecraft-patches/features/0083-Lithium-optimized-non-poi-block-searching.patch b/shiroha-server/minecraft-patches/features/0084-Lithium-optimized-non-poi-block-searching.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0083-Lithium-optimized-non-poi-block-searching.patch rename to shiroha-server/minecraft-patches/features/0084-Lithium-optimized-non-poi-block-searching.patch