Add AttributeModifier constructor without EquipmentSlotGroup (#11079)

85 files changed, 49 insertions, 34 deletions

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.
       * <p>
       * 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
index 2b9703cf94..2b9703cf94 100644
--- 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
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 <[email protected]>
-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
index 926b2aaea7..926b2aaea7 100644
--- a/patches/api/0398-Folia-scheduler-and-owned-region-API.patch
+++ b/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
index ec38bf008b..ec38bf008b 100644
--- a/patches/api/0399-Add-event-for-player-editing-sign.patch
+++ b/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
index 1e085323ca..1e085323ca 100644
--- a/patches/api/0400-Add-Sign-getInteractableSideFor.patch
+++ b/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
index a9640f44a2..a9640f44a2 100644
--- a/patches/api/0401-Fix-BanList-API.patch
+++ b/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
index 75458e78df..75458e78df 100644
--- a/patches/api/0402-Add-whitelist-events.patch
+++ b/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
index f9ef1b00a0..f9ef1b00a0 100644
--- a/patches/api/0403-API-for-updating-recipes-on-clients.patch
+++ b/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
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0404-Add-PlayerFailMoveEvent.patch
+++ b/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
index db402e8491..db402e8491 100644
--- a/patches/api/0405-Fix-custom-statistic-criteria-creation.patch
+++ b/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
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0406-SculkCatalyst-bloom-API.patch
+++ b/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
index 1fb9128be8..1fb9128be8 100644
--- a/patches/api/0407-API-for-an-entity-s-scoreboard-name.patch
+++ b/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
index a46b2f6103..a46b2f6103 100644
--- a/patches/api/0408-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/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
index 47a8946b80..47a8946b80 100644
--- a/patches/api/0409-Add-Listing-API-for-Player.patch
+++ b/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
index 34d1940866..34d1940866 100644
--- a/patches/api/0410-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/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
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0411-Fix-NPE-on-Boat-getStatus.patch
+++ b/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
index a7ac9f7567..a7ac9f7567 100644
--- a/patches/api/0412-Expand-Pose-API.patch
+++ b/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
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0413-MerchantRecipe-add-copy-constructor.patch
+++ b/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
index e25208ec19..e25208ec19 100644
--- a/patches/api/0414-More-DragonBattle-API.patch
+++ b/patches/api/0413-More-DragonBattle-API.patch
diff --git a/patches/api/0415-Add-PlayerPickItemEvent.patch b/patches/api/0414-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0415-Add-PlayerPickItemEvent.patch
+++ b/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
index 870b735548..870b735548 100644
--- a/patches/api/0416-Allow-trident-custom-damage.patch
+++ b/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
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0417-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/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
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0418-Limit-setBurnTime-to-valid-short-values.patch
+++ b/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
index 08e2f91095..08e2f91095 100644
--- a/patches/api/0419-Add-OfflinePlayer-isConnected.patch
+++ b/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
index 68e755f010..68e755f010 100644
--- a/patches/api/0420-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/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
index 9fe874ee2d..9fe874ee2d 100644
--- a/patches/api/0421-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/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
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0422-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/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
index 2fbfc5dc58..2fbfc5dc58 100644
--- a/patches/api/0423-Add-player-idle-duration-API.patch
+++ b/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
index 3bb30787dc..3bb30787dc 100644
--- 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
diff --git a/patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0424-Add-predicate-for-blocks-when-raytracing.patch
index 13d64df888..13d64df888 100644
--- a/patches/api/0425-Add-predicate-for-blocks-when-raytracing.patch
+++ b/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
index b431332b9a..b431332b9a 100644
--- 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
diff --git a/patches/api/0427-Add-UUID-attribute-modifier-API.patch b/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 <[email protected]>
 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 <[email protected]>
 
 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
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0428-Expand-LingeringPotion-API.patch
+++ b/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
index bdb434071d..bdb434071d 100644
--- a/patches/api/0429-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/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
index e2d19afb32..e2d19afb32 100644
--- a/patches/api/0430-Add-Structure-check-API.patch
+++ b/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
index 5144abda5f..5144abda5f 100644
--- a/patches/api/0431-Experimental-annotations-change.patch
+++ b/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
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0432-Add-more-scoreboard-API.patch
+++ b/patches/api/0431-Add-more-scoreboard-API.patch
diff --git a/patches/api/0433-Improve-Registry.patch b/patches/api/0432-Improve-Registry.patch
index d5cb134c45..d5cb134c45 100644
--- a/patches/api/0433-Improve-Registry.patch
+++ b/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
index 9b489a9ded..9b489a9ded 100644
--- a/patches/api/0434-Add-experience-points-API.patch
+++ b/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
index 34200f73ee..34200f73ee 100644
--- a/patches/api/0435-Add-missing-InventoryType.patch
+++ b/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
index c87460e48d..c87460e48d 100644
--- a/patches/api/0436-Add-drops-to-shear-events.patch
+++ b/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
index 94799bbf65..94799bbf65 100644
--- a/patches/api/0437-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0436-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0438-Add-PlayerShieldDisableEvent.patch b/patches/api/0437-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0438-Add-PlayerShieldDisableEvent.patch
+++ b/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
index 93ba48c77c..93ba48c77c 100644
--- 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
diff --git a/patches/api/0440-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0439-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0440-Add-BlockStateMeta-clearBlockState.patch
+++ b/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
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0441-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0440-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0442-Add-ShulkerDuplicateEvent.patch b/patches/api/0441-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0442-Add-ShulkerDuplicateEvent.patch
+++ b/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
index eaeff9f037..eaeff9f037 100644
--- a/patches/api/0443-Add-api-for-spawn-egg-texture-colors.patch
+++ b/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
index b1b11e6033..b1b11e6033 100644
--- a/patches/api/0444-Add-Lifecycle-Event-system.patch
+++ b/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
index dccbe82eeb..dccbe82eeb 100644
--- a/patches/api/0445-ItemStack-Tooltip-API.patch
+++ b/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
index 9b950f9493..9b950f9493 100644
--- a/patches/api/0446-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/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
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0447-Add-FluidState-API.patch
+++ b/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
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0448-add-number-format-api.patch
+++ b/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
index 0884753c86..0884753c86 100644
--- a/patches/api/0449-improve-BanList-types.patch
+++ b/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
index bcf3db2033..bcf3db2033 100644
--- a/patches/api/0450-Suspicious-Effect-Entry-API.patch
+++ b/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
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0451-Fix-DamageSource-API.patch
+++ b/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
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0452-Expanded-Hopper-API.patch
+++ b/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
index e99c290635..e99c290635 100644
--- a/patches/api/0453-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/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
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0454-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0453-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0455-Deprecate-ItemStack-setType.patch b/patches/api/0454-Deprecate-ItemStack-setType.patch
index cdb918bc11..cdb918bc11 100644
--- a/patches/api/0455-Deprecate-ItemStack-setType.patch
+++ b/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
index ccd77b7fbc..ccd77b7fbc 100644
--- a/patches/api/0456-Item-Mutation-Fixes.patch
+++ b/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
index a3844b5401..a3844b5401 100644
--- a/patches/api/0457-API-for-checking-sent-chunks.patch
+++ b/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
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0458-Add-CartographyItemEvent.patch
+++ b/patches/api/0457-Add-CartographyItemEvent.patch
diff --git a/patches/api/0459-More-Raid-API.patch b/patches/api/0458-More-Raid-API.patch
index b365913e82..b365913e82 100644
--- a/patches/api/0459-More-Raid-API.patch
+++ b/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
index 0a16b34cd5..0a16b34cd5 100644
--- a/patches/api/0460-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0459-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0461-Fix-ItemFlags.patch b/patches/api/0460-Fix-ItemFlags.patch
index a6301eff75..a6301eff75 100644
--- a/patches/api/0461-Fix-ItemFlags.patch
+++ b/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
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0462-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/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
index fe1609629e..fe1609629e 100644
--- a/patches/api/0463-Add-hook-to-remap-library-jars.patch
+++ b/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
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0464-Add-GameMode-isInvulnerable.patch
+++ b/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
index e2c609b4f0..e2c609b4f0 100644
--- a/patches/api/0465-Expose-hasColor-to-leather-armor.patch
+++ b/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
index a2cd416d60..a2cd416d60 100644
--- a/patches/api/0466-Add-missing-wind-charge-damage-type.patch
+++ b/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
index b1702bee61..b1702bee61 100644
--- 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
diff --git a/patches/api/0468-More-Chest-Block-API.patch b/patches/api/0467-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0468-More-Chest-Block-API.patch
+++ b/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
index 9e99f07ecd..9e99f07ecd 100644
--- a/patches/api/0469-Brigadier-based-command-API.patch
+++ b/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
index 2635c201c9..2635c201c9 100644
--- a/patches/api/0470-Fix-issues-with-recipe-API.patch
+++ b/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
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 <[email protected]>
 
 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
index 8a0f6e9468..8a0f6e9468 100644
--- 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
diff --git a/patches/api/0473-General-ItemMeta-fixes.patch b/patches/api/0472-General-ItemMeta-fixes.patch
index a8eb5a99e1..a8eb5a99e1 100644
--- a/patches/api/0473-General-ItemMeta-fixes.patch
+++ b/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
index 94cba543ec..94cba543ec 100644
--- a/patches/api/0474-Add-missing-fishing-event-state.patch
+++ b/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
index 3efcc02654..3efcc02654 100644
--- a/patches/api/0475-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/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
index 9ad8ef719b..9ad8ef719b 100644
--- a/patches/api/0476-Registry-Modification-API.patch
+++ b/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
index e97c9cef4e..e97c9cef4e 100644
--- a/patches/api/0477-Introduce-registry-entry-and-builders.patch
+++ b/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
index c974d8f397..c974d8f397 100644
--- a/patches/api/0478-Proxy-ItemStack-to-CraftItemStack.patch
+++ b/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
index 042b9e8600..042b9e8600 100644
--- 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