diff --git a/patches/api/0401-Add-PlayerFailMoveEvent.patch b/patches/api/0400-Add-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/api/0401-Add-PlayerFailMoveEvent.patch
rename to patches/api/0400-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0402-Fix-custom-statistic-criteria-creation.patch b/patches/api/0401-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/api/0402-Fix-custom-statistic-criteria-creation.patch
rename to patches/api/0401-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0403-SculkCatalyst-bloom-API.patch b/patches/api/0402-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/api/0403-SculkCatalyst-bloom-API.patch
rename to patches/api/0402-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0404-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0403-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/api/0404-API-for-an-entity-s-scoreboard-name.patch
rename to patches/api/0403-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 97%
rename from patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
index a832ca9f1d..f09ff7714f 100644
--- a/patches/api/0405-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0404-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2 100644
+index 50efe16bb80c618c3dfae03b70c8c165183af8ec..85ad1f7f0de9a6f9048981c3ee509b42ddbeef1a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -949,9 +949,6 @@ public final class Bukkit {
@@ -84,7 +84,7 @@ index 52c601328bbf5c1642aa620c8bb466a9d2d231be..c8fa12acaf52cd3923a7a8702ccc50cf
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 8ba2fbaab7428a42b506fd000fbc162f68ddaed1..50ffca9bccfb582d58ccb13f0decf66e5d91aef3 100644
+index 1b8d6a3333a4fa9155b79644e683e2343c134e12..640ef81d204f480f4af83d420c7e968ce569a38d 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -817,16 +817,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0406-Add-Listing-API-for-Player.patch b/patches/api/0405-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/api/0406-Add-Listing-API-for-Player.patch
rename to patches/api/0405-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0406-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/api/0407-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/api/0406-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0408-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0407-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/api/0408-Fix-NPE-on-Boat-getStatus.patch
rename to patches/api/0407-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0409-Expand-Pose-API.patch b/patches/api/0408-Expand-Pose-API.patch
similarity index 100%
rename from patches/api/0409-Expand-Pose-API.patch
rename to patches/api/0408-Expand-Pose-API.patch
diff --git a/patches/api/0410-MerchantRecipe-add-copy-constructor.patch b/patches/api/0409-MerchantRecipe-add-copy-constructor.patch
similarity index 100%
rename from patches/api/0410-MerchantRecipe-add-copy-constructor.patch
rename to patches/api/0409-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0411-More-DragonBattle-API.patch b/patches/api/0410-More-DragonBattle-API.patch
similarity index 100%
rename from patches/api/0411-More-DragonBattle-API.patch
rename to patches/api/0410-More-DragonBattle-API.patch
diff --git a/patches/api/0412-Add-PlayerPickItemEvent.patch b/patches/api/0411-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/api/0412-Add-PlayerPickItemEvent.patch
rename to patches/api/0411-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0413-Allow-trident-custom-damage.patch b/patches/api/0412-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/api/0413-Allow-trident-custom-damage.patch
rename to patches/api/0412-Allow-trident-custom-damage.patch
diff --git a/patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0413-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/api/0414-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/api/0413-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0414-Limit-setBurnTime-to-valid-short-values.patch
similarity index 100%
rename from patches/api/0415-Limit-setBurnTime-to-valid-short-values.patch
rename to patches/api/0414-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0416-Add-OfflinePlayer-isConnected.patch b/patches/api/0415-Add-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/api/0416-Add-OfflinePlayer-isConnected.patch
rename to patches/api/0415-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0416-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/api/0417-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/api/0416-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/api/0418-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/api/0417-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0418-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
similarity index 100%
rename from patches/api/0419-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
rename to patches/api/0418-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0420-Add-player-idle-duration-API.patch b/patches/api/0419-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/api/0420-Add-player-idle-duration-API.patch
rename to patches/api/0419-Add-player-idle-duration-API.patch
diff --git a/patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0420-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/api/0421-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/api/0420-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/api/0422-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/api/0421-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0422-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/api/0423-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/api/0422-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0424-Attribute-Modifier-API-improvements.patch b/patches/api/0423-Attribute-Modifier-API-improvements.patch
similarity index 100%
rename from patches/api/0424-Attribute-Modifier-API-improvements.patch
rename to patches/api/0423-Attribute-Modifier-API-improvements.patch
diff --git a/patches/api/0425-Expand-LingeringPotion-API.patch b/patches/api/0424-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/api/0425-Expand-LingeringPotion-API.patch
rename to patches/api/0424-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
similarity index 100%
rename from patches/api/0426-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
rename to patches/api/0425-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0427-Add-Structure-check-API.patch b/patches/api/0426-Add-Structure-check-API.patch
similarity index 100%
rename from patches/api/0427-Add-Structure-check-API.patch
rename to patches/api/0426-Add-Structure-check-API.patch
diff --git a/patches/api/0428-Experimental-annotations-change.patch b/patches/api/0427-Experimental-annotations-change.patch
similarity index 100%
rename from patches/api/0428-Experimental-annotations-change.patch
rename to patches/api/0427-Experimental-annotations-change.patch
diff --git a/patches/api/0429-Add-more-scoreboard-API.patch b/patches/api/0428-Add-more-scoreboard-API.patch
similarity index 100%
rename from patches/api/0429-Add-more-scoreboard-API.patch
rename to patches/api/0428-Add-more-scoreboard-API.patch
diff --git a/patches/api/0430-Improve-Registry.patch b/patches/api/0429-Improve-Registry.patch
similarity index 100%
rename from patches/api/0430-Improve-Registry.patch
rename to patches/api/0429-Improve-Registry.patch
diff --git a/patches/api/0431-Add-experience-points-API.patch b/patches/api/0430-Add-experience-points-API.patch
similarity index 100%
rename from patches/api/0431-Add-experience-points-API.patch
rename to patches/api/0430-Add-experience-points-API.patch
diff --git a/patches/api/0432-Add-missing-InventoryType.patch b/patches/api/0431-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/api/0432-Add-missing-InventoryType.patch
rename to patches/api/0431-Add-missing-InventoryType.patch
diff --git a/patches/api/0433-Add-drops-to-shear-events.patch b/patches/api/0432-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/api/0433-Add-drops-to-shear-events.patch
rename to patches/api/0432-Add-drops-to-shear-events.patch
diff --git a/patches/api/0434-Add-HiddenPotionEffect-API.patch b/patches/api/0433-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/api/0434-Add-HiddenPotionEffect-API.patch
rename to patches/api/0433-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0435-Add-PlayerShieldDisableEvent.patch b/patches/api/0434-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/api/0435-Add-PlayerShieldDisableEvent.patch
rename to patches/api/0434-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
similarity index 100%
rename from patches/api/0436-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
rename to patches/api/0435-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0437-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0436-Add-BlockStateMeta-clearBlockState.patch
similarity index 100%
rename from patches/api/0437-Add-BlockStateMeta-clearBlockState.patch
rename to patches/api/0436-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0438-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0437-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/api/0438-Expose-LootTable-of-DecoratedPot.patch
rename to patches/api/0437-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0439-Add-ShulkerDuplicateEvent.patch b/patches/api/0438-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/api/0439-Add-ShulkerDuplicateEvent.patch
rename to patches/api/0438-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/api/0440-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/api/0439-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0441-Add-Lifecycle-Event-system.patch b/patches/api/0440-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/api/0441-Add-Lifecycle-Event-system.patch
rename to patches/api/0440-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0442-ItemStack-Tooltip-API.patch b/patches/api/0441-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/api/0442-ItemStack-Tooltip-API.patch
rename to patches/api/0441-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0442-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/api/0443-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/api/0442-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0444-Add-FluidState-API.patch b/patches/api/0443-Add-FluidState-API.patch
similarity index 100%
rename from patches/api/0444-Add-FluidState-API.patch
rename to patches/api/0443-Add-FluidState-API.patch
diff --git a/patches/api/0445-add-number-format-api.patch b/patches/api/0444-add-number-format-api.patch
similarity index 100%
rename from patches/api/0445-add-number-format-api.patch
rename to patches/api/0444-add-number-format-api.patch
diff --git a/patches/api/0446-improve-BanList-types.patch b/patches/api/0445-improve-BanList-types.patch
similarity index 94%
rename from patches/api/0446-improve-BanList-types.patch
rename to patches/api/0445-improve-BanList-types.patch
index bfb2a6a550..0c89e083a6 100644
--- a/patches/api/0446-improve-BanList-types.patch
+++ b/patches/api/0445-improve-BanList-types.patch
@@ -70,10 +70,10 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d5e42f73c 100644
+index 85ad1f7f0de9a6f9048981c3ee509b42ddbeef1a..2d466b308b2f8bd31c50f5d05416eadf20c9cb71 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1663,11 +1663,27 @@ public final class Bukkit {
+@@ -1611,11 +1611,27 @@ public final class Bukkit {
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
@@ -102,10 +102,10 @@ index c8fa12acaf52cd3923a7a8702ccc50cfdc9170a2..e20e4239a5a1f952e1c70e899549989d
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 50ffca9bccfb582d58ccb13f0decf66e5d91aef3..6246251caf2c6f025c824b8e7a944b8d48751fa1 100644
+index 640ef81d204f480f4af83d420c7e968ce569a38d..20750c09d819d62f32491db8672936b929e1098e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -1425,10 +1425,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -1374,10 +1374,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       * @param <T> The ban target
       *
       * @return a ban list of the specified type
diff --git a/patches/api/0447-Suspicious-Effect-Entry-API.patch b/patches/api/0446-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/api/0447-Suspicious-Effect-Entry-API.patch
rename to patches/api/0446-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0448-Fix-DamageSource-API.patch b/patches/api/0447-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/api/0448-Fix-DamageSource-API.patch
rename to patches/api/0447-Fix-DamageSource-API.patch
diff --git a/patches/api/0449-Expanded-Hopper-API.patch b/patches/api/0448-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/api/0449-Expanded-Hopper-API.patch
rename to patches/api/0448-Expanded-Hopper-API.patch
diff --git a/patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch
similarity index 100%
rename from patches/api/0450-Clone-mutables-to-prevent-unexpected-issues.patch
rename to patches/api/0449-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0450-Add-BlockBreakProgressUpdateEvent.patch
similarity index 100%
rename from patches/api/0451-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/api/0450-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0452-Deprecate-ItemStack-setType.patch b/patches/api/0451-Deprecate-ItemStack-setType.patch
similarity index 100%
rename from patches/api/0452-Deprecate-ItemStack-setType.patch
rename to patches/api/0451-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0453-Item-Mutation-Fixes.patch b/patches/api/0452-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/api/0453-Item-Mutation-Fixes.patch
rename to patches/api/0452-Item-Mutation-Fixes.patch
diff --git a/patches/api/0454-API-for-checking-sent-chunks.patch b/patches/api/0453-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/api/0454-API-for-checking-sent-chunks.patch
rename to patches/api/0453-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0455-Add-CartographyItemEvent.patch b/patches/api/0454-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/api/0455-Add-CartographyItemEvent.patch
rename to patches/api/0454-Add-CartographyItemEvent.patch
diff --git a/patches/api/0456-More-Raid-API.patch b/patches/api/0455-More-Raid-API.patch
similarity index 100%
rename from patches/api/0456-More-Raid-API.patch
rename to patches/api/0455-More-Raid-API.patch
diff --git a/patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0456-Fix-SpawnerEntry-Equipment-API.patch
similarity index 100%
rename from patches/api/0457-Fix-SpawnerEntry-Equipment-API.patch
rename to patches/api/0456-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0458-Fix-ItemFlags.patch b/patches/api/0457-Fix-ItemFlags.patch
similarity index 100%
rename from patches/api/0458-Fix-ItemFlags.patch
rename to patches/api/0457-Fix-ItemFlags.patch
diff --git a/patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0458-Allow-modifying-library-loader-jars-bytecode.patch
similarity index 100%
rename from patches/api/0459-Allow-modifying-library-loader-jars-bytecode.patch
rename to patches/api/0458-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0460-Add-hook-to-remap-library-jars.patch b/patches/api/0459-Add-hook-to-remap-library-jars.patch
similarity index 100%
rename from patches/api/0460-Add-hook-to-remap-library-jars.patch
rename to patches/api/0459-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0461-Add-GameMode-isInvulnerable.patch b/patches/api/0460-Add-GameMode-isInvulnerable.patch
similarity index 100%
rename from patches/api/0461-Add-GameMode-isInvulnerable.patch
rename to patches/api/0460-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0462-Expose-hasColor-to-leather-armor.patch b/patches/api/0461-Expose-hasColor-to-leather-armor.patch
similarity index 100%
rename from patches/api/0462-Expose-hasColor-to-leather-armor.patch
rename to patches/api/0461-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0463-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch
similarity index 100%
rename from patches/api/0463-Added-API-to-get-player-ha-proxy-address.patch
rename to patches/api/0462-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0464-More-Chest-Block-API.patch b/patches/api/0463-More-Chest-Block-API.patch
similarity index 100%
rename from patches/api/0464-More-Chest-Block-API.patch
rename to patches/api/0463-More-Chest-Block-API.patch
diff --git a/patches/api/0465-Brigadier-based-command-API.patch b/patches/api/0464-Brigadier-based-command-API.patch
similarity index 100%
rename from patches/api/0465-Brigadier-based-command-API.patch
rename to patches/api/0464-Brigadier-based-command-API.patch
diff --git a/patches/api/0466-Fix-issues-with-recipe-API.patch b/patches/api/0465-Fix-issues-with-recipe-API.patch
similarity index 100%
rename from patches/api/0466-Fix-issues-with-recipe-API.patch
rename to patches/api/0465-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0467-Fix-equipment-slot-and-group-API.patch b/patches/api/0466-Fix-equipment-slot-and-group-API.patch
similarity index 100%
rename from patches/api/0467-Fix-equipment-slot-and-group-API.patch
rename to patches/api/0466-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/api/0468-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
similarity index 100%
rename from patches/api/0468-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
rename to patches/api/0467-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0469-General-ItemMeta-fixes.patch b/patches/api/0468-General-ItemMeta-fixes.patch
similarity index 100%
rename from patches/api/0469-General-ItemMeta-fixes.patch
rename to patches/api/0468-General-ItemMeta-fixes.patch
diff --git a/patches/api/0470-Add-missing-fishing-event-state.patch b/patches/api/0469-Add-missing-fishing-event-state.patch
similarity index 100%
rename from patches/api/0470-Add-missing-fishing-event-state.patch
rename to patches/api/0469-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0471-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0470-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
similarity index 100%
rename from patches/api/0471-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
rename to patches/api/0470-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/api/0472-Registry-Modification-API.patch b/patches/api/0471-Registry-Modification-API.patch
similarity index 100%
rename from patches/api/0472-Registry-Modification-API.patch
rename to patches/api/0471-Registry-Modification-API.patch
diff --git a/patches/api/0473-Introduce-registry-entry-and-builders.patch b/patches/api/0472-Introduce-registry-entry-and-builders.patch
similarity index 100%
rename from patches/api/0473-Introduce-registry-entry-and-builders.patch
rename to patches/api/0472-Introduce-registry-entry-and-builders.patch
diff --git a/patches/api/0474-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0473-Proxy-ItemStack-to-CraftItemStack.patch
similarity index 100%
rename from patches/api/0474-Proxy-ItemStack-to-CraftItemStack.patch
rename to patches/api/0473-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/api/0475-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
similarity index 100%
rename from patches/api/0475-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
rename to patches/api/0474-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/api/0476-Fix-HelpCommand-searching.patch b/patches/api/0475-Fix-HelpCommand-searching.patch
similarity index 100%
rename from patches/api/0476-Fix-HelpCommand-searching.patch
rename to patches/api/0475-Fix-HelpCommand-searching.patch
diff --git a/patches/api/0477-add-Plugin-getDataPath.patch b/patches/api/0476-add-Plugin-getDataPath.patch
similarity index 100%
rename from patches/api/0477-add-Plugin-getDataPath.patch
rename to patches/api/0476-add-Plugin-getDataPath.patch
diff --git a/patches/api/0478-Fix-PickupStatus-getting-reset.patch b/patches/api/0477-Fix-PickupStatus-getting-reset.patch
similarity index 100%
rename from patches/api/0478-Fix-PickupStatus-getting-reset.patch
rename to patches/api/0477-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/api/0479-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/api/0479-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/api/0478-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0480-Improve-StandardMessenger-exception-messages.patch b/patches/api/0479-Improve-StandardMessenger-exception-messages.patch
similarity index 100%
rename from patches/api/0480-Improve-StandardMessenger-exception-messages.patch
rename to patches/api/0479-Improve-StandardMessenger-exception-messages.patch
diff --git a/patches/api/0481-Add-even-more-Enchantment-API.patch b/patches/api/0480-Add-even-more-Enchantment-API.patch
similarity index 100%
rename from patches/api/0481-Add-even-more-Enchantment-API.patch
rename to patches/api/0480-Add-even-more-Enchantment-API.patch
diff --git a/patches/api/0482-Leashable-API.patch b/patches/api/0481-Leashable-API.patch
similarity index 100%
rename from patches/api/0482-Leashable-API.patch
rename to patches/api/0481-Leashable-API.patch
diff --git a/patches/api/0483-Add-enchantment-seed-update-API.patch b/patches/api/0482-Add-enchantment-seed-update-API.patch
similarity index 100%
rename from patches/api/0483-Add-enchantment-seed-update-API.patch
rename to patches/api/0482-Add-enchantment-seed-update-API.patch
diff --git a/patches/api/0484-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
similarity index 100%
rename from patches/api/0484-Deprecate-for-removal-all-OldEnum-related-methods.patch
rename to patches/api/0483-Deprecate-for-removal-all-OldEnum-related-methods.patch
diff --git a/patches/api/0485-Add-FeatureFlag-API.patch b/patches/api/0484-Add-FeatureFlag-API.patch
similarity index 100%
rename from patches/api/0485-Add-FeatureFlag-API.patch
rename to patches/api/0484-Add-FeatureFlag-API.patch
diff --git a/patches/api/0486-Tag-Lifecycle-Events.patch b/patches/api/0485-Tag-Lifecycle-Events.patch
similarity index 100%
rename from patches/api/0486-Tag-Lifecycle-Events.patch
rename to patches/api/0485-Tag-Lifecycle-Events.patch
diff --git a/patches/api/0487-Item-serialization-as-json.patch b/patches/api/0486-Item-serialization-as-json.patch
similarity index 100%
rename from patches/api/0487-Item-serialization-as-json.patch
rename to patches/api/0486-Item-serialization-as-json.patch
diff --git a/patches/api/0488-create-TileStateInventoryHolder.patch b/patches/api/0487-create-TileStateInventoryHolder.patch
similarity index 100%
rename from patches/api/0488-create-TileStateInventoryHolder.patch
rename to patches/api/0487-create-TileStateInventoryHolder.patch
diff --git a/patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch b/patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch
similarity index 100%
rename from patches/api/0489-Add-enchantWithLevels-with-enchantment-registry-set.patch
rename to patches/api/0488-Add-enchantWithLevels-with-enchantment-registry-set.patch
diff --git a/patches/api/0490-Improve-entity-effect-API.patch b/patches/api/0489-Improve-entity-effect-API.patch
similarity index 100%
rename from patches/api/0490-Improve-entity-effect-API.patch
rename to patches/api/0489-Improve-entity-effect-API.patch
diff --git a/patches/api/0491-Add-recipeBrewTime.patch b/patches/api/0490-Add-recipeBrewTime.patch
similarity index 100%
rename from patches/api/0491-Add-recipeBrewTime.patch
rename to patches/api/0490-Add-recipeBrewTime.patch
diff --git a/patches/api/0492-Add-PlayerInsertLecternBookEvent.patch b/patches/api/0491-Add-PlayerInsertLecternBookEvent.patch
similarity index 100%
rename from patches/api/0492-Add-PlayerInsertLecternBookEvent.patch
rename to patches/api/0491-Add-PlayerInsertLecternBookEvent.patch
diff --git a/patches/api/0493-Void-damage-configuration-API.patch b/patches/api/0492-Void-damage-configuration-API.patch
similarity index 100%
rename from patches/api/0493-Void-damage-configuration-API.patch
rename to patches/api/0492-Void-damage-configuration-API.patch
diff --git a/patches/api/0494-Add-Offline-PDC-API.patch b/patches/api/0493-Add-Offline-PDC-API.patch
similarity index 100%
rename from patches/api/0494-Add-Offline-PDC-API.patch
rename to patches/api/0493-Add-Offline-PDC-API.patch
diff --git a/patches/api/0495-Add-AnvilView-bypassEnchantmentLevelRestriction.patch b/patches/api/0494-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
similarity index 100%
rename from patches/api/0495-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
rename to patches/api/0494-Add-AnvilView-bypassEnchantmentLevelRestriction.patch
diff --git a/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
index 636f3d2440..a8f124b458 100644
--- a/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
+++ b/patches/server/0969-Fix-removing-recipes-from-RecipeIterator.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Fix removing recipes from RecipeIterator
 public net.minecraft.world.item.crafting.RecipeManager byName
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
-index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..39d2d67bf478beb4c72e41e6f59337893cf47e69 100644
+index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..ca0c82fdd7bd1c2055e84253d90b17857c51b771 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/RecipeIterator.java
 @@ -9,6 +9,7 @@ import org.bukkit.inventory.Recipe;
@@ -18,7 +18,7 @@ index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..39d2d67bf478beb4c72e41e6f5933789
  
      public RecipeIterator() {
          this.recipes = MinecraftServer.getServer().getRecipeManager().recipes.byType.entries().iterator();
-@@ -21,11 +22,19 @@ public class RecipeIterator implements Iterator<Recipe> {
+@@ -21,11 +22,17 @@ public class RecipeIterator implements Iterator<Recipe> {
  
      @Override
      public Recipe next() {
@@ -32,9 +32,7 @@ index 4e0f7564f04d5d566660a2623fb1b325e3b4e67c..39d2d67bf478beb4c72e41e6f5933789
      @Override
      public void remove() {
 +        // Paper start - fix removing recipes from RecipeIterator
-+        if (this.currentRecipe instanceof org.bukkit.Keyed keyed) {
-+            MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey()));
-+        }
++        if (true) throw new UnsupportedOperationException();
 +        // Paper end - fix removing recipes from RecipeIterator
          this.recipes.remove();
      }
diff --git a/patches/unapplied/server/1008-API-for-checking-sent-chunks.patch b/patches/server/1039-API-for-checking-sent-chunks.patch
similarity index 66%
rename from patches/unapplied/server/1008-API-for-checking-sent-chunks.patch
rename to patches/server/1039-API-for-checking-sent-chunks.patch
index 1ff508b727..7f0201844b 100644
--- a/patches/unapplied/server/1008-API-for-checking-sent-chunks.patch
+++ b/patches/server/1039-API-for-checking-sent-chunks.patch
@@ -4,26 +4,11 @@ Date: Mon, 8 Apr 2024 16:43:16 +0200
 Subject: [PATCH] API for checking sent chunks
 
 
-diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
-index 852d75a73dae7448cbe1e2f5e164b235efa8a969..a608f57ebca98eda88ad749d0aad021678be54f9 100644
---- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
-+++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java
-@@ -1078,5 +1078,10 @@ public final class RegionizedPlayerChunkLoader {
- 
-             // now all tickets should be removed, which is all of our external state
-         }
-+
-+        // For external checks
-+        public it.unimi.dsi.fastutil.longs.LongOpenHashSet getSentChunksRaw() {
-+            return this.sentChunks;
-+        }
-     }
- }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e02fa642f11809607e30e22b51c65373edd70842..ad740739437be632fc7fedec488a7d0c49534688 100644
+index ed29e06422aa5e73adfaf9578cda3dfc5777f64c..550e175c7fec97818644933a4e4f7805e54d7d5f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3483,6 +3483,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -3518,6 +3518,35 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/unapplied/server/1022-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
similarity index 88%
rename from patches/unapplied/server/1022-Fix-CraftWorld-isChunkGenerated.patch
rename to patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
index c402325cb5..a1a60d71b0 100644
--- a/patches/unapplied/server/1022-Fix-CraftWorld-isChunkGenerated.patch
+++ b/patches/server/1040-Fix-CraftWorld-isChunkGenerated.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix CraftWorld#isChunkGenerated
 The upstream implementation is returning true for non-full chunks.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 8221597951c5e768fa8af23adc1a57871c76f3a6..90d4834f97d3ba996d46493246b1947511553424 100644
+index 2058671a77cac4cfa6494461a5142abae14402b6..d41c81158c00931e6b11093cce141f6a3085ba05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -372,11 +372,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -417,11 +417,28 @@ public class CraftWorld extends CraftRegionAccessor implements World {
  
      @Override
      public boolean isChunkGenerated(int x, int z) {
@@ -29,7 +29,7 @@ index 8221597951c5e768fa8af23adc1a57871c76f3a6..90d4834f97d3ba996d46493246b19475
          }
 +        final java.util.concurrent.CompletableFuture<ChunkAccess> future = new java.util.concurrent.CompletableFuture<>();
 +        ca.spottedleaf.moonrise.common.util.ChunkSystem.scheduleChunkLoad(
-+            this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL, future::complete
++            this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.util.Priority.NORMAL, future::complete
 +        );
 +        world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone);
 +        return future.thenApply(c -> {
diff --git a/patches/api/0400-API-for-updating-recipes-on-clients.patch b/patches/unapplied/api/0400-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/api/0400-API-for-updating-recipes-on-clients.patch
rename to patches/unapplied/api/0400-API-for-updating-recipes-on-clients.patch