From 57dfcdf4ebc4b677565fbeb4207c47e16f664d71 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Wed, 8 Jun 2022 18:13:02 +0200
Subject: [PATCH] Reorder some patches

---
 ...d-Git-information-to-version-command-on-startup.patch} | 2 +-
 ...thfinding-API.patch => 0151-Mob-Pathfinding-API.patch} | 0
 ...an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} | 0
 ...ormance-Concurrency-Improvements-to-Permissions.patch} | 0
 ...tch => 0154-Add-ItemStackRecipeChoice-Draft-API.patch} | 0
 ...155-Implement-furnace-cook-speed-multiplier-API.patch} | 0
 ...-additions.patch => 0156-Material-API-additions.patch} | 0
 ...d-Material-Tags.patch => 0157-Add-Material-Tags.patch} | 0
 ...erSpawnEvent.patch => 0158-PreSpawnerSpawnEvent.patch} | 0
 ....patch => 0159-Add-LivingEntity-getTargetEntity.patch} | 0
 ...n-related-API.patch => 0160-Add-sun-related-API.patch} | 0
 .../api/{0160-Turtle-API.patch => 0161-Turtle-API.patch}  | 0
 ...vents.patch => 0162-Add-spectator-target-events.patch} | 0
 ...more-Witch-API.patch => 0163-Add-more-Witch-API.patch} | 0
 ...ake-the-default-permission-message-configurable.patch} | 4 ++--
 ...rt-cancellation-supression-of-EntityDismount-Ve.patch} | 0
 ...re-Zombie-API.patch => 0166-Add-more-Zombie-API.patch} | 0
 ...hange-the-reserved-channel-check-to-be-sensible.patch} | 0
 ...nt.patch => 0168-Add-PlayerConnectionCloseEvent.patch} | 0
 ...Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} | 0
 ...=> 0170-Add-ItemStack-Recipe-API-helper-methods.patch} | 0
 ...ockDestroyEvent.patch => 0171-BlockDestroyEvent.patch} | 0
 ...gleEvent.patch => 0172-Add-WhitelistToggleEvent.patch} | 0
 ...4-Query-event.patch => 0173-Add-GS4-Query-event.patch} | 0
 ...nEvent.patch => 0174-Add-PlayerPostRespawnEvent.patch} | 0
 ...eason.patch => 0175-Entity-getEntitySpawnReason.patch} | 0
 ...es.patch => 0176-Fix-Spigot-annotation-mistakes.patch} | 8 ++++----
 ...er-Tick-Events.patch => 0177-Server-Tick-Events.patch} | 0
 ...p.patch => 0178-PlayerDeathEvent-getItemsToKeep.patch} | 0
 ...d-Heightmap-API.patch => 0179-Add-Heightmap-API.patch} | 0
 ...ents.patch => 0180-Mob-Spawner-API-Enhancements.patch} | 0
 ...ace.patch => 0181-Add-BlockSoundGroup-interface.patch} | 0
 ...-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch} | 0
 ...83-Increase-custom-payload-channel-message-size.patch} | 0
 ....patch => 0184-Expose-the-internal-current-tick.patch} | 4 ++--
 ...h => 0185-PlayerDeathEvent-shouldDropExperience.patch} | 0
 ...tch => 0186-Add-effect-to-block-break-naturally.patch} | 0
 ...atchEvent.patch => 0187-Add-ThrownEggHatchEvent.patch} | 0
 ...7-Entity-Jump-API.patch => 0188-Entity-Jump-API.patch} | 0
 ....patch => 0189-add-hand-to-BlockMultiPlaceEvent.patch} | 0
 ...tick-times-API.patch => 0190-Add-tick-times-API.patch} | 4 ++--
 ....patch => 0191-Expose-MinecraftServer-isRunning.patch} | 4 ++--
 ...ch => 0192-Add-Raw-Byte-ItemStack-Serialization.patch} | 0
 ...le-Sync-Events-firing-Async-errors-during-shutd.patch} | 0
 ...patch => 0194-Make-JavaPluginLoader-thread-safe.patch} | 0
 ...API.patch => 0195-Add-Player-Client-Options-API.patch} | 0
 ...> 0196-Add-PlayerAttackEntityCooldownResetEvent.patch} | 0
 ...otion-toItemStack-swapping-the-extended-and-upg.patch} | 0
 ...patch => 0198-Add-item-slot-convenience-methods.patch} | 0
 ...estocks-API.patch => 0199-Villager-Restocks-API.patch} | 0
 ...-game-version.patch => 0200-Expose-game-version.patch} | 4 ++--
 ...Add-Mob-Goal-API.patch => 0201-Add-Mob-Goal-API.patch} | 4 ++--
 ...n-API.patch => 0202-Add-villager-reputation-API.patch} | 0
 ...Spawn-Reason-API.patch => 0203-Spawn-Reason-API.patch} | 0
 ...tential-bed-API.patch => 0204-Potential-bed-API.patch} | 0
 ...h => 0205-Prioritise-own-classes-where-possible.patch} | 0
 ...206-Provide-a-useful-PluginClassLoader-toString.patch} | 0
 ...ventory-getHolder-method-without-block-snapshot.patch} | 0
 ...prove-Arrow-API.patch => 0208-Improve-Arrow-API.patch} | 0
 ...09-Add-and-implement-PlayerRecipeBookClickEvent.patch} | 0
 ...ta.patch => 0210-Support-components-in-ItemMeta.patch} | 0
 ...added-2-new-TargetReasons-for-1.16-mob-behavior.patch} | 0
 ...-liquid-API.patch => 0212-Add-entity-liquid-API.patch} | 0
 ...3-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch} | 0
 ...{0218-Brand-support.patch => 0214-Brand-support.patch} | 0
 ...tch => 0215-Support-hex-colors-in-getLastColors.patch} | 0
 ...Players-API.patch => 0216-Add-setMaxPlayers-API.patch} | 4 ++--
 ...moon-phase-API.patch => 0218-Add-moon-phase-API.patch} | 0
 ...219-Add-playPickupItemAnimation-to-LivingEntity.patch} | 0
 ...re-Evoker-API.patch => 0220-Add-more-Evoker-API.patch} | 0
 ...tch => 0221-Add-methods-to-get-translation-keys.patch} | 0
 ...=> 0222-Create-HoverEvent-from-ItemStack-Entity.patch} | 0
 ...dd-additional-open-container-api-to-HumanEntity.patch} | 0
 ...e-the-Entity-Counter-to-allow-plugins-to-use-va.patch} | 0
 ...Entity-isTicking.patch => 0225-Entity-isTicking.patch} | 0
 ...fy-the-Javadocs-for-Entity.getEntitySpawnReason.patch} | 0
 ...-resetOffers.patch => 0227-Villager-resetOffers.patch} | 0
 ...boost-API.patch => 0228-Player-elytra-boost-API.patch} | 0
 ...tch => 0229-Add-getOfflinePlayerIfCached-String.patch} | 4 ++--
 ...unts-API.patch => 0230-Add-ignore-discounts-API.patch} | 0
 ...ckup.patch => 0231-Item-no-age-no-player-pickup.patch} | 0
 ...s.patch => 0232-Beacon-API-custom-effect-ranges.patch} | 0
 ...it-reason.patch => 0233-Add-API-for-quit-reason.patch} | 0
 ...y-Speed-API.patch => 0234-Add-Destroy-Speed-API.patch} | 0
 ....patch => 0235-Add-LivingEntity-clearActiveItem.patch} | 0
 ...Event.patch => 0236-Add-PlayerItemCooldownEvent.patch} | 0
 ...-lightning-API.patch => 0237-More-lightning-API.patch} | 0
 ...ckEvent.patch => 0238-Add-PlayerShearBlockEvent.patch} | 0
 ....patch => 0239-Enable-multi-release-plugin-jars.patch} | 0
 ...s.patch => 0240-Player-Chunk-Load-Unload-Events.patch} | 0
 ...atch => 0241-Expose-LivingEntity-hurt-direction.patch} | 0
 ...=> 0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} | 0
 ...TradeEvent.patch => 0243-Added-PlayerTradeEvent.patch} | 0
 ...tEvent-API.patch => 0244-Add-TargetHitEvent-API.patch} | 0
 ...s.patch => 0245-Additional-Block-Material-API-s.patch} | 0
 ...dd-API-to-get-Material-from-Boats-and-Minecarts.patch} | 0
 ...atch => 0247-Add-PlayerFlowerPotManipulateEvent.patch} | 0
 ...g-doors.patch => 0248-Zombie-API-breaking-doors.patch} | 0
 ...Event.patch => 0249-Add-EntityLoadCrossbowEvent.patch} | 0
 ...nt.patch => 0250-Added-WorldGameRuleChangeEvent.patch} | 0
 ...atch => 0251-Added-ServerResourcesReloadedEvent.patch} | 0
 ...vent.patch => 0252-Add-BlockFailedDispenseEvent.patch} | 0
 ...atch => 0253-Added-PlayerLecternPageChangeEvent.patch} | 0
 ...atch => 0254-Added-PlayerLoomPatternSelectEvent.patch} | 0
 ...PI-to-get-exact-interaction-point-in-PlayerInte.patch} | 0
 ...ndOpLevel-API.patch => 0256-Add-sendOpLevel-API.patch} | 0
 ...d-PaperRegistry.patch => 0257-Add-PaperRegistry.patch} | 0
 ...teEvent.patch => 0258-Add-StructuresLocateEvent.patch} | 0
 ...n-chat-component-with-empty-text-instead-of-thr.patch} | 0
 ...seEvent.patch => 0260-Add-BlockPreDispenseEvent.patch} | 0
 ...ty-Tags.patch => 0261-Added-Vanilla-Entity-Tags.patch} | 0
 ...tch => 0262-Added-PlayerChangeBeaconEffectEvent.patch} | 0
 ...> 0263-Added-PlayerStonecutterRecipeSelectEvent.patch} | 0
 ...64-Add-dropLeash-variable-to-EntityUnleashEvent.patch} | 0
 ...gFormEvent.patch => 0265-add-DragonEggFormEvent.patch} | 0
 ...5-EntityMoveEvent.patch => 0266-EntityMoveEvent.patch} | 0
 ...> 0267-Allow-adding-items-to-BlockDropItemEvent.patch} | 0
 ...68-Add-getMainThreadExecutor-to-BukkitScheduler.patch} | 0
 ...0269-living-entity-allow-attribute-registration.patch} | 0
 ...ssing-effects.patch => 0270-Add-missing-effects.patch} | 0
 ...ed-Players.patch => 0271-Expose-Tracked-Players.patch} | 0
 ...ch => 0272-Cache-the-result-of-Material-isBlock.patch} | 0
 ...der-events.patch => 0273-Add-worldborder-events.patch} | 0
 ...Event.patch => 0274-added-PlayerNameEntityEvent.patch} | 0
 ...-events.patch => 0275-Add-recipe-to-cook-events.patch} | 0
 ...isValidTool.patch => 0276-Add-Block-isValidTool.patch} | 0
 ...orld-key-API.patch => 0277-Expand-world-key-API.patch} | 4 ++--
 ...7-Item-Rarity-API.patch => 0278-Item-Rarity-API.patch} | 0
 ...l-version.patch => 0279-Expose-protocol-version.patch} | 0
 ...-for-Component-suggestion-tooltips-in-AsyncTabC.patch} | 2 +-
 ...tch => 0281-add-isDeeplySleeping-to-HumanEntity.patch} | 0
 ...tch => 0282-add-consumeFuel-to-FurnaceBurnEvent.patch} | 0
 ...0283-add-get-set-drop-chance-to-EntityEquipment.patch} | 0
 ...pEvent.patch => 0284-Added-PlayerDeepSleepEvent.patch} | 0
 ...284-More-World-API.patch => 0285-More-World-API.patch} | 0
 ...ent.patch => 0286-Added-PlayerBedFailEnterEvent.patch} | 0
 ...Introduce-beacon-activation-deactivation-events.patch} | 0
 ...ents.patch => 0288-PlayerMoveEvent-Improvements.patch} | 0
 ... => 0289-add-RespawnFlags-to-PlayerRespawnEvent.patch} | 0
 ...-API.patch => 0290-Add-more-WanderingTrader-API.patch} | 0
 ...ch => 0291-Add-EntityBlockStorage-clearEntities.patch} | 0
 ...Adventure-message-to-PlayerAdvancementDoneEvent.patch} | 0
 ...293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} | 0
 ...3-Inventory-close.patch => 0294-Inventory-close.patch} | 0
 ...-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} | 0
 ...tapack-API.patch => 0296-Add-basic-Datapack-API.patch} | 4 ++--
 ... => 0297-additions-to-PlayerGameModeChangeEvent.patch} | 0
 ...ck-API.patch => 0298-ItemStack-repair-check-API.patch} | 0
 ...hantment-API.patch => 0299-More-Enchantment-API.patch} | 0
 ...00-List-all-missing-hard-depends-not-just-first.patch} | 0
 ...Mob-lookAt-API.patch => 0301-Add-Mob-lookAt-API.patch} | 0
 ...Stack-editMeta.patch => 0302-ItemStack-editMeta.patch} | 0
 ...kEvent.patch => 0303-Add-EntityInsideBlockEvent.patch} | 0
 ....patch => 0304-Attributes-API-for-item-defaults.patch} | 0
 ...> 0305-Add-cause-to-Weather-ThunderChangeEvents.patch} | 0
 ...d-Block-API.patch => 0306-More-Lidded-Block-API.patch} | 0
 ...causes.patch => 0307-Add-PlayerKickEvent-causes.patch} | 0
 ...nt.patch => 0308-Add-PufferFishStateChangeEvent.patch} | 0
 ...erEvent.patch => 0309-Add-BellRevealRaiderEvent.patch} | 0
 ....patch => 0310-Add-ElderGuardianAppearanceEvent.patch} | 0
 ...ds.patch => 0311-Add-more-line-of-sight-methods.patch} | 0
 ...on-API.patch => 0312-Add-more-LimitedRegion-API.patch} | 0
 ...r-API.patch => 0313-Missing-Entity-Behavior-API.patch} | 0
 .../0355-Implement-alternative-item-despawn-rate.patch    | 4 ++--
 164 files changed, 28 insertions(+), 28 deletions(-)
 rename patches/api/{0313-Add-Git-information-to-version-command-on-startup.patch => 0150-Add-Git-information-to-version-command-on-startup.patch} (98%)
 rename patches/api/{0150-Mob-Pathfinding-API.patch => 0151-Mob-Pathfinding-API.patch} (100%)
 rename patches/api/{0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename patches/api/{0152-Performance-Concurrency-Improvements-to-Permissions.patch => 0153-Performance-Concurrency-Improvements-to-Permissions.patch} (100%)
 rename patches/api/{0153-Add-ItemStackRecipeChoice-Draft-API.patch => 0154-Add-ItemStackRecipeChoice-Draft-API.patch} (100%)
 rename patches/api/{0154-Implement-furnace-cook-speed-multiplier-API.patch => 0155-Implement-furnace-cook-speed-multiplier-API.patch} (100%)
 rename patches/api/{0155-Material-API-additions.patch => 0156-Material-API-additions.patch} (100%)
 rename patches/api/{0156-Add-Material-Tags.patch => 0157-Add-Material-Tags.patch} (100%)
 rename patches/api/{0157-PreSpawnerSpawnEvent.patch => 0158-PreSpawnerSpawnEvent.patch} (100%)
 rename patches/api/{0158-Add-LivingEntity-getTargetEntity.patch => 0159-Add-LivingEntity-getTargetEntity.patch} (100%)
 rename patches/api/{0159-Add-sun-related-API.patch => 0160-Add-sun-related-API.patch} (100%)
 rename patches/api/{0160-Turtle-API.patch => 0161-Turtle-API.patch} (100%)
 rename patches/api/{0161-Add-spectator-target-events.patch => 0162-Add-spectator-target-events.patch} (100%)
 rename patches/api/{0162-Add-more-Witch-API.patch => 0163-Add-more-Witch-API.patch} (100%)
 rename patches/api/{0163-Make-the-default-permission-message-configurable.patch => 0164-Make-the-default-permission-message-configurable.patch} (95%)
 rename patches/api/{0164-Support-cancellation-supression-of-EntityDismount-Ve.patch => 0165-Support-cancellation-supression-of-EntityDismount-Ve.patch} (100%)
 rename patches/api/{0165-Add-more-Zombie-API.patch => 0166-Add-more-Zombie-API.patch} (100%)
 rename patches/api/{0166-Change-the-reserved-channel-check-to-be-sensible.patch => 0167-Change-the-reserved-channel-check-to-be-sensible.patch} (100%)
 rename patches/api/{0167-Add-PlayerConnectionCloseEvent.patch => 0168-Add-PlayerConnectionCloseEvent.patch} (100%)
 rename patches/api/{0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch => 0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch} (100%)
 rename patches/api/{0169-Add-ItemStack-Recipe-API-helper-methods.patch => 0170-Add-ItemStack-Recipe-API-helper-methods.patch} (100%)
 rename patches/api/{0170-BlockDestroyEvent.patch => 0171-BlockDestroyEvent.patch} (100%)
 rename patches/api/{0171-Add-WhitelistToggleEvent.patch => 0172-Add-WhitelistToggleEvent.patch} (100%)
 rename patches/api/{0172-Add-GS4-Query-event.patch => 0173-Add-GS4-Query-event.patch} (100%)
 rename patches/api/{0173-Add-PlayerPostRespawnEvent.patch => 0174-Add-PlayerPostRespawnEvent.patch} (100%)
 rename patches/api/{0174-Entity-getEntitySpawnReason.patch => 0175-Entity-getEntitySpawnReason.patch} (100%)
 rename patches/api/{0175-Fix-Spigot-annotation-mistakes.patch => 0176-Fix-Spigot-annotation-mistakes.patch} (99%)
 rename patches/api/{0176-Server-Tick-Events.patch => 0177-Server-Tick-Events.patch} (100%)
 rename patches/api/{0177-PlayerDeathEvent-getItemsToKeep.patch => 0178-PlayerDeathEvent-getItemsToKeep.patch} (100%)
 rename patches/api/{0178-Add-Heightmap-API.patch => 0179-Add-Heightmap-API.patch} (100%)
 rename patches/api/{0179-Mob-Spawner-API-Enhancements.patch => 0180-Mob-Spawner-API-Enhancements.patch} (100%)
 rename patches/api/{0180-Add-BlockSoundGroup-interface.patch => 0181-Add-BlockSoundGroup-interface.patch} (100%)
 rename patches/api/{0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch => 0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch} (100%)
 rename patches/api/{0182-Increase-custom-payload-channel-message-size.patch => 0183-Increase-custom-payload-channel-message-size.patch} (100%)
 rename patches/api/{0183-Expose-the-internal-current-tick.patch => 0184-Expose-the-internal-current-tick.patch} (90%)
 rename patches/api/{0184-PlayerDeathEvent-shouldDropExperience.patch => 0185-PlayerDeathEvent-shouldDropExperience.patch} (100%)
 rename patches/api/{0185-Add-effect-to-block-break-naturally.patch => 0186-Add-effect-to-block-break-naturally.patch} (100%)
 rename patches/api/{0186-Add-ThrownEggHatchEvent.patch => 0187-Add-ThrownEggHatchEvent.patch} (100%)
 rename patches/api/{0187-Entity-Jump-API.patch => 0188-Entity-Jump-API.patch} (100%)
 rename patches/api/{0188-add-hand-to-BlockMultiPlaceEvent.patch => 0189-add-hand-to-BlockMultiPlaceEvent.patch} (100%)
 rename patches/api/{0189-Add-tick-times-API.patch => 0190-Add-tick-times-API.patch} (92%)
 rename patches/api/{0190-Expose-MinecraftServer-isRunning.patch => 0191-Expose-MinecraftServer-isRunning.patch} (91%)
 rename patches/api/{0191-Add-Raw-Byte-ItemStack-Serialization.patch => 0192-Add-Raw-Byte-ItemStack-Serialization.patch} (100%)
 rename patches/api/{0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch => 0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch} (100%)
 rename patches/api/{0193-Make-JavaPluginLoader-thread-safe.patch => 0194-Make-JavaPluginLoader-thread-safe.patch} (100%)
 rename patches/api/{0194-Add-Player-Client-Options-API.patch => 0195-Add-Player-Client-Options-API.patch} (100%)
 rename patches/api/{0195-Add-PlayerAttackEntityCooldownResetEvent.patch => 0196-Add-PlayerAttackEntityCooldownResetEvent.patch} (100%)
 rename patches/api/{0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch => 0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch} (100%)
 rename patches/api/{0197-Add-item-slot-convenience-methods.patch => 0198-Add-item-slot-convenience-methods.patch} (100%)
 rename patches/api/{0198-Villager-Restocks-API.patch => 0199-Villager-Restocks-API.patch} (100%)
 rename patches/api/{0199-Expose-game-version.patch => 0200-Expose-game-version.patch} (92%)
 rename patches/api/{0200-Add-Mob-Goal-API.patch => 0201-Add-Mob-Goal-API.patch} (99%)
 rename patches/api/{0201-Add-villager-reputation-API.patch => 0202-Add-villager-reputation-API.patch} (100%)
 rename patches/api/{0202-Spawn-Reason-API.patch => 0203-Spawn-Reason-API.patch} (100%)
 rename patches/api/{0203-Potential-bed-API.patch => 0204-Potential-bed-API.patch} (100%)
 rename patches/api/{0204-Prioritise-own-classes-where-possible.patch => 0205-Prioritise-own-classes-where-possible.patch} (100%)
 rename patches/api/{0205-Provide-a-useful-PluginClassLoader-toString.patch => 0206-Provide-a-useful-PluginClassLoader-toString.patch} (100%)
 rename patches/api/{0206-Inventory-getHolder-method-without-block-snapshot.patch => 0207-Inventory-getHolder-method-without-block-snapshot.patch} (100%)
 rename patches/api/{0207-Improve-Arrow-API.patch => 0208-Improve-Arrow-API.patch} (100%)
 rename patches/api/{0208-Add-and-implement-PlayerRecipeBookClickEvent.patch => 0209-Add-and-implement-PlayerRecipeBookClickEvent.patch} (100%)
 rename patches/api/{0209-Support-components-in-ItemMeta.patch => 0210-Support-components-in-ItemMeta.patch} (100%)
 rename patches/api/{0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch => 0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch} (100%)
 rename patches/api/{0211-Add-entity-liquid-API.patch => 0212-Add-entity-liquid-API.patch} (100%)
 rename patches/api/{0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch => 0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch} (100%)
 rename patches/api/{0218-Brand-support.patch => 0214-Brand-support.patch} (100%)
 rename patches/api/{0213-Support-hex-colors-in-getLastColors.patch => 0215-Support-hex-colors-in-getLastColors.patch} (100%)
 rename patches/api/{0214-Add-setMaxPlayers-API.patch => 0216-Add-setMaxPlayers-API.patch} (91%)
 rename patches/api/{0215-Add-moon-phase-API.patch => 0218-Add-moon-phase-API.patch} (100%)
 rename patches/api/{0216-Add-playPickupItemAnimation-to-LivingEntity.patch => 0219-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/api/{0219-Add-more-Evoker-API.patch => 0220-Add-more-Evoker-API.patch} (100%)
 rename patches/api/{0220-Add-methods-to-get-translation-keys.patch => 0221-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/api/{0221-Create-HoverEvent-from-ItemStack-Entity.patch => 0222-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/api/{0222-Add-additional-open-container-api-to-HumanEntity.patch => 0223-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/api/{0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/api/{0224-Entity-isTicking.patch => 0225-Entity-isTicking.patch} (100%)
 rename patches/api/{0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch => 0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch} (100%)
 rename patches/api/{0226-Villager-resetOffers.patch => 0227-Villager-resetOffers.patch} (100%)
 rename patches/api/{0227-Player-elytra-boost-API.patch => 0228-Player-elytra-boost-API.patch} (100%)
 rename patches/api/{0228-Add-getOfflinePlayerIfCached-String.patch => 0229-Add-getOfflinePlayerIfCached-String.patch} (94%)
 rename patches/api/{0229-Add-ignore-discounts-API.patch => 0230-Add-ignore-discounts-API.patch} (100%)
 rename patches/api/{0230-Item-no-age-no-player-pickup.patch => 0231-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/api/{0231-Beacon-API-custom-effect-ranges.patch => 0232-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/api/{0232-Add-API-for-quit-reason.patch => 0233-Add-API-for-quit-reason.patch} (100%)
 rename patches/api/{0233-Add-Destroy-Speed-API.patch => 0234-Add-Destroy-Speed-API.patch} (100%)
 rename patches/api/{0234-Add-LivingEntity-clearActiveItem.patch => 0235-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/api/{0235-Add-PlayerItemCooldownEvent.patch => 0236-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/api/{0236-More-lightning-API.patch => 0237-More-lightning-API.patch} (100%)
 rename patches/api/{0237-Add-PlayerShearBlockEvent.patch => 0238-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/api/{0238-Enable-multi-release-plugin-jars.patch => 0239-Enable-multi-release-plugin-jars.patch} (100%)
 rename patches/api/{0239-Player-Chunk-Load-Unload-Events.patch => 0240-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/api/{0240-Expose-LivingEntity-hurt-direction.patch => 0241-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/api/{0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/api/{0242-Added-PlayerTradeEvent.patch => 0243-Added-PlayerTradeEvent.patch} (100%)
 rename patches/api/{0243-Add-TargetHitEvent-API.patch => 0244-Add-TargetHitEvent-API.patch} (100%)
 rename patches/api/{0244-Additional-Block-Material-API-s.patch => 0245-Additional-Block-Material-API-s.patch} (100%)
 rename patches/api/{0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch => 0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%)
 rename patches/api/{0246-Add-PlayerFlowerPotManipulateEvent.patch => 0247-Add-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/api/{0247-Zombie-API-breaking-doors.patch => 0248-Zombie-API-breaking-doors.patch} (100%)
 rename patches/api/{0248-Add-EntityLoadCrossbowEvent.patch => 0249-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/api/{0249-Added-WorldGameRuleChangeEvent.patch => 0250-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/api/{0250-Added-ServerResourcesReloadedEvent.patch => 0251-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/api/{0251-Add-BlockFailedDispenseEvent.patch => 0252-Add-BlockFailedDispenseEvent.patch} (100%)
 rename patches/api/{0252-Added-PlayerLecternPageChangeEvent.patch => 0253-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/api/{0253-Added-PlayerLoomPatternSelectEvent.patch => 0254-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/api/{0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch => 0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch} (100%)
 rename patches/api/{0255-Add-sendOpLevel-API.patch => 0256-Add-sendOpLevel-API.patch} (100%)
 rename patches/api/{0256-Add-PaperRegistry.patch => 0257-Add-PaperRegistry.patch} (100%)
 rename patches/api/{0257-Add-StructuresLocateEvent.patch => 0258-Add-StructuresLocateEvent.patch} (100%)
 rename patches/api/{0258-Return-chat-component-with-empty-text-instead-of-thr.patch => 0259-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/api/{0259-Add-BlockPreDispenseEvent.patch => 0260-Add-BlockPreDispenseEvent.patch} (100%)
 rename patches/api/{0260-Added-Vanilla-Entity-Tags.patch => 0261-Added-Vanilla-Entity-Tags.patch} (100%)
 rename patches/api/{0261-Added-PlayerChangeBeaconEffectEvent.patch => 0262-Added-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/api/{0262-Added-PlayerStonecutterRecipeSelectEvent.patch => 0263-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/api/{0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/api/{0264-add-DragonEggFormEvent.patch => 0265-add-DragonEggFormEvent.patch} (100%)
 rename patches/api/{0265-EntityMoveEvent.patch => 0266-EntityMoveEvent.patch} (100%)
 rename patches/api/{0266-Allow-adding-items-to-BlockDropItemEvent.patch => 0267-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/api/{0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/api/{0268-living-entity-allow-attribute-registration.patch => 0269-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/api/{0269-Add-missing-effects.patch => 0270-Add-missing-effects.patch} (100%)
 rename patches/api/{0270-Expose-Tracked-Players.patch => 0271-Expose-Tracked-Players.patch} (100%)
 rename patches/api/{0271-Cache-the-result-of-Material-isBlock.patch => 0272-Cache-the-result-of-Material-isBlock.patch} (100%)
 rename patches/api/{0272-Add-worldborder-events.patch => 0273-Add-worldborder-events.patch} (100%)
 rename patches/api/{0273-added-PlayerNameEntityEvent.patch => 0274-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/api/{0274-Add-recipe-to-cook-events.patch => 0275-Add-recipe-to-cook-events.patch} (100%)
 rename patches/api/{0275-Add-Block-isValidTool.patch => 0276-Add-Block-isValidTool.patch} (100%)
 rename patches/api/{0276-Expand-world-key-API.patch => 0277-Expand-world-key-API.patch} (97%)
 rename patches/api/{0277-Item-Rarity-API.patch => 0278-Item-Rarity-API.patch} (100%)
 rename patches/api/{0278-Expose-protocol-version.patch => 0279-Expose-protocol-version.patch} (100%)
 rename patches/api/{0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch => 0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch} (99%)
 rename patches/api/{0280-add-isDeeplySleeping-to-HumanEntity.patch => 0281-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/api/{0281-add-consumeFuel-to-FurnaceBurnEvent.patch => 0282-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/api/{0282-add-get-set-drop-chance-to-EntityEquipment.patch => 0283-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/api/{0283-Added-PlayerDeepSleepEvent.patch => 0284-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/api/{0284-More-World-API.patch => 0285-More-World-API.patch} (100%)
 rename patches/api/{0285-Added-PlayerBedFailEnterEvent.patch => 0286-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/api/{0286-Introduce-beacon-activation-deactivation-events.patch => 0287-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/api/{0287-PlayerMoveEvent-Improvements.patch => 0288-PlayerMoveEvent-Improvements.patch} (100%)
 rename patches/api/{0288-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0289-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/api/{0289-Add-more-WanderingTrader-API.patch => 0290-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/api/{0290-Add-EntityBlockStorage-clearEntities.patch => 0291-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/api/{0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/api/{0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/api/{0293-Inventory-close.patch => 0294-Inventory-close.patch} (100%)
 rename patches/api/{0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/api/{0295-Add-basic-Datapack-API.patch => 0296-Add-basic-Datapack-API.patch} (95%)
 rename patches/api/{0296-additions-to-PlayerGameModeChangeEvent.patch => 0297-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/api/{0297-ItemStack-repair-check-API.patch => 0298-ItemStack-repair-check-API.patch} (100%)
 rename patches/api/{0298-More-Enchantment-API.patch => 0299-More-Enchantment-API.patch} (100%)
 rename patches/api/{0299-List-all-missing-hard-depends-not-just-first.patch => 0300-List-all-missing-hard-depends-not-just-first.patch} (100%)
 rename patches/api/{0300-Add-Mob-lookAt-API.patch => 0301-Add-Mob-lookAt-API.patch} (100%)
 rename patches/api/{0301-ItemStack-editMeta.patch => 0302-ItemStack-editMeta.patch} (100%)
 rename patches/api/{0302-Add-EntityInsideBlockEvent.patch => 0303-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/api/{0303-Attributes-API-for-item-defaults.patch => 0304-Attributes-API-for-item-defaults.patch} (100%)
 rename patches/api/{0304-Add-cause-to-Weather-ThunderChangeEvents.patch => 0305-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/api/{0305-More-Lidded-Block-API.patch => 0306-More-Lidded-Block-API.patch} (100%)
 rename patches/api/{0306-Add-PlayerKickEvent-causes.patch => 0307-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/api/{0307-Add-PufferFishStateChangeEvent.patch => 0308-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/api/{0308-Add-BellRevealRaiderEvent.patch => 0309-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/api/{0309-Add-ElderGuardianAppearanceEvent.patch => 0310-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/api/{0310-Add-more-line-of-sight-methods.patch => 0311-Add-more-line-of-sight-methods.patch} (100%)
 rename patches/api/{0311-Add-more-LimitedRegion-API.patch => 0312-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/api/{0312-Missing-Entity-Behavior-API.patch => 0313-Missing-Entity-Behavior-API.patch} (100%)

diff --git a/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch b/patches/api/0150-Add-Git-information-to-version-command-on-startup.patch
similarity index 98%
rename from patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
rename to patches/api/0150-Add-Git-information-to-version-command-on-startup.patch
index 25a9ef2267..29ee37a8b1 100644
--- a/patches/api/0313-Add-Git-information-to-version-command-on-startup.patch
+++ b/patches/api/0150-Add-Git-information-to-version-command-on-startup.patch
@@ -48,7 +48,7 @@ index 0000000000000000000000000000000000000000..909617079db61b675cc7b60b44ef96b3
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5da1155557c6a662632717ac55d546dd91dee3fa..3e3e48f467eef561eeada98c6b99388e23595d7f 100644
+index 098a09baa481f76e63991268d3dfabc413626fcf..653fe32bd134945e1cb1cf40f2623ffffdf5d762 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -53,6 +53,7 @@ import org.bukkit.util.CachedServerIcon;
diff --git a/patches/api/0150-Mob-Pathfinding-API.patch b/patches/api/0151-Mob-Pathfinding-API.patch
similarity index 100%
rename from patches/api/0150-Mob-Pathfinding-API.patch
rename to patches/api/0151-Mob-Pathfinding-API.patch
diff --git a/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/api/0152-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch
similarity index 100%
rename from patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch
rename to patches/api/0153-Performance-Concurrency-Improvements-to-Permissions.patch
diff --git a/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch
similarity index 100%
rename from patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch
rename to patches/api/0154-Add-ItemStackRecipeChoice-Draft-API.patch
diff --git a/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch
similarity index 100%
rename from patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch
rename to patches/api/0155-Implement-furnace-cook-speed-multiplier-API.patch
diff --git a/patches/api/0155-Material-API-additions.patch b/patches/api/0156-Material-API-additions.patch
similarity index 100%
rename from patches/api/0155-Material-API-additions.patch
rename to patches/api/0156-Material-API-additions.patch
diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch
similarity index 100%
rename from patches/api/0156-Add-Material-Tags.patch
rename to patches/api/0157-Add-Material-Tags.patch
diff --git a/patches/api/0157-PreSpawnerSpawnEvent.patch b/patches/api/0158-PreSpawnerSpawnEvent.patch
similarity index 100%
rename from patches/api/0157-PreSpawnerSpawnEvent.patch
rename to patches/api/0158-PreSpawnerSpawnEvent.patch
diff --git a/patches/api/0158-Add-LivingEntity-getTargetEntity.patch b/patches/api/0159-Add-LivingEntity-getTargetEntity.patch
similarity index 100%
rename from patches/api/0158-Add-LivingEntity-getTargetEntity.patch
rename to patches/api/0159-Add-LivingEntity-getTargetEntity.patch
diff --git a/patches/api/0159-Add-sun-related-API.patch b/patches/api/0160-Add-sun-related-API.patch
similarity index 100%
rename from patches/api/0159-Add-sun-related-API.patch
rename to patches/api/0160-Add-sun-related-API.patch
diff --git a/patches/api/0160-Turtle-API.patch b/patches/api/0161-Turtle-API.patch
similarity index 100%
rename from patches/api/0160-Turtle-API.patch
rename to patches/api/0161-Turtle-API.patch
diff --git a/patches/api/0161-Add-spectator-target-events.patch b/patches/api/0162-Add-spectator-target-events.patch
similarity index 100%
rename from patches/api/0161-Add-spectator-target-events.patch
rename to patches/api/0162-Add-spectator-target-events.patch
diff --git a/patches/api/0162-Add-more-Witch-API.patch b/patches/api/0163-Add-more-Witch-API.patch
similarity index 100%
rename from patches/api/0162-Add-more-Witch-API.patch
rename to patches/api/0163-Add-more-Witch-API.patch
diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/api/0164-Make-the-default-permission-message-configurable.patch
similarity index 95%
rename from patches/api/0163-Make-the-default-permission-message-configurable.patch
rename to patches/api/0164-Make-the-default-permission-message-configurable.patch
index 60ab692a15..56059efd9c 100644
--- a/patches/api/0163-Make-the-default-permission-message-configurable.patch
+++ b/patches/api/0164-Make-the-default-permission-message-configurable.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Make the default permission message configurable
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 098a09baa481f76e63991268d3dfabc413626fcf..ca6f3a18ca8902b99c1c8c21b6da5def7fdb2aa8 100644
+index 653fe32bd134945e1cb1cf40f2623ffffdf5d762..9bd83fc81ae5a196a7254a4fd68f884805d5bddb 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2113,6 +2113,15 @@ public final class Bukkit {
+@@ -2132,6 +2132,15 @@ public final class Bukkit {
          return server.suggestPlayerNamesWhenNullTabCompletions();
      }
  
diff --git a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
similarity index 100%
rename from patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch
rename to patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch
diff --git a/patches/api/0165-Add-more-Zombie-API.patch b/patches/api/0166-Add-more-Zombie-API.patch
similarity index 100%
rename from patches/api/0165-Add-more-Zombie-API.patch
rename to patches/api/0166-Add-more-Zombie-API.patch
diff --git a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
similarity index 100%
rename from patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch
rename to patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch
diff --git a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch b/patches/api/0168-Add-PlayerConnectionCloseEvent.patch
similarity index 100%
rename from patches/api/0167-Add-PlayerConnectionCloseEvent.patch
rename to patches/api/0168-Add-PlayerConnectionCloseEvent.patch
diff --git a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
similarity index 100%
rename from patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
rename to patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
diff --git a/patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch
similarity index 100%
rename from patches/api/0169-Add-ItemStack-Recipe-API-helper-methods.patch
rename to patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch
diff --git a/patches/api/0170-BlockDestroyEvent.patch b/patches/api/0171-BlockDestroyEvent.patch
similarity index 100%
rename from patches/api/0170-BlockDestroyEvent.patch
rename to patches/api/0171-BlockDestroyEvent.patch
diff --git a/patches/api/0171-Add-WhitelistToggleEvent.patch b/patches/api/0172-Add-WhitelistToggleEvent.patch
similarity index 100%
rename from patches/api/0171-Add-WhitelistToggleEvent.patch
rename to patches/api/0172-Add-WhitelistToggleEvent.patch
diff --git a/patches/api/0172-Add-GS4-Query-event.patch b/patches/api/0173-Add-GS4-Query-event.patch
similarity index 100%
rename from patches/api/0172-Add-GS4-Query-event.patch
rename to patches/api/0173-Add-GS4-Query-event.patch
diff --git a/patches/api/0173-Add-PlayerPostRespawnEvent.patch b/patches/api/0174-Add-PlayerPostRespawnEvent.patch
similarity index 100%
rename from patches/api/0173-Add-PlayerPostRespawnEvent.patch
rename to patches/api/0174-Add-PlayerPostRespawnEvent.patch
diff --git a/patches/api/0174-Entity-getEntitySpawnReason.patch b/patches/api/0175-Entity-getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/0174-Entity-getEntitySpawnReason.patch
rename to patches/api/0175-Entity-getEntitySpawnReason.patch
diff --git a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
similarity index 99%
rename from patches/api/0175-Fix-Spigot-annotation-mistakes.patch
rename to patches/api/0176-Fix-Spigot-annotation-mistakes.patch
index 07d1d7a5d8..79fecfff09 100644
--- a/patches/api/0175-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0176-Fix-Spigot-annotation-mistakes.patch
@@ -9,10 +9,10 @@ a ton of noise to plugin developers.
 These do not help plugin developers if they bring moise noise than value.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index ca6f3a18ca8902b99c1c8c21b6da5def7fdb2aa8..d9f245ec7998655116c485b5607a130cb443765e 100644
+index 9bd83fc81ae5a196a7254a4fd68f884805d5bddb..3a011b6fe654da9710aa81c4e13e9b135fbecfc3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1158,10 +1158,8 @@ public final class Bukkit {
+@@ -1177,10 +1177,8 @@ public final class Bukkit {
       * @param name the name the player to retrieve
       * @return an offline player
       * @see #getOfflinePlayer(java.util.UUID)
@@ -24,7 +24,7 @@ index ca6f3a18ca8902b99c1c8c21b6da5def7fdb2aa8..d9f245ec7998655116c485b5607a130c
      @NotNull
      public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
          return server.getOfflinePlayer(name);
-@@ -1699,7 +1697,7 @@ public final class Bukkit {
+@@ -1718,7 +1716,7 @@ public final class Bukkit {
       *
       * @return the scoreboard manager or null if no worlds are loaded.
       */
@@ -669,7 +669,7 @@ index ecf8cd763ae600c11be6385ea6240e4d2c08abc9..40e9040fec4e7d39aa1b0d75d183cf97
          return setIngredient(key, ingredient.getItemType(), ingredient.getData());
      }
 diff --git a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
-index ba4fb2356c63dd0e1c14f373a699b87e2e25562c..a50f72da6a5e6470484e61ef1a833bcca4041a79 100644
+index ff5a0e378a7c1e0f89d81144629251dc61af6355..c6dba5bbca302237bb4abd2b7ef17c1281d74a29 100644
 --- a/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 +++ b/src/main/java/org/bukkit/inventory/ShapelessRecipe.java
 @@ -54,8 +54,10 @@ public class ShapelessRecipe implements Recipe, Keyed {
diff --git a/patches/api/0176-Server-Tick-Events.patch b/patches/api/0177-Server-Tick-Events.patch
similarity index 100%
rename from patches/api/0176-Server-Tick-Events.patch
rename to patches/api/0177-Server-Tick-Events.patch
diff --git a/patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch
similarity index 100%
rename from patches/api/0177-PlayerDeathEvent-getItemsToKeep.patch
rename to patches/api/0178-PlayerDeathEvent-getItemsToKeep.patch
diff --git a/patches/api/0178-Add-Heightmap-API.patch b/patches/api/0179-Add-Heightmap-API.patch
similarity index 100%
rename from patches/api/0178-Add-Heightmap-API.patch
rename to patches/api/0179-Add-Heightmap-API.patch
diff --git a/patches/api/0179-Mob-Spawner-API-Enhancements.patch b/patches/api/0180-Mob-Spawner-API-Enhancements.patch
similarity index 100%
rename from patches/api/0179-Mob-Spawner-API-Enhancements.patch
rename to patches/api/0180-Mob-Spawner-API-Enhancements.patch
diff --git a/patches/api/0180-Add-BlockSoundGroup-interface.patch b/patches/api/0181-Add-BlockSoundGroup-interface.patch
similarity index 100%
rename from patches/api/0180-Add-BlockSoundGroup-interface.patch
rename to patches/api/0181-Add-BlockSoundGroup-interface.patch
diff --git a/patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
similarity index 100%
rename from patches/api/0181-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
rename to patches/api/0182-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch
diff --git a/patches/api/0182-Increase-custom-payload-channel-message-size.patch b/patches/api/0183-Increase-custom-payload-channel-message-size.patch
similarity index 100%
rename from patches/api/0182-Increase-custom-payload-channel-message-size.patch
rename to patches/api/0183-Increase-custom-payload-channel-message-size.patch
diff --git a/patches/api/0183-Expose-the-internal-current-tick.patch b/patches/api/0184-Expose-the-internal-current-tick.patch
similarity index 90%
rename from patches/api/0183-Expose-the-internal-current-tick.patch
rename to patches/api/0184-Expose-the-internal-current-tick.patch
index f607ec8ee0..2421f661d8 100644
--- a/patches/api/0183-Expose-the-internal-current-tick.patch
+++ b/patches/api/0184-Expose-the-internal-current-tick.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose the internal current tick
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d9f245ec7998655116c485b5607a130cb443765e..f6a862fcf269865eacc67088833bfdd09b661654 100644
+index 3a011b6fe654da9710aa81c4e13e9b135fbecfc3..5880fe78b52cab2e9c2e4f2639570e0380dd9b73 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2196,6 +2196,10 @@ public final class Bukkit {
+@@ -2215,6 +2215,10 @@ public final class Bukkit {
      public static com.destroystokyo.paper.profile.PlayerProfile createProfileExact(@Nullable UUID uuid, @Nullable String name) {
          return server.createProfileExact(uuid, name);
      }
diff --git a/patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch
similarity index 100%
rename from patches/api/0184-PlayerDeathEvent-shouldDropExperience.patch
rename to patches/api/0185-PlayerDeathEvent-shouldDropExperience.patch
diff --git a/patches/api/0185-Add-effect-to-block-break-naturally.patch b/patches/api/0186-Add-effect-to-block-break-naturally.patch
similarity index 100%
rename from patches/api/0185-Add-effect-to-block-break-naturally.patch
rename to patches/api/0186-Add-effect-to-block-break-naturally.patch
diff --git a/patches/api/0186-Add-ThrownEggHatchEvent.patch b/patches/api/0187-Add-ThrownEggHatchEvent.patch
similarity index 100%
rename from patches/api/0186-Add-ThrownEggHatchEvent.patch
rename to patches/api/0187-Add-ThrownEggHatchEvent.patch
diff --git a/patches/api/0187-Entity-Jump-API.patch b/patches/api/0188-Entity-Jump-API.patch
similarity index 100%
rename from patches/api/0187-Entity-Jump-API.patch
rename to patches/api/0188-Entity-Jump-API.patch
diff --git a/patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch
similarity index 100%
rename from patches/api/0188-add-hand-to-BlockMultiPlaceEvent.patch
rename to patches/api/0189-add-hand-to-BlockMultiPlaceEvent.patch
diff --git a/patches/api/0189-Add-tick-times-API.patch b/patches/api/0190-Add-tick-times-API.patch
similarity index 92%
rename from patches/api/0189-Add-tick-times-API.patch
rename to patches/api/0190-Add-tick-times-API.patch
index 9bc09be7f9..ef9f60e23b 100644
--- a/patches/api/0189-Add-tick-times-API.patch
+++ b/patches/api/0190-Add-tick-times-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add tick times API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index f6a862fcf269865eacc67088833bfdd09b661654..3fb45f03f3901de5592e2bb6ba8f75b5fd474509 100644
+index 5880fe78b52cab2e9c2e4f2639570e0380dd9b73..3b60fa65686572fdd8fab22cd131ca5cfe5274c8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1898,6 +1898,25 @@ public final class Bukkit {
+@@ -1917,6 +1917,25 @@ public final class Bukkit {
      public static double[] getTPS() {
          return server.getTPS();
      }
diff --git a/patches/api/0190-Expose-MinecraftServer-isRunning.patch b/patches/api/0191-Expose-MinecraftServer-isRunning.patch
similarity index 91%
rename from patches/api/0190-Expose-MinecraftServer-isRunning.patch
rename to patches/api/0191-Expose-MinecraftServer-isRunning.patch
index e630be40ce..6bb47f1878 100644
--- a/patches/api/0190-Expose-MinecraftServer-isRunning.patch
+++ b/patches/api/0191-Expose-MinecraftServer-isRunning.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
 This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3fb45f03f3901de5592e2bb6ba8f75b5fd474509..5d5f1e52f2ff19a48776a4fdbd026d67e538bec9 100644
+index 3b60fa65686572fdd8fab22cd131ca5cfe5274c8..3455de478517a91285bb9d1b306ce1c4be619389 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2219,6 +2219,15 @@ public final class Bukkit {
+@@ -2238,6 +2238,15 @@ public final class Bukkit {
      public static int getCurrentTick() {
          return server.getCurrentTick();
      }
diff --git a/patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch
similarity index 100%
rename from patches/api/0191-Add-Raw-Byte-ItemStack-Serialization.patch
rename to patches/api/0192-Add-Raw-Byte-ItemStack-Serialization.patch
diff --git a/patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
similarity index 100%
rename from patches/api/0192-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
rename to patches/api/0193-Disable-Sync-Events-firing-Async-errors-during-shutd.patch
diff --git a/patches/api/0193-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0194-Make-JavaPluginLoader-thread-safe.patch
similarity index 100%
rename from patches/api/0193-Make-JavaPluginLoader-thread-safe.patch
rename to patches/api/0194-Make-JavaPluginLoader-thread-safe.patch
diff --git a/patches/api/0194-Add-Player-Client-Options-API.patch b/patches/api/0195-Add-Player-Client-Options-API.patch
similarity index 100%
rename from patches/api/0194-Add-Player-Client-Options-API.patch
rename to patches/api/0195-Add-Player-Client-Options-API.patch
diff --git a/patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch
similarity index 100%
rename from patches/api/0195-Add-PlayerAttackEntityCooldownResetEvent.patch
rename to patches/api/0196-Add-PlayerAttackEntityCooldownResetEvent.patch
diff --git a/patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
similarity index 100%
rename from patches/api/0196-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
rename to patches/api/0197-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch
diff --git a/patches/api/0197-Add-item-slot-convenience-methods.patch b/patches/api/0198-Add-item-slot-convenience-methods.patch
similarity index 100%
rename from patches/api/0197-Add-item-slot-convenience-methods.patch
rename to patches/api/0198-Add-item-slot-convenience-methods.patch
diff --git a/patches/api/0198-Villager-Restocks-API.patch b/patches/api/0199-Villager-Restocks-API.patch
similarity index 100%
rename from patches/api/0198-Villager-Restocks-API.patch
rename to patches/api/0199-Villager-Restocks-API.patch
diff --git a/patches/api/0199-Expose-game-version.patch b/patches/api/0200-Expose-game-version.patch
similarity index 92%
rename from patches/api/0199-Expose-game-version.patch
rename to patches/api/0200-Expose-game-version.patch
index a30e1009ba..c95b82afef 100644
--- a/patches/api/0199-Expose-game-version.patch
+++ b/patches/api/0200-Expose-game-version.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose game version
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 5d5f1e52f2ff19a48776a4fdbd026d67e538bec9..8a782b8b65a9a99318ed1a1f1e8631197d0e5eeb 100644
+index 3455de478517a91285bb9d1b306ce1c4be619389..706e42172b938840c6ec06f0f7b686eee17a4a93 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -135,6 +135,18 @@ public final class Bukkit {
+@@ -154,6 +154,18 @@ public final class Bukkit {
          return server.getBukkitVersion();
      }
  
diff --git a/patches/api/0200-Add-Mob-Goal-API.patch b/patches/api/0201-Add-Mob-Goal-API.patch
similarity index 99%
rename from patches/api/0200-Add-Mob-Goal-API.patch
rename to patches/api/0201-Add-Mob-Goal-API.patch
index 87bd25ccaa..d544a7f862 100644
--- a/patches/api/0200-Add-Mob-Goal-API.patch
+++ b/patches/api/0201-Add-Mob-Goal-API.patch
@@ -523,10 +523,10 @@ index 0000000000000000000000000000000000000000..8fd399f791b45eb7fc62693ca954eea0
 +    @Deprecated GoalKey<Mob> UNIVERSAL_ANGER_RESET = GoalKey.of(Mob.class, NamespacedKey.minecraft("universal_anger_reset"));
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 8a782b8b65a9a99318ed1a1f1e8631197d0e5eeb..43674a3fb8b0b1dc4bef13ecaf83f68f06b29ec1 100644
+index 706e42172b938840c6ec06f0f7b686eee17a4a93..3faefc48a2dca51f19d4289547f0ce875bb61e32 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2240,6 +2240,16 @@ public final class Bukkit {
+@@ -2259,6 +2259,16 @@ public final class Bukkit {
      public static boolean isStopping() {
          return server.isStopping();
      }
diff --git a/patches/api/0201-Add-villager-reputation-API.patch b/patches/api/0202-Add-villager-reputation-API.patch
similarity index 100%
rename from patches/api/0201-Add-villager-reputation-API.patch
rename to patches/api/0202-Add-villager-reputation-API.patch
diff --git a/patches/api/0202-Spawn-Reason-API.patch b/patches/api/0203-Spawn-Reason-API.patch
similarity index 100%
rename from patches/api/0202-Spawn-Reason-API.patch
rename to patches/api/0203-Spawn-Reason-API.patch
diff --git a/patches/api/0203-Potential-bed-API.patch b/patches/api/0204-Potential-bed-API.patch
similarity index 100%
rename from patches/api/0203-Potential-bed-API.patch
rename to patches/api/0204-Potential-bed-API.patch
diff --git a/patches/api/0204-Prioritise-own-classes-where-possible.patch b/patches/api/0205-Prioritise-own-classes-where-possible.patch
similarity index 100%
rename from patches/api/0204-Prioritise-own-classes-where-possible.patch
rename to patches/api/0205-Prioritise-own-classes-where-possible.patch
diff --git a/patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch
similarity index 100%
rename from patches/api/0205-Provide-a-useful-PluginClassLoader-toString.patch
rename to patches/api/0206-Provide-a-useful-PluginClassLoader-toString.patch
diff --git a/patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch
similarity index 100%
rename from patches/api/0206-Inventory-getHolder-method-without-block-snapshot.patch
rename to patches/api/0207-Inventory-getHolder-method-without-block-snapshot.patch
diff --git a/patches/api/0207-Improve-Arrow-API.patch b/patches/api/0208-Improve-Arrow-API.patch
similarity index 100%
rename from patches/api/0207-Improve-Arrow-API.patch
rename to patches/api/0208-Improve-Arrow-API.patch
diff --git a/patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch
similarity index 100%
rename from patches/api/0208-Add-and-implement-PlayerRecipeBookClickEvent.patch
rename to patches/api/0209-Add-and-implement-PlayerRecipeBookClickEvent.patch
diff --git a/patches/api/0209-Support-components-in-ItemMeta.patch b/patches/api/0210-Support-components-in-ItemMeta.patch
similarity index 100%
rename from patches/api/0209-Support-components-in-ItemMeta.patch
rename to patches/api/0210-Support-components-in-ItemMeta.patch
diff --git a/patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
similarity index 100%
rename from patches/api/0210-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
rename to patches/api/0211-added-2-new-TargetReasons-for-1.16-mob-behavior.patch
diff --git a/patches/api/0211-Add-entity-liquid-API.patch b/patches/api/0212-Add-entity-liquid-API.patch
similarity index 100%
rename from patches/api/0211-Add-entity-liquid-API.patch
rename to patches/api/0212-Add-entity-liquid-API.patch
diff --git a/patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
similarity index 100%
rename from patches/api/0212-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
rename to patches/api/0213-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch
diff --git a/patches/api/0218-Brand-support.patch b/patches/api/0214-Brand-support.patch
similarity index 100%
rename from patches/api/0218-Brand-support.patch
rename to patches/api/0214-Brand-support.patch
diff --git a/patches/api/0213-Support-hex-colors-in-getLastColors.patch b/patches/api/0215-Support-hex-colors-in-getLastColors.patch
similarity index 100%
rename from patches/api/0213-Support-hex-colors-in-getLastColors.patch
rename to patches/api/0215-Support-hex-colors-in-getLastColors.patch
diff --git a/patches/api/0214-Add-setMaxPlayers-API.patch b/patches/api/0216-Add-setMaxPlayers-API.patch
similarity index 91%
rename from patches/api/0214-Add-setMaxPlayers-API.patch
rename to patches/api/0216-Add-setMaxPlayers-API.patch
index c9d0796fad..d4ded71a79 100644
--- a/patches/api/0214-Add-setMaxPlayers-API.patch
+++ b/patches/api/0216-Add-setMaxPlayers-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add #setMaxPlayers API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 43674a3fb8b0b1dc4bef13ecaf83f68f06b29ec1..4eafa8f3342648d0b58642102d6c75a8a79c9764 100644
+index 3faefc48a2dca51f19d4289547f0ce875bb61e32..4b2f3e674e634efa42f6840933dd9ee9595d036b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -188,6 +188,17 @@ public final class Bukkit {
+@@ -207,6 +207,17 @@ public final class Bukkit {
          return server.getMaxPlayers();
      }
  
diff --git a/patches/api/0215-Add-moon-phase-API.patch b/patches/api/0218-Add-moon-phase-API.patch
similarity index 100%
rename from patches/api/0215-Add-moon-phase-API.patch
rename to patches/api/0218-Add-moon-phase-API.patch
diff --git a/patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/api/0216-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/api/0219-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0219-Add-more-Evoker-API.patch b/patches/api/0220-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/api/0219-Add-more-Evoker-API.patch
rename to patches/api/0220-Add-more-Evoker-API.patch
diff --git a/patches/api/0220-Add-methods-to-get-translation-keys.patch b/patches/api/0221-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/api/0220-Add-methods-to-get-translation-keys.patch
rename to patches/api/0221-Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/api/0221-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/api/0222-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0222-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/api/0223-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/api/0223-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/api/0224-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0224-Entity-isTicking.patch b/patches/api/0225-Entity-isTicking.patch
similarity index 100%
rename from patches/api/0224-Entity-isTicking.patch
rename to patches/api/0225-Entity-isTicking.patch
diff --git a/patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/0225-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
rename to patches/api/0226-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/0226-Villager-resetOffers.patch b/patches/api/0227-Villager-resetOffers.patch
similarity index 100%
rename from patches/api/0226-Villager-resetOffers.patch
rename to patches/api/0227-Villager-resetOffers.patch
diff --git a/patches/api/0227-Player-elytra-boost-API.patch b/patches/api/0228-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/api/0227-Player-elytra-boost-API.patch
rename to patches/api/0228-Player-elytra-boost-API.patch
diff --git a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0229-Add-getOfflinePlayerIfCached-String.patch
similarity index 94%
rename from patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
rename to patches/api/0229-Add-getOfflinePlayerIfCached-String.patch
index 4f32a4a520..e8a6c1d60b 100644
--- a/patches/api/0228-Add-getOfflinePlayerIfCached-String.patch
+++ b/patches/api/0229-Add-getOfflinePlayerIfCached-String.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add getOfflinePlayerIfCached(String)
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4eafa8f3342648d0b58642102d6c75a8a79c9764..37a295b2bbf7127713e19f224e788e0adb8823f4 100644
+index 4b2f3e674e634efa42f6840933dd9ee9595d036b..7e422716841d3736cce4f0968121231f9c6c33d3 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -1188,6 +1188,27 @@ public final class Bukkit {
+@@ -1207,6 +1207,27 @@ public final class Bukkit {
          return server.getOfflinePlayer(name);
      }
  
diff --git a/patches/api/0229-Add-ignore-discounts-API.patch b/patches/api/0230-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/api/0229-Add-ignore-discounts-API.patch
rename to patches/api/0230-Add-ignore-discounts-API.patch
diff --git a/patches/api/0230-Item-no-age-no-player-pickup.patch b/patches/api/0231-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/api/0230-Item-no-age-no-player-pickup.patch
rename to patches/api/0231-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0231-Beacon-API-custom-effect-ranges.patch b/patches/api/0232-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/api/0231-Beacon-API-custom-effect-ranges.patch
rename to patches/api/0232-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0232-Add-API-for-quit-reason.patch b/patches/api/0233-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/api/0232-Add-API-for-quit-reason.patch
rename to patches/api/0233-Add-API-for-quit-reason.patch
diff --git a/patches/api/0233-Add-Destroy-Speed-API.patch b/patches/api/0234-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/api/0233-Add-Destroy-Speed-API.patch
rename to patches/api/0234-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0234-Add-LivingEntity-clearActiveItem.patch b/patches/api/0235-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/api/0234-Add-LivingEntity-clearActiveItem.patch
rename to patches/api/0235-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0235-Add-PlayerItemCooldownEvent.patch b/patches/api/0236-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/api/0235-Add-PlayerItemCooldownEvent.patch
rename to patches/api/0236-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0236-More-lightning-API.patch b/patches/api/0237-More-lightning-API.patch
similarity index 100%
rename from patches/api/0236-More-lightning-API.patch
rename to patches/api/0237-More-lightning-API.patch
diff --git a/patches/api/0237-Add-PlayerShearBlockEvent.patch b/patches/api/0238-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/api/0237-Add-PlayerShearBlockEvent.patch
rename to patches/api/0238-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0238-Enable-multi-release-plugin-jars.patch b/patches/api/0239-Enable-multi-release-plugin-jars.patch
similarity index 100%
rename from patches/api/0238-Enable-multi-release-plugin-jars.patch
rename to patches/api/0239-Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/0239-Player-Chunk-Load-Unload-Events.patch b/patches/api/0240-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/api/0239-Player-Chunk-Load-Unload-Events.patch
rename to patches/api/0240-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0240-Expose-LivingEntity-hurt-direction.patch b/patches/api/0241-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/api/0240-Expose-LivingEntity-hurt-direction.patch
rename to patches/api/0241-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/api/0241-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/api/0242-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0242-Added-PlayerTradeEvent.patch b/patches/api/0243-Added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/api/0242-Added-PlayerTradeEvent.patch
rename to patches/api/0243-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0243-Add-TargetHitEvent-API.patch b/patches/api/0244-Add-TargetHitEvent-API.patch
similarity index 100%
rename from patches/api/0243-Add-TargetHitEvent-API.patch
rename to patches/api/0244-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0244-Additional-Block-Material-API-s.patch b/patches/api/0245-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/api/0244-Additional-Block-Material-API-s.patch
rename to patches/api/0245-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/api/0245-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/api/0246-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/api/0246-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/api/0247-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0247-Zombie-API-breaking-doors.patch b/patches/api/0248-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/api/0247-Zombie-API-breaking-doors.patch
rename to patches/api/0248-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0248-Add-EntityLoadCrossbowEvent.patch b/patches/api/0249-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/api/0248-Add-EntityLoadCrossbowEvent.patch
rename to patches/api/0249-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0249-Added-WorldGameRuleChangeEvent.patch b/patches/api/0250-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/api/0249-Added-WorldGameRuleChangeEvent.patch
rename to patches/api/0250-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0250-Added-ServerResourcesReloadedEvent.patch b/patches/api/0251-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/api/0250-Added-ServerResourcesReloadedEvent.patch
rename to patches/api/0251-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0251-Add-BlockFailedDispenseEvent.patch b/patches/api/0252-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/api/0251-Add-BlockFailedDispenseEvent.patch
rename to patches/api/0252-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0252-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0253-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/api/0252-Added-PlayerLecternPageChangeEvent.patch
rename to patches/api/0253-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/api/0253-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/api/0254-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
similarity index 100%
rename from patches/api/0254-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
rename to patches/api/0255-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0255-Add-sendOpLevel-API.patch b/patches/api/0256-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/api/0255-Add-sendOpLevel-API.patch
rename to patches/api/0256-Add-sendOpLevel-API.patch
diff --git a/patches/api/0256-Add-PaperRegistry.patch b/patches/api/0257-Add-PaperRegistry.patch
similarity index 100%
rename from patches/api/0256-Add-PaperRegistry.patch
rename to patches/api/0257-Add-PaperRegistry.patch
diff --git a/patches/api/0257-Add-StructuresLocateEvent.patch b/patches/api/0258-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/api/0257-Add-StructuresLocateEvent.patch
rename to patches/api/0258-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/api/0258-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/api/0259-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0259-Add-BlockPreDispenseEvent.patch b/patches/api/0260-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/api/0259-Add-BlockPreDispenseEvent.patch
rename to patches/api/0260-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0260-Added-Vanilla-Entity-Tags.patch b/patches/api/0261-Added-Vanilla-Entity-Tags.patch
similarity index 100%
rename from patches/api/0260-Added-Vanilla-Entity-Tags.patch
rename to patches/api/0261-Added-Vanilla-Entity-Tags.patch
diff --git a/patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/api/0261-Added-PlayerChangeBeaconEffectEvent.patch
rename to patches/api/0262-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/api/0262-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/api/0263-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/api/0263-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0264-add-DragonEggFormEvent.patch b/patches/api/0265-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/api/0264-add-DragonEggFormEvent.patch
rename to patches/api/0265-add-DragonEggFormEvent.patch
diff --git a/patches/api/0265-EntityMoveEvent.patch b/patches/api/0266-EntityMoveEvent.patch
similarity index 100%
rename from patches/api/0265-EntityMoveEvent.patch
rename to patches/api/0266-EntityMoveEvent.patch
diff --git a/patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/api/0266-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/api/0267-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/api/0267-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/api/0268-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0268-living-entity-allow-attribute-registration.patch b/patches/api/0269-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/api/0268-living-entity-allow-attribute-registration.patch
rename to patches/api/0269-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0269-Add-missing-effects.patch b/patches/api/0270-Add-missing-effects.patch
similarity index 100%
rename from patches/api/0269-Add-missing-effects.patch
rename to patches/api/0270-Add-missing-effects.patch
diff --git a/patches/api/0270-Expose-Tracked-Players.patch b/patches/api/0271-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/api/0270-Expose-Tracked-Players.patch
rename to patches/api/0271-Expose-Tracked-Players.patch
diff --git a/patches/api/0271-Cache-the-result-of-Material-isBlock.patch b/patches/api/0272-Cache-the-result-of-Material-isBlock.patch
similarity index 100%
rename from patches/api/0271-Cache-the-result-of-Material-isBlock.patch
rename to patches/api/0272-Cache-the-result-of-Material-isBlock.patch
diff --git a/patches/api/0272-Add-worldborder-events.patch b/patches/api/0273-Add-worldborder-events.patch
similarity index 100%
rename from patches/api/0272-Add-worldborder-events.patch
rename to patches/api/0273-Add-worldborder-events.patch
diff --git a/patches/api/0273-added-PlayerNameEntityEvent.patch b/patches/api/0274-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/api/0273-added-PlayerNameEntityEvent.patch
rename to patches/api/0274-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0274-Add-recipe-to-cook-events.patch b/patches/api/0275-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/api/0274-Add-recipe-to-cook-events.patch
rename to patches/api/0275-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0275-Add-Block-isValidTool.patch b/patches/api/0276-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/api/0275-Add-Block-isValidTool.patch
rename to patches/api/0276-Add-Block-isValidTool.patch
diff --git a/patches/api/0276-Expand-world-key-API.patch b/patches/api/0277-Expand-world-key-API.patch
similarity index 97%
rename from patches/api/0276-Expand-world-key-API.patch
rename to patches/api/0277-Expand-world-key-API.patch
index 0a3eb6c378..7ee3077c31 100644
--- a/patches/api/0276-Expand-world-key-API.patch
+++ b/patches/api/0277-Expand-world-key-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Expand world key API
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 37a295b2bbf7127713e19f224e788e0adb8823f4..3a2137c6505ef0e14875f7eaa7809509750fb625 100644
+index 7e422716841d3736cce4f0968121231f9c6c33d3..4c6780dd1375f5d2c6e60229cc05c4af9d480b8a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -791,6 +791,18 @@ public final class Bukkit {
+@@ -810,6 +810,18 @@ public final class Bukkit {
      public static World getWorld(@NotNull UUID uid) {
          return server.getWorld(uid);
      }
diff --git a/patches/api/0277-Item-Rarity-API.patch b/patches/api/0278-Item-Rarity-API.patch
similarity index 100%
rename from patches/api/0277-Item-Rarity-API.patch
rename to patches/api/0278-Item-Rarity-API.patch
diff --git a/patches/api/0278-Expose-protocol-version.patch b/patches/api/0279-Expose-protocol-version.patch
similarity index 100%
rename from patches/api/0278-Expose-protocol-version.patch
rename to patches/api/0279-Expose-protocol-version.patch
diff --git a/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
similarity index 99%
rename from patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
rename to patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
index fe3d224a62..3649c64a09 100644
--- a/patches/api/0279-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
+++ b/patches/api/0280-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch
@@ -393,7 +393,7 @@ index 0000000000000000000000000000000000000000..6f560a51277ccbd46a9142cfa057d276
 +    }
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 7f57b95727d0336f1f1548055574e0c129fe9643..57cf9fab2501da6f1abd12e14697630ca82b0a6d 100644
+index 93498307004b68b934fbfa1aeb3aaf0e97cbdac7..bbe81f7a420f913ffdcad913a3c43ff41ead41f5 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -48,6 +48,8 @@ public class AnnotationTest {
diff --git a/patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0281-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0280-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/api/0281-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0282-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/api/0281-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/api/0282-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0283-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/api/0282-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/api/0283-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0283-Added-PlayerDeepSleepEvent.patch b/patches/api/0284-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/api/0283-Added-PlayerDeepSleepEvent.patch
rename to patches/api/0284-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0284-More-World-API.patch b/patches/api/0285-More-World-API.patch
similarity index 100%
rename from patches/api/0284-More-World-API.patch
rename to patches/api/0285-More-World-API.patch
diff --git a/patches/api/0285-Added-PlayerBedFailEnterEvent.patch b/patches/api/0286-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/api/0285-Added-PlayerBedFailEnterEvent.patch
rename to patches/api/0286-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0286-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0287-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/api/0286-Introduce-beacon-activation-deactivation-events.patch
rename to patches/api/0287-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0287-PlayerMoveEvent-Improvements.patch b/patches/api/0288-PlayerMoveEvent-Improvements.patch
similarity index 100%
rename from patches/api/0287-PlayerMoveEvent-Improvements.patch
rename to patches/api/0288-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0289-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/api/0288-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/api/0289-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0289-Add-more-WanderingTrader-API.patch b/patches/api/0290-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/api/0289-Add-more-WanderingTrader-API.patch
rename to patches/api/0290-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0290-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0291-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/api/0290-Add-EntityBlockStorage-clearEntities.patch
rename to patches/api/0291-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/api/0291-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/api/0292-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/api/0292-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/0293-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0293-Inventory-close.patch b/patches/api/0294-Inventory-close.patch
similarity index 100%
rename from patches/api/0293-Inventory-close.patch
rename to patches/api/0294-Inventory-close.patch
diff --git a/patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/api/0294-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/api/0295-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0295-Add-basic-Datapack-API.patch b/patches/api/0296-Add-basic-Datapack-API.patch
similarity index 95%
rename from patches/api/0295-Add-basic-Datapack-API.patch
rename to patches/api/0296-Add-basic-Datapack-API.patch
index ea77570d05..fd30969d75 100644
--- a/patches/api/0295-Add-basic-Datapack-API.patch
+++ b/patches/api/0296-Add-basic-Datapack-API.patch
@@ -70,10 +70,10 @@ index 0000000000000000000000000000000000000000..58f78d5e91beacaf710f62461cf869f7
 +
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3a2137c6505ef0e14875f7eaa7809509750fb625..5da1155557c6a662632717ac55d546dd91dee3fa 100644
+index 4c6780dd1375f5d2c6e60229cc05c4af9d480b8a..3e3e48f467eef561eeada98c6b99388e23595d7f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2294,6 +2294,14 @@ public final class Bukkit {
+@@ -2313,6 +2313,14 @@ public final class Bukkit {
      public static com.destroystokyo.paper.entity.ai.MobGoals getMobGoals() {
          return server.getMobGoals();
      }
diff --git a/patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0297-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/api/0296-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/api/0297-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0297-ItemStack-repair-check-API.patch b/patches/api/0298-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/api/0297-ItemStack-repair-check-API.patch
rename to patches/api/0298-ItemStack-repair-check-API.patch
diff --git a/patches/api/0298-More-Enchantment-API.patch b/patches/api/0299-More-Enchantment-API.patch
similarity index 100%
rename from patches/api/0298-More-Enchantment-API.patch
rename to patches/api/0299-More-Enchantment-API.patch
diff --git a/patches/api/0299-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0300-List-all-missing-hard-depends-not-just-first.patch
similarity index 100%
rename from patches/api/0299-List-all-missing-hard-depends-not-just-first.patch
rename to patches/api/0300-List-all-missing-hard-depends-not-just-first.patch
diff --git a/patches/api/0300-Add-Mob-lookAt-API.patch b/patches/api/0301-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/api/0300-Add-Mob-lookAt-API.patch
rename to patches/api/0301-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0301-ItemStack-editMeta.patch b/patches/api/0302-ItemStack-editMeta.patch
similarity index 100%
rename from patches/api/0301-ItemStack-editMeta.patch
rename to patches/api/0302-ItemStack-editMeta.patch
diff --git a/patches/api/0302-Add-EntityInsideBlockEvent.patch b/patches/api/0303-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/api/0302-Add-EntityInsideBlockEvent.patch
rename to patches/api/0303-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0303-Attributes-API-for-item-defaults.patch b/patches/api/0304-Attributes-API-for-item-defaults.patch
similarity index 100%
rename from patches/api/0303-Attributes-API-for-item-defaults.patch
rename to patches/api/0304-Attributes-API-for-item-defaults.patch
diff --git a/patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0305-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/api/0304-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/api/0305-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0305-More-Lidded-Block-API.patch b/patches/api/0306-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/api/0305-More-Lidded-Block-API.patch
rename to patches/api/0306-More-Lidded-Block-API.patch
diff --git a/patches/api/0306-Add-PlayerKickEvent-causes.patch b/patches/api/0307-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/api/0306-Add-PlayerKickEvent-causes.patch
rename to patches/api/0307-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0307-Add-PufferFishStateChangeEvent.patch b/patches/api/0308-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/api/0307-Add-PufferFishStateChangeEvent.patch
rename to patches/api/0308-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0308-Add-BellRevealRaiderEvent.patch b/patches/api/0309-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/api/0308-Add-BellRevealRaiderEvent.patch
rename to patches/api/0309-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0309-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0310-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/api/0309-Add-ElderGuardianAppearanceEvent.patch
rename to patches/api/0310-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0310-Add-more-line-of-sight-methods.patch b/patches/api/0311-Add-more-line-of-sight-methods.patch
similarity index 100%
rename from patches/api/0310-Add-more-line-of-sight-methods.patch
rename to patches/api/0311-Add-more-line-of-sight-methods.patch
diff --git a/patches/api/0311-Add-more-LimitedRegion-API.patch b/patches/api/0312-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/api/0311-Add-more-LimitedRegion-API.patch
rename to patches/api/0312-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0312-Missing-Entity-Behavior-API.patch b/patches/api/0313-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/api/0312-Missing-Entity-Behavior-API.patch
rename to patches/api/0313-Missing-Entity-Behavior-API.patch
diff --git a/patches/server/0355-Implement-alternative-item-despawn-rate.patch b/patches/server/0355-Implement-alternative-item-despawn-rate.patch
index b481d30f3f..6482488f1b 100644
--- a/patches/server/0355-Implement-alternative-item-despawn-rate.patch
+++ b/patches/server/0355-Implement-alternative-item-despawn-rate.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement alternative item-despawn-rate
 Co-authored-by: Noah van der Aa <ndvdaa@gmail.com>
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 9e1db210ded0830d0dcfaa34936e66bbf51fc1fc..5918a319d34f8f30cce2f458dd061d83cd838ad0 100644
+index 9e1db210ded0830d0dcfaa34936e66bbf51fc1fc..1563d22762458b9ced45be29d60eef07bfc45bb3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -586,5 +586,74 @@ public class PaperWorldConfig {
@@ -16,7 +16,7 @@ index 9e1db210ded0830d0dcfaa34936e66bbf51fc1fc..5918a319d34f8f30cce2f458dd061d83
 -}
  
 +    public boolean altItemDespawnRateEnabled;
-+    public java.util.Map<net.minecraft.resources.ResourceLocation, Integer> altItemDespawnRateMap = new HashMap<>();
++    public java.util.Map<net.minecraft.resources.ResourceLocation, Integer> altItemDespawnRateMap = new java.util.HashMap<>();
 +    private void altItemDespawnRate() {
 +        String path = "alt-item-despawn-rate";
 +        // Migrate from bukkit material to Mojang item ids