From ffe256f06d8974879f8541936d5f26b9416731b9 Mon Sep 17 00:00:00 2001 From: NanaChiyo0721 Date: Fri, 7 Aug 2026 14:13:33 +0800 Subject: [PATCH] Reduce allocation in unlistened spawn events --- ...llocation-in-unlistened-spawn-events.patch | 86 +++++++++++++++++++ ...ync-protocol-switching-optimization.patch} | 0 ...0033-Improved-server-health-command.patch} | 0 ...iju-Entity-tick-and-removal-limiter.patch} | 2 +- ...ju-Vanilla-end-portal-teleportation.patch} | 0 ...-to-support-for-long-command-inputs.patch} | 0 ...0037-Add-config-for-server-mod-name.patch} | 0 ...=> 0038-Add-config-for-cpu-affinity.patch} | 0 ...Add-config-for-unsafe-teleportation.patch} | 0 ...040-Add-config-for-watchdog-timeout.patch} | 0 ...fig-to-disable-entity-tick-catchers.patch} | 0 ...42-Add-config-for-heightmap-warning.patch} | 0 ...atch => 0043-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 ... 0047-Add-config-for-item-multitask.patch} | 0 ...8-Add-config-to-enable-tick-command.patch} | 0 ...-for-whether-to-save-portal-tickets.patch} | 0 ...tch => 0050-Add-portal-rate-limiter.patch} | 0 ...us-bar.patch => 0051-Add-status-bar.patch} | 0 ...patch => 0052-Leaves-Vanilla-Hopper.patch} | 0 ...eaves-Lithium-Sleeping-Block-Entity.patch} | 0 ...ch => 0054-Petal-Reduce-sensor-work.patch} | 0 ...5-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 ... => 0059-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 => 0064-Leaf-fast-bit-radix-sort.patch} | 0 ...Configurable-vanilla-username-check.patch} | 0 ...66-Leaf-Lithium-faster-hash-palette.patch} | 0 ...cket-limit-Shiroha-Option-to-full-d.patch} | 0 ...ves-Configurable-collision-behavior.patch} | 0 ...069-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 ...3-Gale-Store-mob-counts-in-an-array.patch} | 0 ...imize-random-calls-in-chunk-ticking.patch} | 0 ...uce-enderman-teleport-chunk-lookups.patch} | 0 ...> 0076-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 ... 0081-Gale-Reduce-array-allocations.patch} | 0 ...082-Some-optimizations-from-krypton.patch} | 0 ...h => 0083-Frustum-filtering-tracker.patch} | 0 ...imized-collections-for-WeightedList.patch} | 0 ...m-optimized-non-poi-block-searching.patch} | 0 55 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-unlistened-spawn-events.patch rename shiroha-server/minecraft-patches/features/{0031-Async-protocol-switching-optimization.patch => 0032-Async-protocol-switching-optimization.patch} (100%) rename shiroha-server/minecraft-patches/features/{0032-Improved-server-health-command.patch => 0033-Improved-server-health-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0033-Kaiiju-Entity-tick-and-removal-limiter.patch => 0034-Kaiiju-Entity-tick-and-removal-limiter.patch} (98%) rename shiroha-server/minecraft-patches/features/{0034-Kaiiju-Vanilla-end-portal-teleportation.patch => 0035-Kaiiju-Vanilla-end-portal-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0035-Add-config-to-support-for-long-command-inputs.patch => 0036-Add-config-to-support-for-long-command-inputs.patch} (100%) rename shiroha-server/minecraft-patches/features/{0036-Add-config-for-server-mod-name.patch => 0037-Add-config-for-server-mod-name.patch} (100%) rename shiroha-server/minecraft-patches/features/{0037-Add-config-for-cpu-affinity.patch => 0038-Add-config-for-cpu-affinity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0038-Add-config-for-unsafe-teleportation.patch => 0039-Add-config-for-unsafe-teleportation.patch} (100%) rename shiroha-server/minecraft-patches/features/{0039-Add-config-for-watchdog-timeout.patch => 0040-Add-config-for-watchdog-timeout.patch} (100%) rename shiroha-server/minecraft-patches/features/{0040-Add-config-to-disable-entity-tick-catchers.patch => 0041-Add-config-to-disable-entity-tick-catchers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0041-Add-config-for-heightmap-warning.patch => 0042-Add-config-for-heightmap-warning.patch} (100%) rename shiroha-server/minecraft-patches/features/{0042-Add-config-gui-support.patch => 0043-Add-config-gui-support.patch} (100%) rename shiroha-server/minecraft-patches/features/{0043-Add-force-the-data-command-to-be-enabled-config.patch => 0044-Add-force-the-data-command-to-be-enabled-config.patch} (100%) rename shiroha-server/minecraft-patches/features/{0044-Add-experimental-config-for-command-block-command-ex.patch => 0045-Add-experimental-config-for-command-block-command-ex.patch} (100%) rename shiroha-server/minecraft-patches/features/{0045-Add-config-to-modify-tripwire-behavior.patch => 0046-Add-config-to-modify-tripwire-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0046-Add-config-for-item-multitask.patch => 0047-Add-config-for-item-multitask.patch} (100%) rename shiroha-server/minecraft-patches/features/{0047-Add-config-to-enable-tick-command.patch => 0048-Add-config-to-enable-tick-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0048-Add-config-for-whether-to-save-portal-tickets.patch => 0049-Add-config-for-whether-to-save-portal-tickets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0049-Add-portal-rate-limiter.patch => 0050-Add-portal-rate-limiter.patch} (100%) rename shiroha-server/minecraft-patches/features/{0050-Add-status-bar.patch => 0051-Add-status-bar.patch} (100%) rename shiroha-server/minecraft-patches/features/{0051-Leaves-Vanilla-Hopper.patch => 0052-Leaves-Vanilla-Hopper.patch} (100%) rename shiroha-server/minecraft-patches/features/{0052-Leaves-Lithium-Sleeping-Block-Entity.patch => 0053-Leaves-Lithium-Sleeping-Block-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0053-Petal-Reduce-sensor-work.patch => 0054-Petal-Reduce-sensor-work.patch} (100%) rename shiroha-server/minecraft-patches/features/{0054-Purpur-Lobotomize-stuck-villagers.patch => 0055-Purpur-Lobotomize-stuck-villagers.patch} (100%) rename shiroha-server/minecraft-patches/features/{0055-Pufferfish-Reduce-projectile-chunk-loading.patch => 0056-Pufferfish-Reduce-projectile-chunk-loading.patch} (100%) rename shiroha-server/minecraft-patches/features/{0056-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch => 0057-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch} (100%) rename shiroha-server/minecraft-patches/features/{0057-Leaf-Secure-seed-and-matter-seed-command.patch => 0058-Leaf-Secure-seed-and-matter-seed-command.patch} (100%) rename shiroha-server/minecraft-patches/features/{0058-Secure-seed-V2-with-Blake3.patch => 0059-Secure-seed-V2-with-Blake3.patch} (100%) rename shiroha-server/minecraft-patches/features/{0059-Leaf-Replace-brain-maps-with-optimized-collection.patch => 0060-Leaf-Replace-brain-maps-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0060-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch => 0061-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch} (100%) rename shiroha-server/minecraft-patches/features/{0061-Leaf-Optimize-PatchedDataComponentMap-equals.patch => 0062-Leaf-Optimize-PatchedDataComponentMap-equals.patch} (100%) rename shiroha-server/minecraft-patches/features/{0062-Leaf-Better-checking-for-useless-move-packets.patch => 0063-Leaf-Better-checking-for-useless-move-packets.patch} (100%) rename shiroha-server/minecraft-patches/features/{0063-Leaf-fast-bit-radix-sort.patch => 0064-Leaf-fast-bit-radix-sort.patch} (100%) rename shiroha-server/minecraft-patches/features/{0064-Leaf-Configurable-vanilla-username-check.patch => 0065-Leaf-Configurable-vanilla-username-check.patch} (100%) rename shiroha-server/minecraft-patches/features/{0065-Leaf-Lithium-faster-hash-palette.patch => 0066-Leaf-Lithium-faster-hash-palette.patch} (100%) rename shiroha-server/minecraft-patches/features/{0066-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch => 0067-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch} (100%) rename shiroha-server/minecraft-patches/features/{0067-Leaves-Configurable-collision-behavior.patch => 0068-Leaves-Configurable-collision-behavior.patch} (100%) rename shiroha-server/minecraft-patches/features/{0068-Leaves-Optimized-dragon-respawn.patch => 0069-Leaves-Optimized-dragon-respawn.patch} (100%) rename shiroha-server/minecraft-patches/features/{0069-Gale-Variable-entity-wake-up-duration.patch => 0070-Gale-Variable-entity-wake-up-duration.patch} (100%) rename shiroha-server/minecraft-patches/features/{0070-Gale-Replace-AI-attributes-with-optimized-collection.patch => 0071-Gale-Replace-AI-attributes-with-optimized-collection.patch} (100%) rename shiroha-server/minecraft-patches/features/{0071-Gale-Skip-entity-move-if-movement-is-zero.patch => 0072-Gale-Skip-entity-move-if-movement-is-zero.patch} (100%) rename shiroha-server/minecraft-patches/features/{0072-Gale-Store-mob-counts-in-an-array.patch => 0073-Gale-Store-mob-counts-in-an-array.patch} (100%) rename shiroha-server/minecraft-patches/features/{0073-Gale-Optimize-random-calls-in-chunk-ticking.patch => 0074-Gale-Optimize-random-calls-in-chunk-ticking.patch} (100%) rename shiroha-server/minecraft-patches/features/{0074-Gale-Reduce-enderman-teleport-chunk-lookups.patch => 0075-Gale-Reduce-enderman-teleport-chunk-lookups.patch} (100%) rename shiroha-server/minecraft-patches/features/{0075-Gale-Cache-ShapePairKey-hash.patch => 0076-Gale-Cache-ShapePairKey-hash.patch} (100%) rename shiroha-server/minecraft-patches/features/{0076-Gale-For-collision-check-has-physics-before-same-veh.patch => 0077-Gale-For-collision-check-has-physics-before-same-veh.patch} (100%) rename shiroha-server/minecraft-patches/features/{0077-Gale-Skip-negligible-planar-movement-multiplication.patch => 0078-Gale-Skip-negligible-planar-movement-multiplication.patch} (100%) rename shiroha-server/minecraft-patches/features/{0078-Gale-Optimize-matching-item-checks.patch => 0079-Gale-Optimize-matching-item-checks.patch} (100%) rename shiroha-server/minecraft-patches/features/{0079-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch => 0080-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch} (100%) rename shiroha-server/minecraft-patches/features/{0080-Gale-Reduce-array-allocations.patch => 0081-Gale-Reduce-array-allocations.patch} (100%) rename shiroha-server/minecraft-patches/features/{0081-Some-optimizations-from-krypton.patch => 0082-Some-optimizations-from-krypton.patch} (100%) rename shiroha-server/minecraft-patches/features/{0082-Frustum-filtering-tracker.patch => 0083-Frustum-filtering-tracker.patch} (100%) rename shiroha-server/minecraft-patches/features/{0083-Lithium-optimized-collections-for-WeightedList.patch => 0084-Lithium-optimized-collections-for-WeightedList.patch} (100%) rename shiroha-server/minecraft-patches/features/{0084-Lithium-optimized-non-poi-block-searching.patch => 0085-Lithium-optimized-non-poi-block-searching.patch} (100%) diff --git a/shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-unlistened-spawn-events.patch b/shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-unlistened-spawn-events.patch new file mode 100644 index 0000000..86fc108 --- /dev/null +++ b/shiroha-server/minecraft-patches/features/0031-Reduce-allocation-in-unlistened-spawn-events.patch @@ -0,0 +1,86 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: NanaChiyo0721 +Date: Fri, 7 Aug 2026 14:07:55 +0800 +Subject: [PATCH] Reduce allocation in unlistened spawn events + + +diff --git a/net/minecraft/util/SpawnUtil.java b/net/minecraft/util/SpawnUtil.java +index 625ee78221324ce4959770fe36e4334d057cbc74..ed0e28761b1f14b7907e8e6bfac0690aa2d0b962 100644 +--- a/net/minecraft/util/SpawnUtil.java ++++ b/net/minecraft/util/SpawnUtil.java +@@ -57,6 +57,7 @@ public class SpawnUtil { + && moveToPossibleSpawnPosition(level, spawnRangeY, searchPos, strategy) + && (!checkCollisions || level.noCollision(entityType.getSpawnAABB(searchPos.getX() + 0.5, searchPos.getY(), searchPos.getZ() + 0.5)))) { + // Paper start - PreCreatureSpawnEvent ++ if (com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent.getHandlerList().getRegisteredListeners().length != 0) { // Shiroha - Reduce allocation in unlistened spawn events + final com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent( + org.bukkit.craftbukkit.util.CraftLocation.toBukkit(start, level), + org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(entityType), +@@ -71,6 +72,7 @@ public class SpawnUtil { + } + break; + } ++ } // Shiroha - Reduce allocation in unlistened spawn events + // Paper end - PreCreatureSpawnEvent + T mob = (T)entityType.create(level, null, searchPos, spawnReason, false, false); + if (mob != null) { +diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java +index 6efaa78faca15c7a48bdffb24480d1bac29f3ba8..93f94d5b8f66b97bfd6a2fe3a35bbcbcfb18d699 100644 +--- a/net/minecraft/world/entity/EntityType.java ++++ b/net/minecraft/world/entity/EntityType.java +@@ -230,6 +230,7 @@ public class EntityType implements EntityTypeTest, + ) { + // CraftBukkit end + // Paper start - PreCreatureSpawnEvent ++ if (com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent.getHandlerList().getRegisteredListeners().length != 0) { // Shiroha - Reduce allocation in unlistened spawn events + com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent( + org.bukkit.craftbukkit.util.CraftLocation.toBukkit(spawnPos, level), + org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(this), +@@ -238,6 +239,7 @@ public class EntityType implements EntityTypeTest, + if (!event.callEvent()) { + return null; + } ++ } // Shiroha - Reduce allocation in unlistened spawn events + // Paper end - PreCreatureSpawnEvent + T entity = this.create(level, postSpawnConfig, spawnPos, spawnReason, tryMoveDown, movedUp); + if (entity != null) { +diff --git a/net/minecraft/world/level/BaseSpawner.java b/net/minecraft/world/level/BaseSpawner.java +index 2f89a9145902e514089924462003709f256ac3f4..6ef921e08c52e9611e261066724d8893b531fcd8 100644 +--- a/net/minecraft/world/level/BaseSpawner.java ++++ b/net/minecraft/world/level/BaseSpawner.java +@@ -140,6 +140,7 @@ public abstract class BaseSpawner { + } + + // Paper start - PreCreatureSpawnEvent ++ if (com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent.getHandlerList().getRegisteredListeners().length != 0) { // Shiroha - Reduce allocation in unlistened spawn events + com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent event = new com.destroystokyo.paper.event.entity.PreSpawnerSpawnEvent( + org.bukkit.craftbukkit.util.CraftLocation.toBukkit(spawnPos, level), + org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(entityType.get()), +@@ -152,6 +153,7 @@ public abstract class BaseSpawner { + } + continue; + } ++ } // Shiroha - Reduce allocation in unlistened spawn events + // Paper end - PreCreatureSpawnEvent + + Entity entity = EntityType.loadEntityRecursive(input, level, EntitySpawnReason.SPAWNER, e -> { +diff --git a/net/minecraft/world/level/NaturalSpawner.java b/net/minecraft/world/level/NaturalSpawner.java +index 500dcbe924fca160bd673592e1aba384f6eb9ed2..ecdd27be9ac86c396d1cf430356637ee237cf368 100644 +--- a/net/minecraft/world/level/NaturalSpawner.java ++++ b/net/minecraft/world/level/NaturalSpawner.java +@@ -391,6 +391,7 @@ public final class NaturalSpawner { + ) { + // Paper start - PreCreatureSpawnEvent + EntityType type = currentSpawnData.type(); ++ if (com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent.getHandlerList().getRegisteredListeners().length != 0) { // Shiroha - Reduce allocation in unlistened spawn events + com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event = new com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent( + org.bukkit.craftbukkit.util.CraftLocation.toBukkit(pos, level), + org.bukkit.craftbukkit.entity.CraftEntityType.minecraftToBukkit(type), org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.NATURAL +@@ -401,6 +402,7 @@ public final class NaturalSpawner { + } + return PreSpawnStatus.CANCELLED; + } ++ } // Shiroha - Reduce allocation in unlistened spawn events + final boolean success = type.getCategory() != MobCategory.MISC + // Paper end - PreCreatureSpawnEvent + && (type.canSpawnFarFromPlayer() || !(nearestPlayerDistanceSqr > type.getCategory().getDespawnDistance() * type.getCategory().getDespawnDistance())) diff --git a/shiroha-server/minecraft-patches/features/0031-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0032-Async-protocol-switching-optimization.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0031-Async-protocol-switching-optimization.patch rename to shiroha-server/minecraft-patches/features/0032-Async-protocol-switching-optimization.patch diff --git a/shiroha-server/minecraft-patches/features/0032-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0033-Improved-server-health-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0032-Improved-server-health-command.patch rename to shiroha-server/minecraft-patches/features/0033-Improved-server-health-command.patch diff --git a/shiroha-server/minecraft-patches/features/0033-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0034-Kaiiju-Entity-tick-and-removal-limiter.patch similarity index 98% rename from shiroha-server/minecraft-patches/features/0033-Kaiiju-Entity-tick-and-removal-limiter.patch rename to shiroha-server/minecraft-patches/features/0034-Kaiiju-Entity-tick-and-removal-limiter.patch index 9ca4167..177060a 100644 --- a/shiroha-server/minecraft-patches/features/0033-Kaiiju-Entity-tick-and-removal-limiter.patch +++ b/shiroha-server/minecraft-patches/features/0034-Kaiiju-Entity-tick-and-removal-limiter.patch @@ -54,7 +54,7 @@ index 878a00bb28223b2719b4ce7c5d715e0346364770..e89d2af26ffe83e71cfb733cfdbec542 if (this.paperConfig().unsupportedSettings.ticking.blockEntities) { // Paper - option to disable ticking profiler.popPush("blockEntities"); diff --git a/net/minecraft/world/entity/EntityType.java b/net/minecraft/world/entity/EntityType.java -index 6efaa78faca15c7a48bdffb24480d1bac29f3ba8..31619890f1bd4f458b6f9a31fac8cefaafe09e8e 100644 +index 93f94d5b8f66b97bfd6a2fe3a35bbcbcfb18d699..c164e3fa59b47d58c57d65d4330df3a2b31795c6 100644 --- a/net/minecraft/world/entity/EntityType.java +++ b/net/minecraft/world/entity/EntityType.java @@ -73,6 +73,7 @@ public class EntityType implements EntityTypeTest, diff --git a/shiroha-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0035-Kaiiju-Vanilla-end-portal-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0034-Kaiiju-Vanilla-end-portal-teleportation.patch rename to shiroha-server/minecraft-patches/features/0035-Kaiiju-Vanilla-end-portal-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0035-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0036-Add-config-to-support-for-long-command-inputs.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0035-Add-config-to-support-for-long-command-inputs.patch rename to shiroha-server/minecraft-patches/features/0036-Add-config-to-support-for-long-command-inputs.patch diff --git a/shiroha-server/minecraft-patches/features/0036-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0037-Add-config-for-server-mod-name.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0036-Add-config-for-server-mod-name.patch rename to shiroha-server/minecraft-patches/features/0037-Add-config-for-server-mod-name.patch diff --git a/shiroha-server/minecraft-patches/features/0037-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0038-Add-config-for-cpu-affinity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0037-Add-config-for-cpu-affinity.patch rename to shiroha-server/minecraft-patches/features/0038-Add-config-for-cpu-affinity.patch diff --git a/shiroha-server/minecraft-patches/features/0038-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0039-Add-config-for-unsafe-teleportation.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0038-Add-config-for-unsafe-teleportation.patch rename to shiroha-server/minecraft-patches/features/0039-Add-config-for-unsafe-teleportation.patch diff --git a/shiroha-server/minecraft-patches/features/0039-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0040-Add-config-for-watchdog-timeout.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0039-Add-config-for-watchdog-timeout.patch rename to shiroha-server/minecraft-patches/features/0040-Add-config-for-watchdog-timeout.patch diff --git a/shiroha-server/minecraft-patches/features/0040-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0041-Add-config-to-disable-entity-tick-catchers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0040-Add-config-to-disable-entity-tick-catchers.patch rename to shiroha-server/minecraft-patches/features/0041-Add-config-to-disable-entity-tick-catchers.patch diff --git a/shiroha-server/minecraft-patches/features/0041-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0042-Add-config-for-heightmap-warning.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0041-Add-config-for-heightmap-warning.patch rename to shiroha-server/minecraft-patches/features/0042-Add-config-for-heightmap-warning.patch diff --git a/shiroha-server/minecraft-patches/features/0042-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0043-Add-config-gui-support.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0042-Add-config-gui-support.patch rename to shiroha-server/minecraft-patches/features/0043-Add-config-gui-support.patch diff --git a/shiroha-server/minecraft-patches/features/0043-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0044-Add-force-the-data-command-to-be-enabled-config.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0043-Add-force-the-data-command-to-be-enabled-config.patch rename to shiroha-server/minecraft-patches/features/0044-Add-force-the-data-command-to-be-enabled-config.patch diff --git a/shiroha-server/minecraft-patches/features/0044-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0045-Add-experimental-config-for-command-block-command-ex.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0044-Add-experimental-config-for-command-block-command-ex.patch rename to shiroha-server/minecraft-patches/features/0045-Add-experimental-config-for-command-block-command-ex.patch diff --git a/shiroha-server/minecraft-patches/features/0045-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0046-Add-config-to-modify-tripwire-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0045-Add-config-to-modify-tripwire-behavior.patch rename to shiroha-server/minecraft-patches/features/0046-Add-config-to-modify-tripwire-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0046-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0047-Add-config-for-item-multitask.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0046-Add-config-for-item-multitask.patch rename to shiroha-server/minecraft-patches/features/0047-Add-config-for-item-multitask.patch diff --git a/shiroha-server/minecraft-patches/features/0047-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0048-Add-config-to-enable-tick-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0047-Add-config-to-enable-tick-command.patch rename to shiroha-server/minecraft-patches/features/0048-Add-config-to-enable-tick-command.patch diff --git a/shiroha-server/minecraft-patches/features/0048-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0049-Add-config-for-whether-to-save-portal-tickets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0048-Add-config-for-whether-to-save-portal-tickets.patch rename to shiroha-server/minecraft-patches/features/0049-Add-config-for-whether-to-save-portal-tickets.patch diff --git a/shiroha-server/minecraft-patches/features/0049-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0050-Add-portal-rate-limiter.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0049-Add-portal-rate-limiter.patch rename to shiroha-server/minecraft-patches/features/0050-Add-portal-rate-limiter.patch diff --git a/shiroha-server/minecraft-patches/features/0050-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0051-Add-status-bar.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0050-Add-status-bar.patch rename to shiroha-server/minecraft-patches/features/0051-Add-status-bar.patch diff --git a/shiroha-server/minecraft-patches/features/0051-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0052-Leaves-Vanilla-Hopper.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0051-Leaves-Vanilla-Hopper.patch rename to shiroha-server/minecraft-patches/features/0052-Leaves-Vanilla-Hopper.patch diff --git a/shiroha-server/minecraft-patches/features/0052-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0053-Leaves-Lithium-Sleeping-Block-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0052-Leaves-Lithium-Sleeping-Block-Entity.patch rename to shiroha-server/minecraft-patches/features/0053-Leaves-Lithium-Sleeping-Block-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0053-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0054-Petal-Reduce-sensor-work.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0053-Petal-Reduce-sensor-work.patch rename to shiroha-server/minecraft-patches/features/0054-Petal-Reduce-sensor-work.patch diff --git a/shiroha-server/minecraft-patches/features/0054-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0055-Purpur-Lobotomize-stuck-villagers.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0054-Purpur-Lobotomize-stuck-villagers.patch rename to shiroha-server/minecraft-patches/features/0055-Purpur-Lobotomize-stuck-villagers.patch diff --git a/shiroha-server/minecraft-patches/features/0055-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0056-Pufferfish-Reduce-projectile-chunk-loading.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0055-Pufferfish-Reduce-projectile-chunk-loading.patch rename to shiroha-server/minecraft-patches/features/0056-Pufferfish-Reduce-projectile-chunk-loading.patch diff --git a/shiroha-server/minecraft-patches/features/0056-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0057-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0056-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch rename to shiroha-server/minecraft-patches/features/0057-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch diff --git a/shiroha-server/minecraft-patches/features/0057-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0058-Leaf-Secure-seed-and-matter-seed-command.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0057-Leaf-Secure-seed-and-matter-seed-command.patch rename to shiroha-server/minecraft-patches/features/0058-Leaf-Secure-seed-and-matter-seed-command.patch diff --git a/shiroha-server/minecraft-patches/features/0058-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0059-Secure-seed-V2-with-Blake3.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0058-Secure-seed-V2-with-Blake3.patch rename to shiroha-server/minecraft-patches/features/0059-Secure-seed-V2-with-Blake3.patch diff --git a/shiroha-server/minecraft-patches/features/0059-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0060-Leaf-Replace-brain-maps-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0059-Leaf-Replace-brain-maps-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0060-Leaf-Replace-brain-maps-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0060-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0061-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0060-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch rename to shiroha-server/minecraft-patches/features/0061-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch diff --git a/shiroha-server/minecraft-patches/features/0061-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0062-Leaf-Optimize-PatchedDataComponentMap-equals.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0061-Leaf-Optimize-PatchedDataComponentMap-equals.patch rename to shiroha-server/minecraft-patches/features/0062-Leaf-Optimize-PatchedDataComponentMap-equals.patch diff --git a/shiroha-server/minecraft-patches/features/0062-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0063-Leaf-Better-checking-for-useless-move-packets.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0062-Leaf-Better-checking-for-useless-move-packets.patch rename to shiroha-server/minecraft-patches/features/0063-Leaf-Better-checking-for-useless-move-packets.patch diff --git a/shiroha-server/minecraft-patches/features/0063-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0064-Leaf-fast-bit-radix-sort.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0063-Leaf-fast-bit-radix-sort.patch rename to shiroha-server/minecraft-patches/features/0064-Leaf-fast-bit-radix-sort.patch diff --git a/shiroha-server/minecraft-patches/features/0064-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0065-Leaf-Configurable-vanilla-username-check.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0064-Leaf-Configurable-vanilla-username-check.patch rename to shiroha-server/minecraft-patches/features/0065-Leaf-Configurable-vanilla-username-check.patch diff --git a/shiroha-server/minecraft-patches/features/0065-Leaf-Lithium-faster-hash-palette.patch b/shiroha-server/minecraft-patches/features/0066-Leaf-Lithium-faster-hash-palette.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0065-Leaf-Lithium-faster-hash-palette.patch rename to shiroha-server/minecraft-patches/features/0066-Leaf-Lithium-faster-hash-palette.patch diff --git a/shiroha-server/minecraft-patches/features/0066-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch b/shiroha-server/minecraft-patches/features/0067-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0066-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch rename to shiroha-server/minecraft-patches/features/0067-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch diff --git a/shiroha-server/minecraft-patches/features/0067-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0068-Leaves-Configurable-collision-behavior.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0067-Leaves-Configurable-collision-behavior.patch rename to shiroha-server/minecraft-patches/features/0068-Leaves-Configurable-collision-behavior.patch diff --git a/shiroha-server/minecraft-patches/features/0068-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0068-Leaves-Optimized-dragon-respawn.patch rename to shiroha-server/minecraft-patches/features/0069-Leaves-Optimized-dragon-respawn.patch diff --git a/shiroha-server/minecraft-patches/features/0069-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0070-Gale-Variable-entity-wake-up-duration.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0069-Gale-Variable-entity-wake-up-duration.patch rename to shiroha-server/minecraft-patches/features/0070-Gale-Variable-entity-wake-up-duration.patch diff --git a/shiroha-server/minecraft-patches/features/0070-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0071-Gale-Replace-AI-attributes-with-optimized-collection.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0070-Gale-Replace-AI-attributes-with-optimized-collection.patch rename to shiroha-server/minecraft-patches/features/0071-Gale-Replace-AI-attributes-with-optimized-collection.patch diff --git a/shiroha-server/minecraft-patches/features/0071-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0071-Gale-Skip-entity-move-if-movement-is-zero.patch rename to shiroha-server/minecraft-patches/features/0072-Gale-Skip-entity-move-if-movement-is-zero.patch diff --git a/shiroha-server/minecraft-patches/features/0072-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0073-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0072-Gale-Store-mob-counts-in-an-array.patch rename to shiroha-server/minecraft-patches/features/0073-Gale-Store-mob-counts-in-an-array.patch diff --git a/shiroha-server/minecraft-patches/features/0073-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0074-Gale-Optimize-random-calls-in-chunk-ticking.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0073-Gale-Optimize-random-calls-in-chunk-ticking.patch rename to shiroha-server/minecraft-patches/features/0074-Gale-Optimize-random-calls-in-chunk-ticking.patch diff --git a/shiroha-server/minecraft-patches/features/0074-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0075-Gale-Reduce-enderman-teleport-chunk-lookups.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0074-Gale-Reduce-enderman-teleport-chunk-lookups.patch rename to shiroha-server/minecraft-patches/features/0075-Gale-Reduce-enderman-teleport-chunk-lookups.patch diff --git a/shiroha-server/minecraft-patches/features/0075-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0076-Gale-Cache-ShapePairKey-hash.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0075-Gale-Cache-ShapePairKey-hash.patch rename to shiroha-server/minecraft-patches/features/0076-Gale-Cache-ShapePairKey-hash.patch diff --git a/shiroha-server/minecraft-patches/features/0076-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0076-Gale-For-collision-check-has-physics-before-same-veh.patch rename to shiroha-server/minecraft-patches/features/0077-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/shiroha-server/minecraft-patches/features/0077-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0077-Gale-Skip-negligible-planar-movement-multiplication.patch rename to shiroha-server/minecraft-patches/features/0078-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/shiroha-server/minecraft-patches/features/0078-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0079-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0078-Gale-Optimize-matching-item-checks.patch rename to shiroha-server/minecraft-patches/features/0079-Gale-Optimize-matching-item-checks.patch diff --git a/shiroha-server/minecraft-patches/features/0079-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0080-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0079-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch rename to shiroha-server/minecraft-patches/features/0080-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch diff --git a/shiroha-server/minecraft-patches/features/0080-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0080-Gale-Reduce-array-allocations.patch rename to shiroha-server/minecraft-patches/features/0081-Gale-Reduce-array-allocations.patch diff --git a/shiroha-server/minecraft-patches/features/0081-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0082-Some-optimizations-from-krypton.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0081-Some-optimizations-from-krypton.patch rename to shiroha-server/minecraft-patches/features/0082-Some-optimizations-from-krypton.patch diff --git a/shiroha-server/minecraft-patches/features/0082-Frustum-filtering-tracker.patch b/shiroha-server/minecraft-patches/features/0083-Frustum-filtering-tracker.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0082-Frustum-filtering-tracker.patch rename to shiroha-server/minecraft-patches/features/0083-Frustum-filtering-tracker.patch diff --git a/shiroha-server/minecraft-patches/features/0083-Lithium-optimized-collections-for-WeightedList.patch b/shiroha-server/minecraft-patches/features/0084-Lithium-optimized-collections-for-WeightedList.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0083-Lithium-optimized-collections-for-WeightedList.patch rename to shiroha-server/minecraft-patches/features/0084-Lithium-optimized-collections-for-WeightedList.patch diff --git a/shiroha-server/minecraft-patches/features/0084-Lithium-optimized-non-poi-block-searching.patch b/shiroha-server/minecraft-patches/features/0085-Lithium-optimized-non-poi-block-searching.patch similarity index 100% rename from shiroha-server/minecraft-patches/features/0084-Lithium-optimized-non-poi-block-searching.patch rename to shiroha-server/minecraft-patches/features/0085-Lithium-optimized-non-poi-block-searching.patch