From 9fd5b3cfbd40b2847dec14f53c1b3b68aed46f12 Mon Sep 17 00:00:00 2001 From: Malfrador Date: Mon, 15 Jul 2024 12:31:41 +0200 Subject: [PATCH] Add AttributeModifier constructor without EquipmentSlotGroup (#11079) --- patches/api/0053-Fix-upstream-javadocs.patch | 14 +++++++ ...to-remove-all-active-potion-effects.patch} | 0 .../api/0396-Add-transient-modifier-API.patch | 27 ------------- ...olia-scheduler-and-owned-region-API.patch} | 0 ...8-Add-event-for-player-editing-sign.patch} | 0 ...399-Add-Sign-getInteractableSideFor.patch} | 0 ...t-API.patch => 0400-Fix-BanList-API.patch} | 0 ....patch => 0401-Add-whitelist-events.patch} | 0 ...API-for-updating-recipes-on-clients.patch} | 0 ...tch => 0403-Add-PlayerFailMoveEvent.patch} | 0 ...-custom-statistic-criteria-creation.patch} | 0 ...tch => 0405-SculkCatalyst-bloom-API.patch} | 0 ...API-for-an-entity-s-scoreboard-name.patch} | 0 ...lace-methods-with-old-StructureType.patch} | 0 ... => 0408-Add-Listing-API-for-Player.patch} | 0 ...d-BlockFace-during-BlockDamageEvent.patch} | 0 ...h => 0410-Fix-NPE-on-Boat-getStatus.patch} | 0 ...e-API.patch => 0411-Expand-Pose-API.patch} | 0 ...MerchantRecipe-add-copy-constructor.patch} | 0 ...patch => 0413-More-DragonBattle-API.patch} | 0 ...tch => 0414-Add-PlayerPickItemEvent.patch} | 0 ...=> 0415-Allow-trident-custom-damage.patch} | 0 ...pose-hand-during-BlockCanBuildEvent.patch} | 0 ...t-setBurnTime-to-valid-short-values.patch} | 0 ... 0418-Add-OfflinePlayer-isConnected.patch} | 0 ...titleOverride-to-InventoryOpenEvent.patch} | 0 ...roper-checking-of-empty-item-stacks.patch} | 0 ...dItemsEvent-throwing-exception-when.patch} | 0 ...> 0422-Add-player-idle-duration-API.patch} | 0 ...e-collision-shape-of-a-block-before.patch} | 0 ...redicate-for-blocks-when-raytracing.patch} | 0 ...h-event-for-all-player-interactions.patch} | 0 ...Attribute-Modifier-API-improvements.patch} | 38 ++++++++++++++++--- ... => 0427-Expand-LingeringPotion-API.patch} | 0 ...y-durability-check-in-ItemStack-isS.patch} | 0 ...tch => 0429-Add-Structure-check-API.patch} | 0 ...430-Experimental-annotations-change.patch} | 0 ...tch => 0431-Add-more-scoreboard-API.patch} | 0 ...stry.patch => 0432-Improve-Registry.patch} | 0 ...h => 0433-Add-experience-points-API.patch} | 0 ...h => 0434-Add-missing-InventoryType.patch} | 0 ...h => 0435-Add-drops-to-shear-events.patch} | 0 ... => 0436-Add-HiddenPotionEffect-API.patch} | 0 ...> 0437-Add-PlayerShieldDisableEvent.patch} | 0 ...mpty-String-in-NamespacedKey.fromSt.patch} | 0 ...-Add-BlockStateMeta-clearBlockState.patch} | 0 ...40-Expose-LootTable-of-DecoratedPot.patch} | 0 ...h => 0441-Add-ShulkerDuplicateEvent.patch} | 0 ...dd-api-for-spawn-egg-texture-colors.patch} | 0 ... => 0443-Add-Lifecycle-Event-system.patch} | 0 ...patch => 0444-ItemStack-Tooltip-API.patch} | 0 ...Snapshot-includeLightData-parameter.patch} | 0 ...PI.patch => 0446-Add-FluidState-API.patch} | 0 ...patch => 0447-add-number-format-api.patch} | 0 ...patch => 0448-improve-BanList-types.patch} | 0 ...=> 0449-Suspicious-Effect-Entry-API.patch} | 0 ....patch => 0450-Fix-DamageSource-API.patch} | 0 ...I.patch => 0451-Expanded-Hopper-API.patch} | 0 ...tables-to-prevent-unexpected-issues.patch} | 0 ...3-Add-BlockBreakProgressUpdateEvent.patch} | 0 ...=> 0454-Deprecate-ItemStack-setType.patch} | 0 ...s.patch => 0455-Item-Mutation-Fixes.patch} | 0 ...> 0456-API-for-checking-sent-chunks.patch} | 0 ...ch => 0457-Add-CartographyItemEvent.patch} | 0 ...aid-API.patch => 0458-More-Raid-API.patch} | 0 ...0459-Fix-SpawnerEntry-Equipment-API.patch} | 0 ...emFlags.patch => 0460-Fix-ItemFlags.patch} | 0 ...ifying-library-loader-jars-bytecode.patch} | 0 ...0462-Add-hook-to-remap-library-jars.patch} | 0 ...=> 0463-Add-GameMode-isInvulnerable.patch} | 0 ...64-Expose-hasColor-to-leather-armor.patch} | 0 ...Add-missing-wind-charge-damage-type.patch} | 0 ...-API-to-get-player-ha-proxy-address.patch} | 0 ....patch => 0467-More-Chest-Block-API.patch} | 0 ...=> 0468-Brigadier-based-command-API.patch} | 0 ... => 0469-Fix-issues-with-recipe-API.patch} | 0 ...70-Fix-equipment-slot-and-group-API.patch} | 4 +- ...lugin-to-use-Paper-PluginLoader-API.patch} | 0 ...atch => 0472-General-ItemMeta-fixes.patch} | 0 ...473-Add-missing-fishing-event-state.patch} | 0 ...ate-InvAction-HOTBAR_MOVE_AND_READD.patch} | 0 ...h => 0475-Registry-Modification-API.patch} | 0 ...troduce-registry-entry-and-builders.patch} | 0 ...7-Proxy-ItemStack-to-CraftItemStack.patch} | 0 ...-accessible-directly-from-ItemStack.patch} | 0 85 files changed, 49 insertions(+), 34 deletions(-) rename patches/api/{0397-Add-method-to-remove-all-active-potion-effects.patch => 0396-Add-method-to-remove-all-active-potion-effects.patch} (100%) delete mode 100644 patches/api/0396-Add-transient-modifier-API.patch rename patches/api/{0398-Folia-scheduler-and-owned-region-API.patch => 0397-Folia-scheduler-and-owned-region-API.patch} (100%) rename patches/api/{0399-Add-event-for-player-editing-sign.patch => 0398-Add-event-for-player-editing-sign.patch} (100%) rename patches/api/{0400-Add-Sign-getInteractableSideFor.patch => 0399-Add-Sign-getInteractableSideFor.patch} (100%) rename patches/api/{0401-Fix-BanList-API.patch => 0400-Fix-BanList-API.patch} (100%) rename patches/api/{0402-Add-whitelist-events.patch => 0401-Add-whitelist-events.patch} (100%) rename patches/api/{0403-API-for-updating-recipes-on-clients.patch => 0402-API-for-updating-recipes-on-clients.patch} (100%) rename patches/api/{0404-Add-PlayerFailMoveEvent.patch => 0403-Add-PlayerFailMoveEvent.patch} (100%) rename patches/api/{0405-Fix-custom-statistic-criteria-creation.patch => 0404-Fix-custom-statistic-criteria-creation.patch} (100%) rename patches/api/{0406-SculkCatalyst-bloom-API.patch => 0405-SculkCatalyst-bloom-API.patch} (100%) rename patches/api/{0407-API-for-an-entity-s-scoreboard-name.patch => 0406-API-for-an-entity-s-scoreboard-name.patch} (100%) rename patches/api/{0408-Deprecate-and-replace-methods-with-old-StructureType.patch => 0407-Deprecate-and-replace-methods-with-old-StructureType.patch} (100%) rename patches/api/{0409-Add-Listing-API-for-Player.patch => 0408-Add-Listing-API-for-Player.patch} (100%) rename patches/api/{0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch => 0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch} (100%) rename patches/api/{0411-Fix-NPE-on-Boat-getStatus.patch => 0410-Fix-NPE-on-Boat-getStatus.patch} (100%) rename patches/api/{0412-Expand-Pose-API.patch => 0411-Expand-Pose-API.patch} (100%) rename patches/api/{0413-MerchantRecipe-add-copy-constructor.patch => 0412-MerchantRecipe-add-copy-constructor.patch} (100%) rename patches/api/{0414-More-DragonBattle-API.patch => 0413-More-DragonBattle-API.patch} (100%) rename patches/api/{0415-Add-PlayerPickItemEvent.patch => 0414-Add-PlayerPickItemEvent.patch} (100%) rename patches/api/{0416-Allow-trident-custom-damage.patch => 0415-Allow-trident-custom-damage.patch} (100%) rename patches/api/{0417-Expose-hand-during-BlockCanBuildEvent.patch => 0416-Expose-hand-during-BlockCanBuildEvent.patch} (100%) rename patches/api/{0418-Limit-setBurnTime-to-valid-short-values.patch => 0417-Limit-setBurnTime-to-valid-short-values.patch} (100%) rename patches/api/{0419-Add-OfflinePlayer-isConnected.patch => 0418-Add-OfflinePlayer-isConnected.patch} (100%) rename patches/api/{0420-Add-titleOverride-to-InventoryOpenEvent.patch => 0419-Add-titleOverride-to-InventoryOpenEvent.patch} (100%) rename patches/api/{0421-Allow-proper-checking-of-empty-item-stacks.patch => 0420-Allow-proper-checking-of-empty-item-stacks.patch} (100%) rename patches/api/{0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch => 0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch} (100%) rename patches/api/{0423-Add-player-idle-duration-API.patch => 0422-Add-player-idle-duration-API.patch} (100%) rename patches/api/{0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch => 0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch} (100%) rename patches/api/{0425-Add-predicate-for-blocks-when-raytracing.patch => 0424-Add-predicate-for-blocks-when-raytracing.patch} (100%) rename patches/api/{0426-Add-hand-to-fish-event-for-all-player-interactions.patch => 0425-Add-hand-to-fish-event-for-all-player-interactions.patch} (100%) rename patches/api/{0427-Add-UUID-attribute-modifier-API.patch => 0426-Attribute-Modifier-API-improvements.patch} (72%) rename patches/api/{0428-Expand-LingeringPotion-API.patch => 0427-Expand-LingeringPotion-API.patch} (100%) rename patches/api/{0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch => 0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch} (100%) rename patches/api/{0430-Add-Structure-check-API.patch => 0429-Add-Structure-check-API.patch} (100%) rename patches/api/{0431-Experimental-annotations-change.patch => 0430-Experimental-annotations-change.patch} (100%) rename patches/api/{0432-Add-more-scoreboard-API.patch => 0431-Add-more-scoreboard-API.patch} (100%) rename patches/api/{0433-Improve-Registry.patch => 0432-Improve-Registry.patch} (100%) rename patches/api/{0434-Add-experience-points-API.patch => 0433-Add-experience-points-API.patch} (100%) rename patches/api/{0435-Add-missing-InventoryType.patch => 0434-Add-missing-InventoryType.patch} (100%) rename patches/api/{0436-Add-drops-to-shear-events.patch => 0435-Add-drops-to-shear-events.patch} (100%) rename patches/api/{0437-Add-HiddenPotionEffect-API.patch => 0436-Add-HiddenPotionEffect-API.patch} (100%) rename patches/api/{0438-Add-PlayerShieldDisableEvent.patch => 0437-Add-PlayerShieldDisableEvent.patch} (100%) rename patches/api/{0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch => 0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch} (100%) rename patches/api/{0440-Add-BlockStateMeta-clearBlockState.patch => 0439-Add-BlockStateMeta-clearBlockState.patch} (100%) rename patches/api/{0441-Expose-LootTable-of-DecoratedPot.patch => 0440-Expose-LootTable-of-DecoratedPot.patch} (100%) rename patches/api/{0442-Add-ShulkerDuplicateEvent.patch => 0441-Add-ShulkerDuplicateEvent.patch} (100%) rename patches/api/{0443-Add-api-for-spawn-egg-texture-colors.patch => 0442-Add-api-for-spawn-egg-texture-colors.patch} (100%) rename patches/api/{0444-Add-Lifecycle-Event-system.patch => 0443-Add-Lifecycle-Event-system.patch} (100%) rename patches/api/{0445-ItemStack-Tooltip-API.patch => 0444-ItemStack-Tooltip-API.patch} (100%) rename patches/api/{0446-Add-getChunkSnapshot-includeLightData-parameter.patch => 0445-Add-getChunkSnapshot-includeLightData-parameter.patch} (100%) rename patches/api/{0447-Add-FluidState-API.patch => 0446-Add-FluidState-API.patch} (100%) rename patches/api/{0448-add-number-format-api.patch => 0447-add-number-format-api.patch} (100%) rename patches/api/{0449-improve-BanList-types.patch => 0448-improve-BanList-types.patch} (100%) rename patches/api/{0450-Suspicious-Effect-Entry-API.patch => 0449-Suspicious-Effect-Entry-API.patch} (100%) rename patches/api/{0451-Fix-DamageSource-API.patch => 0450-Fix-DamageSource-API.patch} (100%) rename patches/api/{0452-Expanded-Hopper-API.patch => 0451-Expanded-Hopper-API.patch} (100%) rename patches/api/{0453-Clone-mutables-to-prevent-unexpected-issues.patch => 0452-Clone-mutables-to-prevent-unexpected-issues.patch} (100%) rename patches/api/{0454-Add-BlockBreakProgressUpdateEvent.patch => 0453-Add-BlockBreakProgressUpdateEvent.patch} (100%) rename patches/api/{0455-Deprecate-ItemStack-setType.patch => 0454-Deprecate-ItemStack-setType.patch} (100%) rename patches/api/{0456-Item-Mutation-Fixes.patch => 0455-Item-Mutation-Fixes.patch} (100%) rename patches/api/{0457-API-for-checking-sent-chunks.patch => 0456-API-for-checking-sent-chunks.patch} (100%) rename patches/api/{0458-Add-CartographyItemEvent.patch => 0457-Add-CartographyItemEvent.patch} (100%) rename patches/api/{0459-More-Raid-API.patch => 0458-More-Raid-API.patch} (100%) rename patches/api/{0460-Fix-SpawnerEntry-Equipment-API.patch => 0459-Fix-SpawnerEntry-Equipment-API.patch} (100%) rename patches/api/{0461-Fix-ItemFlags.patch => 0460-Fix-ItemFlags.patch} (100%) rename patches/api/{0462-Allow-modifying-library-loader-jars-bytecode.patch => 0461-Allow-modifying-library-loader-jars-bytecode.patch} (100%) rename patches/api/{0463-Add-hook-to-remap-library-jars.patch => 0462-Add-hook-to-remap-library-jars.patch} (100%) rename patches/api/{0464-Add-GameMode-isInvulnerable.patch => 0463-Add-GameMode-isInvulnerable.patch} (100%) rename patches/api/{0465-Expose-hasColor-to-leather-armor.patch => 0464-Expose-hasColor-to-leather-armor.patch} (100%) rename patches/api/{0466-Add-missing-wind-charge-damage-type.patch => 0465-Add-missing-wind-charge-damage-type.patch} (100%) rename patches/api/{0467-Added-API-to-get-player-ha-proxy-address.patch => 0466-Added-API-to-get-player-ha-proxy-address.patch} (100%) rename patches/api/{0468-More-Chest-Block-API.patch => 0467-More-Chest-Block-API.patch} (100%) rename patches/api/{0469-Brigadier-based-command-API.patch => 0468-Brigadier-based-command-API.patch} (100%) rename patches/api/{0470-Fix-issues-with-recipe-API.patch => 0469-Fix-issues-with-recipe-API.patch} (100%) rename patches/api/{0471-Fix-equipment-slot-and-group-API.patch => 0470-Fix-equipment-slot-and-group-API.patch} (97%) rename patches/api/{0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch => 0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch} (100%) rename patches/api/{0473-General-ItemMeta-fixes.patch => 0472-General-ItemMeta-fixes.patch} (100%) rename patches/api/{0474-Add-missing-fishing-event-state.patch => 0473-Add-missing-fishing-event-state.patch} (100%) rename patches/api/{0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch => 0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch} (100%) rename patches/api/{0476-Registry-Modification-API.patch => 0475-Registry-Modification-API.patch} (100%) rename patches/api/{0477-Introduce-registry-entry-and-builders.patch => 0476-Introduce-registry-entry-and-builders.patch} (100%) rename patches/api/{0478-Proxy-ItemStack-to-CraftItemStack.patch => 0477-Proxy-ItemStack-to-CraftItemStack.patch} (100%) rename patches/api/{0479-Make-a-PDC-view-accessible-directly-from-ItemStack.patch => 0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch} (100%) diff --git a/patches/api/0053-Fix-upstream-javadocs.patch b/patches/api/0053-Fix-upstream-javadocs.patch index c443b9328b..92c0a51384 100644 --- a/patches/api/0053-Fix-upstream-javadocs.patch +++ b/patches/api/0053-Fix-upstream-javadocs.patch @@ -185,6 +185,20 @@ index 9885fd1adc1f93a80d650e6d42dfa3a0b084db9f..c4f2f03ec31998d486dad1d45ef83df3 * temporarily freezing while locating an unexplored structure. *

* The {@code radius} is not a rigid square radius. Each structure may alter +diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java +index d66502c9df2592cd18694481e7e90a71a5c3a359..ee39c0b83e558681e8b006172d34c98e2c83cda2 100644 +--- a/src/main/java/org/bukkit/attribute/AttributeModifier.java ++++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java +@@ -117,8 +117,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { + } + + /** +- * Get the {@link EquipmentSlot} this AttributeModifier is active on, +- * or null if this modifier is applicable for any slot. ++ * Get the {@link EquipmentSlotGroup} this AttributeModifier is active on. + * + * @return the slot + */ diff --git a/src/main/java/org/bukkit/block/Bed.java b/src/main/java/org/bukkit/block/Bed.java index f9bd74f9ce6bd6650726e5a993f9b6e292cdc74d..f4c37ce1fe7aac3dde8485ee51fc8888ed56e79e 100644 --- a/src/main/java/org/bukkit/block/Bed.java diff --git a/patches/api/0397-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch similarity index 100% rename from patches/api/0397-Add-method-to-remove-all-active-potion-effects.patch rename to patches/api/0396-Add-method-to-remove-all-active-potion-effects.patch diff --git a/patches/api/0396-Add-transient-modifier-API.patch b/patches/api/0396-Add-transient-modifier-API.patch deleted file mode 100644 index a32e4c86a9..0000000000 --- a/patches/api/0396-Add-transient-modifier-API.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Malfrador -Date: Wed, 31 May 2023 21:25:01 +0200 -Subject: [PATCH] Add transient modifier API - - -diff --git a/src/main/java/org/bukkit/attribute/AttributeInstance.java b/src/main/java/org/bukkit/attribute/AttributeInstance.java -index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..5513174ea545bb5b4fdc028cbaa4c1bb763e2c6d 100644 ---- a/src/main/java/org/bukkit/attribute/AttributeInstance.java -+++ b/src/main/java/org/bukkit/attribute/AttributeInstance.java -@@ -46,6 +46,16 @@ public interface AttributeInstance { - */ - void addModifier(@NotNull AttributeModifier modifier); - -+ // Paper start - Transient modifier API -+ /** -+ * Add a transient modifier to this instance. -+ * Transient modifiers are not persisted (saved with the NBT data) -+ * -+ * @param modifier to add -+ */ -+ void addTransientModifier(@NotNull AttributeModifier modifier); -+ // Paper end -+ - /** - * Remove a modifier from this instance. - * diff --git a/patches/api/0398-Folia-scheduler-and-owned-region-API.patch b/patches/api/0397-Folia-scheduler-and-owned-region-API.patch similarity index 100% rename from patches/api/0398-Folia-scheduler-and-owned-region-API.patch rename to patches/api/0397-Folia-scheduler-and-owned-region-API.patch diff --git a/patches/api/0399-Add-event-for-player-editing-sign.patch b/patches/api/0398-Add-event-for-player-editing-sign.patch similarity index 100% rename from patches/api/0399-Add-event-for-player-editing-sign.patch rename to patches/api/0398-Add-event-for-player-editing-sign.patch diff --git a/patches/api/0400-Add-Sign-getInteractableSideFor.patch b/patches/api/0399-Add-Sign-getInteractableSideFor.patch similarity index 100% rename from patches/api/0400-Add-Sign-getInteractableSideFor.patch rename to patches/api/0399-Add-Sign-getInteractableSideFor.patch diff --git a/patches/api/0401-Fix-BanList-API.patch b/patches/api/0400-Fix-BanList-API.patch similarity index 100% rename from patches/api/0401-Fix-BanList-API.patch rename to patches/api/0400-Fix-BanList-API.patch diff --git a/patches/api/0402-Add-whitelist-events.patch b/patches/api/0401-Add-whitelist-events.patch similarity index 100% rename from patches/api/0402-Add-whitelist-events.patch rename to patches/api/0401-Add-whitelist-events.patch diff --git a/patches/api/0403-API-for-updating-recipes-on-clients.patch b/patches/api/0402-API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/0403-API-for-updating-recipes-on-clients.patch rename to patches/api/0402-API-for-updating-recipes-on-clients.patch diff --git a/patches/api/0404-Add-PlayerFailMoveEvent.patch b/patches/api/0403-Add-PlayerFailMoveEvent.patch similarity index 100% rename from patches/api/0404-Add-PlayerFailMoveEvent.patch rename to patches/api/0403-Add-PlayerFailMoveEvent.patch diff --git a/patches/api/0405-Fix-custom-statistic-criteria-creation.patch b/patches/api/0404-Fix-custom-statistic-criteria-creation.patch similarity index 100% rename from patches/api/0405-Fix-custom-statistic-criteria-creation.patch rename to patches/api/0404-Fix-custom-statistic-criteria-creation.patch diff --git a/patches/api/0406-SculkCatalyst-bloom-API.patch b/patches/api/0405-SculkCatalyst-bloom-API.patch similarity index 100% rename from patches/api/0406-SculkCatalyst-bloom-API.patch rename to patches/api/0405-SculkCatalyst-bloom-API.patch diff --git a/patches/api/0407-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0406-API-for-an-entity-s-scoreboard-name.patch similarity index 100% rename from patches/api/0407-API-for-an-entity-s-scoreboard-name.patch rename to patches/api/0406-API-for-an-entity-s-scoreboard-name.patch diff --git a/patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0407-Deprecate-and-replace-methods-with-old-StructureType.patch similarity index 100% rename from patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch rename to patches/api/0407-Deprecate-and-replace-methods-with-old-StructureType.patch diff --git a/patches/api/0409-Add-Listing-API-for-Player.patch b/patches/api/0408-Add-Listing-API-for-Player.patch similarity index 100% rename from patches/api/0409-Add-Listing-API-for-Player.patch rename to patches/api/0408-Add-Listing-API-for-Player.patch diff --git a/patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch similarity index 100% rename from patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch rename to patches/api/0409-Expose-clicked-BlockFace-during-BlockDamageEvent.patch diff --git a/patches/api/0411-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0410-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0411-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0410-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0412-Expand-Pose-API.patch b/patches/api/0411-Expand-Pose-API.patch similarity index 100% rename from patches/api/0412-Expand-Pose-API.patch rename to patches/api/0411-Expand-Pose-API.patch diff --git a/patches/api/0413-MerchantRecipe-add-copy-constructor.patch b/patches/api/0412-MerchantRecipe-add-copy-constructor.patch similarity index 100% rename from patches/api/0413-MerchantRecipe-add-copy-constructor.patch rename to patches/api/0412-MerchantRecipe-add-copy-constructor.patch diff --git a/patches/api/0414-More-DragonBattle-API.patch b/patches/api/0413-More-DragonBattle-API.patch similarity index 100% rename from patches/api/0414-More-DragonBattle-API.patch rename to patches/api/0413-More-DragonBattle-API.patch diff --git a/patches/api/0415-Add-PlayerPickItemEvent.patch b/patches/api/0414-Add-PlayerPickItemEvent.patch similarity index 100% rename from patches/api/0415-Add-PlayerPickItemEvent.patch rename to patches/api/0414-Add-PlayerPickItemEvent.patch diff --git a/patches/api/0416-Allow-trident-custom-damage.patch b/patches/api/0415-Allow-trident-custom-damage.patch similarity index 100% rename from patches/api/0416-Allow-trident-custom-damage.patch rename to patches/api/0415-Allow-trident-custom-damage.patch diff --git a/patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0416-Expose-hand-during-BlockCanBuildEvent.patch similarity index 100% rename from patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch rename to patches/api/0416-Expose-hand-during-BlockCanBuildEvent.patch diff --git a/patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0417-Limit-setBurnTime-to-valid-short-values.patch similarity index 100% rename from patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch rename to patches/api/0417-Limit-setBurnTime-to-valid-short-values.patch diff --git a/patches/api/0419-Add-OfflinePlayer-isConnected.patch b/patches/api/0418-Add-OfflinePlayer-isConnected.patch similarity index 100% rename from patches/api/0419-Add-OfflinePlayer-isConnected.patch rename to patches/api/0418-Add-OfflinePlayer-isConnected.patch diff --git a/patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0419-Add-titleOverride-to-InventoryOpenEvent.patch similarity index 100% rename from patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch rename to patches/api/0419-Add-titleOverride-to-InventoryOpenEvent.patch diff --git a/patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0420-Allow-proper-checking-of-empty-item-stacks.patch similarity index 100% rename from patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch rename to patches/api/0420-Allow-proper-checking-of-empty-item-stacks.patch diff --git a/patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch similarity index 100% rename from patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch rename to patches/api/0421-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch diff --git a/patches/api/0423-Add-player-idle-duration-API.patch b/patches/api/0422-Add-player-idle-duration-API.patch similarity index 100% rename from patches/api/0423-Add-player-idle-duration-API.patch rename to patches/api/0422-Add-player-idle-duration-API.patch diff --git a/patches/api/0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch similarity index 100% rename from patches/api/0424-Add-API-to-get-the-collision-shape-of-a-block-before.patch rename to patches/api/0423-Add-API-to-get-the-collision-shape-of-a-block-before.patch diff --git a/patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch similarity index 100% rename from patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch rename to patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch diff --git a/patches/api/0426-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0425-Add-hand-to-fish-event-for-all-player-interactions.patch similarity index 100% rename from patches/api/0426-Add-hand-to-fish-event-for-all-player-interactions.patch rename to patches/api/0425-Add-hand-to-fish-event-for-all-player-interactions.patch diff --git a/patches/api/0427-Add-UUID-attribute-modifier-API.patch b/patches/api/0426-Attribute-Modifier-API-improvements.patch similarity index 72% rename from patches/api/0427-Add-UUID-attribute-modifier-API.patch rename to patches/api/0426-Attribute-Modifier-API-improvements.patch index 64de52c83e..dc2fb7fbe6 100644 --- a/patches/api/0427-Add-UUID-attribute-modifier-API.patch +++ b/patches/api/0426-Attribute-Modifier-API-improvements.patch @@ -1,11 +1,12 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: TonytheMacaroni Date: Thu, 9 Nov 2023 20:35:35 -0500 -Subject: [PATCH] Add UUID attribute modifier API +Subject: [PATCH] Attribute Modifier API improvements +Co-authored-by: Malfrador diff --git a/src/main/java/org/bukkit/attribute/AttributeInstance.java b/src/main/java/org/bukkit/attribute/AttributeInstance.java -index 5513174ea545bb5b4fdc028cbaa4c1bb763e2c6d..f1fa86ddf1f50a357c9e94cc61261d8c96a2da6f 100644 +index f08ee26cc4d479e1bfc5264b8cbe721315de91f2..f1fa86ddf1f50a357c9e94cc61261d8c96a2da6f 100644 --- a/src/main/java/org/bukkit/attribute/AttributeInstance.java +++ b/src/main/java/org/bukkit/attribute/AttributeInstance.java @@ -39,6 +39,42 @@ public interface AttributeInstance { @@ -51,11 +52,28 @@ index 5513174ea545bb5b4fdc028cbaa4c1bb763e2c6d..f1fa86ddf1f50a357c9e94cc61261d8c /** * Add a modifier to this instance. * +@@ -46,6 +82,16 @@ public interface AttributeInstance { + */ + void addModifier(@NotNull AttributeModifier modifier); + ++ // Paper start - Transient modifier API ++ /** ++ * Add a transient modifier to this instance. ++ * Transient modifiers are not persisted (saved with the NBT data) ++ * ++ * @param modifier to add ++ */ ++ void addTransientModifier(@NotNull AttributeModifier modifier); ++ // Paper end ++ + /** + * Remove a modifier from this instance. + * diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index d66502c9df2592cd18694481e7e90a71a5c3a359..90f18f355a6a236a7e4273cc1258e7c8034b8276 100644 +index c6b8700d258b859d246118868167497397010292..3808f76d49e24c20156c013f68e00efa9351f1a3 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java -@@ -25,22 +25,22 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { +@@ -25,26 +25,32 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { private final Operation operation; private final EquipmentSlotGroup slot; @@ -82,7 +100,17 @@ index d66502c9df2592cd18694481e7e90a71a5c3a359..90f18f355a6a236a7e4273cc1258e7c8 public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) { this(NamespacedKey.fromString(uuid.toString()), amount, operation, slot); } -@@ -63,7 +63,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { + ++ // Paper start - Add constructor without EquipmentSlotGroup ++ public AttributeModifier(@NotNull NamespacedKey key, double amount, @NotNull Operation operation) { ++ this(key, amount, operation, EquipmentSlotGroup.ANY); ++ } ++ // Paper end ++ + public AttributeModifier(@NotNull NamespacedKey key, double amount, @NotNull Operation operation, @NotNull EquipmentSlotGroup slot) { + Preconditions.checkArgument(key != null, "Key cannot be null"); + Preconditions.checkArgument(operation != null, "Operation cannot be null"); +@@ -63,7 +69,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { * @deprecated attributes are now identified by keys */ @NotNull diff --git a/patches/api/0428-Expand-LingeringPotion-API.patch b/patches/api/0427-Expand-LingeringPotion-API.patch similarity index 100% rename from patches/api/0428-Expand-LingeringPotion-API.patch rename to patches/api/0427-Expand-LingeringPotion-API.patch diff --git a/patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch similarity index 100% rename from patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch rename to patches/api/0428-Remove-unnecessary-durability-check-in-ItemStack-isS.patch diff --git a/patches/api/0430-Add-Structure-check-API.patch b/patches/api/0429-Add-Structure-check-API.patch similarity index 100% rename from patches/api/0430-Add-Structure-check-API.patch rename to patches/api/0429-Add-Structure-check-API.patch diff --git a/patches/api/0431-Experimental-annotations-change.patch b/patches/api/0430-Experimental-annotations-change.patch similarity index 100% rename from patches/api/0431-Experimental-annotations-change.patch rename to patches/api/0430-Experimental-annotations-change.patch diff --git a/patches/api/0432-Add-more-scoreboard-API.patch b/patches/api/0431-Add-more-scoreboard-API.patch similarity index 100% rename from patches/api/0432-Add-more-scoreboard-API.patch rename to patches/api/0431-Add-more-scoreboard-API.patch diff --git a/patches/api/0433-Improve-Registry.patch b/patches/api/0432-Improve-Registry.patch similarity index 100% rename from patches/api/0433-Improve-Registry.patch rename to patches/api/0432-Improve-Registry.patch diff --git a/patches/api/0434-Add-experience-points-API.patch b/patches/api/0433-Add-experience-points-API.patch similarity index 100% rename from patches/api/0434-Add-experience-points-API.patch rename to patches/api/0433-Add-experience-points-API.patch diff --git a/patches/api/0435-Add-missing-InventoryType.patch b/patches/api/0434-Add-missing-InventoryType.patch similarity index 100% rename from patches/api/0435-Add-missing-InventoryType.patch rename to patches/api/0434-Add-missing-InventoryType.patch diff --git a/patches/api/0436-Add-drops-to-shear-events.patch b/patches/api/0435-Add-drops-to-shear-events.patch similarity index 100% rename from patches/api/0436-Add-drops-to-shear-events.patch rename to patches/api/0435-Add-drops-to-shear-events.patch diff --git a/patches/api/0437-Add-HiddenPotionEffect-API.patch b/patches/api/0436-Add-HiddenPotionEffect-API.patch similarity index 100% rename from patches/api/0437-Add-HiddenPotionEffect-API.patch rename to patches/api/0436-Add-HiddenPotionEffect-API.patch diff --git a/patches/api/0438-Add-PlayerShieldDisableEvent.patch b/patches/api/0437-Add-PlayerShieldDisableEvent.patch similarity index 100% rename from patches/api/0438-Add-PlayerShieldDisableEvent.patch rename to patches/api/0437-Add-PlayerShieldDisableEvent.patch diff --git a/patches/api/0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch similarity index 100% rename from patches/api/0439-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch rename to patches/api/0438-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch diff --git a/patches/api/0440-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0439-Add-BlockStateMeta-clearBlockState.patch similarity index 100% rename from patches/api/0440-Add-BlockStateMeta-clearBlockState.patch rename to patches/api/0439-Add-BlockStateMeta-clearBlockState.patch diff --git a/patches/api/0441-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0440-Expose-LootTable-of-DecoratedPot.patch similarity index 100% rename from patches/api/0441-Expose-LootTable-of-DecoratedPot.patch rename to patches/api/0440-Expose-LootTable-of-DecoratedPot.patch diff --git a/patches/api/0442-Add-ShulkerDuplicateEvent.patch b/patches/api/0441-Add-ShulkerDuplicateEvent.patch similarity index 100% rename from patches/api/0442-Add-ShulkerDuplicateEvent.patch rename to patches/api/0441-Add-ShulkerDuplicateEvent.patch diff --git a/patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0442-Add-api-for-spawn-egg-texture-colors.patch similarity index 100% rename from patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch rename to patches/api/0442-Add-api-for-spawn-egg-texture-colors.patch diff --git a/patches/api/0444-Add-Lifecycle-Event-system.patch b/patches/api/0443-Add-Lifecycle-Event-system.patch similarity index 100% rename from patches/api/0444-Add-Lifecycle-Event-system.patch rename to patches/api/0443-Add-Lifecycle-Event-system.patch diff --git a/patches/api/0445-ItemStack-Tooltip-API.patch b/patches/api/0444-ItemStack-Tooltip-API.patch similarity index 100% rename from patches/api/0445-ItemStack-Tooltip-API.patch rename to patches/api/0444-ItemStack-Tooltip-API.patch diff --git a/patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0445-Add-getChunkSnapshot-includeLightData-parameter.patch similarity index 100% rename from patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch rename to patches/api/0445-Add-getChunkSnapshot-includeLightData-parameter.patch diff --git a/patches/api/0447-Add-FluidState-API.patch b/patches/api/0446-Add-FluidState-API.patch similarity index 100% rename from patches/api/0447-Add-FluidState-API.patch rename to patches/api/0446-Add-FluidState-API.patch diff --git a/patches/api/0448-add-number-format-api.patch b/patches/api/0447-add-number-format-api.patch similarity index 100% rename from patches/api/0448-add-number-format-api.patch rename to patches/api/0447-add-number-format-api.patch diff --git a/patches/api/0449-improve-BanList-types.patch b/patches/api/0448-improve-BanList-types.patch similarity index 100% rename from patches/api/0449-improve-BanList-types.patch rename to patches/api/0448-improve-BanList-types.patch diff --git a/patches/api/0450-Suspicious-Effect-Entry-API.patch b/patches/api/0449-Suspicious-Effect-Entry-API.patch similarity index 100% rename from patches/api/0450-Suspicious-Effect-Entry-API.patch rename to patches/api/0449-Suspicious-Effect-Entry-API.patch diff --git a/patches/api/0451-Fix-DamageSource-API.patch b/patches/api/0450-Fix-DamageSource-API.patch similarity index 100% rename from patches/api/0451-Fix-DamageSource-API.patch rename to patches/api/0450-Fix-DamageSource-API.patch diff --git a/patches/api/0452-Expanded-Hopper-API.patch b/patches/api/0451-Expanded-Hopper-API.patch similarity index 100% rename from patches/api/0452-Expanded-Hopper-API.patch rename to patches/api/0451-Expanded-Hopper-API.patch diff --git a/patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0452-Clone-mutables-to-prevent-unexpected-issues.patch similarity index 100% rename from patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch rename to patches/api/0452-Clone-mutables-to-prevent-unexpected-issues.patch diff --git a/patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch similarity index 100% rename from patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch rename to patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch diff --git a/patches/api/0455-Deprecate-ItemStack-setType.patch b/patches/api/0454-Deprecate-ItemStack-setType.patch similarity index 100% rename from patches/api/0455-Deprecate-ItemStack-setType.patch rename to patches/api/0454-Deprecate-ItemStack-setType.patch diff --git a/patches/api/0456-Item-Mutation-Fixes.patch b/patches/api/0455-Item-Mutation-Fixes.patch similarity index 100% rename from patches/api/0456-Item-Mutation-Fixes.patch rename to patches/api/0455-Item-Mutation-Fixes.patch diff --git a/patches/api/0457-API-for-checking-sent-chunks.patch b/patches/api/0456-API-for-checking-sent-chunks.patch similarity index 100% rename from patches/api/0457-API-for-checking-sent-chunks.patch rename to patches/api/0456-API-for-checking-sent-chunks.patch diff --git a/patches/api/0458-Add-CartographyItemEvent.patch b/patches/api/0457-Add-CartographyItemEvent.patch similarity index 100% rename from patches/api/0458-Add-CartographyItemEvent.patch rename to patches/api/0457-Add-CartographyItemEvent.patch diff --git a/patches/api/0459-More-Raid-API.patch b/patches/api/0458-More-Raid-API.patch similarity index 100% rename from patches/api/0459-More-Raid-API.patch rename to patches/api/0458-More-Raid-API.patch diff --git a/patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch similarity index 100% rename from patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch rename to patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch diff --git a/patches/api/0461-Fix-ItemFlags.patch b/patches/api/0460-Fix-ItemFlags.patch similarity index 100% rename from patches/api/0461-Fix-ItemFlags.patch rename to patches/api/0460-Fix-ItemFlags.patch diff --git a/patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0461-Allow-modifying-library-loader-jars-bytecode.patch similarity index 100% rename from patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch rename to patches/api/0461-Allow-modifying-library-loader-jars-bytecode.patch diff --git a/patches/api/0463-Add-hook-to-remap-library-jars.patch b/patches/api/0462-Add-hook-to-remap-library-jars.patch similarity index 100% rename from patches/api/0463-Add-hook-to-remap-library-jars.patch rename to patches/api/0462-Add-hook-to-remap-library-jars.patch diff --git a/patches/api/0464-Add-GameMode-isInvulnerable.patch b/patches/api/0463-Add-GameMode-isInvulnerable.patch similarity index 100% rename from patches/api/0464-Add-GameMode-isInvulnerable.patch rename to patches/api/0463-Add-GameMode-isInvulnerable.patch diff --git a/patches/api/0465-Expose-hasColor-to-leather-armor.patch b/patches/api/0464-Expose-hasColor-to-leather-armor.patch similarity index 100% rename from patches/api/0465-Expose-hasColor-to-leather-armor.patch rename to patches/api/0464-Expose-hasColor-to-leather-armor.patch diff --git a/patches/api/0466-Add-missing-wind-charge-damage-type.patch b/patches/api/0465-Add-missing-wind-charge-damage-type.patch similarity index 100% rename from patches/api/0466-Add-missing-wind-charge-damage-type.patch rename to patches/api/0465-Add-missing-wind-charge-damage-type.patch diff --git a/patches/api/0467-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0466-Added-API-to-get-player-ha-proxy-address.patch similarity index 100% rename from patches/api/0467-Added-API-to-get-player-ha-proxy-address.patch rename to patches/api/0466-Added-API-to-get-player-ha-proxy-address.patch diff --git a/patches/api/0468-More-Chest-Block-API.patch b/patches/api/0467-More-Chest-Block-API.patch similarity index 100% rename from patches/api/0468-More-Chest-Block-API.patch rename to patches/api/0467-More-Chest-Block-API.patch diff --git a/patches/api/0469-Brigadier-based-command-API.patch b/patches/api/0468-Brigadier-based-command-API.patch similarity index 100% rename from patches/api/0469-Brigadier-based-command-API.patch rename to patches/api/0468-Brigadier-based-command-API.patch diff --git a/patches/api/0470-Fix-issues-with-recipe-API.patch b/patches/api/0469-Fix-issues-with-recipe-API.patch similarity index 100% rename from patches/api/0470-Fix-issues-with-recipe-API.patch rename to patches/api/0469-Fix-issues-with-recipe-API.patch diff --git a/patches/api/0471-Fix-equipment-slot-and-group-API.patch b/patches/api/0470-Fix-equipment-slot-and-group-API.patch similarity index 97% rename from patches/api/0471-Fix-equipment-slot-and-group-API.patch rename to patches/api/0470-Fix-equipment-slot-and-group-API.patch index 34248d0de4..0601373657 100644 --- a/patches/api/0471-Fix-equipment-slot-and-group-API.patch +++ b/patches/api/0470-Fix-equipment-slot-and-group-API.patch @@ -10,10 +10,10 @@ Adds the following: Co-authored-by: SoSeDiK diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java -index 90f18f355a6a236a7e4273cc1258e7c8034b8276..a0750d457a9cd7cf3ab9c45bb28ce5a2aef35298 100644 +index 3808f76d49e24c20156c013f68e00efa9351f1a3..e14b64d3b178791dacc7849e97f2ed95f1919c55 100644 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java -@@ -112,6 +112,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { +@@ -118,6 +118,7 @@ public class AttributeModifier implements ConfigurationSerializable, Keyed { */ @Nullable @Deprecated diff --git a/patches/api/0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch similarity index 100% rename from patches/api/0472-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch rename to patches/api/0471-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch diff --git a/patches/api/0473-General-ItemMeta-fixes.patch b/patches/api/0472-General-ItemMeta-fixes.patch similarity index 100% rename from patches/api/0473-General-ItemMeta-fixes.patch rename to patches/api/0472-General-ItemMeta-fixes.patch diff --git a/patches/api/0474-Add-missing-fishing-event-state.patch b/patches/api/0473-Add-missing-fishing-event-state.patch similarity index 100% rename from patches/api/0474-Add-missing-fishing-event-state.patch rename to patches/api/0473-Add-missing-fishing-event-state.patch diff --git a/patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch similarity index 100% rename from patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch rename to patches/api/0474-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch diff --git a/patches/api/0476-Registry-Modification-API.patch b/patches/api/0475-Registry-Modification-API.patch similarity index 100% rename from patches/api/0476-Registry-Modification-API.patch rename to patches/api/0475-Registry-Modification-API.patch diff --git a/patches/api/0477-Introduce-registry-entry-and-builders.patch b/patches/api/0476-Introduce-registry-entry-and-builders.patch similarity index 100% rename from patches/api/0477-Introduce-registry-entry-and-builders.patch rename to patches/api/0476-Introduce-registry-entry-and-builders.patch diff --git a/patches/api/0478-Proxy-ItemStack-to-CraftItemStack.patch b/patches/api/0477-Proxy-ItemStack-to-CraftItemStack.patch similarity index 100% rename from patches/api/0478-Proxy-ItemStack-to-CraftItemStack.patch rename to patches/api/0477-Proxy-ItemStack-to-CraftItemStack.patch diff --git a/patches/api/0479-Make-a-PDC-view-accessible-directly-from-ItemStack.patch b/patches/api/0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch similarity index 100% rename from patches/api/0479-Make-a-PDC-view-accessible-directly-from-ItemStack.patch rename to patches/api/0478-Make-a-PDC-view-accessible-directly-from-ItemStack.patch