diff --git a/shiroha-server/minecraft-patches/features/0023-Fix-folia-nether-portal-ticket-placement.patch b/shiroha-server/minecraft-patches/features/0023-Fix-folia-nether-portal-ticket-placement.patch
new file mode 100644
index 0000000..e25c2b2
--- /dev/null
+++ b/shiroha-server/minecraft-patches/features/0023-Fix-folia-nether-portal-ticket-placement.patch
@@ -0,0 +1,66 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: NanaChiyo0721 <nanachiyo0721@163.com>
+Date: Tue, 28 Jul 2026 19:25:20 +0800
+Subject: [PATCH] Fix folia nether portal ticket placement
+
+
+diff --git a/net/minecraft/util/BlockUtil.java b/net/minecraft/util/BlockUtil.java
+index ea93ac07ec6d4e83d1d0904daf721132e2bbecc3..947413df55b972a5f866d5717fdb9e925a89ad60 100644
+--- a/net/minecraft/util/BlockUtil.java
++++ b/net/minecraft/util/BlockUtil.java
+@@ -138,12 +138,20 @@ public class BlockUtil {
+         public final BlockPos minCorner;
+         public final int axis1Size;
+         public final int axis2Size;
++        public BlockPos foundOrigin; // Shiroha - Fix folia nether portal ticket placement
+ 
+         public FoundRectangle(final BlockPos minCorner, final int axis1Size, final int axis2Size) {
+             this.minCorner = minCorner;
+             this.axis1Size = axis1Size;
+             this.axis2Size = axis2Size;
++            this.foundOrigin = minCorner; // Shiroha - Fix folia nether portal ticket placement - prevent edge conditions(idk if someone would do this so just prevent it)
+         }
++        // Shiroha start - Fix folia nether portal ticket placement
++        public FoundRectangle withFoundOrigin(BlockPos origin) {
++            this.foundOrigin = origin;
++            return this;
++        }
++        // Shiroha end
+     }
+ 
+     public static class IntBounds {
+diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
+index 4a5266e3e15e765dda4b2aac54bf0eb90291b096..63c1d223d9fc16b4211e992bde3c9f08d3ed15ca 100644
+--- a/net/minecraft/world/entity/Entity.java
++++ b/net/minecraft/world/entity/Entity.java
+@@ -4723,7 +4723,7 @@ public abstract class Entity
+                             portalInfoCompletable.complete(
+                                 new TeleportTransition(destination, Vec3.atCenterOf(targetPos), Vec3.ZERO,
+                                     90.0f, 0.0f,
+-                                    TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET))
++                                    TeleportTransition.PLAY_PORTAL_SOUND.then(ent -> ent.placePortalTicket(targetPos))) // Shiroha - Fix folia nether portal ticket placement
+                             );
+                             return;
+                         }
+@@ -4735,7 +4735,7 @@ public abstract class Entity
+                         portalInfoCompletable.complete(
+                             net.minecraft.world.level.block.NetherPortalBlock.createDimensionTransition(
+                                 destination, portal, originalPortalDirection, relativePos,
+-                                Entity.this, TeleportTransition.PLAY_PORTAL_SOUND.then(TeleportTransition.PLACE_PORTAL_TICKET)
++                                Entity.this, TeleportTransition.PLAY_PORTAL_SOUND.then(ent -> ent.placePortalTicket(portal.foundOrigin)) // Shiroha - Fix folia nether portal ticket placement
+                             )
+                         );
+                     }
+diff --git a/net/minecraft/world/level/block/NetherPortalBlock.java b/net/minecraft/world/level/block/NetherPortalBlock.java
+index 29fc9521c2c8333c999647dd833899393a838064..9022be7b8c415cd6341f45fa9525c59ec10ff985 100644
+--- a/net/minecraft/world/level/block/NetherPortalBlock.java
++++ b/net/minecraft/world/level/block/NetherPortalBlock.java
+@@ -204,7 +204,7 @@ public class NetherPortalBlock extends Block implements Portal {
+ 
+         return BlockUtil.getLargestRectangleAround(found, portalState.getValue(BlockStateProperties.HORIZONTAL_AXIS), 21, Direction.Axis.Y, 21, (pos) -> {
+             return world.getBlockStateFromEmptyChunk(pos) == portalState;
+-        });
++        }).withFoundOrigin(found); // Shiroha - Fix folia nether portal ticket placement
+     }
+     // Folia end - region threading
+ 
diff --git a/shiroha-server/minecraft-patches/features/0023-Force-clamp-grid-exponent-to-1-6.patch b/shiroha-server/minecraft-patches/features/0024-Force-clamp-grid-exponent-to-1-6.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0023-Force-clamp-grid-exponent-to-1-6.patch
rename to shiroha-server/minecraft-patches/features/0024-Force-clamp-grid-exponent-to-1-6.patch
diff --git a/shiroha-server/minecraft-patches/features/0024-Force-disable-builtin-spark-plugin.patch b/shiroha-server/minecraft-patches/features/0025-Force-disable-builtin-spark-plugin.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0024-Force-disable-builtin-spark-plugin.patch
rename to shiroha-server/minecraft-patches/features/0025-Force-disable-builtin-spark-plugin.patch
diff --git a/shiroha-server/minecraft-patches/features/0025-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch b/shiroha-server/minecraft-patches/features/0026-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0025-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch
rename to shiroha-server/minecraft-patches/features/0026-Prevent-tamable-animals-check-can-teleport-in-an-unl.patch
diff --git a/shiroha-server/minecraft-patches/features/0026-Replace-packet-processing-queue-with-mt-queue.patch b/shiroha-server/minecraft-patches/features/0027-Replace-packet-processing-queue-with-mt-queue.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0026-Replace-packet-processing-queue-with-mt-queue.patch
rename to shiroha-server/minecraft-patches/features/0027-Replace-packet-processing-queue-with-mt-queue.patch
diff --git a/shiroha-server/minecraft-patches/features/0027-Async-protocol-switching-optimization.patch b/shiroha-server/minecraft-patches/features/0028-Async-protocol-switching-optimization.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0027-Async-protocol-switching-optimization.patch
rename to shiroha-server/minecraft-patches/features/0028-Async-protocol-switching-optimization.patch
diff --git a/shiroha-server/minecraft-patches/features/0028-Improved-server-health-command.patch b/shiroha-server/minecraft-patches/features/0029-Improved-server-health-command.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0028-Improved-server-health-command.patch
rename to shiroha-server/minecraft-patches/features/0029-Improved-server-health-command.patch
diff --git a/shiroha-server/minecraft-patches/features/0029-Kaiiju-Entity-tick-and-removal-limiter.patch b/shiroha-server/minecraft-patches/features/0030-Kaiiju-Entity-tick-and-removal-limiter.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0029-Kaiiju-Entity-tick-and-removal-limiter.patch
rename to shiroha-server/minecraft-patches/features/0030-Kaiiju-Entity-tick-and-removal-limiter.patch
diff --git a/shiroha-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch b/shiroha-server/minecraft-patches/features/0031-Kaiiju-Vanilla-end-portal-teleportation.patch
similarity index 98%
rename from shiroha-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch
rename to shiroha-server/minecraft-patches/features/0031-Kaiiju-Vanilla-end-portal-teleportation.patch
index c8fdf61..148b8ee 100644
--- a/shiroha-server/minecraft-patches/features/0030-Kaiiju-Vanilla-end-portal-teleportation.patch
+++ b/shiroha-server/minecraft-patches/features/0031-Kaiiju-Vanilla-end-portal-teleportation.patch
@@ -8,7 +8,7 @@ As part of: Kaiiju (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2e
 Licensed under: GPL-3.0 (https://github.com/KaiijuMC/Kaiiju/blob/c2b7aec8f7b418a39a2ec408e6411e6f752379da/LICENSE)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 4a5266e3e15e765dda4b2aac54bf0eb90291b096..bf5b6922fbe7d631c429d337001a4d2cd919fbe3 100644
+index 63c1d223d9fc16b4211e992bde3c9f08d3ed15ca..dda97d7e3d3a997ae4a2b6ee1656c165d5f349c4 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -4640,15 +4640,19 @@ public abstract class Entity
diff --git a/shiroha-server/minecraft-patches/features/0031-Add-config-to-support-for-long-command-inputs.patch b/shiroha-server/minecraft-patches/features/0032-Add-config-to-support-for-long-command-inputs.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0031-Add-config-to-support-for-long-command-inputs.patch
rename to shiroha-server/minecraft-patches/features/0032-Add-config-to-support-for-long-command-inputs.patch
diff --git a/shiroha-server/minecraft-patches/features/0032-Add-config-for-server-mod-name.patch b/shiroha-server/minecraft-patches/features/0033-Add-config-for-server-mod-name.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0032-Add-config-for-server-mod-name.patch
rename to shiroha-server/minecraft-patches/features/0033-Add-config-for-server-mod-name.patch
diff --git a/shiroha-server/minecraft-patches/features/0033-Add-config-for-cpu-affinity.patch b/shiroha-server/minecraft-patches/features/0034-Add-config-for-cpu-affinity.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0033-Add-config-for-cpu-affinity.patch
rename to shiroha-server/minecraft-patches/features/0034-Add-config-for-cpu-affinity.patch
diff --git a/shiroha-server/minecraft-patches/features/0034-Add-config-for-unsafe-teleportation.patch b/shiroha-server/minecraft-patches/features/0035-Add-config-for-unsafe-teleportation.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0034-Add-config-for-unsafe-teleportation.patch
rename to shiroha-server/minecraft-patches/features/0035-Add-config-for-unsafe-teleportation.patch
diff --git a/shiroha-server/minecraft-patches/features/0035-Add-config-for-watchdog-timeout.patch b/shiroha-server/minecraft-patches/features/0036-Add-config-for-watchdog-timeout.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0035-Add-config-for-watchdog-timeout.patch
rename to shiroha-server/minecraft-patches/features/0036-Add-config-for-watchdog-timeout.patch
diff --git a/shiroha-server/minecraft-patches/features/0036-Add-config-to-disable-entity-tick-catchers.patch b/shiroha-server/minecraft-patches/features/0037-Add-config-to-disable-entity-tick-catchers.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0036-Add-config-to-disable-entity-tick-catchers.patch
rename to shiroha-server/minecraft-patches/features/0037-Add-config-to-disable-entity-tick-catchers.patch
diff --git a/shiroha-server/minecraft-patches/features/0037-Add-config-for-heightmap-warning.patch b/shiroha-server/minecraft-patches/features/0038-Add-config-for-heightmap-warning.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0037-Add-config-for-heightmap-warning.patch
rename to shiroha-server/minecraft-patches/features/0038-Add-config-for-heightmap-warning.patch
diff --git a/shiroha-server/minecraft-patches/features/0038-Add-config-gui-support.patch b/shiroha-server/minecraft-patches/features/0039-Add-config-gui-support.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0038-Add-config-gui-support.patch
rename to shiroha-server/minecraft-patches/features/0039-Add-config-gui-support.patch
diff --git a/shiroha-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch b/shiroha-server/minecraft-patches/features/0040-Add-force-the-data-command-to-be-enabled-config.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0039-Add-force-the-data-command-to-be-enabled-config.patch
rename to shiroha-server/minecraft-patches/features/0040-Add-force-the-data-command-to-be-enabled-config.patch
diff --git a/shiroha-server/minecraft-patches/features/0040-Add-experimental-config-for-command-block-command-ex.patch b/shiroha-server/minecraft-patches/features/0041-Add-experimental-config-for-command-block-command-ex.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0040-Add-experimental-config-for-command-block-command-ex.patch
rename to shiroha-server/minecraft-patches/features/0041-Add-experimental-config-for-command-block-command-ex.patch
diff --git a/shiroha-server/minecraft-patches/features/0041-Add-config-to-modify-tripwire-behavior.patch b/shiroha-server/minecraft-patches/features/0042-Add-config-to-modify-tripwire-behavior.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0041-Add-config-to-modify-tripwire-behavior.patch
rename to shiroha-server/minecraft-patches/features/0042-Add-config-to-modify-tripwire-behavior.patch
diff --git a/shiroha-server/minecraft-patches/features/0042-Add-config-for-item-multitask.patch b/shiroha-server/minecraft-patches/features/0043-Add-config-for-item-multitask.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0042-Add-config-for-item-multitask.patch
rename to shiroha-server/minecraft-patches/features/0043-Add-config-for-item-multitask.patch
diff --git a/shiroha-server/minecraft-patches/features/0043-Add-config-to-enable-tick-command.patch b/shiroha-server/minecraft-patches/features/0044-Add-config-to-enable-tick-command.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0043-Add-config-to-enable-tick-command.patch
rename to shiroha-server/minecraft-patches/features/0044-Add-config-to-enable-tick-command.patch
diff --git a/shiroha-server/minecraft-patches/features/0044-Add-config-for-whether-to-save-portal-tickets.patch b/shiroha-server/minecraft-patches/features/0045-Add-config-for-whether-to-save-portal-tickets.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0044-Add-config-for-whether-to-save-portal-tickets.patch
rename to shiroha-server/minecraft-patches/features/0045-Add-config-for-whether-to-save-portal-tickets.patch
diff --git a/shiroha-server/minecraft-patches/features/0045-Add-portal-rate-limiter.patch b/shiroha-server/minecraft-patches/features/0046-Add-portal-rate-limiter.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0045-Add-portal-rate-limiter.patch
rename to shiroha-server/minecraft-patches/features/0046-Add-portal-rate-limiter.patch
diff --git a/shiroha-server/minecraft-patches/features/0046-Add-status-bar.patch b/shiroha-server/minecraft-patches/features/0047-Add-status-bar.patch
similarity index 99%
rename from shiroha-server/minecraft-patches/features/0046-Add-status-bar.patch
rename to shiroha-server/minecraft-patches/features/0047-Add-status-bar.patch
index a59f242..60c8d93 100644
--- a/shiroha-server/minecraft-patches/features/0046-Add-status-bar.patch
+++ b/shiroha-server/minecraft-patches/features/0047-Add-status-bar.patch
@@ -171,7 +171,7 @@ index f03fa06c0ba56f7f5e1e45bc1568a490751efde3..eee1c14249addbf4714df733870da974
 +    // KioCG end
  }
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index bf5b6922fbe7d631c429d337001a4d2cd919fbe3..9ec6e74acaf25c33438ca8713b80d5b5a9613b19 100644
+index dda97d7e3d3a997ae4a2b6ee1656c165d5f349c4..3f3110efa6a917f5ad3892a57229a8ae937cd023 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -6432,4 +6432,6 @@ public abstract class Entity
diff --git a/shiroha-server/minecraft-patches/features/0047-Leaves-Vanilla-Hopper.patch b/shiroha-server/minecraft-patches/features/0048-Leaves-Vanilla-Hopper.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0047-Leaves-Vanilla-Hopper.patch
rename to shiroha-server/minecraft-patches/features/0048-Leaves-Vanilla-Hopper.patch
diff --git a/shiroha-server/minecraft-patches/features/0048-Leaves-Lithium-Sleeping-Block-Entity.patch b/shiroha-server/minecraft-patches/features/0049-Leaves-Lithium-Sleeping-Block-Entity.patch
similarity index 99%
rename from shiroha-server/minecraft-patches/features/0048-Leaves-Lithium-Sleeping-Block-Entity.patch
rename to shiroha-server/minecraft-patches/features/0049-Leaves-Lithium-Sleeping-Block-Entity.patch
index 3b0ebf2..744e125 100644
--- a/shiroha-server/minecraft-patches/features/0048-Leaves-Lithium-Sleeping-Block-Entity.patch
+++ b/shiroha-server/minecraft-patches/features/0049-Leaves-Lithium-Sleeping-Block-Entity.patch
@@ -240,7 +240,7 @@ index 6e08d50794c4af4405f3e164a3fd46f376b3f78f..dd2d0940eece3e85078e574f66f71a4c
  
      int getContainerSize();
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 9ec6e74acaf25c33438ca8713b80d5b5a9613b19..66f1f80c172e464a57d63679a8d13729c480a1e3 100644
+index 3f3110efa6a917f5ad3892a57229a8ae937cd023..34daca8ff9cbd03458ac864ed3d31f6603301864 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -324,7 +324,7 @@ public abstract class Entity
diff --git a/shiroha-server/minecraft-patches/features/0049-Petal-Reduce-sensor-work.patch b/shiroha-server/minecraft-patches/features/0050-Petal-Reduce-sensor-work.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0049-Petal-Reduce-sensor-work.patch
rename to shiroha-server/minecraft-patches/features/0050-Petal-Reduce-sensor-work.patch
diff --git a/shiroha-server/minecraft-patches/features/0050-Purpur-Lobotomize-stuck-villagers.patch b/shiroha-server/minecraft-patches/features/0051-Purpur-Lobotomize-stuck-villagers.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0050-Purpur-Lobotomize-stuck-villagers.patch
rename to shiroha-server/minecraft-patches/features/0051-Purpur-Lobotomize-stuck-villagers.patch
diff --git a/shiroha-server/minecraft-patches/features/0051-Pufferfish-Reduce-projectile-chunk-loading.patch b/shiroha-server/minecraft-patches/features/0052-Pufferfish-Reduce-projectile-chunk-loading.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0051-Pufferfish-Reduce-projectile-chunk-loading.patch
rename to shiroha-server/minecraft-patches/features/0052-Pufferfish-Reduce-projectile-chunk-loading.patch
diff --git a/shiroha-server/minecraft-patches/features/0052-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch b/shiroha-server/minecraft-patches/features/0053-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0052-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
rename to shiroha-server/minecraft-patches/features/0053-Pufferfish-Throttle-goal-selector-during-inactive-ti.patch
diff --git a/shiroha-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch b/shiroha-server/minecraft-patches/features/0054-Leaf-Secure-seed-and-matter-seed-command.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0053-Leaf-Secure-seed-and-matter-seed-command.patch
rename to shiroha-server/minecraft-patches/features/0054-Leaf-Secure-seed-and-matter-seed-command.patch
diff --git a/shiroha-server/minecraft-patches/features/0054-Secure-seed-V2-with-Blake3.patch b/shiroha-server/minecraft-patches/features/0055-Secure-seed-V2-with-Blake3.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0054-Secure-seed-V2-with-Blake3.patch
rename to shiroha-server/minecraft-patches/features/0055-Secure-seed-V2-with-Blake3.patch
diff --git a/shiroha-server/minecraft-patches/features/0055-Leaf-Replace-brain-maps-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0056-Leaf-Replace-brain-maps-with-optimized-collection.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0055-Leaf-Replace-brain-maps-with-optimized-collection.patch
rename to shiroha-server/minecraft-patches/features/0056-Leaf-Replace-brain-maps-with-optimized-collection.patch
diff --git a/shiroha-server/minecraft-patches/features/0056-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch b/shiroha-server/minecraft-patches/features/0057-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0056-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch
rename to shiroha-server/minecraft-patches/features/0057-Leaf-Remove-useless-creating-stats-json-bases-on-pla.patch
diff --git a/shiroha-server/minecraft-patches/features/0057-Leaf-Optimize-PatchedDataComponentMap-equals.patch b/shiroha-server/minecraft-patches/features/0058-Leaf-Optimize-PatchedDataComponentMap-equals.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0057-Leaf-Optimize-PatchedDataComponentMap-equals.patch
rename to shiroha-server/minecraft-patches/features/0058-Leaf-Optimize-PatchedDataComponentMap-equals.patch
diff --git a/shiroha-server/minecraft-patches/features/0058-Leaf-Better-checking-for-useless-move-packets.patch b/shiroha-server/minecraft-patches/features/0059-Leaf-Better-checking-for-useless-move-packets.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0058-Leaf-Better-checking-for-useless-move-packets.patch
rename to shiroha-server/minecraft-patches/features/0059-Leaf-Better-checking-for-useless-move-packets.patch
diff --git a/shiroha-server/minecraft-patches/features/0059-Leaf-fast-bit-radix-sort.patch b/shiroha-server/minecraft-patches/features/0060-Leaf-fast-bit-radix-sort.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0059-Leaf-fast-bit-radix-sort.patch
rename to shiroha-server/minecraft-patches/features/0060-Leaf-fast-bit-radix-sort.patch
diff --git a/shiroha-server/minecraft-patches/features/0060-Leaf-Configurable-vanilla-username-check.patch b/shiroha-server/minecraft-patches/features/0061-Leaf-Configurable-vanilla-username-check.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0060-Leaf-Configurable-vanilla-username-check.patch
rename to shiroha-server/minecraft-patches/features/0061-Leaf-Configurable-vanilla-username-check.patch
diff --git a/shiroha-server/minecraft-patches/features/0061-Leaf-Lithium-faster-hash-palette.patch b/shiroha-server/minecraft-patches/features/0062-Leaf-Lithium-faster-hash-palette.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0061-Leaf-Lithium-faster-hash-palette.patch
rename to shiroha-server/minecraft-patches/features/0062-Leaf-Lithium-faster-hash-palette.patch
diff --git a/shiroha-server/minecraft-patches/features/0062-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch b/shiroha-server/minecraft-patches/features/0063-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0062-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch
rename to shiroha-server/minecraft-patches/features/0063-Leaves-Disable-packet-limit-Shiroha-Option-to-full-d.patch
diff --git a/shiroha-server/minecraft-patches/features/0063-Leaves-Configurable-collision-behavior.patch b/shiroha-server/minecraft-patches/features/0064-Leaves-Configurable-collision-behavior.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0063-Leaves-Configurable-collision-behavior.patch
rename to shiroha-server/minecraft-patches/features/0064-Leaves-Configurable-collision-behavior.patch
diff --git a/shiroha-server/minecraft-patches/features/0064-Leaves-Optimized-dragon-respawn.patch b/shiroha-server/minecraft-patches/features/0065-Leaves-Optimized-dragon-respawn.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0064-Leaves-Optimized-dragon-respawn.patch
rename to shiroha-server/minecraft-patches/features/0065-Leaves-Optimized-dragon-respawn.patch
diff --git a/shiroha-server/minecraft-patches/features/0065-Gale-Variable-entity-wake-up-duration.patch b/shiroha-server/minecraft-patches/features/0066-Gale-Variable-entity-wake-up-duration.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0065-Gale-Variable-entity-wake-up-duration.patch
rename to shiroha-server/minecraft-patches/features/0066-Gale-Variable-entity-wake-up-duration.patch
diff --git a/shiroha-server/minecraft-patches/features/0066-Gale-Replace-AI-attributes-with-optimized-collection.patch b/shiroha-server/minecraft-patches/features/0067-Gale-Replace-AI-attributes-with-optimized-collection.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0066-Gale-Replace-AI-attributes-with-optimized-collection.patch
rename to shiroha-server/minecraft-patches/features/0067-Gale-Replace-AI-attributes-with-optimized-collection.patch
diff --git a/shiroha-server/minecraft-patches/features/0067-Gale-Skip-entity-move-if-movement-is-zero.patch b/shiroha-server/minecraft-patches/features/0068-Gale-Skip-entity-move-if-movement-is-zero.patch
similarity index 95%
rename from shiroha-server/minecraft-patches/features/0067-Gale-Skip-entity-move-if-movement-is-zero.patch
rename to shiroha-server/minecraft-patches/features/0068-Gale-Skip-entity-move-if-movement-is-zero.patch
index f5aea60..f996e0d 100644
--- a/shiroha-server/minecraft-patches/features/0067-Gale-Skip-entity-move-if-movement-is-zero.patch
+++ b/shiroha-server/minecraft-patches/features/0068-Gale-Skip-entity-move-if-movement-is-zero.patch
@@ -10,7 +10,7 @@ VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 66f1f80c172e464a57d63679a8d13729c480a1e3..c720d1af1bdd1e9eb8e33129b2fb1abe57685364 100644
+index 34daca8ff9cbd03458ac864ed3d31f6603301864..e7497f8f488cf9833b428ce1c82451c902465d19 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1152,8 +1152,14 @@ public abstract class Entity
diff --git a/shiroha-server/minecraft-patches/features/0068-Gale-Store-mob-counts-in-an-array.patch b/shiroha-server/minecraft-patches/features/0069-Gale-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0068-Gale-Store-mob-counts-in-an-array.patch
rename to shiroha-server/minecraft-patches/features/0069-Gale-Store-mob-counts-in-an-array.patch
diff --git a/shiroha-server/minecraft-patches/features/0069-Gale-Optimize-random-calls-in-chunk-ticking.patch b/shiroha-server/minecraft-patches/features/0070-Gale-Optimize-random-calls-in-chunk-ticking.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0069-Gale-Optimize-random-calls-in-chunk-ticking.patch
rename to shiroha-server/minecraft-patches/features/0070-Gale-Optimize-random-calls-in-chunk-ticking.patch
diff --git a/shiroha-server/minecraft-patches/features/0070-Gale-Reduce-enderman-teleport-chunk-lookups.patch b/shiroha-server/minecraft-patches/features/0071-Gale-Reduce-enderman-teleport-chunk-lookups.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0070-Gale-Reduce-enderman-teleport-chunk-lookups.patch
rename to shiroha-server/minecraft-patches/features/0071-Gale-Reduce-enderman-teleport-chunk-lookups.patch
diff --git a/shiroha-server/minecraft-patches/features/0071-Gale-Cache-ShapePairKey-hash.patch b/shiroha-server/minecraft-patches/features/0072-Gale-Cache-ShapePairKey-hash.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0071-Gale-Cache-ShapePairKey-hash.patch
rename to shiroha-server/minecraft-patches/features/0072-Gale-Cache-ShapePairKey-hash.patch
diff --git a/shiroha-server/minecraft-patches/features/0072-Gale-For-collision-check-has-physics-before-same-veh.patch b/shiroha-server/minecraft-patches/features/0073-Gale-For-collision-check-has-physics-before-same-veh.patch
similarity index 94%
rename from shiroha-server/minecraft-patches/features/0072-Gale-For-collision-check-has-physics-before-same-veh.patch
rename to shiroha-server/minecraft-patches/features/0073-Gale-For-collision-check-has-physics-before-same-veh.patch
index 41f3978..0b7a9f4 100644
--- a/shiroha-server/minecraft-patches/features/0072-Gale-For-collision-check-has-physics-before-same-veh.patch
+++ b/shiroha-server/minecraft-patches/features/0073-Gale-For-collision-check-has-physics-before-same-veh.patch
@@ -20,7 +20,7 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index c720d1af1bdd1e9eb8e33129b2fb1abe57685364..21dad4bf9e248f9769ff39461cd0fd66c9441600 100644
+index e7497f8f488cf9833b428ce1c82451c902465d19..3c055fa3f6641137dda1532a19af8b67caa52143 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -2438,8 +2438,8 @@ public abstract class Entity
diff --git a/shiroha-server/minecraft-patches/features/0073-Gale-Skip-negligible-planar-movement-multiplication.patch b/shiroha-server/minecraft-patches/features/0074-Gale-Skip-negligible-planar-movement-multiplication.patch
similarity index 94%
rename from shiroha-server/minecraft-patches/features/0073-Gale-Skip-negligible-planar-movement-multiplication.patch
rename to shiroha-server/minecraft-patches/features/0074-Gale-Skip-negligible-planar-movement-multiplication.patch
index b7471dd..88bdd37 100644
--- a/shiroha-server/minecraft-patches/features/0073-Gale-Skip-negligible-planar-movement-multiplication.patch
+++ b/shiroha-server/minecraft-patches/features/0074-Gale-Skip-negligible-planar-movement-multiplication.patch
@@ -7,7 +7,7 @@ License: GPL-3.0-only (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://github.com/GaleMC/Gale
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 21dad4bf9e248f9769ff39461cd0fd66c9441600..e8991b08105ed611da2f0449f2a47cb0db74fed0 100644
+index 3c055fa3f6641137dda1532a19af8b67caa52143..503af0546705e88ec06e064ec1c24f87cb25abeb 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1299,8 +1299,17 @@ public abstract class Entity
diff --git a/shiroha-server/minecraft-patches/features/0074-Gale-Optimize-matching-item-checks.patch b/shiroha-server/minecraft-patches/features/0075-Gale-Optimize-matching-item-checks.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0074-Gale-Optimize-matching-item-checks.patch
rename to shiroha-server/minecraft-patches/features/0075-Gale-Optimize-matching-item-checks.patch
diff --git a/shiroha-server/minecraft-patches/features/0075-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch b/shiroha-server/minecraft-patches/features/0076-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0075-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch
rename to shiroha-server/minecraft-patches/features/0076-Gale-Reduce-lambda-and-Optional-allocation-in-Entity.patch
diff --git a/shiroha-server/minecraft-patches/features/0076-Gale-Reduce-array-allocations.patch b/shiroha-server/minecraft-patches/features/0077-Gale-Reduce-array-allocations.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0076-Gale-Reduce-array-allocations.patch
rename to shiroha-server/minecraft-patches/features/0077-Gale-Reduce-array-allocations.patch
diff --git a/shiroha-server/minecraft-patches/features/0077-Some-optimizations-from-krypton.patch b/shiroha-server/minecraft-patches/features/0078-Some-optimizations-from-krypton.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0077-Some-optimizations-from-krypton.patch
rename to shiroha-server/minecraft-patches/features/0078-Some-optimizations-from-krypton.patch
diff --git a/shiroha-server/minecraft-patches/features/0078-Frustum-filtering-tracker.patch b/shiroha-server/minecraft-patches/features/0079-Frustum-filtering-tracker.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0078-Frustum-filtering-tracker.patch
rename to shiroha-server/minecraft-patches/features/0079-Frustum-filtering-tracker.patch
diff --git a/shiroha-server/minecraft-patches/features/0079-Lithium-optimized-collections-for-WeightedList.patch b/shiroha-server/minecraft-patches/features/0080-Lithium-optimized-collections-for-WeightedList.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0079-Lithium-optimized-collections-for-WeightedList.patch
rename to shiroha-server/minecraft-patches/features/0080-Lithium-optimized-collections-for-WeightedList.patch
diff --git a/shiroha-server/minecraft-patches/features/0080-Lithium-optimized-non-poi-block-searching.patch b/shiroha-server/minecraft-patches/features/0081-Lithium-optimized-non-poi-block-searching.patch
similarity index 100%
rename from shiroha-server/minecraft-patches/features/0080-Lithium-optimized-non-poi-block-searching.patch
rename to shiroha-server/minecraft-patches/features/0081-Lithium-optimized-non-poi-block-searching.patch