From 971a7a5511b3c656b96a9be66ec9848915eb6d3d Mon Sep 17 00:00:00 2001
From: Fabrizio La Rosa <lr.fabrizio@gmail.com>
Date: Sun, 8 Sep 2024 22:12:36 +0200
Subject: [PATCH] Add Decorated Pot Cracked API (#11365)

---
 ... => 0335-Add-missing-block-data-API.patch} | 49 ++++++++++++++++++-
 ...d-EquipmentSlot-convenience-methods.patch} |  0
 ...low-changing-bed-s-occupied-property.patch | 26 ----------
 ...swingHand-EquipmentSlot-convenience.patch} |  2 +-
 ...ch => 0368-Add-entity-knockback-API.patch} |  2 +-
 ... => 0369-Added-EntityToggleSitEvent.patch} |  0
 ...patch => 0370-Add-Moving-Piston-API.patch} |  0
 ...0371-Add-PrePlayerAttackEntityEvent.patch} |  0
 ... 0372-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...374-Add-paper-dumplisteners-command.patch} |  0
 ....patch => 0375-ItemStack-damage-API.patch} |  2 +-
 ...patch => 0376-Add-Tick-TemporalUnit.patch} |  0
 ...tion-API.patch => 0377-Friction-API.patch} |  2 +-
 ... 0378-Player-Entity-Tracking-Events.patch} |  0
 ...atch => 0379-Add-missing-Fluid-type.patch} |  0
 ...ments.patch => 0380-fix-Instruments.patch} |  0
 ...tch => 0381-Add-BlockLockCheckEvent.patch} |  0
 ... 0382-Add-Sneaking-API-for-Entities.patch} |  0
 ....patch => 0383-Improve-PortalEvents.patch} |  0
 ...atch => 0384-Flying-Fall-Damage-API.patch} |  0
 ...eplace-ItemFlag.HIDE_POTION_EFFECTS.patch} |  0
 ...en-API.patch => 0386-Win-Screen-API.patch} |  0
 ...tch => 0387-Add-Entity-Body-Yaw-API.patch} |  2 +-
 ...or-InventoryBlockStartEvent-subclas.patch} |  0
 ...=> 0389-Add-EntityFertilizeEggEvent.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...API.patch => 0391-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ... 0393-Add-Mob-Experience-reward-API.patch} |  0
 ... => 0394-Expand-PlayerItemMendEvent.patch} |  0
 ...to-remove-all-active-potion-effects.patch} |  2 +-
 ...olia-scheduler-and-owned-region-API.patch} |  0
 ...7-Add-event-for-player-editing-sign.patch} |  0
 ...I.patch => 0398-More-Sign-Block-API.patch} |  0
 ...t-API.patch => 0399-Fix-BanList-API.patch} |  0
 ....patch => 0400-Add-whitelist-events.patch} |  0
 ...API-for-updating-recipes-on-clients.patch} |  0
 ...tch => 0402-Add-PlayerFailMoveEvent.patch} |  0
 ...-custom-statistic-criteria-creation.patch} |  0
 ...tch => 0404-SculkCatalyst-bloom-API.patch} |  0
 ...API-for-an-entity-s-scoreboard-name.patch} |  0
 ...lace-methods-with-old-StructureType.patch} |  0
 ... => 0407-Add-Listing-API-for-Player.patch} |  0
 ...d-BlockFace-during-BlockDamageEvent.patch} |  0
 ...h => 0409-Fix-NPE-on-Boat-getStatus.patch} |  0
 ...e-API.patch => 0410-Expand-Pose-API.patch} |  0
 ...MerchantRecipe-add-copy-constructor.patch} |  0
 ...patch => 0412-More-DragonBattle-API.patch} |  0
 ...tch => 0413-Add-PlayerPickItemEvent.patch} |  0
 ...=> 0414-Allow-trident-custom-damage.patch} |  0
 ...pose-hand-during-BlockCanBuildEvent.patch} |  0
 ...t-setBurnTime-to-valid-short-values.patch} |  0
 ... 0417-Add-OfflinePlayer-isConnected.patch} |  0
 ...titleOverride-to-InventoryOpenEvent.patch} |  0
 ...roper-checking-of-empty-item-stacks.patch} |  0
 ...dItemsEvent-throwing-exception-when.patch} |  0
 ...> 0421-Add-player-idle-duration-API.patch} |  0
 ...e-collision-shape-of-a-block-before.patch} |  0
 ...redicate-for-blocks-when-raytracing.patch} |  0
 ...h-event-for-all-player-interactions.patch} |  0
 ...Attribute-Modifier-API-improvements.patch} |  2 +-
 ... => 0426-Expand-LingeringPotion-API.patch} |  0
 ...y-durability-check-in-ItemStack-isS.patch} |  0
 ...tch => 0428-Add-Structure-check-API.patch} |  0
 ...429-Experimental-annotations-change.patch} |  0
 ...tch => 0430-Add-more-scoreboard-API.patch} |  0
 ...stry.patch => 0431-Improve-Registry.patch} |  0
 ...h => 0432-Add-experience-points-API.patch} |  0
 ...h => 0433-Add-missing-InventoryType.patch} |  0
 ...h => 0434-Add-drops-to-shear-events.patch} |  0
 ... => 0435-Add-HiddenPotionEffect-API.patch} |  2 +-
 ...> 0436-Add-PlayerShieldDisableEvent.patch} |  0
 ...mpty-String-in-NamespacedKey.fromSt.patch} |  0
 ...-Add-BlockStateMeta-clearBlockState.patch} |  0
 ...39-Expose-LootTable-of-DecoratedPot.patch} |  0
 ...h => 0440-Add-ShulkerDuplicateEvent.patch} |  0
 ...dd-api-for-spawn-egg-texture-colors.patch} |  0
 ... => 0442-Add-Lifecycle-Event-system.patch} |  0
 ...patch => 0443-ItemStack-Tooltip-API.patch} |  0
 ...Snapshot-includeLightData-parameter.patch} |  0
 ...PI.patch => 0445-Add-FluidState-API.patch} |  0
 ...patch => 0446-add-number-format-api.patch} |  0
 ...patch => 0447-improve-BanList-types.patch} |  0
 ...=> 0448-Suspicious-Effect-Entry-API.patch} |  0
 ....patch => 0449-Fix-DamageSource-API.patch} |  0
 ...I.patch => 0450-Expanded-Hopper-API.patch} |  0
 ...tables-to-prevent-unexpected-issues.patch} |  0
 ...2-Add-BlockBreakProgressUpdateEvent.patch} |  0
 ...=> 0453-Deprecate-ItemStack-setType.patch} |  0
 ...s.patch => 0454-Item-Mutation-Fixes.patch} |  0
 ...> 0455-API-for-checking-sent-chunks.patch} |  0
 ...ch => 0456-Add-CartographyItemEvent.patch} |  0
 ...aid-API.patch => 0457-More-Raid-API.patch} |  0
 ...0458-Fix-SpawnerEntry-Equipment-API.patch} |  0
 ...emFlags.patch => 0459-Fix-ItemFlags.patch} |  0
 ...ifying-library-loader-jars-bytecode.patch} |  0
 ...0461-Add-hook-to-remap-library-jars.patch} |  0
 ...=> 0462-Add-GameMode-isInvulnerable.patch} |  0
 ...63-Expose-hasColor-to-leather-armor.patch} |  0
 ...Add-missing-wind-charge-damage-type.patch} |  0
 ...-API-to-get-player-ha-proxy-address.patch} |  0
 ....patch => 0466-More-Chest-Block-API.patch} |  0
 ...=> 0467-Brigadier-based-command-API.patch} |  0
 ... => 0468-Fix-issues-with-recipe-API.patch} |  0
 ...69-Fix-equipment-slot-and-group-API.patch} |  4 +-
 ...lugin-to-use-Paper-PluginLoader-API.patch} |  0
 ...atch => 0471-General-ItemMeta-fixes.patch} |  0
 ...472-Add-missing-fishing-event-state.patch} |  0
 ...ate-InvAction-HOTBAR_MOVE_AND_READD.patch} |  0
 ...h => 0474-Registry-Modification-API.patch} |  0
 ...troduce-registry-entry-and-builders.patch} |  0
 ...6-Proxy-ItemStack-to-CraftItemStack.patch} |  0
 ...-accessible-directly-from-ItemStack.patch} |  0
 ...h => 0478-Fix-HelpCommand-searching.patch} |  0
 ...atch => 0479-add-Plugin-getDataPath.patch} |  0
 ...0480-Fix-PickupStatus-getting-reset.patch} |  0
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |  0
 ...tandardMessenger-exception-messages.patch} |  0
 ... 0483-Add-even-more-Enchantment-API.patch} |  0
 ...ble-API.patch => 0484-Leashable-API.patch} |  0
 ...485-Add-enchantment-seed-update-API.patch} |  0
 ...removal-all-OldEnum-related-methods.patch} |  0
 ...I.patch => 0487-Add-FeatureFlag-API.patch} |  0
 ....patch => 0488-Tag-Lifecycle-Events.patch} |  0
 ... => 0489-Item-serialization-as-json.patch} |  0
 ... => 0668-Add-missing-block-data-API.patch} | 46 ++++++++++++++++-
 ...ch => 0755-Add-entity-knockback-API.patch} |  0
 ...low-changing-bed-s-occupied-property.patch | 22 ---------
 ....patch => 0756-Detect-headless-JREs.patch} |  0
 ...-vehicle-collision-event-not-called.patch} |  0
 ...ch => 0758-Add-EntityToggleSitEvent.patch} |  0
 ... => 0759-Add-fire-tick-delay-option.patch} |  0
 ...patch => 0760-Add-Moving-Piston-API.patch} |  0
 ...> 0761-Ignore-impossible-spawn-tick.patch} |  0
 ...t-and-EntitySelectorParser-permissi.patch} |  0
 ...Event-cancellation-cant-fully-preve.patch} |  0
 ...0764-Add-PrePlayerAttackEntityEvent.patch} |  0
 ...e-reset-EnderDragon-boss-event-name.patch} |  0
 ... 0766-Add-Player-Warden-Warning-API.patch} |  0
 ...a-friendly-methods-to-update-trades.patch} |  0
 ...768-Add-paper-dumplisteners-command.patch} |  0
 ...lobal-player-list-where-appropriate.patch} |  0
 ...sync-entity-add-due-to-fungus-trees.patch} |  0
 ....patch => 0771-ItemStack-damage-API.patch} |  0
 ...tion-API.patch => 0772-Friction-API.patch} |  0
 ...trol-player-s-insomnia-and-phantoms.patch} |  0
 ...-premature-player-kicks-on-shutdown.patch} |  0
 ... => 0775-Sync-offhand-slot-in-menus.patch} |  0
 ... 0776-Player-Entity-Tracking-Events.patch} |  0
 ...tch => 0777-Limit-pet-look-distance.patch} |  0
 ...ments.patch => 0778-fix-Instruments.patch} |  0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |  0
 ...es-in-dispense-events-regarding-sta.patch} |  0
 ...tch => 0781-Add-BlockLockCheckEvent.patch} |  0
 ... 0782-Add-Sneaking-API-for-Entities.patch} |  0
 ... => 0783-Improve-logging-and-errors.patch} |  0
 ....patch => 0784-Improve-PortalEvents.patch} |  0
 ...ion-for-spider-worldborder-climbing.patch} |  0
 ...sing-SpigotConfig-logCommands-check.patch} |  0
 ...Allay-stopDancing-while-not-dancing.patch} |  0
 ...ge.patch => 0788-Flying-Fall-Damage.patch} |  0
 ...ion-moving-velocity-to-VehicleBlock.patch} |  0
 ...onfig-for-disabling-entity-tag-tags.patch} |  0
 ...e-player-info-update-packet-on-join.patch} |  0
 ...k-items-during-EntityResurrectEvent.patch} |  0
 ...en-API.patch => 0793-Win-Screen-API.patch} |  0
 ...ItemStack-setAmount-null-assignment.patch} |  0
 ...ix-force-opening-enchantment-tables.patch} |  0
 ...tch => 0796-Add-Entity-Body-Yaw-API.patch} |  0
 ...vent-sleeping-villagers-moving-towa.patch} |  0
 ...=> 0798-Add-EntityFertilizeEggEvent.patch} |  0
 ...ty-drop-not-updating-the-client-inv.patch} |  0
 ...temEvent-and-EntityCompostItemEvent.patch} |  0
 ...ctly-handle-ArmorStand-invisibility.patch} |  0
 ...ancement-triggers-for-entity-damage.patch} |  0
 ...803-Fix-text-display-error-on-spawn.patch} |  0
 ...nventories-returning-null-Locations.patch} |  0
 ...API.patch => 0805-Add-Shearable-API.patch} |  0
 ...Fix-SpawnEggMeta-get-setSpawnedType.patch} |  0
 ...g-to-bad-recipes-in-furnace-like-ti.patch} |  0
 ...ence-violations-like-they-should-be.patch} |  0
 ...xpired-keys-from-impacting-new-join.patch} |  0
 ...ts-being-fired-from-unloaded-chunks.patch} |  0
 ...0811-Use-array-for-gamerule-storage.patch} |  0
 ...Fix-a-couple-of-upstream-bed-issues.patch} |  0
 ...ix-demo-flag-not-enabling-demo-mode.patch} |  0
 ... 0814-Add-Mob-Experience-reward-API.patch} |  0
 ...redstone-on-top-of-trap-doors-early.patch} |  0
 ...Lazy-Initialization-for-Enum-Fields.patch} |  0
 ...17-More-accurate-isInOpenWater-impl.patch} |  0
 ... => 0818-Expand-PlayerItemMendEvent.patch} |  0
 ...sh-ProjectileSource-for-projectiles.patch} |  0
 ... => 0820-Add-transient-modifier-API.patch} |  0
 ...patch => 0821-Fix-block-place-logic.patch} |  0
 ...nd-playing-for-BlockItem-ItemStacks.patch} |  0
 ...l-BlockGrowEvent-for-missing-blocks.patch} |  0
 ...nhasbukkit-default-if-alias-block-e.patch} |  0
 ...pLike-spam-for-missing-key-selector.patch} |  0
 ...-Fix-sniffer-removeExploredLocation.patch} |  0
 ...to-remove-all-active-potion-effects.patch} |  0
 ...rafting-result-amount-for-fireworks.patch} |  0
 ...9-Add-event-for-player-editing-sign.patch} |  0
 ...k-item-frames-if-players-can-see-it.patch} |  0
 ...ermission-levels-for-command-blocks.patch} |  0
 ...Add-option-to-disable-block-updates.patch} |  0
 ...833-Call-missing-BlockDispenseEvent.patch} |  0
 ...-chunks-for-supporting-block-checks.patch} |  0
 ...Optimize-player-lookups-for-beacons.patch} |  0
 ...I.patch => 0836-More-Sign-Block-API.patch} |  0
 ...7-fix-item-meta-for-tadpole-buckets.patch} |  0
 ...t-API.patch => 0838-Fix-BanList-API.patch} |  0
 ...d-water-fluid-explosion-resistance-.patch} |  0
 ...x-possible-NPE-on-painting-creation.patch} |  0
 ...imer-for-Wandering-Traders-spawned-.patch} |  0
 ...nceOrb-should-call-EntitySpawnEvent.patch} |  0
 ...t-throw-both-Spread-and-Grow-Events.patch} |  0
 ....patch => 0844-Add-whitelist-events.patch} |  0
 ... 0845-Implement-PlayerFailMoveEvent.patch} |  0
 ...olia-scheduler-and-owned-region-API.patch} |  0
 ...se-allay-memory-on-non-item-targets.patch} |  0
 ...API-for-updating-recipes-on-clients.patch} |  0
 ...tion-when-spawning-display-entities.patch} |  0
 ...850-Only-capture-actual-tree-growth.patch} |  0
 ...rce-for-mushroom-block-spread-event.patch} |  0
 ...Data-on-more-entities-when-spawning.patch} |  0
 ...-Use-correct-seed-on-api-world-load.patch} |  0
 ...ta-neighbour-ticks-outside-of-range.patch} |  0
 ...> 0855-Cache-map-ids-on-item-frames.patch} |  0
 ...-custom-statistic-criteria-creation.patch} |  0
 ...atch => 0857-Bandaid-fix-for-Effect.patch} |  0
 ...tch => 0858-SculkCatalyst-bloom-API.patch} |  0
 ...API-for-an-entity-s-scoreboard-name.patch} |  0
 ...lace-methods-with-old-StructureType.patch} |  0
 ...e-namespaced-commands-if-send-names.patch} |  0
 ...-handle-BlockBreakEvent-isDropItems.patch} |  0
 ...entity-death-event-for-ender-dragon.patch} |  0
 ...tity-tracking-range-by-Y-coordinate.patch} |  0
 ... => 0865-Add-Listing-API-for-Player.patch} |  0
 ...figurable-Region-Compression-Format.patch} |  0
 ...7-Add-BlockFace-to-BlockDamageEvent.patch} |  0
 ...h => 0868-Fix-NPE-on-Boat-getStatus.patch} |  0
 ...e-API.patch => 0869-Expand-Pose-API.patch} |  0
 ...patch => 0870-More-DragonBattle-API.patch} |  0
 ...tch => 0871-Add-PlayerPickItemEvent.patch} |  0
 ...=> 0872-Allow-trident-custom-damage.patch} |  0
 ...3-Expose-hand-in-BlockCanBuildEvent.patch} |  0
 ...-nearest-structure-border-iteration.patch} |  0
 ...Implement-OfflinePlayer-isConnected.patch} |  0
 ...esync.patch => 0876-Fix-slot-desync.patch} |  0
 ...titleOverride-to-InventoryOpenEvent.patch} |  0
 ...78-Configure-sniffer-egg-hatch-time.patch} |  0
 ...-proximity-check-before-entity-look.patch} |  0
 ...kip-POI-finding-if-stuck-in-vehicle.patch} |  0
 ...t-sanity-checks-in-container-clicks.patch} |  0
 ...ll-BlockRedstoneEvents-for-lecterns.patch} |  0
 ...roper-checking-of-empty-item-stacks.patch} |  0
 ...ix-silent-equipment-change-for-mobs.patch} |  0
 ...h => 0885-Fix-spigot-s-Forced-Stats.patch} |  0
 ...ing-InventoryHolders-to-inventories.patch} |  0
 ...entities-in-chunks-that-are-positio.patch} |  0
 ...sing-logs-for-log-ips-config-option.patch} |  0
 ...n-on-UpgradeData.BlockFixers-class-.patch} |  0
 ...-AdvancementProgress-getDateAwarded.patch} |  0
 ...idebar-objectives-not-being-cleared.patch} |  0
 ...x-missing-map-initialize-event-call.patch} |  0
 ...a-when-attaching-firework-to-entity.patch} |  0
 ...94-Fix-UnsafeValues-loadAdvancement.patch} |  0
 ...> 0895-Add-player-idle-duration-API.patch} |  0
 ...-if-we-can-see-non-visible-entities.patch} |  0
 ...NPE-in-SculkBloomEvent-world-access.patch} |  0
 ...tack-for-Player-sendEquipmentChange.patch} |  0
 ...Ints.patch => 0899-Optimize-VarInts.patch} |  0
 ...e-collision-shape-of-a-block-before.patch} |  0
 ...redicate-for-blocks-when-raytracing.patch} |  0
 ...em-packets-with-collector-as-source.patch} |  0
 ... => 0903-Expand-LingeringPotion-API.patch} |  0
 ...ngEffect-powers-lightning-rods-and-.patch} |  0
 ...h-event-for-all-player-interactions.patch} |  0
 ...everal-issues-with-EntityBreedEvent.patch} |  0
 ...907-Add-UUID-attribute-modifier-API.patch} |  0
 ...-event-call-for-entity-teleport-API.patch} |  0
 ...y-create-LootContext-for-criterions.patch} |  0
 ...-t-fire-sync-events-during-worldgen.patch} |  0
 ...tch => 0911-Add-Structure-check-API.patch} |  0
 ...-getAttributeModifier-duplication-c.patch} |  0
 ...store-vanilla-entity-drops-behavior.patch} |  0
 ...-Dont-resend-blocks-on-interactions.patch} |  0
 ...tch => 0915-add-more-scoreboard-API.patch} |  0
 ...stry.patch => 0916-Improve-Registry.patch} |  0
 ...on-null-loc-for-EntityTeleportEvent.patch} |  0
 ...h => 0918-Add-experience-points-API.patch} |  0
 ...h => 0919-Add-drops-to-shear-events.patch} |  0
 ...> 0920-Add-PlayerShieldDisableEvent.patch} |  0
 ...ate-ResourceLocation-in-NBT-reading.patch} |  0
 ...-experience-dropping-on-block-break.patch} |  0
 ...> 0923-Fixup-NamespacedKey-handling.patch} |  0
 ...24-Expose-LootTable-of-DecoratedPot.patch} |  0
 ...location-of-Vec3D-by-entity-tracker.patch} |  0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |  0
 ...h => 0927-Add-ShulkerDuplicateEvent.patch} |  0
 ...dd-api-for-spawn-egg-texture-colors.patch} |  0
 ... => 0929-Add-Lifecycle-Event-system.patch} |  0
 ...patch => 0930-ItemStack-Tooltip-API.patch} |  0
 ...Snapshot-includeLightData-parameter.patch} |  0
 ...PI.patch => 0932-Add-FluidState-API.patch} |  0
 ...patch => 0933-add-number-format-api.patch} |  0
 ...patch => 0934-improve-BanList-types.patch} |  0
 ...I.patch => 0935-Expanded-Hopper-API.patch} |  0
 ...6-Add-BlockBreakProgressUpdateEvent.patch} |  0
 ...=> 0937-Deprecate-ItemStack-setType.patch} |  0
 ...ch => 0938-Add-CartographyItemEvent.patch} |  0
 ...aid-API.patch => 0939-More-Raid-API.patch} |  0
 ...ng-message-for-initial-server-start.patch} |  0
 ...-Configurable-max-block-fluid-ticks.patch} |  0
 ...=> 0942-Fix-bees-aging-inside-hives.patch} |  0
 ...3-Disable-memory-reserve-allocating.patch} |  0
 ...ByEntityEvent-for-unowned-wither-sk.patch} |  0
 ....patch => 0945-Fix-DamageSource-API.patch} |  0
 ...nvalid-block-entity-during-world-ge.patch} |  0
 ...ackOverflowError-for-some-dispenses.patch} |  0
 ...=> 0948-Improve-tag-parser-handling.patch} |  0
 ...s.patch => 0949-Item-Mutation-Fixes.patch} |  0
 ...-Per-world-ticks-per-spawn-settings.patch} |  0
 ...e-changed-item-from-dispense-events.patch} |  0
 ...nd-End-Portal-Frames-from-being-des.patch} |  0
 ...e-disarming-not-working-as-intended.patch} |  0
 ...-for-mobs-immune-to-default-effects.patch} |  0
 ... => 0955-Deep-clone-nbt-tags-in-PDC.patch} |  0
 ...956-Support-old-UUID-format-for-NBT.patch} |  0
 ...57-Fix-shield-disable-inconsistency.patch} |  0
 ...-Large-Packets-disconnecting-client.patch} |  0
 ...emFlags.patch => 0959-Fix-ItemFlags.patch} |  0
 ...h => 0960-Fix-Player-setBlockUpdate.patch} |  0
 ...et-damage-reduction-inconsistencies.patch} |  0
 ...-handling-of-LivingEntity-actuallyH.patch} |  0
 ...e-checking-handled-tags-in-itemmeta.patch} |  0
 ...atch => 0964-General-ItemMeta-fixes.patch} |  0
 ...65-Expose-hasColor-to-leather-armor.patch} |  0
 ...-API-to-get-player-ha-proxy-address.patch} |  0
 ....patch => 0967-More-Chest-Block-API.patch} |  0
 ...ta-component-type-on-encoding-error.patch} |  0
 ...=> 0969-Brigadier-based-command-API.patch} |  0
 ... => 0970-Fix-issues-with-Recipe-API.patch} |  0
 ...71-Fix-equipment-slot-and-group-API.patch} |  0
 ...lugin-to-use-Paper-PluginLoader-API.patch} |  0
 ...versized-item-data-in-equipment-and.patch} |  0
 ...nt-NPE-if-hooked-entity-was-cleared.patch} |  0
 ...ng-BlockPlaceEvent-calling-onRemove.patch} |  0
 ...976-Add-missing-fishing-event-state.patch} |  0
 ...ate-InvAction-HOTBAR_MOVE_AND_READD.patch} |  0
 ...nnect-packet-in-phases-where-it-doe.patch} |  0
 ...tch => 0979-Adopt-MaterialRerouting.patch} |  0
 ...=> 0980-Suspicious-Effect-Entry-API.patch} |  0
 ...eck-if-itemstack-is-stackable-first.patch} |  0
 ...emoving-recipes-from-RecipeIterator.patch} |  0
 ...mage-tick-when-blocking-with-shield.patch} |  0
 ...he-experimental-smithing-inventory-.patch} |  0
 ... 0985-Moonrise-optimisation-patches.patch} |  0
 ...> 0986-Rewrite-dataconverter-system.patch} |  0
 ...87-disable-forced-empty-world-ticks.patch} |  0
 ...dBounds-and-getBlockState-for-inlin.patch} |  0
 ...tem-frames-performance-and-bug-fixe.patch} |  0
 ...ing-for-EntityLiving-hasLineOfSight.patch} |  0
 ...Manager-and-add-advanced-packet-sup.patch} |  0
 ...92-Allow-Saving-of-Oversized-Chunks.patch} |  0
 ...993-Flat-bedrock-generator-settings.patch} |  0
 ...=> 0994-Entity-Activation-Range-2.0.patch} |  0
 ...0995-Optional-per-player-mob-spawns.patch} |  0
 ...7-Anti-Xray.patch => 0996-Anti-Xray.patch} |  0
 ...-Eigencraft-redstone-implementation.patch} |  0
 ...ate-Current-redstone-implementation.patch} |  0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |  0
 ...city-compression-and-cipher-natives.patch} |  0
 ...timize-Collision-to-not-load-chunks.patch} |  0
 ...alSelector-Goal.Flag-Set-operations.patch} |  0
 ...pers.patch => 1003-Optimize-Hoppers.patch} |  0
 ...04-Entity-load-save-limit-per-chunk.patch} |  0
 ...> 1005-Optimize-Voxel-Shape-Merging.patch} |  0
 ...Optimize-Bit-Operations-by-inlining.patch} |  0
 ...> 1007-Remove-streams-from-hot-code.patch} |  0
 ...er-Remove-Streams-Optimized-collect.patch} |  0
 ...ementation-for-blockstate-state-loo.patch} |  0
 ...-type-tags-suggestions-in-selectors.patch} |  0
 ...-Oversized-block-entities-in-chunks.patch} |  0
 ...> 1012-API-for-checking-sent-chunks.patch} |  0
 ...eck-distance-in-entity-interactions.patch} |  0
 ...ch => 1014-Configurable-Sand-Duping.patch} |  0
 ...=> 1015-Optimise-general-POI-access.patch} |  0
 ...-Improve-performance-of-mass-crafts.patch} |  0
 ...ch => 1017-Properly-resend-entities.patch} |  0
 ...h => 1018-Registry-Modification-API.patch} |  0
 ...019-Add-registry-entry-and-builders.patch} |  0
 ...h => 1020-Improved-Watchdog-Support.patch} |  0
 ...1-Proxy-ItemStack-to-CraftItemStack.patch} |  0
 ...-accessible-directly-from-ItemStack.patch} |  0
 ...aft-commands-in-function-parsing-an.patch} |  0
 ...24-optimize-dirt-and-snow-spreading.patch} |  0
 ... 1025-Fix-NPE-for-Jukebox-setRecord.patch} |  0
 ...026-Fix-CraftWorld-isChunkGenerated.patch} |  0
 ...patch => 1027-fix-horse-inventories.patch} |  0
 ...ityDamageEvents-before-actuallyHurt.patch} |  0
 ...r-desync-when-new-players-are-added.patch} |  0
 ...atch => 1030-Lag-compensation-ticks.patch} |  0
 ...-more-information-in-watchdog-dumps.patch} |  0
 ...ch => 1032-Write-SavedData-IO-async.patch} |  0
 ...Correctly-call-PlayerItemBreakEvent.patch} |  0
 ... => 1034-Add-ItemType-getItemRarity.patch} |  0
 ...Incremental-chunk-and-player-saving.patch} |  0
 ...ulate-regionfile-header-if-it-is-co.patch} |  0
 ...le-spark.patch => 1037-Bundle-spark.patch} |  2 +-
 ... => 1038-Add-plugin-info-at-startup.patch} |  0
 ...tion-leniency-distance-configurable.patch} |  0
 ...1040-Fix-PickupStatus-getting-reset.patch} |  0
 ...ype-in-SculkSensorBlock-canActivate.patch} |  0
 ...anPlaceOn-and-CanDestroy-NBT-values.patch} |  0
 ...on-for-horizontal-only-item-merging.patch} |  0
 ...n-checking-in-player-move-packet-ha.patch} |  0
 ...045-Add-skipping-world-symlink-scan.patch} |  0
 ... 1046-Add-even-more-Enchantment-API.patch} |  0
 ...ble-API.patch => 1047-Leashable-API.patch} |  0
 ...=> 1048-Fix-CraftBukkit-drag-system.patch} |  0
 ...ent-firing-for-block-entity-loading.patch} |  0
 ...-lootable-item-function-from-compas.patch} |  0
 ...y-placed-blocks-on-the-end-platform.patch} |  0
 ...052-Add-enchantment-seed-update-API.patch} |  0
 ...ending-chat-to-client-with-updating.patch} |  0
 ...Fix-InventoryOpenEvent-cancellation.patch} |  0
 ...ire-BlockExpEvent-on-grindstone-use.patch} |  0
 ... => 1056-Check-dead-flag-in-isAlive.patch} |  0
 ...I.patch => 1057-Add-FeatureFlag-API.patch} |  0
 ....patch => 1058-Tag-Lifecycle-Events.patch} |  0
 ... => 1059-Item-serialization-as-json.patch} |  0
 433 files changed, 104 insertions(+), 61 deletions(-)
 rename patches/api/{0335-Add-missing-block-data-mins-and-maxes.patch => 0335-Add-missing-block-data-API.patch} (63%)
 rename patches/api/{0367-Add-EquipmentSlot-convenience-methods.patch => 0366-Add-EquipmentSlot-convenience-methods.patch} (100%)
 delete mode 100644 patches/api/0366-Allow-changing-bed-s-occupied-property.patch
 rename patches/api/{0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch => 0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch} (94%)
 rename patches/api/{0369-Add-entity-knockback-API.patch => 0368-Add-entity-knockback-API.patch} (93%)
 rename patches/api/{0370-Added-EntityToggleSitEvent.patch => 0369-Added-EntityToggleSitEvent.patch} (100%)
 rename patches/api/{0371-Add-Moving-Piston-API.patch => 0370-Add-Moving-Piston-API.patch} (100%)
 rename patches/api/{0372-Add-PrePlayerAttackEntityEvent.patch => 0371-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/api/{0373-Add-Player-Warden-Warning-API.patch => 0372-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/api/{0374-More-vanilla-friendly-methods-to-update-trades.patch => 0373-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/api/{0375-Add-paper-dumplisteners-command.patch => 0374-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/api/{0376-ItemStack-damage-API.patch => 0375-ItemStack-damage-API.patch} (97%)
 rename patches/api/{0377-Add-Tick-TemporalUnit.patch => 0376-Add-Tick-TemporalUnit.patch} (100%)
 rename patches/api/{0378-Friction-API.patch => 0377-Friction-API.patch} (96%)
 rename patches/api/{0379-Player-Entity-Tracking-Events.patch => 0378-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/api/{0380-Add-missing-Fluid-type.patch => 0379-Add-missing-Fluid-type.patch} (100%)
 rename patches/api/{0381-fix-Instruments.patch => 0380-fix-Instruments.patch} (100%)
 rename patches/api/{0382-Add-BlockLockCheckEvent.patch => 0381-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/api/{0383-Add-Sneaking-API-for-Entities.patch => 0382-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/api/{0384-Improve-PortalEvents.patch => 0383-Improve-PortalEvents.patch} (100%)
 rename patches/api/{0385-Flying-Fall-Damage-API.patch => 0384-Flying-Fall-Damage-API.patch} (100%)
 rename patches/api/{0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch => 0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch} (100%)
 rename patches/api/{0387-Win-Screen-API.patch => 0386-Win-Screen-API.patch} (100%)
 rename patches/api/{0388-Add-Entity-Body-Yaw-API.patch => 0387-Add-Entity-Body-Yaw-API.patch} (95%)
 rename patches/api/{0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch => 0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch} (100%)
 rename patches/api/{0390-Add-EntityFertilizeEggEvent.patch => 0389-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/api/{0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/api/{0392-Add-Shearable-API.patch => 0391-Add-Shearable-API.patch} (100%)
 rename patches/api/{0393-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0392-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/api/{0394-Add-Mob-Experience-reward-API.patch => 0393-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/api/{0395-Expand-PlayerItemMendEvent.patch => 0394-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/api/{0396-Add-method-to-remove-all-active-potion-effects.patch => 0395-Add-method-to-remove-all-active-potion-effects.patch} (91%)
 rename patches/api/{0397-Folia-scheduler-and-owned-region-API.patch => 0396-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/api/{0398-Add-event-for-player-editing-sign.patch => 0397-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/api/{0399-More-Sign-Block-API.patch => 0398-More-Sign-Block-API.patch} (100%)
 rename patches/api/{0400-Fix-BanList-API.patch => 0399-Fix-BanList-API.patch} (100%)
 rename patches/api/{0401-Add-whitelist-events.patch => 0400-Add-whitelist-events.patch} (100%)
 rename patches/api/{0402-API-for-updating-recipes-on-clients.patch => 0401-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/api/{0403-Add-PlayerFailMoveEvent.patch => 0402-Add-PlayerFailMoveEvent.patch} (100%)
 rename patches/api/{0404-Fix-custom-statistic-criteria-creation.patch => 0403-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/api/{0405-SculkCatalyst-bloom-API.patch => 0404-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/api/{0406-API-for-an-entity-s-scoreboard-name.patch => 0405-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/api/{0407-Deprecate-and-replace-methods-with-old-StructureType.patch => 0406-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/api/{0408-Add-Listing-API-for-Player.patch => 0407-Add-Listing-API-for-Player.patch} (100%)
 rename patches/api/{0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%)
 rename patches/api/{0410-Fix-NPE-on-Boat-getStatus.patch => 0409-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/api/{0411-Expand-Pose-API.patch => 0410-Expand-Pose-API.patch} (100%)
 rename patches/api/{0412-MerchantRecipe-add-copy-constructor.patch => 0411-MerchantRecipe-add-copy-constructor.patch} (100%)
 rename patches/api/{0413-More-DragonBattle-API.patch => 0412-More-DragonBattle-API.patch} (100%)
 rename patches/api/{0414-Add-PlayerPickItemEvent.patch => 0413-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/api/{0415-Allow-trident-custom-damage.patch => 0414-Allow-trident-custom-damage.patch} (100%)
 rename patches/api/{0416-Expose-hand-during-BlockCanBuildEvent.patch => 0415-Expose-hand-during-BlockCanBuildEvent.patch} (100%)
 rename patches/api/{0417-Limit-setBurnTime-to-valid-short-values.patch => 0416-Limit-setBurnTime-to-valid-short-values.patch} (100%)
 rename patches/api/{0418-Add-OfflinePlayer-isConnected.patch => 0417-Add-OfflinePlayer-isConnected.patch} (100%)
 rename patches/api/{0419-Add-titleOverride-to-InventoryOpenEvent.patch => 0418-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/api/{0420-Allow-proper-checking-of-empty-item-stacks.patch => 0419-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/api/{0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch => 0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch} (100%)
 rename patches/api/{0422-Add-player-idle-duration-API.patch => 0421-Add-player-idle-duration-API.patch} (100%)
 rename patches/api/{0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/api/{0424-Add-predicate-for-blocks-when-raytracing.patch => 0423-Add-predicate-for-blocks-when-raytracing.patch} (100%)
 rename patches/api/{0425-Add-hand-to-fish-event-for-all-player-interactions.patch => 0424-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/api/{0426-Attribute-Modifier-API-improvements.patch => 0425-Attribute-Modifier-API-improvements.patch} (98%)
 rename patches/api/{0427-Expand-LingeringPotion-API.patch => 0426-Expand-LingeringPotion-API.patch} (100%)
 rename patches/api/{0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch => 0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch} (100%)
 rename patches/api/{0429-Add-Structure-check-API.patch => 0428-Add-Structure-check-API.patch} (100%)
 rename patches/api/{0430-Experimental-annotations-change.patch => 0429-Experimental-annotations-change.patch} (100%)
 rename patches/api/{0431-Add-more-scoreboard-API.patch => 0430-Add-more-scoreboard-API.patch} (100%)
 rename patches/api/{0432-Improve-Registry.patch => 0431-Improve-Registry.patch} (100%)
 rename patches/api/{0433-Add-experience-points-API.patch => 0432-Add-experience-points-API.patch} (100%)
 rename patches/api/{0434-Add-missing-InventoryType.patch => 0433-Add-missing-InventoryType.patch} (100%)
 rename patches/api/{0435-Add-drops-to-shear-events.patch => 0434-Add-drops-to-shear-events.patch} (100%)
 rename patches/api/{0436-Add-HiddenPotionEffect-API.patch => 0435-Add-HiddenPotionEffect-API.patch} (98%)
 rename patches/api/{0437-Add-PlayerShieldDisableEvent.patch => 0436-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/api/{0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch => 0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch} (100%)
 rename patches/api/{0439-Add-BlockStateMeta-clearBlockState.patch => 0438-Add-BlockStateMeta-clearBlockState.patch} (100%)
 rename patches/api/{0440-Expose-LootTable-of-DecoratedPot.patch => 0439-Expose-LootTable-of-DecoratedPot.patch} (100%)
 rename patches/api/{0441-Add-ShulkerDuplicateEvent.patch => 0440-Add-ShulkerDuplicateEvent.patch} (100%)
 rename patches/api/{0442-Add-api-for-spawn-egg-texture-colors.patch => 0441-Add-api-for-spawn-egg-texture-colors.patch} (100%)
 rename patches/api/{0443-Add-Lifecycle-Event-system.patch => 0442-Add-Lifecycle-Event-system.patch} (100%)
 rename patches/api/{0444-ItemStack-Tooltip-API.patch => 0443-ItemStack-Tooltip-API.patch} (100%)
 rename patches/api/{0445-Add-getChunkSnapshot-includeLightData-parameter.patch => 0444-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%)
 rename patches/api/{0446-Add-FluidState-API.patch => 0445-Add-FluidState-API.patch} (100%)
 rename patches/api/{0447-add-number-format-api.patch => 0446-add-number-format-api.patch} (100%)
 rename patches/api/{0448-improve-BanList-types.patch => 0447-improve-BanList-types.patch} (100%)
 rename patches/api/{0449-Suspicious-Effect-Entry-API.patch => 0448-Suspicious-Effect-Entry-API.patch} (100%)
 rename patches/api/{0450-Fix-DamageSource-API.patch => 0449-Fix-DamageSource-API.patch} (100%)
 rename patches/api/{0451-Expanded-Hopper-API.patch => 0450-Expanded-Hopper-API.patch} (100%)
 rename patches/api/{0452-Clone-mutables-to-prevent-unexpected-issues.patch => 0451-Clone-mutables-to-prevent-unexpected-issues.patch} (100%)
 rename patches/api/{0453-Add-BlockBreakProgressUpdateEvent.patch => 0452-Add-BlockBreakProgressUpdateEvent.patch} (100%)
 rename patches/api/{0454-Deprecate-ItemStack-setType.patch => 0453-Deprecate-ItemStack-setType.patch} (100%)
 rename patches/api/{0455-Item-Mutation-Fixes.patch => 0454-Item-Mutation-Fixes.patch} (100%)
 rename patches/api/{0456-API-for-checking-sent-chunks.patch => 0455-API-for-checking-sent-chunks.patch} (100%)
 rename patches/api/{0457-Add-CartographyItemEvent.patch => 0456-Add-CartographyItemEvent.patch} (100%)
 rename patches/api/{0458-More-Raid-API.patch => 0457-More-Raid-API.patch} (100%)
 rename patches/api/{0459-Fix-SpawnerEntry-Equipment-API.patch => 0458-Fix-SpawnerEntry-Equipment-API.patch} (100%)
 rename patches/api/{0460-Fix-ItemFlags.patch => 0459-Fix-ItemFlags.patch} (100%)
 rename patches/api/{0461-Allow-modifying-library-loader-jars-bytecode.patch => 0460-Allow-modifying-library-loader-jars-bytecode.patch} (100%)
 rename patches/api/{0462-Add-hook-to-remap-library-jars.patch => 0461-Add-hook-to-remap-library-jars.patch} (100%)
 rename patches/api/{0463-Add-GameMode-isInvulnerable.patch => 0462-Add-GameMode-isInvulnerable.patch} (100%)
 rename patches/api/{0464-Expose-hasColor-to-leather-armor.patch => 0463-Expose-hasColor-to-leather-armor.patch} (100%)
 rename patches/api/{0465-Add-missing-wind-charge-damage-type.patch => 0464-Add-missing-wind-charge-damage-type.patch} (100%)
 rename patches/api/{0466-Added-API-to-get-player-ha-proxy-address.patch => 0465-Added-API-to-get-player-ha-proxy-address.patch} (100%)
 rename patches/api/{0467-More-Chest-Block-API.patch => 0466-More-Chest-Block-API.patch} (100%)
 rename patches/api/{0468-Brigadier-based-command-API.patch => 0467-Brigadier-based-command-API.patch} (100%)
 rename patches/api/{0469-Fix-issues-with-recipe-API.patch => 0468-Fix-issues-with-recipe-API.patch} (100%)
 rename patches/api/{0470-Fix-equipment-slot-and-group-API.patch => 0469-Fix-equipment-slot-and-group-API.patch} (97%)
 rename patches/api/{0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch => 0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch} (100%)
 rename patches/api/{0472-General-ItemMeta-fixes.patch => 0471-General-ItemMeta-fixes.patch} (100%)
 rename patches/api/{0473-Add-missing-fishing-event-state.patch => 0472-Add-missing-fishing-event-state.patch} (100%)
 rename patches/api/{0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch => 0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch} (100%)
 rename patches/api/{0475-Registry-Modification-API.patch => 0474-Registry-Modification-API.patch} (100%)
 rename patches/api/{0476-Introduce-registry-entry-and-builders.patch => 0475-Introduce-registry-entry-and-builders.patch} (100%)
 rename patches/api/{0477-Proxy-ItemStack-to-CraftItemStack.patch => 0476-Proxy-ItemStack-to-CraftItemStack.patch} (100%)
 rename patches/api/{0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch => 0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch} (100%)
 rename patches/api/{0479-Fix-HelpCommand-searching.patch => 0478-Fix-HelpCommand-searching.patch} (100%)
 rename patches/api/{0480-add-Plugin-getDataPath.patch => 0479-add-Plugin-getDataPath.patch} (100%)
 rename patches/api/{0481-Fix-PickupStatus-getting-reset.patch => 0480-Fix-PickupStatus-getting-reset.patch} (100%)
 rename patches/api/{0482-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename patches/api/{0483-Improve-StandardMessenger-exception-messages.patch => 0482-Improve-StandardMessenger-exception-messages.patch} (100%)
 rename patches/api/{0484-Add-even-more-Enchantment-API.patch => 0483-Add-even-more-Enchantment-API.patch} (100%)
 rename patches/api/{0485-Leashable-API.patch => 0484-Leashable-API.patch} (100%)
 rename patches/api/{0486-Add-enchantment-seed-update-API.patch => 0485-Add-enchantment-seed-update-API.patch} (100%)
 rename patches/api/{0487-Deprecate-for-removal-all-OldEnum-related-methods.patch => 0486-Deprecate-for-removal-all-OldEnum-related-methods.patch} (100%)
 rename patches/api/{0488-Add-FeatureFlag-API.patch => 0487-Add-FeatureFlag-API.patch} (100%)
 rename patches/api/{0489-Tag-Lifecycle-Events.patch => 0488-Tag-Lifecycle-Events.patch} (100%)
 rename patches/api/{0490-Item-serialization-as-json.patch => 0489-Item-serialization-as-json.patch} (100%)
 rename patches/server/{0668-Add-missing-block-data-mins-and-maxes.patch => 0668-Add-missing-block-data-API.patch} (77%)
 rename patches/server/{0756-Add-entity-knockback-API.patch => 0755-Add-entity-knockback-API.patch} (100%)
 delete mode 100644 patches/server/0755-Allow-changing-bed-s-occupied-property.patch
 rename patches/server/{0757-Detect-headless-JREs.patch => 0756-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0758-fix-entity-vehicle-collision-event-not-called.patch => 0757-fix-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0759-Add-EntityToggleSitEvent.patch => 0758-Add-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0760-Add-fire-tick-delay-option.patch => 0759-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0761-Add-Moving-Piston-API.patch => 0760-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0762-Ignore-impossible-spawn-tick.patch => 0761-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch => 0762-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch} (100%)
 rename patches/server/{0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0763-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0765-Add-PrePlayerAttackEntityEvent.patch => 0764-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0766-ensure-reset-EnderDragon-boss-event-name.patch => 0765-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0767-Add-Player-Warden-Warning-API.patch => 0766-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0768-More-vanilla-friendly-methods-to-update-trades.patch => 0767-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0769-Add-paper-dumplisteners-command.patch => 0768-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0770-check-global-player-list-where-appropriate.patch => 0769-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0771-Fix-async-entity-add-due-to-fungus-trees.patch => 0770-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0772-ItemStack-damage-API.patch => 0771-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0773-Friction-API.patch => 0772-Friction-API.patch} (100%)
 rename patches/server/{0774-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0773-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0775-Fix-premature-player-kicks-on-shutdown.patch => 0774-Fix-premature-player-kicks-on-shutdown.patch} (100%)
 rename patches/server/{0776-Sync-offhand-slot-in-menus.patch => 0775-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0777-Player-Entity-Tracking-Events.patch => 0776-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0778-Limit-pet-look-distance.patch => 0777-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0779-fix-Instruments.patch => 0778-fix-Instruments.patch} (100%)
 rename patches/server/{0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0779-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0780-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0782-Add-BlockLockCheckEvent.patch => 0781-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0783-Add-Sneaking-API-for-Entities.patch => 0782-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0784-Improve-logging-and-errors.patch => 0783-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0785-Improve-PortalEvents.patch => 0784-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0786-Add-config-option-for-spider-worldborder-climbing.patch => 0785-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0787-Add-missing-SpigotConfig-logCommands-check.patch => 0786-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0787-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0789-Flying-Fall-Damage.patch => 0788-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0789-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0791-config-for-disabling-entity-tag-tags.patch => 0790-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0792-Use-single-player-info-update-packet-on-join.patch => 0791-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0793-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0792-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0794-Win-Screen-API.patch => 0793-Win-Screen-API.patch} (100%)
 rename patches/server/{0795-Remove-CraftItemStack-setAmount-null-assignment.patch => 0794-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0796-Fix-force-opening-enchantment-tables.patch => 0795-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0797-Add-Entity-Body-Yaw-API.patch => 0796-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0797-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0799-Add-EntityFertilizeEggEvent.patch => 0798-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0799-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0800-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0802-Correctly-handle-ArmorStand-invisibility.patch => 0801-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0803-Fix-advancement-triggers-for-entity-damage.patch => 0802-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0804-Fix-text-display-error-on-spawn.patch => 0803-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0805-Fix-inventories-returning-null-Locations.patch => 0804-Fix-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0806-Add-Shearable-API.patch => 0805-Add-Shearable-API.patch} (100%)
 rename patches/server/{0807-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0806-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0807-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0809-Treat-sequence-violations-like-they-should-be.patch => 0808-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0810-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0809-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0810-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%)
 rename patches/server/{0812-Use-array-for-gamerule-storage.patch => 0811-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0813-Fix-a-couple-of-upstream-bed-issues.patch => 0812-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0814-Fix-demo-flag-not-enabling-demo-mode.patch => 0813-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0815-Add-Mob-Experience-reward-API.patch => 0814-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0816-Break-redstone-on-top-of-trap-doors-early.patch => 0815-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0816-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0818-More-accurate-isInOpenWater-impl.patch => 0817-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0819-Expand-PlayerItemMendEvent.patch => 0818-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/server/{0820-Refresh-ProjectileSource-for-projectiles.patch => 0819-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0821-Add-transient-modifier-API.patch => 0820-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0822-Fix-block-place-logic.patch => 0821-Fix-block-place-logic.patch} (100%)
 rename patches/server/{0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0822-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0824-Call-BlockGrowEvent-for-missing-blocks.patch => 0823-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0824-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%)
 rename patches/server/{0826-fix-MapLike-spam-for-missing-key-selector.patch => 0825-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0827-Fix-sniffer-removeExploredLocation.patch => 0826-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0828-Add-method-to-remove-all-active-potion-effects.patch => 0827-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0828-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0830-Add-event-for-player-editing-sign.patch => 0829-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0831-Only-tick-item-frames-if-players-can-see-it.patch => 0830-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0832-Fix-cmd-permission-levels-for-command-blocks.patch => 0831-Fix-cmd-permission-levels-for-command-blocks.patch} (100%)
 rename patches/server/{0833-Add-option-to-disable-block-updates.patch => 0832-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0834-Call-missing-BlockDispenseEvent.patch => 0833-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0835-Don-t-load-chunks-for-supporting-block-checks.patch => 0834-Don-t-load-chunks-for-supporting-block-checks.patch} (100%)
 rename patches/server/{0836-Optimize-player-lookups-for-beacons.patch => 0835-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0837-More-Sign-Block-API.patch => 0836-More-Sign-Block-API.patch} (100%)
 rename patches/server/{0838-fix-item-meta-for-tadpole-buckets.patch => 0837-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0839-Fix-BanList-API.patch => 0838-Fix-BanList-API.patch} (100%)
 rename patches/server/{0840-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0839-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0841-Fix-possible-NPE-on-painting-creation.patch => 0840-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0841-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0843-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0842-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0843-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0845-Add-whitelist-events.patch => 0844-Add-whitelist-events.patch} (100%)
 rename patches/server/{0846-Implement-PlayerFailMoveEvent.patch => 0845-Implement-PlayerFailMoveEvent.patch} (100%)
 rename patches/server/{0847-Folia-scheduler-and-owned-region-API.patch => 0846-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/server/{0848-Only-erase-allay-memory-on-non-item-targets.patch => 0847-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0849-API-for-updating-recipes-on-clients.patch => 0848-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/server/{0850-Fix-rotation-when-spawning-display-entities.patch => 0849-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0851-Only-capture-actual-tree-growth.patch => 0850-Only-capture-actual-tree-growth.patch} (100%)
 rename patches/server/{0852-Use-correct-source-for-mushroom-block-spread-event.patch => 0851-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0853-Respect-randomizeData-on-more-entities-when-spawning.patch => 0852-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0854-Use-correct-seed-on-api-world-load.patch => 0853-Use-correct-seed-on-api-world-load.patch} (100%)
 rename patches/server/{0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0854-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0856-Cache-map-ids-on-item-frames.patch => 0855-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0857-Fix-custom-statistic-criteria-creation.patch => 0856-Fix-custom-statistic-criteria-creation.patch} (100%)
 rename patches/server/{0858-Bandaid-fix-for-Effect.patch => 0857-Bandaid-fix-for-Effect.patch} (100%)
 rename patches/server/{0859-SculkCatalyst-bloom-API.patch => 0858-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0860-API-for-an-entity-s-scoreboard-name.patch => 0859-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0861-Deprecate-and-replace-methods-with-old-StructureType.patch => 0860-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/server/{0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0861-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (100%)
 rename patches/server/{0863-Properly-handle-BlockBreakEvent-isDropItems.patch => 0862-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0864-Fire-entity-death-event-for-ender-dragon.patch => 0863-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0865-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0864-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%)
 rename patches/server/{0866-Add-Listing-API-for-Player.patch => 0865-Add-Listing-API-for-Player.patch} (100%)
 rename patches/server/{0867-Configurable-Region-Compression-Format.patch => 0866-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0868-Add-BlockFace-to-BlockDamageEvent.patch => 0867-Add-BlockFace-to-BlockDamageEvent.patch} (100%)
 rename patches/server/{0869-Fix-NPE-on-Boat-getStatus.patch => 0868-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0870-Expand-Pose-API.patch => 0869-Expand-Pose-API.patch} (100%)
 rename patches/server/{0871-More-DragonBattle-API.patch => 0870-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0872-Add-PlayerPickItemEvent.patch => 0871-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/server/{0873-Allow-trident-custom-damage.patch => 0872-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0874-Expose-hand-in-BlockCanBuildEvent.patch => 0873-Expose-hand-in-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0875-Optimize-nearest-structure-border-iteration.patch => 0874-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{0876-Implement-OfflinePlayer-isConnected.patch => 0875-Implement-OfflinePlayer-isConnected.patch} (100%)
 rename patches/server/{0877-Fix-slot-desync.patch => 0876-Fix-slot-desync.patch} (100%)
 rename patches/server/{0878-Add-titleOverride-to-InventoryOpenEvent.patch => 0877-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/server/{0879-Configure-sniffer-egg-hatch-time.patch => 0878-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{0880-Do-crystal-portal-proximity-check-before-entity-look.patch => 0879-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{0881-Skip-POI-finding-if-stuck-in-vehicle.patch => 0880-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{0882-Add-slot-sanity-checks-in-container-clicks.patch => 0881-Add-slot-sanity-checks-in-container-clicks.patch} (100%)
 rename patches/server/{0883-Call-BlockRedstoneEvents-for-lecterns.patch => 0882-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{0884-Allow-proper-checking-of-empty-item-stacks.patch => 0883-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{0885-Fix-silent-equipment-change-for-mobs.patch => 0884-Fix-silent-equipment-change-for-mobs.patch} (100%)
 rename patches/server/{0886-Fix-spigot-s-Forced-Stats.patch => 0885-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{0887-Add-missing-InventoryHolders-to-inventories.patch => 0886-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 0887-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%)
 rename patches/server/{0889-Add-missing-logs-for-log-ips-config-option.patch => 0888-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 0889-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 0890-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{0892-Fix-team-sidebar-objectives-not-being-cleared.patch => 0891-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{0893-Fix-missing-map-initialize-event-call.patch => 0892-Fix-missing-map-initialize-event-call.patch} (100%)
 rename patches/server/{0894-Update-entity-data-when-attaching-firework-to-entity.patch => 0893-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{0895-Fix-UnsafeValues-loadAdvancement.patch => 0894-Fix-UnsafeValues-loadAdvancement.patch} (100%)
 rename patches/server/{0896-Add-player-idle-duration-API.patch => 0895-Add-player-idle-duration-API.patch} (100%)
 rename patches/server/{0897-Don-t-check-if-we-can-see-non-visible-entities.patch => 0896-Don-t-check-if-we-can-see-non-visible-entities.patch} (100%)
 rename patches/server/{0898-Fix-NPE-in-SculkBloomEvent-world-access.patch => 0897-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 0898-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (100%)
 rename patches/server/{0900-Optimize-VarInts.patch => 0899-Optimize-VarInts.patch} (100%)
 rename patches/server/{0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0900-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{0902-Add-predicate-for-blocks-when-raytracing.patch => 0901-Add-predicate-for-blocks-when-raytracing.patch} (100%)
 rename patches/server/{0903-Broadcast-take-item-packets-with-collector-as-source.patch => 0902-Broadcast-take-item-packets-with-collector-as-source.patch} (100%)
 rename patches/server/{0904-Expand-LingeringPotion-API.patch => 0903-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 0904-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%)
 rename patches/server/{0906-Add-hand-to-fish-event-for-all-player-interactions.patch => 0905-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{0907-Fix-several-issues-with-EntityBreedEvent.patch => 0906-Fix-several-issues-with-EntityBreedEvent.patch} (100%)
 rename patches/server/{0908-Add-UUID-attribute-modifier-API.patch => 0907-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{0909-Fix-missing-event-call-for-entity-teleport-API.patch => 0908-Fix-missing-event-call-for-entity-teleport-API.patch} (100%)
 rename patches/server/{0910-Lazily-create-LootContext-for-criterions.patch => 0909-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{0911-Don-t-fire-sync-events-during-worldgen.patch => 0910-Don-t-fire-sync-events-during-worldgen.patch} (100%)
 rename patches/server/{0912-Add-Structure-check-API.patch => 0911-Add-Structure-check-API.patch} (100%)
 rename patches/server/{0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 0912-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%)
 rename patches/server/{0914-Restore-vanilla-entity-drops-behavior.patch => 0913-Restore-vanilla-entity-drops-behavior.patch} (100%)
 rename patches/server/{0915-Dont-resend-blocks-on-interactions.patch => 0914-Dont-resend-blocks-on-interactions.patch} (100%)
 rename patches/server/{0916-add-more-scoreboard-API.patch => 0915-add-more-scoreboard-API.patch} (100%)
 rename patches/server/{0917-Improve-Registry.patch => 0916-Improve-Registry.patch} (100%)
 rename patches/server/{0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 0917-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%)
 rename patches/server/{0919-Add-experience-points-API.patch => 0918-Add-experience-points-API.patch} (100%)
 rename patches/server/{0920-Add-drops-to-shear-events.patch => 0919-Add-drops-to-shear-events.patch} (100%)
 rename patches/server/{0921-Add-PlayerShieldDisableEvent.patch => 0920-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/server/{0922-Validate-ResourceLocation-in-NBT-reading.patch => 0921-Validate-ResourceLocation-in-NBT-reading.patch} (100%)
 rename patches/server/{0923-Properly-handle-experience-dropping-on-block-break.patch => 0922-Properly-handle-experience-dropping-on-block-break.patch} (100%)
 rename patches/server/{0924-Fixup-NamespacedKey-handling.patch => 0923-Fixup-NamespacedKey-handling.patch} (100%)
 rename patches/server/{0925-Expose-LootTable-of-DecoratedPot.patch => 0924-Expose-LootTable-of-DecoratedPot.patch} (100%)
 rename patches/server/{0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0925-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0926-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0928-Add-ShulkerDuplicateEvent.patch => 0927-Add-ShulkerDuplicateEvent.patch} (100%)
 rename patches/server/{0929-Add-api-for-spawn-egg-texture-colors.patch => 0928-Add-api-for-spawn-egg-texture-colors.patch} (100%)
 rename patches/server/{0930-Add-Lifecycle-Event-system.patch => 0929-Add-Lifecycle-Event-system.patch} (100%)
 rename patches/server/{0931-ItemStack-Tooltip-API.patch => 0930-ItemStack-Tooltip-API.patch} (100%)
 rename patches/server/{0932-Add-getChunkSnapshot-includeLightData-parameter.patch => 0931-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%)
 rename patches/server/{0933-Add-FluidState-API.patch => 0932-Add-FluidState-API.patch} (100%)
 rename patches/server/{0934-add-number-format-api.patch => 0933-add-number-format-api.patch} (100%)
 rename patches/server/{0935-improve-BanList-types.patch => 0934-improve-BanList-types.patch} (100%)
 rename patches/server/{0936-Expanded-Hopper-API.patch => 0935-Expanded-Hopper-API.patch} (100%)
 rename patches/server/{0937-Add-BlockBreakProgressUpdateEvent.patch => 0936-Add-BlockBreakProgressUpdateEvent.patch} (100%)
 rename patches/server/{0938-Deprecate-ItemStack-setType.patch => 0937-Deprecate-ItemStack-setType.patch} (100%)
 rename patches/server/{0939-Add-CartographyItemEvent.patch => 0938-Add-CartographyItemEvent.patch} (100%)
 rename patches/server/{0940-More-Raid-API.patch => 0939-More-Raid-API.patch} (100%)
 rename patches/server/{0941-Add-onboarding-message-for-initial-server-start.patch => 0940-Add-onboarding-message-for-initial-server-start.patch} (100%)
 rename patches/server/{0942-Configurable-max-block-fluid-ticks.patch => 0941-Configurable-max-block-fluid-ticks.patch} (100%)
 rename patches/server/{0943-Fix-bees-aging-inside-hives.patch => 0942-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0944-Disable-memory-reserve-allocating.patch => 0943-Disable-memory-reserve-allocating.patch} (100%)
 rename patches/server/{0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch => 0944-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch} (100%)
 rename patches/server/{0946-Fix-DamageSource-API.patch => 0945-Fix-DamageSource-API.patch} (100%)
 rename patches/server/{0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch => 0946-Fix-creation-of-invalid-block-entity-during-world-ge.patch} (100%)
 rename patches/server/{0948-Fix-possible-StackOverflowError-for-some-dispenses.patch => 0947-Fix-possible-StackOverflowError-for-some-dispenses.patch} (100%)
 rename patches/server/{0949-Improve-tag-parser-handling.patch => 0948-Improve-tag-parser-handling.patch} (100%)
 rename patches/server/{0950-Item-Mutation-Fixes.patch => 0949-Item-Mutation-Fixes.patch} (100%)
 rename patches/server/{0951-Per-world-ticks-per-spawn-settings.patch => 0950-Per-world-ticks-per-spawn-settings.patch} (100%)
 rename patches/server/{0952-Properly-track-the-changed-item-from-dispense-events.patch => 0951-Properly-track-the-changed-item-from-dispense-events.patch} (100%)
 rename patches/server/{0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 0952-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{0954-Fix-tripwire-disarming-not-working-as-intended.patch => 0953-Fix-tripwire-disarming-not-working-as-intended.patch} (100%)
 rename patches/server/{0955-Add-config-for-mobs-immune-to-default-effects.patch => 0954-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{0956-Deep-clone-nbt-tags-in-PDC.patch => 0955-Deep-clone-nbt-tags-in-PDC.patch} (100%)
 rename patches/server/{0957-Support-old-UUID-format-for-NBT.patch => 0956-Support-old-UUID-format-for-NBT.patch} (100%)
 rename patches/server/{0958-Fix-shield-disable-inconsistency.patch => 0957-Fix-shield-disable-inconsistency.patch} (100%)
 rename patches/server/{0959-Handle-Large-Packets-disconnecting-client.patch => 0958-Handle-Large-Packets-disconnecting-client.patch} (100%)
 rename patches/server/{0960-Fix-ItemFlags.patch => 0959-Fix-ItemFlags.patch} (100%)
 rename patches/server/{0961-Fix-Player-setBlockUpdate.patch => 0960-Fix-Player-setBlockUpdate.patch} (100%)
 rename patches/server/{0962-Fix-helmet-damage-reduction-inconsistencies.patch => 0961-Fix-helmet-damage-reduction-inconsistencies.patch} (100%)
 rename patches/server/{0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch => 0962-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch} (100%)
 rename patches/server/{0964-improve-checking-handled-tags-in-itemmeta.patch => 0963-improve-checking-handled-tags-in-itemmeta.patch} (100%)
 rename patches/server/{0965-General-ItemMeta-fixes.patch => 0964-General-ItemMeta-fixes.patch} (100%)
 rename patches/server/{0966-Expose-hasColor-to-leather-armor.patch => 0965-Expose-hasColor-to-leather-armor.patch} (100%)
 rename patches/server/{0967-Added-API-to-get-player-ha-proxy-address.patch => 0966-Added-API-to-get-player-ha-proxy-address.patch} (100%)
 rename patches/server/{0968-More-Chest-Block-API.patch => 0967-More-Chest-Block-API.patch} (100%)
 rename patches/server/{0969-Print-data-component-type-on-encoding-error.patch => 0968-Print-data-component-type-on-encoding-error.patch} (100%)
 rename patches/server/{0970-Brigadier-based-command-API.patch => 0969-Brigadier-based-command-API.patch} (100%)
 rename patches/server/{0971-Fix-issues-with-Recipe-API.patch => 0970-Fix-issues-with-Recipe-API.patch} (100%)
 rename patches/server/{0972-Fix-equipment-slot-and-group-API.patch => 0971-Fix-equipment-slot-and-group-API.patch} (100%)
 rename patches/server/{0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch => 0972-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch} (100%)
 rename patches/server/{0974-Prevent-sending-oversized-item-data-in-equipment-and.patch => 0973-Prevent-sending-oversized-item-data-in-equipment-and.patch} (100%)
 rename patches/server/{0975-Prevent-NPE-if-hooked-entity-was-cleared.patch => 0974-Prevent-NPE-if-hooked-entity-was-cleared.patch} (100%)
 rename patches/server/{0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch => 0975-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch} (100%)
 rename patches/server/{0977-Add-missing-fishing-event-state.patch => 0976-Add-missing-fishing-event-state.patch} (100%)
 rename patches/server/{0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch => 0977-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch} (100%)
 rename patches/server/{0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch => 0978-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch} (100%)
 rename patches/server/{0980-Adopt-MaterialRerouting.patch => 0979-Adopt-MaterialRerouting.patch} (100%)
 rename patches/server/{0981-Suspicious-Effect-Entry-API.patch => 0980-Suspicious-Effect-Entry-API.patch} (100%)
 rename patches/server/{0982-check-if-itemstack-is-stackable-first.patch => 0981-check-if-itemstack-is-stackable-first.patch} (100%)
 rename patches/server/{0983-Fix-removing-recipes-from-RecipeIterator.patch => 0982-Fix-removing-recipes-from-RecipeIterator.patch} (100%)
 rename patches/server/{0984-Configurable-damage-tick-when-blocking-with-shield.patch => 0983-Configurable-damage-tick-when-blocking-with-shield.patch} (100%)
 rename patches/server/{0985-Properly-remove-the-experimental-smithing-inventory-.patch => 0984-Properly-remove-the-experimental-smithing-inventory-.patch} (100%)
 rename patches/server/{0986-Moonrise-optimisation-patches.patch => 0985-Moonrise-optimisation-patches.patch} (100%)
 rename patches/server/{0987-Rewrite-dataconverter-system.patch => 0986-Rewrite-dataconverter-system.patch} (100%)
 rename patches/server/{0988-disable-forced-empty-world-ticks.patch => 0987-disable-forced-empty-world-ticks.patch} (100%)
 rename patches/server/{0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%)
 rename patches/server/{0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename patches/server/{0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%)
 rename patches/server/{0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0993-Allow-Saving-of-Oversized-Chunks.patch => 0992-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0994-Flat-bedrock-generator-settings.patch => 0993-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0995-Entity-Activation-Range-2.0.patch => 0994-Entity-Activation-Range-2.0.patch} (100%)
 rename patches/server/{0996-Optional-per-player-mob-spawns.patch => 0995-Optional-per-player-mob-spawns.patch} (100%)
 rename patches/server/{0997-Anti-Xray.patch => 0996-Anti-Xray.patch} (100%)
 rename patches/server/{0998-Eigencraft-redstone-implementation.patch => 0997-Eigencraft-redstone-implementation.patch} (100%)
 rename patches/server/{0999-Add-Alternate-Current-redstone-implementation.patch => 0998-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0999-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%)
 rename patches/server/{1001-Use-Velocity-compression-and-cipher-natives.patch => 1000-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{1002-Optimize-Collision-to-not-load-chunks.patch => 1001-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 1002-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{1004-Optimize-Hoppers.patch => 1003-Optimize-Hoppers.patch} (100%)
 rename patches/server/{1005-Entity-load-save-limit-per-chunk.patch => 1004-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{1006-Optimize-Voxel-Shape-Merging.patch => 1005-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{1007-Optimize-Bit-Operations-by-inlining.patch => 1006-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{1008-Remove-streams-from-hot-code.patch => 1007-Remove-streams-from-hot-code.patch} (100%)
 rename patches/server/{1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch => 1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch} (100%)
 rename patches/server/{1010-Custom-table-implementation-for-blockstate-state-loo.patch => 1009-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{1011-Fix-entity-type-tags-suggestions-in-selectors.patch => 1010-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{1012-Handle-Oversized-block-entities-in-chunks.patch => 1011-Handle-Oversized-block-entities-in-chunks.patch} (100%)
 rename patches/server/{1013-API-for-checking-sent-chunks.patch => 1012-API-for-checking-sent-chunks.patch} (100%)
 rename patches/server/{1014-Check-distance-in-entity-interactions.patch => 1013-Check-distance-in-entity-interactions.patch} (100%)
 rename patches/server/{1015-Configurable-Sand-Duping.patch => 1014-Configurable-Sand-Duping.patch} (100%)
 rename patches/server/{1016-Optimise-general-POI-access.patch => 1015-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{1017-Improve-performance-of-mass-crafts.patch => 1016-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{1018-Properly-resend-entities.patch => 1017-Properly-resend-entities.patch} (100%)
 rename patches/server/{1019-Registry-Modification-API.patch => 1018-Registry-Modification-API.patch} (100%)
 rename patches/server/{1020-Add-registry-entry-and-builders.patch => 1019-Add-registry-entry-and-builders.patch} (100%)
 rename patches/server/{1021-Improved-Watchdog-Support.patch => 1020-Improved-Watchdog-Support.patch} (100%)
 rename patches/server/{1022-Proxy-ItemStack-to-CraftItemStack.patch => 1021-Proxy-ItemStack-to-CraftItemStack.patch} (100%)
 rename patches/server/{1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch => 1022-Make-a-PDC-view-accessible-directly-from-ItemStack.patch} (100%)
 rename patches/server/{1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch => 1023-Prioritize-Minecraft-commands-in-function-parsing-an.patch} (100%)
 rename patches/server/{1025-optimize-dirt-and-snow-spreading.patch => 1024-optimize-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{1026-Fix-NPE-for-Jukebox-setRecord.patch => 1025-Fix-NPE-for-Jukebox-setRecord.patch} (100%)
 rename patches/server/{1027-Fix-CraftWorld-isChunkGenerated.patch => 1026-Fix-CraftWorld-isChunkGenerated.patch} (100%)
 rename patches/server/{1028-fix-horse-inventories.patch => 1027-fix-horse-inventories.patch} (100%)
 rename patches/server/{1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch => 1028-Only-call-EntityDamageEvents-before-actuallyHurt.patch} (100%)
 rename patches/server/{1030-Fix-entity-tracker-desync-when-new-players-are-added.patch => 1029-Fix-entity-tracker-desync-when-new-players-are-added.patch} (100%)
 rename patches/server/{1031-Lag-compensation-ticks.patch => 1030-Lag-compensation-ticks.patch} (100%)
 rename patches/server/{1032-Detail-more-information-in-watchdog-dumps.patch => 1031-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{1033-Write-SavedData-IO-async.patch => 1032-Write-SavedData-IO-async.patch} (100%)
 rename patches/server/{1034-Correctly-call-PlayerItemBreakEvent.patch => 1033-Correctly-call-PlayerItemBreakEvent.patch} (100%)
 rename patches/server/{1035-Add-ItemType-getItemRarity.patch => 1034-Add-ItemType-getItemRarity.patch} (100%)
 rename patches/server/{1036-Incremental-chunk-and-player-saving.patch => 1035-Incremental-chunk-and-player-saving.patch} (100%)
 rename patches/server/{1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 1036-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{1038-Bundle-spark.patch => 1037-Bundle-spark.patch} (99%)
 rename patches/server/{1039-Add-plugin-info-at-startup.patch => 1038-Add-plugin-info-at-startup.patch} (100%)
 rename patches/server/{1040-Make-interaction-leniency-distance-configurable.patch => 1039-Make-interaction-leniency-distance-configurable.patch} (100%)
 rename patches/server/{1041-Fix-PickupStatus-getting-reset.patch => 1040-Fix-PickupStatus-getting-reset.patch} (100%)
 rename patches/server/{1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch => 1041-Check-for-block-type-in-SculkSensorBlock-canActivate.patch} (100%)
 rename patches/server/{1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch => 1042-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch} (100%)
 rename patches/server/{1044-Configuration-for-horizontal-only-item-merging.patch => 1043-Configuration-for-horizontal-only-item-merging.patch} (100%)
 rename patches/server/{1045-Optimise-collision-checking-in-player-move-packet-ha.patch => 1044-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{1046-Add-skipping-world-symlink-scan.patch => 1045-Add-skipping-world-symlink-scan.patch} (100%)
 rename patches/server/{1047-Add-even-more-Enchantment-API.patch => 1046-Add-even-more-Enchantment-API.patch} (100%)
 rename patches/server/{1048-Leashable-API.patch => 1047-Leashable-API.patch} (100%)
 rename patches/server/{1049-Fix-CraftBukkit-drag-system.patch => 1048-Fix-CraftBukkit-drag-system.patch} (100%)
 rename patches/server/{1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch => 1049-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch} (100%)
 rename patches/server/{1051-Remove-set-damage-lootable-item-function-from-compas.patch => 1050-Remove-set-damage-lootable-item-function-from-compas.patch} (100%)
 rename patches/server/{1052-Properly-destroy-placed-blocks-on-the-end-platform.patch => 1051-Properly-destroy-placed-blocks-on-the-end-platform.patch} (100%)
 rename patches/server/{1053-Add-enchantment-seed-update-API.patch => 1052-Add-enchantment-seed-update-API.patch} (100%)
 rename patches/server/{1054-Fix-synchronise-sending-chat-to-client-with-updating.patch => 1053-Fix-synchronise-sending-chat-to-client-with-updating.patch} (100%)
 rename patches/server/{1055-Fix-InventoryOpenEvent-cancellation.patch => 1054-Fix-InventoryOpenEvent-cancellation.patch} (100%)
 rename patches/server/{1056-Fire-BlockExpEvent-on-grindstone-use.patch => 1055-Fire-BlockExpEvent-on-grindstone-use.patch} (100%)
 rename patches/server/{1057-Check-dead-flag-in-isAlive.patch => 1056-Check-dead-flag-in-isAlive.patch} (100%)
 rename patches/server/{1058-Add-FeatureFlag-API.patch => 1057-Add-FeatureFlag-API.patch} (100%)
 rename patches/server/{1059-Tag-Lifecycle-Events.patch => 1058-Tag-Lifecycle-Events.patch} (100%)
 rename patches/server/{1060-Item-serialization-as-json.patch => 1059-Item-serialization-as-json.patch} (100%)

diff --git a/patches/api/0335-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0335-Add-missing-block-data-API.patch
similarity index 63%
rename from patches/api/0335-Add-missing-block-data-mins-and-maxes.patch
rename to patches/api/0335-Add-missing-block-data-API.patch
index 63a647706a..1675944429 100644
--- a/patches/api/0335-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0335-Add-missing-block-data-API.patch
@@ -1,8 +1,13 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Sat, 16 Oct 2021 22:57:10 -0700
-Subject: [PATCH] Add missing block data mins and maxes
+Subject: [PATCH] Add missing block data API
 
+General purpose patch adding missing getters/setters to BlockData and
+its child types.
+
+Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
+Co-authored-by: Fabrizio La Rosa <lr.fabrizio@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/block/data/Levelled.java b/src/main/java/org/bukkit/block/data/Levelled.java
 index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c23dfd95e2 100644
@@ -22,6 +27,26 @@ index 5255538fecae6da413546be3adacd2a99f6c74e9..860f072dee391b300cb1629058a3f9c2
 +    int getMinimumLevel();
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java
+index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644
+--- a/src/main/java/org/bukkit/block/data/type/Bed.java
++++ b/src/main/java/org/bukkit/block/data/type/Bed.java
+@@ -35,6 +35,15 @@ public interface Bed extends Directional {
+      */
+     boolean isOccupied();
+ 
++    // Paper start
++    /**
++     * Sets the value of the 'occupied' property.
++     *
++     * @param occupied the new 'occupied' value
++     */
++    void setOccupied(boolean occupied);
++    // Paper end
++
+     /**
+      * Horizontal half of a bed.
+      */
 diff --git a/src/main/java/org/bukkit/block/data/type/Candle.java b/src/main/java/org/bukkit/block/data/type/Candle.java
 index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d040267caef75 100644
 --- a/src/main/java/org/bukkit/block/data/type/Candle.java
@@ -40,6 +65,28 @@ index d4d08bd424f84523200d1a2012f4d37c07cc3497..7baccce27f2db2242f628ea92a9d0402
 +    int getMinimumCandles();
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+index eb0ffa977450ef0c79caa78302cfe75ee35b34b7..b3d290dbfdcbadcbadcb54e6b414e423eba80cc6 100644
+--- a/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
++++ b/src/main/java/org/bukkit/block/data/type/DecoratedPot.java
+@@ -4,4 +4,17 @@ import org.bukkit.block.data.Directional;
+ import org.bukkit.block.data.Waterlogged;
+ 
+ public interface DecoratedPot extends Directional, Waterlogged {
++    // Paper start - add missing block data api
++    /**
++     * @return whether the pot is cracked
++     */
++    public boolean isCracked();
++
++    /**
++     * Set whether the pot is cracked.
++     *
++     * @param cracked whether the pot is cracked
++     */
++    public void setCracked(boolean cracked);
++    // Paper end - add missing block data api
+ }
 diff --git a/src/main/java/org/bukkit/block/data/type/Leaves.java b/src/main/java/org/bukkit/block/data/type/Leaves.java
 index 3ea21dfad26222ee70fbc627595f54de1a28aa96..cd013a7c42648d819d1e91c7cf9f97a8190c1fad 100644
 --- a/src/main/java/org/bukkit/block/data/type/Leaves.java
diff --git a/patches/api/0367-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0366-Add-EquipmentSlot-convenience-methods.patch
similarity index 100%
rename from patches/api/0367-Add-EquipmentSlot-convenience-methods.patch
rename to patches/api/0366-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0366-Allow-changing-bed-s-occupied-property.patch b/patches/api/0366-Allow-changing-bed-s-occupied-property.patch
deleted file mode 100644
index 8dfafd6d33..0000000000
--- a/patches/api/0366-Allow-changing-bed-s-occupied-property.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Wed, 12 Oct 2022 00:36:55 +0300
-Subject: [PATCH] Allow changing bed's 'occupied' property
-
-
-diff --git a/src/main/java/org/bukkit/block/data/type/Bed.java b/src/main/java/org/bukkit/block/data/type/Bed.java
-index ed519bfebe5b921f60867a3900edfce9859058b6..6e7a456dc5e9bfc28a19029a3381e53fa6453d30 100644
---- a/src/main/java/org/bukkit/block/data/type/Bed.java
-+++ b/src/main/java/org/bukkit/block/data/type/Bed.java
-@@ -35,6 +35,15 @@ public interface Bed extends Directional {
-      */
-     boolean isOccupied();
- 
-+    // Paper start
-+    /**
-+     * Sets the value of the 'occupied' property.
-+     *
-+     * @param occupied the new 'occupied' value
-+     */
-+    void setOccupied(boolean occupied);
-+    // Paper end
-+
-     /**
-      * Horizontal half of a bed.
-      */
diff --git a/patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
similarity index 94%
rename from patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
rename to patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index b745878796..2a6826e5c3 100644
--- a/patches/api/0368-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0367-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add LivingEntity#swingHand(EquipmentSlot) convenience method
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 22428de50580f7b70d14484ba229aa271bfd7069..fc96043f799cf5d521d51ad4c74f8f8067bed754 100644
+index 0c7d96bc296b56dc9ff0ada89bb4d715716f8adc..fb62933d589ccbe4181a7b9633bb742ae35f68dd 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1331,4 +1331,24 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0369-Add-entity-knockback-API.patch b/patches/api/0368-Add-entity-knockback-API.patch
similarity index 93%
rename from patches/api/0369-Add-entity-knockback-API.patch
rename to patches/api/0368-Add-entity-knockback-API.patch
index fe9d0a85bb..33ebf42097 100644
--- a/patches/api/0369-Add-entity-knockback-API.patch
+++ b/patches/api/0368-Add-entity-knockback-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add entity knockback API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index fc96043f799cf5d521d51ad4c74f8f8067bed754..8dd993ce32686431e1c759d446a3620cb52f7ec1 100644
+index fb62933d589ccbe4181a7b9633bb742ae35f68dd..597a3b581cb6fa2605fd5916e5639c1020d688b7 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1351,4 +1351,18 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0370-Added-EntityToggleSitEvent.patch b/patches/api/0369-Added-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/api/0370-Added-EntityToggleSitEvent.patch
rename to patches/api/0369-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0371-Add-Moving-Piston-API.patch b/patches/api/0370-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/api/0371-Add-Moving-Piston-API.patch
rename to patches/api/0370-Add-Moving-Piston-API.patch
diff --git a/patches/api/0372-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0371-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/api/0372-Add-PrePlayerAttackEntityEvent.patch
rename to patches/api/0371-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0373-Add-Player-Warden-Warning-API.patch b/patches/api/0372-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/api/0373-Add-Player-Warden-Warning-API.patch
rename to patches/api/0372-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0374-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/api/0374-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/api/0373-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0375-Add-paper-dumplisteners-command.patch b/patches/api/0374-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/api/0375-Add-paper-dumplisteners-command.patch
rename to patches/api/0374-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0376-ItemStack-damage-API.patch b/patches/api/0375-ItemStack-damage-API.patch
similarity index 97%
rename from patches/api/0376-ItemStack-damage-API.patch
rename to patches/api/0375-ItemStack-damage-API.patch
index 1a38447711..9c25426479 100644
--- a/patches/api/0376-ItemStack-damage-API.patch
+++ b/patches/api/0375-ItemStack-damage-API.patch
@@ -8,7 +8,7 @@ to simulate damage done to an itemstack and all
 the logic associated with damaging them
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 8dd993ce32686431e1c759d446a3620cb52f7ec1..0d665a31152c9a667576f2e9d91ffec5304ce944 100644
+index 597a3b581cb6fa2605fd5916e5639c1020d688b7..c9c3b926c5bb408d964ed5acc9f95c8527837a25 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1365,4 +1365,53 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0377-Add-Tick-TemporalUnit.patch b/patches/api/0376-Add-Tick-TemporalUnit.patch
similarity index 100%
rename from patches/api/0377-Add-Tick-TemporalUnit.patch
rename to patches/api/0376-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0378-Friction-API.patch b/patches/api/0377-Friction-API.patch
similarity index 96%
rename from patches/api/0378-Friction-API.patch
rename to patches/api/0377-Friction-API.patch
index 23ae7abbae..7667486715 100644
--- a/patches/api/0378-Friction-API.patch
+++ b/patches/api/0377-Friction-API.patch
@@ -59,7 +59,7 @@ index ced419f8655bff72f0257b639d5f7d73afe3c2e2..bcc6ba95bd21c7972865838c636a03f5
      /**
       * 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 0d665a31152c9a667576f2e9d91ffec5304ce944..a2c1cc7462564411db71a1e00222ef55633b49c8 100644
+index c9c3b926c5bb408d964ed5acc9f95c8527837a25..7c027d7bbd6b8a1543fa92d44e99674925f093b3 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
diff --git a/patches/api/0379-Player-Entity-Tracking-Events.patch b/patches/api/0378-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/api/0379-Player-Entity-Tracking-Events.patch
rename to patches/api/0378-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0380-Add-missing-Fluid-type.patch b/patches/api/0379-Add-missing-Fluid-type.patch
similarity index 100%
rename from patches/api/0380-Add-missing-Fluid-type.patch
rename to patches/api/0379-Add-missing-Fluid-type.patch
diff --git a/patches/api/0381-fix-Instruments.patch b/patches/api/0380-fix-Instruments.patch
similarity index 100%
rename from patches/api/0381-fix-Instruments.patch
rename to patches/api/0380-fix-Instruments.patch
diff --git a/patches/api/0382-Add-BlockLockCheckEvent.patch b/patches/api/0381-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/api/0382-Add-BlockLockCheckEvent.patch
rename to patches/api/0381-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0383-Add-Sneaking-API-for-Entities.patch b/patches/api/0382-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/api/0383-Add-Sneaking-API-for-Entities.patch
rename to patches/api/0382-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0384-Improve-PortalEvents.patch b/patches/api/0383-Improve-PortalEvents.patch
similarity index 100%
rename from patches/api/0384-Improve-PortalEvents.patch
rename to patches/api/0383-Improve-PortalEvents.patch
diff --git a/patches/api/0385-Flying-Fall-Damage-API.patch b/patches/api/0384-Flying-Fall-Damage-API.patch
similarity index 100%
rename from patches/api/0385-Flying-Fall-Damage-API.patch
rename to patches/api/0384-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
similarity index 100%
rename from patches/api/0386-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
rename to patches/api/0385-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0387-Win-Screen-API.patch b/patches/api/0386-Win-Screen-API.patch
similarity index 100%
rename from patches/api/0387-Win-Screen-API.patch
rename to patches/api/0386-Win-Screen-API.patch
diff --git a/patches/api/0388-Add-Entity-Body-Yaw-API.patch b/patches/api/0387-Add-Entity-Body-Yaw-API.patch
similarity index 95%
rename from patches/api/0388-Add-Entity-Body-Yaw-API.patch
rename to patches/api/0387-Add-Entity-Body-Yaw-API.patch
index c0186ee4f1..9351e36f78 100644
--- a/patches/api/0388-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0387-Add-Entity-Body-Yaw-API.patch
@@ -53,7 +53,7 @@ index 6dcaf7e9bc9afb708ab569e82f27c87833450ff1..a76e537c9b3b9519cd46894c90b750f0
  
      // Paper start - Collision API
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index a2c1cc7462564411db71a1e00222ef55633b49c8..4974540e8277011e4eb00f691a5f6f96d3dde20c 100644
+index 7c027d7bbd6b8a1543fa92d44e99674925f093b3..f5149d54d6cb5019f398718b9aa52bc3ab34a5ae 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1414,4 +1414,22 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
similarity index 100%
rename from patches/api/0389-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
rename to patches/api/0388-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0390-Add-EntityFertilizeEggEvent.patch b/patches/api/0389-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/api/0390-Add-EntityFertilizeEggEvent.patch
rename to patches/api/0389-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/api/0391-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/api/0390-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0392-Add-Shearable-API.patch b/patches/api/0391-Add-Shearable-API.patch
similarity index 100%
rename from patches/api/0392-Add-Shearable-API.patch
rename to patches/api/0391-Add-Shearable-API.patch
diff --git a/patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/api/0393-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/api/0392-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0394-Add-Mob-Experience-reward-API.patch b/patches/api/0393-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/api/0394-Add-Mob-Experience-reward-API.patch
rename to patches/api/0393-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0395-Expand-PlayerItemMendEvent.patch b/patches/api/0394-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/api/0395-Expand-PlayerItemMendEvent.patch
rename to patches/api/0394-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch
similarity index 91%
rename from patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch
index 2b9703cf94..4106e532d8 100644
--- a/patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0395-Add-method-to-remove-all-active-potion-effects.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method to remove all active potion effects
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 4974540e8277011e4eb00f691a5f6f96d3dde20c..5de7651f673cba9782f88f46dc938274b37a38ec 100644
+index f5149d54d6cb5019f398718b9aa52bc3ab34a5ae..ad3717d963f28751d410e6688ae64a4c1175871d 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -657,6 +657,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0397-Folia-scheduler-and-owned-region-API.patch b/patches/api/0396-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/api/0397-Folia-scheduler-and-owned-region-API.patch
rename to patches/api/0396-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/api/0398-Add-event-for-player-editing-sign.patch b/patches/api/0397-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/api/0398-Add-event-for-player-editing-sign.patch
rename to patches/api/0397-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0399-More-Sign-Block-API.patch b/patches/api/0398-More-Sign-Block-API.patch
similarity index 100%
rename from patches/api/0399-More-Sign-Block-API.patch
rename to patches/api/0398-More-Sign-Block-API.patch
diff --git a/patches/api/0400-Fix-BanList-API.patch b/patches/api/0399-Fix-BanList-API.patch
similarity index 100%
rename from patches/api/0400-Fix-BanList-API.patch
rename to patches/api/0399-Fix-BanList-API.patch
diff --git a/patches/api/0401-Add-whitelist-events.patch b/patches/api/0400-Add-whitelist-events.patch
similarity index 100%
rename from patches/api/0401-Add-whitelist-events.patch
rename to patches/api/0400-Add-whitelist-events.patch
diff --git a/patches/api/0402-API-for-updating-recipes-on-clients.patch b/patches/api/0401-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/api/0402-API-for-updating-recipes-on-clients.patch
rename to patches/api/0401-API-for-updating-recipes-on-clients.patch
diff --git a/patches/api/0403-Add-PlayerFailMoveEvent.patch b/patches/api/0402-Add-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/api/0403-Add-PlayerFailMoveEvent.patch
rename to patches/api/0402-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0404-Fix-custom-statistic-criteria-creation.patch b/patches/api/0403-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/api/0404-Fix-custom-statistic-criteria-creation.patch
rename to patches/api/0403-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0405-SculkCatalyst-bloom-API.patch b/patches/api/0404-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/api/0405-SculkCatalyst-bloom-API.patch
rename to patches/api/0404-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0406-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0405-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/api/0406-API-for-an-entity-s-scoreboard-name.patch
rename to patches/api/0405-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0407-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/api/0407-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/api/0406-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/api/0408-Add-Listing-API-for-Player.patch b/patches/api/0407-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/api/0408-Add-Listing-API-for-Player.patch
rename to patches/api/0407-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
similarity index 100%
rename from patches/api/0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
rename to patches/api/0408-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0410-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0409-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/api/0410-Fix-NPE-on-Boat-getStatus.patch
rename to patches/api/0409-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0411-Expand-Pose-API.patch b/patches/api/0410-Expand-Pose-API.patch
similarity index 100%
rename from patches/api/0411-Expand-Pose-API.patch
rename to patches/api/0410-Expand-Pose-API.patch
diff --git a/patches/api/0412-MerchantRecipe-add-copy-constructor.patch b/patches/api/0411-MerchantRecipe-add-copy-constructor.patch
similarity index 100%
rename from patches/api/0412-MerchantRecipe-add-copy-constructor.patch
rename to patches/api/0411-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0413-More-DragonBattle-API.patch b/patches/api/0412-More-DragonBattle-API.patch
similarity index 100%
rename from patches/api/0413-More-DragonBattle-API.patch
rename to patches/api/0412-More-DragonBattle-API.patch
diff --git a/patches/api/0414-Add-PlayerPickItemEvent.patch b/patches/api/0413-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/api/0414-Add-PlayerPickItemEvent.patch
rename to patches/api/0413-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0415-Allow-trident-custom-damage.patch b/patches/api/0414-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/api/0415-Allow-trident-custom-damage.patch
rename to patches/api/0414-Allow-trident-custom-damage.patch
diff --git a/patches/api/0416-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/api/0416-Expose-hand-during-BlockCanBuildEvent.patch
rename to patches/api/0415-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0417-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch
similarity index 100%
rename from patches/api/0417-Limit-setBurnTime-to-valid-short-values.patch
rename to patches/api/0416-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0418-Add-OfflinePlayer-isConnected.patch b/patches/api/0417-Add-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/api/0418-Add-OfflinePlayer-isConnected.patch
rename to patches/api/0417-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0419-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/api/0419-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/api/0418-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0420-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/api/0420-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/api/0419-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/api/0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
similarity index 100%
rename from patches/api/0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
rename to patches/api/0420-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0422-Add-player-idle-duration-API.patch b/patches/api/0421-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/api/0422-Add-player-idle-duration-API.patch
rename to patches/api/0421-Add-player-idle-duration-API.patch
diff --git a/patches/api/0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/api/0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/api/0422-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/api/0423-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0425-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/api/0425-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/api/0424-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0426-Attribute-Modifier-API-improvements.patch b/patches/api/0425-Attribute-Modifier-API-improvements.patch
similarity index 98%
rename from patches/api/0426-Attribute-Modifier-API-improvements.patch
rename to patches/api/0425-Attribute-Modifier-API-improvements.patch
index dc2fb7fbe6..acf67fcd39 100644
--- a/patches/api/0426-Attribute-Modifier-API-improvements.patch
+++ b/patches/api/0425-Attribute-Modifier-API-improvements.patch
@@ -70,7 +70,7 @@ index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..f1fa86ddf1f50a357c9e94cc61261d8c
       * Remove a modifier from this instance.
       *
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index c6b8700d258b859d246118868167497397010292..3808f76d49e24c20156c013f68e00efa9351f1a3 100644
+index ee39c0b83e558681e8b006172d34c98e2c83cda2..c57690798108e9f91f8c552f39dcc2b080fe1b61 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -25,26 +25,32 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
diff --git a/patches/api/0427-Expand-LingeringPotion-API.patch b/patches/api/0426-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/api/0427-Expand-LingeringPotion-API.patch
rename to patches/api/0426-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
similarity index 100%
rename from patches/api/0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
rename to patches/api/0427-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
diff --git a/patches/api/0429-Add-Structure-check-API.patch b/patches/api/0428-Add-Structure-check-API.patch
similarity index 100%
rename from patches/api/0429-Add-Structure-check-API.patch
rename to patches/api/0428-Add-Structure-check-API.patch
diff --git a/patches/api/0430-Experimental-annotations-change.patch b/patches/api/0429-Experimental-annotations-change.patch
similarity index 100%
rename from patches/api/0430-Experimental-annotations-change.patch
rename to patches/api/0429-Experimental-annotations-change.patch
diff --git a/patches/api/0431-Add-more-scoreboard-API.patch b/patches/api/0430-Add-more-scoreboard-API.patch
similarity index 100%
rename from patches/api/0431-Add-more-scoreboard-API.patch
rename to patches/api/0430-Add-more-scoreboard-API.patch
diff --git a/patches/api/0432-Improve-Registry.patch b/patches/api/0431-Improve-Registry.patch
similarity index 100%
rename from patches/api/0432-Improve-Registry.patch
rename to patches/api/0431-Improve-Registry.patch
diff --git a/patches/api/0433-Add-experience-points-API.patch b/patches/api/0432-Add-experience-points-API.patch
similarity index 100%
rename from patches/api/0433-Add-experience-points-API.patch
rename to patches/api/0432-Add-experience-points-API.patch
diff --git a/patches/api/0434-Add-missing-InventoryType.patch b/patches/api/0433-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/api/0434-Add-missing-InventoryType.patch
rename to patches/api/0433-Add-missing-InventoryType.patch
diff --git a/patches/api/0435-Add-drops-to-shear-events.patch b/patches/api/0434-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/api/0435-Add-drops-to-shear-events.patch
rename to patches/api/0434-Add-drops-to-shear-events.patch
diff --git a/patches/api/0436-Add-HiddenPotionEffect-API.patch b/patches/api/0435-Add-HiddenPotionEffect-API.patch
similarity index 98%
rename from patches/api/0436-Add-HiddenPotionEffect-API.patch
rename to patches/api/0435-Add-HiddenPotionEffect-API.patch
index 94799bbf65..281fad5e4b 100644
--- a/patches/api/0436-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0435-Add-HiddenPotionEffect-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add HiddenPotionEffect API
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5de7651f673cba9782f88f46dc938274b37a38ec..5c29956c6db53440322330ff723c7087193641f1 100644
+index ad3717d963f28751d410e6688ae64a4c1175871d..8369da45206d2606f0715f3d803163dd8028251e 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -591,6 +591,9 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0437-Add-PlayerShieldDisableEvent.patch b/patches/api/0436-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/api/0437-Add-PlayerShieldDisableEvent.patch
rename to patches/api/0436-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
similarity index 100%
rename from patches/api/0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
rename to patches/api/0437-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0439-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0438-Add-BlockStateMeta-clearBlockState.patch
similarity index 100%
rename from patches/api/0439-Add-BlockStateMeta-clearBlockState.patch
rename to patches/api/0438-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0440-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0439-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/api/0440-Expose-LootTable-of-DecoratedPot.patch
rename to patches/api/0439-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0441-Add-ShulkerDuplicateEvent.patch b/patches/api/0440-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/api/0441-Add-ShulkerDuplicateEvent.patch
rename to patches/api/0440-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0442-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/api/0442-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/api/0441-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0443-Add-Lifecycle-Event-system.patch b/patches/api/0442-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/api/0443-Add-Lifecycle-Event-system.patch
rename to patches/api/0442-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0444-ItemStack-Tooltip-API.patch b/patches/api/0443-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/api/0444-ItemStack-Tooltip-API.patch
rename to patches/api/0443-ItemStack-Tooltip-API.patch
diff --git a/patches/api/0445-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/api/0445-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/api/0444-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0446-Add-FluidState-API.patch b/patches/api/0445-Add-FluidState-API.patch
similarity index 100%
rename from patches/api/0446-Add-FluidState-API.patch
rename to patches/api/0445-Add-FluidState-API.patch
diff --git a/patches/api/0447-add-number-format-api.patch b/patches/api/0446-add-number-format-api.patch
similarity index 100%
rename from patches/api/0447-add-number-format-api.patch
rename to patches/api/0446-add-number-format-api.patch
diff --git a/patches/api/0448-improve-BanList-types.patch b/patches/api/0447-improve-BanList-types.patch
similarity index 100%
rename from patches/api/0448-improve-BanList-types.patch
rename to patches/api/0447-improve-BanList-types.patch
diff --git a/patches/api/0449-Suspicious-Effect-Entry-API.patch b/patches/api/0448-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/api/0449-Suspicious-Effect-Entry-API.patch
rename to patches/api/0448-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0450-Fix-DamageSource-API.patch b/patches/api/0449-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/api/0450-Fix-DamageSource-API.patch
rename to patches/api/0449-Fix-DamageSource-API.patch
diff --git a/patches/api/0451-Expanded-Hopper-API.patch b/patches/api/0450-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/api/0451-Expanded-Hopper-API.patch
rename to patches/api/0450-Expanded-Hopper-API.patch
diff --git a/patches/api/0452-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch
similarity index 100%
rename from patches/api/0452-Clone-mutables-to-prevent-unexpected-issues.patch
rename to patches/api/0451-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch
similarity index 100%
rename from patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/api/0452-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0454-Deprecate-ItemStack-setType.patch b/patches/api/0453-Deprecate-ItemStack-setType.patch
similarity index 100%
rename from patches/api/0454-Deprecate-ItemStack-setType.patch
rename to patches/api/0453-Deprecate-ItemStack-setType.patch
diff --git a/patches/api/0455-Item-Mutation-Fixes.patch b/patches/api/0454-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/api/0455-Item-Mutation-Fixes.patch
rename to patches/api/0454-Item-Mutation-Fixes.patch
diff --git a/patches/api/0456-API-for-checking-sent-chunks.patch b/patches/api/0455-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/api/0456-API-for-checking-sent-chunks.patch
rename to patches/api/0455-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0457-Add-CartographyItemEvent.patch b/patches/api/0456-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/api/0457-Add-CartographyItemEvent.patch
rename to patches/api/0456-Add-CartographyItemEvent.patch
diff --git a/patches/api/0458-More-Raid-API.patch b/patches/api/0457-More-Raid-API.patch
similarity index 100%
rename from patches/api/0458-More-Raid-API.patch
rename to patches/api/0457-More-Raid-API.patch
diff --git a/patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch
similarity index 100%
rename from patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch
rename to patches/api/0458-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0460-Fix-ItemFlags.patch b/patches/api/0459-Fix-ItemFlags.patch
similarity index 100%
rename from patches/api/0460-Fix-ItemFlags.patch
rename to patches/api/0459-Fix-ItemFlags.patch
diff --git a/patches/api/0461-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch
similarity index 100%
rename from patches/api/0461-Allow-modifying-library-loader-jars-bytecode.patch
rename to patches/api/0460-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0462-Add-hook-to-remap-library-jars.patch b/patches/api/0461-Add-hook-to-remap-library-jars.patch
similarity index 100%
rename from patches/api/0462-Add-hook-to-remap-library-jars.patch
rename to patches/api/0461-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0463-Add-GameMode-isInvulnerable.patch b/patches/api/0462-Add-GameMode-isInvulnerable.patch
similarity index 100%
rename from patches/api/0463-Add-GameMode-isInvulnerable.patch
rename to patches/api/0462-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0464-Expose-hasColor-to-leather-armor.patch b/patches/api/0463-Expose-hasColor-to-leather-armor.patch
similarity index 100%
rename from patches/api/0464-Expose-hasColor-to-leather-armor.patch
rename to patches/api/0463-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0465-Add-missing-wind-charge-damage-type.patch b/patches/api/0464-Add-missing-wind-charge-damage-type.patch
similarity index 100%
rename from patches/api/0465-Add-missing-wind-charge-damage-type.patch
rename to patches/api/0464-Add-missing-wind-charge-damage-type.patch
diff --git a/patches/api/0466-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch
similarity index 100%
rename from patches/api/0466-Added-API-to-get-player-ha-proxy-address.patch
rename to patches/api/0465-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0467-More-Chest-Block-API.patch b/patches/api/0466-More-Chest-Block-API.patch
similarity index 100%
rename from patches/api/0467-More-Chest-Block-API.patch
rename to patches/api/0466-More-Chest-Block-API.patch
diff --git a/patches/api/0468-Brigadier-based-command-API.patch b/patches/api/0467-Brigadier-based-command-API.patch
similarity index 100%
rename from patches/api/0468-Brigadier-based-command-API.patch
rename to patches/api/0467-Brigadier-based-command-API.patch
diff --git a/patches/api/0469-Fix-issues-with-recipe-API.patch b/patches/api/0468-Fix-issues-with-recipe-API.patch
similarity index 100%
rename from patches/api/0469-Fix-issues-with-recipe-API.patch
rename to patches/api/0468-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0470-Fix-equipment-slot-and-group-API.patch b/patches/api/0469-Fix-equipment-slot-and-group-API.patch
similarity index 97%
rename from patches/api/0470-Fix-equipment-slot-and-group-API.patch
rename to patches/api/0469-Fix-equipment-slot-and-group-API.patch
index 0601373657..b6b99f5eab 100644
--- a/patches/api/0470-Fix-equipment-slot-and-group-API.patch
+++ b/patches/api/0469-Fix-equipment-slot-and-group-API.patch
@@ -10,7 +10,7 @@ Adds the following:
 Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index 3808f76d49e24c20156c013f68e00efa9351f1a3..e14b64d3b178791dacc7849e97f2ed95f1919c55 100644
+index c57690798108e9f91f8c552f39dcc2b080fe1b61..bfa378fe3d074bafbc0af2c4d858e2a34d3126bd 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
 @@ -118,6 +118,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed {
@@ -22,7 +22,7 @@ index 3808f76d49e24c20156c013f68e00efa9351f1a3..e14b64d3b178791dacc7849e97f2ed95
          return slot == EquipmentSlotGroup.ANY ? null : slot.getExample();
      }
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 5c29956c6db53440322330ff723c7087193641f1..a1e54e9d14393a6c0ea57cca854071c5396d9717 100644
+index 8369da45206d2606f0715f3d803163dd8028251e..fcdc5fce88720cc926a3953d80b5045113d1516c 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
 @@ -1447,4 +1447,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
diff --git a/patches/api/0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
similarity index 100%
rename from patches/api/0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
rename to patches/api/0470-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0472-General-ItemMeta-fixes.patch b/patches/api/0471-General-ItemMeta-fixes.patch
similarity index 100%
rename from patches/api/0472-General-ItemMeta-fixes.patch
rename to patches/api/0471-General-ItemMeta-fixes.patch
diff --git a/patches/api/0473-Add-missing-fishing-event-state.patch b/patches/api/0472-Add-missing-fishing-event-state.patch
similarity index 100%
rename from patches/api/0473-Add-missing-fishing-event-state.patch
rename to patches/api/0472-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
similarity index 100%
rename from patches/api/0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
rename to patches/api/0473-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/api/0475-Registry-Modification-API.patch b/patches/api/0474-Registry-Modification-API.patch
similarity index 100%
rename from patches/api/0475-Registry-Modification-API.patch
rename to patches/api/0474-Registry-Modification-API.patch
diff --git a/patches/api/0476-Introduce-registry-entry-and-builders.patch b/patches/api/0475-Introduce-registry-entry-and-builders.patch
similarity index 100%
rename from patches/api/0476-Introduce-registry-entry-and-builders.patch
rename to patches/api/0475-Introduce-registry-entry-and-builders.patch
diff --git a/patches/api/0477-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch
similarity index 100%
rename from patches/api/0477-Proxy-ItemStack-to-CraftItemStack.patch
rename to patches/api/0476-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/api/0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
similarity index 100%
rename from patches/api/0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
rename to patches/api/0477-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/api/0479-Fix-HelpCommand-searching.patch b/patches/api/0478-Fix-HelpCommand-searching.patch
similarity index 100%
rename from patches/api/0479-Fix-HelpCommand-searching.patch
rename to patches/api/0478-Fix-HelpCommand-searching.patch
diff --git a/patches/api/0480-add-Plugin-getDataPath.patch b/patches/api/0479-add-Plugin-getDataPath.patch
similarity index 100%
rename from patches/api/0480-add-Plugin-getDataPath.patch
rename to patches/api/0479-add-Plugin-getDataPath.patch
diff --git a/patches/api/0481-Fix-PickupStatus-getting-reset.patch b/patches/api/0480-Fix-PickupStatus-getting-reset.patch
similarity index 100%
rename from patches/api/0481-Fix-PickupStatus-getting-reset.patch
rename to patches/api/0480-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/api/0482-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/api/0482-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/api/0481-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/api/0483-Improve-StandardMessenger-exception-messages.patch b/patches/api/0482-Improve-StandardMessenger-exception-messages.patch
similarity index 100%
rename from patches/api/0483-Improve-StandardMessenger-exception-messages.patch
rename to patches/api/0482-Improve-StandardMessenger-exception-messages.patch
diff --git a/patches/api/0484-Add-even-more-Enchantment-API.patch b/patches/api/0483-Add-even-more-Enchantment-API.patch
similarity index 100%
rename from patches/api/0484-Add-even-more-Enchantment-API.patch
rename to patches/api/0483-Add-even-more-Enchantment-API.patch
diff --git a/patches/api/0485-Leashable-API.patch b/patches/api/0484-Leashable-API.patch
similarity index 100%
rename from patches/api/0485-Leashable-API.patch
rename to patches/api/0484-Leashable-API.patch
diff --git a/patches/api/0486-Add-enchantment-seed-update-API.patch b/patches/api/0485-Add-enchantment-seed-update-API.patch
similarity index 100%
rename from patches/api/0486-Add-enchantment-seed-update-API.patch
rename to patches/api/0485-Add-enchantment-seed-update-API.patch
diff --git a/patches/api/0487-Deprecate-for-removal-all-OldEnum-related-methods.patch b/patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch
similarity index 100%
rename from patches/api/0487-Deprecate-for-removal-all-OldEnum-related-methods.patch
rename to patches/api/0486-Deprecate-for-removal-all-OldEnum-related-methods.patch
diff --git a/patches/api/0488-Add-FeatureFlag-API.patch b/patches/api/0487-Add-FeatureFlag-API.patch
similarity index 100%
rename from patches/api/0488-Add-FeatureFlag-API.patch
rename to patches/api/0487-Add-FeatureFlag-API.patch
diff --git a/patches/api/0489-Tag-Lifecycle-Events.patch b/patches/api/0488-Tag-Lifecycle-Events.patch
similarity index 100%
rename from patches/api/0489-Tag-Lifecycle-Events.patch
rename to patches/api/0488-Tag-Lifecycle-Events.patch
diff --git a/patches/api/0490-Item-serialization-as-json.patch b/patches/api/0489-Item-serialization-as-json.patch
similarity index 100%
rename from patches/api/0490-Item-serialization-as-json.patch
rename to patches/api/0489-Item-serialization-as-json.patch
diff --git a/patches/server/0668-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0668-Add-missing-block-data-API.patch
similarity index 77%
rename from patches/server/0668-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0668-Add-missing-block-data-API.patch
index fe8170196d..ace8c632a6 100644
--- a/patches/server/0668-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0668-Add-missing-block-data-API.patch
@@ -1,9 +1,30 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Jake Potrebic <jake.m.potrebic@gmail.com>
 Date: Sat, 16 Oct 2021 22:57:31 -0700
-Subject: [PATCH] Add missing block data mins and maxes
+Subject: [PATCH] Add missing block data API
 
+General purpose patch adding missing getters/setters to BlockData and
+its child types.
 
+Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
+Co-authored-by: Fabrizio La Rosa <lr.fabrizio@gmail.com>
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
+index 2ccf3fbe3f991b7a014cff3bcd424e6a81bc310a..e5450d3511389bf3bd6461fb6ec65ea82e4ae9f0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
+@@ -51,4 +51,11 @@ public final class CraftBed extends org.bukkit.craftbukkit.block.data.CraftBlock
+     public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
+         return this.getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class);
+     }
++
++    // Paper start
++    @Override
++    public void setOccupied(boolean occupied) {
++        set(CraftBed.OCCUPIED, occupied);
++    }
++    // Paper end
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
 index 2230160d5e04e979467a56346600436c1e5dd70c..08436bfeba2f35fb11b16c4f71f76e13c0d44b1a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftCandle.java
@@ -58,6 +79,29 @@ index 7ce2e8b733bcd496dcfccb1ddfcb7c5c1b64052e..5ae27fc8f9d18bae949d335ea53e7e70
 +    }
 +    // Paper end
  }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
+index 356230b9b266974e36d0508f8c239714d673504d..b7ea9a6fba6b4fc157dfcc4bee099871b8ad7380 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftDecoratedPot.java
+@@ -45,4 +45,18 @@ public final class CraftDecoratedPot extends org.bukkit.craftbukkit.block.data.C
+     public void setWaterlogged(boolean waterlogged) {
+         this.set(CraftDecoratedPot.WATERLOGGED, waterlogged);
+     }
++
++    // Paper start - add missing block data api
++    private static final net.minecraft.world.level.block.state.properties.BooleanProperty CRACKED = getBoolean(net.minecraft.world.level.block.DecoratedPotBlock.class, "cracked");
++
++    @Override
++    public boolean isCracked() {
++        return this.get(CraftDecoratedPot.CRACKED);
++    }
++
++    @Override
++    public void setCracked(final boolean cracked) {
++        this.set(CraftDecoratedPot.CRACKED, cracked);
++    }
++    // Paper end - add missing block data api
+ }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
 index 70d734fc71a4499bbf569b3908aa5fbbdf19e6a0..1af5fe48c5861077555e6bdeb6312859b7b37eb2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftFluids.java
diff --git a/patches/server/0756-Add-entity-knockback-API.patch b/patches/server/0755-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0756-Add-entity-knockback-API.patch
rename to patches/server/0755-Add-entity-knockback-API.patch
diff --git a/patches/server/0755-Allow-changing-bed-s-occupied-property.patch b/patches/server/0755-Allow-changing-bed-s-occupied-property.patch
deleted file mode 100644
index d8b51d7f0b..0000000000
--- a/patches/server/0755-Allow-changing-bed-s-occupied-property.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Wed, 12 Oct 2022 00:36:55 +0300
-Subject: [PATCH] Allow changing bed's 'occupied' property
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-index 2ccf3fbe3f991b7a014cff3bcd424e6a81bc310a..e5450d3511389bf3bd6461fb6ec65ea82e4ae9f0 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftBed.java
-@@ -51,4 +51,11 @@ public final class CraftBed extends org.bukkit.craftbukkit.block.data.CraftBlock
-     public java.util.Set<org.bukkit.block.BlockFace> getFaces() {
-         return this.getValues(CraftBed.FACING, org.bukkit.block.BlockFace.class);
-     }
-+
-+    // Paper start
-+    @Override
-+    public void setOccupied(boolean occupied) {
-+        set(CraftBed.OCCUPIED, occupied);
-+    }
-+    // Paper end
- }
diff --git a/patches/server/0757-Detect-headless-JREs.patch b/patches/server/0756-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0757-Detect-headless-JREs.patch
rename to patches/server/0756-Detect-headless-JREs.patch
diff --git a/patches/server/0758-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0757-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0758-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0757-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0759-Add-EntityToggleSitEvent.patch b/patches/server/0758-Add-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0759-Add-EntityToggleSitEvent.patch
rename to patches/server/0758-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0760-Add-fire-tick-delay-option.patch b/patches/server/0759-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0760-Add-fire-tick-delay-option.patch
rename to patches/server/0759-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0761-Add-Moving-Piston-API.patch b/patches/server/0760-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0761-Add-Moving-Piston-API.patch
rename to patches/server/0760-Add-Moving-Piston-API.patch
diff --git a/patches/server/0762-Ignore-impossible-spawn-tick.patch b/patches/server/0761-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0762-Ignore-impossible-spawn-tick.patch
rename to patches/server/0761-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch b/patches/server/0762-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
similarity index 100%
rename from patches/server/0763-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
rename to patches/server/0762-Fix-EntityArgument-and-EntitySelectorParser-permissi.patch
diff --git a/patches/server/0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0763-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0764-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0763-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0765-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0764-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0765-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0764-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0766-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0765-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0766-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0765-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0767-Add-Player-Warden-Warning-API.patch b/patches/server/0766-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0767-Add-Player-Warden-Warning-API.patch
rename to patches/server/0766-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0768-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0767-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0768-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0767-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0769-Add-paper-dumplisteners-command.patch b/patches/server/0768-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0769-Add-paper-dumplisteners-command.patch
rename to patches/server/0768-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0770-check-global-player-list-where-appropriate.patch b/patches/server/0769-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0770-check-global-player-list-where-appropriate.patch
rename to patches/server/0769-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0771-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0770-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0771-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0770-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0772-ItemStack-damage-API.patch b/patches/server/0771-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0772-ItemStack-damage-API.patch
rename to patches/server/0771-ItemStack-damage-API.patch
diff --git a/patches/server/0773-Friction-API.patch b/patches/server/0772-Friction-API.patch
similarity index 100%
rename from patches/server/0773-Friction-API.patch
rename to patches/server/0772-Friction-API.patch
diff --git a/patches/server/0774-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0773-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0774-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0773-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0775-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0774-Fix-premature-player-kicks-on-shutdown.patch
similarity index 100%
rename from patches/server/0775-Fix-premature-player-kicks-on-shutdown.patch
rename to patches/server/0774-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0776-Sync-offhand-slot-in-menus.patch b/patches/server/0775-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0776-Sync-offhand-slot-in-menus.patch
rename to patches/server/0775-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0777-Player-Entity-Tracking-Events.patch b/patches/server/0776-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0777-Player-Entity-Tracking-Events.patch
rename to patches/server/0776-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0778-Limit-pet-look-distance.patch b/patches/server/0777-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0778-Limit-pet-look-distance.patch
rename to patches/server/0777-Limit-pet-look-distance.patch
diff --git a/patches/server/0779-fix-Instruments.patch b/patches/server/0778-fix-Instruments.patch
similarity index 100%
rename from patches/server/0779-fix-Instruments.patch
rename to patches/server/0778-fix-Instruments.patch
diff --git a/patches/server/0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0779-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0780-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0779-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0780-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0781-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0780-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0782-Add-BlockLockCheckEvent.patch b/patches/server/0781-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0782-Add-BlockLockCheckEvent.patch
rename to patches/server/0781-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0783-Add-Sneaking-API-for-Entities.patch b/patches/server/0782-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0783-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0782-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0784-Improve-logging-and-errors.patch b/patches/server/0783-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0784-Improve-logging-and-errors.patch
rename to patches/server/0783-Improve-logging-and-errors.patch
diff --git a/patches/server/0785-Improve-PortalEvents.patch b/patches/server/0784-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0785-Improve-PortalEvents.patch
rename to patches/server/0784-Improve-PortalEvents.patch
diff --git a/patches/server/0786-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0785-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0786-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0785-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0787-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0786-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0787-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0786-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0787-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0788-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0787-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0789-Flying-Fall-Damage.patch b/patches/server/0788-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0789-Flying-Fall-Damage.patch
rename to patches/server/0788-Flying-Fall-Damage.patch
diff --git a/patches/server/0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0789-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0790-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0789-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0791-config-for-disabling-entity-tag-tags.patch b/patches/server/0790-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0791-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0790-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0792-Use-single-player-info-update-packet-on-join.patch b/patches/server/0791-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0792-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0791-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0793-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0792-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0793-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0792-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0794-Win-Screen-API.patch b/patches/server/0793-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0794-Win-Screen-API.patch
rename to patches/server/0793-Win-Screen-API.patch
diff --git a/patches/server/0795-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0794-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0795-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0794-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0796-Fix-force-opening-enchantment-tables.patch b/patches/server/0795-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0796-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0795-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0797-Add-Entity-Body-Yaw-API.patch b/patches/server/0796-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0797-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0796-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0797-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0798-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0797-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0799-Add-EntityFertilizeEggEvent.patch b/patches/server/0798-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0799-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0798-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0799-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0800-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0799-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0800-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0801-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0800-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0802-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0801-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0802-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0801-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0803-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0802-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0803-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0802-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0804-Fix-text-display-error-on-spawn.patch b/patches/server/0803-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0804-Fix-text-display-error-on-spawn.patch
rename to patches/server/0803-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0805-Fix-inventories-returning-null-Locations.patch b/patches/server/0804-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0805-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0804-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0806-Add-Shearable-API.patch b/patches/server/0805-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0806-Add-Shearable-API.patch
rename to patches/server/0805-Add-Shearable-API.patch
diff --git a/patches/server/0807-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0806-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0807-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0806-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0807-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0808-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0807-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0809-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0808-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0809-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0808-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0810-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0809-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0810-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0809-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0810-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0811-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0810-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0812-Use-array-for-gamerule-storage.patch b/patches/server/0811-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0812-Use-array-for-gamerule-storage.patch
rename to patches/server/0811-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0813-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0812-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0813-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0812-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0814-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0813-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0814-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0813-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0815-Add-Mob-Experience-reward-API.patch b/patches/server/0814-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0815-Add-Mob-Experience-reward-API.patch
rename to patches/server/0814-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0816-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0815-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0816-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0815-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0816-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0817-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0816-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0818-More-accurate-isInOpenWater-impl.patch b/patches/server/0817-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0818-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0817-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0819-Expand-PlayerItemMendEvent.patch b/patches/server/0818-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0819-Expand-PlayerItemMendEvent.patch
rename to patches/server/0818-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0820-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0819-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0820-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0819-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0821-Add-transient-modifier-API.patch b/patches/server/0820-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0821-Add-transient-modifier-API.patch
rename to patches/server/0820-Add-transient-modifier-API.patch
diff --git a/patches/server/0822-Fix-block-place-logic.patch b/patches/server/0821-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0822-Fix-block-place-logic.patch
rename to patches/server/0821-Fix-block-place-logic.patch
diff --git a/patches/server/0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0822-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0823-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0822-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0824-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0823-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0824-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0823-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0824-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0825-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0824-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0826-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0825-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0826-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0825-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0827-Fix-sniffer-removeExploredLocation.patch b/patches/server/0826-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0827-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0826-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0828-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0827-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0828-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0827-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0828-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0829-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0828-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0830-Add-event-for-player-editing-sign.patch b/patches/server/0829-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0830-Add-event-for-player-editing-sign.patch
rename to patches/server/0829-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0831-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0830-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0831-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0830-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0832-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0831-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0832-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0831-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0833-Add-option-to-disable-block-updates.patch b/patches/server/0832-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0833-Add-option-to-disable-block-updates.patch
rename to patches/server/0832-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0834-Call-missing-BlockDispenseEvent.patch b/patches/server/0833-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0834-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0833-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0835-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0834-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0835-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0834-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0836-Optimize-player-lookups-for-beacons.patch b/patches/server/0835-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0836-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0835-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0837-More-Sign-Block-API.patch b/patches/server/0836-More-Sign-Block-API.patch
similarity index 100%
rename from patches/server/0837-More-Sign-Block-API.patch
rename to patches/server/0836-More-Sign-Block-API.patch
diff --git a/patches/server/0838-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0837-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0838-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0837-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0839-Fix-BanList-API.patch b/patches/server/0838-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0839-Fix-BanList-API.patch
rename to patches/server/0838-Fix-BanList-API.patch
diff --git a/patches/server/0840-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0839-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0840-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0839-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0841-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0840-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0841-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0840-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0841-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0842-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0841-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0843-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0842-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0843-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0842-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0843-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0844-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0843-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0845-Add-whitelist-events.patch b/patches/server/0844-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0845-Add-whitelist-events.patch
rename to patches/server/0844-Add-whitelist-events.patch
diff --git a/patches/server/0846-Implement-PlayerFailMoveEvent.patch b/patches/server/0845-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0846-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0845-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0847-Folia-scheduler-and-owned-region-API.patch b/patches/server/0846-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0847-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0846-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0848-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0847-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0848-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0847-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0849-API-for-updating-recipes-on-clients.patch b/patches/server/0848-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0849-API-for-updating-recipes-on-clients.patch
rename to patches/server/0848-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0850-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0849-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0850-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0849-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0851-Only-capture-actual-tree-growth.patch b/patches/server/0850-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0851-Only-capture-actual-tree-growth.patch
rename to patches/server/0850-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0852-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0851-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0852-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0851-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0853-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0852-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0853-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0852-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0854-Use-correct-seed-on-api-world-load.patch b/patches/server/0853-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0854-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0853-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0854-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0855-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0854-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0856-Cache-map-ids-on-item-frames.patch b/patches/server/0855-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0856-Cache-map-ids-on-item-frames.patch
rename to patches/server/0855-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0857-Fix-custom-statistic-criteria-creation.patch b/patches/server/0856-Fix-custom-statistic-criteria-creation.patch
similarity index 100%
rename from patches/server/0857-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0856-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/server/0858-Bandaid-fix-for-Effect.patch b/patches/server/0857-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0858-Bandaid-fix-for-Effect.patch
rename to patches/server/0857-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0859-SculkCatalyst-bloom-API.patch b/patches/server/0858-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0859-SculkCatalyst-bloom-API.patch
rename to patches/server/0858-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0860-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0859-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0860-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0859-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0861-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0860-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0861-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0860-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0861-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0862-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0861-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0863-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0862-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0863-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0862-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0864-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0863-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0864-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0863-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0865-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0864-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0865-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0864-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0866-Add-Listing-API-for-Player.patch b/patches/server/0865-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0866-Add-Listing-API-for-Player.patch
rename to patches/server/0865-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0867-Configurable-Region-Compression-Format.patch b/patches/server/0866-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0867-Configurable-Region-Compression-Format.patch
rename to patches/server/0866-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0868-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0867-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0868-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0867-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0869-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0868-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0869-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0868-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0870-Expand-Pose-API.patch b/patches/server/0869-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0870-Expand-Pose-API.patch
rename to patches/server/0869-Expand-Pose-API.patch
diff --git a/patches/server/0871-More-DragonBattle-API.patch b/patches/server/0870-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0871-More-DragonBattle-API.patch
rename to patches/server/0870-More-DragonBattle-API.patch
diff --git a/patches/server/0872-Add-PlayerPickItemEvent.patch b/patches/server/0871-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/0872-Add-PlayerPickItemEvent.patch
rename to patches/server/0871-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0873-Allow-trident-custom-damage.patch b/patches/server/0872-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0873-Allow-trident-custom-damage.patch
rename to patches/server/0872-Allow-trident-custom-damage.patch
diff --git a/patches/server/0874-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0873-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0874-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0873-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0875-Optimize-nearest-structure-border-iteration.patch b/patches/server/0874-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0875-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0874-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0876-Implement-OfflinePlayer-isConnected.patch b/patches/server/0875-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/0876-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0875-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0877-Fix-slot-desync.patch b/patches/server/0876-Fix-slot-desync.patch
similarity index 100%
rename from patches/server/0877-Fix-slot-desync.patch
rename to patches/server/0876-Fix-slot-desync.patch
diff --git a/patches/server/0878-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0877-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/0878-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0877-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0879-Configure-sniffer-egg-hatch-time.patch b/patches/server/0878-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0879-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0878-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0880-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0879-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0880-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0879-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0881-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0880-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0881-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0880-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0882-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0881-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/0882-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0881-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0883-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0882-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0883-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0882-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0884-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0883-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0884-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0883-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0885-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0884-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/0885-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0884-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0886-Fix-spigot-s-Forced-Stats.patch b/patches/server/0885-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0886-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0885-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0887-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0886-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/0887-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0886-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0887-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/0888-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0887-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0889-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0888-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0889-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0888-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0889-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0890-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0889-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0890-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0891-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0890-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0892-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0891-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0892-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0891-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0893-Fix-missing-map-initialize-event-call.patch b/patches/server/0892-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/0893-Fix-missing-map-initialize-event-call.patch
rename to patches/server/0892-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0894-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0893-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/0894-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/0893-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0895-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0894-Fix-UnsafeValues-loadAdvancement.patch
similarity index 100%
rename from patches/server/0895-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/0894-Fix-UnsafeValues-loadAdvancement.patch
diff --git a/patches/server/0896-Add-player-idle-duration-API.patch b/patches/server/0895-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/0896-Add-player-idle-duration-API.patch
rename to patches/server/0895-Add-player-idle-duration-API.patch
diff --git a/patches/server/0897-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0896-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/0897-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/0896-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0898-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0897-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/0898-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/0897-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0898-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/0899-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/0898-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0900-Optimize-VarInts.patch b/patches/server/0899-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/0900-Optimize-VarInts.patch
rename to patches/server/0899-Optimize-VarInts.patch
diff --git a/patches/server/0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0900-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/0901-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/0900-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0902-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0901-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/0902-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/0901-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0903-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0902-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/0903-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/0902-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0904-Expand-LingeringPotion-API.patch b/patches/server/0903-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/0904-Expand-LingeringPotion-API.patch
rename to patches/server/0903-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0904-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/0905-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/0904-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0906-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0905-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/0906-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/0905-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0907-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0906-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/0907-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/0906-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0908-Add-UUID-attribute-modifier-API.patch b/patches/server/0907-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/0908-Add-UUID-attribute-modifier-API.patch
rename to patches/server/0907-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0909-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0908-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/0909-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/0908-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0910-Lazily-create-LootContext-for-criterions.patch b/patches/server/0909-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/0910-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/0909-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0911-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0910-Don-t-fire-sync-events-during-worldgen.patch
similarity index 100%
rename from patches/server/0911-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/0910-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0912-Add-Structure-check-API.patch b/patches/server/0911-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/0912-Add-Structure-check-API.patch
rename to patches/server/0911-Add-Structure-check-API.patch
diff --git a/patches/server/0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0912-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/0913-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/0912-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0914-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0913-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/0914-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/0913-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0915-Dont-resend-blocks-on-interactions.patch b/patches/server/0914-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/0915-Dont-resend-blocks-on-interactions.patch
rename to patches/server/0914-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0916-add-more-scoreboard-API.patch b/patches/server/0915-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/0916-add-more-scoreboard-API.patch
rename to patches/server/0915-add-more-scoreboard-API.patch
diff --git a/patches/server/0917-Improve-Registry.patch b/patches/server/0916-Improve-Registry.patch
similarity index 100%
rename from patches/server/0917-Improve-Registry.patch
rename to patches/server/0916-Improve-Registry.patch
diff --git a/patches/server/0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0917-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/0918-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/0917-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0919-Add-experience-points-API.patch b/patches/server/0918-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/0919-Add-experience-points-API.patch
rename to patches/server/0918-Add-experience-points-API.patch
diff --git a/patches/server/0920-Add-drops-to-shear-events.patch b/patches/server/0919-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/0920-Add-drops-to-shear-events.patch
rename to patches/server/0919-Add-drops-to-shear-events.patch
diff --git a/patches/server/0921-Add-PlayerShieldDisableEvent.patch b/patches/server/0920-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/0921-Add-PlayerShieldDisableEvent.patch
rename to patches/server/0920-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0922-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0921-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/0922-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/0921-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0923-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0922-Properly-handle-experience-dropping-on-block-break.patch
similarity index 100%
rename from patches/server/0923-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/0922-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0924-Fixup-NamespacedKey-handling.patch b/patches/server/0923-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/0924-Fixup-NamespacedKey-handling.patch
rename to patches/server/0923-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0925-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0924-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/server/0925-Expose-LootTable-of-DecoratedPot.patch
rename to patches/server/0924-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0925-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0926-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0925-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0926-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0927-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0926-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0928-Add-ShulkerDuplicateEvent.patch b/patches/server/0927-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/server/0928-Add-ShulkerDuplicateEvent.patch
rename to patches/server/0927-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0929-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0928-Add-api-for-spawn-egg-texture-colors.patch
similarity index 100%
rename from patches/server/0929-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/server/0928-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/server/0930-Add-Lifecycle-Event-system.patch b/patches/server/0929-Add-Lifecycle-Event-system.patch
similarity index 100%
rename from patches/server/0930-Add-Lifecycle-Event-system.patch
rename to patches/server/0929-Add-Lifecycle-Event-system.patch
diff --git a/patches/server/0931-ItemStack-Tooltip-API.patch b/patches/server/0930-ItemStack-Tooltip-API.patch
similarity index 100%
rename from patches/server/0931-ItemStack-Tooltip-API.patch
rename to patches/server/0930-ItemStack-Tooltip-API.patch
diff --git a/patches/server/0932-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0931-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/server/0932-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/server/0931-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0933-Add-FluidState-API.patch b/patches/server/0932-Add-FluidState-API.patch
similarity index 100%
rename from patches/server/0933-Add-FluidState-API.patch
rename to patches/server/0932-Add-FluidState-API.patch
diff --git a/patches/server/0934-add-number-format-api.patch b/patches/server/0933-add-number-format-api.patch
similarity index 100%
rename from patches/server/0934-add-number-format-api.patch
rename to patches/server/0933-add-number-format-api.patch
diff --git a/patches/server/0935-improve-BanList-types.patch b/patches/server/0934-improve-BanList-types.patch
similarity index 100%
rename from patches/server/0935-improve-BanList-types.patch
rename to patches/server/0934-improve-BanList-types.patch
diff --git a/patches/server/0936-Expanded-Hopper-API.patch b/patches/server/0935-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/server/0936-Expanded-Hopper-API.patch
rename to patches/server/0935-Expanded-Hopper-API.patch
diff --git a/patches/server/0937-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0936-Add-BlockBreakProgressUpdateEvent.patch
similarity index 100%
rename from patches/server/0937-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/server/0936-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0938-Deprecate-ItemStack-setType.patch b/patches/server/0937-Deprecate-ItemStack-setType.patch
similarity index 100%
rename from patches/server/0938-Deprecate-ItemStack-setType.patch
rename to patches/server/0937-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0939-Add-CartographyItemEvent.patch b/patches/server/0938-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/server/0939-Add-CartographyItemEvent.patch
rename to patches/server/0938-Add-CartographyItemEvent.patch
diff --git a/patches/server/0940-More-Raid-API.patch b/patches/server/0939-More-Raid-API.patch
similarity index 100%
rename from patches/server/0940-More-Raid-API.patch
rename to patches/server/0939-More-Raid-API.patch
diff --git a/patches/server/0941-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0940-Add-onboarding-message-for-initial-server-start.patch
similarity index 100%
rename from patches/server/0941-Add-onboarding-message-for-initial-server-start.patch
rename to patches/server/0940-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0942-Configurable-max-block-fluid-ticks.patch b/patches/server/0941-Configurable-max-block-fluid-ticks.patch
similarity index 100%
rename from patches/server/0942-Configurable-max-block-fluid-ticks.patch
rename to patches/server/0941-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0943-Fix-bees-aging-inside-hives.patch b/patches/server/0942-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0943-Fix-bees-aging-inside-hives.patch
rename to patches/server/0942-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0944-Disable-memory-reserve-allocating.patch b/patches/server/0943-Disable-memory-reserve-allocating.patch
similarity index 100%
rename from patches/server/0944-Disable-memory-reserve-allocating.patch
rename to patches/server/0943-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0944-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
similarity index 100%
rename from patches/server/0945-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
rename to patches/server/0944-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0946-Fix-DamageSource-API.patch b/patches/server/0945-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/server/0946-Fix-DamageSource-API.patch
rename to patches/server/0945-Fix-DamageSource-API.patch
diff --git a/patches/server/0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0946-Fix-creation-of-invalid-block-entity-during-world-ge.patch
similarity index 100%
rename from patches/server/0947-Fix-creation-of-invalid-block-entity-during-world-ge.patch
rename to patches/server/0946-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0948-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0947-Fix-possible-StackOverflowError-for-some-dispenses.patch
similarity index 100%
rename from patches/server/0948-Fix-possible-StackOverflowError-for-some-dispenses.patch
rename to patches/server/0947-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0949-Improve-tag-parser-handling.patch b/patches/server/0948-Improve-tag-parser-handling.patch
similarity index 100%
rename from patches/server/0949-Improve-tag-parser-handling.patch
rename to patches/server/0948-Improve-tag-parser-handling.patch
diff --git a/patches/server/0950-Item-Mutation-Fixes.patch b/patches/server/0949-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/server/0950-Item-Mutation-Fixes.patch
rename to patches/server/0949-Item-Mutation-Fixes.patch
diff --git a/patches/server/0951-Per-world-ticks-per-spawn-settings.patch b/patches/server/0950-Per-world-ticks-per-spawn-settings.patch
similarity index 100%
rename from patches/server/0951-Per-world-ticks-per-spawn-settings.patch
rename to patches/server/0950-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0952-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0951-Properly-track-the-changed-item-from-dispense-events.patch
similarity index 100%
rename from patches/server/0952-Properly-track-the-changed-item-from-dispense-events.patch
rename to patches/server/0951-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/0952-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/0953-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/0952-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/0954-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/0953-Fix-tripwire-disarming-not-working-as-intended.patch
similarity index 100%
rename from patches/server/0954-Fix-tripwire-disarming-not-working-as-intended.patch
rename to patches/server/0953-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/0955-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/0954-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/0955-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/0954-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/0956-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/0955-Deep-clone-nbt-tags-in-PDC.patch
similarity index 100%
rename from patches/server/0956-Deep-clone-nbt-tags-in-PDC.patch
rename to patches/server/0955-Deep-clone-nbt-tags-in-PDC.patch
diff --git a/patches/server/0957-Support-old-UUID-format-for-NBT.patch b/patches/server/0956-Support-old-UUID-format-for-NBT.patch
similarity index 100%
rename from patches/server/0957-Support-old-UUID-format-for-NBT.patch
rename to patches/server/0956-Support-old-UUID-format-for-NBT.patch
diff --git a/patches/server/0958-Fix-shield-disable-inconsistency.patch b/patches/server/0957-Fix-shield-disable-inconsistency.patch
similarity index 100%
rename from patches/server/0958-Fix-shield-disable-inconsistency.patch
rename to patches/server/0957-Fix-shield-disable-inconsistency.patch
diff --git a/patches/server/0959-Handle-Large-Packets-disconnecting-client.patch b/patches/server/0958-Handle-Large-Packets-disconnecting-client.patch
similarity index 100%
rename from patches/server/0959-Handle-Large-Packets-disconnecting-client.patch
rename to patches/server/0958-Handle-Large-Packets-disconnecting-client.patch
diff --git a/patches/server/0960-Fix-ItemFlags.patch b/patches/server/0959-Fix-ItemFlags.patch
similarity index 100%
rename from patches/server/0960-Fix-ItemFlags.patch
rename to patches/server/0959-Fix-ItemFlags.patch
diff --git a/patches/server/0961-Fix-Player-setBlockUpdate.patch b/patches/server/0960-Fix-Player-setBlockUpdate.patch
similarity index 100%
rename from patches/server/0961-Fix-Player-setBlockUpdate.patch
rename to patches/server/0960-Fix-Player-setBlockUpdate.patch
diff --git a/patches/server/0962-Fix-helmet-damage-reduction-inconsistencies.patch b/patches/server/0961-Fix-helmet-damage-reduction-inconsistencies.patch
similarity index 100%
rename from patches/server/0962-Fix-helmet-damage-reduction-inconsistencies.patch
rename to patches/server/0961-Fix-helmet-damage-reduction-inconsistencies.patch
diff --git a/patches/server/0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch b/patches/server/0962-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
similarity index 100%
rename from patches/server/0963-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
rename to patches/server/0962-Revert-to-vanilla-handling-of-LivingEntity-actuallyH.patch
diff --git a/patches/server/0964-improve-checking-handled-tags-in-itemmeta.patch b/patches/server/0963-improve-checking-handled-tags-in-itemmeta.patch
similarity index 100%
rename from patches/server/0964-improve-checking-handled-tags-in-itemmeta.patch
rename to patches/server/0963-improve-checking-handled-tags-in-itemmeta.patch
diff --git a/patches/server/0965-General-ItemMeta-fixes.patch b/patches/server/0964-General-ItemMeta-fixes.patch
similarity index 100%
rename from patches/server/0965-General-ItemMeta-fixes.patch
rename to patches/server/0964-General-ItemMeta-fixes.patch
diff --git a/patches/server/0966-Expose-hasColor-to-leather-armor.patch b/patches/server/0965-Expose-hasColor-to-leather-armor.patch
similarity index 100%
rename from patches/server/0966-Expose-hasColor-to-leather-armor.patch
rename to patches/server/0965-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/server/0967-Added-API-to-get-player-ha-proxy-address.patch b/patches/server/0966-Added-API-to-get-player-ha-proxy-address.patch
similarity index 100%
rename from patches/server/0967-Added-API-to-get-player-ha-proxy-address.patch
rename to patches/server/0966-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/server/0968-More-Chest-Block-API.patch b/patches/server/0967-More-Chest-Block-API.patch
similarity index 100%
rename from patches/server/0968-More-Chest-Block-API.patch
rename to patches/server/0967-More-Chest-Block-API.patch
diff --git a/patches/server/0969-Print-data-component-type-on-encoding-error.patch b/patches/server/0968-Print-data-component-type-on-encoding-error.patch
similarity index 100%
rename from patches/server/0969-Print-data-component-type-on-encoding-error.patch
rename to patches/server/0968-Print-data-component-type-on-encoding-error.patch
diff --git a/patches/server/0970-Brigadier-based-command-API.patch b/patches/server/0969-Brigadier-based-command-API.patch
similarity index 100%
rename from patches/server/0970-Brigadier-based-command-API.patch
rename to patches/server/0969-Brigadier-based-command-API.patch
diff --git a/patches/server/0971-Fix-issues-with-Recipe-API.patch b/patches/server/0970-Fix-issues-with-Recipe-API.patch
similarity index 100%
rename from patches/server/0971-Fix-issues-with-Recipe-API.patch
rename to patches/server/0970-Fix-issues-with-Recipe-API.patch
diff --git a/patches/server/0972-Fix-equipment-slot-and-group-API.patch b/patches/server/0971-Fix-equipment-slot-and-group-API.patch
similarity index 100%
rename from patches/server/0972-Fix-equipment-slot-and-group-API.patch
rename to patches/server/0971-Fix-equipment-slot-and-group-API.patch
diff --git a/patches/server/0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/server/0972-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
similarity index 100%
rename from patches/server/0973-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
rename to patches/server/0972-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/server/0974-Prevent-sending-oversized-item-data-in-equipment-and.patch b/patches/server/0973-Prevent-sending-oversized-item-data-in-equipment-and.patch
similarity index 100%
rename from patches/server/0974-Prevent-sending-oversized-item-data-in-equipment-and.patch
rename to patches/server/0973-Prevent-sending-oversized-item-data-in-equipment-and.patch
diff --git a/patches/server/0975-Prevent-NPE-if-hooked-entity-was-cleared.patch b/patches/server/0974-Prevent-NPE-if-hooked-entity-was-cleared.patch
similarity index 100%
rename from patches/server/0975-Prevent-NPE-if-hooked-entity-was-cleared.patch
rename to patches/server/0974-Prevent-NPE-if-hooked-entity-was-cleared.patch
diff --git a/patches/server/0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch b/patches/server/0975-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
similarity index 100%
rename from patches/server/0976-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
rename to patches/server/0975-Fix-cancelling-BlockPlaceEvent-calling-onRemove.patch
diff --git a/patches/server/0977-Add-missing-fishing-event-state.patch b/patches/server/0976-Add-missing-fishing-event-state.patch
similarity index 100%
rename from patches/server/0977-Add-missing-fishing-event-state.patch
rename to patches/server/0976-Add-missing-fishing-event-state.patch
diff --git a/patches/server/0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/server/0977-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
similarity index 100%
rename from patches/server/0978-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
rename to patches/server/0977-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
diff --git a/patches/server/0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch b/patches/server/0978-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
similarity index 100%
rename from patches/server/0979-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
rename to patches/server/0978-Fix-sending-disconnect-packet-in-phases-where-it-doe.patch
diff --git a/patches/server/0980-Adopt-MaterialRerouting.patch b/patches/server/0979-Adopt-MaterialRerouting.patch
similarity index 100%
rename from patches/server/0980-Adopt-MaterialRerouting.patch
rename to patches/server/0979-Adopt-MaterialRerouting.patch
diff --git a/patches/server/0981-Suspicious-Effect-Entry-API.patch b/patches/server/0980-Suspicious-Effect-Entry-API.patch
similarity index 100%
rename from patches/server/0981-Suspicious-Effect-Entry-API.patch
rename to patches/server/0980-Suspicious-Effect-Entry-API.patch
diff --git a/patches/server/0982-check-if-itemstack-is-stackable-first.patch b/patches/server/0981-check-if-itemstack-is-stackable-first.patch
similarity index 100%
rename from patches/server/0982-check-if-itemstack-is-stackable-first.patch
rename to patches/server/0981-check-if-itemstack-is-stackable-first.patch
diff --git a/patches/server/0983-Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/0982-Fix-removing-recipes-from-RecipeIterator.patch
similarity index 100%
rename from patches/server/0983-Fix-removing-recipes-from-RecipeIterator.patch
rename to patches/server/0982-Fix-removing-recipes-from-RecipeIterator.patch
diff --git a/patches/server/0984-Configurable-damage-tick-when-blocking-with-shield.patch b/patches/server/0983-Configurable-damage-tick-when-blocking-with-shield.patch
similarity index 100%
rename from patches/server/0984-Configurable-damage-tick-when-blocking-with-shield.patch
rename to patches/server/0983-Configurable-damage-tick-when-blocking-with-shield.patch
diff --git a/patches/server/0985-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/server/0984-Properly-remove-the-experimental-smithing-inventory-.patch
similarity index 100%
rename from patches/server/0985-Properly-remove-the-experimental-smithing-inventory-.patch
rename to patches/server/0984-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/server/0986-Moonrise-optimisation-patches.patch b/patches/server/0985-Moonrise-optimisation-patches.patch
similarity index 100%
rename from patches/server/0986-Moonrise-optimisation-patches.patch
rename to patches/server/0985-Moonrise-optimisation-patches.patch
diff --git a/patches/server/0987-Rewrite-dataconverter-system.patch b/patches/server/0986-Rewrite-dataconverter-system.patch
similarity index 100%
rename from patches/server/0987-Rewrite-dataconverter-system.patch
rename to patches/server/0986-Rewrite-dataconverter-system.patch
diff --git a/patches/server/0988-disable-forced-empty-world-ticks.patch b/patches/server/0987-disable-forced-empty-world-ticks.patch
similarity index 100%
rename from patches/server/0988-disable-forced-empty-world-ticks.patch
rename to patches/server/0987-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/0989-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0988-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/0990-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0989-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 100%
rename from patches/server/0991-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0990-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0992-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0991-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0993-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0992-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0993-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0992-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0994-Flat-bedrock-generator-settings.patch b/patches/server/0993-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0994-Flat-bedrock-generator-settings.patch
rename to patches/server/0993-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0995-Entity-Activation-Range-2.0.patch b/patches/server/0994-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0995-Entity-Activation-Range-2.0.patch
rename to patches/server/0994-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0996-Optional-per-player-mob-spawns.patch b/patches/server/0995-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0996-Optional-per-player-mob-spawns.patch
rename to patches/server/0995-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0997-Anti-Xray.patch b/patches/server/0996-Anti-Xray.patch
similarity index 100%
rename from patches/server/0997-Anti-Xray.patch
rename to patches/server/0996-Anti-Xray.patch
diff --git a/patches/server/0998-Eigencraft-redstone-implementation.patch b/patches/server/0997-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/0998-Eigencraft-redstone-implementation.patch
rename to patches/server/0997-Eigencraft-redstone-implementation.patch
diff --git a/patches/server/0999-Add-Alternate-Current-redstone-implementation.patch b/patches/server/0998-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/0999-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/0998-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0999-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/1000-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0999-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/1001-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1000-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/1001-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/1000-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1002-Optimize-Collision-to-not-load-chunks.patch b/patches/server/1001-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/1002-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/1001-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/1002-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/1003-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/1002-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1004-Optimize-Hoppers.patch b/patches/server/1003-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/1004-Optimize-Hoppers.patch
rename to patches/server/1003-Optimize-Hoppers.patch
diff --git a/patches/server/1005-Entity-load-save-limit-per-chunk.patch b/patches/server/1004-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/1005-Entity-load-save-limit-per-chunk.patch
rename to patches/server/1004-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1006-Optimize-Voxel-Shape-Merging.patch b/patches/server/1005-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/1006-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/1005-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1007-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/1007-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1008-Remove-streams-from-hot-code.patch b/patches/server/1007-Remove-streams-from-hot-code.patch
similarity index 100%
rename from patches/server/1008-Remove-streams-from-hot-code.patch
rename to patches/server/1007-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch b/patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
similarity index 100%
rename from patches/server/1009-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
rename to patches/server/1008-Optimize-Pathfinder-Remove-Streams-Optimized-collect.patch
diff --git a/patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/1010-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/1009-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1010-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/1011-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/1010-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1012-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1011-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/server/1012-Handle-Oversized-block-entities-in-chunks.patch
rename to patches/server/1011-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1013-API-for-checking-sent-chunks.patch b/patches/server/1012-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/server/1013-API-for-checking-sent-chunks.patch
rename to patches/server/1012-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1014-Check-distance-in-entity-interactions.patch b/patches/server/1013-Check-distance-in-entity-interactions.patch
similarity index 100%
rename from patches/server/1014-Check-distance-in-entity-interactions.patch
rename to patches/server/1013-Check-distance-in-entity-interactions.patch
diff --git a/patches/server/1015-Configurable-Sand-Duping.patch b/patches/server/1014-Configurable-Sand-Duping.patch
similarity index 100%
rename from patches/server/1015-Configurable-Sand-Duping.patch
rename to patches/server/1014-Configurable-Sand-Duping.patch
diff --git a/patches/server/1016-Optimise-general-POI-access.patch b/patches/server/1015-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/1016-Optimise-general-POI-access.patch
rename to patches/server/1015-Optimise-general-POI-access.patch
diff --git a/patches/server/1017-Improve-performance-of-mass-crafts.patch b/patches/server/1016-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1017-Improve-performance-of-mass-crafts.patch
rename to patches/server/1016-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1018-Properly-resend-entities.patch b/patches/server/1017-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/1018-Properly-resend-entities.patch
rename to patches/server/1017-Properly-resend-entities.patch
diff --git a/patches/server/1019-Registry-Modification-API.patch b/patches/server/1018-Registry-Modification-API.patch
similarity index 100%
rename from patches/server/1019-Registry-Modification-API.patch
rename to patches/server/1018-Registry-Modification-API.patch
diff --git a/patches/server/1020-Add-registry-entry-and-builders.patch b/patches/server/1019-Add-registry-entry-and-builders.patch
similarity index 100%
rename from patches/server/1020-Add-registry-entry-and-builders.patch
rename to patches/server/1019-Add-registry-entry-and-builders.patch
diff --git a/patches/server/1021-Improved-Watchdog-Support.patch b/patches/server/1020-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/1021-Improved-Watchdog-Support.patch
rename to patches/server/1020-Improved-Watchdog-Support.patch
diff --git a/patches/server/1022-Proxy-ItemStack-to-CraftItemStack.patch b/patches/server/1021-Proxy-ItemStack-to-CraftItemStack.patch
similarity index 100%
rename from patches/server/1022-Proxy-ItemStack-to-CraftItemStack.patch
rename to patches/server/1021-Proxy-ItemStack-to-CraftItemStack.patch
diff --git a/patches/server/1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/server/1022-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
similarity index 100%
rename from patches/server/1023-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
rename to patches/server/1022-Make-a-PDC-view-accessible-directly-from-ItemStack.patch
diff --git a/patches/server/1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch b/patches/server/1023-Prioritize-Minecraft-commands-in-function-parsing-an.patch
similarity index 100%
rename from patches/server/1024-Prioritize-Minecraft-commands-in-function-parsing-an.patch
rename to patches/server/1023-Prioritize-Minecraft-commands-in-function-parsing-an.patch
diff --git a/patches/server/1025-optimize-dirt-and-snow-spreading.patch b/patches/server/1024-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/1025-optimize-dirt-and-snow-spreading.patch
rename to patches/server/1024-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch b/patches/server/1025-Fix-NPE-for-Jukebox-setRecord.patch
similarity index 100%
rename from patches/server/1026-Fix-NPE-for-Jukebox-setRecord.patch
rename to patches/server/1025-Fix-NPE-for-Jukebox-setRecord.patch
diff --git a/patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch b/patches/server/1026-Fix-CraftWorld-isChunkGenerated.patch
similarity index 100%
rename from patches/server/1027-Fix-CraftWorld-isChunkGenerated.patch
rename to patches/server/1026-Fix-CraftWorld-isChunkGenerated.patch
diff --git a/patches/server/1028-fix-horse-inventories.patch b/patches/server/1027-fix-horse-inventories.patch
similarity index 100%
rename from patches/server/1028-fix-horse-inventories.patch
rename to patches/server/1027-fix-horse-inventories.patch
diff --git a/patches/server/1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch b/patches/server/1028-Only-call-EntityDamageEvents-before-actuallyHurt.patch
similarity index 100%
rename from patches/server/1029-Only-call-EntityDamageEvents-before-actuallyHurt.patch
rename to patches/server/1028-Only-call-EntityDamageEvents-before-actuallyHurt.patch
diff --git a/patches/server/1030-Fix-entity-tracker-desync-when-new-players-are-added.patch b/patches/server/1029-Fix-entity-tracker-desync-when-new-players-are-added.patch
similarity index 100%
rename from patches/server/1030-Fix-entity-tracker-desync-when-new-players-are-added.patch
rename to patches/server/1029-Fix-entity-tracker-desync-when-new-players-are-added.patch
diff --git a/patches/server/1031-Lag-compensation-ticks.patch b/patches/server/1030-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/1031-Lag-compensation-ticks.patch
rename to patches/server/1030-Lag-compensation-ticks.patch
diff --git a/patches/server/1032-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1031-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/1032-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/1031-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1033-Write-SavedData-IO-async.patch b/patches/server/1032-Write-SavedData-IO-async.patch
similarity index 100%
rename from patches/server/1033-Write-SavedData-IO-async.patch
rename to patches/server/1032-Write-SavedData-IO-async.patch
diff --git a/patches/server/1034-Correctly-call-PlayerItemBreakEvent.patch b/patches/server/1033-Correctly-call-PlayerItemBreakEvent.patch
similarity index 100%
rename from patches/server/1034-Correctly-call-PlayerItemBreakEvent.patch
rename to patches/server/1033-Correctly-call-PlayerItemBreakEvent.patch
diff --git a/patches/server/1035-Add-ItemType-getItemRarity.patch b/patches/server/1034-Add-ItemType-getItemRarity.patch
similarity index 100%
rename from patches/server/1035-Add-ItemType-getItemRarity.patch
rename to patches/server/1034-Add-ItemType-getItemRarity.patch
diff --git a/patches/server/1036-Incremental-chunk-and-player-saving.patch b/patches/server/1035-Incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/1036-Incremental-chunk-and-player-saving.patch
rename to patches/server/1035-Incremental-chunk-and-player-saving.patch
diff --git a/patches/server/1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1036-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/1037-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/1036-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1038-Bundle-spark.patch b/patches/server/1037-Bundle-spark.patch
similarity index 99%
rename from patches/server/1038-Bundle-spark.patch
rename to patches/server/1037-Bundle-spark.patch
index 24b9c208b8..46102122ae 100644
--- a/patches/server/1038-Bundle-spark.patch
+++ b/patches/server/1037-Bundle-spark.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bundle spark
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1a734293c9416f13324bb0edf8f950c9029f8bc4..5e68a68d1ff920eb743795ae2048064a244a761c 100644
+index 4f6136ae3ac4890b21a5fb3f69f9c1474a0773d1..32832deabc39be99ae0d69fe81439b86789f09e4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -61,6 +61,10 @@ dependencies {
diff --git a/patches/server/1039-Add-plugin-info-at-startup.patch b/patches/server/1038-Add-plugin-info-at-startup.patch
similarity index 100%
rename from patches/server/1039-Add-plugin-info-at-startup.patch
rename to patches/server/1038-Add-plugin-info-at-startup.patch
diff --git a/patches/server/1040-Make-interaction-leniency-distance-configurable.patch b/patches/server/1039-Make-interaction-leniency-distance-configurable.patch
similarity index 100%
rename from patches/server/1040-Make-interaction-leniency-distance-configurable.patch
rename to patches/server/1039-Make-interaction-leniency-distance-configurable.patch
diff --git a/patches/server/1041-Fix-PickupStatus-getting-reset.patch b/patches/server/1040-Fix-PickupStatus-getting-reset.patch
similarity index 100%
rename from patches/server/1041-Fix-PickupStatus-getting-reset.patch
rename to patches/server/1040-Fix-PickupStatus-getting-reset.patch
diff --git a/patches/server/1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1041-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
similarity index 100%
rename from patches/server/1042-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
rename to patches/server/1041-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
diff --git a/patches/server/1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/server/1042-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
similarity index 100%
rename from patches/server/1043-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
rename to patches/server/1042-Add-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch
diff --git a/patches/server/1044-Configuration-for-horizontal-only-item-merging.patch b/patches/server/1043-Configuration-for-horizontal-only-item-merging.patch
similarity index 100%
rename from patches/server/1044-Configuration-for-horizontal-only-item-merging.patch
rename to patches/server/1043-Configuration-for-horizontal-only-item-merging.patch
diff --git a/patches/server/1045-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1044-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/1045-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/1044-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1046-Add-skipping-world-symlink-scan.patch b/patches/server/1045-Add-skipping-world-symlink-scan.patch
similarity index 100%
rename from patches/server/1046-Add-skipping-world-symlink-scan.patch
rename to patches/server/1045-Add-skipping-world-symlink-scan.patch
diff --git a/patches/server/1047-Add-even-more-Enchantment-API.patch b/patches/server/1046-Add-even-more-Enchantment-API.patch
similarity index 100%
rename from patches/server/1047-Add-even-more-Enchantment-API.patch
rename to patches/server/1046-Add-even-more-Enchantment-API.patch
diff --git a/patches/server/1048-Leashable-API.patch b/patches/server/1047-Leashable-API.patch
similarity index 100%
rename from patches/server/1048-Leashable-API.patch
rename to patches/server/1047-Leashable-API.patch
diff --git a/patches/server/1049-Fix-CraftBukkit-drag-system.patch b/patches/server/1048-Fix-CraftBukkit-drag-system.patch
similarity index 100%
rename from patches/server/1049-Fix-CraftBukkit-drag-system.patch
rename to patches/server/1048-Fix-CraftBukkit-drag-system.patch
diff --git a/patches/server/1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch b/patches/server/1049-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
similarity index 100%
rename from patches/server/1050-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
rename to patches/server/1049-Fix-SculkBloomEvent-firing-for-block-entity-loading.patch
diff --git a/patches/server/1051-Remove-set-damage-lootable-item-function-from-compas.patch b/patches/server/1050-Remove-set-damage-lootable-item-function-from-compas.patch
similarity index 100%
rename from patches/server/1051-Remove-set-damage-lootable-item-function-from-compas.patch
rename to patches/server/1050-Remove-set-damage-lootable-item-function-from-compas.patch
diff --git a/patches/server/1052-Properly-destroy-placed-blocks-on-the-end-platform.patch b/patches/server/1051-Properly-destroy-placed-blocks-on-the-end-platform.patch
similarity index 100%
rename from patches/server/1052-Properly-destroy-placed-blocks-on-the-end-platform.patch
rename to patches/server/1051-Properly-destroy-placed-blocks-on-the-end-platform.patch
diff --git a/patches/server/1053-Add-enchantment-seed-update-API.patch b/patches/server/1052-Add-enchantment-seed-update-API.patch
similarity index 100%
rename from patches/server/1053-Add-enchantment-seed-update-API.patch
rename to patches/server/1052-Add-enchantment-seed-update-API.patch
diff --git a/patches/server/1054-Fix-synchronise-sending-chat-to-client-with-updating.patch b/patches/server/1053-Fix-synchronise-sending-chat-to-client-with-updating.patch
similarity index 100%
rename from patches/server/1054-Fix-synchronise-sending-chat-to-client-with-updating.patch
rename to patches/server/1053-Fix-synchronise-sending-chat-to-client-with-updating.patch
diff --git a/patches/server/1055-Fix-InventoryOpenEvent-cancellation.patch b/patches/server/1054-Fix-InventoryOpenEvent-cancellation.patch
similarity index 100%
rename from patches/server/1055-Fix-InventoryOpenEvent-cancellation.patch
rename to patches/server/1054-Fix-InventoryOpenEvent-cancellation.patch
diff --git a/patches/server/1056-Fire-BlockExpEvent-on-grindstone-use.patch b/patches/server/1055-Fire-BlockExpEvent-on-grindstone-use.patch
similarity index 100%
rename from patches/server/1056-Fire-BlockExpEvent-on-grindstone-use.patch
rename to patches/server/1055-Fire-BlockExpEvent-on-grindstone-use.patch
diff --git a/patches/server/1057-Check-dead-flag-in-isAlive.patch b/patches/server/1056-Check-dead-flag-in-isAlive.patch
similarity index 100%
rename from patches/server/1057-Check-dead-flag-in-isAlive.patch
rename to patches/server/1056-Check-dead-flag-in-isAlive.patch
diff --git a/patches/server/1058-Add-FeatureFlag-API.patch b/patches/server/1057-Add-FeatureFlag-API.patch
similarity index 100%
rename from patches/server/1058-Add-FeatureFlag-API.patch
rename to patches/server/1057-Add-FeatureFlag-API.patch
diff --git a/patches/server/1059-Tag-Lifecycle-Events.patch b/patches/server/1058-Tag-Lifecycle-Events.patch
similarity index 100%
rename from patches/server/1059-Tag-Lifecycle-Events.patch
rename to patches/server/1058-Tag-Lifecycle-Events.patch
diff --git a/patches/server/1060-Item-serialization-as-json.patch b/patches/server/1059-Item-serialization-as-json.patch
similarity index 100%
rename from patches/server/1060-Item-serialization-as-json.patch
rename to patches/server/1059-Item-serialization-as-json.patch