From c38f96b0e57ad28f444dad8d1c4d2f1fb6ea19cb Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 26 Apr 2024 16:43:59 -0700
Subject: [PATCH] deprecate our ItemRarity API

---
 .../api/0262-Improve-Item-Rarity-API.patch    | 131 ++++++++++++++++++
 patches/api/0262-Item-Rarity-API.patch        | 109 ---------------
 .../api/0263-Expose-protocol-version.patch    |   8 +-
 .../api/0280-ItemStack-repair-check-API.patch |  21 ++-
 patches/api/0283-ItemStack-editMeta.patch     |   2 +-
 ...285-Attributes-API-for-item-defaults.patch |   6 +-
 .../0312-Get-entity-default-attributes.patch  |   8 +-
 ...Collidable-methods-to-various-places.patch |   8 +-
 ...20-Add-Raw-Byte-Entity-Serialization.patch |   2 +-
 .../api/0349-Add-enchantWithLevels-API.patch  |   2 +-
 ...0367-Add-NamespacedKey-biome-methods.patch |   4 +-
 patches/api/0385-ItemStack-damage-API.patch   |   4 +-
 ...x-custom-statistic-criteria-creation.patch |   4 +-
 ...proper-checking-of-empty-item-stacks.patch |   4 +-
 ...ry-durability-check-in-ItemStack-isS.patch |   2 +-
 ...add-missing-Experimental-annotations.patch |   2 +-
 ...Add-api-for-spawn-egg-texture-colors.patch |   4 +-
 .../api/0455-Add-Lifecycle-Event-system.patch |   4 +-
 patches/api/0456-ItemStack-Tooltip-API.patch  |   8 +-
 .../0466-Deprecate-ItemStack-setType.patch    |   2 +-
 ...d-item-when-player-has-disconnected.patch} |   0
 patches/server/0520-Item-Rarity-API.patch     |  63 ---------
 ...elist-use-configurable-kick-message.patch} |   0
 ...gnore-result-of-PlayerEditBookEvent.patch} |   0
 ...tch => 0523-Expose-protocol-version.patch} |   8 +-
 ...ab-completions-for-brigadier-comman.patch} |   0
 ...temConsumeEvent-cancelling-properly.patch} |   0
 ...patch => 0526-Add-bypass-host-check.patch} |   0
 ...0527-Set-area-affect-cloud-rotation.patch} |   0
 ...add-isDeeplySleeping-to-HumanEntity.patch} |   0
 ...add-consumeFuel-to-FurnaceBurnEvent.patch} |   0
 ...-set-drop-chance-to-EntityEquipment.patch} |   0
 ...ix-PigZombieAngerEvent-cancellation.patch} |   0
 ...ix-PlayerItemHeldEvent-firing-twice.patch} |   0
 ...ch => 0533-Add-PlayerDeepSleepEvent.patch} |   0
 ...ld-API.patch => 0534-More-World-API.patch} |   0
 ...=> 0535-Add-PlayerBedFailEnterEvent.patch} |   0
 ...-to-convert-between-Component-and-B.patch} |   0
 ...awnEvent-fix-passed-parameter-issue.patch} |   0
 ...acon-activation-deactivation-events.patch} |   0
 ...dd-Channel-initialization-listeners.patch} |   0
 ...mands-if-tab-completion-is-disabled.patch} |   0
 ...> 0541-Add-more-WanderingTrader-API.patch} |   0
 ...dd-EntityBlockStorage-clearEntities.patch} |   0
 ...ssage-to-PlayerAdvancementDoneEvent.patch} |   0
 ... => 0544-Add-HiddenPotionEffect-API.patch} |   0
 ...close.patch => 0545-Inventory-close.patch} |   0
 ...-in-sunlight-API-for-Phantoms-and-S.patch} |   0
 ...atch => 0547-Add-basic-Datapack-API.patch} |   0
 ...ment-variable-to-disable-server-gui.patch} |   0
 ...49-Expand-PlayerGameModeChangeEvent.patch} |   0
 ... => 0550-ItemStack-repair-check-API.patch} |  16 +--
 ....patch => 0551-More-Enchantment-API.patch} |   0
 ...ve-range-check-for-block-placing-up.patch} |   0
 ...PI.patch => 0553-Add-Mob-lookAt-API.patch} |   0
 ...f-bucket-dispenses-will-succeed-for.patch} |   0
 ...0555-Add-Unix-domain-socket-support.patch} |   0
 ... => 0556-Add-EntityInsideBlockEvent.patch} |   0
 ...557-Fix-item-default-attributes-API.patch} |   2 +-
 ...ause-to-Weather-ThunderChangeEvents.patch} |   0
 ...patch => 0559-More-Lidded-Block-API.patch} |   0
 ...60-Limit-item-frame-cursors-on-maps.patch} |   0
 ... => 0561-Add-PlayerKickEvent-causes.patch} |   0
 ...0562-Add-PufferFishStateChangeEvent.patch} |   0
 ...erBucketEmptyEvent-result-itemstack.patch} |   0
 ...tedContainer-instead-of-ThreadingDe.patch} |   0
 ...-to-fix-items-merging-through-walls.patch} |   0
 ...h => 0566-Add-BellRevealRaiderEvent.patch} |   0
 ... 0567-Fix-invulnerable-end-crystals.patch} |   0
 ...68-Add-ElderGuardianAppearanceEvent.patch} |   0
 ...0569-Fix-dangerous-end-portal-logic.patch} |   0
 ...-Biome-Mob-Lookups-for-Mob-Spawning.patch} |   0
 ...patch => 0571-Line-Of-Sight-Changes.patch} |   0
 ... => 0572-add-per-world-spawn-limits.patch} |   0
 ...h => 0573-Fix-potions-splash-events.patch} |   0
 ... => 0574-Add-more-LimitedRegion-API.patch} |   0
 ...layerDropItemEvent-using-wrong-item.patch} |   0
 ...PI.patch => 0576-Missing-Entity-API.patch} |   0
 ...ect-for-book-edit-is-called-on-main.patch} |   0
 ...of-Block-applyBoneMeal-always-being.patch} |   0
 ...tChunkIfLoadedImmediately-in-places.patch} |   0
 ...rom-signs-not-firing-command-events.patch} |   0
 ...tch => 0581-Add-PlayerArmSwingEvent.patch} |   0
 ...-event-leave-message-not-being-sent.patch} |   0
 ...-t-apply-cramming-damage-to-players.patch} |   0
 ...d-timings-for-sensors-and-behaviors.patch} |   0
 ... 0585-Add-missing-forceDrop-toggles.patch} |   0
 ...inger-API.patch => 0586-Stinger-API.patch} |   0
 ... => 0587-Add-System.out-err-catcher.patch} |   0
 ...AFK-kick-while-watching-end-credits.patch} |   0
 ...iting-of-comments-to-server.propert.patch} |   0
 ...tch => 0590-Add-PlayerSetSpawnEvent.patch} |   0
 ...rs-respect-inventory-max-stack-size.patch} |   0
 ...ize-entity-tracker-passenger-checks.patch} |   0
 ...-option-for-Piglins-guarding-chests.patch} |   0
 ...h => 0594-Add-EntityDamageItemEvent.patch} |   0
 ...timize-indirect-passenger-iteration.patch} |   0
 ...em-frame-map-cursor-update-interval.patch} |   0
 ...597-Clear-bucket-NBT-after-dispense.patch} |   0
 ...arget-without-changing-other-things.patch} |   0
 ...ch => 0599-Add-BlockBreakBlockEvent.patch} |   0
 ...-data-components-copy-in-smithing-r.patch} |   0
 ...patch => 0601-More-CommandBlock-API.patch} |   0
 ...-missing-team-sidebar-display-slots.patch} |   0
 ...0603-Add-back-EntityPortalExitEvent.patch} |   0
 ...-find-targets-for-lightning-strikes.patch} |   0
 ... 0605-Get-entity-default-attributes.patch} |   8 +-
 ...d-API.patch => 0606-Left-handed-API.patch} |   0
 ...ch => 0607-Add-more-advancement-API.patch} |   0
 ...608-Add-ItemFactory-getSpawnEgg-API.patch} |   0
 ...tch => 0609-Add-critical-damage-API.patch} |   0
 ...0610-Fix-issues-with-mob-conversion.patch} |   0
 ...ollidable-methods-to-various-places.patch} |   4 +-
 ...-ram-API.patch => 0612-Goat-ram-API.patch} |   0
 ...dd-API-for-resetting-a-single-score.patch} |   0
 ...4-Add-Raw-Byte-Entity-Serialization.patch} |   2 +-
 ...15-Vanilla-command-permission-fixes.patch} |   0
 ...logic-for-inventories-on-chunk-unlo.patch} |   0
 ...17-Fix-GameProfileCache-concurrency.patch} |   0
 ...618-Improve-and-expand-AsyncCatcher.patch} |   0
 ...per-mobcaps-and-paper-playermobcaps.patch} |   0
 ...tize-ResourceLocation-error-logging.patch} |   0
 ...lly-inline-methods-in-BlockPosition.patch} |   0
 ...ler-threads-according-to-the-plugin.patch} |   0
 ...-getChunkAt-has-inlined-logic-for-l.patch} |   0
 ...our-chunk-data-off-disk-when-conver.patch} |   0
 ...d-state-when-raytracing-skip-air-bl.patch} |   0
 ...atch => 0626-Time-scoreboard-search.patch} |   0
 ...rimise-map-impl-for-tracked-players.patch} |   0
 ...h => 0628-Add-missing-InventoryType.patch} |   0
 ...imise-BlockSoil-nearby-water-lookup.patch} |   0
 ...ntory-not-closing-on-entity-removal.patch} |   0
 ...rement-before-suggesting-root-nodes.patch} |   0
 ...ServerboundCommandSuggestionPacket-.patch} |   0
 ...h => 0633-Add-packet-limiter-config.patch} |   0
 ...nColor-on-tropical-fish-bucket-meta.patch} |   0
 ...=> 0635-Ensure-valid-vehicle-status.patch} |   0
 ...ftlocked-end-exit-portal-generation.patch} |   0
 ...r-causing-a-crash-when-trying-to-ge.patch} |   0
 ...-t-log-debug-logging-being-disabled.patch} |   0
 ...ous-menus-with-empty-level-accesses.patch} |   0
 ...h => 0640-Preserve-overstacked-loot.patch} |   0
 ...ate-head-rotation-in-missing-places.patch} |   0
 ...unintended-light-block-manipulation.patch} |   0
 ...0643-Fix-CraftCriteria-defaults-map.patch} |   0
 ...Fix-upstreams-block-state-factories.patch} |   0
 ... => 0645-Configurable-feature-seeds.patch} |   0
 ... 0646-Add-root-admin-user-detection.patch} |   0
 ...t-attempt-to-teleport-dead-entities.patch} |   0
 ...ive-velocity-through-repeated-crits.patch} |   0
 ...e-code-using-deprecated-for-removal.patch} |   0
 ...=> 0650-Fix-Spigot-growth-modifiers.patch} |   0
 ...OpenersCounter-openCount-from-going.patch} |   0
 ...0652-Add-PlayerItemFrameChangeEvent.patch} |   0
 ...tch => 0653-Optimize-HashMapPalette.patch} |   0
 ...low-delegation-to-vanilla-chunk-gen.patch} |   0
 ...-isSectionEmpty-int-and-optimize-Pa.patch} |   0
 ...patch => 0656-Add-more-Campfire-API.patch} |   0
 ...data-to-disk-if-it-serializes-witho.patch} |   0
 ...ard-CraftEntity-in-teleport-command.patch} |   0
 ... => 0659-Improve-scoreboard-entries.patch} |   0
 ...ch => 0660-Entity-powdered-snow-API.patch} |   0
 ...0661-Add-API-for-item-entity-health.patch} |   0
 ...ax-block-light-for-monster-spawning.patch} |   0
 ...pistons-and-BlockPistonRetractEvent.patch} |   0
 ...-canSmelt-methods-to-FurnaceInvento.patch} |   0
 ...le-API.patch => 0665-Bucketable-API.patch} |   0
 ...es.patch => 0666-Validate-usernames.patch} |   0
 ...er-animal-spawn-height-configurable.patch} |   0
 ...anilla-BiomeProvider-from-WorldInfo.patch} |   0
 ...ion-for-worlds-affected-by-time-cmd.patch} |   0
 ...heck-for-PersistentDataContainer-ha.patch} |   0
 ...1-Multiple-Entries-with-Scoreboards.patch} |   0
 ...672-Reset-placed-block-on-exception.patch} |   0
 ...configurable-height-for-slime-spawn.patch} |   0
 ...0674-Fix-xp-reward-for-baby-zombies.patch} |   0
 ...lti-Block-Change-API-Implementation.patch} |   0
 ...ent.patch => 0676-Fix-NotePlayEvent.patch} |   0
 ....patch => 0677-Freeze-Tick-Lock-API.patch} |   0
 ...h => 0678-More-PotionEffectType-API.patch} |   0
 ...for-StructureTemplate.Pallete-cache.patch} |   0
 ...command-sender-which-forwards-feedb.patch} |   0
 ...-missing-structure-set-seed-configs.patch} |   0
 ...h => 0682-Implement-regenerateChunk.patch} |   0
 ...lled-powdered-snow-bucket-placement.patch} |   0
 ...ate-calls-to-CraftServer-getSpawnLi.patch} |   0
 ...gs.patch => 0685-Add-GameEvent-tags.patch} |   0
 ...ks-fairly-for-worlds-while-waiting-.patch} |   0
 ...tch => 0687-Furnace-RecipesUsed-API.patch} |   0
 ...gurable-sculk-sensor-listener-range.patch} |   0
 ...d-missing-block-data-mins-and-maxes.patch} |   0
 ...fault-CustomSpawners-in-custom-worl.patch} |   0
 ...-worldlist-before-initing-the-world.patch} |   0
 ... => 0692-Fix-Entity-Position-Desync.patch} |   0
 ...s.patch => 0693-Custom-Potion-Mixes.patch} |   0
 ...94-Force-close-world-loading-screen.patch} |   0
 ...695-Fix-falling-block-spawn-methods.patch} |   0
 ...Expose-furnace-minecart-push-values.patch} |   0
 ...ojectileHitEvent-for-piercing-arrow.patch} |   0
 ...I.patch => 0698-More-Projectile-API.patch} |   0
 ...x-swamp-hut-cat-generation-deadlock.patch} |   0
 ...le-movement-from-players-while-tele.patch} |   0
 ...0701-Implement-getComputedBiome-API.patch} |   0
 ...> 0702-Make-some-itemstacks-nonnull.patch} |   0
 ...703-Implement-enchantWithLevels-API.patch} |   0
 ...h => 0704-Fix-saving-in-unloadWorld.patch} |   0
 ...h => 0705-Buffer-OOB-setBlock-calls.patch} |   0
 ... 0706-Add-TameableDeathMessageEvent.patch} |   0
 ...ock-data-for-EntityChangeBlockEvent.patch} |   0
 ...bles-running-when-mob-loot-gamerule.patch} |   0
 ...ssenger-world-matches-ridden-entity.patch} |   0
 ...s.patch => 0710-cache-resource-keys.patch} |   0
 ...low-changing-the-EnderDragon-podium.patch} |   0
 ...erriding-a-block-entity-during-worl.patch} |   0
 ...t-tile-entity-copies-loading-chunks.patch} |   0
 ...ead-of-display-name-in-PlayerList-g.patch} |   0
 ...> 0715-Expand-PlayerItemDamageEvent.patch} |   0
 ...> 0716-WorldCreator-keepSpawnLoaded.patch} |   0
 ...-in-CraftPersistentDataTypeRegistry.patch} |   0
 ...destroyed-trigger-in-the-correct-pl.patch} |   0
 ...Event-and-CollarColorable-interface.patch} |   0
 ...CauldronLevelChange-on-initial-fill.patch} |   0
 ...snow-cauldrons-not-turning-to-water.patch} |   0
 ...> 0722-Add-PlayerStopUsingItemEvent.patch} |   0
 ...rs.patch => 0723-Don-t-tick-markers.patch} |   0
 ...tch => 0724-Expand-FallingBlock-API.patch} |   0
 ...0725-Add-support-for-Proxy-Protocol.patch} |   0
 ...x-OfflinePlayer-getBedSpawnLocation.patch} |   0
 ...tory-for-smokers-and-blast-furnaces.patch} |   0
 ... 0728-Sanitize-sent-BlockEntity-NBT.patch} |   0
 ...-selector-resolving-in-books-by-def.patch} |   0
 ...ntity-loading-causing-async-lookups.patch} |   0
 ...-on-world-create-while-being-ticked.patch} |   0
 ...32-Dont-resent-entity-on-art-update.patch} |   0
 ... => 0733-Add-WardenAngerChangeEvent.patch} |   0
 ...strict-advancement-dimension-checks.patch} |   0
 ...tant-BlockStateListPopulator-method.patch} |   0
 ...I.patch => 0736-Nameable-Banner-API.patch} |   0
 ...roadcast-messages-to-command-blocks.patch} |   0
 ...pty-items-from-being-added-to-world.patch} |   0
 ...hPotion-and-LingeringPotion-spawnin.patch} |   0
 ...atch => 0740-Add-Player-getFishHook.patch} |   0
 ...chunk-for-dynamic-game-event-listen.patch} |   0
 ...s-missing-EntityDropItemEvent-calls.patch} |   0
 ...PE.patch => 0743-Fix-Bee-flower-NPE.patch} |   0
 ...-not-using-commands.spam-exclusions.patch} |   0
 ...API.patch => 0745-More-Teleport-API.patch} |   0
 ... => 0746-Add-EntityPortalReadyEvent.patch} |   0
 ...level-random-in-entity-constructors.patch} |   0
 ...k-entities-after-destroy-prediction.patch} |   0
 ...on-plugins-accessing-faraway-chunks.patch} |   0
 ...tom-Chat-Completion-Suggestions-API.patch} |   0
 ...Add-and-fix-missing-BlockFadeEvents.patch} |   0
 ...ion-API.patch => 0752-Collision-API.patch} |   0
 ...nd-message-for-brigadier-syntax-exc.patch} |   0
 ...API.patch => 0754-Block-Ticking-API.patch} |   0
 ...-Add-Velocity-IP-Forwarding-Support.patch} |   0
 ...756-Add-NamespacedKey-biome-methods.patch} |   4 +-
 ...x-plugin-loggers-on-server-shutdown.patch} |   0
 ...ok-changes-from-crashing-the-server.patch} |   0
 ...tityChangeBlockEvent-in-more-places.patch} |   0
 ...> 0760-Missing-eating-regain-reason.patch} |   0
 ....patch => 0761-Missing-effect-cause.patch} |   0
 ...serialization-deserialization-for-P.patch} |   0
 ...rameter-to-ProjectileSource-launchP.patch} |   0
 ...4-Call-BlockPhysicsEvent-more-often.patch} |   0
 ...0765-Configurable-chat-thread-limit.patch} |   0
 ...of-WorldCreator-keepSpawnLoaded-ret.patch} |   0
 ... 0767-fix-Jigsaw-block-kicking-user.patch} |   0
 ...mEvent-for-mud-converting-into-clay.patch} |   0
 ... => 0769-Add-getDrops-to-BlockState.patch} |   0
 ...=> 0770-Fix-a-bunch-of-vanilla-bugs.patch} |   0
 ...y-onTrackingStart-during-navigation.patch} |   0
 ... 0772-Fix-custom-piglin-loved-items.patch} |   0
 ...=> 0773-EntityPickupItemEvent-fixes.patch} |   0
 ...interactions-with-items-on-cooldown.patch} |   0
 ...-Add-PlayerInventorySlotChangeEvent.patch} |   0
 ... 0776-Elder-Guardian-appearance-API.patch} |   0
 ...ow-changing-bed-s-occupied-property.patch} |   0
 ...ch => 0778-Add-entity-knockback-API.patch} |   0
 ....patch => 0779-Detect-headless-JREs.patch} |   0
 ...-vehicle-collision-event-not-called.patch} |   0
 ...ch => 0781-Add-EntityToggleSitEvent.patch} |   0
 ... => 0782-Add-fire-tick-delay-option.patch} |   0
 ...patch => 0783-Add-Moving-Piston-API.patch} |   0
 ...> 0784-Ignore-impossible-spawn-tick.patch} |   0
 ...t-suggestion-permissions-to-align-w.patch} |   0
 ...Event-cancellation-cant-fully-preve.patch} |   0
 ...0787-Add-PrePlayerAttackEntityEvent.patch} |   0
 ...e-reset-EnderDragon-boss-event-name.patch} |   0
 ...-green-map-markers-do-not-disappear.patch} |   0
 ... 0790-Add-Player-Warden-Warning-API.patch} |   0
 ...a-friendly-methods-to-update-trades.patch} |   0
 ...792-Add-paper-dumplisteners-command.patch} |   0
 ...lobal-player-list-where-appropriate.patch} |   0
 ...sync-entity-add-due-to-fungus-trees.patch} |   0
 ....patch => 0795-ItemStack-damage-API.patch} |   0
 ...tion-API.patch => 0796-Friction-API.patch} |   0
 ...trol-player-s-insomnia-and-phantoms.patch} |   0
 ...-premature-player-kicks-on-shutdown.patch} |   0
 ... => 0799-Sync-offhand-slot-in-menus.patch} |   0
 ... 0800-Player-Entity-Tracking-Events.patch} |   0
 ...tch => 0801-Limit-pet-look-distance.patch} |   0
 ...nd-additions-to-the-SpawnReason-API.patch} |   0
 ...ments.patch => 0803-fix-Instruments.patch} |   0
 ...for-some-hot-BlockBehavior-and-Flui.patch} |   0
 ...es-in-dispense-events-regarding-sta.patch} |   0
 ...tch => 0806-Add-BlockLockCheckEvent.patch} |   0
 ... 0807-Add-Sneaking-API-for-Entities.patch} |   0
 ... => 0808-Improve-logging-and-errors.patch} |   0
 ....patch => 0809-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 => 0813-Flying-Fall-Damage.patch} |   0
 ...k-state-to-BlockExplodeEvent-and-En.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 => 0819-Win-Screen-API.patch} |   0
 ...ItemStack-setAmount-null-assignment.patch} |   0
 ...ix-force-opening-enchantment-tables.patch} |   0
 ...tch => 0822-Add-Entity-Body-Yaw-API.patch} |   0
 ...vent-sleeping-villagers-moving-towa.patch} |   0
 ...=> 0824-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
 ...829-Fix-text-display-error-on-spawn.patch} |   0
 ...nventories-returning-null-Locations.patch} |   0
 ...API.patch => 0831-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
 ...uplicate-animate-packet-for-records.patch} |   0
 ...xpired-keys-from-impacting-new-join.patch} |   0
 ...ts-being-fired-from-unloaded-chunks.patch} |   0
 ...0838-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
 ... 0841-Add-Mob-Experience-reward-API.patch} |   0
 ...redstone-on-top-of-trap-doors-early.patch} |   0
 ...Lazy-Initialization-for-Enum-Fields.patch} |   0
 ...44-More-accurate-isInOpenWater-impl.patch} |   0
 ... => 0845-Expand-PlayerItemMendEvent.patch} |   0
 ...sh-ProjectileSource-for-projectiles.patch} |   0
 ... => 0847-Add-transient-modifier-API.patch} |   0
 ...patch => 0848-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
 ...6-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
 ...860-Call-missing-BlockDispenseEvent.patch} |   0
 ...-chunks-for-supporting-block-checks.patch} |   0
 ...Optimize-player-lookups-for-beacons.patch} |   0
 ...863-Add-Sign-getInteractableSideFor.patch} |   0
 ...4-fix-item-meta-for-tadpole-buckets.patch} |   0
 ...t-API.patch => 0865-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 => 0871-Add-whitelist-events.patch} |   0
 ... 0872-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
 ...877-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
 ...> 0882-Cache-map-ids-on-item-frames.patch} |   0
 ...-custom-statistic-criteria-creation.patch} |   4 +-
 ...atch => 0884-Bandaid-fix-for-Effect.patch} |   0
 ...tch => 0885-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
 ... => 0892-Add-Listing-API-for-Player.patch} |   0
 ...figurable-Region-Compression-Format.patch} |   0
 ...4-Add-BlockFace-to-BlockDamageEvent.patch} |   0
 ...h => 0895-Fix-NPE-on-Boat-getStatus.patch} |   0
 ...e-API.patch => 0896-Expand-Pose-API.patch} |   0
 ...patch => 0897-More-DragonBattle-API.patch} |   0
 ...tch => 0898-Add-PlayerPickItemEvent.patch} |   0
 ...=> 0899-Allow-trident-custom-damage.patch} |   0
 ...0-Expose-hand-in-BlockCanBuildEvent.patch} |   0
 ...-nearest-structure-border-iteration.patch} |   0
 ...Implement-OfflinePlayer-isConnected.patch} |   0
 ....patch => 0903-Fix-inventory-desync.patch} |   0
 ...titleOverride-to-InventoryOpenEvent.patch} |   0
 ...05-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 => 0912-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
 ...21-Fix-UnsafeValues-loadAdvancement.patch} |   2 +-
 ...> 0922-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 => 0926-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
 ... => 0930-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
 ...934-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 => 0938-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 => 0942-add-more-scoreboard-API.patch} |   0
 ...stry.patch => 0943-Improve-Registry.patch} |   0
 ...on-null-loc-for-EntityTeleportEvent.patch} |   0
 ...h => 0945-Add-experience-points-API.patch} |   0
 ...h => 0946-Add-drops-to-shear-events.patch} |   0
 ...> 0947-Add-PlayerShieldDisableEvent.patch} |   0
 ...ate-ResourceLocation-in-NBT-reading.patch} |   0
 ...-experience-dropping-on-block-break.patch} |   0
 ...> 0950-Fixup-NamespacedKey-handling.patch} |   0
 ...51-Expose-LootTable-of-DecoratedPot.patch} |   0
 ...location-of-Vec3D-by-entity-tracker.patch} |   0
 ...rTradeEvent-and-PlayerPurchaseEvent.patch} |   0
 ...h => 0954-Add-ShulkerDuplicateEvent.patch} |   0
 ...dd-api-for-spawn-egg-texture-colors.patch} |   4 +-
 ... => 0956-Add-Lifecycle-Event-system.patch} |   4 +-
 ...patch => 0957-ItemStack-Tooltip-API.patch} |   4 +-
 ...Snapshot-includeLightData-parameter.patch} |   0
 ...PI.patch => 0959-Add-FluidState-API.patch} |   0
 ...patch => 0960-add-number-format-api.patch} |   0
 ...patch => 0961-improve-BanList-types.patch} |   0
 ...I.patch => 0962-Expanded-Hopper-API.patch} |   0
 ...3-Add-BlockBreakProgressUpdateEvent.patch} |   0
 ...=> 0964-Deprecate-ItemStack-setType.patch} |   0
 ...ch => 0965-Add-CartographyItemEvent.patch} |   0
 ...aid-API.patch => 0966-More-Raid-API.patch} |   0
 ...ng-message-for-initial-server-start.patch} |   0
 ...-Configurable-max-block-fluid-ticks.patch} |   0
 ...=> 0969-Fix-bees-aging-inside-hives.patch} |   0
 ...0-Disable-memory-reserve-allocating.patch} |   0
 ...ByEntityEvent-for-unowned-wither-sk.patch} |   0
 ....patch => 0972-Fix-DamageSource-API.patch} |   0
 ...nvalid-block-entity-during-world-ge.patch} |   0
 ...ackOverflowError-for-some-dispenses.patch} |   0
 ...=> 0975-Improve-tag-parser-handling.patch} |   0
 ...s.patch => 0976-Item-Mutation-Fixes.patch} |   0
 ...-Per-world-ticks-per-spawn-settings.patch} |   0
 ...e-changed-item-from-dispense-events.patch} |   0
 ...> 0979-Rewrite-dataconverter-system.patch} |   2 +-
 ...=> 0980-Suspicious-Effect-Entry-API.patch} |   0
 ...eck-if-itemstack-is-stackable-first.patch} |   0
 ...82-disable-forced-empty-world-ticks.patch} |   0
 ...4-Starlight.patch => 0983-Starlight.patch} |   0
 ....patch => 0984-Rewrite-chunk-system.patch} |   0
 ...incremental-chunk-and-player-saving.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
 ...90-Allow-Saving-of-Oversized-Chunks.patch} |   0
 ...91-Fix-World-isChunkGenerated-calls.patch} |   0
 ...992-Flat-bedrock-generator-settings.patch} |   0
 ...=> 0993-Entity-Activation-Range-2.0.patch} |   0
 ...0994-Optional-per-player-mob-spawns.patch} |   0
 ...6-Anti-Xray.patch => 0995-Anti-Xray.patch} |   0
 ...g-PreCreatureSpawnEvent-with-per-pl.patch} |   0
 ...timize-Collision-to-not-load-chunks.patch} |   0
 ...alSelector-Goal.Flag-Set-operations.patch} |   0
 ...99-Entity-load-save-limit-per-chunk.patch} |   0
 ...h => 1000-Improved-Watchdog-Support.patch} |   0
 ...> 1001-Optimize-Voxel-Shape-Merging.patch} |   0
 ...ch => 1002-Write-SavedData-IO-async.patch} |   0
 ...nd-End-Portal-Frames-from-being-des.patch} |   0
 ...ance-map-to-optimise-entity-tracker.patch} |   0
 ...Optimize-Bit-Operations-by-inlining.patch} |   0
 ...> 1006-Remove-streams-from-hot-code.patch} |   0
 ...-Eigencraft-redstone-implementation.patch} |   0
 ...er-Remove-Streams-Optimized-collect.patch} |   0
 ...-Improve-boat-collision-performance.patch} |   0
 ...=> 1010-Optimise-general-POI-access.patch} |   0
 ...ementation-for-blockstate-state-loo.patch} |   0
 ...> 1012-Execute-chunk-tasks-mid-tick.patch} |   0
 ... 1013-Optimise-random-block-ticking.patch} |   0
 ...ulate-regionfile-header-if-it-is-co.patch} |   0
 ...city-compression-and-cipher-natives.patch} |   0
 ...-more-information-in-watchdog-dumps.patch} |   0
 ...tch => 1017-Collision-optimisations.patch} |   0
 ...n-checking-in-player-move-packet-ha.patch} |   0
 ...e-disarming-not-working-as-intended.patch} |   0
 ...-type-tags-suggestions-in-selectors.patch} |   0
 ...ate-Current-redstone-implementation.patch} |   0
 ...22-optimize-dirt-and-snow-spreading.patch} |   0
 ...ch => 1023-Properly-resend-entities.patch} |   0
 ...pers.patch => 1024-Optimize-Hoppers.patch} |   0
 ...-Improve-performance-of-mass-crafts.patch} |   0
 ...> 1026-Actually-optimise-explosions.patch} |   0
 ... 1027-Optimise-chunk-tick-iteration.patch} |   0
 ...atch => 1028-Lag-compensation-ticks.patch} |   0
 ...29-Optimise-nearby-player-retrieval.patch} |   0
 ... 1030-Distance-manager-tick-timings.patch} |   0
 ...-Oversized-block-entities-in-chunks.patch} |   0
 ...packets-for-hard-colliding-entities.patch} |   0
 ...-and-optimise-world-force-upgrading.patch} |   0
 ...> 1034-API-for-checking-sent-chunks.patch} |   0
 ...dle-pdc-and-custom-tags-in-ItemMeta.patch} |   0
 ...g-old-serialized-names-to-new-names.patch} |   0
 ...-for-mobs-immune-to-default-effects.patch} |   0
 ... => 1038-Deep-clone-nbt-tags-in-PDC.patch} |   0
 540 files changed, 210 insertions(+), 252 deletions(-)
 create mode 100644 patches/api/0262-Improve-Item-Rarity-API.patch
 delete mode 100644 patches/api/0262-Item-Rarity-API.patch
 rename patches/server/{0521-Drop-carried-item-when-player-has-disconnected.patch => 0520-Drop-carried-item-when-player-has-disconnected.patch} (100%)
 delete mode 100644 patches/server/0520-Item-Rarity-API.patch
 rename patches/server/{0522-forced-whitelist-use-configurable-kick-message.patch => 0521-forced-whitelist-use-configurable-kick-message.patch} (100%)
 rename patches/server/{0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch => 0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch} (100%)
 rename patches/server/{0524-Expose-protocol-version.patch => 0523-Expose-protocol-version.patch} (64%)
 rename patches/server/{0525-Enhance-console-tab-completions-for-brigadier-comman.patch => 0524-Enhance-console-tab-completions-for-brigadier-comman.patch} (100%)
 rename patches/server/{0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch => 0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch} (100%)
 rename patches/server/{0527-Add-bypass-host-check.patch => 0526-Add-bypass-host-check.patch} (100%)
 rename patches/server/{0528-Set-area-affect-cloud-rotation.patch => 0527-Set-area-affect-cloud-rotation.patch} (100%)
 rename patches/server/{0529-add-isDeeplySleeping-to-HumanEntity.patch => 0528-add-isDeeplySleeping-to-HumanEntity.patch} (100%)
 rename patches/server/{0530-add-consumeFuel-to-FurnaceBurnEvent.patch => 0529-add-consumeFuel-to-FurnaceBurnEvent.patch} (100%)
 rename patches/server/{0531-add-get-set-drop-chance-to-EntityEquipment.patch => 0530-add-get-set-drop-chance-to-EntityEquipment.patch} (100%)
 rename patches/server/{0532-fix-PigZombieAngerEvent-cancellation.patch => 0531-fix-PigZombieAngerEvent-cancellation.patch} (100%)
 rename patches/server/{0533-fix-PlayerItemHeldEvent-firing-twice.patch => 0532-fix-PlayerItemHeldEvent-firing-twice.patch} (100%)
 rename patches/server/{0534-Add-PlayerDeepSleepEvent.patch => 0533-Add-PlayerDeepSleepEvent.patch} (100%)
 rename patches/server/{0535-More-World-API.patch => 0534-More-World-API.patch} (100%)
 rename patches/server/{0536-Add-PlayerBedFailEnterEvent.patch => 0535-Add-PlayerBedFailEnterEvent.patch} (100%)
 rename patches/server/{0537-Implement-methods-to-convert-between-Component-and-B.patch => 0536-Implement-methods-to-convert-between-Component-and-B.patch} (100%)
 rename patches/server/{0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch => 0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch} (100%)
 rename patches/server/{0539-Introduce-beacon-activation-deactivation-events.patch => 0538-Introduce-beacon-activation-deactivation-events.patch} (100%)
 rename patches/server/{0540-Add-Channel-initialization-listeners.patch => 0539-Add-Channel-initialization-listeners.patch} (100%)
 rename patches/server/{0541-Send-empty-commands-if-tab-completion-is-disabled.patch => 0540-Send-empty-commands-if-tab-completion-is-disabled.patch} (100%)
 rename patches/server/{0542-Add-more-WanderingTrader-API.patch => 0541-Add-more-WanderingTrader-API.patch} (100%)
 rename patches/server/{0543-Add-EntityBlockStorage-clearEntities.patch => 0542-Add-EntityBlockStorage-clearEntities.patch} (100%)
 rename patches/server/{0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch => 0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch} (100%)
 rename patches/server/{0545-Add-HiddenPotionEffect-API.patch => 0544-Add-HiddenPotionEffect-API.patch} (100%)
 rename patches/server/{0546-Inventory-close.patch => 0545-Inventory-close.patch} (100%)
 rename patches/server/{0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch => 0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch} (100%)
 rename patches/server/{0548-Add-basic-Datapack-API.patch => 0547-Add-basic-Datapack-API.patch} (100%)
 rename patches/server/{0549-Add-environment-variable-to-disable-server-gui.patch => 0548-Add-environment-variable-to-disable-server-gui.patch} (100%)
 rename patches/server/{0550-Expand-PlayerGameModeChangeEvent.patch => 0549-Expand-PlayerGameModeChangeEvent.patch} (100%)
 rename patches/server/{0551-ItemStack-repair-check-API.patch => 0550-ItemStack-repair-check-API.patch} (92%)
 rename patches/server/{0552-More-Enchantment-API.patch => 0551-More-Enchantment-API.patch} (100%)
 rename patches/server/{0553-Move-range-check-for-block-placing-up.patch => 0552-Move-range-check-for-block-placing-up.patch} (100%)
 rename patches/server/{0554-Add-Mob-lookAt-API.patch => 0553-Add-Mob-lookAt-API.patch} (100%)
 rename patches/server/{0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch => 0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch} (100%)
 rename patches/server/{0556-Add-Unix-domain-socket-support.patch => 0555-Add-Unix-domain-socket-support.patch} (100%)
 rename patches/server/{0557-Add-EntityInsideBlockEvent.patch => 0556-Add-EntityInsideBlockEvent.patch} (100%)
 rename patches/server/{0558-Fix-item-default-attributes-API.patch => 0557-Fix-item-default-attributes-API.patch} (95%)
 rename patches/server/{0559-Add-cause-to-Weather-ThunderChangeEvents.patch => 0558-Add-cause-to-Weather-ThunderChangeEvents.patch} (100%)
 rename patches/server/{0560-More-Lidded-Block-API.patch => 0559-More-Lidded-Block-API.patch} (100%)
 rename patches/server/{0561-Limit-item-frame-cursors-on-maps.patch => 0560-Limit-item-frame-cursors-on-maps.patch} (100%)
 rename patches/server/{0562-Add-PlayerKickEvent-causes.patch => 0561-Add-PlayerKickEvent-causes.patch} (100%)
 rename patches/server/{0563-Add-PufferFishStateChangeEvent.patch => 0562-Add-PufferFishStateChangeEvent.patch} (100%)
 rename patches/server/{0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch => 0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch} (100%)
 rename patches/server/{0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch => 0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch} (100%)
 rename patches/server/{0566-Add-option-to-fix-items-merging-through-walls.patch => 0565-Add-option-to-fix-items-merging-through-walls.patch} (100%)
 rename patches/server/{0567-Add-BellRevealRaiderEvent.patch => 0566-Add-BellRevealRaiderEvent.patch} (100%)
 rename patches/server/{0568-Fix-invulnerable-end-crystals.patch => 0567-Fix-invulnerable-end-crystals.patch} (100%)
 rename patches/server/{0569-Add-ElderGuardianAppearanceEvent.patch => 0568-Add-ElderGuardianAppearanceEvent.patch} (100%)
 rename patches/server/{0570-Fix-dangerous-end-portal-logic.patch => 0569-Fix-dangerous-end-portal-logic.patch} (100%)
 rename patches/server/{0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch => 0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch} (100%)
 rename patches/server/{0572-Line-Of-Sight-Changes.patch => 0571-Line-Of-Sight-Changes.patch} (100%)
 rename patches/server/{0573-add-per-world-spawn-limits.patch => 0572-add-per-world-spawn-limits.patch} (100%)
 rename patches/server/{0574-Fix-potions-splash-events.patch => 0573-Fix-potions-splash-events.patch} (100%)
 rename patches/server/{0575-Add-more-LimitedRegion-API.patch => 0574-Add-more-LimitedRegion-API.patch} (100%)
 rename patches/server/{0576-Fix-PlayerDropItemEvent-using-wrong-item.patch => 0575-Fix-PlayerDropItemEvent-using-wrong-item.patch} (100%)
 rename patches/server/{0577-Missing-Entity-API.patch => 0576-Missing-Entity-API.patch} (100%)
 rename patches/server/{0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch => 0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch} (100%)
 rename patches/server/{0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch => 0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch} (100%)
 rename patches/server/{0580-Use-getChunkIfLoadedImmediately-in-places.patch => 0579-Use-getChunkIfLoadedImmediately-in-places.patch} (100%)
 rename patches/server/{0581-Fix-commands-from-signs-not-firing-command-events.patch => 0580-Fix-commands-from-signs-not-firing-command-events.patch} (100%)
 rename patches/server/{0582-Add-PlayerArmSwingEvent.patch => 0581-Add-PlayerArmSwingEvent.patch} (100%)
 rename patches/server/{0583-Fix-kick-event-leave-message-not-being-sent.patch => 0582-Fix-kick-event-leave-message-not-being-sent.patch} (100%)
 rename patches/server/{0584-Don-t-apply-cramming-damage-to-players.patch => 0583-Don-t-apply-cramming-damage-to-players.patch} (100%)
 rename patches/server/{0585-Rate-options-and-timings-for-sensors-and-behaviors.patch => 0584-Rate-options-and-timings-for-sensors-and-behaviors.patch} (100%)
 rename patches/server/{0586-Add-missing-forceDrop-toggles.patch => 0585-Add-missing-forceDrop-toggles.patch} (100%)
 rename patches/server/{0587-Stinger-API.patch => 0586-Stinger-API.patch} (100%)
 rename patches/server/{0588-Add-System.out-err-catcher.patch => 0587-Add-System.out-err-catcher.patch} (100%)
 rename patches/server/{0589-Prevent-AFK-kick-while-watching-end-credits.patch => 0588-Prevent-AFK-kick-while-watching-end-credits.patch} (100%)
 rename patches/server/{0590-Allow-skipping-writing-of-comments-to-server.propert.patch => 0589-Allow-skipping-writing-of-comments-to-server.propert.patch} (100%)
 rename patches/server/{0591-Add-PlayerSetSpawnEvent.patch => 0590-Add-PlayerSetSpawnEvent.patch} (100%)
 rename patches/server/{0592-Make-hoppers-respect-inventory-max-stack-size.patch => 0591-Make-hoppers-respect-inventory-max-stack-size.patch} (100%)
 rename patches/server/{0593-Optimize-entity-tracker-passenger-checks.patch => 0592-Optimize-entity-tracker-passenger-checks.patch} (100%)
 rename patches/server/{0594-Config-option-for-Piglins-guarding-chests.patch => 0593-Config-option-for-Piglins-guarding-chests.patch} (100%)
 rename patches/server/{0595-Add-EntityDamageItemEvent.patch => 0594-Add-EntityDamageItemEvent.patch} (100%)
 rename patches/server/{0596-Optimize-indirect-passenger-iteration.patch => 0595-Optimize-indirect-passenger-iteration.patch} (100%)
 rename patches/server/{0597-Configurable-item-frame-map-cursor-update-interval.patch => 0596-Configurable-item-frame-map-cursor-update-interval.patch} (100%)
 rename patches/server/{0598-Clear-bucket-NBT-after-dispense.patch => 0597-Clear-bucket-NBT-after-dispense.patch} (100%)
 rename patches/server/{0599-Change-EnderEye-target-without-changing-other-things.patch => 0598-Change-EnderEye-target-without-changing-other-things.patch} (100%)
 rename patches/server/{0600-Add-BlockBreakBlockEvent.patch => 0599-Add-BlockBreakBlockEvent.patch} (100%)
 rename patches/server/{0601-Option-to-prevent-data-components-copy-in-smithing-r.patch => 0600-Option-to-prevent-data-components-copy-in-smithing-r.patch} (100%)
 rename patches/server/{0602-More-CommandBlock-API.patch => 0601-More-CommandBlock-API.patch} (100%)
 rename patches/server/{0603-Add-missing-team-sidebar-display-slots.patch => 0602-Add-missing-team-sidebar-display-slots.patch} (100%)
 rename patches/server/{0604-Add-back-EntityPortalExitEvent.patch => 0603-Add-back-EntityPortalExitEvent.patch} (100%)
 rename patches/server/{0605-Add-methods-to-find-targets-for-lightning-strikes.patch => 0604-Add-methods-to-find-targets-for-lightning-strikes.patch} (100%)
 rename patches/server/{0606-Get-entity-default-attributes.patch => 0605-Get-entity-default-attributes.patch} (95%)
 rename patches/server/{0607-Left-handed-API.patch => 0606-Left-handed-API.patch} (100%)
 rename patches/server/{0608-Add-more-advancement-API.patch => 0607-Add-more-advancement-API.patch} (100%)
 rename patches/server/{0609-Add-ItemFactory-getSpawnEgg-API.patch => 0608-Add-ItemFactory-getSpawnEgg-API.patch} (100%)
 rename patches/server/{0610-Add-critical-damage-API.patch => 0609-Add-critical-damage-API.patch} (100%)
 rename patches/server/{0611-Fix-issues-with-mob-conversion.patch => 0610-Fix-issues-with-mob-conversion.patch} (100%)
 rename patches/server/{0612-Add-isCollidable-methods-to-various-places.patch => 0611-Add-isCollidable-methods-to-various-places.patch} (94%)
 rename patches/server/{0613-Goat-ram-API.patch => 0612-Goat-ram-API.patch} (100%)
 rename patches/server/{0614-Add-API-for-resetting-a-single-score.patch => 0613-Add-API-for-resetting-a-single-score.patch} (100%)
 rename patches/server/{0615-Add-Raw-Byte-Entity-Serialization.patch => 0614-Add-Raw-Byte-Entity-Serialization.patch} (98%)
 rename patches/server/{0616-Vanilla-command-permission-fixes.patch => 0615-Vanilla-command-permission-fixes.patch} (100%)
 rename patches/server/{0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch => 0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch} (100%)
 rename patches/server/{0618-Fix-GameProfileCache-concurrency.patch => 0617-Fix-GameProfileCache-concurrency.patch} (100%)
 rename patches/server/{0619-Improve-and-expand-AsyncCatcher.patch => 0618-Improve-and-expand-AsyncCatcher.patch} (100%)
 rename patches/server/{0620-Add-paper-mobcaps-and-paper-playermobcaps.patch => 0619-Add-paper-mobcaps-and-paper-playermobcaps.patch} (100%)
 rename patches/server/{0621-Sanitize-ResourceLocation-error-logging.patch => 0620-Sanitize-ResourceLocation-error-logging.patch} (100%)
 rename patches/server/{0622-Manually-inline-methods-in-BlockPosition.patch => 0621-Manually-inline-methods-in-BlockPosition.patch} (100%)
 rename patches/server/{0623-Name-craft-scheduler-threads-according-to-the-plugin.patch => 0622-Name-craft-scheduler-threads-according-to-the-plugin.patch} (100%)
 rename patches/server/{0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch => 0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch} (100%)
 rename patches/server/{0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch => 0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch} (100%)
 rename patches/server/{0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch => 0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch} (100%)
 rename patches/server/{0627-Time-scoreboard-search.patch => 0626-Time-scoreboard-search.patch} (100%)
 rename patches/server/{0628-Oprimise-map-impl-for-tracked-players.patch => 0627-Oprimise-map-impl-for-tracked-players.patch} (100%)
 rename patches/server/{0629-Add-missing-InventoryType.patch => 0628-Add-missing-InventoryType.patch} (100%)
 rename patches/server/{0630-Optimise-BlockSoil-nearby-water-lookup.patch => 0629-Optimise-BlockSoil-nearby-water-lookup.patch} (100%)
 rename patches/server/{0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch => 0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch} (100%)
 rename patches/server/{0632-Check-requirement-before-suggesting-root-nodes.patch => 0631-Check-requirement-before-suggesting-root-nodes.patch} (100%)
 rename patches/server/{0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch => 0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch} (100%)
 rename patches/server/{0634-Add-packet-limiter-config.patch => 0633-Add-packet-limiter-config.patch} (100%)
 rename patches/server/{0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch => 0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch} (100%)
 rename patches/server/{0636-Ensure-valid-vehicle-status.patch => 0635-Ensure-valid-vehicle-status.patch} (100%)
 rename patches/server/{0637-Prevent-softlocked-end-exit-portal-generation.patch => 0636-Prevent-softlocked-end-exit-portal-generation.patch} (100%)
 rename patches/server/{0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch => 0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch} (100%)
 rename patches/server/{0639-Don-t-log-debug-logging-being-disabled.patch => 0638-Don-t-log-debug-logging-being-disabled.patch} (100%)
 rename patches/server/{0640-fix-various-menus-with-empty-level-accesses.patch => 0639-fix-various-menus-with-empty-level-accesses.patch} (100%)
 rename patches/server/{0641-Preserve-overstacked-loot.patch => 0640-Preserve-overstacked-loot.patch} (100%)
 rename patches/server/{0642-Update-head-rotation-in-missing-places.patch => 0641-Update-head-rotation-in-missing-places.patch} (100%)
 rename patches/server/{0643-prevent-unintended-light-block-manipulation.patch => 0642-prevent-unintended-light-block-manipulation.patch} (100%)
 rename patches/server/{0644-Fix-CraftCriteria-defaults-map.patch => 0643-Fix-CraftCriteria-defaults-map.patch} (100%)
 rename patches/server/{0645-Fix-upstreams-block-state-factories.patch => 0644-Fix-upstreams-block-state-factories.patch} (100%)
 rename patches/server/{0646-Configurable-feature-seeds.patch => 0645-Configurable-feature-seeds.patch} (100%)
 rename patches/server/{0647-Add-root-admin-user-detection.patch => 0646-Add-root-admin-user-detection.patch} (100%)
 rename patches/server/{0648-don-t-attempt-to-teleport-dead-entities.patch => 0647-don-t-attempt-to-teleport-dead-entities.patch} (100%)
 rename patches/server/{0649-Prevent-excessive-velocity-through-repeated-crits.patch => 0648-Prevent-excessive-velocity-through-repeated-crits.patch} (100%)
 rename patches/server/{0650-Remove-client-side-code-using-deprecated-for-removal.patch => 0649-Remove-client-side-code-using-deprecated-for-removal.patch} (100%)
 rename patches/server/{0651-Fix-Spigot-growth-modifiers.patch => 0650-Fix-Spigot-growth-modifiers.patch} (100%)
 rename patches/server/{0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch => 0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch} (100%)
 rename patches/server/{0653-Add-PlayerItemFrameChangeEvent.patch => 0652-Add-PlayerItemFrameChangeEvent.patch} (100%)
 rename patches/server/{0654-Optimize-HashMapPalette.patch => 0653-Optimize-HashMapPalette.patch} (100%)
 rename patches/server/{0655-Allow-delegation-to-vanilla-chunk-gen.patch => 0654-Allow-delegation-to-vanilla-chunk-gen.patch} (100%)
 rename patches/server/{0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch => 0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch} (100%)
 rename patches/server/{0657-Add-more-Campfire-API.patch => 0656-Add-more-Campfire-API.patch} (100%)
 rename patches/server/{0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch => 0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch} (100%)
 rename patches/server/{0659-Forward-CraftEntity-in-teleport-command.patch => 0658-Forward-CraftEntity-in-teleport-command.patch} (100%)
 rename patches/server/{0660-Improve-scoreboard-entries.patch => 0659-Improve-scoreboard-entries.patch} (100%)
 rename patches/server/{0661-Entity-powdered-snow-API.patch => 0660-Entity-powdered-snow-API.patch} (100%)
 rename patches/server/{0662-Add-API-for-item-entity-health.patch => 0661-Add-API-for-item-entity-health.patch} (100%)
 rename patches/server/{0663-Configurable-max-block-light-for-monster-spawning.patch => 0662-Configurable-max-block-light-for-monster-spawning.patch} (100%)
 rename patches/server/{0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch => 0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch} (100%)
 rename patches/server/{0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch => 0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch} (100%)
 rename patches/server/{0666-Bucketable-API.patch => 0665-Bucketable-API.patch} (100%)
 rename patches/server/{0667-Validate-usernames.patch => 0666-Validate-usernames.patch} (100%)
 rename patches/server/{0668-Make-water-animal-spawn-height-configurable.patch => 0667-Make-water-animal-spawn-height-configurable.patch} (100%)
 rename patches/server/{0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch => 0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch} (100%)
 rename patches/server/{0670-Add-config-option-for-worlds-affected-by-time-cmd.patch => 0669-Add-config-option-for-worlds-affected-by-time-cmd.patch} (100%)
 rename patches/server/{0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch => 0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch} (100%)
 rename patches/server/{0672-Multiple-Entries-with-Scoreboards.patch => 0671-Multiple-Entries-with-Scoreboards.patch} (100%)
 rename patches/server/{0673-Reset-placed-block-on-exception.patch => 0672-Reset-placed-block-on-exception.patch} (100%)
 rename patches/server/{0674-Add-configurable-height-for-slime-spawn.patch => 0673-Add-configurable-height-for-slime-spawn.patch} (100%)
 rename patches/server/{0675-Fix-xp-reward-for-baby-zombies.patch => 0674-Fix-xp-reward-for-baby-zombies.patch} (100%)
 rename patches/server/{0676-Multi-Block-Change-API-Implementation.patch => 0675-Multi-Block-Change-API-Implementation.patch} (100%)
 rename patches/server/{0677-Fix-NotePlayEvent.patch => 0676-Fix-NotePlayEvent.patch} (100%)
 rename patches/server/{0678-Freeze-Tick-Lock-API.patch => 0677-Freeze-Tick-Lock-API.patch} (100%)
 rename patches/server/{0679-More-PotionEffectType-API.patch => 0678-More-PotionEffectType-API.patch} (100%)
 rename patches/server/{0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch => 0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch} (100%)
 rename patches/server/{0681-API-for-creating-command-sender-which-forwards-feedb.patch => 0680-API-for-creating-command-sender-which-forwards-feedb.patch} (100%)
 rename patches/server/{0682-Add-missing-structure-set-seed-configs.patch => 0681-Add-missing-structure-set-seed-configs.patch} (100%)
 rename patches/server/{0683-Implement-regenerateChunk.patch => 0682-Implement-regenerateChunk.patch} (100%)
 rename patches/server/{0684-Fix-cancelled-powdered-snow-bucket-placement.patch => 0683-Fix-cancelled-powdered-snow-bucket-placement.patch} (100%)
 rename patches/server/{0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch => 0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch} (100%)
 rename patches/server/{0686-Add-GameEvent-tags.patch => 0685-Add-GameEvent-tags.patch} (100%)
 rename patches/server/{0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch => 0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch} (100%)
 rename patches/server/{0688-Furnace-RecipesUsed-API.patch => 0687-Furnace-RecipesUsed-API.patch} (100%)
 rename patches/server/{0689-Configurable-sculk-sensor-listener-range.patch => 0688-Configurable-sculk-sensor-listener-range.patch} (100%)
 rename patches/server/{0690-Add-missing-block-data-mins-and-maxes.patch => 0689-Add-missing-block-data-mins-and-maxes.patch} (100%)
 rename patches/server/{0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch => 0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch} (100%)
 rename patches/server/{0692-Put-world-into-worldlist-before-initing-the-world.patch => 0691-Put-world-into-worldlist-before-initing-the-world.patch} (100%)
 rename patches/server/{0693-Fix-Entity-Position-Desync.patch => 0692-Fix-Entity-Position-Desync.patch} (100%)
 rename patches/server/{0694-Custom-Potion-Mixes.patch => 0693-Custom-Potion-Mixes.patch} (100%)
 rename patches/server/{0695-Force-close-world-loading-screen.patch => 0694-Force-close-world-loading-screen.patch} (100%)
 rename patches/server/{0696-Fix-falling-block-spawn-methods.patch => 0695-Fix-falling-block-spawn-methods.patch} (100%)
 rename patches/server/{0697-Expose-furnace-minecart-push-values.patch => 0696-Expose-furnace-minecart-push-values.patch} (100%)
 rename patches/server/{0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch => 0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch} (100%)
 rename patches/server/{0699-More-Projectile-API.patch => 0698-More-Projectile-API.patch} (100%)
 rename patches/server/{0700-Fix-swamp-hut-cat-generation-deadlock.patch => 0699-Fix-swamp-hut-cat-generation-deadlock.patch} (100%)
 rename patches/server/{0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch => 0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch} (100%)
 rename patches/server/{0702-Implement-getComputedBiome-API.patch => 0701-Implement-getComputedBiome-API.patch} (100%)
 rename patches/server/{0703-Make-some-itemstacks-nonnull.patch => 0702-Make-some-itemstacks-nonnull.patch} (100%)
 rename patches/server/{0704-Implement-enchantWithLevels-API.patch => 0703-Implement-enchantWithLevels-API.patch} (100%)
 rename patches/server/{0705-Fix-saving-in-unloadWorld.patch => 0704-Fix-saving-in-unloadWorld.patch} (100%)
 rename patches/server/{0706-Buffer-OOB-setBlock-calls.patch => 0705-Buffer-OOB-setBlock-calls.patch} (100%)
 rename patches/server/{0707-Add-TameableDeathMessageEvent.patch => 0706-Add-TameableDeathMessageEvent.patch} (100%)
 rename patches/server/{0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch => 0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch} (100%)
 rename patches/server/{0709-fix-player-loottables-running-when-mob-loot-gamerule.patch => 0708-fix-player-loottables-running-when-mob-loot-gamerule.patch} (100%)
 rename patches/server/{0710-Ensure-entity-passenger-world-matches-ridden-entity.patch => 0709-Ensure-entity-passenger-world-matches-ridden-entity.patch} (100%)
 rename patches/server/{0711-cache-resource-keys.patch => 0710-cache-resource-keys.patch} (100%)
 rename patches/server/{0712-Allow-changing-the-EnderDragon-podium.patch => 0711-Allow-changing-the-EnderDragon-podium.patch} (100%)
 rename patches/server/{0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch => 0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch} (100%)
 rename patches/server/{0714-Prevent-tile-entity-copies-loading-chunks.patch => 0713-Prevent-tile-entity-copies-loading-chunks.patch} (100%)
 rename patches/server/{0715-Use-username-instead-of-display-name-in-PlayerList-g.patch => 0714-Use-username-instead-of-display-name-in-PlayerList-g.patch} (100%)
 rename patches/server/{0716-Expand-PlayerItemDamageEvent.patch => 0715-Expand-PlayerItemDamageEvent.patch} (100%)
 rename patches/server/{0717-WorldCreator-keepSpawnLoaded.patch => 0716-WorldCreator-keepSpawnLoaded.patch} (100%)
 rename patches/server/{0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch => 0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch} (100%)
 rename patches/server/{0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch => 0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch} (100%)
 rename patches/server/{0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch => 0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch} (100%)
 rename patches/server/{0721-Fire-CauldronLevelChange-on-initial-fill.patch => 0720-Fire-CauldronLevelChange-on-initial-fill.patch} (100%)
 rename patches/server/{0722-fix-powder-snow-cauldrons-not-turning-to-water.patch => 0721-fix-powder-snow-cauldrons-not-turning-to-water.patch} (100%)
 rename patches/server/{0723-Add-PlayerStopUsingItemEvent.patch => 0722-Add-PlayerStopUsingItemEvent.patch} (100%)
 rename patches/server/{0724-Don-t-tick-markers.patch => 0723-Don-t-tick-markers.patch} (100%)
 rename patches/server/{0725-Expand-FallingBlock-API.patch => 0724-Expand-FallingBlock-API.patch} (100%)
 rename patches/server/{0726-Add-support-for-Proxy-Protocol.patch => 0725-Add-support-for-Proxy-Protocol.patch} (100%)
 rename patches/server/{0727-Fix-OfflinePlayer-getBedSpawnLocation.patch => 0726-Fix-OfflinePlayer-getBedSpawnLocation.patch} (100%)
 rename patches/server/{0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch => 0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch} (100%)
 rename patches/server/{0729-Sanitize-sent-BlockEntity-NBT.patch => 0728-Sanitize-sent-BlockEntity-NBT.patch} (100%)
 rename patches/server/{0730-Disable-component-selector-resolving-in-books-by-def.patch => 0729-Disable-component-selector-resolving-in-books-by-def.patch} (100%)
 rename patches/server/{0731-Prevent-entity-loading-causing-async-lookups.patch => 0730-Prevent-entity-loading-causing-async-lookups.patch} (100%)
 rename patches/server/{0732-Throw-exception-on-world-create-while-being-ticked.patch => 0731-Throw-exception-on-world-create-while-being-ticked.patch} (100%)
 rename patches/server/{0733-Dont-resent-entity-on-art-update.patch => 0732-Dont-resent-entity-on-art-update.patch} (100%)
 rename patches/server/{0734-Add-WardenAngerChangeEvent.patch => 0733-Add-WardenAngerChangeEvent.patch} (100%)
 rename patches/server/{0735-Add-option-for-strict-advancement-dimension-checks.patch => 0734-Add-option-for-strict-advancement-dimension-checks.patch} (100%)
 rename patches/server/{0736-Add-missing-important-BlockStateListPopulator-method.patch => 0735-Add-missing-important-BlockStateListPopulator-method.patch} (100%)
 rename patches/server/{0737-Nameable-Banner-API.patch => 0736-Nameable-Banner-API.patch} (100%)
 rename patches/server/{0738-Don-t-broadcast-messages-to-command-blocks.patch => 0737-Don-t-broadcast-messages-to-command-blocks.patch} (100%)
 rename patches/server/{0739-Prevent-empty-items-from-being-added-to-world.patch => 0738-Prevent-empty-items-from-being-added-to-world.patch} (100%)
 rename patches/server/{0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch => 0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch} (100%)
 rename patches/server/{0741-Add-Player-getFishHook.patch => 0740-Add-Player-getFishHook.patch} (100%)
 rename patches/server/{0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch => 0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch} (100%)
 rename patches/server/{0743-Add-various-missing-EntityDropItemEvent-calls.patch => 0742-Add-various-missing-EntityDropItemEvent-calls.patch} (100%)
 rename patches/server/{0744-Fix-Bee-flower-NPE.patch => 0743-Fix-Bee-flower-NPE.patch} (100%)
 rename patches/server/{0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch => 0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch} (100%)
 rename patches/server/{0746-More-Teleport-API.patch => 0745-More-Teleport-API.patch} (100%)
 rename patches/server/{0747-Add-EntityPortalReadyEvent.patch => 0746-Add-EntityPortalReadyEvent.patch} (100%)
 rename patches/server/{0748-Don-t-use-level-random-in-entity-constructors.patch => 0747-Don-t-use-level-random-in-entity-constructors.patch} (100%)
 rename patches/server/{0749-Send-block-entities-after-destroy-prediction.patch => 0748-Send-block-entities-after-destroy-prediction.patch} (100%)
 rename patches/server/{0750-Warn-on-plugins-accessing-faraway-chunks.patch => 0749-Warn-on-plugins-accessing-faraway-chunks.patch} (100%)
 rename patches/server/{0751-Custom-Chat-Completion-Suggestions-API.patch => 0750-Custom-Chat-Completion-Suggestions-API.patch} (100%)
 rename patches/server/{0752-Add-and-fix-missing-BlockFadeEvents.patch => 0751-Add-and-fix-missing-BlockFadeEvents.patch} (100%)
 rename patches/server/{0753-Collision-API.patch => 0752-Collision-API.patch} (100%)
 rename patches/server/{0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch => 0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch} (100%)
 rename patches/server/{0755-Block-Ticking-API.patch => 0754-Block-Ticking-API.patch} (100%)
 rename patches/server/{0756-Add-Velocity-IP-Forwarding-Support.patch => 0755-Add-Velocity-IP-Forwarding-Support.patch} (100%)
 rename patches/server/{0757-Add-NamespacedKey-biome-methods.patch => 0756-Add-NamespacedKey-biome-methods.patch} (92%)
 rename patches/server/{0758-Fix-plugin-loggers-on-server-shutdown.patch => 0757-Fix-plugin-loggers-on-server-shutdown.patch} (100%)
 rename patches/server/{0759-Stop-large-look-changes-from-crashing-the-server.patch => 0758-Stop-large-look-changes-from-crashing-the-server.patch} (100%)
 rename patches/server/{0760-Fire-EntityChangeBlockEvent-in-more-places.patch => 0759-Fire-EntityChangeBlockEvent-in-more-places.patch} (100%)
 rename patches/server/{0761-Missing-eating-regain-reason.patch => 0760-Missing-eating-regain-reason.patch} (100%)
 rename patches/server/{0762-Missing-effect-cause.patch => 0761-Missing-effect-cause.patch} (100%)
 rename patches/server/{0763-Added-byte-array-serialization-deserialization-for-P.patch => 0762-Added-byte-array-serialization-deserialization-for-P.patch} (100%)
 rename patches/server/{0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch => 0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch} (100%)
 rename patches/server/{0765-Call-BlockPhysicsEvent-more-often.patch => 0764-Call-BlockPhysicsEvent-more-often.patch} (100%)
 rename patches/server/{0766-Configurable-chat-thread-limit.patch => 0765-Configurable-chat-thread-limit.patch} (100%)
 rename patches/server/{0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch => 0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch} (100%)
 rename patches/server/{0768-fix-Jigsaw-block-kicking-user.patch => 0767-fix-Jigsaw-block-kicking-user.patch} (100%)
 rename patches/server/{0769-use-BlockFormEvent-for-mud-converting-into-clay.patch => 0768-use-BlockFormEvent-for-mud-converting-into-clay.patch} (100%)
 rename patches/server/{0770-Add-getDrops-to-BlockState.patch => 0769-Add-getDrops-to-BlockState.patch} (100%)
 rename patches/server/{0771-Fix-a-bunch-of-vanilla-bugs.patch => 0770-Fix-a-bunch-of-vanilla-bugs.patch} (100%)
 rename patches/server/{0772-Remove-unnecessary-onTrackingStart-during-navigation.patch => 0771-Remove-unnecessary-onTrackingStart-during-navigation.patch} (100%)
 rename patches/server/{0773-Fix-custom-piglin-loved-items.patch => 0772-Fix-custom-piglin-loved-items.patch} (100%)
 rename patches/server/{0774-EntityPickupItemEvent-fixes.patch => 0773-EntityPickupItemEvent-fixes.patch} (100%)
 rename patches/server/{0775-Correctly-handle-interactions-with-items-on-cooldown.patch => 0774-Correctly-handle-interactions-with-items-on-cooldown.patch} (100%)
 rename patches/server/{0776-Add-PlayerInventorySlotChangeEvent.patch => 0775-Add-PlayerInventorySlotChangeEvent.patch} (100%)
 rename patches/server/{0777-Elder-Guardian-appearance-API.patch => 0776-Elder-Guardian-appearance-API.patch} (100%)
 rename patches/server/{0778-Allow-changing-bed-s-occupied-property.patch => 0777-Allow-changing-bed-s-occupied-property.patch} (100%)
 rename patches/server/{0779-Add-entity-knockback-API.patch => 0778-Add-entity-knockback-API.patch} (100%)
 rename patches/server/{0780-Detect-headless-JREs.patch => 0779-Detect-headless-JREs.patch} (100%)
 rename patches/server/{0781-fix-entity-vehicle-collision-event-not-called.patch => 0780-fix-entity-vehicle-collision-event-not-called.patch} (100%)
 rename patches/server/{0782-Add-EntityToggleSitEvent.patch => 0781-Add-EntityToggleSitEvent.patch} (100%)
 rename patches/server/{0783-Add-fire-tick-delay-option.patch => 0782-Add-fire-tick-delay-option.patch} (100%)
 rename patches/server/{0784-Add-Moving-Piston-API.patch => 0783-Add-Moving-Piston-API.patch} (100%)
 rename patches/server/{0785-Ignore-impossible-spawn-tick.patch => 0784-Ignore-impossible-spawn-tick.patch} (100%)
 rename patches/server/{0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch => 0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch} (100%)
 rename patches/server/{0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch => 0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch} (100%)
 rename patches/server/{0788-Add-PrePlayerAttackEntityEvent.patch => 0787-Add-PrePlayerAttackEntityEvent.patch} (100%)
 rename patches/server/{0789-ensure-reset-EnderDragon-boss-event-name.patch => 0788-ensure-reset-EnderDragon-boss-event-name.patch} (100%)
 rename patches/server/{0790-fix-MC-252817-green-map-markers-do-not-disappear.patch => 0789-fix-MC-252817-green-map-markers-do-not-disappear.patch} (100%)
 rename patches/server/{0791-Add-Player-Warden-Warning-API.patch => 0790-Add-Player-Warden-Warning-API.patch} (100%)
 rename patches/server/{0792-More-vanilla-friendly-methods-to-update-trades.patch => 0791-More-vanilla-friendly-methods-to-update-trades.patch} (100%)
 rename patches/server/{0793-Add-paper-dumplisteners-command.patch => 0792-Add-paper-dumplisteners-command.patch} (100%)
 rename patches/server/{0794-check-global-player-list-where-appropriate.patch => 0793-check-global-player-list-where-appropriate.patch} (100%)
 rename patches/server/{0795-Fix-async-entity-add-due-to-fungus-trees.patch => 0794-Fix-async-entity-add-due-to-fungus-trees.patch} (100%)
 rename patches/server/{0796-ItemStack-damage-API.patch => 0795-ItemStack-damage-API.patch} (100%)
 rename patches/server/{0797-Friction-API.patch => 0796-Friction-API.patch} (100%)
 rename patches/server/{0798-Ability-to-control-player-s-insomnia-and-phantoms.patch => 0797-Ability-to-control-player-s-insomnia-and-phantoms.patch} (100%)
 rename patches/server/{0799-Fix-premature-player-kicks-on-shutdown.patch => 0798-Fix-premature-player-kicks-on-shutdown.patch} (100%)
 rename patches/server/{0800-Sync-offhand-slot-in-menus.patch => 0799-Sync-offhand-slot-in-menus.patch} (100%)
 rename patches/server/{0801-Player-Entity-Tracking-Events.patch => 0800-Player-Entity-Tracking-Events.patch} (100%)
 rename patches/server/{0802-Limit-pet-look-distance.patch => 0801-Limit-pet-look-distance.patch} (100%)
 rename patches/server/{0803-Fixes-and-additions-to-the-SpawnReason-API.patch => 0802-Fixes-and-additions-to-the-SpawnReason-API.patch} (100%)
 rename patches/server/{0804-fix-Instruments.patch => 0803-fix-Instruments.patch} (100%)
 rename patches/server/{0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch => 0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch} (100%)
 rename patches/server/{0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch => 0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch} (100%)
 rename patches/server/{0807-Add-BlockLockCheckEvent.patch => 0806-Add-BlockLockCheckEvent.patch} (100%)
 rename patches/server/{0808-Add-Sneaking-API-for-Entities.patch => 0807-Add-Sneaking-API-for-Entities.patch} (100%)
 rename patches/server/{0809-Improve-logging-and-errors.patch => 0808-Improve-logging-and-errors.patch} (100%)
 rename patches/server/{0810-Improve-PortalEvents.patch => 0809-Improve-PortalEvents.patch} (100%)
 rename patches/server/{0811-Add-config-option-for-spider-worldborder-climbing.patch => 0810-Add-config-option-for-spider-worldborder-climbing.patch} (100%)
 rename patches/server/{0812-Add-missing-SpigotConfig-logCommands-check.patch => 0811-Add-missing-SpigotConfig-logCommands-check.patch} (100%)
 rename patches/server/{0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch => 0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch} (100%)
 rename patches/server/{0814-Flying-Fall-Damage.patch => 0813-Flying-Fall-Damage.patch} (100%)
 rename patches/server/{0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch => 0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch} (100%)
 rename patches/server/{0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch => 0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch} (100%)
 rename patches/server/{0817-config-for-disabling-entity-tag-tags.patch => 0816-config-for-disabling-entity-tag-tags.patch} (100%)
 rename patches/server/{0818-Use-single-player-info-update-packet-on-join.patch => 0817-Use-single-player-info-update-packet-on-join.patch} (100%)
 rename patches/server/{0819-Correctly-shrink-items-during-EntityResurrectEvent.patch => 0818-Correctly-shrink-items-during-EntityResurrectEvent.patch} (100%)
 rename patches/server/{0820-Win-Screen-API.patch => 0819-Win-Screen-API.patch} (100%)
 rename patches/server/{0821-Remove-CraftItemStack-setAmount-null-assignment.patch => 0820-Remove-CraftItemStack-setAmount-null-assignment.patch} (100%)
 rename patches/server/{0822-Fix-force-opening-enchantment-tables.patch => 0821-Fix-force-opening-enchantment-tables.patch} (100%)
 rename patches/server/{0823-Add-Entity-Body-Yaw-API.patch => 0822-Add-Entity-Body-Yaw-API.patch} (100%)
 rename patches/server/{0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch => 0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch} (100%)
 rename patches/server/{0825-Add-EntityFertilizeEggEvent.patch => 0824-Add-EntityFertilizeEggEvent.patch} (100%)
 rename patches/server/{0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch => 0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch} (100%)
 rename patches/server/{0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch => 0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch} (100%)
 rename patches/server/{0828-Correctly-handle-ArmorStand-invisibility.patch => 0827-Correctly-handle-ArmorStand-invisibility.patch} (100%)
 rename patches/server/{0829-Fix-advancement-triggers-for-entity-damage.patch => 0828-Fix-advancement-triggers-for-entity-damage.patch} (100%)
 rename patches/server/{0830-Fix-text-display-error-on-spawn.patch => 0829-Fix-text-display-error-on-spawn.patch} (100%)
 rename patches/server/{0831-Fix-inventories-returning-null-Locations.patch => 0830-Fix-inventories-returning-null-Locations.patch} (100%)
 rename patches/server/{0832-Add-Shearable-API.patch => 0831-Add-Shearable-API.patch} (100%)
 rename patches/server/{0833-Fix-SpawnEggMeta-get-setSpawnedType.patch => 0832-Fix-SpawnEggMeta-get-setSpawnedType.patch} (100%)
 rename patches/server/{0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch => 0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch} (100%)
 rename patches/server/{0835-Treat-sequence-violations-like-they-should-be.patch => 0834-Treat-sequence-violations-like-they-should-be.patch} (100%)
 rename patches/server/{0836-remove-duplicate-animate-packet-for-records.patch => 0835-remove-duplicate-animate-packet-for-records.patch} (100%)
 rename patches/server/{0837-Prevent-causing-expired-keys-from-impacting-new-join.patch => 0836-Prevent-causing-expired-keys-from-impacting-new-join.patch} (100%)
 rename patches/server/{0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch => 0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch} (100%)
 rename patches/server/{0839-Use-array-for-gamerule-storage.patch => 0838-Use-array-for-gamerule-storage.patch} (100%)
 rename patches/server/{0840-Fix-a-couple-of-upstream-bed-issues.patch => 0839-Fix-a-couple-of-upstream-bed-issues.patch} (100%)
 rename patches/server/{0841-Fix-demo-flag-not-enabling-demo-mode.patch => 0840-Fix-demo-flag-not-enabling-demo-mode.patch} (100%)
 rename patches/server/{0842-Add-Mob-Experience-reward-API.patch => 0841-Add-Mob-Experience-reward-API.patch} (100%)
 rename patches/server/{0843-Break-redstone-on-top-of-trap-doors-early.patch => 0842-Break-redstone-on-top-of-trap-doors-early.patch} (100%)
 rename patches/server/{0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch => 0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch} (100%)
 rename patches/server/{0845-More-accurate-isInOpenWater-impl.patch => 0844-More-accurate-isInOpenWater-impl.patch} (100%)
 rename patches/server/{0846-Expand-PlayerItemMendEvent.patch => 0845-Expand-PlayerItemMendEvent.patch} (100%)
 rename patches/server/{0847-Refresh-ProjectileSource-for-projectiles.patch => 0846-Refresh-ProjectileSource-for-projectiles.patch} (100%)
 rename patches/server/{0848-Add-transient-modifier-API.patch => 0847-Add-transient-modifier-API.patch} (100%)
 rename patches/server/{0849-Fix-block-place-logic.patch => 0848-Fix-block-place-logic.patch} (100%)
 rename patches/server/{0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch => 0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch} (100%)
 rename patches/server/{0851-Call-BlockGrowEvent-for-missing-blocks.patch => 0850-Call-BlockGrowEvent-for-missing-blocks.patch} (100%)
 rename patches/server/{0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch => 0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch} (100%)
 rename patches/server/{0853-fix-MapLike-spam-for-missing-key-selector.patch => 0852-fix-MapLike-spam-for-missing-key-selector.patch} (100%)
 rename patches/server/{0854-Fix-sniffer-removeExploredLocation.patch => 0853-Fix-sniffer-removeExploredLocation.patch} (100%)
 rename patches/server/{0855-Add-method-to-remove-all-active-potion-effects.patch => 0854-Add-method-to-remove-all-active-potion-effects.patch} (100%)
 rename patches/server/{0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch => 0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch} (100%)
 rename patches/server/{0857-Add-event-for-player-editing-sign.patch => 0856-Add-event-for-player-editing-sign.patch} (100%)
 rename patches/server/{0858-Only-tick-item-frames-if-players-can-see-it.patch => 0857-Only-tick-item-frames-if-players-can-see-it.patch} (100%)
 rename patches/server/{0859-Fix-cmd-permission-levels-for-command-blocks.patch => 0858-Fix-cmd-permission-levels-for-command-blocks.patch} (100%)
 rename patches/server/{0860-Add-option-to-disable-block-updates.patch => 0859-Add-option-to-disable-block-updates.patch} (100%)
 rename patches/server/{0861-Call-missing-BlockDispenseEvent.patch => 0860-Call-missing-BlockDispenseEvent.patch} (100%)
 rename patches/server/{0862-Don-t-load-chunks-for-supporting-block-checks.patch => 0861-Don-t-load-chunks-for-supporting-block-checks.patch} (100%)
 rename patches/server/{0863-Optimize-player-lookups-for-beacons.patch => 0862-Optimize-player-lookups-for-beacons.patch} (100%)
 rename patches/server/{0864-Add-Sign-getInteractableSideFor.patch => 0863-Add-Sign-getInteractableSideFor.patch} (100%)
 rename patches/server/{0865-fix-item-meta-for-tadpole-buckets.patch => 0864-fix-item-meta-for-tadpole-buckets.patch} (100%)
 rename patches/server/{0866-Fix-BanList-API.patch => 0865-Fix-BanList-API.patch} (100%)
 rename patches/server/{0867-Determine-lava-and-water-fluid-explosion-resistance-.patch => 0866-Determine-lava-and-water-fluid-explosion-resistance-.patch} (100%)
 rename patches/server/{0868-Fix-possible-NPE-on-painting-creation.patch => 0867-Fix-possible-NPE-on-painting-creation.patch} (100%)
 rename patches/server/{0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch => 0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch} (100%)
 rename patches/server/{0870-ExperienceOrb-should-call-EntitySpawnEvent.patch => 0869-ExperienceOrb-should-call-EntitySpawnEvent.patch} (100%)
 rename patches/server/{0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch => 0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch} (100%)
 rename patches/server/{0872-Add-whitelist-events.patch => 0871-Add-whitelist-events.patch} (100%)
 rename patches/server/{0873-Implement-PlayerFailMoveEvent.patch => 0872-Implement-PlayerFailMoveEvent.patch} (100%)
 rename patches/server/{0874-Folia-scheduler-and-owned-region-API.patch => 0873-Folia-scheduler-and-owned-region-API.patch} (100%)
 rename patches/server/{0875-Only-erase-allay-memory-on-non-item-targets.patch => 0874-Only-erase-allay-memory-on-non-item-targets.patch} (100%)
 rename patches/server/{0876-API-for-updating-recipes-on-clients.patch => 0875-API-for-updating-recipes-on-clients.patch} (100%)
 rename patches/server/{0877-Fix-rotation-when-spawning-display-entities.patch => 0876-Fix-rotation-when-spawning-display-entities.patch} (100%)
 rename patches/server/{0878-Only-capture-actual-tree-growth.patch => 0877-Only-capture-actual-tree-growth.patch} (100%)
 rename patches/server/{0879-Use-correct-source-for-mushroom-block-spread-event.patch => 0878-Use-correct-source-for-mushroom-block-spread-event.patch} (100%)
 rename patches/server/{0880-Respect-randomizeData-on-more-entities-when-spawning.patch => 0879-Respect-randomizeData-on-more-entities-when-spawning.patch} (100%)
 rename patches/server/{0881-Use-correct-seed-on-api-world-load.patch => 0880-Use-correct-seed-on-api-world-load.patch} (100%)
 rename patches/server/{0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch => 0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch} (100%)
 rename patches/server/{0883-Cache-map-ids-on-item-frames.patch => 0882-Cache-map-ids-on-item-frames.patch} (100%)
 rename patches/server/{0884-Fix-custom-statistic-criteria-creation.patch => 0883-Fix-custom-statistic-criteria-creation.patch} (88%)
 rename patches/server/{0885-Bandaid-fix-for-Effect.patch => 0884-Bandaid-fix-for-Effect.patch} (100%)
 rename patches/server/{0886-SculkCatalyst-bloom-API.patch => 0885-SculkCatalyst-bloom-API.patch} (100%)
 rename patches/server/{0887-API-for-an-entity-s-scoreboard-name.patch => 0886-API-for-an-entity-s-scoreboard-name.patch} (100%)
 rename patches/server/{0888-Deprecate-and-replace-methods-with-old-StructureType.patch => 0887-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%)
 rename patches/server/{0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch => 0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch} (100%)
 rename patches/server/{0890-Properly-handle-BlockBreakEvent-isDropItems.patch => 0889-Properly-handle-BlockBreakEvent-isDropItems.patch} (100%)
 rename patches/server/{0891-Fire-entity-death-event-for-ender-dragon.patch => 0890-Fire-entity-death-event-for-ender-dragon.patch} (100%)
 rename patches/server/{0892-Configurable-entity-tracking-range-by-Y-coordinate.patch => 0891-Configurable-entity-tracking-range-by-Y-coordinate.patch} (100%)
 rename patches/server/{0893-Add-Listing-API-for-Player.patch => 0892-Add-Listing-API-for-Player.patch} (100%)
 rename patches/server/{0894-Configurable-Region-Compression-Format.patch => 0893-Configurable-Region-Compression-Format.patch} (100%)
 rename patches/server/{0895-Add-BlockFace-to-BlockDamageEvent.patch => 0894-Add-BlockFace-to-BlockDamageEvent.patch} (100%)
 rename patches/server/{0896-Fix-NPE-on-Boat-getStatus.patch => 0895-Fix-NPE-on-Boat-getStatus.patch} (100%)
 rename patches/server/{0897-Expand-Pose-API.patch => 0896-Expand-Pose-API.patch} (100%)
 rename patches/server/{0898-More-DragonBattle-API.patch => 0897-More-DragonBattle-API.patch} (100%)
 rename patches/server/{0899-Add-PlayerPickItemEvent.patch => 0898-Add-PlayerPickItemEvent.patch} (100%)
 rename patches/server/{0900-Allow-trident-custom-damage.patch => 0899-Allow-trident-custom-damage.patch} (100%)
 rename patches/server/{0901-Expose-hand-in-BlockCanBuildEvent.patch => 0900-Expose-hand-in-BlockCanBuildEvent.patch} (100%)
 rename patches/server/{0902-Optimize-nearest-structure-border-iteration.patch => 0901-Optimize-nearest-structure-border-iteration.patch} (100%)
 rename patches/server/{0903-Implement-OfflinePlayer-isConnected.patch => 0902-Implement-OfflinePlayer-isConnected.patch} (100%)
 rename patches/server/{0904-Fix-inventory-desync.patch => 0903-Fix-inventory-desync.patch} (100%)
 rename patches/server/{0905-Add-titleOverride-to-InventoryOpenEvent.patch => 0904-Add-titleOverride-to-InventoryOpenEvent.patch} (100%)
 rename patches/server/{0906-Configure-sniffer-egg-hatch-time.patch => 0905-Configure-sniffer-egg-hatch-time.patch} (100%)
 rename patches/server/{0907-Do-crystal-portal-proximity-check-before-entity-look.patch => 0906-Do-crystal-portal-proximity-check-before-entity-look.patch} (100%)
 rename patches/server/{0908-Skip-POI-finding-if-stuck-in-vehicle.patch => 0907-Skip-POI-finding-if-stuck-in-vehicle.patch} (100%)
 rename patches/server/{0909-Add-slot-sanity-checks-in-container-clicks.patch => 0908-Add-slot-sanity-checks-in-container-clicks.patch} (100%)
 rename patches/server/{0910-Call-BlockRedstoneEvents-for-lecterns.patch => 0909-Call-BlockRedstoneEvents-for-lecterns.patch} (100%)
 rename patches/server/{0911-Allow-proper-checking-of-empty-item-stacks.patch => 0910-Allow-proper-checking-of-empty-item-stacks.patch} (100%)
 rename patches/server/{0912-Fix-silent-equipment-change-for-mobs.patch => 0911-Fix-silent-equipment-change-for-mobs.patch} (100%)
 rename patches/server/{0913-Fix-spigot-s-Forced-Stats.patch => 0912-Fix-spigot-s-Forced-Stats.patch} (100%)
 rename patches/server/{0914-Add-missing-InventoryHolders-to-inventories.patch => 0913-Add-missing-InventoryHolders-to-inventories.patch} (100%)
 rename patches/server/{0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch => 0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch} (100%)
 rename patches/server/{0916-Add-missing-logs-for-log-ips-config-option.patch => 0915-Add-missing-logs-for-log-ips-config-option.patch} (100%)
 rename patches/server/{0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch => 0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch} (100%)
 rename patches/server/{0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch => 0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch} (100%)
 rename patches/server/{0919-Fix-team-sidebar-objectives-not-being-cleared.patch => 0918-Fix-team-sidebar-objectives-not-being-cleared.patch} (100%)
 rename patches/server/{0920-Fix-missing-map-initialize-event-call.patch => 0919-Fix-missing-map-initialize-event-call.patch} (100%)
 rename patches/server/{0921-Update-entity-data-when-attaching-firework-to-entity.patch => 0920-Update-entity-data-when-attaching-firework-to-entity.patch} (100%)
 rename patches/server/{0922-Fix-UnsafeValues-loadAdvancement.patch => 0921-Fix-UnsafeValues-loadAdvancement.patch} (96%)
 rename patches/server/{0923-Add-player-idle-duration-API.patch => 0922-Add-player-idle-duration-API.patch} (100%)
 rename patches/server/{0924-Don-t-check-if-we-can-see-non-visible-entities.patch => 0923-Don-t-check-if-we-can-see-non-visible-entities.patch} (100%)
 rename patches/server/{0925-Fix-NPE-in-SculkBloomEvent-world-access.patch => 0924-Fix-NPE-in-SculkBloomEvent-world-access.patch} (100%)
 rename patches/server/{0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch => 0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch} (100%)
 rename patches/server/{0927-Optimize-VarInts.patch => 0926-Optimize-VarInts.patch} (100%)
 rename patches/server/{0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%)
 rename patches/server/{0929-Add-predicate-for-blocks-when-raytracing.patch => 0928-Add-predicate-for-blocks-when-raytracing.patch} (100%)
 rename patches/server/{0930-Broadcast-take-item-packets-with-collector-as-source.patch => 0929-Broadcast-take-item-packets-with-collector-as-source.patch} (100%)
 rename patches/server/{0931-Expand-LingeringPotion-API.patch => 0930-Expand-LingeringPotion-API.patch} (100%)
 rename patches/server/{0932-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch => 0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch} (100%)
 rename patches/server/{0933-Add-hand-to-fish-event-for-all-player-interactions.patch => 0932-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%)
 rename patches/server/{0934-Fix-several-issues-with-EntityBreedEvent.patch => 0933-Fix-several-issues-with-EntityBreedEvent.patch} (100%)
 rename patches/server/{0935-Add-UUID-attribute-modifier-API.patch => 0934-Add-UUID-attribute-modifier-API.patch} (100%)
 rename patches/server/{0936-Fix-missing-event-call-for-entity-teleport-API.patch => 0935-Fix-missing-event-call-for-entity-teleport-API.patch} (100%)
 rename patches/server/{0937-Lazily-create-LootContext-for-criterions.patch => 0936-Lazily-create-LootContext-for-criterions.patch} (100%)
 rename patches/server/{0938-Don-t-fire-sync-events-during-worldgen.patch => 0937-Don-t-fire-sync-events-during-worldgen.patch} (100%)
 rename patches/server/{0939-Add-Structure-check-API.patch => 0938-Add-Structure-check-API.patch} (100%)
 rename patches/server/{0940-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch => 0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch} (100%)
 rename patches/server/{0941-Restore-vanilla-entity-drops-behavior.patch => 0940-Restore-vanilla-entity-drops-behavior.patch} (100%)
 rename patches/server/{0942-Dont-resend-blocks-on-interactions.patch => 0941-Dont-resend-blocks-on-interactions.patch} (100%)
 rename patches/server/{0943-add-more-scoreboard-API.patch => 0942-add-more-scoreboard-API.patch} (100%)
 rename patches/server/{0944-Improve-Registry.patch => 0943-Improve-Registry.patch} (100%)
 rename patches/server/{0945-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch => 0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch} (100%)
 rename patches/server/{0946-Add-experience-points-API.patch => 0945-Add-experience-points-API.patch} (100%)
 rename patches/server/{0947-Add-drops-to-shear-events.patch => 0946-Add-drops-to-shear-events.patch} (100%)
 rename patches/server/{0948-Add-PlayerShieldDisableEvent.patch => 0947-Add-PlayerShieldDisableEvent.patch} (100%)
 rename patches/server/{0949-Validate-ResourceLocation-in-NBT-reading.patch => 0948-Validate-ResourceLocation-in-NBT-reading.patch} (100%)
 rename patches/server/{0950-Properly-handle-experience-dropping-on-block-break.patch => 0949-Properly-handle-experience-dropping-on-block-break.patch} (100%)
 rename patches/server/{0951-Fixup-NamespacedKey-handling.patch => 0950-Fixup-NamespacedKey-handling.patch} (100%)
 rename patches/server/{0952-Expose-LootTable-of-DecoratedPot.patch => 0951-Expose-LootTable-of-DecoratedPot.patch} (100%)
 rename patches/server/{0953-Reduce-allocation-of-Vec3D-by-entity-tracker.patch => 0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch} (100%)
 rename patches/server/{0954-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch => 0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch} (100%)
 rename patches/server/{0955-Add-ShulkerDuplicateEvent.patch => 0954-Add-ShulkerDuplicateEvent.patch} (100%)
 rename patches/server/{0956-Add-api-for-spawn-egg-texture-colors.patch => 0955-Add-api-for-spawn-egg-texture-colors.patch} (88%)
 rename patches/server/{0957-Add-Lifecycle-Event-system.patch => 0956-Add-Lifecycle-Event-system.patch} (99%)
 rename patches/server/{0958-ItemStack-Tooltip-API.patch => 0957-ItemStack-Tooltip-API.patch} (92%)
 rename patches/server/{0959-Add-getChunkSnapshot-includeLightData-parameter.patch => 0958-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%)
 rename patches/server/{0960-Add-FluidState-API.patch => 0959-Add-FluidState-API.patch} (100%)
 rename patches/server/{0961-add-number-format-api.patch => 0960-add-number-format-api.patch} (100%)
 rename patches/server/{0962-improve-BanList-types.patch => 0961-improve-BanList-types.patch} (100%)
 rename patches/server/{0963-Expanded-Hopper-API.patch => 0962-Expanded-Hopper-API.patch} (100%)
 rename patches/server/{0964-Add-BlockBreakProgressUpdateEvent.patch => 0963-Add-BlockBreakProgressUpdateEvent.patch} (100%)
 rename patches/server/{0965-Deprecate-ItemStack-setType.patch => 0964-Deprecate-ItemStack-setType.patch} (100%)
 rename patches/server/{0966-Add-CartographyItemEvent.patch => 0965-Add-CartographyItemEvent.patch} (100%)
 rename patches/server/{0967-More-Raid-API.patch => 0966-More-Raid-API.patch} (100%)
 rename patches/server/{0968-Add-onboarding-message-for-initial-server-start.patch => 0967-Add-onboarding-message-for-initial-server-start.patch} (100%)
 rename patches/server/{0969-Configurable-max-block-fluid-ticks.patch => 0968-Configurable-max-block-fluid-ticks.patch} (100%)
 rename patches/server/{0970-Fix-bees-aging-inside-hives.patch => 0969-Fix-bees-aging-inside-hives.patch} (100%)
 rename patches/server/{0971-Disable-memory-reserve-allocating.patch => 0970-Disable-memory-reserve-allocating.patch} (100%)
 rename patches/server/{0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch => 0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch} (100%)
 rename patches/server/{0973-Fix-DamageSource-API.patch => 0972-Fix-DamageSource-API.patch} (100%)
 rename patches/server/{0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch => 0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch} (100%)
 rename patches/server/{0975-Fix-possible-StackOverflowError-for-some-dispenses.patch => 0974-Fix-possible-StackOverflowError-for-some-dispenses.patch} (100%)
 rename patches/server/{0976-Improve-tag-parser-handling.patch => 0975-Improve-tag-parser-handling.patch} (100%)
 rename patches/server/{0977-Item-Mutation-Fixes.patch => 0976-Item-Mutation-Fixes.patch} (100%)
 rename patches/server/{0978-Per-world-ticks-per-spawn-settings.patch => 0977-Per-world-ticks-per-spawn-settings.patch} (100%)
 rename patches/server/{0979-Properly-track-the-changed-item-from-dispense-events.patch => 0978-Properly-track-the-changed-item-from-dispense-events.patch} (100%)
 rename patches/server/{0980-Rewrite-dataconverter-system.patch => 0979-Rewrite-dataconverter-system.patch} (99%)
 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-disable-forced-empty-world-ticks.patch => 0982-disable-forced-empty-world-ticks.patch} (100%)
 rename patches/server/{0984-Starlight.patch => 0983-Starlight.patch} (100%)
 rename patches/server/{0985-Rewrite-chunk-system.patch => 0984-Rewrite-chunk-system.patch} (100%)
 rename patches/server/{0986-incremental-chunk-and-player-saving.patch => 0985-incremental-chunk-and-player-saving.patch} (100%)
 rename patches/server/{0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch => 0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch} (100%)
 rename patches/server/{0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch => 0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch} (100%)
 rename patches/server/{0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch => 0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch} (100%)
 rename patches/server/{0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch => 0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch} (100%)
 rename patches/server/{0991-Allow-Saving-of-Oversized-Chunks.patch => 0990-Allow-Saving-of-Oversized-Chunks.patch} (100%)
 rename patches/server/{0992-Fix-World-isChunkGenerated-calls.patch => 0991-Fix-World-isChunkGenerated-calls.patch} (100%)
 rename patches/server/{0993-Flat-bedrock-generator-settings.patch => 0992-Flat-bedrock-generator-settings.patch} (100%)
 rename patches/server/{0994-Entity-Activation-Range-2.0.patch => 0993-Entity-Activation-Range-2.0.patch} (100%)
 rename patches/server/{0995-Optional-per-player-mob-spawns.patch => 0994-Optional-per-player-mob-spawns.patch} (100%)
 rename patches/server/{0996-Anti-Xray.patch => 0995-Anti-Xray.patch} (100%)
 rename patches/server/{0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch => 0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch} (100%)
 rename patches/server/{0998-Optimize-Collision-to-not-load-chunks.patch => 0997-Optimize-Collision-to-not-load-chunks.patch} (100%)
 rename patches/server/{0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch => 0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch} (100%)
 rename patches/server/{1000-Entity-load-save-limit-per-chunk.patch => 0999-Entity-load-save-limit-per-chunk.patch} (100%)
 rename patches/server/{1001-Improved-Watchdog-Support.patch => 1000-Improved-Watchdog-Support.patch} (100%)
 rename patches/server/{1002-Optimize-Voxel-Shape-Merging.patch => 1001-Optimize-Voxel-Shape-Merging.patch} (100%)
 rename patches/server/{1003-Write-SavedData-IO-async.patch => 1002-Write-SavedData-IO-async.patch} (100%)
 rename patches/server/{1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch => 1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch} (100%)
 rename patches/server/{1005-Use-distance-map-to-optimise-entity-tracker.patch => 1004-Use-distance-map-to-optimise-entity-tracker.patch} (100%)
 rename patches/server/{1006-Optimize-Bit-Operations-by-inlining.patch => 1005-Optimize-Bit-Operations-by-inlining.patch} (100%)
 rename patches/server/{1007-Remove-streams-from-hot-code.patch => 1006-Remove-streams-from-hot-code.patch} (100%)
 rename patches/server/{1008-Eigencraft-redstone-implementation.patch => 1007-Eigencraft-redstone-implementation.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-Improve-boat-collision-performance.patch => 1009-Improve-boat-collision-performance.patch} (100%)
 rename patches/server/{1011-Optimise-general-POI-access.patch => 1010-Optimise-general-POI-access.patch} (100%)
 rename patches/server/{1012-Custom-table-implementation-for-blockstate-state-loo.patch => 1011-Custom-table-implementation-for-blockstate-state-loo.patch} (100%)
 rename patches/server/{1013-Execute-chunk-tasks-mid-tick.patch => 1012-Execute-chunk-tasks-mid-tick.patch} (100%)
 rename patches/server/{1014-Optimise-random-block-ticking.patch => 1013-Optimise-random-block-ticking.patch} (100%)
 rename patches/server/{1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch => 1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch} (100%)
 rename patches/server/{1016-Use-Velocity-compression-and-cipher-natives.patch => 1015-Use-Velocity-compression-and-cipher-natives.patch} (100%)
 rename patches/server/{1017-Detail-more-information-in-watchdog-dumps.patch => 1016-Detail-more-information-in-watchdog-dumps.patch} (100%)
 rename patches/server/{1018-Collision-optimisations.patch => 1017-Collision-optimisations.patch} (100%)
 rename patches/server/{1019-Optimise-collision-checking-in-player-move-packet-ha.patch => 1018-Optimise-collision-checking-in-player-move-packet-ha.patch} (100%)
 rename patches/server/{1020-Fix-tripwire-disarming-not-working-as-intended.patch => 1019-Fix-tripwire-disarming-not-working-as-intended.patch} (100%)
 rename patches/server/{1021-Fix-entity-type-tags-suggestions-in-selectors.patch => 1020-Fix-entity-type-tags-suggestions-in-selectors.patch} (100%)
 rename patches/server/{1022-Add-Alternate-Current-redstone-implementation.patch => 1021-Add-Alternate-Current-redstone-implementation.patch} (100%)
 rename patches/server/{1023-optimize-dirt-and-snow-spreading.patch => 1022-optimize-dirt-and-snow-spreading.patch} (100%)
 rename patches/server/{1024-Properly-resend-entities.patch => 1023-Properly-resend-entities.patch} (100%)
 rename patches/server/{1025-Optimize-Hoppers.patch => 1024-Optimize-Hoppers.patch} (100%)
 rename patches/server/{1026-Improve-performance-of-mass-crafts.patch => 1025-Improve-performance-of-mass-crafts.patch} (100%)
 rename patches/server/{1027-Actually-optimise-explosions.patch => 1026-Actually-optimise-explosions.patch} (100%)
 rename patches/server/{1028-Optimise-chunk-tick-iteration.patch => 1027-Optimise-chunk-tick-iteration.patch} (100%)
 rename patches/server/{1029-Lag-compensation-ticks.patch => 1028-Lag-compensation-ticks.patch} (100%)
 rename patches/server/{1030-Optimise-nearby-player-retrieval.patch => 1029-Optimise-nearby-player-retrieval.patch} (100%)
 rename patches/server/{1031-Distance-manager-tick-timings.patch => 1030-Distance-manager-tick-timings.patch} (100%)
 rename patches/server/{1032-Handle-Oversized-block-entities-in-chunks.patch => 1031-Handle-Oversized-block-entities-in-chunks.patch} (100%)
 rename patches/server/{1033-Send-full-pos-packets-for-hard-colliding-entities.patch => 1032-Send-full-pos-packets-for-hard-colliding-entities.patch} (100%)
 rename patches/server/{1034-Fix-and-optimise-world-force-upgrading.patch => 1033-Fix-and-optimise-world-force-upgrading.patch} (100%)
 rename patches/server/{1035-API-for-checking-sent-chunks.patch => 1034-API-for-checking-sent-chunks.patch} (100%)
 rename patches/server/{1036-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch => 1035-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch} (100%)
 rename patches/server/{1037-handle-converting-old-serialized-names-to-new-names.patch => 1036-handle-converting-old-serialized-names-to-new-names.patch} (100%)
 rename patches/server/{1038-Add-config-for-mobs-immune-to-default-effects.patch => 1037-Add-config-for-mobs-immune-to-default-effects.patch} (100%)
 rename patches/server/{1039-Deep-clone-nbt-tags-in-PDC.patch => 1038-Deep-clone-nbt-tags-in-PDC.patch} (100%)

diff --git a/patches/api/0262-Improve-Item-Rarity-API.patch b/patches/api/0262-Improve-Item-Rarity-API.patch
new file mode 100644
index 0000000000..539f61725e
--- /dev/null
+++ b/patches/api/0262-Improve-Item-Rarity-API.patch
@@ -0,0 +1,131 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Fri, 12 Mar 2021 17:09:40 -0800
+Subject: [PATCH] Improve Item Rarity API
+
+
+diff --git a/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..f1cd5a4f37eee8975ac3d0421b524afcf644fafd
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
+@@ -0,0 +1,32 @@
++package io.papermc.paper.inventory;
++
++import net.kyori.adventure.text.format.NamedTextColor;
++import net.kyori.adventure.text.format.TextColor;
++import org.jetbrains.annotations.NotNull;
++
++/**
++ * @deprecated use {@link org.bukkit.inventory.ItemRarity} with {@link org.bukkit.inventory.meta.ItemMeta#getRarity()}
++ */
++@Deprecated(forRemoval = true, since = "1.20.5")
++public enum ItemRarity {
++
++    COMMON(NamedTextColor.WHITE),
++    UNCOMMON(NamedTextColor.YELLOW),
++    RARE(NamedTextColor.AQUA),
++    EPIC(NamedTextColor.LIGHT_PURPLE);
++
++    TextColor color;
++
++    ItemRarity(TextColor color) {
++        this.color = color;
++    }
++
++    /**
++     * Gets the color formatting associated with the rarity.
++     * @return
++     */
++    @NotNull
++    public TextColor getColor() {
++        return color;
++    }
++}
+diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
+index 3ee36de0ee975dc300e594b17d0dc2c06edf2a16..2ce1d9239d08c799d53873563646f933211a902e 100644
+--- a/src/main/java/org/bukkit/Material.java
++++ b/src/main/java/org/bukkit/Material.java
+@@ -4748,6 +4748,19 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+             return Bukkit.getUnsafe().getBlockTranslationKey(this);
+         }
+     }
++
++    /**
++     * Returns the item rarity for the item. The Material <b>MUST</b> be an Item not a block.
++     * Use {@link #isItem()} before this.
++     *
++     * @return the item rarity
++     * @deprecated use {@link org.bukkit.inventory.meta.ItemMeta#hasRarity()} and {@link org.bukkit.inventory.meta.ItemMeta#getRarity()}
++     */
++    @NotNull
++    @Deprecated(forRemoval = true, since = "1.20.5")
++    public io.papermc.paper.inventory.ItemRarity getItemRarity() {
++        return new org.bukkit.inventory.ItemStack(this).getRarity();
++    }
+     // Paper end
+ 
+     /**
+diff --git a/src/main/java/org/bukkit/inventory/ItemRarity.java b/src/main/java/org/bukkit/inventory/ItemRarity.java
+index e7931f73f10fe35ebd5fe4a04b036d53bb117ebd..cbce835ed6d44e5b8c9aaae4e36a77f8e5bed45f 100644
+--- a/src/main/java/org/bukkit/inventory/ItemRarity.java
++++ b/src/main/java/org/bukkit/inventory/ItemRarity.java
+@@ -9,17 +9,32 @@ public enum ItemRarity {
+     /**
+      * White item name.
+      */
+-    COMMON,
++    COMMON(net.kyori.adventure.text.format.NamedTextColor.WHITE), // Paper
+     /**
+      * Yellow item name.
+      */
+-    UNCOMMON,
++    UNCOMMON(net.kyori.adventure.text.format.NamedTextColor.YELLOW), // Paper
+     /**
+      * Aqua item name.
+      */
+-    RARE,
++    RARE(net.kyori.adventure.text.format.NamedTextColor.AQUA), // Paper
+     /**
+      * Light purple item name.
+      */
+-    EPIC;
++    EPIC(net.kyori.adventure.text.format.NamedTextColor.LIGHT_PURPLE); // Paper
++    // Paper start - improve ItemRarity
++    private final net.kyori.adventure.text.format.NamedTextColor color;
++    ItemRarity(final net.kyori.adventure.text.format.NamedTextColor color) {
++        this.color = color;
++    }
++
++    /**
++     * Gets the color formatting associated with this rarity.
++     *
++     * @return the color
++     */
++    public net.kyori.adventure.text.format.@org.jetbrains.annotations.NotNull TextColor color() {
++        return this.color;
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
+index 96b6052c198454f06f877fc7cda85a98c0ddba7c..f9b0b463f9920524eab7f328bc456a30eebc6910 100644
+--- a/src/main/java/org/bukkit/inventory/ItemStack.java
++++ b/src/main/java/org/bukkit/inventory/ItemStack.java
+@@ -888,5 +888,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+     public @NotNull String translationKey() {
+         return Bukkit.getUnsafe().getTranslationKey(this);
+     }
++
++    /**
++     * Gets the item rarity of the itemstack. The rarity can change based on enchantments.
++     *
++     * @return the itemstack rarity
++     * @deprecated Use {@link ItemMeta#hasRarity()} and {@link ItemMeta#getRarity()}
++     */
++    @NotNull
++    @Deprecated(forRemoval = true, since = "1.20.5")
++    public io.papermc.paper.inventory.ItemRarity getRarity() {
++        return io.papermc.paper.inventory.ItemRarity.valueOf(this.getItemMeta().getRarity().name());
++    }
+     // Paper end
+ }
diff --git a/patches/api/0262-Item-Rarity-API.patch b/patches/api/0262-Item-Rarity-API.patch
deleted file mode 100644
index 42bb22f799..0000000000
--- a/patches/api/0262-Item-Rarity-API.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 12 Mar 2021 17:09:40 -0800
-Subject: [PATCH] Item Rarity API
-
-
-diff --git a/src/main/java/io/papermc/paper/inventory/ItemRarity.java b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db20272cc2734
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/inventory/ItemRarity.java
-@@ -0,0 +1,28 @@
-+package io.papermc.paper.inventory;
-+
-+import net.kyori.adventure.text.format.NamedTextColor;
-+import net.kyori.adventure.text.format.TextColor;
-+import org.jetbrains.annotations.NotNull;
-+
-+public enum ItemRarity {
-+
-+    COMMON(NamedTextColor.WHITE),
-+    UNCOMMON(NamedTextColor.YELLOW),
-+    RARE(NamedTextColor.AQUA),
-+    EPIC(NamedTextColor.LIGHT_PURPLE);
-+
-+    TextColor color;
-+
-+    ItemRarity(TextColor color) {
-+        this.color = color;
-+    }
-+
-+    /**
-+     * Gets the color formatting associated with the rarity.
-+     * @return
-+     */
-+    @NotNull
-+    public TextColor getColor() {
-+        return color;
-+    }
-+}
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3ee36de0ee975dc300e594b17d0dc2c06edf2a16..7c14a272156cefe6d69e41fec6892891646e0985 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -4748,6 +4748,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-             return Bukkit.getUnsafe().getBlockTranslationKey(this);
-         }
-     }
-+
-+    /**
-+     * Returns the item rarity for the item. The Material <b>MUST</b> be an Item not a block.
-+     * Use {@link #isItem()} before this.
-+     *
-+     * @return the item rarity
-+     */
-+    @NotNull
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity() {
-+        return Bukkit.getUnsafe().getItemRarity(this);
-+    }
-     // Paper end
- 
-     /**
-diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 5de86f8cd3cc7f7e8ebc4a22d3921273378704f2..c423204eaf3252c9fc1a3af1214ec70ed712fb80 100644
---- a/src/main/java/org/bukkit/UnsafeValues.java
-+++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -169,5 +169,22 @@ public interface UnsafeValues {
-      * Just don't use it.
-      */
-     @org.jetbrains.annotations.NotNull String getMainLevelName();
-+
-+    /**
-+     * Gets the item rarity of a material. The material <b>MUST</b> be an item.
-+     * Use {@link Material#isItem()} before this.
-+     *
-+     * @param material the material to get the rarity of
-+     * @return the item rarity
-+     */
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity(Material material);
-+
-+    /**
-+     * Gets the item rarity of the itemstack. The rarity can change based on enchantements.
-+     *
-+     * @param itemStack the itemstack to get the rarity of
-+     * @return the itemstack rarity
-+     */
-+    public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 96b6052c198454f06f877fc7cda85a98c0ddba7c..069c644f03286ba62d521754d825e81934e1e6d6 100644
---- a/src/main/java/org/bukkit/inventory/ItemStack.java
-+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -888,5 +888,15 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
-     public @NotNull String translationKey() {
-         return Bukkit.getUnsafe().getTranslationKey(this);
-     }
-+
-+    /**
-+     * Gets the item rarity of the itemstack. The rarity can change based on enchantements.
-+     *
-+     * @return the itemstack rarity
-+     */
-+    @NotNull
-+    public io.papermc.paper.inventory.ItemRarity getRarity() {
-+        return Bukkit.getUnsafe().getItemStackRarity(this);
-+    }
-     // Paper end
- }
diff --git a/patches/api/0263-Expose-protocol-version.patch b/patches/api/0263-Expose-protocol-version.patch
index 3fbc03ad3e..0450fa0966 100644
--- a/patches/api/0263-Expose-protocol-version.patch
+++ b/patches/api/0263-Expose-protocol-version.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index c423204eaf3252c9fc1a3af1214ec70ed712fb80..42e4983051062f2fd3b595487cf8093440b41bba 100644
+index 5de86f8cd3cc7f7e8ebc4a22d3921273378704f2..a874faec93468c83fc475b60629fc36f933bd11c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -186,5 +186,12 @@ public interface UnsafeValues {
-      * @return the itemstack rarity
+@@ -169,5 +169,12 @@ public interface UnsafeValues {
+      * Just don't use it.
       */
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
+     @org.jetbrains.annotations.NotNull String getMainLevelName();
 +
 +    /**
 +     * Returns the server's protocol version.
diff --git a/patches/api/0280-ItemStack-repair-check-API.patch b/patches/api/0280-ItemStack-repair-check-API.patch
index fbfec478f2..95046ce219 100644
--- a/patches/api/0280-ItemStack-repair-check-API.patch
+++ b/patches/api/0280-ItemStack-repair-check-API.patch
@@ -5,13 +5,14 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 42e4983051062f2fd3b595487cf8093440b41bba..057f4db9cb6b686ab941ec5d3e6ca23dcfbd845f 100644
+index a874faec93468c83fc475b60629fc36f933bd11c..4130481843c9e0b847bd656622b0c1107ac1297b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -187,6 +187,16 @@ public interface UnsafeValues {
+@@ -176,5 +176,15 @@ public interface UnsafeValues {
+      * @return the server's protocol version
       */
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(ItemStack itemStack);
- 
+     int getProtocolVersion();
++
 +    /**
 +     * Checks if an itemstack can be repaired with another itemstack.
 +     * Returns false if either argument's type is not an item ({@link Material#isItem()}).
@@ -21,17 +22,15 @@ index 42e4983051062f2fd3b595487cf8093440b41bba..057f4db9cb6b686ab941ec5d3e6ca23d
 +     * @return true if valid repair, false if not
 +     */
 +    public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);
-+
-     /**
-      * Returns the server's protocol version.
-      *
+     // Paper end
+ }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 069c644f03286ba62d521754d825e81934e1e6d6..51f3f387af28bb733e2a20c7befd1070768103b2 100644
+index f9b0b463f9920524eab7f328bc456a30eebc6910..2fb521dc2b4d991f56288e2faba978d9d7d29a0b 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -898,5 +898,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -900,5 +900,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public io.papermc.paper.inventory.ItemRarity getRarity() {
-         return Bukkit.getUnsafe().getItemStackRarity(this);
+         return io.papermc.paper.inventory.ItemRarity.valueOf(this.getItemMeta().getRarity().name());
      }
 +
 +    /**
diff --git a/patches/api/0283-ItemStack-editMeta.patch b/patches/api/0283-ItemStack-editMeta.patch
index 49647ecfde..5d71277d19 100644
--- a/patches/api/0283-ItemStack-editMeta.patch
+++ b/patches/api/0283-ItemStack-editMeta.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack#editMeta
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 51f3f387af28bb733e2a20c7befd1070768103b2..0f3ef975293d0e970a35fd6845f8bf911e933169 100644
+index 2fb521dc2b4d991f56288e2faba978d9d7d29a0b..455e633edc19d29559e66b1d52c532ef1a0fa8df 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -558,6 +558,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0285-Attributes-API-for-item-defaults.patch b/patches/api/0285-Attributes-API-for-item-defaults.patch
index 1445309f84..947bae94d8 100644
--- a/patches/api/0285-Attributes-API-for-item-defaults.patch
+++ b/patches/api/0285-Attributes-API-for-item-defaults.patch
@@ -6,12 +6,12 @@ Subject: [PATCH] Attributes API for item defaults
 (Now replaced by upstream's API)
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 7c14a272156cefe6d69e41fec6892891646e0985..eb9e0eb1aa6e203ff6f896b177ee60c8afacc62d 100644
+index 2ce1d9239d08c799d53873563646f933211a902e..401645f5e0dfe6c9a0d082b5a76112a882b058ee 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4759,6 +4759,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4761,6 +4761,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public io.papermc.paper.inventory.ItemRarity getItemRarity() {
-         return Bukkit.getUnsafe().getItemRarity(this);
+         return new org.bukkit.inventory.ItemStack(this).getRarity();
      }
 +
 +    /**
diff --git a/patches/api/0312-Get-entity-default-attributes.patch b/patches/api/0312-Get-entity-default-attributes.patch
index 8c11a9af7f..f0dd49bec9 100644
--- a/patches/api/0312-Get-entity-default-attributes.patch
+++ b/patches/api/0312-Get-entity-default-attributes.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Get entity default attributes
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 057f4db9cb6b686ab941ec5d3e6ca23dcfbd845f..900b502a400bb99a2131305812e48acfeb8b94a1 100644
+index 4130481843c9e0b847bd656622b0c1107ac1297b..a846f3c6e8dceb90e42db903b8be2c248f2f9d5c 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -203,5 +203,22 @@ public interface UnsafeValues {
-      * @return the server's protocol version
+@@ -186,5 +186,22 @@ public interface UnsafeValues {
+      * @return true if valid repair, false if not
       */
-     int getProtocolVersion();
+     public boolean isValidRepairItemStack(@org.jetbrains.annotations.NotNull ItemStack itemToBeRepaired, @org.jetbrains.annotations.NotNull ItemStack repairMaterial);
 +
 +    /**
 +     * Checks if the entity represented by the namespaced key has default attributes.
diff --git a/patches/api/0317-Add-isCollidable-methods-to-various-places.patch b/patches/api/0317-Add-isCollidable-methods-to-various-places.patch
index a5f9888bf8..d4627b4000 100644
--- a/patches/api/0317-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/api/0317-Add-isCollidable-methods-to-various-places.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add isCollidable methods to various places
 
 
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index eb9e0eb1aa6e203ff6f896b177ee60c8afacc62d..137b4553636f31574c51960cada6eb07d80a02d9 100644
+index 401645f5e0dfe6c9a0d082b5a76112a882b058ee..8283eccf2578bae50a4c6fd86318e0d5f7cf09df 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -4774,6 +4774,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
+@@ -4776,6 +4776,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      public Multimap<Attribute, AttributeModifier> getItemAttributes(@NotNull EquipmentSlot equipmentSlot) {
          return this.getDefaultAttributeModifiers(equipmentSlot);
      }
@@ -26,10 +26,10 @@ index eb9e0eb1aa6e203ff6f896b177ee60c8afacc62d..137b4553636f31574c51960cada6eb07
  
      /**
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 900b502a400bb99a2131305812e48acfeb8b94a1..75c9569214321b3f23f3614722d7453020d095c3 100644
+index a846f3c6e8dceb90e42db903b8be2c248f2f9d5c..e1f9d80f0a6481824443339015049f96f3bf86f2 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -220,5 +220,14 @@ public interface UnsafeValues {
+@@ -203,5 +203,14 @@ public interface UnsafeValues {
       * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultEntityAttributes(NamespacedKey)} first)
       */
      @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
diff --git a/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch b/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch
index 5895168aae..b0a70d977f 100644
--- a/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/api/0320-Add-Raw-Byte-Entity-Serialization.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Raw Byte Entity Serialization
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 75c9569214321b3f23f3614722d7453020d095c3..bdfa60a764c13d82cd013335fb7b0c896abe74bd 100644
+index e1f9d80f0a6481824443339015049f96f3bf86f2..9245f50b2bac30e956ef6ddc11c551b9b68463ee 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -158,6 +158,14 @@ public interface UnsafeValues {
diff --git a/patches/api/0349-Add-enchantWithLevels-API.patch b/patches/api/0349-Add-enchantWithLevels-API.patch
index cf08b881ef..021eefa1f3 100644
--- a/patches/api/0349-Add-enchantWithLevels-API.patch
+++ b/patches/api/0349-Add-enchantWithLevels-API.patch
@@ -70,7 +70,7 @@ index dbebaf8172ec6872f56958b9583affde4f8400a4..98a970a6582dca22e719a31559c7bece
 +    // Paper end - enchantWithLevels API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 0f3ef975293d0e970a35fd6845f8bf911e933169..984b6e96a5ebebc38ab62790c4d6a9946c9c6944 100644
+index 455e633edc19d29559e66b1d52c532ef1a0fa8df..637b9067973aadece2806cc2b6200a4d3b8d97a1 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -667,6 +667,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0367-Add-NamespacedKey-biome-methods.patch b/patches/api/0367-Add-NamespacedKey-biome-methods.patch
index 88b7d9aefc..9b5cd7d737 100644
--- a/patches/api/0367-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0367-Add-NamespacedKey-biome-methods.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index bdfa60a764c13d82cd013335fb7b0c896abe74bd..0eddda31e47e807551436ae834e89ea56141f163 100644
+index 9245f50b2bac30e956ef6ddc11c551b9b68463ee..5d862c9221d1ce6d577295a5181f951c2f71a631 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -237,5 +237,32 @@ public interface UnsafeValues {
+@@ -220,5 +220,32 @@ public interface UnsafeValues {
       * @throws IllegalArgumentException if {@link Material#isBlock()} is false
       */
      boolean isCollidable(@org.jetbrains.annotations.NotNull Material material);
diff --git a/patches/api/0385-ItemStack-damage-API.patch b/patches/api/0385-ItemStack-damage-API.patch
index 391205b8ae..bd1863d99b 100644
--- a/patches/api/0385-ItemStack-damage-API.patch
+++ b/patches/api/0385-ItemStack-damage-API.patch
@@ -66,10 +66,10 @@ index 6bfc8a2148f504370df938447f4f6b757f1a516b..208bab1f5a3200f54141c38ee4272629
 +    // Paper end - ItemStack damage API
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 984b6e96a5ebebc38ab62790c4d6a9946c9c6944..13648f2e810daa84af25c28a009b1f641791e2f7 100644
+index 637b9067973aadece2806cc2b6200a4d3b8d97a1..d2162e53cefb8f9dc5c52bc1904e860066f43a41 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -982,5 +982,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -984,5 +984,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public boolean canRepair(@NotNull ItemStack toBeRepaired) {
          return Bukkit.getUnsafe().isValidRepairItemStack(toBeRepaired, this);
      }
diff --git a/patches/api/0416-Fix-custom-statistic-criteria-creation.patch b/patches/api/0416-Fix-custom-statistic-criteria-creation.patch
index 3a25880b2e..f8da658f51 100644
--- a/patches/api/0416-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0416-Fix-custom-statistic-criteria-creation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 0eddda31e47e807551436ae834e89ea56141f163..7b54ca313ce65f91932ee8ee968196f6091db86f 100644
+index 5d862c9221d1ce6d577295a5181f951c2f71a631..e19434a0f5065987be087b6bd531c88be33d2917 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -264,5 +264,7 @@ public interface UnsafeValues {
+@@ -247,5 +247,7 @@ public interface UnsafeValues {
       * @throws IllegalStateException if no biome by the given key is registered.
       */
      void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey);
diff --git a/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch
index 984f6939f5..5d980f4398 100644
--- a/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0432-Allow-proper-checking-of-empty-item-stacks.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow proper checking of empty item stacks
 This adds a method to check if an item stack is empty or not. This mirrors vanilla's implementation of the same method.
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 13648f2e810daa84af25c28a009b1f641791e2f7..ff3929b4a497ff0ef0c7ea7f9ac3509764b80e0a 100644
+index d2162e53cefb8f9dc5c52bc1904e860066f43a41..db02c04a8e9a0b8e1e4518a629d5703398d4ef72 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -996,5 +996,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -998,5 +998,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public @NotNull ItemStack damage(int amount, @NotNull org.bukkit.entity.LivingEntity livingEntity) {
          return livingEntity.damageItemStack(this, amount);
      }
diff --git a/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 3bddd2ce94..1617e84222 100644
--- a/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0440-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
@@ -9,7 +9,7 @@ By removing this check we avoid unnecessarily allocating useless `ItemMeta` obje
 This is a leftover from when checking for the item's durability was "free" because the durability was stored in the `ItemStack` itself, this [was changed in Minecraft 1.13](https://hub.spigotmc.org/stash/projects/SPIGOT/repos/bukkit/commits/f8b2086d60942eb2cd7ac25a2a1408cb790c222c#src/main/java/org/bukkit/inventory/ItemStack.java).
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ff3929b4a497ff0ef0c7ea7f9ac3509764b80e0a..ee636c066d1f87873c1ddf52c60c77b1b86d6e90 100644
+index db02c04a8e9a0b8e1e4518a629d5703398d4ef72..0611f19bcdd8230b439b5055713221318dce98e2 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -295,7 +295,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/api/0442-add-missing-Experimental-annotations.patch b/patches/api/0442-add-missing-Experimental-annotations.patch
index 6a10187982..9c46d14fa0 100644
--- a/patches/api/0442-add-missing-Experimental-annotations.patch
+++ b/patches/api/0442-add-missing-Experimental-annotations.patch
@@ -27,7 +27,7 @@ index 6b68c92ec894451d99ded3e3df5965cb31d68ed2..fd5e433f930963c102c9c977523a0036
      public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
  }
 diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 137b4553636f31574c51960cada6eb07d80a02d9..cdbb67b677d5226d15df40339b7df02482561e3e 100644
+index 8283eccf2578bae50a4c6fd86318e0d5f7cf09df..6ebc5da2b47b005b836927621f3b929d2442a832 100644
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
 @@ -146,54 +146,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
diff --git a/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch
index f05f31cb72..6e3d91aff4 100644
--- a/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0454-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 7b54ca313ce65f91932ee8ee968196f6091db86f..e1493ef58854e7bc929a2fa5aaba9da527dfd563 100644
+index e19434a0f5065987be087b6bd531c88be33d2917..80947c6862a906dec9c039b5dff993461d4d831b 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -267,4 +267,17 @@ public interface UnsafeValues {
+@@ -250,4 +250,17 @@ public interface UnsafeValues {
  
      String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic);
      // Paper end
diff --git a/patches/api/0455-Add-Lifecycle-Event-system.patch b/patches/api/0455-Add-Lifecycle-Event-system.patch
index 540279acf4..4b36ba4885 100644
--- a/patches/api/0455-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0455-Add-Lifecycle-Event-system.patch
@@ -528,10 +528,10 @@ index 0000000000000000000000000000000000000000..304f978e40e1759bb19704cc5cec3995
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index e1493ef58854e7bc929a2fa5aaba9da527dfd563..887129a95ff2e299507bf870b1ef3212afe6563e 100644
+index 80947c6862a906dec9c039b5dff993461d4d831b..7e6bdf3333537491b3421d196779a4eb502f7314 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -280,4 +280,12 @@ public interface UnsafeValues {
+@@ -263,4 +263,12 @@ public interface UnsafeValues {
       */
      @Nullable org.bukkit.Color getSpawnEggLayerColor(org.bukkit.entity.EntityType entityType, int layer);
      // Paper end - spawn egg color visibility
diff --git a/patches/api/0456-ItemStack-Tooltip-API.patch b/patches/api/0456-ItemStack-Tooltip-API.patch
index 995d8493f5..7eb3a41ef5 100644
--- a/patches/api/0456-ItemStack-Tooltip-API.patch
+++ b/patches/api/0456-ItemStack-Tooltip-API.patch
@@ -108,10 +108,10 @@ index 0000000000000000000000000000000000000000..1d9bed6691f581529c53b577b26f1d0f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 887129a95ff2e299507bf870b1ef3212afe6563e..c7d0cdd4778c329f09db6cea97ddb019690d6246 100644
+index 7e6bdf3333537491b3421d196779a4eb502f7314..a3ba9249e636d1fb8dad98fab413436009fe04df 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
-@@ -288,4 +288,6 @@ public interface UnsafeValues {
+@@ -271,4 +271,6 @@ public interface UnsafeValues {
      @org.jetbrains.annotations.ApiStatus.Internal
      io.papermc.paper.plugin.lifecycle.event.LifecycleEventManager<org.bukkit.plugin.Plugin> createPluginLifecycleEventManager(final org.bukkit.plugin.java.JavaPlugin plugin, final java.util.function.BooleanSupplier registrationCheck);
      // Paper end - lifecycle event API
@@ -119,10 +119,10 @@ index 887129a95ff2e299507bf870b1ef3212afe6563e..c7d0cdd4778c329f09db6cea97ddb019
 +    @NotNull java.util.List<net.kyori.adventure.text.Component> computeTooltipLines(@NotNull ItemStack itemStack, @NotNull io.papermc.paper.inventory.tooltip.TooltipContext tooltipContext, @Nullable org.bukkit.entity.Player player); // Paper - expose itemstack tooltip lines
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index ee636c066d1f87873c1ddf52c60c77b1b86d6e90..b04e7b9c3f631c0bb7734b809a58dbb988414fbb 100644
+index 0611f19bcdd8230b439b5055713221318dce98e2..9440cffffa1d7e75d2d76d55d5608bafd69b645b 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1016,4 +1016,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1018,4 +1018,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return type.isAir() || amount <= 0;
      }
      // Paper end
diff --git a/patches/api/0466-Deprecate-ItemStack-setType.patch b/patches/api/0466-Deprecate-ItemStack-setType.patch
index 0ea99724f4..2c0996f9a1 100644
--- a/patches/api/0466-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0466-Deprecate-ItemStack-setType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate ItemStack#setType
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index b04e7b9c3f631c0bb7734b809a58dbb988414fbb..df2d5ad5ff1bcb1488a94edde9cc4d53cacdd91d 100644
+index 9440cffffa1d7e75d2d76d55d5608bafd69b645b..91083a135a7e979e32cbb3531b5ef69b7a28f305 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -134,8 +134,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
diff --git a/patches/server/0521-Drop-carried-item-when-player-has-disconnected.patch b/patches/server/0520-Drop-carried-item-when-player-has-disconnected.patch
similarity index 100%
rename from patches/server/0521-Drop-carried-item-when-player-has-disconnected.patch
rename to patches/server/0520-Drop-carried-item-when-player-has-disconnected.patch
diff --git a/patches/server/0520-Item-Rarity-API.patch b/patches/server/0520-Item-Rarity-API.patch
deleted file mode 100644
index 0939bc6a87..0000000000
--- a/patches/server/0520-Item-Rarity-API.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <jake.m.potrebic@gmail.com>
-Date: Fri, 12 Mar 2021 17:09:42 -0800
-Subject: [PATCH] Item Rarity API
-
-== AT ==
-public net.minecraft.world.item.Item rarity
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c0592a85a1a0781b83232533b9ca1b30b116eb98..125ed63d8ae812284cd452b4387fd0d674c9c25a 100644
---- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -542,6 +542,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public String getMainLevelName() {
-         return ((net.minecraft.server.dedicated.DedicatedServer) net.minecraft.server.MinecraftServer.getServer()).getProperties().levelName;
-     }
-+
-+    @Override
-+    public io.papermc.paper.inventory.ItemRarity getItemRarity(org.bukkit.Material material) {
-+        Item item = getItem(material);
-+        if (item == null) {
-+            throw new IllegalArgumentException(material + " is not an item, and rarity does not apply to blocks");
-+        }
-+        return io.papermc.paper.inventory.ItemRarity.values()[item.components().getOrDefault(net.minecraft.core.component.DataComponents.RARITY, net.minecraft.world.item.Rarity.COMMON).ordinal()];
-+    }
-+
-+    @Override
-+    public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
-+        return io.papermc.paper.inventory.ItemRarity.values()[itemStack.getRarity().ordinal()];
-+    }
-     // Paper end
- 
-     /**
-diff --git a/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java b/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..8086e6a754cb94ce15428ac0cdbaa43590beb9fe
---- /dev/null
-+++ b/src/test/java/io/papermc/paper/inventory/ItemRarityTest.java
-@@ -0,0 +1,24 @@
-+package io.papermc.paper.inventory;
-+
-+import io.papermc.paper.adventure.PaperAdventure;
-+import net.minecraft.world.item.Rarity;
-+import org.junit.jupiter.api.Test;
-+
-+import static org.junit.jupiter.api.Assertions.assertEquals;
-+
-+public class ItemRarityTest {
-+
-+    @Test
-+    public void testConvertFromNmsToBukkit() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            assertEquals(ItemRarity.values()[nmsRarity.ordinal()].name(), nmsRarity.name(), "rarity names are mis-matched");
-+        }
-+    }
-+
-+    @Test
-+    public void testRarityFormatting() {
-+        for (Rarity nmsRarity : Rarity.values()) {
-+            assertEquals(nmsRarity.color(), PaperAdventure.asVanilla(ItemRarity.values()[nmsRarity.ordinal()].color), "rarity formatting is mis-matched");
-+        }
-+    }
-+}
diff --git a/patches/server/0522-forced-whitelist-use-configurable-kick-message.patch b/patches/server/0521-forced-whitelist-use-configurable-kick-message.patch
similarity index 100%
rename from patches/server/0522-forced-whitelist-use-configurable-kick-message.patch
rename to patches/server/0521-forced-whitelist-use-configurable-kick-message.patch
diff --git a/patches/server/0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch b/patches/server/0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch
similarity index 100%
rename from patches/server/0523-Don-t-ignore-result-of-PlayerEditBookEvent.patch
rename to patches/server/0522-Don-t-ignore-result-of-PlayerEditBookEvent.patch
diff --git a/patches/server/0524-Expose-protocol-version.patch b/patches/server/0523-Expose-protocol-version.patch
similarity index 64%
rename from patches/server/0524-Expose-protocol-version.patch
rename to patches/server/0523-Expose-protocol-version.patch
index fc6a93944d..86eecc86b6 100644
--- a/patches/server/0524-Expose-protocol-version.patch
+++ b/patches/server/0523-Expose-protocol-version.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Expose protocol version
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 125ed63d8ae812284cd452b4387fd0d674c9c25a..c4457bb46c3e66f5954383fb18b6109a5fe2772d 100644
+index c0592a85a1a0781b83232533b9ca1b30b116eb98..d11d0a9a2c6b13033437a22b7270e7d37bfe8046 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -556,6 +556,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public io.papermc.paper.inventory.ItemRarity getItemStackRarity(org.bukkit.inventory.ItemStack itemStack) {
-         return io.papermc.paper.inventory.ItemRarity.values()[itemStack.getRarity().ordinal()];
+@@ -542,6 +542,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public String getMainLevelName() {
+         return ((net.minecraft.server.dedicated.DedicatedServer) net.minecraft.server.MinecraftServer.getServer()).getProperties().levelName;
      }
 +
 +    @Override
diff --git a/patches/server/0525-Enhance-console-tab-completions-for-brigadier-comman.patch b/patches/server/0524-Enhance-console-tab-completions-for-brigadier-comman.patch
similarity index 100%
rename from patches/server/0525-Enhance-console-tab-completions-for-brigadier-comman.patch
rename to patches/server/0524-Enhance-console-tab-completions-for-brigadier-comman.patch
diff --git a/patches/server/0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch b/patches/server/0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
similarity index 100%
rename from patches/server/0526-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
rename to patches/server/0525-Fix-PlayerItemConsumeEvent-cancelling-properly.patch
diff --git a/patches/server/0527-Add-bypass-host-check.patch b/patches/server/0526-Add-bypass-host-check.patch
similarity index 100%
rename from patches/server/0527-Add-bypass-host-check.patch
rename to patches/server/0526-Add-bypass-host-check.patch
diff --git a/patches/server/0528-Set-area-affect-cloud-rotation.patch b/patches/server/0527-Set-area-affect-cloud-rotation.patch
similarity index 100%
rename from patches/server/0528-Set-area-affect-cloud-rotation.patch
rename to patches/server/0527-Set-area-affect-cloud-rotation.patch
diff --git a/patches/server/0529-add-isDeeplySleeping-to-HumanEntity.patch b/patches/server/0528-add-isDeeplySleeping-to-HumanEntity.patch
similarity index 100%
rename from patches/server/0529-add-isDeeplySleeping-to-HumanEntity.patch
rename to patches/server/0528-add-isDeeplySleeping-to-HumanEntity.patch
diff --git a/patches/server/0530-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/server/0529-add-consumeFuel-to-FurnaceBurnEvent.patch
similarity index 100%
rename from patches/server/0530-add-consumeFuel-to-FurnaceBurnEvent.patch
rename to patches/server/0529-add-consumeFuel-to-FurnaceBurnEvent.patch
diff --git a/patches/server/0531-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/server/0530-add-get-set-drop-chance-to-EntityEquipment.patch
similarity index 100%
rename from patches/server/0531-add-get-set-drop-chance-to-EntityEquipment.patch
rename to patches/server/0530-add-get-set-drop-chance-to-EntityEquipment.patch
diff --git a/patches/server/0532-fix-PigZombieAngerEvent-cancellation.patch b/patches/server/0531-fix-PigZombieAngerEvent-cancellation.patch
similarity index 100%
rename from patches/server/0532-fix-PigZombieAngerEvent-cancellation.patch
rename to patches/server/0531-fix-PigZombieAngerEvent-cancellation.patch
diff --git a/patches/server/0533-fix-PlayerItemHeldEvent-firing-twice.patch b/patches/server/0532-fix-PlayerItemHeldEvent-firing-twice.patch
similarity index 100%
rename from patches/server/0533-fix-PlayerItemHeldEvent-firing-twice.patch
rename to patches/server/0532-fix-PlayerItemHeldEvent-firing-twice.patch
diff --git a/patches/server/0534-Add-PlayerDeepSleepEvent.patch b/patches/server/0533-Add-PlayerDeepSleepEvent.patch
similarity index 100%
rename from patches/server/0534-Add-PlayerDeepSleepEvent.patch
rename to patches/server/0533-Add-PlayerDeepSleepEvent.patch
diff --git a/patches/server/0535-More-World-API.patch b/patches/server/0534-More-World-API.patch
similarity index 100%
rename from patches/server/0535-More-World-API.patch
rename to patches/server/0534-More-World-API.patch
diff --git a/patches/server/0536-Add-PlayerBedFailEnterEvent.patch b/patches/server/0535-Add-PlayerBedFailEnterEvent.patch
similarity index 100%
rename from patches/server/0536-Add-PlayerBedFailEnterEvent.patch
rename to patches/server/0535-Add-PlayerBedFailEnterEvent.patch
diff --git a/patches/server/0537-Implement-methods-to-convert-between-Component-and-B.patch b/patches/server/0536-Implement-methods-to-convert-between-Component-and-B.patch
similarity index 100%
rename from patches/server/0537-Implement-methods-to-convert-between-Component-and-B.patch
rename to patches/server/0536-Implement-methods-to-convert-between-Component-and-B.patch
diff --git a/patches/server/0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch b/patches/server/0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
similarity index 100%
rename from patches/server/0538-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
rename to patches/server/0537-Expand-PlayerRespawnEvent-fix-passed-parameter-issue.patch
diff --git a/patches/server/0539-Introduce-beacon-activation-deactivation-events.patch b/patches/server/0538-Introduce-beacon-activation-deactivation-events.patch
similarity index 100%
rename from patches/server/0539-Introduce-beacon-activation-deactivation-events.patch
rename to patches/server/0538-Introduce-beacon-activation-deactivation-events.patch
diff --git a/patches/server/0540-Add-Channel-initialization-listeners.patch b/patches/server/0539-Add-Channel-initialization-listeners.patch
similarity index 100%
rename from patches/server/0540-Add-Channel-initialization-listeners.patch
rename to patches/server/0539-Add-Channel-initialization-listeners.patch
diff --git a/patches/server/0541-Send-empty-commands-if-tab-completion-is-disabled.patch b/patches/server/0540-Send-empty-commands-if-tab-completion-is-disabled.patch
similarity index 100%
rename from patches/server/0541-Send-empty-commands-if-tab-completion-is-disabled.patch
rename to patches/server/0540-Send-empty-commands-if-tab-completion-is-disabled.patch
diff --git a/patches/server/0542-Add-more-WanderingTrader-API.patch b/patches/server/0541-Add-more-WanderingTrader-API.patch
similarity index 100%
rename from patches/server/0542-Add-more-WanderingTrader-API.patch
rename to patches/server/0541-Add-more-WanderingTrader-API.patch
diff --git a/patches/server/0543-Add-EntityBlockStorage-clearEntities.patch b/patches/server/0542-Add-EntityBlockStorage-clearEntities.patch
similarity index 100%
rename from patches/server/0543-Add-EntityBlockStorage-clearEntities.patch
rename to patches/server/0542-Add-EntityBlockStorage-clearEntities.patch
diff --git a/patches/server/0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/server/0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
similarity index 100%
rename from patches/server/0544-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
rename to patches/server/0543-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch
diff --git a/patches/server/0545-Add-HiddenPotionEffect-API.patch b/patches/server/0544-Add-HiddenPotionEffect-API.patch
similarity index 100%
rename from patches/server/0545-Add-HiddenPotionEffect-API.patch
rename to patches/server/0544-Add-HiddenPotionEffect-API.patch
diff --git a/patches/server/0546-Inventory-close.patch b/patches/server/0545-Inventory-close.patch
similarity index 100%
rename from patches/server/0546-Inventory-close.patch
rename to patches/server/0545-Inventory-close.patch
diff --git a/patches/server/0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/server/0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
similarity index 100%
rename from patches/server/0547-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
rename to patches/server/0546-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch
diff --git a/patches/server/0548-Add-basic-Datapack-API.patch b/patches/server/0547-Add-basic-Datapack-API.patch
similarity index 100%
rename from patches/server/0548-Add-basic-Datapack-API.patch
rename to patches/server/0547-Add-basic-Datapack-API.patch
diff --git a/patches/server/0549-Add-environment-variable-to-disable-server-gui.patch b/patches/server/0548-Add-environment-variable-to-disable-server-gui.patch
similarity index 100%
rename from patches/server/0549-Add-environment-variable-to-disable-server-gui.patch
rename to patches/server/0548-Add-environment-variable-to-disable-server-gui.patch
diff --git a/patches/server/0550-Expand-PlayerGameModeChangeEvent.patch b/patches/server/0549-Expand-PlayerGameModeChangeEvent.patch
similarity index 100%
rename from patches/server/0550-Expand-PlayerGameModeChangeEvent.patch
rename to patches/server/0549-Expand-PlayerGameModeChangeEvent.patch
diff --git a/patches/server/0551-ItemStack-repair-check-API.patch b/patches/server/0550-ItemStack-repair-check-API.patch
similarity index 92%
rename from patches/server/0551-ItemStack-repair-check-API.patch
rename to patches/server/0550-ItemStack-repair-check-API.patch
index 04cf961fe1..d72feae891 100644
--- a/patches/server/0551-ItemStack-repair-check-API.patch
+++ b/patches/server/0550-ItemStack-repair-check-API.patch
@@ -5,13 +5,14 @@ Subject: [PATCH] ItemStack repair check API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c4457bb46c3e66f5954383fb18b6109a5fe2772d..a8ac14a908060aa656756ad728d0d1e826d3bbe7 100644
+index d11d0a9a2c6b13033437a22b7270e7d37bfe8046..c2a7801ee4f6642813778f5e8ae89db46a253a3d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -557,6 +557,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
-         return io.papermc.paper.inventory.ItemRarity.values()[itemStack.getRarity().ordinal()];
+@@ -547,6 +547,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
+     public int getProtocolVersion() {
+         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
      }
- 
++
 +    @Override
 +    public boolean isValidRepairItemStack(org.bukkit.inventory.ItemStack itemToBeRepaired, org.bukkit.inventory.ItemStack repairMaterial) {
 +        if (!itemToBeRepaired.getType().isItem() || !repairMaterial.getType().isItem()) {
@@ -19,10 +20,9 @@ index c4457bb46c3e66f5954383fb18b6109a5fe2772d..a8ac14a908060aa656756ad728d0d1e8
 +        }
 +        return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
 +    }
-+
-     @Override
-     public int getProtocolVersion() {
-         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
+     // Paper end
+ 
+     /**
 diff --git a/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java b/src/test/java/io/papermc/paper/util/ItemStackRepairCheckTest.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..6b8d360ef86e181a680ad77f28b7dd7368dddfe7
diff --git a/patches/server/0552-More-Enchantment-API.patch b/patches/server/0551-More-Enchantment-API.patch
similarity index 100%
rename from patches/server/0552-More-Enchantment-API.patch
rename to patches/server/0551-More-Enchantment-API.patch
diff --git a/patches/server/0553-Move-range-check-for-block-placing-up.patch b/patches/server/0552-Move-range-check-for-block-placing-up.patch
similarity index 100%
rename from patches/server/0553-Move-range-check-for-block-placing-up.patch
rename to patches/server/0552-Move-range-check-for-block-placing-up.patch
diff --git a/patches/server/0554-Add-Mob-lookAt-API.patch b/patches/server/0553-Add-Mob-lookAt-API.patch
similarity index 100%
rename from patches/server/0554-Add-Mob-lookAt-API.patch
rename to patches/server/0553-Add-Mob-lookAt-API.patch
diff --git a/patches/server/0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch b/patches/server/0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
similarity index 100%
rename from patches/server/0555-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
rename to patches/server/0554-Correctly-check-if-bucket-dispenses-will-succeed-for.patch
diff --git a/patches/server/0556-Add-Unix-domain-socket-support.patch b/patches/server/0555-Add-Unix-domain-socket-support.patch
similarity index 100%
rename from patches/server/0556-Add-Unix-domain-socket-support.patch
rename to patches/server/0555-Add-Unix-domain-socket-support.patch
diff --git a/patches/server/0557-Add-EntityInsideBlockEvent.patch b/patches/server/0556-Add-EntityInsideBlockEvent.patch
similarity index 100%
rename from patches/server/0557-Add-EntityInsideBlockEvent.patch
rename to patches/server/0556-Add-EntityInsideBlockEvent.patch
diff --git a/patches/server/0558-Fix-item-default-attributes-API.patch b/patches/server/0557-Fix-item-default-attributes-API.patch
similarity index 95%
rename from patches/server/0558-Fix-item-default-attributes-API.patch
rename to patches/server/0557-Fix-item-default-attributes-API.patch
index b1e4c1dbd5..f23189a1ba 100644
--- a/patches/server/0558-Fix-item-default-attributes-API.patch
+++ b/patches/server/0557-Fix-item-default-attributes-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix item default attributes API
 (previously added this API but upstream also added it)
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index a8ac14a908060aa656756ad728d0d1e826d3bbe7..991a63f1a7cbd5d2cb88784a59ed0085b7bdfbe2 100644
+index c2a7801ee4f6642813778f5e8ae89db46a253a3d..61686e63b2d1a98b9747e11058f450a51e2d4d01 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -396,9 +396,14 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0559-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/server/0558-Add-cause-to-Weather-ThunderChangeEvents.patch
similarity index 100%
rename from patches/server/0559-Add-cause-to-Weather-ThunderChangeEvents.patch
rename to patches/server/0558-Add-cause-to-Weather-ThunderChangeEvents.patch
diff --git a/patches/server/0560-More-Lidded-Block-API.patch b/patches/server/0559-More-Lidded-Block-API.patch
similarity index 100%
rename from patches/server/0560-More-Lidded-Block-API.patch
rename to patches/server/0559-More-Lidded-Block-API.patch
diff --git a/patches/server/0561-Limit-item-frame-cursors-on-maps.patch b/patches/server/0560-Limit-item-frame-cursors-on-maps.patch
similarity index 100%
rename from patches/server/0561-Limit-item-frame-cursors-on-maps.patch
rename to patches/server/0560-Limit-item-frame-cursors-on-maps.patch
diff --git a/patches/server/0562-Add-PlayerKickEvent-causes.patch b/patches/server/0561-Add-PlayerKickEvent-causes.patch
similarity index 100%
rename from patches/server/0562-Add-PlayerKickEvent-causes.patch
rename to patches/server/0561-Add-PlayerKickEvent-causes.patch
diff --git a/patches/server/0563-Add-PufferFishStateChangeEvent.patch b/patches/server/0562-Add-PufferFishStateChangeEvent.patch
similarity index 100%
rename from patches/server/0563-Add-PufferFishStateChangeEvent.patch
rename to patches/server/0562-Add-PufferFishStateChangeEvent.patch
diff --git a/patches/server/0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch b/patches/server/0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
similarity index 100%
rename from patches/server/0564-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
rename to patches/server/0563-Fix-PlayerBucketEmptyEvent-result-itemstack.patch
diff --git a/patches/server/0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch b/patches/server/0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
similarity index 100%
rename from patches/server/0565-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
rename to patches/server/0564-Synchronize-PalettedContainer-instead-of-ThreadingDe.patch
diff --git a/patches/server/0566-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0565-Add-option-to-fix-items-merging-through-walls.patch
similarity index 100%
rename from patches/server/0566-Add-option-to-fix-items-merging-through-walls.patch
rename to patches/server/0565-Add-option-to-fix-items-merging-through-walls.patch
diff --git a/patches/server/0567-Add-BellRevealRaiderEvent.patch b/patches/server/0566-Add-BellRevealRaiderEvent.patch
similarity index 100%
rename from patches/server/0567-Add-BellRevealRaiderEvent.patch
rename to patches/server/0566-Add-BellRevealRaiderEvent.patch
diff --git a/patches/server/0568-Fix-invulnerable-end-crystals.patch b/patches/server/0567-Fix-invulnerable-end-crystals.patch
similarity index 100%
rename from patches/server/0568-Fix-invulnerable-end-crystals.patch
rename to patches/server/0567-Fix-invulnerable-end-crystals.patch
diff --git a/patches/server/0569-Add-ElderGuardianAppearanceEvent.patch b/patches/server/0568-Add-ElderGuardianAppearanceEvent.patch
similarity index 100%
rename from patches/server/0569-Add-ElderGuardianAppearanceEvent.patch
rename to patches/server/0568-Add-ElderGuardianAppearanceEvent.patch
diff --git a/patches/server/0570-Fix-dangerous-end-portal-logic.patch b/patches/server/0569-Fix-dangerous-end-portal-logic.patch
similarity index 100%
rename from patches/server/0570-Fix-dangerous-end-portal-logic.patch
rename to patches/server/0569-Fix-dangerous-end-portal-logic.patch
diff --git a/patches/server/0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch b/patches/server/0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
similarity index 100%
rename from patches/server/0571-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
rename to patches/server/0570-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch
diff --git a/patches/server/0572-Line-Of-Sight-Changes.patch b/patches/server/0571-Line-Of-Sight-Changes.patch
similarity index 100%
rename from patches/server/0572-Line-Of-Sight-Changes.patch
rename to patches/server/0571-Line-Of-Sight-Changes.patch
diff --git a/patches/server/0573-add-per-world-spawn-limits.patch b/patches/server/0572-add-per-world-spawn-limits.patch
similarity index 100%
rename from patches/server/0573-add-per-world-spawn-limits.patch
rename to patches/server/0572-add-per-world-spawn-limits.patch
diff --git a/patches/server/0574-Fix-potions-splash-events.patch b/patches/server/0573-Fix-potions-splash-events.patch
similarity index 100%
rename from patches/server/0574-Fix-potions-splash-events.patch
rename to patches/server/0573-Fix-potions-splash-events.patch
diff --git a/patches/server/0575-Add-more-LimitedRegion-API.patch b/patches/server/0574-Add-more-LimitedRegion-API.patch
similarity index 100%
rename from patches/server/0575-Add-more-LimitedRegion-API.patch
rename to patches/server/0574-Add-more-LimitedRegion-API.patch
diff --git a/patches/server/0576-Fix-PlayerDropItemEvent-using-wrong-item.patch b/patches/server/0575-Fix-PlayerDropItemEvent-using-wrong-item.patch
similarity index 100%
rename from patches/server/0576-Fix-PlayerDropItemEvent-using-wrong-item.patch
rename to patches/server/0575-Fix-PlayerDropItemEvent-using-wrong-item.patch
diff --git a/patches/server/0577-Missing-Entity-API.patch b/patches/server/0576-Missing-Entity-API.patch
similarity index 100%
rename from patches/server/0577-Missing-Entity-API.patch
rename to patches/server/0576-Missing-Entity-API.patch
diff --git a/patches/server/0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch b/patches/server/0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch
similarity index 100%
rename from patches/server/0578-Ensure-disconnect-for-book-edit-is-called-on-main.patch
rename to patches/server/0577-Ensure-disconnect-for-book-edit-is-called-on-main.patch
diff --git a/patches/server/0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch b/patches/server/0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
similarity index 100%
rename from patches/server/0579-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
rename to patches/server/0578-Fix-return-value-of-Block-applyBoneMeal-always-being.patch
diff --git a/patches/server/0580-Use-getChunkIfLoadedImmediately-in-places.patch b/patches/server/0579-Use-getChunkIfLoadedImmediately-in-places.patch
similarity index 100%
rename from patches/server/0580-Use-getChunkIfLoadedImmediately-in-places.patch
rename to patches/server/0579-Use-getChunkIfLoadedImmediately-in-places.patch
diff --git a/patches/server/0581-Fix-commands-from-signs-not-firing-command-events.patch b/patches/server/0580-Fix-commands-from-signs-not-firing-command-events.patch
similarity index 100%
rename from patches/server/0581-Fix-commands-from-signs-not-firing-command-events.patch
rename to patches/server/0580-Fix-commands-from-signs-not-firing-command-events.patch
diff --git a/patches/server/0582-Add-PlayerArmSwingEvent.patch b/patches/server/0581-Add-PlayerArmSwingEvent.patch
similarity index 100%
rename from patches/server/0582-Add-PlayerArmSwingEvent.patch
rename to patches/server/0581-Add-PlayerArmSwingEvent.patch
diff --git a/patches/server/0583-Fix-kick-event-leave-message-not-being-sent.patch b/patches/server/0582-Fix-kick-event-leave-message-not-being-sent.patch
similarity index 100%
rename from patches/server/0583-Fix-kick-event-leave-message-not-being-sent.patch
rename to patches/server/0582-Fix-kick-event-leave-message-not-being-sent.patch
diff --git a/patches/server/0584-Don-t-apply-cramming-damage-to-players.patch b/patches/server/0583-Don-t-apply-cramming-damage-to-players.patch
similarity index 100%
rename from patches/server/0584-Don-t-apply-cramming-damage-to-players.patch
rename to patches/server/0583-Don-t-apply-cramming-damage-to-players.patch
diff --git a/patches/server/0585-Rate-options-and-timings-for-sensors-and-behaviors.patch b/patches/server/0584-Rate-options-and-timings-for-sensors-and-behaviors.patch
similarity index 100%
rename from patches/server/0585-Rate-options-and-timings-for-sensors-and-behaviors.patch
rename to patches/server/0584-Rate-options-and-timings-for-sensors-and-behaviors.patch
diff --git a/patches/server/0586-Add-missing-forceDrop-toggles.patch b/patches/server/0585-Add-missing-forceDrop-toggles.patch
similarity index 100%
rename from patches/server/0586-Add-missing-forceDrop-toggles.patch
rename to patches/server/0585-Add-missing-forceDrop-toggles.patch
diff --git a/patches/server/0587-Stinger-API.patch b/patches/server/0586-Stinger-API.patch
similarity index 100%
rename from patches/server/0587-Stinger-API.patch
rename to patches/server/0586-Stinger-API.patch
diff --git a/patches/server/0588-Add-System.out-err-catcher.patch b/patches/server/0587-Add-System.out-err-catcher.patch
similarity index 100%
rename from patches/server/0588-Add-System.out-err-catcher.patch
rename to patches/server/0587-Add-System.out-err-catcher.patch
diff --git a/patches/server/0589-Prevent-AFK-kick-while-watching-end-credits.patch b/patches/server/0588-Prevent-AFK-kick-while-watching-end-credits.patch
similarity index 100%
rename from patches/server/0589-Prevent-AFK-kick-while-watching-end-credits.patch
rename to patches/server/0588-Prevent-AFK-kick-while-watching-end-credits.patch
diff --git a/patches/server/0590-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0589-Allow-skipping-writing-of-comments-to-server.propert.patch
similarity index 100%
rename from patches/server/0590-Allow-skipping-writing-of-comments-to-server.propert.patch
rename to patches/server/0589-Allow-skipping-writing-of-comments-to-server.propert.patch
diff --git a/patches/server/0591-Add-PlayerSetSpawnEvent.patch b/patches/server/0590-Add-PlayerSetSpawnEvent.patch
similarity index 100%
rename from patches/server/0591-Add-PlayerSetSpawnEvent.patch
rename to patches/server/0590-Add-PlayerSetSpawnEvent.patch
diff --git a/patches/server/0592-Make-hoppers-respect-inventory-max-stack-size.patch b/patches/server/0591-Make-hoppers-respect-inventory-max-stack-size.patch
similarity index 100%
rename from patches/server/0592-Make-hoppers-respect-inventory-max-stack-size.patch
rename to patches/server/0591-Make-hoppers-respect-inventory-max-stack-size.patch
diff --git a/patches/server/0593-Optimize-entity-tracker-passenger-checks.patch b/patches/server/0592-Optimize-entity-tracker-passenger-checks.patch
similarity index 100%
rename from patches/server/0593-Optimize-entity-tracker-passenger-checks.patch
rename to patches/server/0592-Optimize-entity-tracker-passenger-checks.patch
diff --git a/patches/server/0594-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0593-Config-option-for-Piglins-guarding-chests.patch
similarity index 100%
rename from patches/server/0594-Config-option-for-Piglins-guarding-chests.patch
rename to patches/server/0593-Config-option-for-Piglins-guarding-chests.patch
diff --git a/patches/server/0595-Add-EntityDamageItemEvent.patch b/patches/server/0594-Add-EntityDamageItemEvent.patch
similarity index 100%
rename from patches/server/0595-Add-EntityDamageItemEvent.patch
rename to patches/server/0594-Add-EntityDamageItemEvent.patch
diff --git a/patches/server/0596-Optimize-indirect-passenger-iteration.patch b/patches/server/0595-Optimize-indirect-passenger-iteration.patch
similarity index 100%
rename from patches/server/0596-Optimize-indirect-passenger-iteration.patch
rename to patches/server/0595-Optimize-indirect-passenger-iteration.patch
diff --git a/patches/server/0597-Configurable-item-frame-map-cursor-update-interval.patch b/patches/server/0596-Configurable-item-frame-map-cursor-update-interval.patch
similarity index 100%
rename from patches/server/0597-Configurable-item-frame-map-cursor-update-interval.patch
rename to patches/server/0596-Configurable-item-frame-map-cursor-update-interval.patch
diff --git a/patches/server/0598-Clear-bucket-NBT-after-dispense.patch b/patches/server/0597-Clear-bucket-NBT-after-dispense.patch
similarity index 100%
rename from patches/server/0598-Clear-bucket-NBT-after-dispense.patch
rename to patches/server/0597-Clear-bucket-NBT-after-dispense.patch
diff --git a/patches/server/0599-Change-EnderEye-target-without-changing-other-things.patch b/patches/server/0598-Change-EnderEye-target-without-changing-other-things.patch
similarity index 100%
rename from patches/server/0599-Change-EnderEye-target-without-changing-other-things.patch
rename to patches/server/0598-Change-EnderEye-target-without-changing-other-things.patch
diff --git a/patches/server/0600-Add-BlockBreakBlockEvent.patch b/patches/server/0599-Add-BlockBreakBlockEvent.patch
similarity index 100%
rename from patches/server/0600-Add-BlockBreakBlockEvent.patch
rename to patches/server/0599-Add-BlockBreakBlockEvent.patch
diff --git a/patches/server/0601-Option-to-prevent-data-components-copy-in-smithing-r.patch b/patches/server/0600-Option-to-prevent-data-components-copy-in-smithing-r.patch
similarity index 100%
rename from patches/server/0601-Option-to-prevent-data-components-copy-in-smithing-r.patch
rename to patches/server/0600-Option-to-prevent-data-components-copy-in-smithing-r.patch
diff --git a/patches/server/0602-More-CommandBlock-API.patch b/patches/server/0601-More-CommandBlock-API.patch
similarity index 100%
rename from patches/server/0602-More-CommandBlock-API.patch
rename to patches/server/0601-More-CommandBlock-API.patch
diff --git a/patches/server/0603-Add-missing-team-sidebar-display-slots.patch b/patches/server/0602-Add-missing-team-sidebar-display-slots.patch
similarity index 100%
rename from patches/server/0603-Add-missing-team-sidebar-display-slots.patch
rename to patches/server/0602-Add-missing-team-sidebar-display-slots.patch
diff --git a/patches/server/0604-Add-back-EntityPortalExitEvent.patch b/patches/server/0603-Add-back-EntityPortalExitEvent.patch
similarity index 100%
rename from patches/server/0604-Add-back-EntityPortalExitEvent.patch
rename to patches/server/0603-Add-back-EntityPortalExitEvent.patch
diff --git a/patches/server/0605-Add-methods-to-find-targets-for-lightning-strikes.patch b/patches/server/0604-Add-methods-to-find-targets-for-lightning-strikes.patch
similarity index 100%
rename from patches/server/0605-Add-methods-to-find-targets-for-lightning-strikes.patch
rename to patches/server/0604-Add-methods-to-find-targets-for-lightning-strikes.patch
diff --git a/patches/server/0606-Get-entity-default-attributes.patch b/patches/server/0605-Get-entity-default-attributes.patch
similarity index 95%
rename from patches/server/0606-Get-entity-default-attributes.patch
rename to patches/server/0605-Get-entity-default-attributes.patch
index 616f74da09..b0c1f2f95c 100644
--- a/patches/server/0606-Get-entity-default-attributes.patch
+++ b/patches/server/0605-Get-entity-default-attributes.patch
@@ -81,12 +81,12 @@ index 0000000000000000000000000000000000000000..ec9ebd2d539333293c51b7edfa18f18b
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 991a63f1a7cbd5d2cb88784a59ed0085b7bdfbe2..4e02a5c432f0d9ff705c7f02dfccbc7d76d39805 100644
+index 61686e63b2d1a98b9747e11058f450a51e2d4d01..5f460ab55025ff5dd66d7e52f92b4e7f36f2bb3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -574,6 +574,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
-     public int getProtocolVersion() {
-         return net.minecraft.SharedConstants.getCurrentVersion().getProtocolVersion();
+@@ -560,6 +560,18 @@ public final class CraftMagicNumbers implements UnsafeValues {
+         }
+         return CraftMagicNumbers.getItem(itemToBeRepaired.getType()).isValidRepairItem(CraftItemStack.asNMSCopy(itemToBeRepaired), CraftItemStack.asNMSCopy(repairMaterial));
      }
 +
 +    @Override
diff --git a/patches/server/0607-Left-handed-API.patch b/patches/server/0606-Left-handed-API.patch
similarity index 100%
rename from patches/server/0607-Left-handed-API.patch
rename to patches/server/0606-Left-handed-API.patch
diff --git a/patches/server/0608-Add-more-advancement-API.patch b/patches/server/0607-Add-more-advancement-API.patch
similarity index 100%
rename from patches/server/0608-Add-more-advancement-API.patch
rename to patches/server/0607-Add-more-advancement-API.patch
diff --git a/patches/server/0609-Add-ItemFactory-getSpawnEgg-API.patch b/patches/server/0608-Add-ItemFactory-getSpawnEgg-API.patch
similarity index 100%
rename from patches/server/0609-Add-ItemFactory-getSpawnEgg-API.patch
rename to patches/server/0608-Add-ItemFactory-getSpawnEgg-API.patch
diff --git a/patches/server/0610-Add-critical-damage-API.patch b/patches/server/0609-Add-critical-damage-API.patch
similarity index 100%
rename from patches/server/0610-Add-critical-damage-API.patch
rename to patches/server/0609-Add-critical-damage-API.patch
diff --git a/patches/server/0611-Fix-issues-with-mob-conversion.patch b/patches/server/0610-Fix-issues-with-mob-conversion.patch
similarity index 100%
rename from patches/server/0611-Fix-issues-with-mob-conversion.patch
rename to patches/server/0610-Fix-issues-with-mob-conversion.patch
diff --git a/patches/server/0612-Add-isCollidable-methods-to-various-places.patch b/patches/server/0611-Add-isCollidable-methods-to-various-places.patch
similarity index 94%
rename from patches/server/0612-Add-isCollidable-methods-to-various-places.patch
rename to patches/server/0611-Add-isCollidable-methods-to-various-places.patch
index e7b98fac20..226170159d 100644
--- a/patches/server/0612-Add-isCollidable-methods-to-various-places.patch
+++ b/patches/server/0611-Add-isCollidable-methods-to-various-places.patch
@@ -39,10 +39,10 @@ index 1002123cd0c6f57cecc4e80f5f21cc6ff5886d37..e96023b71845526383288917e8d7c575
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4e02a5c432f0d9ff705c7f02dfccbc7d76d39805..c1c90d38ceaf7020dc19f1774cc88dbff1f05caf 100644
+index 5f460ab55025ff5dd66d7e52f92b4e7f36f2bb3f..f0cbe0ae5123bebce82aa677f196f7e8e096dfc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -586,6 +586,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -572,6 +572,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          var supplier = net.minecraft.world.entity.ai.attributes.DefaultAttributes.getSupplier((net.minecraft.world.entity.EntityType<? extends net.minecraft.world.entity.LivingEntity>) net.minecraft.core.registries.BuiltInRegistries.ENTITY_TYPE.get(CraftNamespacedKey.toMinecraft(bukkitEntityKey)));
          return new io.papermc.paper.attribute.UnmodifiableAttributeMap(supplier);
      }
diff --git a/patches/server/0613-Goat-ram-API.patch b/patches/server/0612-Goat-ram-API.patch
similarity index 100%
rename from patches/server/0613-Goat-ram-API.patch
rename to patches/server/0612-Goat-ram-API.patch
diff --git a/patches/server/0614-Add-API-for-resetting-a-single-score.patch b/patches/server/0613-Add-API-for-resetting-a-single-score.patch
similarity index 100%
rename from patches/server/0614-Add-API-for-resetting-a-single-score.patch
rename to patches/server/0613-Add-API-for-resetting-a-single-score.patch
diff --git a/patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch b/patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch
similarity index 98%
rename from patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch
rename to patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch
index 4e849ec251..5eeed3ba32 100644
--- a/patches/server/0615-Add-Raw-Byte-Entity-Serialization.patch
+++ b/patches/server/0614-Add-Raw-Byte-Entity-Serialization.patch
@@ -50,7 +50,7 @@ index 9edcdc71b28cf08e42fbe44723ba540e8d4f7808..a61638bc8200f6aa25d9c3254aea6c0c
      @Override
      public boolean isInvisible() {  // Paper - moved up from LivingEntity
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c1c90d38ceaf7020dc19f1774cc88dbff1f05caf..af29b750a066ba44d6869eb8d466c3028c5c874d 100644
+index f0cbe0ae5123bebce82aa677f196f7e8e096dfc9..365f7846d4c522811cf992ea1a2da67b025661b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -510,7 +510,33 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0616-Vanilla-command-permission-fixes.patch b/patches/server/0615-Vanilla-command-permission-fixes.patch
similarity index 100%
rename from patches/server/0616-Vanilla-command-permission-fixes.patch
rename to patches/server/0615-Vanilla-command-permission-fixes.patch
diff --git a/patches/server/0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch b/patches/server/0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
similarity index 100%
rename from patches/server/0617-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
rename to patches/server/0616-Do-not-run-close-logic-for-inventories-on-chunk-unlo.patch
diff --git a/patches/server/0618-Fix-GameProfileCache-concurrency.patch b/patches/server/0617-Fix-GameProfileCache-concurrency.patch
similarity index 100%
rename from patches/server/0618-Fix-GameProfileCache-concurrency.patch
rename to patches/server/0617-Fix-GameProfileCache-concurrency.patch
diff --git a/patches/server/0619-Improve-and-expand-AsyncCatcher.patch b/patches/server/0618-Improve-and-expand-AsyncCatcher.patch
similarity index 100%
rename from patches/server/0619-Improve-and-expand-AsyncCatcher.patch
rename to patches/server/0618-Improve-and-expand-AsyncCatcher.patch
diff --git a/patches/server/0620-Add-paper-mobcaps-and-paper-playermobcaps.patch b/patches/server/0619-Add-paper-mobcaps-and-paper-playermobcaps.patch
similarity index 100%
rename from patches/server/0620-Add-paper-mobcaps-and-paper-playermobcaps.patch
rename to patches/server/0619-Add-paper-mobcaps-and-paper-playermobcaps.patch
diff --git a/patches/server/0621-Sanitize-ResourceLocation-error-logging.patch b/patches/server/0620-Sanitize-ResourceLocation-error-logging.patch
similarity index 100%
rename from patches/server/0621-Sanitize-ResourceLocation-error-logging.patch
rename to patches/server/0620-Sanitize-ResourceLocation-error-logging.patch
diff --git a/patches/server/0622-Manually-inline-methods-in-BlockPosition.patch b/patches/server/0621-Manually-inline-methods-in-BlockPosition.patch
similarity index 100%
rename from patches/server/0622-Manually-inline-methods-in-BlockPosition.patch
rename to patches/server/0621-Manually-inline-methods-in-BlockPosition.patch
diff --git a/patches/server/0623-Name-craft-scheduler-threads-according-to-the-plugin.patch b/patches/server/0622-Name-craft-scheduler-threads-according-to-the-plugin.patch
similarity index 100%
rename from patches/server/0623-Name-craft-scheduler-threads-according-to-the-plugin.patch
rename to patches/server/0622-Name-craft-scheduler-threads-according-to-the-plugin.patch
diff --git a/patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch b/patches/server/0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
similarity index 100%
rename from patches/server/0624-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
rename to patches/server/0623-Make-sure-inlined-getChunkAt-has-inlined-logic-for-l.patch
diff --git a/patches/server/0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch b/patches/server/0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
similarity index 100%
rename from patches/server/0625-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
rename to patches/server/0624-Don-t-read-neighbour-chunk-data-off-disk-when-conver.patch
diff --git a/patches/server/0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch b/patches/server/0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
similarity index 100%
rename from patches/server/0626-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
rename to patches/server/0625-Don-t-lookup-fluid-state-when-raytracing-skip-air-bl.patch
diff --git a/patches/server/0627-Time-scoreboard-search.patch b/patches/server/0626-Time-scoreboard-search.patch
similarity index 100%
rename from patches/server/0627-Time-scoreboard-search.patch
rename to patches/server/0626-Time-scoreboard-search.patch
diff --git a/patches/server/0628-Oprimise-map-impl-for-tracked-players.patch b/patches/server/0627-Oprimise-map-impl-for-tracked-players.patch
similarity index 100%
rename from patches/server/0628-Oprimise-map-impl-for-tracked-players.patch
rename to patches/server/0627-Oprimise-map-impl-for-tracked-players.patch
diff --git a/patches/server/0629-Add-missing-InventoryType.patch b/patches/server/0628-Add-missing-InventoryType.patch
similarity index 100%
rename from patches/server/0629-Add-missing-InventoryType.patch
rename to patches/server/0628-Add-missing-InventoryType.patch
diff --git a/patches/server/0630-Optimise-BlockSoil-nearby-water-lookup.patch b/patches/server/0629-Optimise-BlockSoil-nearby-water-lookup.patch
similarity index 100%
rename from patches/server/0630-Optimise-BlockSoil-nearby-water-lookup.patch
rename to patches/server/0629-Optimise-BlockSoil-nearby-water-lookup.patch
diff --git a/patches/server/0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch b/patches/server/0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch
similarity index 100%
rename from patches/server/0631-Fix-merchant-inventory-not-closing-on-entity-removal.patch
rename to patches/server/0630-Fix-merchant-inventory-not-closing-on-entity-removal.patch
diff --git a/patches/server/0632-Check-requirement-before-suggesting-root-nodes.patch b/patches/server/0631-Check-requirement-before-suggesting-root-nodes.patch
similarity index 100%
rename from patches/server/0632-Check-requirement-before-suggesting-root-nodes.patch
rename to patches/server/0631-Check-requirement-before-suggesting-root-nodes.patch
diff --git a/patches/server/0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch b/patches/server/0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
similarity index 100%
rename from patches/server/0633-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
rename to patches/server/0632-Don-t-respond-to-ServerboundCommandSuggestionPacket-.patch
diff --git a/patches/server/0634-Add-packet-limiter-config.patch b/patches/server/0633-Add-packet-limiter-config.patch
similarity index 100%
rename from patches/server/0634-Add-packet-limiter-config.patch
rename to patches/server/0633-Add-packet-limiter-config.patch
diff --git a/patches/server/0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch b/patches/server/0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
similarity index 100%
rename from patches/server/0635-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
rename to patches/server/0634-Fix-setPatternColor-on-tropical-fish-bucket-meta.patch
diff --git a/patches/server/0636-Ensure-valid-vehicle-status.patch b/patches/server/0635-Ensure-valid-vehicle-status.patch
similarity index 100%
rename from patches/server/0636-Ensure-valid-vehicle-status.patch
rename to patches/server/0635-Ensure-valid-vehicle-status.patch
diff --git a/patches/server/0637-Prevent-softlocked-end-exit-portal-generation.patch b/patches/server/0636-Prevent-softlocked-end-exit-portal-generation.patch
similarity index 100%
rename from patches/server/0637-Prevent-softlocked-end-exit-portal-generation.patch
rename to patches/server/0636-Prevent-softlocked-end-exit-portal-generation.patch
diff --git a/patches/server/0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
similarity index 100%
rename from patches/server/0638-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
rename to patches/server/0637-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
diff --git a/patches/server/0639-Don-t-log-debug-logging-being-disabled.patch b/patches/server/0638-Don-t-log-debug-logging-being-disabled.patch
similarity index 100%
rename from patches/server/0639-Don-t-log-debug-logging-being-disabled.patch
rename to patches/server/0638-Don-t-log-debug-logging-being-disabled.patch
diff --git a/patches/server/0640-fix-various-menus-with-empty-level-accesses.patch b/patches/server/0639-fix-various-menus-with-empty-level-accesses.patch
similarity index 100%
rename from patches/server/0640-fix-various-menus-with-empty-level-accesses.patch
rename to patches/server/0639-fix-various-menus-with-empty-level-accesses.patch
diff --git a/patches/server/0641-Preserve-overstacked-loot.patch b/patches/server/0640-Preserve-overstacked-loot.patch
similarity index 100%
rename from patches/server/0641-Preserve-overstacked-loot.patch
rename to patches/server/0640-Preserve-overstacked-loot.patch
diff --git a/patches/server/0642-Update-head-rotation-in-missing-places.patch b/patches/server/0641-Update-head-rotation-in-missing-places.patch
similarity index 100%
rename from patches/server/0642-Update-head-rotation-in-missing-places.patch
rename to patches/server/0641-Update-head-rotation-in-missing-places.patch
diff --git a/patches/server/0643-prevent-unintended-light-block-manipulation.patch b/patches/server/0642-prevent-unintended-light-block-manipulation.patch
similarity index 100%
rename from patches/server/0643-prevent-unintended-light-block-manipulation.patch
rename to patches/server/0642-prevent-unintended-light-block-manipulation.patch
diff --git a/patches/server/0644-Fix-CraftCriteria-defaults-map.patch b/patches/server/0643-Fix-CraftCriteria-defaults-map.patch
similarity index 100%
rename from patches/server/0644-Fix-CraftCriteria-defaults-map.patch
rename to patches/server/0643-Fix-CraftCriteria-defaults-map.patch
diff --git a/patches/server/0645-Fix-upstreams-block-state-factories.patch b/patches/server/0644-Fix-upstreams-block-state-factories.patch
similarity index 100%
rename from patches/server/0645-Fix-upstreams-block-state-factories.patch
rename to patches/server/0644-Fix-upstreams-block-state-factories.patch
diff --git a/patches/server/0646-Configurable-feature-seeds.patch b/patches/server/0645-Configurable-feature-seeds.patch
similarity index 100%
rename from patches/server/0646-Configurable-feature-seeds.patch
rename to patches/server/0645-Configurable-feature-seeds.patch
diff --git a/patches/server/0647-Add-root-admin-user-detection.patch b/patches/server/0646-Add-root-admin-user-detection.patch
similarity index 100%
rename from patches/server/0647-Add-root-admin-user-detection.patch
rename to patches/server/0646-Add-root-admin-user-detection.patch
diff --git a/patches/server/0648-don-t-attempt-to-teleport-dead-entities.patch b/patches/server/0647-don-t-attempt-to-teleport-dead-entities.patch
similarity index 100%
rename from patches/server/0648-don-t-attempt-to-teleport-dead-entities.patch
rename to patches/server/0647-don-t-attempt-to-teleport-dead-entities.patch
diff --git a/patches/server/0649-Prevent-excessive-velocity-through-repeated-crits.patch b/patches/server/0648-Prevent-excessive-velocity-through-repeated-crits.patch
similarity index 100%
rename from patches/server/0649-Prevent-excessive-velocity-through-repeated-crits.patch
rename to patches/server/0648-Prevent-excessive-velocity-through-repeated-crits.patch
diff --git a/patches/server/0650-Remove-client-side-code-using-deprecated-for-removal.patch b/patches/server/0649-Remove-client-side-code-using-deprecated-for-removal.patch
similarity index 100%
rename from patches/server/0650-Remove-client-side-code-using-deprecated-for-removal.patch
rename to patches/server/0649-Remove-client-side-code-using-deprecated-for-removal.patch
diff --git a/patches/server/0651-Fix-Spigot-growth-modifiers.patch b/patches/server/0650-Fix-Spigot-growth-modifiers.patch
similarity index 100%
rename from patches/server/0651-Fix-Spigot-growth-modifiers.patch
rename to patches/server/0650-Fix-Spigot-growth-modifiers.patch
diff --git a/patches/server/0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch b/patches/server/0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch
similarity index 100%
rename from patches/server/0652-Prevent-ContainerOpenersCounter-openCount-from-going.patch
rename to patches/server/0651-Prevent-ContainerOpenersCounter-openCount-from-going.patch
diff --git a/patches/server/0653-Add-PlayerItemFrameChangeEvent.patch b/patches/server/0652-Add-PlayerItemFrameChangeEvent.patch
similarity index 100%
rename from patches/server/0653-Add-PlayerItemFrameChangeEvent.patch
rename to patches/server/0652-Add-PlayerItemFrameChangeEvent.patch
diff --git a/patches/server/0654-Optimize-HashMapPalette.patch b/patches/server/0653-Optimize-HashMapPalette.patch
similarity index 100%
rename from patches/server/0654-Optimize-HashMapPalette.patch
rename to patches/server/0653-Optimize-HashMapPalette.patch
diff --git a/patches/server/0655-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/server/0654-Allow-delegation-to-vanilla-chunk-gen.patch
similarity index 100%
rename from patches/server/0655-Allow-delegation-to-vanilla-chunk-gen.patch
rename to patches/server/0654-Allow-delegation-to-vanilla-chunk-gen.patch
diff --git a/patches/server/0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch b/patches/server/0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
similarity index 100%
rename from patches/server/0656-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
rename to patches/server/0655-Fix-ChunkSnapshot-isSectionEmpty-int-and-optimize-Pa.patch
diff --git a/patches/server/0657-Add-more-Campfire-API.patch b/patches/server/0656-Add-more-Campfire-API.patch
similarity index 100%
rename from patches/server/0657-Add-more-Campfire-API.patch
rename to patches/server/0656-Add-more-Campfire-API.patch
diff --git a/patches/server/0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch b/patches/server/0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
similarity index 100%
rename from patches/server/0658-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
rename to patches/server/0657-Only-write-chunk-data-to-disk-if-it-serializes-witho.patch
diff --git a/patches/server/0659-Forward-CraftEntity-in-teleport-command.patch b/patches/server/0658-Forward-CraftEntity-in-teleport-command.patch
similarity index 100%
rename from patches/server/0659-Forward-CraftEntity-in-teleport-command.patch
rename to patches/server/0658-Forward-CraftEntity-in-teleport-command.patch
diff --git a/patches/server/0660-Improve-scoreboard-entries.patch b/patches/server/0659-Improve-scoreboard-entries.patch
similarity index 100%
rename from patches/server/0660-Improve-scoreboard-entries.patch
rename to patches/server/0659-Improve-scoreboard-entries.patch
diff --git a/patches/server/0661-Entity-powdered-snow-API.patch b/patches/server/0660-Entity-powdered-snow-API.patch
similarity index 100%
rename from patches/server/0661-Entity-powdered-snow-API.patch
rename to patches/server/0660-Entity-powdered-snow-API.patch
diff --git a/patches/server/0662-Add-API-for-item-entity-health.patch b/patches/server/0661-Add-API-for-item-entity-health.patch
similarity index 100%
rename from patches/server/0662-Add-API-for-item-entity-health.patch
rename to patches/server/0661-Add-API-for-item-entity-health.patch
diff --git a/patches/server/0663-Configurable-max-block-light-for-monster-spawning.patch b/patches/server/0662-Configurable-max-block-light-for-monster-spawning.patch
similarity index 100%
rename from patches/server/0663-Configurable-max-block-light-for-monster-spawning.patch
rename to patches/server/0662-Configurable-max-block-light-for-monster-spawning.patch
diff --git a/patches/server/0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch b/patches/server/0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
similarity index 100%
rename from patches/server/0664-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
rename to patches/server/0663-Fix-sticky-pistons-and-BlockPistonRetractEvent.patch
diff --git a/patches/server/0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/server/0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
similarity index 100%
rename from patches/server/0665-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
rename to patches/server/0664-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/server/0666-Bucketable-API.patch b/patches/server/0665-Bucketable-API.patch
similarity index 100%
rename from patches/server/0666-Bucketable-API.patch
rename to patches/server/0665-Bucketable-API.patch
diff --git a/patches/server/0667-Validate-usernames.patch b/patches/server/0666-Validate-usernames.patch
similarity index 100%
rename from patches/server/0667-Validate-usernames.patch
rename to patches/server/0666-Validate-usernames.patch
diff --git a/patches/server/0668-Make-water-animal-spawn-height-configurable.patch b/patches/server/0667-Make-water-animal-spawn-height-configurable.patch
similarity index 100%
rename from patches/server/0668-Make-water-animal-spawn-height-configurable.patch
rename to patches/server/0667-Make-water-animal-spawn-height-configurable.patch
diff --git a/patches/server/0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/server/0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
similarity index 100%
rename from patches/server/0669-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
rename to patches/server/0668-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/server/0670-Add-config-option-for-worlds-affected-by-time-cmd.patch b/patches/server/0669-Add-config-option-for-worlds-affected-by-time-cmd.patch
similarity index 100%
rename from patches/server/0670-Add-config-option-for-worlds-affected-by-time-cmd.patch
rename to patches/server/0669-Add-config-option-for-worlds-affected-by-time-cmd.patch
diff --git a/patches/server/0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch b/patches/server/0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
similarity index 100%
rename from patches/server/0671-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
rename to patches/server/0670-Add-missing-IAE-check-for-PersistentDataContainer-ha.patch
diff --git a/patches/server/0672-Multiple-Entries-with-Scoreboards.patch b/patches/server/0671-Multiple-Entries-with-Scoreboards.patch
similarity index 100%
rename from patches/server/0672-Multiple-Entries-with-Scoreboards.patch
rename to patches/server/0671-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/server/0673-Reset-placed-block-on-exception.patch b/patches/server/0672-Reset-placed-block-on-exception.patch
similarity index 100%
rename from patches/server/0673-Reset-placed-block-on-exception.patch
rename to patches/server/0672-Reset-placed-block-on-exception.patch
diff --git a/patches/server/0674-Add-configurable-height-for-slime-spawn.patch b/patches/server/0673-Add-configurable-height-for-slime-spawn.patch
similarity index 100%
rename from patches/server/0674-Add-configurable-height-for-slime-spawn.patch
rename to patches/server/0673-Add-configurable-height-for-slime-spawn.patch
diff --git a/patches/server/0675-Fix-xp-reward-for-baby-zombies.patch b/patches/server/0674-Fix-xp-reward-for-baby-zombies.patch
similarity index 100%
rename from patches/server/0675-Fix-xp-reward-for-baby-zombies.patch
rename to patches/server/0674-Fix-xp-reward-for-baby-zombies.patch
diff --git a/patches/server/0676-Multi-Block-Change-API-Implementation.patch b/patches/server/0675-Multi-Block-Change-API-Implementation.patch
similarity index 100%
rename from patches/server/0676-Multi-Block-Change-API-Implementation.patch
rename to patches/server/0675-Multi-Block-Change-API-Implementation.patch
diff --git a/patches/server/0677-Fix-NotePlayEvent.patch b/patches/server/0676-Fix-NotePlayEvent.patch
similarity index 100%
rename from patches/server/0677-Fix-NotePlayEvent.patch
rename to patches/server/0676-Fix-NotePlayEvent.patch
diff --git a/patches/server/0678-Freeze-Tick-Lock-API.patch b/patches/server/0677-Freeze-Tick-Lock-API.patch
similarity index 100%
rename from patches/server/0678-Freeze-Tick-Lock-API.patch
rename to patches/server/0677-Freeze-Tick-Lock-API.patch
diff --git a/patches/server/0679-More-PotionEffectType-API.patch b/patches/server/0678-More-PotionEffectType-API.patch
similarity index 100%
rename from patches/server/0679-More-PotionEffectType-API.patch
rename to patches/server/0678-More-PotionEffectType-API.patch
diff --git a/patches/server/0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch b/patches/server/0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
similarity index 100%
rename from patches/server/0680-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
rename to patches/server/0679-Use-a-CHM-for-StructureTemplate.Pallete-cache.patch
diff --git a/patches/server/0681-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/server/0680-API-for-creating-command-sender-which-forwards-feedb.patch
similarity index 100%
rename from patches/server/0681-API-for-creating-command-sender-which-forwards-feedb.patch
rename to patches/server/0680-API-for-creating-command-sender-which-forwards-feedb.patch
diff --git a/patches/server/0682-Add-missing-structure-set-seed-configs.patch b/patches/server/0681-Add-missing-structure-set-seed-configs.patch
similarity index 100%
rename from patches/server/0682-Add-missing-structure-set-seed-configs.patch
rename to patches/server/0681-Add-missing-structure-set-seed-configs.patch
diff --git a/patches/server/0683-Implement-regenerateChunk.patch b/patches/server/0682-Implement-regenerateChunk.patch
similarity index 100%
rename from patches/server/0683-Implement-regenerateChunk.patch
rename to patches/server/0682-Implement-regenerateChunk.patch
diff --git a/patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch b/patches/server/0683-Fix-cancelled-powdered-snow-bucket-placement.patch
similarity index 100%
rename from patches/server/0684-Fix-cancelled-powdered-snow-bucket-placement.patch
rename to patches/server/0683-Fix-cancelled-powdered-snow-bucket-placement.patch
diff --git a/patches/server/0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch b/patches/server/0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
similarity index 100%
rename from patches/server/0685-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
rename to patches/server/0684-Add-missing-Validate-calls-to-CraftServer-getSpawnLi.patch
diff --git a/patches/server/0686-Add-GameEvent-tags.patch b/patches/server/0685-Add-GameEvent-tags.patch
similarity index 100%
rename from patches/server/0686-Add-GameEvent-tags.patch
rename to patches/server/0685-Add-GameEvent-tags.patch
diff --git a/patches/server/0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch b/patches/server/0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
similarity index 100%
rename from patches/server/0687-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
rename to patches/server/0686-Execute-chunk-tasks-fairly-for-worlds-while-waiting-.patch
diff --git a/patches/server/0688-Furnace-RecipesUsed-API.patch b/patches/server/0687-Furnace-RecipesUsed-API.patch
similarity index 100%
rename from patches/server/0688-Furnace-RecipesUsed-API.patch
rename to patches/server/0687-Furnace-RecipesUsed-API.patch
diff --git a/patches/server/0689-Configurable-sculk-sensor-listener-range.patch b/patches/server/0688-Configurable-sculk-sensor-listener-range.patch
similarity index 100%
rename from patches/server/0689-Configurable-sculk-sensor-listener-range.patch
rename to patches/server/0688-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/server/0690-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0689-Add-missing-block-data-mins-and-maxes.patch
similarity index 100%
rename from patches/server/0690-Add-missing-block-data-mins-and-maxes.patch
rename to patches/server/0689-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/server/0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch
similarity index 100%
rename from patches/server/0691-Option-to-have-default-CustomSpawners-in-custom-worl.patch
rename to patches/server/0690-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff --git a/patches/server/0692-Put-world-into-worldlist-before-initing-the-world.patch b/patches/server/0691-Put-world-into-worldlist-before-initing-the-world.patch
similarity index 100%
rename from patches/server/0692-Put-world-into-worldlist-before-initing-the-world.patch
rename to patches/server/0691-Put-world-into-worldlist-before-initing-the-world.patch
diff --git a/patches/server/0693-Fix-Entity-Position-Desync.patch b/patches/server/0692-Fix-Entity-Position-Desync.patch
similarity index 100%
rename from patches/server/0693-Fix-Entity-Position-Desync.patch
rename to patches/server/0692-Fix-Entity-Position-Desync.patch
diff --git a/patches/server/0694-Custom-Potion-Mixes.patch b/patches/server/0693-Custom-Potion-Mixes.patch
similarity index 100%
rename from patches/server/0694-Custom-Potion-Mixes.patch
rename to patches/server/0693-Custom-Potion-Mixes.patch
diff --git a/patches/server/0695-Force-close-world-loading-screen.patch b/patches/server/0694-Force-close-world-loading-screen.patch
similarity index 100%
rename from patches/server/0695-Force-close-world-loading-screen.patch
rename to patches/server/0694-Force-close-world-loading-screen.patch
diff --git a/patches/server/0696-Fix-falling-block-spawn-methods.patch b/patches/server/0695-Fix-falling-block-spawn-methods.patch
similarity index 100%
rename from patches/server/0696-Fix-falling-block-spawn-methods.patch
rename to patches/server/0695-Fix-falling-block-spawn-methods.patch
diff --git a/patches/server/0697-Expose-furnace-minecart-push-values.patch b/patches/server/0696-Expose-furnace-minecart-push-values.patch
similarity index 100%
rename from patches/server/0697-Expose-furnace-minecart-push-values.patch
rename to patches/server/0696-Expose-furnace-minecart-push-values.patch
diff --git a/patches/server/0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch b/patches/server/0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
similarity index 100%
rename from patches/server/0698-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
rename to patches/server/0697-Fix-cancelling-ProjectileHitEvent-for-piercing-arrow.patch
diff --git a/patches/server/0699-More-Projectile-API.patch b/patches/server/0698-More-Projectile-API.patch
similarity index 100%
rename from patches/server/0699-More-Projectile-API.patch
rename to patches/server/0698-More-Projectile-API.patch
diff --git a/patches/server/0700-Fix-swamp-hut-cat-generation-deadlock.patch b/patches/server/0699-Fix-swamp-hut-cat-generation-deadlock.patch
similarity index 100%
rename from patches/server/0700-Fix-swamp-hut-cat-generation-deadlock.patch
rename to patches/server/0699-Fix-swamp-hut-cat-generation-deadlock.patch
diff --git a/patches/server/0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch b/patches/server/0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch
similarity index 100%
rename from patches/server/0701-Don-t-allow-vehicle-movement-from-players-while-tele.patch
rename to patches/server/0700-Don-t-allow-vehicle-movement-from-players-while-tele.patch
diff --git a/patches/server/0702-Implement-getComputedBiome-API.patch b/patches/server/0701-Implement-getComputedBiome-API.patch
similarity index 100%
rename from patches/server/0702-Implement-getComputedBiome-API.patch
rename to patches/server/0701-Implement-getComputedBiome-API.patch
diff --git a/patches/server/0703-Make-some-itemstacks-nonnull.patch b/patches/server/0702-Make-some-itemstacks-nonnull.patch
similarity index 100%
rename from patches/server/0703-Make-some-itemstacks-nonnull.patch
rename to patches/server/0702-Make-some-itemstacks-nonnull.patch
diff --git a/patches/server/0704-Implement-enchantWithLevels-API.patch b/patches/server/0703-Implement-enchantWithLevels-API.patch
similarity index 100%
rename from patches/server/0704-Implement-enchantWithLevels-API.patch
rename to patches/server/0703-Implement-enchantWithLevels-API.patch
diff --git a/patches/server/0705-Fix-saving-in-unloadWorld.patch b/patches/server/0704-Fix-saving-in-unloadWorld.patch
similarity index 100%
rename from patches/server/0705-Fix-saving-in-unloadWorld.patch
rename to patches/server/0704-Fix-saving-in-unloadWorld.patch
diff --git a/patches/server/0706-Buffer-OOB-setBlock-calls.patch b/patches/server/0705-Buffer-OOB-setBlock-calls.patch
similarity index 100%
rename from patches/server/0706-Buffer-OOB-setBlock-calls.patch
rename to patches/server/0705-Buffer-OOB-setBlock-calls.patch
diff --git a/patches/server/0707-Add-TameableDeathMessageEvent.patch b/patches/server/0706-Add-TameableDeathMessageEvent.patch
similarity index 100%
rename from patches/server/0707-Add-TameableDeathMessageEvent.patch
rename to patches/server/0706-Add-TameableDeathMessageEvent.patch
diff --git a/patches/server/0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch b/patches/server/0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch
similarity index 100%
rename from patches/server/0708-Fix-new-block-data-for-EntityChangeBlockEvent.patch
rename to patches/server/0707-Fix-new-block-data-for-EntityChangeBlockEvent.patch
diff --git a/patches/server/0709-fix-player-loottables-running-when-mob-loot-gamerule.patch b/patches/server/0708-fix-player-loottables-running-when-mob-loot-gamerule.patch
similarity index 100%
rename from patches/server/0709-fix-player-loottables-running-when-mob-loot-gamerule.patch
rename to patches/server/0708-fix-player-loottables-running-when-mob-loot-gamerule.patch
diff --git a/patches/server/0710-Ensure-entity-passenger-world-matches-ridden-entity.patch b/patches/server/0709-Ensure-entity-passenger-world-matches-ridden-entity.patch
similarity index 100%
rename from patches/server/0710-Ensure-entity-passenger-world-matches-ridden-entity.patch
rename to patches/server/0709-Ensure-entity-passenger-world-matches-ridden-entity.patch
diff --git a/patches/server/0711-cache-resource-keys.patch b/patches/server/0710-cache-resource-keys.patch
similarity index 100%
rename from patches/server/0711-cache-resource-keys.patch
rename to patches/server/0710-cache-resource-keys.patch
diff --git a/patches/server/0712-Allow-changing-the-EnderDragon-podium.patch b/patches/server/0711-Allow-changing-the-EnderDragon-podium.patch
similarity index 100%
rename from patches/server/0712-Allow-changing-the-EnderDragon-podium.patch
rename to patches/server/0711-Allow-changing-the-EnderDragon-podium.patch
diff --git a/patches/server/0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch b/patches/server/0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
similarity index 100%
rename from patches/server/0713-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
rename to patches/server/0712-Fix-NBT-pieces-overriding-a-block-entity-during-worl.patch
diff --git a/patches/server/0714-Prevent-tile-entity-copies-loading-chunks.patch b/patches/server/0713-Prevent-tile-entity-copies-loading-chunks.patch
similarity index 100%
rename from patches/server/0714-Prevent-tile-entity-copies-loading-chunks.patch
rename to patches/server/0713-Prevent-tile-entity-copies-loading-chunks.patch
diff --git a/patches/server/0715-Use-username-instead-of-display-name-in-PlayerList-g.patch b/patches/server/0714-Use-username-instead-of-display-name-in-PlayerList-g.patch
similarity index 100%
rename from patches/server/0715-Use-username-instead-of-display-name-in-PlayerList-g.patch
rename to patches/server/0714-Use-username-instead-of-display-name-in-PlayerList-g.patch
diff --git a/patches/server/0716-Expand-PlayerItemDamageEvent.patch b/patches/server/0715-Expand-PlayerItemDamageEvent.patch
similarity index 100%
rename from patches/server/0716-Expand-PlayerItemDamageEvent.patch
rename to patches/server/0715-Expand-PlayerItemDamageEvent.patch
diff --git a/patches/server/0717-WorldCreator-keepSpawnLoaded.patch b/patches/server/0716-WorldCreator-keepSpawnLoaded.patch
similarity index 100%
rename from patches/server/0717-WorldCreator-keepSpawnLoaded.patch
rename to patches/server/0716-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/server/0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch b/patches/server/0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
similarity index 100%
rename from patches/server/0718-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
rename to patches/server/0717-Fix-CME-in-CraftPersistentDataTypeRegistry.patch
diff --git a/patches/server/0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch b/patches/server/0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
similarity index 100%
rename from patches/server/0719-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
rename to patches/server/0718-Trigger-bee_nest_destroyed-trigger-in-the-correct-pl.patch
diff --git a/patches/server/0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/server/0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch
similarity index 100%
rename from patches/server/0720-Add-EntityDyeEvent-and-CollarColorable-interface.patch
rename to patches/server/0719-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/server/0721-Fire-CauldronLevelChange-on-initial-fill.patch b/patches/server/0720-Fire-CauldronLevelChange-on-initial-fill.patch
similarity index 100%
rename from patches/server/0721-Fire-CauldronLevelChange-on-initial-fill.patch
rename to patches/server/0720-Fire-CauldronLevelChange-on-initial-fill.patch
diff --git a/patches/server/0722-fix-powder-snow-cauldrons-not-turning-to-water.patch b/patches/server/0721-fix-powder-snow-cauldrons-not-turning-to-water.patch
similarity index 100%
rename from patches/server/0722-fix-powder-snow-cauldrons-not-turning-to-water.patch
rename to patches/server/0721-fix-powder-snow-cauldrons-not-turning-to-water.patch
diff --git a/patches/server/0723-Add-PlayerStopUsingItemEvent.patch b/patches/server/0722-Add-PlayerStopUsingItemEvent.patch
similarity index 100%
rename from patches/server/0723-Add-PlayerStopUsingItemEvent.patch
rename to patches/server/0722-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/server/0724-Don-t-tick-markers.patch b/patches/server/0723-Don-t-tick-markers.patch
similarity index 100%
rename from patches/server/0724-Don-t-tick-markers.patch
rename to patches/server/0723-Don-t-tick-markers.patch
diff --git a/patches/server/0725-Expand-FallingBlock-API.patch b/patches/server/0724-Expand-FallingBlock-API.patch
similarity index 100%
rename from patches/server/0725-Expand-FallingBlock-API.patch
rename to patches/server/0724-Expand-FallingBlock-API.patch
diff --git a/patches/server/0726-Add-support-for-Proxy-Protocol.patch b/patches/server/0725-Add-support-for-Proxy-Protocol.patch
similarity index 100%
rename from patches/server/0726-Add-support-for-Proxy-Protocol.patch
rename to patches/server/0725-Add-support-for-Proxy-Protocol.patch
diff --git a/patches/server/0727-Fix-OfflinePlayer-getBedSpawnLocation.patch b/patches/server/0726-Fix-OfflinePlayer-getBedSpawnLocation.patch
similarity index 100%
rename from patches/server/0727-Fix-OfflinePlayer-getBedSpawnLocation.patch
rename to patches/server/0726-Fix-OfflinePlayer-getBedSpawnLocation.patch
diff --git a/patches/server/0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch b/patches/server/0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
similarity index 100%
rename from patches/server/0728-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
rename to patches/server/0727-Fix-FurnaceInventory-for-smokers-and-blast-furnaces.patch
diff --git a/patches/server/0729-Sanitize-sent-BlockEntity-NBT.patch b/patches/server/0728-Sanitize-sent-BlockEntity-NBT.patch
similarity index 100%
rename from patches/server/0729-Sanitize-sent-BlockEntity-NBT.patch
rename to patches/server/0728-Sanitize-sent-BlockEntity-NBT.patch
diff --git a/patches/server/0730-Disable-component-selector-resolving-in-books-by-def.patch b/patches/server/0729-Disable-component-selector-resolving-in-books-by-def.patch
similarity index 100%
rename from patches/server/0730-Disable-component-selector-resolving-in-books-by-def.patch
rename to patches/server/0729-Disable-component-selector-resolving-in-books-by-def.patch
diff --git a/patches/server/0731-Prevent-entity-loading-causing-async-lookups.patch b/patches/server/0730-Prevent-entity-loading-causing-async-lookups.patch
similarity index 100%
rename from patches/server/0731-Prevent-entity-loading-causing-async-lookups.patch
rename to patches/server/0730-Prevent-entity-loading-causing-async-lookups.patch
diff --git a/patches/server/0732-Throw-exception-on-world-create-while-being-ticked.patch b/patches/server/0731-Throw-exception-on-world-create-while-being-ticked.patch
similarity index 100%
rename from patches/server/0732-Throw-exception-on-world-create-while-being-ticked.patch
rename to patches/server/0731-Throw-exception-on-world-create-while-being-ticked.patch
diff --git a/patches/server/0733-Dont-resent-entity-on-art-update.patch b/patches/server/0732-Dont-resent-entity-on-art-update.patch
similarity index 100%
rename from patches/server/0733-Dont-resent-entity-on-art-update.patch
rename to patches/server/0732-Dont-resent-entity-on-art-update.patch
diff --git a/patches/server/0734-Add-WardenAngerChangeEvent.patch b/patches/server/0733-Add-WardenAngerChangeEvent.patch
similarity index 100%
rename from patches/server/0734-Add-WardenAngerChangeEvent.patch
rename to patches/server/0733-Add-WardenAngerChangeEvent.patch
diff --git a/patches/server/0735-Add-option-for-strict-advancement-dimension-checks.patch b/patches/server/0734-Add-option-for-strict-advancement-dimension-checks.patch
similarity index 100%
rename from patches/server/0735-Add-option-for-strict-advancement-dimension-checks.patch
rename to patches/server/0734-Add-option-for-strict-advancement-dimension-checks.patch
diff --git a/patches/server/0736-Add-missing-important-BlockStateListPopulator-method.patch b/patches/server/0735-Add-missing-important-BlockStateListPopulator-method.patch
similarity index 100%
rename from patches/server/0736-Add-missing-important-BlockStateListPopulator-method.patch
rename to patches/server/0735-Add-missing-important-BlockStateListPopulator-method.patch
diff --git a/patches/server/0737-Nameable-Banner-API.patch b/patches/server/0736-Nameable-Banner-API.patch
similarity index 100%
rename from patches/server/0737-Nameable-Banner-API.patch
rename to patches/server/0736-Nameable-Banner-API.patch
diff --git a/patches/server/0738-Don-t-broadcast-messages-to-command-blocks.patch b/patches/server/0737-Don-t-broadcast-messages-to-command-blocks.patch
similarity index 100%
rename from patches/server/0738-Don-t-broadcast-messages-to-command-blocks.patch
rename to patches/server/0737-Don-t-broadcast-messages-to-command-blocks.patch
diff --git a/patches/server/0739-Prevent-empty-items-from-being-added-to-world.patch b/patches/server/0738-Prevent-empty-items-from-being-added-to-world.patch
similarity index 100%
rename from patches/server/0739-Prevent-empty-items-from-being-added-to-world.patch
rename to patches/server/0738-Prevent-empty-items-from-being-added-to-world.patch
diff --git a/patches/server/0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch b/patches/server/0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
similarity index 100%
rename from patches/server/0740-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
rename to patches/server/0739-Fix-CCE-for-SplashPotion-and-LingeringPotion-spawnin.patch
diff --git a/patches/server/0741-Add-Player-getFishHook.patch b/patches/server/0740-Add-Player-getFishHook.patch
similarity index 100%
rename from patches/server/0741-Add-Player-getFishHook.patch
rename to patches/server/0740-Add-Player-getFishHook.patch
diff --git a/patches/server/0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch b/patches/server/0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
similarity index 100%
rename from patches/server/0742-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
rename to patches/server/0741-Do-not-sync-load-chunk-for-dynamic-game-event-listen.patch
diff --git a/patches/server/0743-Add-various-missing-EntityDropItemEvent-calls.patch b/patches/server/0742-Add-various-missing-EntityDropItemEvent-calls.patch
similarity index 100%
rename from patches/server/0743-Add-various-missing-EntityDropItemEvent-calls.patch
rename to patches/server/0742-Add-various-missing-EntityDropItemEvent-calls.patch
diff --git a/patches/server/0744-Fix-Bee-flower-NPE.patch b/patches/server/0743-Fix-Bee-flower-NPE.patch
similarity index 100%
rename from patches/server/0744-Fix-Bee-flower-NPE.patch
rename to patches/server/0743-Fix-Bee-flower-NPE.patch
diff --git a/patches/server/0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch b/patches/server/0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
similarity index 100%
rename from patches/server/0745-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
rename to patches/server/0744-Fix-Spigot-Config-not-using-commands.spam-exclusions.patch
diff --git a/patches/server/0746-More-Teleport-API.patch b/patches/server/0745-More-Teleport-API.patch
similarity index 100%
rename from patches/server/0746-More-Teleport-API.patch
rename to patches/server/0745-More-Teleport-API.patch
diff --git a/patches/server/0747-Add-EntityPortalReadyEvent.patch b/patches/server/0746-Add-EntityPortalReadyEvent.patch
similarity index 100%
rename from patches/server/0747-Add-EntityPortalReadyEvent.patch
rename to patches/server/0746-Add-EntityPortalReadyEvent.patch
diff --git a/patches/server/0748-Don-t-use-level-random-in-entity-constructors.patch b/patches/server/0747-Don-t-use-level-random-in-entity-constructors.patch
similarity index 100%
rename from patches/server/0748-Don-t-use-level-random-in-entity-constructors.patch
rename to patches/server/0747-Don-t-use-level-random-in-entity-constructors.patch
diff --git a/patches/server/0749-Send-block-entities-after-destroy-prediction.patch b/patches/server/0748-Send-block-entities-after-destroy-prediction.patch
similarity index 100%
rename from patches/server/0749-Send-block-entities-after-destroy-prediction.patch
rename to patches/server/0748-Send-block-entities-after-destroy-prediction.patch
diff --git a/patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch b/patches/server/0749-Warn-on-plugins-accessing-faraway-chunks.patch
similarity index 100%
rename from patches/server/0750-Warn-on-plugins-accessing-faraway-chunks.patch
rename to patches/server/0749-Warn-on-plugins-accessing-faraway-chunks.patch
diff --git a/patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch b/patches/server/0750-Custom-Chat-Completion-Suggestions-API.patch
similarity index 100%
rename from patches/server/0751-Custom-Chat-Completion-Suggestions-API.patch
rename to patches/server/0750-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/server/0752-Add-and-fix-missing-BlockFadeEvents.patch b/patches/server/0751-Add-and-fix-missing-BlockFadeEvents.patch
similarity index 100%
rename from patches/server/0752-Add-and-fix-missing-BlockFadeEvents.patch
rename to patches/server/0751-Add-and-fix-missing-BlockFadeEvents.patch
diff --git a/patches/server/0753-Collision-API.patch b/patches/server/0752-Collision-API.patch
similarity index 100%
rename from patches/server/0753-Collision-API.patch
rename to patches/server/0752-Collision-API.patch
diff --git a/patches/server/0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch b/patches/server/0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
similarity index 100%
rename from patches/server/0754-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
rename to patches/server/0753-Fix-suggest-command-message-for-brigadier-syntax-exc.patch
diff --git a/patches/server/0755-Block-Ticking-API.patch b/patches/server/0754-Block-Ticking-API.patch
similarity index 100%
rename from patches/server/0755-Block-Ticking-API.patch
rename to patches/server/0754-Block-Ticking-API.patch
diff --git a/patches/server/0756-Add-Velocity-IP-Forwarding-Support.patch b/patches/server/0755-Add-Velocity-IP-Forwarding-Support.patch
similarity index 100%
rename from patches/server/0756-Add-Velocity-IP-Forwarding-Support.patch
rename to patches/server/0755-Add-Velocity-IP-Forwarding-Support.patch
diff --git a/patches/server/0757-Add-NamespacedKey-biome-methods.patch b/patches/server/0756-Add-NamespacedKey-biome-methods.patch
similarity index 92%
rename from patches/server/0757-Add-NamespacedKey-biome-methods.patch
rename to patches/server/0756-Add-NamespacedKey-biome-methods.patch
index 910ff7350d..b870c787cc 100644
--- a/patches/server/0757-Add-NamespacedKey-biome-methods.patch
+++ b/patches/server/0756-Add-NamespacedKey-biome-methods.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Add NamespacedKey biome methods
 Co-authored-by: Thonk <30448663+ExcessiveAmountsOfZombies@users.noreply.github.com>
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index af29b750a066ba44d6869eb8d466c3028c5c874d..7852b06b3cd3bb8ca761e9d05b172a27f9ef6330 100644
+index 365f7846d4c522811cf992ea1a2da67b025661b9..c4e517ef6cf5cd4975846459cf66ebd4db66a805 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -618,6 +618,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -604,6 +604,19 @@ public final class CraftMagicNumbers implements UnsafeValues {
          Preconditions.checkArgument(material.isBlock(), material + " is not a block");
          return getBlock(material).hasCollision;
      }
diff --git a/patches/server/0758-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0757-Fix-plugin-loggers-on-server-shutdown.patch
similarity index 100%
rename from patches/server/0758-Fix-plugin-loggers-on-server-shutdown.patch
rename to patches/server/0757-Fix-plugin-loggers-on-server-shutdown.patch
diff --git a/patches/server/0759-Stop-large-look-changes-from-crashing-the-server.patch b/patches/server/0758-Stop-large-look-changes-from-crashing-the-server.patch
similarity index 100%
rename from patches/server/0759-Stop-large-look-changes-from-crashing-the-server.patch
rename to patches/server/0758-Stop-large-look-changes-from-crashing-the-server.patch
diff --git a/patches/server/0760-Fire-EntityChangeBlockEvent-in-more-places.patch b/patches/server/0759-Fire-EntityChangeBlockEvent-in-more-places.patch
similarity index 100%
rename from patches/server/0760-Fire-EntityChangeBlockEvent-in-more-places.patch
rename to patches/server/0759-Fire-EntityChangeBlockEvent-in-more-places.patch
diff --git a/patches/server/0761-Missing-eating-regain-reason.patch b/patches/server/0760-Missing-eating-regain-reason.patch
similarity index 100%
rename from patches/server/0761-Missing-eating-regain-reason.patch
rename to patches/server/0760-Missing-eating-regain-reason.patch
diff --git a/patches/server/0762-Missing-effect-cause.patch b/patches/server/0761-Missing-effect-cause.patch
similarity index 100%
rename from patches/server/0762-Missing-effect-cause.patch
rename to patches/server/0761-Missing-effect-cause.patch
diff --git a/patches/server/0763-Added-byte-array-serialization-deserialization-for-P.patch b/patches/server/0762-Added-byte-array-serialization-deserialization-for-P.patch
similarity index 100%
rename from patches/server/0763-Added-byte-array-serialization-deserialization-for-P.patch
rename to patches/server/0762-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/server/0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/server/0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
similarity index 100%
rename from patches/server/0764-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
rename to patches/server/0763-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/server/0765-Call-BlockPhysicsEvent-more-often.patch b/patches/server/0764-Call-BlockPhysicsEvent-more-often.patch
similarity index 100%
rename from patches/server/0765-Call-BlockPhysicsEvent-more-often.patch
rename to patches/server/0764-Call-BlockPhysicsEvent-more-often.patch
diff --git a/patches/server/0766-Configurable-chat-thread-limit.patch b/patches/server/0765-Configurable-chat-thread-limit.patch
similarity index 100%
rename from patches/server/0766-Configurable-chat-thread-limit.patch
rename to patches/server/0765-Configurable-chat-thread-limit.patch
diff --git a/patches/server/0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch b/patches/server/0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
similarity index 100%
rename from patches/server/0767-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
rename to patches/server/0766-Mitigate-effects-of-WorldCreator-keepSpawnLoaded-ret.patch
diff --git a/patches/server/0768-fix-Jigsaw-block-kicking-user.patch b/patches/server/0767-fix-Jigsaw-block-kicking-user.patch
similarity index 100%
rename from patches/server/0768-fix-Jigsaw-block-kicking-user.patch
rename to patches/server/0767-fix-Jigsaw-block-kicking-user.patch
diff --git a/patches/server/0769-use-BlockFormEvent-for-mud-converting-into-clay.patch b/patches/server/0768-use-BlockFormEvent-for-mud-converting-into-clay.patch
similarity index 100%
rename from patches/server/0769-use-BlockFormEvent-for-mud-converting-into-clay.patch
rename to patches/server/0768-use-BlockFormEvent-for-mud-converting-into-clay.patch
diff --git a/patches/server/0770-Add-getDrops-to-BlockState.patch b/patches/server/0769-Add-getDrops-to-BlockState.patch
similarity index 100%
rename from patches/server/0770-Add-getDrops-to-BlockState.patch
rename to patches/server/0769-Add-getDrops-to-BlockState.patch
diff --git a/patches/server/0771-Fix-a-bunch-of-vanilla-bugs.patch b/patches/server/0770-Fix-a-bunch-of-vanilla-bugs.patch
similarity index 100%
rename from patches/server/0771-Fix-a-bunch-of-vanilla-bugs.patch
rename to patches/server/0770-Fix-a-bunch-of-vanilla-bugs.patch
diff --git a/patches/server/0772-Remove-unnecessary-onTrackingStart-during-navigation.patch b/patches/server/0771-Remove-unnecessary-onTrackingStart-during-navigation.patch
similarity index 100%
rename from patches/server/0772-Remove-unnecessary-onTrackingStart-during-navigation.patch
rename to patches/server/0771-Remove-unnecessary-onTrackingStart-during-navigation.patch
diff --git a/patches/server/0773-Fix-custom-piglin-loved-items.patch b/patches/server/0772-Fix-custom-piglin-loved-items.patch
similarity index 100%
rename from patches/server/0773-Fix-custom-piglin-loved-items.patch
rename to patches/server/0772-Fix-custom-piglin-loved-items.patch
diff --git a/patches/server/0774-EntityPickupItemEvent-fixes.patch b/patches/server/0773-EntityPickupItemEvent-fixes.patch
similarity index 100%
rename from patches/server/0774-EntityPickupItemEvent-fixes.patch
rename to patches/server/0773-EntityPickupItemEvent-fixes.patch
diff --git a/patches/server/0775-Correctly-handle-interactions-with-items-on-cooldown.patch b/patches/server/0774-Correctly-handle-interactions-with-items-on-cooldown.patch
similarity index 100%
rename from patches/server/0775-Correctly-handle-interactions-with-items-on-cooldown.patch
rename to patches/server/0774-Correctly-handle-interactions-with-items-on-cooldown.patch
diff --git a/patches/server/0776-Add-PlayerInventorySlotChangeEvent.patch b/patches/server/0775-Add-PlayerInventorySlotChangeEvent.patch
similarity index 100%
rename from patches/server/0776-Add-PlayerInventorySlotChangeEvent.patch
rename to patches/server/0775-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/server/0777-Elder-Guardian-appearance-API.patch b/patches/server/0776-Elder-Guardian-appearance-API.patch
similarity index 100%
rename from patches/server/0777-Elder-Guardian-appearance-API.patch
rename to patches/server/0776-Elder-Guardian-appearance-API.patch
diff --git a/patches/server/0778-Allow-changing-bed-s-occupied-property.patch b/patches/server/0777-Allow-changing-bed-s-occupied-property.patch
similarity index 100%
rename from patches/server/0778-Allow-changing-bed-s-occupied-property.patch
rename to patches/server/0777-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/server/0779-Add-entity-knockback-API.patch b/patches/server/0778-Add-entity-knockback-API.patch
similarity index 100%
rename from patches/server/0779-Add-entity-knockback-API.patch
rename to patches/server/0778-Add-entity-knockback-API.patch
diff --git a/patches/server/0780-Detect-headless-JREs.patch b/patches/server/0779-Detect-headless-JREs.patch
similarity index 100%
rename from patches/server/0780-Detect-headless-JREs.patch
rename to patches/server/0779-Detect-headless-JREs.patch
diff --git a/patches/server/0781-fix-entity-vehicle-collision-event-not-called.patch b/patches/server/0780-fix-entity-vehicle-collision-event-not-called.patch
similarity index 100%
rename from patches/server/0781-fix-entity-vehicle-collision-event-not-called.patch
rename to patches/server/0780-fix-entity-vehicle-collision-event-not-called.patch
diff --git a/patches/server/0782-Add-EntityToggleSitEvent.patch b/patches/server/0781-Add-EntityToggleSitEvent.patch
similarity index 100%
rename from patches/server/0782-Add-EntityToggleSitEvent.patch
rename to patches/server/0781-Add-EntityToggleSitEvent.patch
diff --git a/patches/server/0783-Add-fire-tick-delay-option.patch b/patches/server/0782-Add-fire-tick-delay-option.patch
similarity index 100%
rename from patches/server/0783-Add-fire-tick-delay-option.patch
rename to patches/server/0782-Add-fire-tick-delay-option.patch
diff --git a/patches/server/0784-Add-Moving-Piston-API.patch b/patches/server/0783-Add-Moving-Piston-API.patch
similarity index 100%
rename from patches/server/0784-Add-Moving-Piston-API.patch
rename to patches/server/0783-Add-Moving-Piston-API.patch
diff --git a/patches/server/0785-Ignore-impossible-spawn-tick.patch b/patches/server/0784-Ignore-impossible-spawn-tick.patch
similarity index 100%
rename from patches/server/0785-Ignore-impossible-spawn-tick.patch
rename to patches/server/0784-Ignore-impossible-spawn-tick.patch
diff --git a/patches/server/0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch b/patches/server/0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
similarity index 100%
rename from patches/server/0786-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
rename to patches/server/0785-Fix-EntityArgument-suggestion-permissions-to-align-w.patch
diff --git a/patches/server/0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch b/patches/server/0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
similarity index 100%
rename from patches/server/0787-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
rename to patches/server/0786-Fix-EntityCombustEvent-cancellation-cant-fully-preve.patch
diff --git a/patches/server/0788-Add-PrePlayerAttackEntityEvent.patch b/patches/server/0787-Add-PrePlayerAttackEntityEvent.patch
similarity index 100%
rename from patches/server/0788-Add-PrePlayerAttackEntityEvent.patch
rename to patches/server/0787-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/server/0789-ensure-reset-EnderDragon-boss-event-name.patch b/patches/server/0788-ensure-reset-EnderDragon-boss-event-name.patch
similarity index 100%
rename from patches/server/0789-ensure-reset-EnderDragon-boss-event-name.patch
rename to patches/server/0788-ensure-reset-EnderDragon-boss-event-name.patch
diff --git a/patches/server/0790-fix-MC-252817-green-map-markers-do-not-disappear.patch b/patches/server/0789-fix-MC-252817-green-map-markers-do-not-disappear.patch
similarity index 100%
rename from patches/server/0790-fix-MC-252817-green-map-markers-do-not-disappear.patch
rename to patches/server/0789-fix-MC-252817-green-map-markers-do-not-disappear.patch
diff --git a/patches/server/0791-Add-Player-Warden-Warning-API.patch b/patches/server/0790-Add-Player-Warden-Warning-API.patch
similarity index 100%
rename from patches/server/0791-Add-Player-Warden-Warning-API.patch
rename to patches/server/0790-Add-Player-Warden-Warning-API.patch
diff --git a/patches/server/0792-More-vanilla-friendly-methods-to-update-trades.patch b/patches/server/0791-More-vanilla-friendly-methods-to-update-trades.patch
similarity index 100%
rename from patches/server/0792-More-vanilla-friendly-methods-to-update-trades.patch
rename to patches/server/0791-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/server/0793-Add-paper-dumplisteners-command.patch b/patches/server/0792-Add-paper-dumplisteners-command.patch
similarity index 100%
rename from patches/server/0793-Add-paper-dumplisteners-command.patch
rename to patches/server/0792-Add-paper-dumplisteners-command.patch
diff --git a/patches/server/0794-check-global-player-list-where-appropriate.patch b/patches/server/0793-check-global-player-list-where-appropriate.patch
similarity index 100%
rename from patches/server/0794-check-global-player-list-where-appropriate.patch
rename to patches/server/0793-check-global-player-list-where-appropriate.patch
diff --git a/patches/server/0795-Fix-async-entity-add-due-to-fungus-trees.patch b/patches/server/0794-Fix-async-entity-add-due-to-fungus-trees.patch
similarity index 100%
rename from patches/server/0795-Fix-async-entity-add-due-to-fungus-trees.patch
rename to patches/server/0794-Fix-async-entity-add-due-to-fungus-trees.patch
diff --git a/patches/server/0796-ItemStack-damage-API.patch b/patches/server/0795-ItemStack-damage-API.patch
similarity index 100%
rename from patches/server/0796-ItemStack-damage-API.patch
rename to patches/server/0795-ItemStack-damage-API.patch
diff --git a/patches/server/0797-Friction-API.patch b/patches/server/0796-Friction-API.patch
similarity index 100%
rename from patches/server/0797-Friction-API.patch
rename to patches/server/0796-Friction-API.patch
diff --git a/patches/server/0798-Ability-to-control-player-s-insomnia-and-phantoms.patch b/patches/server/0797-Ability-to-control-player-s-insomnia-and-phantoms.patch
similarity index 100%
rename from patches/server/0798-Ability-to-control-player-s-insomnia-and-phantoms.patch
rename to patches/server/0797-Ability-to-control-player-s-insomnia-and-phantoms.patch
diff --git a/patches/server/0799-Fix-premature-player-kicks-on-shutdown.patch b/patches/server/0798-Fix-premature-player-kicks-on-shutdown.patch
similarity index 100%
rename from patches/server/0799-Fix-premature-player-kicks-on-shutdown.patch
rename to patches/server/0798-Fix-premature-player-kicks-on-shutdown.patch
diff --git a/patches/server/0800-Sync-offhand-slot-in-menus.patch b/patches/server/0799-Sync-offhand-slot-in-menus.patch
similarity index 100%
rename from patches/server/0800-Sync-offhand-slot-in-menus.patch
rename to patches/server/0799-Sync-offhand-slot-in-menus.patch
diff --git a/patches/server/0801-Player-Entity-Tracking-Events.patch b/patches/server/0800-Player-Entity-Tracking-Events.patch
similarity index 100%
rename from patches/server/0801-Player-Entity-Tracking-Events.patch
rename to patches/server/0800-Player-Entity-Tracking-Events.patch
diff --git a/patches/server/0802-Limit-pet-look-distance.patch b/patches/server/0801-Limit-pet-look-distance.patch
similarity index 100%
rename from patches/server/0802-Limit-pet-look-distance.patch
rename to patches/server/0801-Limit-pet-look-distance.patch
diff --git a/patches/server/0803-Fixes-and-additions-to-the-SpawnReason-API.patch b/patches/server/0802-Fixes-and-additions-to-the-SpawnReason-API.patch
similarity index 100%
rename from patches/server/0803-Fixes-and-additions-to-the-SpawnReason-API.patch
rename to patches/server/0802-Fixes-and-additions-to-the-SpawnReason-API.patch
diff --git a/patches/server/0804-fix-Instruments.patch b/patches/server/0803-fix-Instruments.patch
similarity index 100%
rename from patches/server/0804-fix-Instruments.patch
rename to patches/server/0803-fix-Instruments.patch
diff --git a/patches/server/0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch b/patches/server/0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
similarity index 100%
rename from patches/server/0805-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
rename to patches/server/0804-Improve-inlining-for-some-hot-BlockBehavior-and-Flui.patch
diff --git a/patches/server/0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch b/patches/server/0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
similarity index 100%
rename from patches/server/0806-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
rename to patches/server/0805-Fix-inconsistencies-in-dispense-events-regarding-sta.patch
diff --git a/patches/server/0807-Add-BlockLockCheckEvent.patch b/patches/server/0806-Add-BlockLockCheckEvent.patch
similarity index 100%
rename from patches/server/0807-Add-BlockLockCheckEvent.patch
rename to patches/server/0806-Add-BlockLockCheckEvent.patch
diff --git a/patches/server/0808-Add-Sneaking-API-for-Entities.patch b/patches/server/0807-Add-Sneaking-API-for-Entities.patch
similarity index 100%
rename from patches/server/0808-Add-Sneaking-API-for-Entities.patch
rename to patches/server/0807-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/server/0809-Improve-logging-and-errors.patch b/patches/server/0808-Improve-logging-and-errors.patch
similarity index 100%
rename from patches/server/0809-Improve-logging-and-errors.patch
rename to patches/server/0808-Improve-logging-and-errors.patch
diff --git a/patches/server/0810-Improve-PortalEvents.patch b/patches/server/0809-Improve-PortalEvents.patch
similarity index 100%
rename from patches/server/0810-Improve-PortalEvents.patch
rename to patches/server/0809-Improve-PortalEvents.patch
diff --git a/patches/server/0811-Add-config-option-for-spider-worldborder-climbing.patch b/patches/server/0810-Add-config-option-for-spider-worldborder-climbing.patch
similarity index 100%
rename from patches/server/0811-Add-config-option-for-spider-worldborder-climbing.patch
rename to patches/server/0810-Add-config-option-for-spider-worldborder-climbing.patch
diff --git a/patches/server/0812-Add-missing-SpigotConfig-logCommands-check.patch b/patches/server/0811-Add-missing-SpigotConfig-logCommands-check.patch
similarity index 100%
rename from patches/server/0812-Add-missing-SpigotConfig-logCommands-check.patch
rename to patches/server/0811-Add-missing-SpigotConfig-logCommands-check.patch
diff --git a/patches/server/0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch b/patches/server/0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
similarity index 100%
rename from patches/server/0813-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
rename to patches/server/0812-Fix-NPE-on-Allay-stopDancing-while-not-dancing.patch
diff --git a/patches/server/0814-Flying-Fall-Damage.patch b/patches/server/0813-Flying-Fall-Damage.patch
similarity index 100%
rename from patches/server/0814-Flying-Fall-Damage.patch
rename to patches/server/0813-Flying-Fall-Damage.patch
diff --git a/patches/server/0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch b/patches/server/0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
similarity index 100%
rename from patches/server/0815-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
rename to patches/server/0814-Add-exploded-block-state-to-BlockExplodeEvent-and-En.patch
diff --git a/patches/server/0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch b/patches/server/0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
similarity index 100%
rename from patches/server/0816-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
rename to patches/server/0815-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch
diff --git a/patches/server/0817-config-for-disabling-entity-tag-tags.patch b/patches/server/0816-config-for-disabling-entity-tag-tags.patch
similarity index 100%
rename from patches/server/0817-config-for-disabling-entity-tag-tags.patch
rename to patches/server/0816-config-for-disabling-entity-tag-tags.patch
diff --git a/patches/server/0818-Use-single-player-info-update-packet-on-join.patch b/patches/server/0817-Use-single-player-info-update-packet-on-join.patch
similarity index 100%
rename from patches/server/0818-Use-single-player-info-update-packet-on-join.patch
rename to patches/server/0817-Use-single-player-info-update-packet-on-join.patch
diff --git a/patches/server/0819-Correctly-shrink-items-during-EntityResurrectEvent.patch b/patches/server/0818-Correctly-shrink-items-during-EntityResurrectEvent.patch
similarity index 100%
rename from patches/server/0819-Correctly-shrink-items-during-EntityResurrectEvent.patch
rename to patches/server/0818-Correctly-shrink-items-during-EntityResurrectEvent.patch
diff --git a/patches/server/0820-Win-Screen-API.patch b/patches/server/0819-Win-Screen-API.patch
similarity index 100%
rename from patches/server/0820-Win-Screen-API.patch
rename to patches/server/0819-Win-Screen-API.patch
diff --git a/patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch b/patches/server/0820-Remove-CraftItemStack-setAmount-null-assignment.patch
similarity index 100%
rename from patches/server/0821-Remove-CraftItemStack-setAmount-null-assignment.patch
rename to patches/server/0820-Remove-CraftItemStack-setAmount-null-assignment.patch
diff --git a/patches/server/0822-Fix-force-opening-enchantment-tables.patch b/patches/server/0821-Fix-force-opening-enchantment-tables.patch
similarity index 100%
rename from patches/server/0822-Fix-force-opening-enchantment-tables.patch
rename to patches/server/0821-Fix-force-opening-enchantment-tables.patch
diff --git a/patches/server/0823-Add-Entity-Body-Yaw-API.patch b/patches/server/0822-Add-Entity-Body-Yaw-API.patch
similarity index 100%
rename from patches/server/0823-Add-Entity-Body-Yaw-API.patch
rename to patches/server/0822-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/server/0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch b/patches/server/0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
similarity index 100%
rename from patches/server/0824-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
rename to patches/server/0823-Fix-MC-157464-Prevent-sleeping-villagers-moving-towa.patch
diff --git a/patches/server/0825-Add-EntityFertilizeEggEvent.patch b/patches/server/0824-Add-EntityFertilizeEggEvent.patch
similarity index 100%
rename from patches/server/0825-Add-EntityFertilizeEggEvent.patch
rename to patches/server/0824-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/server/0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch b/patches/server/0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
similarity index 100%
rename from patches/server/0826-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
rename to patches/server/0825-Fix-HumanEntity-drop-not-updating-the-client-inv.patch
diff --git a/patches/server/0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/server/0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
similarity index 100%
rename from patches/server/0827-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
rename to patches/server/0826-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/server/0828-Correctly-handle-ArmorStand-invisibility.patch b/patches/server/0827-Correctly-handle-ArmorStand-invisibility.patch
similarity index 100%
rename from patches/server/0828-Correctly-handle-ArmorStand-invisibility.patch
rename to patches/server/0827-Correctly-handle-ArmorStand-invisibility.patch
diff --git a/patches/server/0829-Fix-advancement-triggers-for-entity-damage.patch b/patches/server/0828-Fix-advancement-triggers-for-entity-damage.patch
similarity index 100%
rename from patches/server/0829-Fix-advancement-triggers-for-entity-damage.patch
rename to patches/server/0828-Fix-advancement-triggers-for-entity-damage.patch
diff --git a/patches/server/0830-Fix-text-display-error-on-spawn.patch b/patches/server/0829-Fix-text-display-error-on-spawn.patch
similarity index 100%
rename from patches/server/0830-Fix-text-display-error-on-spawn.patch
rename to patches/server/0829-Fix-text-display-error-on-spawn.patch
diff --git a/patches/server/0831-Fix-inventories-returning-null-Locations.patch b/patches/server/0830-Fix-inventories-returning-null-Locations.patch
similarity index 100%
rename from patches/server/0831-Fix-inventories-returning-null-Locations.patch
rename to patches/server/0830-Fix-inventories-returning-null-Locations.patch
diff --git a/patches/server/0832-Add-Shearable-API.patch b/patches/server/0831-Add-Shearable-API.patch
similarity index 100%
rename from patches/server/0832-Add-Shearable-API.patch
rename to patches/server/0831-Add-Shearable-API.patch
diff --git a/patches/server/0833-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/server/0832-Fix-SpawnEggMeta-get-setSpawnedType.patch
similarity index 100%
rename from patches/server/0833-Fix-SpawnEggMeta-get-setSpawnedType.patch
rename to patches/server/0832-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/server/0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch b/patches/server/0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
similarity index 100%
rename from patches/server/0834-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
rename to patches/server/0833-Fix-crash-relating-to-bad-recipes-in-furnace-like-ti.patch
diff --git a/patches/server/0835-Treat-sequence-violations-like-they-should-be.patch b/patches/server/0834-Treat-sequence-violations-like-they-should-be.patch
similarity index 100%
rename from patches/server/0835-Treat-sequence-violations-like-they-should-be.patch
rename to patches/server/0834-Treat-sequence-violations-like-they-should-be.patch
diff --git a/patches/server/0836-remove-duplicate-animate-packet-for-records.patch b/patches/server/0835-remove-duplicate-animate-packet-for-records.patch
similarity index 100%
rename from patches/server/0836-remove-duplicate-animate-packet-for-records.patch
rename to patches/server/0835-remove-duplicate-animate-packet-for-records.patch
diff --git a/patches/server/0837-Prevent-causing-expired-keys-from-impacting-new-join.patch b/patches/server/0836-Prevent-causing-expired-keys-from-impacting-new-join.patch
similarity index 100%
rename from patches/server/0837-Prevent-causing-expired-keys-from-impacting-new-join.patch
rename to patches/server/0836-Prevent-causing-expired-keys-from-impacting-new-join.patch
diff --git a/patches/server/0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch b/patches/server/0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
similarity index 100%
rename from patches/server/0838-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
rename to patches/server/0837-Prevent-GameEvents-being-fired-from-unloaded-chunks.patch
diff --git a/patches/server/0839-Use-array-for-gamerule-storage.patch b/patches/server/0838-Use-array-for-gamerule-storage.patch
similarity index 100%
rename from patches/server/0839-Use-array-for-gamerule-storage.patch
rename to patches/server/0838-Use-array-for-gamerule-storage.patch
diff --git a/patches/server/0840-Fix-a-couple-of-upstream-bed-issues.patch b/patches/server/0839-Fix-a-couple-of-upstream-bed-issues.patch
similarity index 100%
rename from patches/server/0840-Fix-a-couple-of-upstream-bed-issues.patch
rename to patches/server/0839-Fix-a-couple-of-upstream-bed-issues.patch
diff --git a/patches/server/0841-Fix-demo-flag-not-enabling-demo-mode.patch b/patches/server/0840-Fix-demo-flag-not-enabling-demo-mode.patch
similarity index 100%
rename from patches/server/0841-Fix-demo-flag-not-enabling-demo-mode.patch
rename to patches/server/0840-Fix-demo-flag-not-enabling-demo-mode.patch
diff --git a/patches/server/0842-Add-Mob-Experience-reward-API.patch b/patches/server/0841-Add-Mob-Experience-reward-API.patch
similarity index 100%
rename from patches/server/0842-Add-Mob-Experience-reward-API.patch
rename to patches/server/0841-Add-Mob-Experience-reward-API.patch
diff --git a/patches/server/0843-Break-redstone-on-top-of-trap-doors-early.patch b/patches/server/0842-Break-redstone-on-top-of-trap-doors-early.patch
similarity index 100%
rename from patches/server/0843-Break-redstone-on-top-of-trap-doors-early.patch
rename to patches/server/0842-Break-redstone-on-top-of-trap-doors-early.patch
diff --git a/patches/server/0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch b/patches/server/0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch
similarity index 100%
rename from patches/server/0844-Avoid-Lazy-Initialization-for-Enum-Fields.patch
rename to patches/server/0843-Avoid-Lazy-Initialization-for-Enum-Fields.patch
diff --git a/patches/server/0845-More-accurate-isInOpenWater-impl.patch b/patches/server/0844-More-accurate-isInOpenWater-impl.patch
similarity index 100%
rename from patches/server/0845-More-accurate-isInOpenWater-impl.patch
rename to patches/server/0844-More-accurate-isInOpenWater-impl.patch
diff --git a/patches/server/0846-Expand-PlayerItemMendEvent.patch b/patches/server/0845-Expand-PlayerItemMendEvent.patch
similarity index 100%
rename from patches/server/0846-Expand-PlayerItemMendEvent.patch
rename to patches/server/0845-Expand-PlayerItemMendEvent.patch
diff --git a/patches/server/0847-Refresh-ProjectileSource-for-projectiles.patch b/patches/server/0846-Refresh-ProjectileSource-for-projectiles.patch
similarity index 100%
rename from patches/server/0847-Refresh-ProjectileSource-for-projectiles.patch
rename to patches/server/0846-Refresh-ProjectileSource-for-projectiles.patch
diff --git a/patches/server/0848-Add-transient-modifier-API.patch b/patches/server/0847-Add-transient-modifier-API.patch
similarity index 100%
rename from patches/server/0848-Add-transient-modifier-API.patch
rename to patches/server/0847-Add-transient-modifier-API.patch
diff --git a/patches/server/0849-Fix-block-place-logic.patch b/patches/server/0848-Fix-block-place-logic.patch
similarity index 100%
rename from patches/server/0849-Fix-block-place-logic.patch
rename to patches/server/0848-Fix-block-place-logic.patch
diff --git a/patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch b/patches/server/0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
similarity index 100%
rename from patches/server/0850-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
rename to patches/server/0849-Fix-spigot-sound-playing-for-BlockItem-ItemStacks.patch
diff --git a/patches/server/0851-Call-BlockGrowEvent-for-missing-blocks.patch b/patches/server/0850-Call-BlockGrowEvent-for-missing-blocks.patch
similarity index 100%
rename from patches/server/0851-Call-BlockGrowEvent-for-missing-blocks.patch
rename to patches/server/0850-Call-BlockGrowEvent-for-missing-blocks.patch
diff --git a/patches/server/0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch b/patches/server/0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
similarity index 100%
rename from patches/server/0852-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
rename to patches/server/0851-Don-t-enforce-icanhasbukkit-default-if-alias-block-e.patch
diff --git a/patches/server/0853-fix-MapLike-spam-for-missing-key-selector.patch b/patches/server/0852-fix-MapLike-spam-for-missing-key-selector.patch
similarity index 100%
rename from patches/server/0853-fix-MapLike-spam-for-missing-key-selector.patch
rename to patches/server/0852-fix-MapLike-spam-for-missing-key-selector.patch
diff --git a/patches/server/0854-Fix-sniffer-removeExploredLocation.patch b/patches/server/0853-Fix-sniffer-removeExploredLocation.patch
similarity index 100%
rename from patches/server/0854-Fix-sniffer-removeExploredLocation.patch
rename to patches/server/0853-Fix-sniffer-removeExploredLocation.patch
diff --git a/patches/server/0855-Add-method-to-remove-all-active-potion-effects.patch b/patches/server/0854-Add-method-to-remove-all-active-potion-effects.patch
similarity index 100%
rename from patches/server/0855-Add-method-to-remove-all-active-potion-effects.patch
rename to patches/server/0854-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/server/0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch
similarity index 100%
rename from patches/server/0856-Fix-incorrect-crafting-result-amount-for-fireworks.patch
rename to patches/server/0855-Fix-incorrect-crafting-result-amount-for-fireworks.patch
diff --git a/patches/server/0857-Add-event-for-player-editing-sign.patch b/patches/server/0856-Add-event-for-player-editing-sign.patch
similarity index 100%
rename from patches/server/0857-Add-event-for-player-editing-sign.patch
rename to patches/server/0856-Add-event-for-player-editing-sign.patch
diff --git a/patches/server/0858-Only-tick-item-frames-if-players-can-see-it.patch b/patches/server/0857-Only-tick-item-frames-if-players-can-see-it.patch
similarity index 100%
rename from patches/server/0858-Only-tick-item-frames-if-players-can-see-it.patch
rename to patches/server/0857-Only-tick-item-frames-if-players-can-see-it.patch
diff --git a/patches/server/0859-Fix-cmd-permission-levels-for-command-blocks.patch b/patches/server/0858-Fix-cmd-permission-levels-for-command-blocks.patch
similarity index 100%
rename from patches/server/0859-Fix-cmd-permission-levels-for-command-blocks.patch
rename to patches/server/0858-Fix-cmd-permission-levels-for-command-blocks.patch
diff --git a/patches/server/0860-Add-option-to-disable-block-updates.patch b/patches/server/0859-Add-option-to-disable-block-updates.patch
similarity index 100%
rename from patches/server/0860-Add-option-to-disable-block-updates.patch
rename to patches/server/0859-Add-option-to-disable-block-updates.patch
diff --git a/patches/server/0861-Call-missing-BlockDispenseEvent.patch b/patches/server/0860-Call-missing-BlockDispenseEvent.patch
similarity index 100%
rename from patches/server/0861-Call-missing-BlockDispenseEvent.patch
rename to patches/server/0860-Call-missing-BlockDispenseEvent.patch
diff --git a/patches/server/0862-Don-t-load-chunks-for-supporting-block-checks.patch b/patches/server/0861-Don-t-load-chunks-for-supporting-block-checks.patch
similarity index 100%
rename from patches/server/0862-Don-t-load-chunks-for-supporting-block-checks.patch
rename to patches/server/0861-Don-t-load-chunks-for-supporting-block-checks.patch
diff --git a/patches/server/0863-Optimize-player-lookups-for-beacons.patch b/patches/server/0862-Optimize-player-lookups-for-beacons.patch
similarity index 100%
rename from patches/server/0863-Optimize-player-lookups-for-beacons.patch
rename to patches/server/0862-Optimize-player-lookups-for-beacons.patch
diff --git a/patches/server/0864-Add-Sign-getInteractableSideFor.patch b/patches/server/0863-Add-Sign-getInteractableSideFor.patch
similarity index 100%
rename from patches/server/0864-Add-Sign-getInteractableSideFor.patch
rename to patches/server/0863-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/server/0865-fix-item-meta-for-tadpole-buckets.patch b/patches/server/0864-fix-item-meta-for-tadpole-buckets.patch
similarity index 100%
rename from patches/server/0865-fix-item-meta-for-tadpole-buckets.patch
rename to patches/server/0864-fix-item-meta-for-tadpole-buckets.patch
diff --git a/patches/server/0866-Fix-BanList-API.patch b/patches/server/0865-Fix-BanList-API.patch
similarity index 100%
rename from patches/server/0866-Fix-BanList-API.patch
rename to patches/server/0865-Fix-BanList-API.patch
diff --git a/patches/server/0867-Determine-lava-and-water-fluid-explosion-resistance-.patch b/patches/server/0866-Determine-lava-and-water-fluid-explosion-resistance-.patch
similarity index 100%
rename from patches/server/0867-Determine-lava-and-water-fluid-explosion-resistance-.patch
rename to patches/server/0866-Determine-lava-and-water-fluid-explosion-resistance-.patch
diff --git a/patches/server/0868-Fix-possible-NPE-on-painting-creation.patch b/patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
similarity index 100%
rename from patches/server/0868-Fix-possible-NPE-on-painting-creation.patch
rename to patches/server/0867-Fix-possible-NPE-on-painting-creation.patch
diff --git a/patches/server/0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch b/patches/server/0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
similarity index 100%
rename from patches/server/0869-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
rename to patches/server/0868-Only-set-despawnTimer-for-Wandering-Traders-spawned-.patch
diff --git a/patches/server/0870-ExperienceOrb-should-call-EntitySpawnEvent.patch b/patches/server/0869-ExperienceOrb-should-call-EntitySpawnEvent.patch
similarity index 100%
rename from patches/server/0870-ExperienceOrb-should-call-EntitySpawnEvent.patch
rename to patches/server/0869-ExperienceOrb-should-call-EntitySpawnEvent.patch
diff --git a/patches/server/0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch b/patches/server/0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
similarity index 100%
rename from patches/server/0871-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
rename to patches/server/0870-Make-Amethyst-throw-both-Spread-and-Grow-Events.patch
diff --git a/patches/server/0872-Add-whitelist-events.patch b/patches/server/0871-Add-whitelist-events.patch
similarity index 100%
rename from patches/server/0872-Add-whitelist-events.patch
rename to patches/server/0871-Add-whitelist-events.patch
diff --git a/patches/server/0873-Implement-PlayerFailMoveEvent.patch b/patches/server/0872-Implement-PlayerFailMoveEvent.patch
similarity index 100%
rename from patches/server/0873-Implement-PlayerFailMoveEvent.patch
rename to patches/server/0872-Implement-PlayerFailMoveEvent.patch
diff --git a/patches/server/0874-Folia-scheduler-and-owned-region-API.patch b/patches/server/0873-Folia-scheduler-and-owned-region-API.patch
similarity index 100%
rename from patches/server/0874-Folia-scheduler-and-owned-region-API.patch
rename to patches/server/0873-Folia-scheduler-and-owned-region-API.patch
diff --git a/patches/server/0875-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0874-Only-erase-allay-memory-on-non-item-targets.patch
similarity index 100%
rename from patches/server/0875-Only-erase-allay-memory-on-non-item-targets.patch
rename to patches/server/0874-Only-erase-allay-memory-on-non-item-targets.patch
diff --git a/patches/server/0876-API-for-updating-recipes-on-clients.patch b/patches/server/0875-API-for-updating-recipes-on-clients.patch
similarity index 100%
rename from patches/server/0876-API-for-updating-recipes-on-clients.patch
rename to patches/server/0875-API-for-updating-recipes-on-clients.patch
diff --git a/patches/server/0877-Fix-rotation-when-spawning-display-entities.patch b/patches/server/0876-Fix-rotation-when-spawning-display-entities.patch
similarity index 100%
rename from patches/server/0877-Fix-rotation-when-spawning-display-entities.patch
rename to patches/server/0876-Fix-rotation-when-spawning-display-entities.patch
diff --git a/patches/server/0878-Only-capture-actual-tree-growth.patch b/patches/server/0877-Only-capture-actual-tree-growth.patch
similarity index 100%
rename from patches/server/0878-Only-capture-actual-tree-growth.patch
rename to patches/server/0877-Only-capture-actual-tree-growth.patch
diff --git a/patches/server/0879-Use-correct-source-for-mushroom-block-spread-event.patch b/patches/server/0878-Use-correct-source-for-mushroom-block-spread-event.patch
similarity index 100%
rename from patches/server/0879-Use-correct-source-for-mushroom-block-spread-event.patch
rename to patches/server/0878-Use-correct-source-for-mushroom-block-spread-event.patch
diff --git a/patches/server/0880-Respect-randomizeData-on-more-entities-when-spawning.patch b/patches/server/0879-Respect-randomizeData-on-more-entities-when-spawning.patch
similarity index 100%
rename from patches/server/0880-Respect-randomizeData-on-more-entities-when-spawning.patch
rename to patches/server/0879-Respect-randomizeData-on-more-entities-when-spawning.patch
diff --git a/patches/server/0881-Use-correct-seed-on-api-world-load.patch b/patches/server/0880-Use-correct-seed-on-api-world-load.patch
similarity index 100%
rename from patches/server/0881-Use-correct-seed-on-api-world-load.patch
rename to patches/server/0880-Use-correct-seed-on-api-world-load.patch
diff --git a/patches/server/0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch b/patches/server/0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
similarity index 100%
rename from patches/server/0882-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
rename to patches/server/0881-Remove-UpgradeData-neighbour-ticks-outside-of-range.patch
diff --git a/patches/server/0883-Cache-map-ids-on-item-frames.patch b/patches/server/0882-Cache-map-ids-on-item-frames.patch
similarity index 100%
rename from patches/server/0883-Cache-map-ids-on-item-frames.patch
rename to patches/server/0882-Cache-map-ids-on-item-frames.patch
diff --git a/patches/server/0884-Fix-custom-statistic-criteria-creation.patch b/patches/server/0883-Fix-custom-statistic-criteria-creation.patch
similarity index 88%
rename from patches/server/0884-Fix-custom-statistic-criteria-creation.patch
rename to patches/server/0883-Fix-custom-statistic-criteria-creation.patch
index dbad1b4c5e..c15d703018 100644
--- a/patches/server/0884-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/server/0883-Fix-custom-statistic-criteria-creation.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix custom statistic criteria creation
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 7852b06b3cd3bb8ca761e9d05b172a27f9ef6330..1a92d22d2b536a84af1cc404ca9809cae066407a 100644
+index c4e517ef6cf5cd4975846459cf66ebd4db66a805..6e19867f0c242a735801974a8b0332485f450017 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -631,6 +631,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -617,6 +617,12 @@ public final class CraftMagicNumbers implements UnsafeValues {
          net.minecraft.core.Holder<net.minecraft.world.level.biome.Biome> biomeBase = cra.getHandle().registryAccess().registryOrThrow(net.minecraft.core.registries.Registries.BIOME).getHolderOrThrow(net.minecraft.resources.ResourceKey.create(net.minecraft.core.registries.Registries.BIOME, org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(biomeKey)));
          cra.setBiome(x, y, z, biomeBase);
      }
diff --git a/patches/server/0885-Bandaid-fix-for-Effect.patch b/patches/server/0884-Bandaid-fix-for-Effect.patch
similarity index 100%
rename from patches/server/0885-Bandaid-fix-for-Effect.patch
rename to patches/server/0884-Bandaid-fix-for-Effect.patch
diff --git a/patches/server/0886-SculkCatalyst-bloom-API.patch b/patches/server/0885-SculkCatalyst-bloom-API.patch
similarity index 100%
rename from patches/server/0886-SculkCatalyst-bloom-API.patch
rename to patches/server/0885-SculkCatalyst-bloom-API.patch
diff --git a/patches/server/0887-API-for-an-entity-s-scoreboard-name.patch b/patches/server/0886-API-for-an-entity-s-scoreboard-name.patch
similarity index 100%
rename from patches/server/0887-API-for-an-entity-s-scoreboard-name.patch
rename to patches/server/0886-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/server/0888-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/server/0887-Deprecate-and-replace-methods-with-old-StructureType.patch
similarity index 100%
rename from patches/server/0888-Deprecate-and-replace-methods-with-old-StructureType.patch
rename to patches/server/0887-Deprecate-and-replace-methods-with-old-StructureType.patch
diff --git a/patches/server/0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch b/patches/server/0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch
similarity index 100%
rename from patches/server/0889-Don-t-tab-complete-namespaced-commands-if-send-names.patch
rename to patches/server/0888-Don-t-tab-complete-namespaced-commands-if-send-names.patch
diff --git a/patches/server/0890-Properly-handle-BlockBreakEvent-isDropItems.patch b/patches/server/0889-Properly-handle-BlockBreakEvent-isDropItems.patch
similarity index 100%
rename from patches/server/0890-Properly-handle-BlockBreakEvent-isDropItems.patch
rename to patches/server/0889-Properly-handle-BlockBreakEvent-isDropItems.patch
diff --git a/patches/server/0891-Fire-entity-death-event-for-ender-dragon.patch b/patches/server/0890-Fire-entity-death-event-for-ender-dragon.patch
similarity index 100%
rename from patches/server/0891-Fire-entity-death-event-for-ender-dragon.patch
rename to patches/server/0890-Fire-entity-death-event-for-ender-dragon.patch
diff --git a/patches/server/0892-Configurable-entity-tracking-range-by-Y-coordinate.patch b/patches/server/0891-Configurable-entity-tracking-range-by-Y-coordinate.patch
similarity index 100%
rename from patches/server/0892-Configurable-entity-tracking-range-by-Y-coordinate.patch
rename to patches/server/0891-Configurable-entity-tracking-range-by-Y-coordinate.patch
diff --git a/patches/server/0893-Add-Listing-API-for-Player.patch b/patches/server/0892-Add-Listing-API-for-Player.patch
similarity index 100%
rename from patches/server/0893-Add-Listing-API-for-Player.patch
rename to patches/server/0892-Add-Listing-API-for-Player.patch
diff --git a/patches/server/0894-Configurable-Region-Compression-Format.patch b/patches/server/0893-Configurable-Region-Compression-Format.patch
similarity index 100%
rename from patches/server/0894-Configurable-Region-Compression-Format.patch
rename to patches/server/0893-Configurable-Region-Compression-Format.patch
diff --git a/patches/server/0895-Add-BlockFace-to-BlockDamageEvent.patch b/patches/server/0894-Add-BlockFace-to-BlockDamageEvent.patch
similarity index 100%
rename from patches/server/0895-Add-BlockFace-to-BlockDamageEvent.patch
rename to patches/server/0894-Add-BlockFace-to-BlockDamageEvent.patch
diff --git a/patches/server/0896-Fix-NPE-on-Boat-getStatus.patch b/patches/server/0895-Fix-NPE-on-Boat-getStatus.patch
similarity index 100%
rename from patches/server/0896-Fix-NPE-on-Boat-getStatus.patch
rename to patches/server/0895-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/server/0897-Expand-Pose-API.patch b/patches/server/0896-Expand-Pose-API.patch
similarity index 100%
rename from patches/server/0897-Expand-Pose-API.patch
rename to patches/server/0896-Expand-Pose-API.patch
diff --git a/patches/server/0898-More-DragonBattle-API.patch b/patches/server/0897-More-DragonBattle-API.patch
similarity index 100%
rename from patches/server/0898-More-DragonBattle-API.patch
rename to patches/server/0897-More-DragonBattle-API.patch
diff --git a/patches/server/0899-Add-PlayerPickItemEvent.patch b/patches/server/0898-Add-PlayerPickItemEvent.patch
similarity index 100%
rename from patches/server/0899-Add-PlayerPickItemEvent.patch
rename to patches/server/0898-Add-PlayerPickItemEvent.patch
diff --git a/patches/server/0900-Allow-trident-custom-damage.patch b/patches/server/0899-Allow-trident-custom-damage.patch
similarity index 100%
rename from patches/server/0900-Allow-trident-custom-damage.patch
rename to patches/server/0899-Allow-trident-custom-damage.patch
diff --git a/patches/server/0901-Expose-hand-in-BlockCanBuildEvent.patch b/patches/server/0900-Expose-hand-in-BlockCanBuildEvent.patch
similarity index 100%
rename from patches/server/0901-Expose-hand-in-BlockCanBuildEvent.patch
rename to patches/server/0900-Expose-hand-in-BlockCanBuildEvent.patch
diff --git a/patches/server/0902-Optimize-nearest-structure-border-iteration.patch b/patches/server/0901-Optimize-nearest-structure-border-iteration.patch
similarity index 100%
rename from patches/server/0902-Optimize-nearest-structure-border-iteration.patch
rename to patches/server/0901-Optimize-nearest-structure-border-iteration.patch
diff --git a/patches/server/0903-Implement-OfflinePlayer-isConnected.patch b/patches/server/0902-Implement-OfflinePlayer-isConnected.patch
similarity index 100%
rename from patches/server/0903-Implement-OfflinePlayer-isConnected.patch
rename to patches/server/0902-Implement-OfflinePlayer-isConnected.patch
diff --git a/patches/server/0904-Fix-inventory-desync.patch b/patches/server/0903-Fix-inventory-desync.patch
similarity index 100%
rename from patches/server/0904-Fix-inventory-desync.patch
rename to patches/server/0903-Fix-inventory-desync.patch
diff --git a/patches/server/0905-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/server/0904-Add-titleOverride-to-InventoryOpenEvent.patch
similarity index 100%
rename from patches/server/0905-Add-titleOverride-to-InventoryOpenEvent.patch
rename to patches/server/0904-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/server/0906-Configure-sniffer-egg-hatch-time.patch b/patches/server/0905-Configure-sniffer-egg-hatch-time.patch
similarity index 100%
rename from patches/server/0906-Configure-sniffer-egg-hatch-time.patch
rename to patches/server/0905-Configure-sniffer-egg-hatch-time.patch
diff --git a/patches/server/0907-Do-crystal-portal-proximity-check-before-entity-look.patch b/patches/server/0906-Do-crystal-portal-proximity-check-before-entity-look.patch
similarity index 100%
rename from patches/server/0907-Do-crystal-portal-proximity-check-before-entity-look.patch
rename to patches/server/0906-Do-crystal-portal-proximity-check-before-entity-look.patch
diff --git a/patches/server/0908-Skip-POI-finding-if-stuck-in-vehicle.patch b/patches/server/0907-Skip-POI-finding-if-stuck-in-vehicle.patch
similarity index 100%
rename from patches/server/0908-Skip-POI-finding-if-stuck-in-vehicle.patch
rename to patches/server/0907-Skip-POI-finding-if-stuck-in-vehicle.patch
diff --git a/patches/server/0909-Add-slot-sanity-checks-in-container-clicks.patch b/patches/server/0908-Add-slot-sanity-checks-in-container-clicks.patch
similarity index 100%
rename from patches/server/0909-Add-slot-sanity-checks-in-container-clicks.patch
rename to patches/server/0908-Add-slot-sanity-checks-in-container-clicks.patch
diff --git a/patches/server/0910-Call-BlockRedstoneEvents-for-lecterns.patch b/patches/server/0909-Call-BlockRedstoneEvents-for-lecterns.patch
similarity index 100%
rename from patches/server/0910-Call-BlockRedstoneEvents-for-lecterns.patch
rename to patches/server/0909-Call-BlockRedstoneEvents-for-lecterns.patch
diff --git a/patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch b/patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
similarity index 100%
rename from patches/server/0911-Allow-proper-checking-of-empty-item-stacks.patch
rename to patches/server/0910-Allow-proper-checking-of-empty-item-stacks.patch
diff --git a/patches/server/0912-Fix-silent-equipment-change-for-mobs.patch b/patches/server/0911-Fix-silent-equipment-change-for-mobs.patch
similarity index 100%
rename from patches/server/0912-Fix-silent-equipment-change-for-mobs.patch
rename to patches/server/0911-Fix-silent-equipment-change-for-mobs.patch
diff --git a/patches/server/0913-Fix-spigot-s-Forced-Stats.patch b/patches/server/0912-Fix-spigot-s-Forced-Stats.patch
similarity index 100%
rename from patches/server/0913-Fix-spigot-s-Forced-Stats.patch
rename to patches/server/0912-Fix-spigot-s-Forced-Stats.patch
diff --git a/patches/server/0914-Add-missing-InventoryHolders-to-inventories.patch b/patches/server/0913-Add-missing-InventoryHolders-to-inventories.patch
similarity index 100%
rename from patches/server/0914-Add-missing-InventoryHolders-to-inventories.patch
rename to patches/server/0913-Add-missing-InventoryHolders-to-inventories.patch
diff --git a/patches/server/0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch b/patches/server/0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
similarity index 100%
rename from patches/server/0915-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
rename to patches/server/0914-Do-not-read-tile-entities-in-chunks-that-are-positio.patch
diff --git a/patches/server/0916-Add-missing-logs-for-log-ips-config-option.patch b/patches/server/0915-Add-missing-logs-for-log-ips-config-option.patch
similarity index 100%
rename from patches/server/0916-Add-missing-logs-for-log-ips-config-option.patch
rename to patches/server/0915-Add-missing-logs-for-log-ips-config-option.patch
diff --git a/patches/server/0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch b/patches/server/0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
similarity index 100%
rename from patches/server/0917-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
rename to patches/server/0916-Fix-race-condition-on-UpgradeData.BlockFixers-class-.patch
diff --git a/patches/server/0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch b/patches/server/0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
similarity index 100%
rename from patches/server/0918-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
rename to patches/server/0917-Fix-NPE-in-AdvancementProgress-getDateAwarded.patch
diff --git a/patches/server/0919-Fix-team-sidebar-objectives-not-being-cleared.patch b/patches/server/0918-Fix-team-sidebar-objectives-not-being-cleared.patch
similarity index 100%
rename from patches/server/0919-Fix-team-sidebar-objectives-not-being-cleared.patch
rename to patches/server/0918-Fix-team-sidebar-objectives-not-being-cleared.patch
diff --git a/patches/server/0920-Fix-missing-map-initialize-event-call.patch b/patches/server/0919-Fix-missing-map-initialize-event-call.patch
similarity index 100%
rename from patches/server/0920-Fix-missing-map-initialize-event-call.patch
rename to patches/server/0919-Fix-missing-map-initialize-event-call.patch
diff --git a/patches/server/0921-Update-entity-data-when-attaching-firework-to-entity.patch b/patches/server/0920-Update-entity-data-when-attaching-firework-to-entity.patch
similarity index 100%
rename from patches/server/0921-Update-entity-data-when-attaching-firework-to-entity.patch
rename to patches/server/0920-Update-entity-data-when-attaching-firework-to-entity.patch
diff --git a/patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch b/patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch
similarity index 96%
rename from patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch
rename to patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch
index 84ec6f0acd..07ee09f53a 100644
--- a/patches/server/0922-Fix-UnsafeValues-loadAdvancement.patch
+++ b/patches/server/0921-Fix-UnsafeValues-loadAdvancement.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix UnsafeValues#loadAdvancement
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1a92d22d2b536a84af1cc404ca9809cae066407a..0a59d4354e332f4dba99404b770eb88f418546ca 100644
+index 6e19867f0c242a735801974a8b0332485f450017..bedd75d4bce73f317618da4cc22ef5bdce20a38f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -320,7 +320,27 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/patches/server/0923-Add-player-idle-duration-API.patch b/patches/server/0922-Add-player-idle-duration-API.patch
similarity index 100%
rename from patches/server/0923-Add-player-idle-duration-API.patch
rename to patches/server/0922-Add-player-idle-duration-API.patch
diff --git a/patches/server/0924-Don-t-check-if-we-can-see-non-visible-entities.patch b/patches/server/0923-Don-t-check-if-we-can-see-non-visible-entities.patch
similarity index 100%
rename from patches/server/0924-Don-t-check-if-we-can-see-non-visible-entities.patch
rename to patches/server/0923-Don-t-check-if-we-can-see-non-visible-entities.patch
diff --git a/patches/server/0925-Fix-NPE-in-SculkBloomEvent-world-access.patch b/patches/server/0924-Fix-NPE-in-SculkBloomEvent-world-access.patch
similarity index 100%
rename from patches/server/0925-Fix-NPE-in-SculkBloomEvent-world-access.patch
rename to patches/server/0924-Fix-NPE-in-SculkBloomEvent-world-access.patch
diff --git a/patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch b/patches/server/0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
similarity index 100%
rename from patches/server/0926-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
rename to patches/server/0925-Allow-null-itemstack-for-Player-sendEquipmentChange.patch
diff --git a/patches/server/0927-Optimize-VarInts.patch b/patches/server/0926-Optimize-VarInts.patch
similarity index 100%
rename from patches/server/0927-Optimize-VarInts.patch
rename to patches/server/0926-Optimize-VarInts.patch
diff --git a/patches/server/0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/server/0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch
similarity index 100%
rename from patches/server/0928-Add-API-to-get-the-collision-shape-of-a-block-before.patch
rename to patches/server/0927-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/server/0929-Add-predicate-for-blocks-when-raytracing.patch b/patches/server/0928-Add-predicate-for-blocks-when-raytracing.patch
similarity index 100%
rename from patches/server/0929-Add-predicate-for-blocks-when-raytracing.patch
rename to patches/server/0928-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/server/0930-Broadcast-take-item-packets-with-collector-as-source.patch b/patches/server/0929-Broadcast-take-item-packets-with-collector-as-source.patch
similarity index 100%
rename from patches/server/0930-Broadcast-take-item-packets-with-collector-as-source.patch
rename to patches/server/0929-Broadcast-take-item-packets-with-collector-as-source.patch
diff --git a/patches/server/0931-Expand-LingeringPotion-API.patch b/patches/server/0930-Expand-LingeringPotion-API.patch
similarity index 100%
rename from patches/server/0931-Expand-LingeringPotion-API.patch
rename to patches/server/0930-Expand-LingeringPotion-API.patch
diff --git a/patches/server/0932-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch b/patches/server/0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
similarity index 100%
rename from patches/server/0932-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
rename to patches/server/0931-Fix-strikeLightningEffect-powers-lightning-rods-and-.patch
diff --git a/patches/server/0933-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/server/0932-Add-hand-to-fish-event-for-all-player-interactions.patch
similarity index 100%
rename from patches/server/0933-Add-hand-to-fish-event-for-all-player-interactions.patch
rename to patches/server/0932-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/server/0934-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0933-Fix-several-issues-with-EntityBreedEvent.patch
similarity index 100%
rename from patches/server/0934-Fix-several-issues-with-EntityBreedEvent.patch
rename to patches/server/0933-Fix-several-issues-with-EntityBreedEvent.patch
diff --git a/patches/server/0935-Add-UUID-attribute-modifier-API.patch b/patches/server/0934-Add-UUID-attribute-modifier-API.patch
similarity index 100%
rename from patches/server/0935-Add-UUID-attribute-modifier-API.patch
rename to patches/server/0934-Add-UUID-attribute-modifier-API.patch
diff --git a/patches/server/0936-Fix-missing-event-call-for-entity-teleport-API.patch b/patches/server/0935-Fix-missing-event-call-for-entity-teleport-API.patch
similarity index 100%
rename from patches/server/0936-Fix-missing-event-call-for-entity-teleport-API.patch
rename to patches/server/0935-Fix-missing-event-call-for-entity-teleport-API.patch
diff --git a/patches/server/0937-Lazily-create-LootContext-for-criterions.patch b/patches/server/0936-Lazily-create-LootContext-for-criterions.patch
similarity index 100%
rename from patches/server/0937-Lazily-create-LootContext-for-criterions.patch
rename to patches/server/0936-Lazily-create-LootContext-for-criterions.patch
diff --git a/patches/server/0938-Don-t-fire-sync-events-during-worldgen.patch b/patches/server/0937-Don-t-fire-sync-events-during-worldgen.patch
similarity index 100%
rename from patches/server/0938-Don-t-fire-sync-events-during-worldgen.patch
rename to patches/server/0937-Don-t-fire-sync-events-during-worldgen.patch
diff --git a/patches/server/0939-Add-Structure-check-API.patch b/patches/server/0938-Add-Structure-check-API.patch
similarity index 100%
rename from patches/server/0939-Add-Structure-check-API.patch
rename to patches/server/0938-Add-Structure-check-API.patch
diff --git a/patches/server/0940-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
similarity index 100%
rename from patches/server/0940-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
rename to patches/server/0939-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
diff --git a/patches/server/0941-Restore-vanilla-entity-drops-behavior.patch b/patches/server/0940-Restore-vanilla-entity-drops-behavior.patch
similarity index 100%
rename from patches/server/0941-Restore-vanilla-entity-drops-behavior.patch
rename to patches/server/0940-Restore-vanilla-entity-drops-behavior.patch
diff --git a/patches/server/0942-Dont-resend-blocks-on-interactions.patch b/patches/server/0941-Dont-resend-blocks-on-interactions.patch
similarity index 100%
rename from patches/server/0942-Dont-resend-blocks-on-interactions.patch
rename to patches/server/0941-Dont-resend-blocks-on-interactions.patch
diff --git a/patches/server/0943-add-more-scoreboard-API.patch b/patches/server/0942-add-more-scoreboard-API.patch
similarity index 100%
rename from patches/server/0943-add-more-scoreboard-API.patch
rename to patches/server/0942-add-more-scoreboard-API.patch
diff --git a/patches/server/0944-Improve-Registry.patch b/patches/server/0943-Improve-Registry.patch
similarity index 100%
rename from patches/server/0944-Improve-Registry.patch
rename to patches/server/0943-Improve-Registry.patch
diff --git a/patches/server/0945-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch b/patches/server/0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
similarity index 100%
rename from patches/server/0945-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
rename to patches/server/0944-Fix-NPE-on-null-loc-for-EntityTeleportEvent.patch
diff --git a/patches/server/0946-Add-experience-points-API.patch b/patches/server/0945-Add-experience-points-API.patch
similarity index 100%
rename from patches/server/0946-Add-experience-points-API.patch
rename to patches/server/0945-Add-experience-points-API.patch
diff --git a/patches/server/0947-Add-drops-to-shear-events.patch b/patches/server/0946-Add-drops-to-shear-events.patch
similarity index 100%
rename from patches/server/0947-Add-drops-to-shear-events.patch
rename to patches/server/0946-Add-drops-to-shear-events.patch
diff --git a/patches/server/0948-Add-PlayerShieldDisableEvent.patch b/patches/server/0947-Add-PlayerShieldDisableEvent.patch
similarity index 100%
rename from patches/server/0948-Add-PlayerShieldDisableEvent.patch
rename to patches/server/0947-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/server/0949-Validate-ResourceLocation-in-NBT-reading.patch b/patches/server/0948-Validate-ResourceLocation-in-NBT-reading.patch
similarity index 100%
rename from patches/server/0949-Validate-ResourceLocation-in-NBT-reading.patch
rename to patches/server/0948-Validate-ResourceLocation-in-NBT-reading.patch
diff --git a/patches/server/0950-Properly-handle-experience-dropping-on-block-break.patch b/patches/server/0949-Properly-handle-experience-dropping-on-block-break.patch
similarity index 100%
rename from patches/server/0950-Properly-handle-experience-dropping-on-block-break.patch
rename to patches/server/0949-Properly-handle-experience-dropping-on-block-break.patch
diff --git a/patches/server/0951-Fixup-NamespacedKey-handling.patch b/patches/server/0950-Fixup-NamespacedKey-handling.patch
similarity index 100%
rename from patches/server/0951-Fixup-NamespacedKey-handling.patch
rename to patches/server/0950-Fixup-NamespacedKey-handling.patch
diff --git a/patches/server/0952-Expose-LootTable-of-DecoratedPot.patch b/patches/server/0951-Expose-LootTable-of-DecoratedPot.patch
similarity index 100%
rename from patches/server/0952-Expose-LootTable-of-DecoratedPot.patch
rename to patches/server/0951-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/server/0953-Reduce-allocation-of-Vec3D-by-entity-tracker.patch b/patches/server/0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
similarity index 100%
rename from patches/server/0953-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
rename to patches/server/0952-Reduce-allocation-of-Vec3D-by-entity-tracker.patch
diff --git a/patches/server/0954-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch b/patches/server/0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
similarity index 100%
rename from patches/server/0954-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
rename to patches/server/0953-Add-PlayerTradeEvent-and-PlayerPurchaseEvent.patch
diff --git a/patches/server/0955-Add-ShulkerDuplicateEvent.patch b/patches/server/0954-Add-ShulkerDuplicateEvent.patch
similarity index 100%
rename from patches/server/0955-Add-ShulkerDuplicateEvent.patch
rename to patches/server/0954-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/server/0956-Add-api-for-spawn-egg-texture-colors.patch b/patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch
similarity index 88%
rename from patches/server/0956-Add-api-for-spawn-egg-texture-colors.patch
rename to patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch
index 3f171b51f4..d937011392 100644
--- a/patches/server/0956-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/server/0955-Add-api-for-spawn-egg-texture-colors.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add api for spawn egg texture colors
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 0a59d4354e332f4dba99404b770eb88f418546ca..4213e5debc1737364de0dae42fbd1cb68dcb0c83 100644
+index bedd75d4bce73f317618da4cc22ef5bdce20a38f..20502685bad7dc04477308078597ef452f6458fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -659,6 +659,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -645,6 +645,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end
  
diff --git a/patches/server/0957-Add-Lifecycle-Event-system.patch b/patches/server/0956-Add-Lifecycle-Event-system.patch
similarity index 99%
rename from patches/server/0957-Add-Lifecycle-Event-system.patch
rename to patches/server/0956-Add-Lifecycle-Event-system.patch
index bc6a0a8656..57fce2eee7 100644
--- a/patches/server/0957-Add-Lifecycle-Event-system.patch
+++ b/patches/server/0956-Add-Lifecycle-Event-system.patch
@@ -739,10 +739,10 @@ index d96399e9bf1a58db5a4a22e58abb99e7660e0694..66bdac50130f523f9dc4379b103b7a46
 +    // Paper end - lifecycle events
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 4213e5debc1737364de0dae42fbd1cb68dcb0c83..92d7e2435ea5c8b6fe9e5d2abb9d3c8cb350ef4d 100644
+index 20502685bad7dc04477308078597ef452f6458fa..ef580d02d3d1e46bb6a378ab29b351ad62e18743 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -668,6 +668,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -654,6 +654,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
      }
      // Paper end - spawn egg color visibility
  
diff --git a/patches/server/0958-ItemStack-Tooltip-API.patch b/patches/server/0957-ItemStack-Tooltip-API.patch
similarity index 92%
rename from patches/server/0958-ItemStack-Tooltip-API.patch
rename to patches/server/0957-ItemStack-Tooltip-API.patch
index 477d02c3fa..d55aff4e5d 100644
--- a/patches/server/0958-ItemStack-Tooltip-API.patch
+++ b/patches/server/0957-ItemStack-Tooltip-API.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack Tooltip API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 92d7e2435ea5c8b6fe9e5d2abb9d3c8cb350ef4d..2f44452631256e3d6abce02f861cc5bfa5208b53 100644
+index ef580d02d3d1e46bb6a378ab29b351ad62e18743..0b7187b59b6419d015e36a91c1f3b915d3d19d28 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-@@ -658,6 +658,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
+@@ -644,6 +644,20 @@ public final class CraftMagicNumbers implements UnsafeValues {
          return org.bukkit.craftbukkit.CraftStatistic.getNMSStatistic(statistic).getName();
      }
      // Paper end
diff --git a/patches/server/0959-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/server/0958-Add-getChunkSnapshot-includeLightData-parameter.patch
similarity index 100%
rename from patches/server/0959-Add-getChunkSnapshot-includeLightData-parameter.patch
rename to patches/server/0958-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/server/0960-Add-FluidState-API.patch b/patches/server/0959-Add-FluidState-API.patch
similarity index 100%
rename from patches/server/0960-Add-FluidState-API.patch
rename to patches/server/0959-Add-FluidState-API.patch
diff --git a/patches/server/0961-add-number-format-api.patch b/patches/server/0960-add-number-format-api.patch
similarity index 100%
rename from patches/server/0961-add-number-format-api.patch
rename to patches/server/0960-add-number-format-api.patch
diff --git a/patches/server/0962-improve-BanList-types.patch b/patches/server/0961-improve-BanList-types.patch
similarity index 100%
rename from patches/server/0962-improve-BanList-types.patch
rename to patches/server/0961-improve-BanList-types.patch
diff --git a/patches/server/0963-Expanded-Hopper-API.patch b/patches/server/0962-Expanded-Hopper-API.patch
similarity index 100%
rename from patches/server/0963-Expanded-Hopper-API.patch
rename to patches/server/0962-Expanded-Hopper-API.patch
diff --git a/patches/server/0964-Add-BlockBreakProgressUpdateEvent.patch b/patches/server/0963-Add-BlockBreakProgressUpdateEvent.patch
similarity index 100%
rename from patches/server/0964-Add-BlockBreakProgressUpdateEvent.patch
rename to patches/server/0963-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/server/0965-Deprecate-ItemStack-setType.patch b/patches/server/0964-Deprecate-ItemStack-setType.patch
similarity index 100%
rename from patches/server/0965-Deprecate-ItemStack-setType.patch
rename to patches/server/0964-Deprecate-ItemStack-setType.patch
diff --git a/patches/server/0966-Add-CartographyItemEvent.patch b/patches/server/0965-Add-CartographyItemEvent.patch
similarity index 100%
rename from patches/server/0966-Add-CartographyItemEvent.patch
rename to patches/server/0965-Add-CartographyItemEvent.patch
diff --git a/patches/server/0967-More-Raid-API.patch b/patches/server/0966-More-Raid-API.patch
similarity index 100%
rename from patches/server/0967-More-Raid-API.patch
rename to patches/server/0966-More-Raid-API.patch
diff --git a/patches/server/0968-Add-onboarding-message-for-initial-server-start.patch b/patches/server/0967-Add-onboarding-message-for-initial-server-start.patch
similarity index 100%
rename from patches/server/0968-Add-onboarding-message-for-initial-server-start.patch
rename to patches/server/0967-Add-onboarding-message-for-initial-server-start.patch
diff --git a/patches/server/0969-Configurable-max-block-fluid-ticks.patch b/patches/server/0968-Configurable-max-block-fluid-ticks.patch
similarity index 100%
rename from patches/server/0969-Configurable-max-block-fluid-ticks.patch
rename to patches/server/0968-Configurable-max-block-fluid-ticks.patch
diff --git a/patches/server/0970-Fix-bees-aging-inside-hives.patch b/patches/server/0969-Fix-bees-aging-inside-hives.patch
similarity index 100%
rename from patches/server/0970-Fix-bees-aging-inside-hives.patch
rename to patches/server/0969-Fix-bees-aging-inside-hives.patch
diff --git a/patches/server/0971-Disable-memory-reserve-allocating.patch b/patches/server/0970-Disable-memory-reserve-allocating.patch
similarity index 100%
rename from patches/server/0971-Disable-memory-reserve-allocating.patch
rename to patches/server/0970-Disable-memory-reserve-allocating.patch
diff --git a/patches/server/0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch b/patches/server/0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
similarity index 100%
rename from patches/server/0972-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
rename to patches/server/0971-Fire-EntityDamageByEntityEvent-for-unowned-wither-sk.patch
diff --git a/patches/server/0973-Fix-DamageSource-API.patch b/patches/server/0972-Fix-DamageSource-API.patch
similarity index 100%
rename from patches/server/0973-Fix-DamageSource-API.patch
rename to patches/server/0972-Fix-DamageSource-API.patch
diff --git a/patches/server/0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch b/patches/server/0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch
similarity index 100%
rename from patches/server/0974-Fix-creation-of-invalid-block-entity-during-world-ge.patch
rename to patches/server/0973-Fix-creation-of-invalid-block-entity-during-world-ge.patch
diff --git a/patches/server/0975-Fix-possible-StackOverflowError-for-some-dispenses.patch b/patches/server/0974-Fix-possible-StackOverflowError-for-some-dispenses.patch
similarity index 100%
rename from patches/server/0975-Fix-possible-StackOverflowError-for-some-dispenses.patch
rename to patches/server/0974-Fix-possible-StackOverflowError-for-some-dispenses.patch
diff --git a/patches/server/0976-Improve-tag-parser-handling.patch b/patches/server/0975-Improve-tag-parser-handling.patch
similarity index 100%
rename from patches/server/0976-Improve-tag-parser-handling.patch
rename to patches/server/0975-Improve-tag-parser-handling.patch
diff --git a/patches/server/0977-Item-Mutation-Fixes.patch b/patches/server/0976-Item-Mutation-Fixes.patch
similarity index 100%
rename from patches/server/0977-Item-Mutation-Fixes.patch
rename to patches/server/0976-Item-Mutation-Fixes.patch
diff --git a/patches/server/0978-Per-world-ticks-per-spawn-settings.patch b/patches/server/0977-Per-world-ticks-per-spawn-settings.patch
similarity index 100%
rename from patches/server/0978-Per-world-ticks-per-spawn-settings.patch
rename to patches/server/0977-Per-world-ticks-per-spawn-settings.patch
diff --git a/patches/server/0979-Properly-track-the-changed-item-from-dispense-events.patch b/patches/server/0978-Properly-track-the-changed-item-from-dispense-events.patch
similarity index 100%
rename from patches/server/0979-Properly-track-the-changed-item-from-dispense-events.patch
rename to patches/server/0978-Properly-track-the-changed-item-from-dispense-events.patch
diff --git a/patches/server/0980-Rewrite-dataconverter-system.patch b/patches/server/0979-Rewrite-dataconverter-system.patch
similarity index 99%
rename from patches/server/0980-Rewrite-dataconverter-system.patch
rename to patches/server/0979-Rewrite-dataconverter-system.patch
index bbb4bda157..7e296c938d 100644
--- a/patches/server/0980-Rewrite-dataconverter-system.patch
+++ b/patches/server/0979-Rewrite-dataconverter-system.patch
@@ -28899,7 +28899,7 @@ index 1d287dd7379e56f7fd4b425880b850cd843f5789..8ab7ca373a885fbe658013c9c6a2e38d
              return nbttagcompound;
          });
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 2f44452631256e3d6abce02f861cc5bfa5208b53..ca1240c2534f1e6c7182996fde23e58f9c252960 100644
+index 0b7187b59b6419d015e36a91c1f3b915d3d19d28..573b93fc4e392456af2f2cf3900a9d7014f67a22 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -526,7 +526,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
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-disable-forced-empty-world-ticks.patch b/patches/server/0982-disable-forced-empty-world-ticks.patch
similarity index 100%
rename from patches/server/0983-disable-forced-empty-world-ticks.patch
rename to patches/server/0982-disable-forced-empty-world-ticks.patch
diff --git a/patches/server/0984-Starlight.patch b/patches/server/0983-Starlight.patch
similarity index 100%
rename from patches/server/0984-Starlight.patch
rename to patches/server/0983-Starlight.patch
diff --git a/patches/server/0985-Rewrite-chunk-system.patch b/patches/server/0984-Rewrite-chunk-system.patch
similarity index 100%
rename from patches/server/0985-Rewrite-chunk-system.patch
rename to patches/server/0984-Rewrite-chunk-system.patch
diff --git a/patches/server/0986-incremental-chunk-and-player-saving.patch b/patches/server/0985-incremental-chunk-and-player-saving.patch
similarity index 100%
rename from patches/server/0986-incremental-chunk-and-player-saving.patch
rename to patches/server/0985-incremental-chunk-and-player-saving.patch
diff --git a/patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch b/patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
similarity index 100%
rename from patches/server/0987-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
rename to patches/server/0986-Optimize-isInWorldBounds-and-getBlockState-for-inlin.patch
diff --git a/patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch b/patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
similarity index 100%
rename from patches/server/0988-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
rename to patches/server/0987-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
diff --git a/patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
similarity index 100%
rename from patches/server/0989-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
rename to patches/server/0988-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch
diff --git a/patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch b/patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
similarity index 100%
rename from patches/server/0990-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
rename to patches/server/0989-Optimize-Network-Manager-and-add-advanced-packet-sup.patch
diff --git a/patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch b/patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
similarity index 100%
rename from patches/server/0991-Allow-Saving-of-Oversized-Chunks.patch
rename to patches/server/0990-Allow-Saving-of-Oversized-Chunks.patch
diff --git a/patches/server/0992-Fix-World-isChunkGenerated-calls.patch b/patches/server/0991-Fix-World-isChunkGenerated-calls.patch
similarity index 100%
rename from patches/server/0992-Fix-World-isChunkGenerated-calls.patch
rename to patches/server/0991-Fix-World-isChunkGenerated-calls.patch
diff --git a/patches/server/0993-Flat-bedrock-generator-settings.patch b/patches/server/0992-Flat-bedrock-generator-settings.patch
similarity index 100%
rename from patches/server/0993-Flat-bedrock-generator-settings.patch
rename to patches/server/0992-Flat-bedrock-generator-settings.patch
diff --git a/patches/server/0994-Entity-Activation-Range-2.0.patch b/patches/server/0993-Entity-Activation-Range-2.0.patch
similarity index 100%
rename from patches/server/0994-Entity-Activation-Range-2.0.patch
rename to patches/server/0993-Entity-Activation-Range-2.0.patch
diff --git a/patches/server/0995-Optional-per-player-mob-spawns.patch b/patches/server/0994-Optional-per-player-mob-spawns.patch
similarity index 100%
rename from patches/server/0995-Optional-per-player-mob-spawns.patch
rename to patches/server/0994-Optional-per-player-mob-spawns.patch
diff --git a/patches/server/0996-Anti-Xray.patch b/patches/server/0995-Anti-Xray.patch
similarity index 100%
rename from patches/server/0996-Anti-Xray.patch
rename to patches/server/0995-Anti-Xray.patch
diff --git a/patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch b/patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
similarity index 100%
rename from patches/server/0997-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
rename to patches/server/0996-Improve-cancelling-PreCreatureSpawnEvent-with-per-pl.patch
diff --git a/patches/server/0998-Optimize-Collision-to-not-load-chunks.patch b/patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
similarity index 100%
rename from patches/server/0998-Optimize-Collision-to-not-load-chunks.patch
rename to patches/server/0997-Optimize-Collision-to-not-load-chunks.patch
diff --git a/patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch b/patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
similarity index 100%
rename from patches/server/0999-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
rename to patches/server/0998-Optimize-GoalSelector-Goal.Flag-Set-operations.patch
diff --git a/patches/server/1000-Entity-load-save-limit-per-chunk.patch b/patches/server/0999-Entity-load-save-limit-per-chunk.patch
similarity index 100%
rename from patches/server/1000-Entity-load-save-limit-per-chunk.patch
rename to patches/server/0999-Entity-load-save-limit-per-chunk.patch
diff --git a/patches/server/1001-Improved-Watchdog-Support.patch b/patches/server/1000-Improved-Watchdog-Support.patch
similarity index 100%
rename from patches/server/1001-Improved-Watchdog-Support.patch
rename to patches/server/1000-Improved-Watchdog-Support.patch
diff --git a/patches/server/1002-Optimize-Voxel-Shape-Merging.patch b/patches/server/1001-Optimize-Voxel-Shape-Merging.patch
similarity index 100%
rename from patches/server/1002-Optimize-Voxel-Shape-Merging.patch
rename to patches/server/1001-Optimize-Voxel-Shape-Merging.patch
diff --git a/patches/server/1003-Write-SavedData-IO-async.patch b/patches/server/1002-Write-SavedData-IO-async.patch
similarity index 100%
rename from patches/server/1003-Write-SavedData-IO-async.patch
rename to patches/server/1002-Write-SavedData-IO-async.patch
diff --git a/patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch b/patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
similarity index 100%
rename from patches/server/1004-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
rename to patches/server/1003-Protect-Bedrock-and-End-Portal-Frames-from-being-des.patch
diff --git a/patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch b/patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
similarity index 100%
rename from patches/server/1005-Use-distance-map-to-optimise-entity-tracker.patch
rename to patches/server/1004-Use-distance-map-to-optimise-entity-tracker.patch
diff --git a/patches/server/1006-Optimize-Bit-Operations-by-inlining.patch b/patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
similarity index 100%
rename from patches/server/1006-Optimize-Bit-Operations-by-inlining.patch
rename to patches/server/1005-Optimize-Bit-Operations-by-inlining.patch
diff --git a/patches/server/1007-Remove-streams-from-hot-code.patch b/patches/server/1006-Remove-streams-from-hot-code.patch
similarity index 100%
rename from patches/server/1007-Remove-streams-from-hot-code.patch
rename to patches/server/1006-Remove-streams-from-hot-code.patch
diff --git a/patches/server/1008-Eigencraft-redstone-implementation.patch b/patches/server/1007-Eigencraft-redstone-implementation.patch
similarity index 100%
rename from patches/server/1008-Eigencraft-redstone-implementation.patch
rename to patches/server/1007-Eigencraft-redstone-implementation.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-Improve-boat-collision-performance.patch b/patches/server/1009-Improve-boat-collision-performance.patch
similarity index 100%
rename from patches/server/1010-Improve-boat-collision-performance.patch
rename to patches/server/1009-Improve-boat-collision-performance.patch
diff --git a/patches/server/1011-Optimise-general-POI-access.patch b/patches/server/1010-Optimise-general-POI-access.patch
similarity index 100%
rename from patches/server/1011-Optimise-general-POI-access.patch
rename to patches/server/1010-Optimise-general-POI-access.patch
diff --git a/patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch b/patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
similarity index 100%
rename from patches/server/1012-Custom-table-implementation-for-blockstate-state-loo.patch
rename to patches/server/1011-Custom-table-implementation-for-blockstate-state-loo.patch
diff --git a/patches/server/1013-Execute-chunk-tasks-mid-tick.patch b/patches/server/1012-Execute-chunk-tasks-mid-tick.patch
similarity index 100%
rename from patches/server/1013-Execute-chunk-tasks-mid-tick.patch
rename to patches/server/1012-Execute-chunk-tasks-mid-tick.patch
diff --git a/patches/server/1014-Optimise-random-block-ticking.patch b/patches/server/1013-Optimise-random-block-ticking.patch
similarity index 100%
rename from patches/server/1014-Optimise-random-block-ticking.patch
rename to patches/server/1013-Optimise-random-block-ticking.patch
diff --git a/patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch b/patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
similarity index 100%
rename from patches/server/1015-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
rename to patches/server/1014-Attempt-to-recalculate-regionfile-header-if-it-is-co.patch
diff --git a/patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch b/patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch
similarity index 100%
rename from patches/server/1016-Use-Velocity-compression-and-cipher-natives.patch
rename to patches/server/1015-Use-Velocity-compression-and-cipher-natives.patch
diff --git a/patches/server/1017-Detail-more-information-in-watchdog-dumps.patch b/patches/server/1016-Detail-more-information-in-watchdog-dumps.patch
similarity index 100%
rename from patches/server/1017-Detail-more-information-in-watchdog-dumps.patch
rename to patches/server/1016-Detail-more-information-in-watchdog-dumps.patch
diff --git a/patches/server/1018-Collision-optimisations.patch b/patches/server/1017-Collision-optimisations.patch
similarity index 100%
rename from patches/server/1018-Collision-optimisations.patch
rename to patches/server/1017-Collision-optimisations.patch
diff --git a/patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch b/patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch
similarity index 100%
rename from patches/server/1019-Optimise-collision-checking-in-player-move-packet-ha.patch
rename to patches/server/1018-Optimise-collision-checking-in-player-move-packet-ha.patch
diff --git a/patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch b/patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch
similarity index 100%
rename from patches/server/1020-Fix-tripwire-disarming-not-working-as-intended.patch
rename to patches/server/1019-Fix-tripwire-disarming-not-working-as-intended.patch
diff --git a/patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch b/patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch
similarity index 100%
rename from patches/server/1021-Fix-entity-type-tags-suggestions-in-selectors.patch
rename to patches/server/1020-Fix-entity-type-tags-suggestions-in-selectors.patch
diff --git a/patches/server/1022-Add-Alternate-Current-redstone-implementation.patch b/patches/server/1021-Add-Alternate-Current-redstone-implementation.patch
similarity index 100%
rename from patches/server/1022-Add-Alternate-Current-redstone-implementation.patch
rename to patches/server/1021-Add-Alternate-Current-redstone-implementation.patch
diff --git a/patches/server/1023-optimize-dirt-and-snow-spreading.patch b/patches/server/1022-optimize-dirt-and-snow-spreading.patch
similarity index 100%
rename from patches/server/1023-optimize-dirt-and-snow-spreading.patch
rename to patches/server/1022-optimize-dirt-and-snow-spreading.patch
diff --git a/patches/server/1024-Properly-resend-entities.patch b/patches/server/1023-Properly-resend-entities.patch
similarity index 100%
rename from patches/server/1024-Properly-resend-entities.patch
rename to patches/server/1023-Properly-resend-entities.patch
diff --git a/patches/server/1025-Optimize-Hoppers.patch b/patches/server/1024-Optimize-Hoppers.patch
similarity index 100%
rename from patches/server/1025-Optimize-Hoppers.patch
rename to patches/server/1024-Optimize-Hoppers.patch
diff --git a/patches/server/1026-Improve-performance-of-mass-crafts.patch b/patches/server/1025-Improve-performance-of-mass-crafts.patch
similarity index 100%
rename from patches/server/1026-Improve-performance-of-mass-crafts.patch
rename to patches/server/1025-Improve-performance-of-mass-crafts.patch
diff --git a/patches/server/1027-Actually-optimise-explosions.patch b/patches/server/1026-Actually-optimise-explosions.patch
similarity index 100%
rename from patches/server/1027-Actually-optimise-explosions.patch
rename to patches/server/1026-Actually-optimise-explosions.patch
diff --git a/patches/server/1028-Optimise-chunk-tick-iteration.patch b/patches/server/1027-Optimise-chunk-tick-iteration.patch
similarity index 100%
rename from patches/server/1028-Optimise-chunk-tick-iteration.patch
rename to patches/server/1027-Optimise-chunk-tick-iteration.patch
diff --git a/patches/server/1029-Lag-compensation-ticks.patch b/patches/server/1028-Lag-compensation-ticks.patch
similarity index 100%
rename from patches/server/1029-Lag-compensation-ticks.patch
rename to patches/server/1028-Lag-compensation-ticks.patch
diff --git a/patches/server/1030-Optimise-nearby-player-retrieval.patch b/patches/server/1029-Optimise-nearby-player-retrieval.patch
similarity index 100%
rename from patches/server/1030-Optimise-nearby-player-retrieval.patch
rename to patches/server/1029-Optimise-nearby-player-retrieval.patch
diff --git a/patches/server/1031-Distance-manager-tick-timings.patch b/patches/server/1030-Distance-manager-tick-timings.patch
similarity index 100%
rename from patches/server/1031-Distance-manager-tick-timings.patch
rename to patches/server/1030-Distance-manager-tick-timings.patch
diff --git a/patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch b/patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch
similarity index 100%
rename from patches/server/1032-Handle-Oversized-block-entities-in-chunks.patch
rename to patches/server/1031-Handle-Oversized-block-entities-in-chunks.patch
diff --git a/patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch b/patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch
similarity index 100%
rename from patches/server/1033-Send-full-pos-packets-for-hard-colliding-entities.patch
rename to patches/server/1032-Send-full-pos-packets-for-hard-colliding-entities.patch
diff --git a/patches/server/1034-Fix-and-optimise-world-force-upgrading.patch b/patches/server/1033-Fix-and-optimise-world-force-upgrading.patch
similarity index 100%
rename from patches/server/1034-Fix-and-optimise-world-force-upgrading.patch
rename to patches/server/1033-Fix-and-optimise-world-force-upgrading.patch
diff --git a/patches/server/1035-API-for-checking-sent-chunks.patch b/patches/server/1034-API-for-checking-sent-chunks.patch
similarity index 100%
rename from patches/server/1035-API-for-checking-sent-chunks.patch
rename to patches/server/1034-API-for-checking-sent-chunks.patch
diff --git a/patches/server/1036-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch b/patches/server/1035-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
similarity index 100%
rename from patches/server/1036-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
rename to patches/server/1035-Properly-handle-pdc-and-custom-tags-in-ItemMeta.patch
diff --git a/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1036-handle-converting-old-serialized-names-to-new-names.patch
similarity index 100%
rename from patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch
rename to patches/server/1036-handle-converting-old-serialized-names-to-new-names.patch
diff --git a/patches/server/1038-Add-config-for-mobs-immune-to-default-effects.patch b/patches/server/1037-Add-config-for-mobs-immune-to-default-effects.patch
similarity index 100%
rename from patches/server/1038-Add-config-for-mobs-immune-to-default-effects.patch
rename to patches/server/1037-Add-config-for-mobs-immune-to-default-effects.patch
diff --git a/patches/server/1039-Deep-clone-nbt-tags-in-PDC.patch b/patches/server/1038-Deep-clone-nbt-tags-in-PDC.patch
similarity index 100%
rename from patches/server/1039-Deep-clone-nbt-tags-in-PDC.patch
rename to patches/server/1038-Deep-clone-nbt-tags-in-PDC.patch