From 5730a9420843cc700a0d00b5b1a8c2a68fc0bb11 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 18 Mar 2023 10:05:04 -0700
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#8991)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
2b4582fb SPIGOT-5916: getLastColors does not work with the rgb colors

CraftBukkit Changes:
f7707086d SPIGOT-7299: Fix indirect/anvil damage events and minor improvements
---
 ...patch => 0207-Add-setMaxPlayers-API.patch} |  0
 ...-Support-hex-colors-in-getLastColors.patch | 34 -------------------
 ...ent.patch => 0208-Add-BellRingEvent.patch} |  0
 ...PI.patch => 0209-Add-moon-phase-API.patch} |  0
 ...PickupItemAnimation-to-LivingEntity.patch} |  0
 ...I.patch => 0211-Add-more-Evoker-API.patch} |  0
 ...Add-methods-to-get-translation-keys.patch} |  0
 ...te-HoverEvent-from-ItemStack-Entity.patch} |  0
 ...l-open-container-api-to-HumanEntity.patch} |  0
 ...-Counter-to-allow-plugins-to-use-va.patch} |  0
 ...king.patch => 0216-Entity-isTicking.patch} |  0
 ...ocs-for-Entity.getEntitySpawnReason.patch} |  0
 ....patch => 0218-Villager-resetOffers.patch} |  0
 ...tch => 0219-Player-elytra-boost-API.patch} |  0
 ...Add-getOfflinePlayerIfCached-String.patch} |  0
 ...ch => 0221-Add-ignore-discounts-API.patch} |  0
 ...> 0222-Item-no-age-no-player-pickup.patch} |  0
 ...223-Beacon-API-custom-effect-ranges.patch} |  0
 ...tch => 0224-Add-API-for-quit-reason.patch} |  0
 ...patch => 0225-Add-Destroy-Speed-API.patch} |  0
 ...26-Add-LivingEntity-clearActiveItem.patch} |  0
 ...=> 0227-Add-PlayerItemCooldownEvent.patch} |  0
 ...PI.patch => 0228-More-lightning-API.patch} |  0
 ...h => 0229-Add-PlayerShearBlockEvent.patch} |  0
 ...30-Enable-multi-release-plugin-jars.patch} |  0
 ...231-Player-Chunk-Load-Unload-Events.patch} |  0
 ...-Expose-LivingEntity-hurt-direction.patch} |  0
 ...OBSTRUCTED-reason-to-BedEnterResult.patch} |  0
 ...atch => 0234-Added-PlayerTradeEvent.patch} |  0
 ...atch => 0235-Add-TargetHitEvent-API.patch} |  0
 ...236-Additional-Block-Material-API-s.patch} |  0
 ...t-Material-from-Boats-and-Minecarts.patch} |  0
 ...-Add-PlayerFlowerPotManipulateEvent.patch} |  0
 ...h => 0239-Zombie-API-breaking-doors.patch} |  0
 ...=> 0240-Add-EntityLoadCrossbowEvent.patch} |  0
 ...0241-Added-WorldGameRuleChangeEvent.patch} |  0
 ...-Added-ServerResourcesReloadedEvent.patch} |  0
 ...> 0243-Add-BlockFailedDispenseEvent.patch} |  0
 ...-Added-PlayerLecternPageChangeEvent.patch} |  0
 ...-Added-PlayerLoomPatternSelectEvent.patch} |  0
 ...act-interaction-point-in-PlayerInte.patch} |  0
 ...I.patch => 0247-Add-sendOpLevel-API.patch} |  0
 ...try.patch => 0248-Add-PaperRegistry.patch} |  0
 ...h => 0249-Add-StructuresLocateEvent.patch} |  0
 ...nent-with-empty-text-instead-of-thr.patch} |  0
 ...h => 0251-Add-BlockPreDispenseEvent.patch} |  0
 ... => 0252-Added-missing-vanilla-tags.patch} |  0
 ...Added-PlayerChangeBeaconEffectEvent.patch} |  0
 ...-PlayerStonecutterRecipeSelectEvent.patch} |  0
 ...eash-variable-to-EntityUnleashEvent.patch} |  0
 ...atch => 0256-add-DragonEggFormEvent.patch} |  0
 ...Event.patch => 0257-EntityMoveEvent.patch} |  0
 ...-adding-items-to-BlockDropItemEvent.patch} |  0
 ...inThreadExecutor-to-BukkitScheduler.patch} |  0
 ...entity-allow-attribute-registration.patch} |  0
 ...s.patch => 0261-Add-missing-effects.patch} |  0
 ...atch => 0262-Expose-Tracked-Players.patch} |  0
 ...ache-the-result-of-Material-isBlock.patch} |  2 +-
 ...atch => 0264-Add-worldborder-events.patch} |  0
 ...=> 0265-added-PlayerNameEntityEvent.patch} |  0
 ...h => 0266-Add-recipe-to-cook-events.patch} |  0
 ...patch => 0267-Add-Block-isValidTool.patch} |  0
 ....patch => 0268-Expand-world-key-API.patch} |  0
 ...y-API.patch => 0269-Item-Rarity-API.patch} |  2 +-
 ...tch => 0270-Expose-protocol-version.patch} |  0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |  0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |  0
 ...-set-drop-chance-to-EntityEquipment.patch} |  0
 ... => 0274-Added-PlayerDeepSleepEvent.patch} |  0
 ...ld-API.patch => 0275-More-World-API.patch} |  0
 ... 0276-Added-PlayerBedFailEnterEvent.patch} |  0
 ...acon-activation-deactivation-events.patch} |  0
 ...> 0278-PlayerMoveEvent-Improvements.patch} |  0
 ...-RespawnFlags-to-PlayerRespawnEvent.patch} |  0
 ...> 0280-Add-more-WanderingTrader-API.patch} |  0
 ...dd-EntityBlockStorage-clearEntities.patch} |  0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |  0
 ...address-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...close.patch => 0284-Inventory-close.patch} |  0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |  0
 ...atch => 0286-Add-basic-Datapack-API.patch} |  0
 ...itions-to-PlayerGameModeChangeEvent.patch} |  0
 ... => 0288-ItemStack-repair-check-API.patch} |  0
 ....patch => 0289-More-Enchantment-API.patch} |  0
 ...PI.patch => 0290-Add-Mob-lookAt-API.patch} |  0
 ...ta.patch => 0291-ItemStack-editMeta.patch} |  0
 ... => 0292-Add-EntityInsideBlockEvent.patch} |  0
 ...93-Attributes-API-for-item-defaults.patch} |  2 +-
 ...ause-to-Weather-ThunderChangeEvents.patch} |  0
 ...patch => 0295-More-Lidded-Block-API.patch} |  0
 ... => 0296-Add-PlayerKickEvent-causes.patch} |  0
 ...0297-Add-PufferFishStateChangeEvent.patch} |  0
 ...h => 0298-Add-BellRevealRaiderEvent.patch} |  0
 ...99-Add-ElderGuardianAppearanceEvent.patch} |  0
 ...0300-Add-more-line-of-sight-methods.patch} |  2 +-
 ... => 0301-Add-WaterBottleSplashEvent.patch} |  0
 ... => 0302-Add-more-LimitedRegion-API.patch} |  0
 ...=> 0303-Missing-Entity-Behavior-API.patch} |  0
 ...ch => 0304-Adds-PlayerArmSwingEvent.patch} |  0
 ...dd-PlayerSignCommandPreprocessEvent.patch} |  0
 ...array-elements-in-command-arguments.patch} |  0
 ...inger-API.patch => 0307-Stinger-API.patch} |  2 +-
 ...-to-contain-the-source-jars-in-stac.patch} |  0
 ...tch => 0309-Add-PlayerSetSpawnEvent.patch} |  0
 ...=> 0310-Added-EntityDamageItemEvent.patch} |  0
 ...Make-EntityUnleashEvent-cancellable.patch} |  0
 ...arget-without-changing-other-things.patch} |  0
 ...ch => 0313-Add-BlockBreakBlockEvent.patch} |  0
 ...pers-for-left-right-click-to-Action.patch} |  0
 ...revent-NBT-copy-in-smithing-recipes.patch} |  0
 ...patch => 0316-More-CommandBlock-API.patch} |  0
 ...-missing-team-sidebar-display-slots.patch} |  0
 ...0318-add-back-EntityPortalExitEvent.patch} |  0
 ...-find-targets-for-lightning-strikes.patch} |  0
 ... 0320-Get-entity-default-attributes.patch} |  0
 ...d-API.patch => 0321-Left-handed-API.patch} |  0
 ...ch => 0322-Add-more-advancement-API.patch} |  0
 ...323-Add-ItemFactory-getSpawnEgg-API.patch} |  0
 ...tch => 0324-Add-critical-damage-API.patch} |  0
 ...0325-Fix-issues-with-mob-conversion.patch} |  0
 ...ollidable-methods-to-various-places.patch} |  2 +-
 ...-ram-API.patch => 0327-Goat-ram-API.patch} |  0
 ...dd-API-for-resetting-a-single-score.patch} |  0
 ...9-Add-Raw-Byte-Entity-Serialization.patch} |  0
 ...0330-Add-PlayerItemFrameChangeEvent.patch} |  0
 ...> 0331-Add-player-health-update-API.patch} |  0
 ...low-delegation-to-vanilla-chunk-gen.patch} |  0
 ...patch => 0333-Add-more-Campfire-API.patch} |  0
 ...ehicleCollisionEvent-HandlerList-up.patch} |  0
 ... => 0335-Improve-scoreboard-entries.patch} |  0
 ...ch => 0336-Entity-powdered-snow-API.patch} |  0
 ...0337-Add-API-for-item-entity-health.patch} |  0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |  0
 ...le-API.patch => 0339-Bucketable-API.patch} |  0
 ...-for-default-config-comment-parsing.patch} |  0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |  0
 ...load-to-PersistentDataContainer-has.patch} |  0
 ...3-Multiple-Entries-with-Scoreboards.patch} |  0
 ...ostname-to-AsyncPlayerPreLoginEvent.patch} |  0
 ...n-strange-EventHandler-return-types.patch} |  0
 ...atch => 0346-Multi-Block-Change-API.patch} |  0
 ...ent.patch => 0347-Fix-NotePlayEvent.patch} |  0
 ....patch => 0348-Freeze-Tick-Lock-API.patch} |  0
 ...lphin-API.patch => 0349-Dolphin-API.patch} |  0
 ...h => 0350-More-PotionEffectType-API.patch} |  0
 ...command-sender-which-forwards-feedb.patch} |  0
 ...h => 0352-Implement-regenerateChunk.patch} |  0
 ...gs.patch => 0353-Add-GameEvent-tags.patch} |  0
 ...tch => 0354-Furnace-RecipesUsed-API.patch} |  0
 ...gurable-sculk-sensor-listener-range.patch} |  0
 ...d-missing-block-data-mins-and-maxes.patch} |  0
 ...s.patch => 0357-Custom-Potion-Mixes.patch} |  0
 ...Expose-furnace-minecart-push-values.patch} |  0
 ...I.patch => 0359-More-Projectile-API.patch} |  0
 ...ch => 0360-Add-getComputedBiome-API.patch} |  0
 ...h => 0361-Add-enchantWithLevels-API.patch} |  0
 ... 0362-Add-TameableDeathMessageEvent.patch} |  0
 ...hange-the-podium-of-the-EnderDragon.patch} |  0
 ...ing-amount-to-PlayerItemDamageEvent.patch} |  0
 ...> 0365-WorldCreator-keepSpawnLoaded.patch} |  0
 ...Event-and-CollarColorable-interface.patch} |  0
 ...> 0367-Add-PlayerStopUsingItemEvent.patch} |  0
 ...68-FallingBlock-auto-expire-setting.patch} |  0
 ...t-Type.patch => 0369-Keyed-Cat-Type.patch} |  0
 ...dd-method-isTickingWorlds-to-Bukkit.patch} |  0
 ... => 0371-Add-WardenAngerChangeEvent.patch} |  0
 ...I.patch => 0372-Nameable-Banner-API.patch} |  0
 ...atch => 0373-Add-Player-getFishHook.patch} |  0
 ...API.patch => 0374-More-Teleport-API.patch} |  0
 ... => 0375-Add-EntityPortalReadyEvent.patch} |  0
 ...tom-Chat-Completion-Suggestions-API.patch} |  0
 ...ion-API.patch => 0377-Collision-API.patch} |  0
 ...API.patch => 0378-Block-Ticking-API.patch} |  0
 ...379-Add-NamespacedKey-biome-methods.patch} |  0
 ...estroyerIdentity-to-sendBlockDamage.patch} |  0
 ...o-load-resources-from-LibraryLoader.patch} |  0
 ...serialization-deserialization-for-P.patch} |  0
 ...rameter-to-ProjectileSource-launchP.patch} |  0
 ...limit-in-YamlConfigOptions-and-incr.patch} |  0
 ... => 0385-Add-getDrops-to-BlockState.patch} |  0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |  0
 ... 0387-Elder-Guardian-appearance-API.patch} |  0
 ...ow-changing-bed-s-occupied-property.patch} |  0
 ...d-EquipmentSlot-convenience-methods.patch} |  0
 ...swingHand-EquipmentSlot-convenience.patch} |  0
 ...ch => 0391-Add-entity-knockback-API.patch} |  0
 ... => 0392-Added-EntityToggleSitEvent.patch} |  0
 ...patch => 0393-Add-Moving-Piston-API.patch} |  0
 ...0394-Add-PrePlayerAttackEntityEvent.patch} |  0
 ... 0395-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...397-Add-paper-dumplisteners-command.patch} |  0
 ....patch => 0398-ItemStack-damage-API.patch} |  0
 ...patch => 0399-Add-Tick-TemporalUnit.patch} |  0
 ...tion-API.patch => 0400-Friction-API.patch} |  2 +-
 ... 0401-Player-Entity-Tracking-Events.patch} |  0
 ...atch => 0402-Add-missing-Fluid-type.patch} |  0
 ... 0403-Mark-experimental-api-as-such.patch} |  0
 ...ments.patch => 0404-fix-Instruments.patch} |  0
 ...tch => 0405-Add-BlockLockCheckEvent.patch} |  0
 ... 0406-Add-Sneaking-API-for-Entities.patch} |  0
 ....patch => 0407-Improve-PortalEvents.patch} |  0
 ...ed-block-state-to-BlockExplodeEvent.patch} |  0
 ...atch => 0409-Flying-Fall-Damage-API.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  0
 ...eplace-ItemFlag.HIDE_POTION_EFFECTS.patch} |  0
 ...en-API.patch => 0412-Win-Screen-API.patch} |  0
 ...tch => 0413-Add-Entity-Body-Yaw-API.patch} |  0
 ...or-InventoryBlockStartEvent-subclas.patch} |  0
 ...=> 0415-Add-EntityFertilizeEggEvent.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...keboxes.patch => 0417-Fix-Jukeboxes.patch} |  0
 ...API.patch => 0418-Add-Shearable-API.patch} |  0
 patches/server/0110-Add-EntityZapEvent.patch  |  4 +--
 ...4-Add-source-to-PlayerExpChangeEvent.patch |  4 +--
 .../0115-Add-ProjectileCollideEvent.patch     |  6 ++--
 .../0218-InventoryCloseEvent-Reason-API.patch |  6 ++--
 ...8-Vanished-players-don-t-have-rights.patch |  4 +--
 .../server/0444-Add-PrepareResultEvent.patch  |  4 +--
 ...Implemented-BlockFailedDispenseEvent.patch |  4 +--
 ...0553-Implement-BlockPreDispenseEvent.patch |  4 +--
 ...Leash-variable-to-EntityUnleashEvent.patch |  4 +--
 .../server/0685-Add-critical-damage-API.patch | 14 ++++----
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 225 files changed, 36 insertions(+), 70 deletions(-)
 rename patches/api/{0208-Add-setMaxPlayers-API.patch => 0207-Add-setMaxPlayers-API.patch} (100%)
 delete mode 100644 patches/api/0207-Support-hex-colors-in-getLastColors.patch
 rename patches/api/{0209-Add-BellRingEvent.patch => 0208-Add-BellRingEvent.patch} (100%)
 rename patches/api/{0210-Add-moon-phase-API.patch => 0209-Add-moon-phase-API.patch} (100%)
 rename patches/api/{0211-Add-playPickupItemAnimation-to-LivingEntity.patch => 0210-Add-playPickupItemAnimation-to-LivingEntity.patch} (100%)
 rename patches/api/{0212-Add-more-Evoker-API.patch => 0211-Add-more-Evoker-API.patch} (100%)
 rename patches/api/{0213-Add-methods-to-get-translation-keys.patch => 0212-Add-methods-to-get-translation-keys.patch} (100%)
 rename patches/api/{0214-Create-HoverEvent-from-ItemStack-Entity.patch => 0213-Create-HoverEvent-from-ItemStack-Entity.patch} (100%)
 rename patches/api/{0215-Add-additional-open-container-api-to-HumanEntity.patch => 0214-Add-additional-open-container-api-to-HumanEntity.patch} (100%)
 rename patches/api/{0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch => 0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch} (100%)
 rename patches/api/{0217-Entity-isTicking.patch => 0216-Entity-isTicking.patch} (100%)
 rename patches/api/{0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch => 0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch} (100%)
 rename patches/api/{0219-Villager-resetOffers.patch => 0218-Villager-resetOffers.patch} (100%)
 rename patches/api/{0220-Player-elytra-boost-API.patch => 0219-Player-elytra-boost-API.patch} (100%)
 rename patches/api/{0221-Add-getOfflinePlayerIfCached-String.patch => 0220-Add-getOfflinePlayerIfCached-String.patch} (100%)
 rename patches/api/{0222-Add-ignore-discounts-API.patch => 0221-Add-ignore-discounts-API.patch} (100%)
 rename patches/api/{0223-Item-no-age-no-player-pickup.patch => 0222-Item-no-age-no-player-pickup.patch} (100%)
 rename patches/api/{0224-Beacon-API-custom-effect-ranges.patch => 0223-Beacon-API-custom-effect-ranges.patch} (100%)
 rename patches/api/{0225-Add-API-for-quit-reason.patch => 0224-Add-API-for-quit-reason.patch} (100%)
 rename patches/api/{0226-Add-Destroy-Speed-API.patch => 0225-Add-Destroy-Speed-API.patch} (100%)
 rename patches/api/{0227-Add-LivingEntity-clearActiveItem.patch => 0226-Add-LivingEntity-clearActiveItem.patch} (100%)
 rename patches/api/{0228-Add-PlayerItemCooldownEvent.patch => 0227-Add-PlayerItemCooldownEvent.patch} (100%)
 rename patches/api/{0229-More-lightning-API.patch => 0228-More-lightning-API.patch} (100%)
 rename patches/api/{0230-Add-PlayerShearBlockEvent.patch => 0229-Add-PlayerShearBlockEvent.patch} (100%)
 rename patches/api/{0231-Enable-multi-release-plugin-jars.patch => 0230-Enable-multi-release-plugin-jars.patch} (100%)
 rename patches/api/{0232-Player-Chunk-Load-Unload-Events.patch => 0231-Player-Chunk-Load-Unload-Events.patch} (100%)
 rename patches/api/{0233-Expose-LivingEntity-hurt-direction.patch => 0232-Expose-LivingEntity-hurt-direction.patch} (100%)
 rename patches/api/{0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch => 0233-Add-OBSTRUCTED-reason-to-BedEnterResult.patch} (100%)
 rename patches/api/{0235-Added-PlayerTradeEvent.patch => 0234-Added-PlayerTradeEvent.patch} (100%)
 rename patches/api/{0236-Add-TargetHitEvent-API.patch => 0235-Add-TargetHitEvent-API.patch} (100%)
 rename patches/api/{0237-Additional-Block-Material-API-s.patch => 0236-Additional-Block-Material-API-s.patch} (100%)
 rename patches/api/{0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch => 0237-Add-API-to-get-Material-from-Boats-and-Minecarts.patch} (100%)
 rename patches/api/{0239-Add-PlayerFlowerPotManipulateEvent.patch => 0238-Add-PlayerFlowerPotManipulateEvent.patch} (100%)
 rename patches/api/{0240-Zombie-API-breaking-doors.patch => 0239-Zombie-API-breaking-doors.patch} (100%)
 rename patches/api/{0241-Add-EntityLoadCrossbowEvent.patch => 0240-Add-EntityLoadCrossbowEvent.patch} (100%)
 rename patches/api/{0242-Added-WorldGameRuleChangeEvent.patch => 0241-Added-WorldGameRuleChangeEvent.patch} (100%)
 rename patches/api/{0243-Added-ServerResourcesReloadedEvent.patch => 0242-Added-ServerResourcesReloadedEvent.patch} (100%)
 rename patches/api/{0244-Add-BlockFailedDispenseEvent.patch => 0243-Add-BlockFailedDispenseEvent.patch} (100%)
 rename patches/api/{0245-Added-PlayerLecternPageChangeEvent.patch => 0244-Added-PlayerLecternPageChangeEvent.patch} (100%)
 rename patches/api/{0246-Added-PlayerLoomPatternSelectEvent.patch => 0245-Added-PlayerLoomPatternSelectEvent.patch} (100%)
 rename patches/api/{0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch => 0246-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch} (100%)
 rename patches/api/{0248-Add-sendOpLevel-API.patch => 0247-Add-sendOpLevel-API.patch} (100%)
 rename patches/api/{0249-Add-PaperRegistry.patch => 0248-Add-PaperRegistry.patch} (100%)
 rename patches/api/{0250-Add-StructuresLocateEvent.patch => 0249-Add-StructuresLocateEvent.patch} (100%)
 rename patches/api/{0251-Return-chat-component-with-empty-text-instead-of-thr.patch => 0250-Return-chat-component-with-empty-text-instead-of-thr.patch} (100%)
 rename patches/api/{0252-Add-BlockPreDispenseEvent.patch => 0251-Add-BlockPreDispenseEvent.patch} (100%)
 rename patches/api/{0253-Added-missing-vanilla-tags.patch => 0252-Added-missing-vanilla-tags.patch} (100%)
 rename patches/api/{0254-Added-PlayerChangeBeaconEffectEvent.patch => 0253-Added-PlayerChangeBeaconEffectEvent.patch} (100%)
 rename patches/api/{0255-Added-PlayerStonecutterRecipeSelectEvent.patch => 0254-Added-PlayerStonecutterRecipeSelectEvent.patch} (100%)
 rename patches/api/{0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch => 0255-Add-dropLeash-variable-to-EntityUnleashEvent.patch} (100%)
 rename patches/api/{0257-add-DragonEggFormEvent.patch => 0256-add-DragonEggFormEvent.patch} (100%)
 rename patches/api/{0258-EntityMoveEvent.patch => 0257-EntityMoveEvent.patch} (100%)
 rename patches/api/{0259-Allow-adding-items-to-BlockDropItemEvent.patch => 0258-Allow-adding-items-to-BlockDropItemEvent.patch} (100%)
 rename patches/api/{0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch => 0259-Add-getMainThreadExecutor-to-BukkitScheduler.patch} (100%)
 rename patches/api/{0261-living-entity-allow-attribute-registration.patch => 0260-living-entity-allow-attribute-registration.patch} (100%)
 rename patches/api/{0262-Add-missing-effects.patch => 0261-Add-missing-effects.patch} (100%)
 rename patches/api/{0263-Expose-Tracked-Players.patch => 0262-Expose-Tracked-Players.patch} (100%)
 rename patches/api/{0264-Cache-the-result-of-Material-isBlock.patch => 0263-Cache-the-result-of-Material-isBlock.patch} (93%)
 rename patches/api/{0265-Add-worldborder-events.patch => 0264-Add-worldborder-events.patch} (100%)
 rename patches/api/{0266-added-PlayerNameEntityEvent.patch => 0265-added-PlayerNameEntityEvent.patch} (100%)
 rename patches/api/{0267-Add-recipe-to-cook-events.patch => 0266-Add-recipe-to-cook-events.patch} (100%)
 rename patches/api/{0268-Add-Block-isValidTool.patch => 0267-Add-Block-isValidTool.patch} (100%)
 rename patches/api/{0269-Expand-world-key-API.patch => 0268-Expand-world-key-API.patch} (100%)
 rename patches/api/{0270-Item-Rarity-API.patch => 0269-Item-Rarity-API.patch} (97%)
 rename patches/api/{0271-Expose-protocol-version.patch => 0270-Expose-protocol-version.patch} (100%)
 rename patches/api/{0272-add-isDeeplySleeping-to-HumanEntity.patch => 0271-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/api/{0273-add-consumeFuel-to-FurnaceBurnEvent.patch => 0272-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/api/{0274-add-get-set-drop-chance-to-EntityEquipment.patch => 0273-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/api/{0275-Added-PlayerDeepSleepEvent.patch => 0274-Added-PlayerDeepSleepEvent.patch} (100%)
 rename patches/api/{0276-More-World-API.patch => 0275-More-World-API.patch} (100%)
 rename patches/api/{0277-Added-PlayerBedFailEnterEvent.patch => 0276-Added-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/api/{0278-Introduce-beacon-activation-deactivation-events.patch => 0277-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/api/{0279-PlayerMoveEvent-Improvements.patch => 0278-PlayerMoveEvent-Improvements.patch} (100%)
 rename patches/api/{0280-add-RespawnFlags-to-PlayerRespawnEvent.patch => 0279-add-RespawnFlags-to-PlayerRespawnEvent.patch} (100%)
 rename patches/api/{0281-Add-more-WanderingTrader-API.patch => 0280-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/api/{0282-Add-EntityBlockStorage-clearEntities.patch => 0281-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/api/{0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0282-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/api/{0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch => 0283-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/api/{0285-Inventory-close.patch => 0284-Inventory-close.patch} (100%)
 rename patches/api/{0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0285-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/api/{0287-Add-basic-Datapack-API.patch => 0286-Add-basic-Datapack-API.patch} (100%)
 rename patches/api/{0288-additions-to-PlayerGameModeChangeEvent.patch => 0287-additions-to-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/api/{0289-ItemStack-repair-check-API.patch => 0288-ItemStack-repair-check-API.patch} (100%)
 rename patches/api/{0290-More-Enchantment-API.patch => 0289-More-Enchantment-API.patch} (100%)
 rename patches/api/{0291-Add-Mob-lookAt-API.patch => 0290-Add-Mob-lookAt-API.patch} (100%)
 rename patches/api/{0292-ItemStack-editMeta.patch => 0291-ItemStack-editMeta.patch} (100%)
 rename patches/api/{0293-Add-EntityInsideBlockEvent.patch => 0292-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/api/{0294-Attributes-API-for-item-defaults.patch => 0293-Attributes-API-for-item-defaults.patch} (96%)
 rename patches/api/{0295-Add-cause-to-Weather-ThunderChangeEvents.patch => 0294-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/api/{0296-More-Lidded-Block-API.patch => 0295-More-Lidded-Block-API.patch} (100%)
 rename patches/api/{0297-Add-PlayerKickEvent-causes.patch => 0296-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/api/{0298-Add-PufferFishStateChangeEvent.patch => 0297-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/api/{0299-Add-BellRevealRaiderEvent.patch => 0298-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/api/{0300-Add-ElderGuardianAppearanceEvent.patch => 0299-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/api/{0301-Add-more-line-of-sight-methods.patch => 0300-Add-more-line-of-sight-methods.patch} (95%)
 rename patches/api/{0302-Add-WaterBottleSplashEvent.patch => 0301-Add-WaterBottleSplashEvent.patch} (100%)
 rename patches/api/{0303-Add-more-LimitedRegion-API.patch => 0302-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/api/{0304-Missing-Entity-Behavior-API.patch => 0303-Missing-Entity-Behavior-API.patch} (100%)
 rename patches/api/{0305-Adds-PlayerArmSwingEvent.patch => 0304-Adds-PlayerArmSwingEvent.patch} (100%)
 rename patches/api/{0306-Add-PlayerSignCommandPreprocessEvent.patch => 0305-Add-PlayerSignCommandPreprocessEvent.patch} (100%)
 rename patches/api/{0307-fix-empty-array-elements-in-command-arguments.patch => 0306-fix-empty-array-elements-in-command-arguments.patch} (100%)
 rename patches/api/{0308-Stinger-API.patch => 0307-Stinger-API.patch} (94%)
 rename patches/api/{0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch => 0308-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch} (100%)
 rename patches/api/{0310-Add-PlayerSetSpawnEvent.patch => 0309-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/api/{0311-Added-EntityDamageItemEvent.patch => 0310-Added-EntityDamageItemEvent.patch} (100%)
 rename patches/api/{0312-Make-EntityUnleashEvent-cancellable.patch => 0311-Make-EntityUnleashEvent-cancellable.patch} (100%)
 rename patches/api/{0313-Change-EnderEye-target-without-changing-other-things.patch => 0312-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/api/{0314-Add-BlockBreakBlockEvent.patch => 0313-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/api/{0315-Add-helpers-for-left-right-click-to-Action.patch => 0314-Add-helpers-for-left-right-click-to-Action.patch} (100%)
 rename patches/api/{0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch => 0315-Option-to-prevent-NBT-copy-in-smithing-recipes.patch} (100%)
 rename patches/api/{0317-More-CommandBlock-API.patch => 0316-More-CommandBlock-API.patch} (100%)
 rename patches/api/{0318-Add-missing-team-sidebar-display-slots.patch => 0317-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/api/{0319-add-back-EntityPortalExitEvent.patch => 0318-add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/api/{0320-Add-methods-to-find-targets-for-lightning-strikes.patch => 0319-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/api/{0321-Get-entity-default-attributes.patch => 0320-Get-entity-default-attributes.patch} (100%)
 rename patches/api/{0322-Left-handed-API.patch => 0321-Left-handed-API.patch} (100%)
 rename patches/api/{0323-Add-more-advancement-API.patch => 0322-Add-more-advancement-API.patch} (100%)
 rename patches/api/{0324-Add-ItemFactory-getSpawnEgg-API.patch => 0323-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/api/{0325-Add-critical-damage-API.patch => 0324-Add-critical-damage-API.patch} (100%)
 rename patches/api/{0326-Fix-issues-with-mob-conversion.patch => 0325-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/api/{0327-Add-isCollidable-methods-to-various-places.patch => 0326-Add-isCollidable-methods-to-various-places.patch} (97%)
 rename patches/api/{0328-Goat-ram-API.patch => 0327-Goat-ram-API.patch} (100%)
 rename patches/api/{0329-Add-API-for-resetting-a-single-score.patch => 0328-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/api/{0330-Add-Raw-Byte-Entity-Serialization.patch => 0329-Add-Raw-Byte-Entity-Serialization.patch} (100%)
 rename patches/api/{0331-Add-PlayerItemFrameChangeEvent.patch => 0330-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/api/{0332-Add-player-health-update-API.patch => 0331-Add-player-health-update-API.patch} (100%)
 rename patches/api/{0333-Allow-delegation-to-vanilla-chunk-gen.patch => 0332-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/api/{0334-Add-more-Campfire-API.patch => 0333-Add-more-Campfire-API.patch} (100%)
 rename patches/api/{0335-Move-VehicleCollisionEvent-HandlerList-up.patch => 0334-Move-VehicleCollisionEvent-HandlerList-up.patch} (100%)
 rename patches/api/{0336-Improve-scoreboard-entries.patch => 0335-Improve-scoreboard-entries.patch} (100%)
 rename patches/api/{0337-Entity-powdered-snow-API.patch => 0336-Entity-powdered-snow-API.patch} (100%)
 rename patches/api/{0338-Add-API-for-item-entity-health.patch => 0337-Add-API-for-item-entity-health.patch} (100%)
 rename patches/api/{0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0338-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/api/{0340-Bucketable-API.patch => 0339-Bucketable-API.patch} (100%)
 rename patches/api/{0341-System-prop-for-default-config-comment-parsing.patch => 0340-System-prop-for-default-config-comment-parsing.patch} (100%)
 rename patches/api/{0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0341-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/api/{0343-Add-new-overload-to-PersistentDataContainer-has.patch => 0342-Add-new-overload-to-PersistentDataContainer-has.patch} (100%)
 rename patches/api/{0344-Multiple-Entries-with-Scoreboards.patch => 0343-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/api/{0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch => 0344-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch} (100%)
 rename patches/api/{0346-Warn-on-strange-EventHandler-return-types.patch => 0345-Warn-on-strange-EventHandler-return-types.patch} (100%)
 rename patches/api/{0347-Multi-Block-Change-API.patch => 0346-Multi-Block-Change-API.patch} (100%)
 rename patches/api/{0348-Fix-NotePlayEvent.patch => 0347-Fix-NotePlayEvent.patch} (100%)
 rename patches/api/{0349-Freeze-Tick-Lock-API.patch => 0348-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/api/{0350-Dolphin-API.patch => 0349-Dolphin-API.patch} (100%)
 rename patches/api/{0351-More-PotionEffectType-API.patch => 0350-More-PotionEffectType-API.patch} (100%)
 rename patches/api/{0352-API-for-creating-command-sender-which-forwards-feedb.patch => 0351-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/api/{0353-Implement-regenerateChunk.patch => 0352-Implement-regenerateChunk.patch} (100%)
 rename patches/api/{0354-Add-GameEvent-tags.patch => 0353-Add-GameEvent-tags.patch} (100%)
 rename patches/api/{0355-Furnace-RecipesUsed-API.patch => 0354-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/api/{0356-Configurable-sculk-sensor-listener-range.patch => 0355-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/api/{0357-Add-missing-block-data-mins-and-maxes.patch => 0356-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/api/{0358-Custom-Potion-Mixes.patch => 0357-Custom-Potion-Mixes.patch} (100%)
 rename patches/api/{0359-Expose-furnace-minecart-push-values.patch => 0358-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/api/{0360-More-Projectile-API.patch => 0359-More-Projectile-API.patch} (100%)
 rename patches/api/{0361-Add-getComputedBiome-API.patch => 0360-Add-getComputedBiome-API.patch} (100%)
 rename patches/api/{0362-Add-enchantWithLevels-API.patch => 0361-Add-enchantWithLevels-API.patch} (100%)
 rename patches/api/{0363-Add-TameableDeathMessageEvent.patch => 0362-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/api/{0364-Allow-to-change-the-podium-of-the-EnderDragon.patch => 0363-Allow-to-change-the-podium-of-the-EnderDragon.patch} (100%)
 rename patches/api/{0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch => 0364-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch} (100%)
 rename patches/api/{0366-WorldCreator-keepSpawnLoaded.patch => 0365-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/api/{0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0366-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/api/{0368-Add-PlayerStopUsingItemEvent.patch => 0367-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/api/{0369-FallingBlock-auto-expire-setting.patch => 0368-FallingBlock-auto-expire-setting.patch} (100%)
 rename patches/api/{0370-Keyed-Cat-Type.patch => 0369-Keyed-Cat-Type.patch} (100%)
 rename patches/api/{0371-Add-method-isTickingWorlds-to-Bukkit.patch => 0370-Add-method-isTickingWorlds-to-Bukkit.patch} (100%)
 rename patches/api/{0372-Add-WardenAngerChangeEvent.patch => 0371-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/api/{0373-Nameable-Banner-API.patch => 0372-Nameable-Banner-API.patch} (100%)
 rename patches/api/{0374-Add-Player-getFishHook.patch => 0373-Add-Player-getFishHook.patch} (100%)
 rename patches/api/{0375-More-Teleport-API.patch => 0374-More-Teleport-API.patch} (100%)
 rename patches/api/{0376-Add-EntityPortalReadyEvent.patch => 0375-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/api/{0377-Custom-Chat-Completion-Suggestions-API.patch => 0376-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/api/{0378-Collision-API.patch => 0377-Collision-API.patch} (100%)
 rename patches/api/{0379-Block-Ticking-API.patch => 0378-Block-Ticking-API.patch} (100%)
 rename patches/api/{0380-Add-NamespacedKey-biome-methods.patch => 0379-Add-NamespacedKey-biome-methods.patch} (100%)
 rename patches/api/{0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch => 0380-Add-custom-destroyerIdentity-to-sendBlockDamage.patch} (100%)
 rename patches/api/{0382-Also-load-resources-from-LibraryLoader.patch => 0381-Also-load-resources-from-LibraryLoader.patch} (100%)
 rename patches/api/{0383-Added-byte-array-serialization-deserialization-for-P.patch => 0382-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/api/{0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0383-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/api/{0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch => 0384-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch} (100%)
 rename patches/api/{0386-Add-getDrops-to-BlockState.patch => 0385-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/api/{0387-Add-PlayerInventorySlotChangeEvent.patch => 0386-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/api/{0388-Elder-Guardian-appearance-API.patch => 0387-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/api/{0389-Allow-changing-bed-s-occupied-property.patch => 0388-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/api/{0390-Add-EquipmentSlot-convenience-methods.patch => 0389-Add-EquipmentSlot-convenience-methods.patch} (100%)
 rename patches/api/{0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch => 0390-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch} (100%)
 rename patches/api/{0392-Add-entity-knockback-API.patch => 0391-Add-entity-knockback-API.patch} (100%)
 rename patches/api/{0393-Added-EntityToggleSitEvent.patch => 0392-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/api/{0394-Add-Moving-Piston-API.patch => 0393-Add-Moving-Piston-API.patch} (100%)
 rename patches/api/{0395-Add-PrePlayerAttackEntityEvent.patch => 0394-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/api/{0396-Add-Player-Warden-Warning-API.patch => 0395-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/api/{0397-More-vanilla-friendly-methods-to-update-trades.patch => 0396-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/api/{0398-Add-paper-dumplisteners-command.patch => 0397-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/api/{0399-ItemStack-damage-API.patch => 0398-ItemStack-damage-API.patch} (100%)
 rename patches/api/{0400-Add-Tick-TemporalUnit.patch => 0399-Add-Tick-TemporalUnit.patch} (100%)
 rename patches/api/{0401-Friction-API.patch => 0400-Friction-API.patch} (96%)
 rename patches/api/{0402-Player-Entity-Tracking-Events.patch => 0401-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/api/{0403-Add-missing-Fluid-type.patch => 0402-Add-missing-Fluid-type.patch} (100%)
 rename patches/api/{0404-Mark-experimental-api-as-such.patch => 0403-Mark-experimental-api-as-such.patch} (100%)
 rename patches/api/{0405-fix-Instruments.patch => 0404-fix-Instruments.patch} (100%)
 rename patches/api/{0406-Add-BlockLockCheckEvent.patch => 0405-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/api/{0407-Add-Sneaking-API-for-Entities.patch => 0406-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/api/{0408-Improve-PortalEvents.patch => 0407-Improve-PortalEvents.patch} (100%)
 rename patches/api/{0409-Add-exploded-block-state-to-BlockExplodeEvent.patch => 0408-Add-exploded-block-state-to-BlockExplodeEvent.patch} (100%)
 rename patches/api/{0410-Flying-Fall-Damage-API.patch => 0409-Flying-Fall-Damage-API.patch} (100%)
 rename patches/api/{0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0410-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/api/{0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch => 0411-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch} (100%)
 rename patches/api/{0413-Win-Screen-API.patch => 0412-Win-Screen-API.patch} (100%)
 rename patches/api/{0414-Add-Entity-Body-Yaw-API.patch => 0413-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/api/{0415-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch => 0414-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch} (100%)
 rename patches/api/{0416-Add-EntityFertilizeEggEvent.patch => 0415-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/api/{0417-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0416-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/api/{0418-Fix-Jukeboxes.patch => 0417-Fix-Jukeboxes.patch} (100%)
 rename patches/api/{0419-Add-Shearable-API.patch => 0418-Add-Shearable-API.patch} (100%)

diff --git a/patches/api/0208-Add-setMaxPlayers-API.patch b/patches/api/0207-Add-setMaxPlayers-API.patch
similarity index 100%
rename from patches/api/0208-Add-setMaxPlayers-API.patch
rename to patches/api/0207-Add-setMaxPlayers-API.patch
diff --git a/patches/api/0207-Support-hex-colors-in-getLastColors.patch b/patches/api/0207-Support-hex-colors-in-getLastColors.patch
deleted file mode 100644
index fec6bebf3c..0000000000
--- a/patches/api/0207-Support-hex-colors-in-getLastColors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Gerrygames <gecam59@gmail.com>
-Date: Thu, 16 Jul 2020 10:40:10 +0200
-Subject: [PATCH] Support hex colors in getLastColors
-
-
-diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index 24ade174df77d75339b44bcd4b035e0c46d95dc3..f6eb30f53dad684f156102cf7147b2f00c82c71e 100644
---- a/src/main/java/org/bukkit/ChatColor.java
-+++ b/src/main/java/org/bukkit/ChatColor.java
-@@ -363,6 +363,7 @@ public enum ChatColor {
-         return new String(b);
-     }
- 
-+    private static final Pattern HEX_COLOR_PATTERN = Pattern.compile(COLOR_CHAR + "x(?>" + COLOR_CHAR + "[0-9a-f]){6}", Pattern.CASE_INSENSITIVE); // Paper - Support hex colors in getLastColors
-     /**
-      * Gets the ChatColors used at the end of the given input string.
-      *
-@@ -380,6 +381,15 @@ public enum ChatColor {
-         for (int index = length - 1; index > -1; index--) {
-             char section = input.charAt(index);
-             if (section == COLOR_CHAR && index < length - 1) {
-+                // Paper start - Support hex colors
-+                if (index > 11 && input.charAt(index - 12) == COLOR_CHAR && (input.charAt(index - 11) == 'x' || input.charAt(index - 11) == 'X')) {
-+                    String color = input.substring(index - 12, index + 2);
-+                    if (HEX_COLOR_PATTERN.matcher(color).matches()) {
-+                        result = color + result;
-+                        break;
-+                    }
-+                }
-+                // Paper end
-                 char c = input.charAt(index + 1);
-                 ChatColor color = getByChar(c);
- 
diff --git a/patches/api/0209-Add-BellRingEvent.patch b/patches/api/0208-Add-BellRingEvent.patch
similarity index 100%
rename from patches/api/0209-Add-BellRingEvent.patch
rename to patches/api/0208-Add-BellRingEvent.patch
diff --git a/patches/api/0210-Add-moon-phase-API.patch b/patches/api/0209-Add-moon-phase-API.patch
similarity index 100%
rename from patches/api/0210-Add-moon-phase-API.patch
rename to patches/api/0209-Add-moon-phase-API.patch
diff --git a/patches/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch
similarity index 100%
rename from patches/api/0211-Add-playPickupItemAnimation-to-LivingEntity.patch
rename to patches/api/0210-Add-playPickupItemAnimation-to-LivingEntity.patch
diff --git a/patches/api/0212-Add-more-Evoker-API.patch b/patches/api/0211-Add-more-Evoker-API.patch
similarity index 100%
rename from patches/api/0212-Add-more-Evoker-API.patch
rename to patches/api/0211-Add-more-Evoker-API.patch
diff --git a/patches/api/0213-Add-methods-to-get-translation-keys.patch b/patches/api/0212-Add-methods-to-get-translation-keys.patch
similarity index 100%
rename from patches/api/0213-Add-methods-to-get-translation-keys.patch
rename to patches/api/0212-Add-methods-to-get-translation-keys.patch
diff --git a/patches/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
similarity index 100%
rename from patches/api/0214-Create-HoverEvent-from-ItemStack-Entity.patch
rename to patches/api/0213-Create-HoverEvent-from-ItemStack-Entity.patch
diff --git a/patches/api/0215-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0215-Add-additional-open-container-api-to-HumanEntity.patch
rename to patches/api/0214-Add-additional-open-container-api-to-HumanEntity.patch
diff --git a/patches/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
similarity index 100%
rename from patches/api/0216-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
rename to patches/api/0215-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch
diff --git a/patches/api/0217-Entity-isTicking.patch b/patches/api/0216-Entity-isTicking.patch
similarity index 100%
rename from patches/api/0217-Entity-isTicking.patch
rename to patches/api/0216-Entity-isTicking.patch
diff --git a/patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
similarity index 100%
rename from patches/api/0218-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
rename to patches/api/0217-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch
diff --git a/patches/api/0219-Villager-resetOffers.patch b/patches/api/0218-Villager-resetOffers.patch
similarity index 100%
rename from patches/api/0219-Villager-resetOffers.patch
rename to patches/api/0218-Villager-resetOffers.patch
diff --git a/patches/api/0220-Player-elytra-boost-API.patch b/patches/api/0219-Player-elytra-boost-API.patch
similarity index 100%
rename from patches/api/0220-Player-elytra-boost-API.patch
rename to patches/api/0219-Player-elytra-boost-API.patch
diff --git a/patches/api/0221-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0220-Add-getOfflinePlayerIfCached-String.patch
similarity index 100%
rename from patches/api/0221-Add-getOfflinePlayerIfCached-String.patch
rename to patches/api/0220-Add-getOfflinePlayerIfCached-String.patch
diff --git a/patches/api/0222-Add-ignore-discounts-API.patch b/patches/api/0221-Add-ignore-discounts-API.patch
similarity index 100%
rename from patches/api/0222-Add-ignore-discounts-API.patch
rename to patches/api/0221-Add-ignore-discounts-API.patch
diff --git a/patches/api/0223-Item-no-age-no-player-pickup.patch b/patches/api/0222-Item-no-age-no-player-pickup.patch
similarity index 100%
rename from patches/api/0223-Item-no-age-no-player-pickup.patch
rename to patches/api/0222-Item-no-age-no-player-pickup.patch
diff --git a/patches/api/0224-Beacon-API-custom-effect-ranges.patch b/patches/api/0223-Beacon-API-custom-effect-ranges.patch
similarity index 100%
rename from patches/api/0224-Beacon-API-custom-effect-ranges.patch
rename to patches/api/0223-Beacon-API-custom-effect-ranges.patch
diff --git a/patches/api/0225-Add-API-for-quit-reason.patch b/patches/api/0224-Add-API-for-quit-reason.patch
similarity index 100%
rename from patches/api/0225-Add-API-for-quit-reason.patch
rename to patches/api/0224-Add-API-for-quit-reason.patch
diff --git a/patches/api/0226-Add-Destroy-Speed-API.patch b/patches/api/0225-Add-Destroy-Speed-API.patch
similarity index 100%
rename from patches/api/0226-Add-Destroy-Speed-API.patch
rename to patches/api/0225-Add-Destroy-Speed-API.patch
diff --git a/patches/api/0227-Add-LivingEntity-clearActiveItem.patch b/patches/api/0226-Add-LivingEntity-clearActiveItem.patch
similarity index 100%
rename from patches/api/0227-Add-LivingEntity-clearActiveItem.patch
rename to patches/api/0226-Add-LivingEntity-clearActiveItem.patch
diff --git a/patches/api/0228-Add-PlayerItemCooldownEvent.patch b/patches/api/0227-Add-PlayerItemCooldownEvent.patch
similarity index 100%
rename from patches/api/0228-Add-PlayerItemCooldownEvent.patch
rename to patches/api/0227-Add-PlayerItemCooldownEvent.patch
diff --git a/patches/api/0229-More-lightning-API.patch b/patches/api/0228-More-lightning-API.patch
similarity index 100%
rename from patches/api/0229-More-lightning-API.patch
rename to patches/api/0228-More-lightning-API.patch
diff --git a/patches/api/0230-Add-PlayerShearBlockEvent.patch b/patches/api/0229-Add-PlayerShearBlockEvent.patch
similarity index 100%
rename from patches/api/0230-Add-PlayerShearBlockEvent.patch
rename to patches/api/0229-Add-PlayerShearBlockEvent.patch
diff --git a/patches/api/0231-Enable-multi-release-plugin-jars.patch b/patches/api/0230-Enable-multi-release-plugin-jars.patch
similarity index 100%
rename from patches/api/0231-Enable-multi-release-plugin-jars.patch
rename to patches/api/0230-Enable-multi-release-plugin-jars.patch
diff --git a/patches/api/0232-Player-Chunk-Load-Unload-Events.patch b/patches/api/0231-Player-Chunk-Load-Unload-Events.patch
similarity index 100%
rename from patches/api/0232-Player-Chunk-Load-Unload-Events.patch
rename to patches/api/0231-Player-Chunk-Load-Unload-Events.patch
diff --git a/patches/api/0233-Expose-LivingEntity-hurt-direction.patch b/patches/api/0232-Expose-LivingEntity-hurt-direction.patch
similarity index 100%
rename from patches/api/0233-Expose-LivingEntity-hurt-direction.patch
rename to patches/api/0232-Expose-LivingEntity-hurt-direction.patch
diff --git a/patches/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0233-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
similarity index 100%
rename from patches/api/0234-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
rename to patches/api/0233-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
diff --git a/patches/api/0235-Added-PlayerTradeEvent.patch b/patches/api/0234-Added-PlayerTradeEvent.patch
similarity index 100%
rename from patches/api/0235-Added-PlayerTradeEvent.patch
rename to patches/api/0234-Added-PlayerTradeEvent.patch
diff --git a/patches/api/0236-Add-TargetHitEvent-API.patch b/patches/api/0235-Add-TargetHitEvent-API.patch
similarity index 100%
rename from patches/api/0236-Add-TargetHitEvent-API.patch
rename to patches/api/0235-Add-TargetHitEvent-API.patch
diff --git a/patches/api/0237-Additional-Block-Material-API-s.patch b/patches/api/0236-Additional-Block-Material-API-s.patch
similarity index 100%
rename from patches/api/0237-Additional-Block-Material-API-s.patch
rename to patches/api/0236-Additional-Block-Material-API-s.patch
diff --git a/patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0237-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
similarity index 100%
rename from patches/api/0238-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
rename to patches/api/0237-Add-API-to-get-Material-from-Boats-and-Minecarts.patch
diff --git a/patches/api/0239-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0238-Add-PlayerFlowerPotManipulateEvent.patch
similarity index 100%
rename from patches/api/0239-Add-PlayerFlowerPotManipulateEvent.patch
rename to patches/api/0238-Add-PlayerFlowerPotManipulateEvent.patch
diff --git a/patches/api/0240-Zombie-API-breaking-doors.patch b/patches/api/0239-Zombie-API-breaking-doors.patch
similarity index 100%
rename from patches/api/0240-Zombie-API-breaking-doors.patch
rename to patches/api/0239-Zombie-API-breaking-doors.patch
diff --git a/patches/api/0241-Add-EntityLoadCrossbowEvent.patch b/patches/api/0240-Add-EntityLoadCrossbowEvent.patch
similarity index 100%
rename from patches/api/0241-Add-EntityLoadCrossbowEvent.patch
rename to patches/api/0240-Add-EntityLoadCrossbowEvent.patch
diff --git a/patches/api/0242-Added-WorldGameRuleChangeEvent.patch b/patches/api/0241-Added-WorldGameRuleChangeEvent.patch
similarity index 100%
rename from patches/api/0242-Added-WorldGameRuleChangeEvent.patch
rename to patches/api/0241-Added-WorldGameRuleChangeEvent.patch
diff --git a/patches/api/0243-Added-ServerResourcesReloadedEvent.patch b/patches/api/0242-Added-ServerResourcesReloadedEvent.patch
similarity index 100%
rename from patches/api/0243-Added-ServerResourcesReloadedEvent.patch
rename to patches/api/0242-Added-ServerResourcesReloadedEvent.patch
diff --git a/patches/api/0244-Add-BlockFailedDispenseEvent.patch b/patches/api/0243-Add-BlockFailedDispenseEvent.patch
similarity index 100%
rename from patches/api/0244-Add-BlockFailedDispenseEvent.patch
rename to patches/api/0243-Add-BlockFailedDispenseEvent.patch
diff --git a/patches/api/0245-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0244-Added-PlayerLecternPageChangeEvent.patch
similarity index 100%
rename from patches/api/0245-Added-PlayerLecternPageChangeEvent.patch
rename to patches/api/0244-Added-PlayerLecternPageChangeEvent.patch
diff --git a/patches/api/0246-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0245-Added-PlayerLoomPatternSelectEvent.patch
similarity index 100%
rename from patches/api/0246-Added-PlayerLoomPatternSelectEvent.patch
rename to patches/api/0245-Added-PlayerLoomPatternSelectEvent.patch
diff --git a/patches/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0246-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
similarity index 100%
rename from patches/api/0247-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
rename to patches/api/0246-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch
diff --git a/patches/api/0248-Add-sendOpLevel-API.patch b/patches/api/0247-Add-sendOpLevel-API.patch
similarity index 100%
rename from patches/api/0248-Add-sendOpLevel-API.patch
rename to patches/api/0247-Add-sendOpLevel-API.patch
diff --git a/patches/api/0249-Add-PaperRegistry.patch b/patches/api/0248-Add-PaperRegistry.patch
similarity index 100%
rename from patches/api/0249-Add-PaperRegistry.patch
rename to patches/api/0248-Add-PaperRegistry.patch
diff --git a/patches/api/0250-Add-StructuresLocateEvent.patch b/patches/api/0249-Add-StructuresLocateEvent.patch
similarity index 100%
rename from patches/api/0250-Add-StructuresLocateEvent.patch
rename to patches/api/0249-Add-StructuresLocateEvent.patch
diff --git a/patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0250-Return-chat-component-with-empty-text-instead-of-thr.patch
similarity index 100%
rename from patches/api/0251-Return-chat-component-with-empty-text-instead-of-thr.patch
rename to patches/api/0250-Return-chat-component-with-empty-text-instead-of-thr.patch
diff --git a/patches/api/0252-Add-BlockPreDispenseEvent.patch b/patches/api/0251-Add-BlockPreDispenseEvent.patch
similarity index 100%
rename from patches/api/0252-Add-BlockPreDispenseEvent.patch
rename to patches/api/0251-Add-BlockPreDispenseEvent.patch
diff --git a/patches/api/0253-Added-missing-vanilla-tags.patch b/patches/api/0252-Added-missing-vanilla-tags.patch
similarity index 100%
rename from patches/api/0253-Added-missing-vanilla-tags.patch
rename to patches/api/0252-Added-missing-vanilla-tags.patch
diff --git a/patches/api/0254-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0253-Added-PlayerChangeBeaconEffectEvent.patch
similarity index 100%
rename from patches/api/0254-Added-PlayerChangeBeaconEffectEvent.patch
rename to patches/api/0253-Added-PlayerChangeBeaconEffectEvent.patch
diff --git a/patches/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0254-Added-PlayerStonecutterRecipeSelectEvent.patch
similarity index 100%
rename from patches/api/0255-Added-PlayerStonecutterRecipeSelectEvent.patch
rename to patches/api/0254-Added-PlayerStonecutterRecipeSelectEvent.patch
diff --git a/patches/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0255-Add-dropLeash-variable-to-EntityUnleashEvent.patch
similarity index 100%
rename from patches/api/0256-Add-dropLeash-variable-to-EntityUnleashEvent.patch
rename to patches/api/0255-Add-dropLeash-variable-to-EntityUnleashEvent.patch
diff --git a/patches/api/0257-add-DragonEggFormEvent.patch b/patches/api/0256-add-DragonEggFormEvent.patch
similarity index 100%
rename from patches/api/0257-add-DragonEggFormEvent.patch
rename to patches/api/0256-add-DragonEggFormEvent.patch
diff --git a/patches/api/0258-EntityMoveEvent.patch b/patches/api/0257-EntityMoveEvent.patch
similarity index 100%
rename from patches/api/0258-EntityMoveEvent.patch
rename to patches/api/0257-EntityMoveEvent.patch
diff --git a/patches/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0258-Allow-adding-items-to-BlockDropItemEvent.patch
similarity index 100%
rename from patches/api/0259-Allow-adding-items-to-BlockDropItemEvent.patch
rename to patches/api/0258-Allow-adding-items-to-BlockDropItemEvent.patch
diff --git a/patches/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0259-Add-getMainThreadExecutor-to-BukkitScheduler.patch
similarity index 100%
rename from patches/api/0260-Add-getMainThreadExecutor-to-BukkitScheduler.patch
rename to patches/api/0259-Add-getMainThreadExecutor-to-BukkitScheduler.patch
diff --git a/patches/api/0261-living-entity-allow-attribute-registration.patch b/patches/api/0260-living-entity-allow-attribute-registration.patch
similarity index 100%
rename from patches/api/0261-living-entity-allow-attribute-registration.patch
rename to patches/api/0260-living-entity-allow-attribute-registration.patch
diff --git a/patches/api/0262-Add-missing-effects.patch b/patches/api/0261-Add-missing-effects.patch
similarity index 100%
rename from patches/api/0262-Add-missing-effects.patch
rename to patches/api/0261-Add-missing-effects.patch
diff --git a/patches/api/0263-Expose-Tracked-Players.patch b/patches/api/0262-Expose-Tracked-Players.patch
similarity index 100%
rename from patches/api/0263-Expose-Tracked-Players.patch
rename to patches/api/0262-Expose-Tracked-Players.patch
diff --git a/patches/api/0264-Cache-the-result-of-Material-isBlock.patch b/patches/api/0263-Cache-the-result-of-Material-isBlock.patch
similarity index 93%
rename from patches/api/0264-Cache-the-result-of-Material-isBlock.patch
rename to patches/api/0263-Cache-the-result-of-Material-isBlock.patch
index 300816541c..13bedd1afb 100644
--- a/patches/api/0264-Cache-the-result-of-Material-isBlock.patch
+++ b/patches/api/0263-Cache-the-result-of-Material-isBlock.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Cache the result of Material#isBlock
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 0aa1692731ffb05e812f904459853da6080c3f9f..f8440fd7a7c9a00124cb387c6ba3b0973df0d145 100644
+index 9117bbfb5208231752cfa757c0d088bc270d43b9..f0f81ecad42fc3dc894ec0c150346206d70a8720 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4348,6 +4348,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0265-Add-worldborder-events.patch b/patches/api/0264-Add-worldborder-events.patch
similarity index 100%
rename from patches/api/0265-Add-worldborder-events.patch
rename to patches/api/0264-Add-worldborder-events.patch
diff --git a/patches/api/0266-added-PlayerNameEntityEvent.patch b/patches/api/0265-added-PlayerNameEntityEvent.patch
similarity index 100%
rename from patches/api/0266-added-PlayerNameEntityEvent.patch
rename to patches/api/0265-added-PlayerNameEntityEvent.patch
diff --git a/patches/api/0267-Add-recipe-to-cook-events.patch b/patches/api/0266-Add-recipe-to-cook-events.patch
similarity index 100%
rename from patches/api/0267-Add-recipe-to-cook-events.patch
rename to patches/api/0266-Add-recipe-to-cook-events.patch
diff --git a/patches/api/0268-Add-Block-isValidTool.patch b/patches/api/0267-Add-Block-isValidTool.patch
similarity index 100%
rename from patches/api/0268-Add-Block-isValidTool.patch
rename to patches/api/0267-Add-Block-isValidTool.patch
diff --git a/patches/api/0269-Expand-world-key-API.patch b/patches/api/0268-Expand-world-key-API.patch
similarity index 100%
rename from patches/api/0269-Expand-world-key-API.patch
rename to patches/api/0268-Expand-world-key-API.patch
diff --git a/patches/api/0270-Item-Rarity-API.patch b/patches/api/0269-Item-Rarity-API.patch
similarity index 97%
rename from patches/api/0270-Item-Rarity-API.patch
rename to patches/api/0269-Item-Rarity-API.patch
index 3c537d1f53..1344f21cde 100644
--- a/patches/api/0270-Item-Rarity-API.patch
+++ b/patches/api/0269-Item-Rarity-API.patch
@@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index f8440fd7a7c9a00124cb387c6ba3b0973df0d145..1afeac98a9facbe25edc9a96d906b31d8327f047 100644
+index f0f81ecad42fc3dc894ec0c150346206d70a8720..467282a76dbf2edfd88baa4275991ae1163c0919 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4414,6 +4414,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0271-Expose-protocol-version.patch b/patches/api/0270-Expose-protocol-version.patch
similarity index 100%
rename from patches/api/0271-Expose-protocol-version.patch
rename to patches/api/0270-Expose-protocol-version.patch
diff --git a/patches/api/0272-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0271-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/api/0272-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/api/0271-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0272-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/api/0273-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/api/0272-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0273-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/api/0274-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/api/0273-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/api/0275-Added-PlayerDeepSleepEvent.patch b/patches/api/0274-Added-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/api/0275-Added-PlayerDeepSleepEvent.patch
rename to patches/api/0274-Added-PlayerDeepSleepEvent.patch
diff --git a/patches/api/0276-More-World-API.patch b/patches/api/0275-More-World-API.patch
similarity index 100%
rename from patches/api/0276-More-World-API.patch
rename to patches/api/0275-More-World-API.patch
diff --git a/patches/api/0277-Added-PlayerBedFailEnterEvent.patch b/patches/api/0276-Added-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/api/0277-Added-PlayerBedFailEnterEvent.patch
rename to patches/api/0276-Added-PlayerBedFailEnterEvent.patch
diff --git a/patches/api/0278-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0277-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/api/0278-Introduce-beacon-activation-deactivation-events.patch
rename to patches/api/0277-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/api/0279-PlayerMoveEvent-Improvements.patch b/patches/api/0278-PlayerMoveEvent-Improvements.patch
similarity index 100%
rename from patches/api/0279-PlayerMoveEvent-Improvements.patch
rename to patches/api/0278-PlayerMoveEvent-Improvements.patch
diff --git a/patches/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0279-add-RespawnFlags-to-PlayerRespawnEvent.patch
similarity index 100%
rename from patches/api/0280-add-RespawnFlags-to-PlayerRespawnEvent.patch
rename to patches/api/0279-add-RespawnFlags-to-PlayerRespawnEvent.patch
diff --git a/patches/api/0281-Add-more-WanderingTrader-API.patch b/patches/api/0280-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/api/0281-Add-more-WanderingTrader-API.patch
rename to patches/api/0280-Add-more-WanderingTrader-API.patch
diff --git a/patches/api/0282-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0281-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/api/0282-Add-EntityBlockStorage-clearEntities.patch
rename to patches/api/0281-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0282-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/api/0283-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/api/0282-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0283-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/api/0284-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/0283-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0285-Inventory-close.patch b/patches/api/0284-Inventory-close.patch
similarity index 100%
rename from patches/api/0285-Inventory-close.patch
rename to patches/api/0284-Inventory-close.patch
diff --git a/patches/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0285-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/api/0286-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/api/0285-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/api/0287-Add-basic-Datapack-API.patch b/patches/api/0286-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/api/0287-Add-basic-Datapack-API.patch
rename to patches/api/0286-Add-basic-Datapack-API.patch
diff --git a/patches/api/0288-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0287-additions-to-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/api/0288-additions-to-PlayerGameModeChangeEvent.patch
rename to patches/api/0287-additions-to-PlayerGameModeChangeEvent.patch
diff --git a/patches/api/0289-ItemStack-repair-check-API.patch b/patches/api/0288-ItemStack-repair-check-API.patch
similarity index 100%
rename from patches/api/0289-ItemStack-repair-check-API.patch
rename to patches/api/0288-ItemStack-repair-check-API.patch
diff --git a/patches/api/0290-More-Enchantment-API.patch b/patches/api/0289-More-Enchantment-API.patch
similarity index 100%
rename from patches/api/0290-More-Enchantment-API.patch
rename to patches/api/0289-More-Enchantment-API.patch
diff --git a/patches/api/0291-Add-Mob-lookAt-API.patch b/patches/api/0290-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/api/0291-Add-Mob-lookAt-API.patch
rename to patches/api/0290-Add-Mob-lookAt-API.patch
diff --git a/patches/api/0292-ItemStack-editMeta.patch b/patches/api/0291-ItemStack-editMeta.patch
similarity index 100%
rename from patches/api/0292-ItemStack-editMeta.patch
rename to patches/api/0291-ItemStack-editMeta.patch
diff --git a/patches/api/0293-Add-EntityInsideBlockEvent.patch b/patches/api/0292-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/api/0293-Add-EntityInsideBlockEvent.patch
rename to patches/api/0292-Add-EntityInsideBlockEvent.patch
diff --git a/patches/api/0294-Attributes-API-for-item-defaults.patch b/patches/api/0293-Attributes-API-for-item-defaults.patch
similarity index 96%
rename from patches/api/0294-Attributes-API-for-item-defaults.patch
rename to patches/api/0293-Attributes-API-for-item-defaults.patch
index b24d43c545..8d822f5e8d 100644
--- a/patches/api/0294-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0293-Attributes-API-for-item-defaults.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 1afeac98a9facbe25edc9a96d906b31d8327f047..a2a5c3d6ab37dd5908ba5dbd228e8ad4bea2f799 100644
+index 467282a76dbf2edfd88baa4275991ae1163c0919..31ec16d134fd8eb5607d18e17f93225eef402d7e 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4425,6 +4425,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0294-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/api/0295-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/api/0294-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/api/0296-More-Lidded-Block-API.patch b/patches/api/0295-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/api/0296-More-Lidded-Block-API.patch
rename to patches/api/0295-More-Lidded-Block-API.patch
diff --git a/patches/api/0297-Add-PlayerKickEvent-causes.patch b/patches/api/0296-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/api/0297-Add-PlayerKickEvent-causes.patch
rename to patches/api/0296-Add-PlayerKickEvent-causes.patch
diff --git a/patches/api/0298-Add-PufferFishStateChangeEvent.patch b/patches/api/0297-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/api/0298-Add-PufferFishStateChangeEvent.patch
rename to patches/api/0297-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/api/0299-Add-BellRevealRaiderEvent.patch b/patches/api/0298-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/api/0299-Add-BellRevealRaiderEvent.patch
rename to patches/api/0298-Add-BellRevealRaiderEvent.patch
diff --git a/patches/api/0300-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0299-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/api/0300-Add-ElderGuardianAppearanceEvent.patch
rename to patches/api/0299-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/api/0301-Add-more-line-of-sight-methods.patch b/patches/api/0300-Add-more-line-of-sight-methods.patch
similarity index 95%
rename from patches/api/0301-Add-more-line-of-sight-methods.patch
rename to patches/api/0300-Add-more-line-of-sight-methods.patch
index 6c81b3e7cf..23ee16c98c 100644
--- a/patches/api/0301-Add-more-line-of-sight-methods.patch
+++ b/patches/api/0300-Add-more-line-of-sight-methods.patch
@@ -23,7 +23,7 @@ index aa534b1a9a1fb84a2fbd4b372f313bb4b63325fa..43b53c21af01e0f496c8aaacff82dfdf
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index cc61e030f1bdb4d1ef52a0a1ae4983f95d2460fd..9ab91154c74b5a3001cf4d5df1b4ae1e26508b60 100644
+index 16536dae04b020de43f9e13ff32c659b9e6cab0c..72f7bf02ec1ace2c835e4ad58e3e59b3d7357972 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -546,6 +546,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0302-Add-WaterBottleSplashEvent.patch b/patches/api/0301-Add-WaterBottleSplashEvent.patch
similarity index 100%
rename from patches/api/0302-Add-WaterBottleSplashEvent.patch
rename to patches/api/0301-Add-WaterBottleSplashEvent.patch
diff --git a/patches/api/0303-Add-more-LimitedRegion-API.patch b/patches/api/0302-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/api/0303-Add-more-LimitedRegion-API.patch
rename to patches/api/0302-Add-more-LimitedRegion-API.patch
diff --git a/patches/api/0304-Missing-Entity-Behavior-API.patch b/patches/api/0303-Missing-Entity-Behavior-API.patch
similarity index 100%
rename from patches/api/0304-Missing-Entity-Behavior-API.patch
rename to patches/api/0303-Missing-Entity-Behavior-API.patch
diff --git a/patches/api/0305-Adds-PlayerArmSwingEvent.patch b/patches/api/0304-Adds-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/api/0305-Adds-PlayerArmSwingEvent.patch
rename to patches/api/0304-Adds-PlayerArmSwingEvent.patch
diff --git a/patches/api/0306-Add-PlayerSignCommandPreprocessEvent.patch b/patches/api/0305-Add-PlayerSignCommandPreprocessEvent.patch
similarity index 100%
rename from patches/api/0306-Add-PlayerSignCommandPreprocessEvent.patch
rename to patches/api/0305-Add-PlayerSignCommandPreprocessEvent.patch
diff --git a/patches/api/0307-fix-empty-array-elements-in-command-arguments.patch b/patches/api/0306-fix-empty-array-elements-in-command-arguments.patch
similarity index 100%
rename from patches/api/0307-fix-empty-array-elements-in-command-arguments.patch
rename to patches/api/0306-fix-empty-array-elements-in-command-arguments.patch
diff --git a/patches/api/0308-Stinger-API.patch b/patches/api/0307-Stinger-API.patch
similarity index 94%
rename from patches/api/0308-Stinger-API.patch
rename to patches/api/0307-Stinger-API.patch
index a07877f35f..b73ac9aa85 100644
--- a/patches/api/0308-Stinger-API.patch
+++ b/patches/api/0307-Stinger-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Stinger API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9ab91154c74b5a3001cf4d5df1b4ae1e26508b60..27187efdbcf1cf20a53175f1177c16dc40acab3c 100644
+index 72f7bf02ec1ace2c835e4ad58e3e59b3d7357972..4febec3623b936cf40daba6196392ebce4b8d5a8 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -399,6 +399,36 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch b/patches/api/0308-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
similarity index 100%
rename from patches/api/0309-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
rename to patches/api/0308-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch
diff --git a/patches/api/0310-Add-PlayerSetSpawnEvent.patch b/patches/api/0309-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/api/0310-Add-PlayerSetSpawnEvent.patch
rename to patches/api/0309-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/api/0311-Added-EntityDamageItemEvent.patch b/patches/api/0310-Added-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/api/0311-Added-EntityDamageItemEvent.patch
rename to patches/api/0310-Added-EntityDamageItemEvent.patch
diff --git a/patches/api/0312-Make-EntityUnleashEvent-cancellable.patch b/patches/api/0311-Make-EntityUnleashEvent-cancellable.patch
similarity index 100%
rename from patches/api/0312-Make-EntityUnleashEvent-cancellable.patch
rename to patches/api/0311-Make-EntityUnleashEvent-cancellable.patch
diff --git a/patches/api/0313-Change-EnderEye-target-without-changing-other-things.patch b/patches/api/0312-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/api/0313-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/api/0312-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/api/0314-Add-BlockBreakBlockEvent.patch b/patches/api/0313-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/api/0314-Add-BlockBreakBlockEvent.patch
rename to patches/api/0313-Add-BlockBreakBlockEvent.patch
diff --git a/patches/api/0315-Add-helpers-for-left-right-click-to-Action.patch b/patches/api/0314-Add-helpers-for-left-right-click-to-Action.patch
similarity index 100%
rename from patches/api/0315-Add-helpers-for-left-right-click-to-Action.patch
rename to patches/api/0314-Add-helpers-for-left-right-click-to-Action.patch
diff --git a/patches/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch b/patches/api/0315-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
similarity index 100%
rename from patches/api/0316-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
rename to patches/api/0315-Option-to-prevent-NBT-copy-in-smithing-recipes.patch
diff --git a/patches/api/0317-More-CommandBlock-API.patch b/patches/api/0316-More-CommandBlock-API.patch
similarity index 100%
rename from patches/api/0317-More-CommandBlock-API.patch
rename to patches/api/0316-More-CommandBlock-API.patch
diff --git a/patches/api/0318-Add-missing-team-sidebar-display-slots.patch b/patches/api/0317-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/api/0318-Add-missing-team-sidebar-display-slots.patch
rename to patches/api/0317-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/api/0319-add-back-EntityPortalExitEvent.patch b/patches/api/0318-add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/api/0319-add-back-EntityPortalExitEvent.patch
rename to patches/api/0318-add-back-EntityPortalExitEvent.patch
diff --git a/patches/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/api/0319-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/api/0320-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/api/0319-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/api/0321-Get-entity-default-attributes.patch b/patches/api/0320-Get-entity-default-attributes.patch
similarity index 100%
rename from patches/api/0321-Get-entity-default-attributes.patch
rename to patches/api/0320-Get-entity-default-attributes.patch
diff --git a/patches/api/0322-Left-handed-API.patch b/patches/api/0321-Left-handed-API.patch
similarity index 100%
rename from patches/api/0322-Left-handed-API.patch
rename to patches/api/0321-Left-handed-API.patch
diff --git a/patches/api/0323-Add-more-advancement-API.patch b/patches/api/0322-Add-more-advancement-API.patch
similarity index 100%
rename from patches/api/0323-Add-more-advancement-API.patch
rename to patches/api/0322-Add-more-advancement-API.patch
diff --git a/patches/api/0324-Add-ItemFactory-getSpawnEgg-API.patch b/patches/api/0323-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/api/0324-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/api/0323-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/api/0325-Add-critical-damage-API.patch b/patches/api/0324-Add-critical-damage-API.patch
similarity index 100%
rename from patches/api/0325-Add-critical-damage-API.patch
rename to patches/api/0324-Add-critical-damage-API.patch
diff --git a/patches/api/0326-Fix-issues-with-mob-conversion.patch b/patches/api/0325-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/api/0326-Fix-issues-with-mob-conversion.patch
rename to patches/api/0325-Fix-issues-with-mob-conversion.patch
diff --git a/patches/api/0327-Add-isCollidable-methods-to-various-places.patch b/patches/api/0326-Add-isCollidable-methods-to-various-places.patch
similarity index 97%
rename from patches/api/0327-Add-isCollidable-methods-to-various-places.patch
rename to patches/api/0326-Add-isCollidable-methods-to-various-places.patch
index 299033bd74..97a86a8b35 100644
--- a/patches/api/0327-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0326-Add-isCollidable-methods-to-various-places.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index a2a5c3d6ab37dd5908ba5dbd228e8ad4bea2f799..716a40b055e693cfda38d2d8223ce4320919a332 100644
+index 31ec16d134fd8eb5607d18e17f93225eef402d7e..842a9dd6f92737699529721ec4e06fbc225fa3e6 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -4440,6 +4440,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0328-Goat-ram-API.patch b/patches/api/0327-Goat-ram-API.patch
similarity index 100%
rename from patches/api/0328-Goat-ram-API.patch
rename to patches/api/0327-Goat-ram-API.patch
diff --git a/patches/api/0329-Add-API-for-resetting-a-single-score.patch b/patches/api/0328-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/api/0329-Add-API-for-resetting-a-single-score.patch
rename to patches/api/0328-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0329-Add-Raw-Byte-Entity-Serialization.patch
similarity index 100%
rename from patches/api/0330-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/api/0329-Add-Raw-Byte-Entity-Serialization.patch
diff --git a/patches/api/0331-Add-PlayerItemFrameChangeEvent.patch b/patches/api/0330-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/api/0331-Add-PlayerItemFrameChangeEvent.patch
rename to patches/api/0330-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/api/0332-Add-player-health-update-API.patch b/patches/api/0331-Add-player-health-update-API.patch
similarity index 100%
rename from patches/api/0332-Add-player-health-update-API.patch
rename to patches/api/0331-Add-player-health-update-API.patch
diff --git a/patches/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0332-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/api/0333-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/api/0332-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/api/0334-Add-more-Campfire-API.patch b/patches/api/0333-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/api/0334-Add-more-Campfire-API.patch
rename to patches/api/0333-Add-more-Campfire-API.patch
diff --git a/patches/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/0334-Move-VehicleCollisionEvent-HandlerList-up.patch
similarity index 100%
rename from patches/api/0335-Move-VehicleCollisionEvent-HandlerList-up.patch
rename to patches/api/0334-Move-VehicleCollisionEvent-HandlerList-up.patch
diff --git a/patches/api/0336-Improve-scoreboard-entries.patch b/patches/api/0335-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/api/0336-Improve-scoreboard-entries.patch
rename to patches/api/0335-Improve-scoreboard-entries.patch
diff --git a/patches/api/0337-Entity-powdered-snow-API.patch b/patches/api/0336-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/api/0337-Entity-powdered-snow-API.patch
rename to patches/api/0336-Entity-powdered-snow-API.patch
diff --git a/patches/api/0338-Add-API-for-item-entity-health.patch b/patches/api/0337-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/api/0338-Add-API-for-item-entity-health.patch
rename to patches/api/0337-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0338-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/api/0339-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/api/0338-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0340-Bucketable-API.patch b/patches/api/0339-Bucketable-API.patch
similarity index 100%
rename from patches/api/0340-Bucketable-API.patch
rename to patches/api/0339-Bucketable-API.patch
diff --git a/patches/api/0341-System-prop-for-default-config-comment-parsing.patch b/patches/api/0340-System-prop-for-default-config-comment-parsing.patch
similarity index 100%
rename from patches/api/0341-System-prop-for-default-config-comment-parsing.patch
rename to patches/api/0340-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0341-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/api/0342-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/api/0341-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch b/patches/api/0342-Add-new-overload-to-PersistentDataContainer-has.patch
similarity index 100%
rename from patches/api/0343-Add-new-overload-to-PersistentDataContainer-has.patch
rename to patches/api/0342-Add-new-overload-to-PersistentDataContainer-has.patch
diff --git a/patches/api/0344-Multiple-Entries-with-Scoreboards.patch b/patches/api/0343-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/api/0344-Multiple-Entries-with-Scoreboards.patch
rename to patches/api/0343-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0344-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
similarity index 100%
rename from patches/api/0345-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
rename to patches/api/0344-Added-getHostname-to-AsyncPlayerPreLoginEvent.patch
diff --git a/patches/api/0346-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0345-Warn-on-strange-EventHandler-return-types.patch
similarity index 100%
rename from patches/api/0346-Warn-on-strange-EventHandler-return-types.patch
rename to patches/api/0345-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0347-Multi-Block-Change-API.patch b/patches/api/0346-Multi-Block-Change-API.patch
similarity index 100%
rename from patches/api/0347-Multi-Block-Change-API.patch
rename to patches/api/0346-Multi-Block-Change-API.patch
diff --git a/patches/api/0348-Fix-NotePlayEvent.patch b/patches/api/0347-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/api/0348-Fix-NotePlayEvent.patch
rename to patches/api/0347-Fix-NotePlayEvent.patch
diff --git a/patches/api/0349-Freeze-Tick-Lock-API.patch b/patches/api/0348-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/api/0349-Freeze-Tick-Lock-API.patch
rename to patches/api/0348-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0350-Dolphin-API.patch b/patches/api/0349-Dolphin-API.patch
similarity index 100%
rename from patches/api/0350-Dolphin-API.patch
rename to patches/api/0349-Dolphin-API.patch
diff --git a/patches/api/0351-More-PotionEffectType-API.patch b/patches/api/0350-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/api/0351-More-PotionEffectType-API.patch
rename to patches/api/0350-More-PotionEffectType-API.patch
diff --git a/patches/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0351-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/api/0352-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/api/0351-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/api/0353-Implement-regenerateChunk.patch b/patches/api/0352-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/api/0353-Implement-regenerateChunk.patch
rename to patches/api/0352-Implement-regenerateChunk.patch
diff --git a/patches/api/0354-Add-GameEvent-tags.patch b/patches/api/0353-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/api/0354-Add-GameEvent-tags.patch
rename to patches/api/0353-Add-GameEvent-tags.patch
diff --git a/patches/api/0355-Furnace-RecipesUsed-API.patch b/patches/api/0354-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/api/0355-Furnace-RecipesUsed-API.patch
rename to patches/api/0354-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0356-Configurable-sculk-sensor-listener-range.patch b/patches/api/0355-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/api/0356-Configurable-sculk-sensor-listener-range.patch
rename to patches/api/0355-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0357-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0356-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/api/0357-Add-missing-block-data-mins-and-maxes.patch
rename to patches/api/0356-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0358-Custom-Potion-Mixes.patch b/patches/api/0357-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/api/0358-Custom-Potion-Mixes.patch
rename to patches/api/0357-Custom-Potion-Mixes.patch
diff --git a/patches/api/0359-Expose-furnace-minecart-push-values.patch b/patches/api/0358-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/api/0359-Expose-furnace-minecart-push-values.patch
rename to patches/api/0358-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0360-More-Projectile-API.patch b/patches/api/0359-More-Projectile-API.patch
similarity index 100%
rename from patches/api/0360-More-Projectile-API.patch
rename to patches/api/0359-More-Projectile-API.patch
diff --git a/patches/api/0361-Add-getComputedBiome-API.patch b/patches/api/0360-Add-getComputedBiome-API.patch
similarity index 100%
rename from patches/api/0361-Add-getComputedBiome-API.patch
rename to patches/api/0360-Add-getComputedBiome-API.patch
diff --git a/patches/api/0362-Add-enchantWithLevels-API.patch b/patches/api/0361-Add-enchantWithLevels-API.patch
similarity index 100%
rename from patches/api/0362-Add-enchantWithLevels-API.patch
rename to patches/api/0361-Add-enchantWithLevels-API.patch
diff --git a/patches/api/0363-Add-TameableDeathMessageEvent.patch b/patches/api/0362-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/api/0363-Add-TameableDeathMessageEvent.patch
rename to patches/api/0362-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0363-Allow-to-change-the-podium-of-the-EnderDragon.patch
similarity index 100%
rename from patches/api/0364-Allow-to-change-the-podium-of-the-EnderDragon.patch
rename to patches/api/0363-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0364-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/api/0365-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
rename to patches/api/0364-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0366-WorldCreator-keepSpawnLoaded.patch b/patches/api/0365-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/api/0366-WorldCreator-keepSpawnLoaded.patch
rename to patches/api/0365-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0366-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/api/0367-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/api/0366-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0368-Add-PlayerStopUsingItemEvent.patch b/patches/api/0367-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/api/0368-Add-PlayerStopUsingItemEvent.patch
rename to patches/api/0367-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0369-FallingBlock-auto-expire-setting.patch b/patches/api/0368-FallingBlock-auto-expire-setting.patch
similarity index 100%
rename from patches/api/0369-FallingBlock-auto-expire-setting.patch
rename to patches/api/0368-FallingBlock-auto-expire-setting.patch
diff --git a/patches/api/0370-Keyed-Cat-Type.patch b/patches/api/0369-Keyed-Cat-Type.patch
similarity index 100%
rename from patches/api/0370-Keyed-Cat-Type.patch
rename to patches/api/0369-Keyed-Cat-Type.patch
diff --git a/patches/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0370-Add-method-isTickingWorlds-to-Bukkit.patch
similarity index 100%
rename from patches/api/0371-Add-method-isTickingWorlds-to-Bukkit.patch
rename to patches/api/0370-Add-method-isTickingWorlds-to-Bukkit.patch
diff --git a/patches/api/0372-Add-WardenAngerChangeEvent.patch b/patches/api/0371-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/api/0372-Add-WardenAngerChangeEvent.patch
rename to patches/api/0371-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0373-Nameable-Banner-API.patch b/patches/api/0372-Nameable-Banner-API.patch
similarity index 100%
rename from patches/api/0373-Nameable-Banner-API.patch
rename to patches/api/0372-Nameable-Banner-API.patch
diff --git a/patches/api/0374-Add-Player-getFishHook.patch b/patches/api/0373-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/api/0374-Add-Player-getFishHook.patch
rename to patches/api/0373-Add-Player-getFishHook.patch
diff --git a/patches/api/0375-More-Teleport-API.patch b/patches/api/0374-More-Teleport-API.patch
similarity index 100%
rename from patches/api/0375-More-Teleport-API.patch
rename to patches/api/0374-More-Teleport-API.patch
diff --git a/patches/api/0376-Add-EntityPortalReadyEvent.patch b/patches/api/0375-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/api/0376-Add-EntityPortalReadyEvent.patch
rename to patches/api/0375-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0376-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/api/0377-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/api/0376-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0378-Collision-API.patch b/patches/api/0377-Collision-API.patch
similarity index 100%
rename from patches/api/0378-Collision-API.patch
rename to patches/api/0377-Collision-API.patch
diff --git a/patches/api/0379-Block-Ticking-API.patch b/patches/api/0378-Block-Ticking-API.patch
similarity index 100%
rename from patches/api/0379-Block-Ticking-API.patch
rename to patches/api/0378-Block-Ticking-API.patch
diff --git a/patches/api/0380-Add-NamespacedKey-biome-methods.patch b/patches/api/0379-Add-NamespacedKey-biome-methods.patch
similarity index 100%
rename from patches/api/0380-Add-NamespacedKey-biome-methods.patch
rename to patches/api/0379-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch b/patches/api/0380-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
similarity index 100%
rename from patches/api/0381-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
rename to patches/api/0380-Add-custom-destroyerIdentity-to-sendBlockDamage.patch
diff --git a/patches/api/0382-Also-load-resources-from-LibraryLoader.patch b/patches/api/0381-Also-load-resources-from-LibraryLoader.patch
similarity index 100%
rename from patches/api/0382-Also-load-resources-from-LibraryLoader.patch
rename to patches/api/0381-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0383-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0382-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/api/0383-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/api/0382-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0383-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/api/0384-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/api/0383-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0384-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
similarity index 100%
rename from patches/api/0385-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
rename to patches/api/0384-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0386-Add-getDrops-to-BlockState.patch b/patches/api/0385-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/api/0386-Add-getDrops-to-BlockState.patch
rename to patches/api/0385-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0387-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0386-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/api/0387-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/api/0386-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0388-Elder-Guardian-appearance-API.patch b/patches/api/0387-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/api/0388-Elder-Guardian-appearance-API.patch
rename to patches/api/0387-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0389-Allow-changing-bed-s-occupied-property.patch b/patches/api/0388-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/api/0389-Allow-changing-bed-s-occupied-property.patch
rename to patches/api/0388-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0390-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0389-Add-EquipmentSlot-convenience-methods.patch
similarity index 100%
rename from patches/api/0390-Add-EquipmentSlot-convenience-methods.patch
rename to patches/api/0389-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0390-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
similarity index 100%
rename from patches/api/0391-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
rename to patches/api/0390-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0392-Add-entity-knockback-API.patch b/patches/api/0391-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/api/0392-Add-entity-knockback-API.patch
rename to patches/api/0391-Add-entity-knockback-API.patch
diff --git a/patches/api/0393-Added-EntityToggleSitEvent.patch b/patches/api/0392-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/api/0393-Added-EntityToggleSitEvent.patch
rename to patches/api/0392-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0394-Add-Moving-Piston-API.patch b/patches/api/0393-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/api/0394-Add-Moving-Piston-API.patch
rename to patches/api/0393-Add-Moving-Piston-API.patch
diff --git a/patches/api/0395-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0394-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/api/0395-Add-PrePlayerAttackEntityEvent.patch
rename to patches/api/0394-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0396-Add-Player-Warden-Warning-API.patch b/patches/api/0395-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/api/0396-Add-Player-Warden-Warning-API.patch
rename to patches/api/0395-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0397-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0396-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/api/0397-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/api/0396-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0398-Add-paper-dumplisteners-command.patch b/patches/api/0397-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/api/0398-Add-paper-dumplisteners-command.patch
rename to patches/api/0397-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0399-ItemStack-damage-API.patch b/patches/api/0398-ItemStack-damage-API.patch
similarity index 100%
rename from patches/api/0399-ItemStack-damage-API.patch
rename to patches/api/0398-ItemStack-damage-API.patch
diff --git a/patches/api/0400-Add-Tick-TemporalUnit.patch b/patches/api/0399-Add-Tick-TemporalUnit.patch
similarity index 100%
rename from patches/api/0400-Add-Tick-TemporalUnit.patch
rename to patches/api/0399-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0401-Friction-API.patch b/patches/api/0400-Friction-API.patch
similarity index 96%
rename from patches/api/0401-Friction-API.patch
rename to patches/api/0400-Friction-API.patch
index 48b613b474..79adabb9ba 100644
--- a/patches/api/0401-Friction-API.patch
+++ b/patches/api/0400-Friction-API.patch
@@ -59,7 +59,7 @@ index d0bef15785493b512ff0f7414c1d58d38fead581..58017fce436cdbda255f7172fbdadb72
      /**
       * Gets the item stack associated with this item drop.
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index efcf093bc908a3a5711a06e579503100514f57aa..df91f612978dcea83a99f8403820cea1ab462c06 100644
+index 329ca07b6e166729d33446c4cd1ae19e09b7f444..3f35fc2e2311c6c568afd2ed9896584e1ebb716f 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0402-Player-Entity-Tracking-Events.patch b/patches/api/0401-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/api/0402-Player-Entity-Tracking-Events.patch
rename to patches/api/0401-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0403-Add-missing-Fluid-type.patch b/patches/api/0402-Add-missing-Fluid-type.patch
similarity index 100%
rename from patches/api/0403-Add-missing-Fluid-type.patch
rename to patches/api/0402-Add-missing-Fluid-type.patch
diff --git a/patches/api/0404-Mark-experimental-api-as-such.patch b/patches/api/0403-Mark-experimental-api-as-such.patch
similarity index 100%
rename from patches/api/0404-Mark-experimental-api-as-such.patch
rename to patches/api/0403-Mark-experimental-api-as-such.patch
diff --git a/patches/api/0405-fix-Instruments.patch b/patches/api/0404-fix-Instruments.patch
similarity index 100%
rename from patches/api/0405-fix-Instruments.patch
rename to patches/api/0404-fix-Instruments.patch
diff --git a/patches/api/0406-Add-BlockLockCheckEvent.patch b/patches/api/0405-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/api/0406-Add-BlockLockCheckEvent.patch
rename to patches/api/0405-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0407-Add-Sneaking-API-for-Entities.patch b/patches/api/0406-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/api/0407-Add-Sneaking-API-for-Entities.patch
rename to patches/api/0406-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0408-Improve-PortalEvents.patch b/patches/api/0407-Improve-PortalEvents.patch
similarity index 100%
rename from patches/api/0408-Improve-PortalEvents.patch
rename to patches/api/0407-Improve-PortalEvents.patch
diff --git a/patches/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch b/patches/api/0408-Add-exploded-block-state-to-BlockExplodeEvent.patch
similarity index 100%
rename from patches/api/0409-Add-exploded-block-state-to-BlockExplodeEvent.patch
rename to patches/api/0408-Add-exploded-block-state-to-BlockExplodeEvent.patch
diff --git a/patches/api/0410-Flying-Fall-Damage-API.patch b/patches/api/0409-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/api/0410-Flying-Fall-Damage-API.patch
rename to patches/api/0409-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/api/0410-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/api/0411-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/api/0410-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0411-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/api/0412-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/0411-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0413-Win-Screen-API.patch b/patches/api/0412-Win-Screen-API.patch
similarity index 100%
rename from patches/api/0413-Win-Screen-API.patch
rename to patches/api/0412-Win-Screen-API.patch
diff --git a/patches/api/0414-Add-Entity-Body-Yaw-API.patch b/patches/api/0413-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/api/0414-Add-Entity-Body-Yaw-API.patch
rename to patches/api/0413-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0415-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0414-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/api/0415-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/0414-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0416-Add-EntityFertilizeEggEvent.patch b/patches/api/0415-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/api/0416-Add-EntityFertilizeEggEvent.patch
rename to patches/api/0415-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0417-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0416-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/api/0417-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/0416-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0418-Fix-Jukeboxes.patch b/patches/api/0417-Fix-Jukeboxes.patch
similarity index 100%
rename from patches/api/0418-Fix-Jukeboxes.patch
rename to patches/api/0417-Fix-Jukeboxes.patch
diff --git a/patches/api/0419-Add-Shearable-API.patch b/patches/api/0418-Add-Shearable-API.patch
similarity index 100%
rename from patches/api/0419-Add-Shearable-API.patch
rename to patches/api/0418-Add-Shearable-API.patch
diff --git a/patches/server/0110-Add-EntityZapEvent.patch b/patches/server/0110-Add-EntityZapEvent.patch
index c2eb1e1e7c..4da2a42502 100644
--- a/patches/server/0110-Add-EntityZapEvent.patch
+++ b/patches/server/0110-Add-EntityZapEvent.patch
@@ -28,10 +28,10 @@ index efbf6b316a70b94e4bd490df8ebe77cd9f638ba4..cad8854cc7523d60c06ca1f03bfd4fbf
                  entitywitch.finalizeSpawn(world, world.getCurrentDifficultyAt(entitywitch.blockPosition()), MobSpawnType.CONVERSION, (SpawnGroupData) null, (CompoundTag) null);
                  entitywitch.setNoAi(this.isNoAi());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index edab1f25747a7492760a31a90e25b37678b48c64..f1e0cc9b558fd825e6ef1bd26ccec488153fd21d 100644
+index 2c3518ea974be5fce424093e9b710c853fd52a7a..b8ddc96bb444381f3a980e740e109419cffd07ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1162,6 +1162,14 @@ public class CraftEventFactory {
+@@ -1161,6 +1161,14 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
index 613f666a1e..bb80b7d237 100644
--- a/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
+++ b/patches/server/0114-Add-source-to-PlayerExpChangeEvent.patch
@@ -18,10 +18,10 @@ index 5391c60398c8a7d1d49dc2e73116b27862653873..5a79b49e321cba352d8e4189dfbfdd05
  
                  --this.count;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f1e0cc9b558fd825e6ef1bd26ccec488153fd21d..f80f015515e4da9bf9d41f7bc38341c018c90acc 100644
+index b8ddc96bb444381f3a980e740e109419cffd07ae..012cbdbaf56a856879b00fb7664fc4eb0d1987c1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1121,6 +1121,17 @@ public class CraftEventFactory {
+@@ -1120,6 +1120,17 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0115-Add-ProjectileCollideEvent.patch b/patches/server/0115-Add-ProjectileCollideEvent.patch
index 798baf491e..a0074781d3 100644
--- a/patches/server/0115-Add-ProjectileCollideEvent.patch
+++ b/patches/server/0115-Add-ProjectileCollideEvent.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add ProjectileCollideEvent
 Deprecated now and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f80f015515e4da9bf9d41f7bc38341c018c90acc..62c1f7b63601fc8df3469c0e7ad2d75382bde72f 100644
+index 012cbdbaf56a856879b00fb7664fc4eb0d1987c1..427c63945e207236fc2e5caa99e22b3f7b171854 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1265,6 +1265,17 @@ public class CraftEventFactory {
+@@ -1264,6 +1264,17 @@ public class CraftEventFactory {
          return CraftItemStack.asNMSCopy(bitem);
      }
  
@@ -27,7 +27,7 @@ index f80f015515e4da9bf9d41f7bc38341c018c90acc..62c1f7b63601fc8df3469c0e7ad2d753
      public static ProjectileLaunchEvent callProjectileLaunchEvent(Entity entity) {
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
-@@ -1289,8 +1300,15 @@ public class CraftEventFactory {
+@@ -1288,8 +1299,15 @@ public class CraftEventFactory {
          if (position.getType() == HitResult.Type.ENTITY) {
              hitEntity = ((EntityHitResult) position).getEntity().getBukkitEntity();
          }
diff --git a/patches/server/0218-InventoryCloseEvent-Reason-API.patch b/patches/server/0218-InventoryCloseEvent-Reason-API.patch
index beb379302a..fda75aa09d 100644
--- a/patches/server/0218-InventoryCloseEvent-Reason-API.patch
+++ b/patches/server/0218-InventoryCloseEvent-Reason-API.patch
@@ -186,10 +186,10 @@ index ecbcabc24529c7a7becf709fa6f24cfaa22f7f0e..bef819229c4d9c4742f907532f0d3f46
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 62c1f7b63601fc8df3469c0e7ad2d75382bde72f..a030a4852d0f7b2e3aedb7b35c316f525115086e 100644
+index 427c63945e207236fc2e5caa99e22b3f7b171854..200c9694336f5670edef10693a82cbd89bd9b477 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1234,7 +1234,7 @@ public class CraftEventFactory {
+@@ -1233,7 +1233,7 @@ public class CraftEventFactory {
  
      public static AbstractContainerMenu callInventoryOpenEvent(ServerPlayer player, AbstractContainerMenu container, boolean cancelled) {
          if (player.containerMenu != player.inventoryMenu) { // fire INVENTORY_CLOSE if one already open
@@ -198,7 +198,7 @@ index 62c1f7b63601fc8df3469c0e7ad2d75382bde72f..a030a4852d0f7b2e3aedb7b35c316f52
          }
  
          CraftServer server = player.level.getCraftServer();
-@@ -1408,8 +1408,18 @@ public class CraftEventFactory {
+@@ -1407,8 +1407,18 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0228-Vanished-players-don-t-have-rights.patch b/patches/server/0228-Vanished-players-don-t-have-rights.patch
index 8159ecc0dc..a085ae55a0 100644
--- a/patches/server/0228-Vanished-players-don-t-have-rights.patch
+++ b/patches/server/0228-Vanished-players-don-t-have-rights.patch
@@ -89,10 +89,10 @@ index f07e70ab26fffaec5055a7dd2571dc4d29c66d35..754e1667aadef89bbaccebc0f437197b
      public boolean isClientSide() {
          return this.isClientSide;
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a030a4852d0f7b2e3aedb7b35c316f525115086e..9ef6b6fe8a909a90c4b4ddb832f0beb404542a35 100644
+index 200c9694336f5670edef10693a82cbd89bd9b477..1b4e7c9e3452537a13001c23b00eb7ea89c8449b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1271,6 +1271,14 @@ public class CraftEventFactory {
+@@ -1270,6 +1270,14 @@ public class CraftEventFactory {
          Projectile projectile = (Projectile) entity.getBukkitEntity();
          org.bukkit.entity.Entity collided = position.getEntity().getBukkitEntity();
          com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
diff --git a/patches/server/0444-Add-PrepareResultEvent.patch b/patches/server/0444-Add-PrepareResultEvent.patch
index 7e4ba33f38..313dc22aec 100644
--- a/patches/server/0444-Add-PrepareResultEvent.patch
+++ b/patches/server/0444-Add-PrepareResultEvent.patch
@@ -94,10 +94,10 @@ index 665b01ff3579c8fd87074edfc6da6b7ef07693b2..24c31e96be460bcb5062a1fcf7f86c1a
  
      private void setupRecipeList(Container input, ItemStack stack) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 450f3edf0a72272fb0466c2cd3ccc04917a1dedc..81d836ba65890889bbb54852bbebb7aff7e25f68 100644
+index 529116b00cf03ef8616803e59ebeeb655ad76387..e94c80d067c94e96888284020c414c28d7f6f775 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1597,26 +1597,53 @@ public class CraftEventFactory {
+@@ -1596,26 +1596,53 @@ public class CraftEventFactory {
          return event;
      }
  
diff --git a/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch b/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch
index 0ecf10b1d7..c5caedd4ab 100644
--- a/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch
+++ b/patches/server/0537-Implemented-BlockFailedDispenseEvent.patch
@@ -32,10 +32,10 @@ index 1415ad60163f6584619cc7caa61f1848d6ebaa93..801c4c120e98584bcf218a4ef9bd66d7
          } else {
              ItemStack itemstack = tileentitydispenser.getItem(i);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 3d21823498b6ae91520b13d6268396816ff496b1..b6e4475c22641a57f18e6949f19f15c615b5a5a6 100644
+index dea024f5fb0fa769cf1901938e3af4293bf7fca7..ef2e8523c4c90546960e66ca441e723741e73bbb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1880,4 +1880,12 @@ public class CraftEventFactory {
+@@ -1879,4 +1879,12 @@ public class CraftEventFactory {
          EntitiesUnloadEvent event = new EntitiesUnloadEvent(new CraftChunk((ServerLevel) world, coords.x, coords.z), bukkitEntities);
          Bukkit.getPluginManager().callEvent(event);
      }
diff --git a/patches/server/0553-Implement-BlockPreDispenseEvent.patch b/patches/server/0553-Implement-BlockPreDispenseEvent.patch
index c2e0e66d0c..dcd0ae0e23 100644
--- a/patches/server/0553-Implement-BlockPreDispenseEvent.patch
+++ b/patches/server/0553-Implement-BlockPreDispenseEvent.patch
@@ -17,10 +17,10 @@ index 85c5319837295bd2f85baebfe8d6660b267f1d5f..8f55d0753fa26924235c943595f0d1a0
                  tileentitydispenser.setItem(i, idispensebehavior.dispense(sourceblock, itemstack));
              }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 58b16b3d1560e0ae971797ff03553d4e484d1eff..80930b02915b74a72568b2137c01c4bbff1f6a59 100644
+index b0c045aa60a0b942995ae30e385628fd765f6c36..e534f8b57dda54be0ad4c8fe62efa9bdb7b270db 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1898,5 +1898,11 @@ public class CraftEventFactory {
+@@ -1897,5 +1897,11 @@ public class CraftEventFactory {
          io.papermc.paper.event.block.BlockFailedDispenseEvent event = new io.papermc.paper.event.block.BlockFailedDispenseEvent(block);
          return event.callEvent();
      }
diff --git a/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch
index f759694f2d..d9b2226834 100644
--- a/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch
+++ b/patches/server/0557-Add-dropLeash-variable-to-EntityUnleashEvent.patch
@@ -122,10 +122,10 @@ index b5e35033e63da0e5f2c21fddf3b704d6730f0938..7a6cdae1b566f59508b180e720de4eff
                              flag1 = true;
                          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 80930b02915b74a72568b2137c01c4bbff1f6a59..efa269529cad2e9bddcb3c1f06a0cbd0b6ab8573 100644
+index e534f8b57dda54be0ad4c8fe62efa9bdb7b270db..a91ef675f139171bca0158832d1c6266b431d293 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -1530,8 +1530,10 @@ public class CraftEventFactory {
+@@ -1529,8 +1529,10 @@ public class CraftEventFactory {
          return itemInHand;
      }
  
diff --git a/patches/server/0685-Add-critical-damage-API.patch b/patches/server/0685-Add-critical-damage-API.patch
index 8ec373706f..10526c408d 100644
--- a/patches/server/0685-Add-critical-damage-API.patch
+++ b/patches/server/0685-Add-critical-damage-API.patch
@@ -28,7 +28,7 @@ index 9ec30af85095a9993076dafacbecc21b580d06ce..72d62387bfdcbf8e69fe433145be81fb
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
-index 496e10067267df07db9fa2570786d3b281f432c1..166e39a8c6854814dc47c995d23d2d572b56adab 100644
+index b716f297462b29c79500820859b9735c3576a2be..dcbf1e6e494493d81b7a10454a531b0fb719e024 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Player.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Player.java
 @@ -1255,7 +1255,7 @@ public abstract class Player extends LivingEntity {
@@ -71,10 +71,10 @@ index 6486fa86e4bf3c90c09c0425d825bab568a68757..8257563afc3fe04c9e821da363b1f3f6
          int k = entity.getRemainingFireTicks();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index d39a4e21fa2da3fec535ca62028f1c5ac92e8c96..31b955a5424bb9d00c763764f50c9f7605d5317c 100644
+index 6c891278af90a0a7ad4cf28b85284cceb7e63df1..f6f76a659257ae86f868f3af1280565c108678ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-@@ -970,7 +970,7 @@ public class CraftEventFactory {
+@@ -969,7 +969,7 @@ public class CraftEventFactory {
                  } else {
                      damageCause = DamageCause.ENTITY_EXPLOSION;
                  }
@@ -83,16 +83,16 @@ index d39a4e21fa2da3fec535ca62028f1c5ac92e8c96..31b955a5424bb9d00c763764f50c9f76
              }
              event.setCancelled(cancelled);
  
-@@ -999,7 +999,7 @@ public class CraftEventFactory {
+@@ -998,7 +998,7 @@ public class CraftEventFactory {
                  cause = DamageCause.SONIC_BOOM;
              }
  
 -            return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled);
 +            return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API
-         } else if (sourceType == DamageTypes.OUT_OF_WORLD) {
+         } else if (source.is(DamageTypes.OUT_OF_WORLD)) {
              EntityDamageEvent event = new EntityDamageByBlockEvent(null, entity.getBukkitEntity(), DamageCause.VOID, modifiers, modifierFunctions);
              event.setCancelled(cancelled);
-@@ -1069,7 +1069,7 @@ public class CraftEventFactory {
+@@ -1068,7 +1068,7 @@ public class CraftEventFactory {
              } else {
                  throw new IllegalStateException(String.format("Unhandled damage of %s by %s from %s", entity, damager.getHandle(), source.getMsgId()));
              }
@@ -101,7 +101,7 @@ index d39a4e21fa2da3fec535ca62028f1c5ac92e8c96..31b955a5424bb9d00c763764f50c9f76
              event.setCancelled(cancelled);
              CraftEventFactory.callEvent(event);
              if (!event.isCancelled()) {
-@@ -1114,20 +1114,28 @@ public class CraftEventFactory {
+@@ -1113,20 +1113,28 @@ public class CraftEventFactory {
          }
  
          if (cause != null) {
diff --git a/work/Bukkit b/work/Bukkit
index 2651717c7d..2b4582fb65 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 2651717c7d47696a774dfbe3ba1db6c6cfb8a4c5
+Subproject commit 2b4582fb6538a04313af12510624853d02250aba
diff --git a/work/CraftBukkit b/work/CraftBukkit
index dbc32ffa06..f7707086d1 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit dbc32ffa0667ee6d02771283f19c7ccf8c965563
+Subproject commit f7707086d107d825109234dd3020e22558dd1378