Fix more compile issues

174 files changed, 149 insertions, 187 deletions

diff --git a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch b/patches/api/0108-ItemStack-getMaxItemUseDuration.patch
index 8d422d216e..bb9d57e4e1 100644
--- a/patches/api/0108-ItemStack-getMaxItemUseDuration.patch
+++ b/patches/api/0108-ItemStack-getMaxItemUseDuration.patch
@@ -6,31 +6,23 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 29bc12cb3095282a31f01f08ac66c15b24f42524..90cec86f6f75809e2c6e06313b1a96e77c992c18 100644
+index 29bc12cb3095282a31f01f08ac66c15b24f42524..f908c11ece7b3d1a52e21540999f36796237d590 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -13,6 +13,7 @@ import org.bukkit.Translatable;
- import org.bukkit.Utility;
- import org.bukkit.configuration.serialization.ConfigurationSerializable;
- import org.bukkit.enchantments.Enchantment;
-+import org.bukkit.entity.LivingEntity;
- import org.bukkit.inventory.meta.Damageable;
- import org.bukkit.inventory.meta.ItemMeta;
- import org.bukkit.material.MaterialData;
-@@ -670,5 +671,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -670,5 +670,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public String getI18NDisplayName() {
          return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
      }
 +
 +    /**
-+     * @deprecated use {@link #getMaxItemUseDuration(LivingEntity)}; crossbows, later possibly more items require an entity parameter
++     * @deprecated use {@link #getMaxItemUseDuration(org.bukkit.entity.LivingEntity)}; crossbows, later possibly more items require an entity parameter
 +     */
 +    @Deprecated(forRemoval = true)
 +    public int getMaxItemUseDuration() {
 +        return getMaxItemUseDuration(null);
 +    }
 +
-+    public int getMaxItemUseDuration(@NotNull final LivingEntity entity) {
++    public int getMaxItemUseDuration(@NotNull final org.bukkit.entity.LivingEntity entity) {
 +        if (type == null || type == Material.AIR || !type.isItem()) {
 +            return 0;
 +        }
diff --git a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
index 532219c194..0bfbef94ea 100644
--- a/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
+++ b/patches/api/0116-ItemStack-API-additions-for-quantity-flags-lore.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore
 
 
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 90cec86f6f75809e2c6e06313b1a96e77c992c18..93cce80df2c2c8d6379dbe1753748c3e10b73195 100644
+index f908c11ece7b3d1a52e21540999f36796237d590..d125d29759167996a90b7b69d92d944e80af22ab 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -687,5 +687,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -686,5 +686,185 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          // Requires access to NMS
          return ensureServerConversions().getMaxItemUseDuration(entity);
      }
diff --git a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch
index a36bc077a7..7509e7982b 100644
--- a/patches/api/0171-Fix-Spigot-annotation-mistakes.patch
+++ b/patches/api/0171-Fix-Spigot-annotation-mistakes.patch
@@ -1412,7 +1412,7 @@ index 3d08beee52f2247db6f6e679206ed6a965fbf9a8..1b4f9b93860e58762ac28715adad5a67
  
      /**
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 93cce80df2c2c8d6379dbe1753748c3e10b73195..2129243467b11e5599969a5b0d40ca354fbad467 100644
+index d125d29759167996a90b7b69d92d944e80af22ab..d5dd79c98f4d37b09d232214f06ed7dca3a7e6dd 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
 @@ -10,6 +10,7 @@ import org.bukkit.Material;
@@ -1423,7 +1423,7 @@ index 93cce80df2c2c8d6379dbe1753748c3e10b73195..2129243467b11e5599969a5b0d40ca35
  import org.bukkit.Utility;
  import org.bukkit.configuration.serialization.ConfigurationSerializable;
  import org.bukkit.enchantments.Enchantment;
-@@ -180,8 +181,10 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -179,8 +180,10 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * Gets the MaterialData for this stack of items
       *
       * @return MaterialData for this item
@@ -1434,7 +1434,7 @@ index 93cce80df2c2c8d6379dbe1753748c3e10b73195..2129243467b11e5599969a5b0d40ca35
      public MaterialData getData() {
          Material mat = Bukkit.getUnsafe().toLegacy(getType());
          if (data == null && mat != null && mat.getData() != null) {
-@@ -195,7 +198,9 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -194,7 +197,9 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * Sets the MaterialData for this stack of items
       *
       * @param data New MaterialData for this item
@@ -1444,7 +1444,7 @@ index 93cce80df2c2c8d6379dbe1753748c3e10b73195..2129243467b11e5599969a5b0d40ca35
      public void setData(@Nullable MaterialData data) {
          if (data == null) {
              this.data = data;
-@@ -575,7 +580,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -574,7 +579,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       *
       * @return a copy of the current ItemStack's ItemData
       */
diff --git a/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch
index 2fb50dece8..2d931c5392 100644
--- a/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch
+++ b/patches/api/0187-Add-Raw-Byte-ItemStack-Serialization.patch
@@ -20,10 +20,10 @@ index da997507b96908027c49dabc6daf7c787dcad95d..cb7aef53cbffc76dea9fec28445ea8ae
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 2129243467b11e5599969a5b0d40ca354fbad467..59de575055623f832a0775ffb7de742f5d6be402 100644
+index d5dd79c98f4d37b09d232214f06ed7dca3a7e6dd..abdb3b5d3bc96fc48ee53208f77ae0f9c295d771 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -662,6 +662,30 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -661,6 +661,30 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
      }
  
diff --git a/patches/api/0207-Add-methods-to-get-translation-keys.patch b/patches/api/0207-Add-methods-to-get-translation-keys.patch
index 2d6f22cf69..292116000a 100644
--- a/patches/api/0207-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0207-Add-methods-to-get-translation-keys.patch
@@ -526,10 +526,10 @@ index 5bd252c0ae3b09fe141d131360c67bb9bfbf5422..78587d9fabe6371a23a7963917b054db
 +
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 59de575055623f832a0775ffb7de742f5d6be402..6a0f1d5996edb8217b24172466768c4be573873a 100644
+index abdb3b5d3bc96fc48ee53208f77ae0f9c295d771..03f50bcf60ce868d633912e53e804a2b25999f6e 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable;
   * use this class to encapsulate Materials for which {@link Material#isItem()}
   * returns false.</b>
   */
@@ -538,7 +538,7 @@ index 59de575055623f832a0775ffb7de742f5d6be402..6a0f1d5996edb8217b24172466768c4b
      private Material type = Material.AIR;
      private int amount = 0;
      private MaterialData data = null;
-@@ -629,6 +629,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -628,6 +628,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
  
      @Override
      @NotNull
@@ -546,7 +546,7 @@ index 59de575055623f832a0775ffb7de742f5d6be402..6a0f1d5996edb8217b24172466768c4b
      public String getTranslationKey() {
          return Bukkit.getUnsafe().getTranslationKey(this);
      }
-@@ -896,5 +897,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -895,5 +896,16 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          ItemMeta itemMeta = getItemMeta();
          return itemMeta != null && itemMeta.hasItemFlag(flag);
      }
diff --git a/patches/api/0259-Improve-Item-Rarity-API.patch b/patches/api/0259-Improve-Item-Rarity-API.patch
index 1978ba0b55..f945efb2fe 100644
--- a/patches/api/0259-Improve-Item-Rarity-API.patch
+++ b/patches/api/0259-Improve-Item-Rarity-API.patch
@@ -110,10 +110,10 @@ index e7931f73f10fe35ebd5fe4a04b036d53bb117ebd..cbce835ed6d44e5b8c9aaae4e36a77f8
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 6a0f1d5996edb8217b24172466768c4be573873a..938dc055a78fb8959d03f1b89270cc4655e4def0 100644
+index 03f50bcf60ce868d633912e53e804a2b25999f6e..e2f8a0d3a9dcab3fce2d71221751434abc9ab94f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -908,5 +908,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -907,5 +907,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public @NotNull String translationKey() {
          return Bukkit.getUnsafe().getTranslationKey(this);
      }
diff --git a/patches/api/0277-ItemStack-repair-check-API.patch b/patches/api/0277-ItemStack-repair-check-API.patch
index e4d5879ddc..b918edcf35 100644
--- a/patches/api/0277-ItemStack-repair-check-API.patch
+++ b/patches/api/0277-ItemStack-repair-check-API.patch
@@ -25,10 +25,10 @@ index 8635846c9f672e39f0929eec7bf83b22536ed284..51f1a09164d501de6d2561ed90175f2c
      // Paper end
  }
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 938dc055a78fb8959d03f1b89270cc4655e4def0..bbc3a36c0a9f8688230fe63a27f5d9323c79ac32 100644
+index e2f8a0d3a9dcab3fce2d71221751434abc9ab94f..057c87bc25b23f5fb3c34d0de781b7e125921439 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -920,5 +920,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -919,5 +919,27 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      public io.papermc.paper.inventory.ItemRarity getRarity() {
          return io.papermc.paper.inventory.ItemRarity.valueOf(this.getItemMeta().getRarity().name());
      }
diff --git a/patches/api/0280-ItemStack-editMeta.patch b/patches/api/0280-ItemStack-editMeta.patch
index 0cc2444972..a50fabf48e 100644
--- a/patches/api/0280-ItemStack-editMeta.patch
+++ b/patches/api/0280-ItemStack-editMeta.patch
@@ -5,10 +5,10 @@ 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 bbc3a36c0a9f8688230fe63a27f5d9323c79ac32..d4178bc7a51bdcfb2446510de66e4fff1b0a86ec 100644
+index 057c87bc25b23f5fb3c34d0de781b7e125921439..7915521e3640ffc12d87dbbab4cd1a777e3801c9 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -575,6 +575,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -574,6 +574,50 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return result.ensureServerConversions(); // Paper
      }
  
diff --git a/patches/api/0320-Add-more-Campfire-API.patch b/patches/api/0319-Add-more-Campfire-API.patch
index 80cdc0bb39..80cdc0bb39 100644
--- a/patches/api/0320-Add-more-Campfire-API.patch
+++ b/patches/api/0319-Add-more-Campfire-API.patch
diff --git a/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch
deleted file mode 100644
index 256eb6ed6a..0000000000
--- a/patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MiniDigger <[email protected]>
-Date: Wed, 29 Apr 2020 02:09:17 +0200
-Subject: [PATCH] Allow delegation to vanilla chunk gen
-
-
-diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 913ab7ce4a754739ef786086d4da55c93d37a39e..acf382e75c11b8cf7bc06fbac7efe30673021c0c 100644
---- a/src/main/java/org/bukkit/Bukkit.java
-+++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2114,6 +2114,24 @@ public final class Bukkit {
-         return server.createChunkData(world);
-     }
- 
-+    // Paper start
-+    /**
-+     * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
-+     *
-+     * @param world the world to create the ChunkData for
-+     * @param x the x coordinate of the chunk
-+     * @param z the z coordinate of the chunk
-+     * @return a new ChunkData for the world
-+     * @deprecated The new multi-stage worldgen API allows a similar effect by overriding all of the "shouldGenerate..." methods to
-+     * return true, and then modifying the chunkdata in a later stage such as surface or bedrock generation.
-+     */
-+    @NotNull
-+    @Deprecated(forRemoval = true)
-+    public static ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
-+        return server.createVanillaChunkData(world, x, z);
-+    }
-+    // Paper end
-+
-     /**
-      * Creates a boss bar instance to display to players. The progress
-      * defaults to 1.0
-diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index b383ca29be8f86e03e81dbb9962747c03aed1671..9118ae507b9744f142def8bec18b0861eb481820 100644
---- a/src/main/java/org/bukkit/Server.java
-+++ b/src/main/java/org/bukkit/Server.java
-@@ -1789,6 +1789,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     @NotNull
-     public ChunkGenerator.ChunkData createChunkData(@NotNull World world);
- 
-+    // Paper start
-+    /**
-+     * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world.
-+     *
-+     * @param world the world to create the ChunkData for
-+     * @param x the x coordinate of the chunk
-+     * @param z the z coordinate of the chunk
-+     * @return a new ChunkData for the world
-+     * @deprecated The new multi-stage worldgen API allows a similar effect by overriding all of the "shouldGenerate..." methods to
-+     * return true, and then modifying the chunkdata in a later stage such as surface or bedrock generation.
-+     */
-+    @NotNull
-+    @Deprecated(forRemoval = true)
-+    ChunkGenerator.ChunkData createVanillaChunkData(@NotNull World world, int x, int z);
-+    // Paper end
-+
-     /**
-      * Creates a boss bar instance to display to players. The progress
-      * defaults to 1.0
-diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index 7e7a53b41013f1bf8956c0e278820f18d77b2f0d..c942b7101a38ac7dc70e11e87afa1f9210000bc1 100644
---- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
-+++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-@@ -577,6 +577,22 @@ public abstract class ChunkGenerator {
-         return false;
-     }
- 
-+    // Paper start
-+    /**
-+     * Create a ChunkData for use in a generator, that is populated by the vanilla generator for that world
-+     *
-+     * @param world the world to create the ChunkData for
-+     * @param x the x coordinate of the chunk
-+     * @param z the z coordinate of the chunk
-+     * @return a new ChunkData for the world
-+     *
-+     */
-+    @NotNull
-+    public ChunkData createVanillaChunkData(@NotNull World world, int x, int z) {
-+        return Bukkit.getServer().createVanillaChunkData(world, x, z);
-+    }
-+    // Paper end
-+
-     /**
-      * Gets if the server should generate Vanilla structures after this
-      * ChunkGenerator.
diff --git a/patches/api/0321-Extend-VehicleCollisionEvent-move-HandlerList-up.patch b/patches/api/0320-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
index 5f5a4f4140..5f5a4f4140 100644
--- a/patches/api/0321-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
+++ b/patches/api/0320-Extend-VehicleCollisionEvent-move-HandlerList-up.patch
diff --git a/patches/api/0322-Improve-scoreboard-entries.patch b/patches/api/0321-Improve-scoreboard-entries.patch
index d6e077bd86..d6e077bd86 100644
--- a/patches/api/0322-Improve-scoreboard-entries.patch
+++ b/patches/api/0321-Improve-scoreboard-entries.patch
diff --git a/patches/api/0323-Entity-powdered-snow-API.patch b/patches/api/0322-Entity-powdered-snow-API.patch
index 648ddec205..648ddec205 100644
--- a/patches/api/0323-Entity-powdered-snow-API.patch
+++ b/patches/api/0322-Entity-powdered-snow-API.patch
diff --git a/patches/api/0324-Add-API-for-item-entity-health.patch b/patches/api/0323-Add-API-for-item-entity-health.patch
index 572034e557..572034e557 100644
--- a/patches/api/0324-Add-API-for-item-entity-health.patch
+++ b/patches/api/0323-Add-API-for-item-entity-health.patch
diff --git a/patches/api/0325-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch b/patches/api/0324-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
index f094cdc255..f094cdc255 100644
--- a/patches/api/0325-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
+++ b/patches/api/0324-Expose-isFuel-and-canSmelt-methods-to-FurnaceInvento.patch
diff --git a/patches/api/0326-Bucketable-API.patch b/patches/api/0325-Bucketable-API.patch
index 26dbdc9f5d..26dbdc9f5d 100644
--- a/patches/api/0326-Bucketable-API.patch
+++ b/patches/api/0325-Bucketable-API.patch
diff --git a/patches/api/0327-System-prop-for-default-config-comment-parsing.patch b/patches/api/0326-System-prop-for-default-config-comment-parsing.patch
index 632f71e519..632f71e519 100644
--- a/patches/api/0327-System-prop-for-default-config-comment-parsing.patch
+++ b/patches/api/0326-System-prop-for-default-config-comment-parsing.patch
diff --git a/patches/api/0328-Expose-vanilla-BiomeProvider-from-WorldInfo.patch b/patches/api/0327-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
index 9b189fc918..9b189fc918 100644
--- a/patches/api/0328-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
+++ b/patches/api/0327-Expose-vanilla-BiomeProvider-from-WorldInfo.patch
diff --git a/patches/api/0329-Multiple-Entries-with-Scoreboards.patch b/patches/api/0328-Multiple-Entries-with-Scoreboards.patch
index 920c2f117e..920c2f117e 100644
--- a/patches/api/0329-Multiple-Entries-with-Scoreboards.patch
+++ b/patches/api/0328-Multiple-Entries-with-Scoreboards.patch
diff --git a/patches/api/0330-Warn-on-strange-EventHandler-return-types.patch b/patches/api/0329-Warn-on-strange-EventHandler-return-types.patch
index c7807b823b..c7807b823b 100644
--- a/patches/api/0330-Warn-on-strange-EventHandler-return-types.patch
+++ b/patches/api/0329-Warn-on-strange-EventHandler-return-types.patch
diff --git a/patches/api/0331-Multi-Block-Change-API.patch b/patches/api/0330-Multi-Block-Change-API.patch
index 9d93df8706..9d93df8706 100644
--- a/patches/api/0331-Multi-Block-Change-API.patch
+++ b/patches/api/0330-Multi-Block-Change-API.patch
diff --git a/patches/api/0332-Fix-NotePlayEvent.patch b/patches/api/0331-Fix-NotePlayEvent.patch
index d3f827bfd8..d3f827bfd8 100644
--- a/patches/api/0332-Fix-NotePlayEvent.patch
+++ b/patches/api/0331-Fix-NotePlayEvent.patch
diff --git a/patches/api/0333-Freeze-Tick-Lock-API.patch b/patches/api/0332-Freeze-Tick-Lock-API.patch
index c40323bc40..c40323bc40 100644
--- a/patches/api/0333-Freeze-Tick-Lock-API.patch
+++ b/patches/api/0332-Freeze-Tick-Lock-API.patch
diff --git a/patches/api/0334-Dolphin-API.patch b/patches/api/0333-Dolphin-API.patch
index 73beed437b..73beed437b 100644
--- a/patches/api/0334-Dolphin-API.patch
+++ b/patches/api/0333-Dolphin-API.patch
diff --git a/patches/api/0335-More-PotionEffectType-API.patch b/patches/api/0334-More-PotionEffectType-API.patch
index e247835a90..e247835a90 100644
--- a/patches/api/0335-More-PotionEffectType-API.patch
+++ b/patches/api/0334-More-PotionEffectType-API.patch
diff --git a/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch b/patches/api/0335-API-for-creating-command-sender-which-forwards-feedb.patch
index f8da9ce255..bca3814ad8 100644
--- a/patches/api/0336-API-for-creating-command-sender-which-forwards-feedb.patch
+++ b/patches/api/0335-API-for-creating-command-sender-which-forwards-feedb.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for creating command sender which forwards feedback
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index acf382e75c11b8cf7bc06fbac7efe30673021c0c..64bd6071d45d845a2e8e5565014036e7ce16a430 100644
+index 913ab7ce4a754739ef786086d4da55c93d37a39e..69b6c867961d4701a26e8efe048b5bef04c1bcd8 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1581,6 +1581,20 @@ public final class Bukkit {
@@ -30,7 +30,7 @@ index acf382e75c11b8cf7bc06fbac7efe30673021c0c..64bd6071d45d845a2e8e5565014036e7
       * Gets the folder that contains all of the various {@link World}s.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9118ae507b9744f142def8bec18b0861eb481820..d46999648b8770624d288709458cfbf400063037 100644
+index b383ca29be8f86e03e81dbb9962747c03aed1671..c79768c995e47470e781645b9e6062b35bb506fd 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1335,6 +1335,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0337-Implement-regenerateChunk.patch b/patches/api/0336-Implement-regenerateChunk.patch
index 429edcb2d7..429edcb2d7 100644
--- a/patches/api/0337-Implement-regenerateChunk.patch
+++ b/patches/api/0336-Implement-regenerateChunk.patch
diff --git a/patches/api/0338-Add-GameEvent-tags.patch b/patches/api/0337-Add-GameEvent-tags.patch
index 8af580d84b..8af580d84b 100644
--- a/patches/api/0338-Add-GameEvent-tags.patch
+++ b/patches/api/0337-Add-GameEvent-tags.patch
diff --git a/patches/api/0339-Furnace-RecipesUsed-API.patch b/patches/api/0338-Furnace-RecipesUsed-API.patch
index 7fed82db21..7fed82db21 100644
--- a/patches/api/0339-Furnace-RecipesUsed-API.patch
+++ b/patches/api/0338-Furnace-RecipesUsed-API.patch
diff --git a/patches/api/0340-Configurable-sculk-sensor-listener-range.patch b/patches/api/0339-Configurable-sculk-sensor-listener-range.patch
index b1ad0cdb5b..b1ad0cdb5b 100644
--- a/patches/api/0340-Configurable-sculk-sensor-listener-range.patch
+++ b/patches/api/0339-Configurable-sculk-sensor-listener-range.patch
diff --git a/patches/api/0341-Add-missing-block-data-mins-and-maxes.patch b/patches/api/0340-Add-missing-block-data-mins-and-maxes.patch
index 63a647706a..63a647706a 100644
--- a/patches/api/0341-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/api/0340-Add-missing-block-data-mins-and-maxes.patch
diff --git a/patches/api/0342-Custom-Potion-Mixes.patch b/patches/api/0341-Custom-Potion-Mixes.patch
index e43d56d584..0d3feb9f09 100644
--- a/patches/api/0342-Custom-Potion-Mixes.patch
+++ b/patches/api/0341-Custom-Potion-Mixes.patch
@@ -155,10 +155,10 @@ index 0000000000000000000000000000000000000000..3ede1e8f7bf0436fdc5bf395c0f9eaf1
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 64bd6071d45d845a2e8e5565014036e7ce16a430..4cf3a4bdf6e76b73ce0f3acd06a10c129de7b309 100644
+index 69b6c867961d4701a26e8efe048b5bef04c1bcd8..0bb628f1ebfd6eaea23757d928a082afb24a30d1 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2645,6 +2645,15 @@ public final class Bukkit {
+@@ -2627,6 +2627,15 @@ public final class Bukkit {
      public static io.papermc.paper.datapack.DatapackManager getDatapackManager() {
          return server.getDatapackManager();
      }
@@ -175,10 +175,10 @@ index 64bd6071d45d845a2e8e5565014036e7ce16a430..4cf3a4bdf6e76b73ce0f3acd06a10c12
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d46999648b8770624d288709458cfbf400063037..17ea9d6a508d77b449dd5ac6805074e8de42aadb 100644
+index c79768c995e47470e781645b9e6062b35bb506fd..85fd8980be1f1d878e9be1a823f1ad85fb4427c2 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2306,5 +2306,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2290,5 +2290,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull
      io.papermc.paper.datapack.DatapackManager getDatapackManager();
diff --git a/patches/api/0343-Expose-furnace-minecart-push-values.patch b/patches/api/0342-Expose-furnace-minecart-push-values.patch
index 3d8c2336e7..3d8c2336e7 100644
--- a/patches/api/0343-Expose-furnace-minecart-push-values.patch
+++ b/patches/api/0342-Expose-furnace-minecart-push-values.patch
diff --git a/patches/api/0344-More-Projectile-API.patch b/patches/api/0343-More-Projectile-API.patch
index fdec1b8add..fdec1b8add 100644
--- a/patches/api/0344-More-Projectile-API.patch
+++ b/patches/api/0343-More-Projectile-API.patch
diff --git a/patches/api/0345-Add-getComputedBiome-API.patch b/patches/api/0344-Add-getComputedBiome-API.patch
index fecc34acdf..fecc34acdf 100644
--- a/patches/api/0345-Add-getComputedBiome-API.patch
+++ b/patches/api/0344-Add-getComputedBiome-API.patch
diff --git a/patches/api/0346-Add-enchantWithLevels-API.patch b/patches/api/0345-Add-enchantWithLevels-API.patch
index 9aa2a3ee6d..8dbe2d7555 100644
--- a/patches/api/0346-Add-enchantWithLevels-API.patch
+++ b/patches/api/0345-Add-enchantWithLevels-API.patch
@@ -70,10 +70,10 @@ index 96546712f788e091749a1b4eebc6b1d6c3db7814..bd0e55562f1cabef3078573182e0cf9f
 +    // 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 d4178bc7a51bdcfb2446510de66e4fff1b0a86ec..6fffdec6fa82f7aae901984dc0a844da02e6eb2e 100644
+index 7915521e3640ffc12d87dbbab4cd1a777e3801c9..c9fc93b2f4f3cf971ccb496cafce44c93c4b83c6 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -679,6 +679,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -678,6 +678,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
      }
  
      // Paper start
diff --git a/patches/api/0347-Add-TameableDeathMessageEvent.patch b/patches/api/0346-Add-TameableDeathMessageEvent.patch
index aec53f13ba..aec53f13ba 100644
--- a/patches/api/0347-Add-TameableDeathMessageEvent.patch
+++ b/patches/api/0346-Add-TameableDeathMessageEvent.patch
diff --git a/patches/api/0348-Allow-to-change-the-podium-of-the-EnderDragon.patch b/patches/api/0347-Allow-to-change-the-podium-of-the-EnderDragon.patch
index 08ffa1fdde..08ffa1fdde 100644
--- a/patches/api/0348-Allow-to-change-the-podium-of-the-EnderDragon.patch
+++ b/patches/api/0347-Allow-to-change-the-podium-of-the-EnderDragon.patch
diff --git a/patches/api/0349-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch b/patches/api/0348-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
index 21b3f85c0b..21b3f85c0b 100644
--- a/patches/api/0349-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
+++ b/patches/api/0348-Fix-incorrect-new-blockstate-in-EntityBreakDoorEvent.patch
diff --git a/patches/api/0350-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch b/patches/api/0349-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
index 5775b6f33c..5775b6f33c 100644
--- a/patches/api/0350-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
+++ b/patches/api/0349-Add-pre-unbreaking-amount-to-PlayerItemDamageEvent.patch
diff --git a/patches/api/0351-WorldCreator-keepSpawnLoaded.patch b/patches/api/0350-WorldCreator-keepSpawnLoaded.patch
index 287c313c58..287c313c58 100644
--- a/patches/api/0351-WorldCreator-keepSpawnLoaded.patch
+++ b/patches/api/0350-WorldCreator-keepSpawnLoaded.patch
diff --git a/patches/api/0352-Add-EntityDyeEvent-and-CollarColorable-interface.patch b/patches/api/0351-Add-EntityDyeEvent-and-CollarColorable-interface.patch
index e7a4ad2089..e7a4ad2089 100644
--- a/patches/api/0352-Add-EntityDyeEvent-and-CollarColorable-interface.patch
+++ b/patches/api/0351-Add-EntityDyeEvent-and-CollarColorable-interface.patch
diff --git a/patches/api/0353-Add-PlayerStopUsingItemEvent.patch b/patches/api/0352-Add-PlayerStopUsingItemEvent.patch
index c8de1f6ed0..c8de1f6ed0 100644
--- a/patches/api/0353-Add-PlayerStopUsingItemEvent.patch
+++ b/patches/api/0352-Add-PlayerStopUsingItemEvent.patch
diff --git a/patches/api/0354-Expand-FallingBlock-API.patch b/patches/api/0353-Expand-FallingBlock-API.patch
index 42538dc688..42538dc688 100644
--- a/patches/api/0354-Expand-FallingBlock-API.patch
+++ b/patches/api/0353-Expand-FallingBlock-API.patch
diff --git a/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch b/patches/api/0354-Add-method-isTickingWorlds-to-Bukkit.patch
index 85d1d1ea5e..6092439044 100644
--- a/patches/api/0355-Add-method-isTickingWorlds-to-Bukkit.patch
+++ b/patches/api/0354-Add-method-isTickingWorlds-to-Bukkit.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add method isTickingWorlds() to Bukkit.
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4cf3a4bdf6e76b73ce0f3acd06a10c129de7b309..3e774080b5877b25759d001520eacbfb7e49cba0 100644
+index 0bb628f1ebfd6eaea23757d928a082afb24a30d1..8028a9dd43e161556dcd97aa50648b05ae6ff188 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -806,12 +806,26 @@ public final class Bukkit {
@@ -56,7 +56,7 @@ index 4cf3a4bdf6e76b73ce0f3acd06a10c129de7b309..3e774080b5877b25759d001520eacbfb
       * @param world the world to unload
       * @param save whether to save the chunks before unloading
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 17ea9d6a508d77b449dd5ac6805074e8de42aadb..ea6ba08e9016928dd5e5844161e6c99571a1f495 100644
+index 85fd8980be1f1d878e9be1a823f1ad85fb4427c2..65620c67da99af7e84357fe91d90878ebe84798b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -676,34 +676,55 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0356-Add-WardenAngerChangeEvent.patch b/patches/api/0355-Add-WardenAngerChangeEvent.patch
index 4291ccd615..4291ccd615 100644
--- a/patches/api/0356-Add-WardenAngerChangeEvent.patch
+++ b/patches/api/0355-Add-WardenAngerChangeEvent.patch
diff --git a/patches/api/0357-Nameable-Banner-API.patch b/patches/api/0356-Nameable-Banner-API.patch
index eba196daaf..eba196daaf 100644
--- a/patches/api/0357-Nameable-Banner-API.patch
+++ b/patches/api/0356-Nameable-Banner-API.patch
diff --git a/patches/api/0358-Add-Player-getFishHook.patch b/patches/api/0357-Add-Player-getFishHook.patch
index feae3b2e47..feae3b2e47 100644
--- a/patches/api/0358-Add-Player-getFishHook.patch
+++ b/patches/api/0357-Add-Player-getFishHook.patch
diff --git a/patches/api/0359-More-Teleport-API.patch b/patches/api/0358-More-Teleport-API.patch
index a464ab5388..a464ab5388 100644
--- a/patches/api/0359-More-Teleport-API.patch
+++ b/patches/api/0358-More-Teleport-API.patch
diff --git a/patches/api/0360-Add-EntityPortalReadyEvent.patch b/patches/api/0359-Add-EntityPortalReadyEvent.patch
index af86ef0a8f..af86ef0a8f 100644
--- a/patches/api/0360-Add-EntityPortalReadyEvent.patch
+++ b/patches/api/0359-Add-EntityPortalReadyEvent.patch
diff --git a/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch b/patches/api/0360-Custom-Chat-Completion-Suggestions-API.patch
index 83811edce4..83811edce4 100644
--- a/patches/api/0361-Custom-Chat-Completion-Suggestions-API.patch
+++ b/patches/api/0360-Custom-Chat-Completion-Suggestions-API.patch
diff --git a/patches/api/0362-Collision-API.patch b/patches/api/0361-Collision-API.patch
index ce2e084b64..ce2e084b64 100644
--- a/patches/api/0362-Collision-API.patch
+++ b/patches/api/0361-Collision-API.patch
diff --git a/patches/api/0363-Block-Ticking-API.patch b/patches/api/0362-Block-Ticking-API.patch
index d588899982..d588899982 100644
--- a/patches/api/0363-Block-Ticking-API.patch
+++ b/patches/api/0362-Block-Ticking-API.patch
diff --git a/patches/api/0364-Add-NamespacedKey-biome-methods.patch b/patches/api/0363-Add-NamespacedKey-biome-methods.patch
index 29bd350af8..29bd350af8 100644
--- a/patches/api/0364-Add-NamespacedKey-biome-methods.patch
+++ b/patches/api/0363-Add-NamespacedKey-biome-methods.patch
diff --git a/patches/api/0365-Also-load-resources-from-LibraryLoader.patch b/patches/api/0364-Also-load-resources-from-LibraryLoader.patch
index c2a41c2e53..c2a41c2e53 100644
--- a/patches/api/0365-Also-load-resources-from-LibraryLoader.patch
+++ b/patches/api/0364-Also-load-resources-from-LibraryLoader.patch
diff --git a/patches/api/0366-Added-byte-array-serialization-deserialization-for-P.patch b/patches/api/0365-Added-byte-array-serialization-deserialization-for-P.patch
index 9b71f12681..9b71f12681 100644
--- a/patches/api/0366-Added-byte-array-serialization-deserialization-for-P.patch
+++ b/patches/api/0365-Added-byte-array-serialization-deserialization-for-P.patch
diff --git a/patches/api/0367-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch b/patches/api/0366-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
index 291761dadb..291761dadb 100644
--- a/patches/api/0367-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
+++ b/patches/api/0366-Add-a-consumer-parameter-to-ProjectileSource-launchP.patch
diff --git a/patches/api/0368-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch b/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
index 9b5ef25cf4..9b5ef25cf4 100644
--- a/patches/api/0368-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
+++ b/patches/api/0367-Expose-codepoint-limit-in-YamlConfigOptions-and-incr.patch
diff --git a/patches/api/0369-Add-getDrops-to-BlockState.patch b/patches/api/0368-Add-getDrops-to-BlockState.patch
index f9e8152229..f9e8152229 100644
--- a/patches/api/0369-Add-getDrops-to-BlockState.patch
+++ b/patches/api/0368-Add-getDrops-to-BlockState.patch
diff --git a/patches/api/0370-Add-PlayerInventorySlotChangeEvent.patch b/patches/api/0369-Add-PlayerInventorySlotChangeEvent.patch
index d76df6d87d..d76df6d87d 100644
--- a/patches/api/0370-Add-PlayerInventorySlotChangeEvent.patch
+++ b/patches/api/0369-Add-PlayerInventorySlotChangeEvent.patch
diff --git a/patches/api/0371-Elder-Guardian-appearance-API.patch b/patches/api/0370-Elder-Guardian-appearance-API.patch
index 4c5b51b7a5..4c5b51b7a5 100644
--- a/patches/api/0371-Elder-Guardian-appearance-API.patch
+++ b/patches/api/0370-Elder-Guardian-appearance-API.patch
diff --git a/patches/api/0372-Allow-changing-bed-s-occupied-property.patch b/patches/api/0371-Allow-changing-bed-s-occupied-property.patch
index 8dfafd6d33..8dfafd6d33 100644
--- a/patches/api/0372-Allow-changing-bed-s-occupied-property.patch
+++ b/patches/api/0371-Allow-changing-bed-s-occupied-property.patch
diff --git a/patches/api/0373-Add-EquipmentSlot-convenience-methods.patch b/patches/api/0372-Add-EquipmentSlot-convenience-methods.patch
index f7e2301f31..f7e2301f31 100644
--- a/patches/api/0373-Add-EquipmentSlot-convenience-methods.patch
+++ b/patches/api/0372-Add-EquipmentSlot-convenience-methods.patch
diff --git a/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch b/patches/api/0373-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
index b745878796..b745878796 100644
--- a/patches/api/0374-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
+++ b/patches/api/0373-Add-LivingEntity-swingHand-EquipmentSlot-convenience.patch
diff --git a/patches/api/0375-Add-entity-knockback-API.patch b/patches/api/0374-Add-entity-knockback-API.patch
index fe9d0a85bb..fe9d0a85bb 100644
--- a/patches/api/0375-Add-entity-knockback-API.patch
+++ b/patches/api/0374-Add-entity-knockback-API.patch
diff --git a/patches/api/0376-Added-EntityToggleSitEvent.patch b/patches/api/0375-Added-EntityToggleSitEvent.patch
index d5a8c46dc8..d5a8c46dc8 100644
--- a/patches/api/0376-Added-EntityToggleSitEvent.patch
+++ b/patches/api/0375-Added-EntityToggleSitEvent.patch
diff --git a/patches/api/0377-Add-Moving-Piston-API.patch b/patches/api/0376-Add-Moving-Piston-API.patch
index 8f889f1e3d..8f889f1e3d 100644
--- a/patches/api/0377-Add-Moving-Piston-API.patch
+++ b/patches/api/0376-Add-Moving-Piston-API.patch
diff --git a/patches/api/0378-Add-PrePlayerAttackEntityEvent.patch b/patches/api/0377-Add-PrePlayerAttackEntityEvent.patch
index ac0ebedde7..ac0ebedde7 100644
--- a/patches/api/0378-Add-PrePlayerAttackEntityEvent.patch
+++ b/patches/api/0377-Add-PrePlayerAttackEntityEvent.patch
diff --git a/patches/api/0379-Add-Player-Warden-Warning-API.patch b/patches/api/0378-Add-Player-Warden-Warning-API.patch
index d1728e9492..d1728e9492 100644
--- a/patches/api/0379-Add-Player-Warden-Warning-API.patch
+++ b/patches/api/0378-Add-Player-Warden-Warning-API.patch
diff --git a/patches/api/0380-More-vanilla-friendly-methods-to-update-trades.patch b/patches/api/0379-More-vanilla-friendly-methods-to-update-trades.patch
index f13fdb5601..f13fdb5601 100644
--- a/patches/api/0380-More-vanilla-friendly-methods-to-update-trades.patch
+++ b/patches/api/0379-More-vanilla-friendly-methods-to-update-trades.patch
diff --git a/patches/api/0381-Add-paper-dumplisteners-command.patch b/patches/api/0380-Add-paper-dumplisteners-command.patch
index a5d858851f..a5d858851f 100644
--- a/patches/api/0381-Add-paper-dumplisteners-command.patch
+++ b/patches/api/0380-Add-paper-dumplisteners-command.patch
diff --git a/patches/api/0382-ItemStack-damage-API.patch b/patches/api/0381-ItemStack-damage-API.patch
index 64aba9c068..bd4ff35bcc 100644
--- a/patches/api/0382-ItemStack-damage-API.patch
+++ b/patches/api/0381-ItemStack-damage-API.patch
@@ -66,10 +66,10 @@ index 8dd993ce32686431e1c759d446a3620cb52f7ec1..0d665a31152c9a667576f2e9d91ffec5
 +    // 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 6fffdec6fa82f7aae901984dc0a844da02e6eb2e..3c48ba63c62d44096762251e730c226f7e189b31 100644
+index c9fc93b2f4f3cf971ccb496cafce44c93c4b83c6..db128d14931ec2afea5205faa58fb5410ec9a54c 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1004,5 +1004,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1003,5 +1003,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/0383-Add-Tick-TemporalUnit.patch b/patches/api/0382-Add-Tick-TemporalUnit.patch
index 562eb00082..562eb00082 100644
--- a/patches/api/0383-Add-Tick-TemporalUnit.patch
+++ b/patches/api/0382-Add-Tick-TemporalUnit.patch
diff --git a/patches/api/0384-Friction-API.patch b/patches/api/0383-Friction-API.patch
index 23ae7abbae..23ae7abbae 100644
--- a/patches/api/0384-Friction-API.patch
+++ b/patches/api/0383-Friction-API.patch
diff --git a/patches/api/0385-Player-Entity-Tracking-Events.patch b/patches/api/0384-Player-Entity-Tracking-Events.patch
index 3dfa72c922..3dfa72c922 100644
--- a/patches/api/0385-Player-Entity-Tracking-Events.patch
+++ b/patches/api/0384-Player-Entity-Tracking-Events.patch
diff --git a/patches/api/0386-Add-missing-Fluid-type.patch b/patches/api/0385-Add-missing-Fluid-type.patch
index c260bf8497..c260bf8497 100644
--- a/patches/api/0386-Add-missing-Fluid-type.patch
+++ b/patches/api/0385-Add-missing-Fluid-type.patch
diff --git a/patches/api/0387-fix-Instruments.patch b/patches/api/0386-fix-Instruments.patch
index 468dc80a34..468dc80a34 100644
--- a/patches/api/0387-fix-Instruments.patch
+++ b/patches/api/0386-fix-Instruments.patch
diff --git a/patches/api/0388-Add-BlockLockCheckEvent.patch b/patches/api/0387-Add-BlockLockCheckEvent.patch
index c5d560192c..c5d560192c 100644
--- a/patches/api/0388-Add-BlockLockCheckEvent.patch
+++ b/patches/api/0387-Add-BlockLockCheckEvent.patch
diff --git a/patches/api/0389-Add-Sneaking-API-for-Entities.patch b/patches/api/0388-Add-Sneaking-API-for-Entities.patch
index 5419ce7d3c..5419ce7d3c 100644
--- a/patches/api/0389-Add-Sneaking-API-for-Entities.patch
+++ b/patches/api/0388-Add-Sneaking-API-for-Entities.patch
diff --git a/patches/api/0390-Improve-PortalEvents.patch b/patches/api/0389-Improve-PortalEvents.patch
index f7f53b19fc..f7f53b19fc 100644
--- a/patches/api/0390-Improve-PortalEvents.patch
+++ b/patches/api/0389-Improve-PortalEvents.patch
diff --git a/patches/api/0391-Flying-Fall-Damage-API.patch b/patches/api/0390-Flying-Fall-Damage-API.patch
index 13493c2aa9..13493c2aa9 100644
--- a/patches/api/0391-Flying-Fall-Damage-API.patch
+++ b/patches/api/0390-Flying-Fall-Damage-API.patch
diff --git a/patches/api/0392-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/0391-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
index 475ca65bbf..475ca65bbf 100644
--- a/patches/api/0392-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
+++ b/patches/api/0391-Replace-ItemFlag.HIDE_POTION_EFFECTS.patch
diff --git a/patches/api/0393-Win-Screen-API.patch b/patches/api/0392-Win-Screen-API.patch
index cdeea2f4f9..cdeea2f4f9 100644
--- a/patches/api/0393-Win-Screen-API.patch
+++ b/patches/api/0392-Win-Screen-API.patch
diff --git a/patches/api/0394-Add-Entity-Body-Yaw-API.patch b/patches/api/0393-Add-Entity-Body-Yaw-API.patch
index c0186ee4f1..c0186ee4f1 100644
--- a/patches/api/0394-Add-Entity-Body-Yaw-API.patch
+++ b/patches/api/0393-Add-Entity-Body-Yaw-API.patch
diff --git a/patches/api/0395-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch b/patches/api/0394-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
index c375206bf7..c375206bf7 100644
--- a/patches/api/0395-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
+++ b/patches/api/0394-Fix-HandlerList-for-InventoryBlockStartEvent-subclas.patch
diff --git a/patches/api/0396-Add-EntityFertilizeEggEvent.patch b/patches/api/0395-Add-EntityFertilizeEggEvent.patch
index 4ae6ff9f0f..4ae6ff9f0f 100644
--- a/patches/api/0396-Add-EntityFertilizeEggEvent.patch
+++ b/patches/api/0395-Add-EntityFertilizeEggEvent.patch
diff --git a/patches/api/0397-Add-CompostItemEvent-and-EntityCompostItemEvent.patch b/patches/api/0396-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
index 9dee250212..9dee250212 100644
--- a/patches/api/0397-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
+++ b/patches/api/0396-Add-CompostItemEvent-and-EntityCompostItemEvent.patch
diff --git a/patches/api/0398-Add-Shearable-API.patch b/patches/api/0397-Add-Shearable-API.patch
index 06e4cefb44..06e4cefb44 100644
--- a/patches/api/0398-Add-Shearable-API.patch
+++ b/patches/api/0397-Add-Shearable-API.patch
diff --git a/patches/api/0399-Fix-SpawnEggMeta-get-setSpawnedType.patch b/patches/api/0398-Fix-SpawnEggMeta-get-setSpawnedType.patch
index 27abcd1f93..27abcd1f93 100644
--- a/patches/api/0399-Fix-SpawnEggMeta-get-setSpawnedType.patch
+++ b/patches/api/0398-Fix-SpawnEggMeta-get-setSpawnedType.patch
diff --git a/patches/api/0400-Add-Mob-Experience-reward-API.patch b/patches/api/0399-Add-Mob-Experience-reward-API.patch
index 354d6d1eb4..354d6d1eb4 100644
--- a/patches/api/0400-Add-Mob-Experience-reward-API.patch
+++ b/patches/api/0399-Add-Mob-Experience-reward-API.patch
diff --git a/patches/api/0401-Expand-PlayerItemMendEvent.patch b/patches/api/0400-Expand-PlayerItemMendEvent.patch
index 223922e05e..223922e05e 100644
--- a/patches/api/0401-Expand-PlayerItemMendEvent.patch
+++ b/patches/api/0400-Expand-PlayerItemMendEvent.patch
diff --git a/patches/api/0402-Add-transient-modifier-API.patch b/patches/api/0401-Add-transient-modifier-API.patch
index a32e4c86a9..a32e4c86a9 100644
--- a/patches/api/0402-Add-transient-modifier-API.patch
+++ b/patches/api/0401-Add-transient-modifier-API.patch
diff --git a/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch b/patches/api/0402-Properly-remove-the-experimental-smithing-inventory-.patch
index 6448068df8..6448068df8 100644
--- a/patches/api/0403-Properly-remove-the-experimental-smithing-inventory-.patch
+++ b/patches/api/0402-Properly-remove-the-experimental-smithing-inventory-.patch
diff --git a/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch b/patches/api/0403-Add-method-to-remove-all-active-potion-effects.patch
index 2b9703cf94..2b9703cf94 100644
--- a/patches/api/0404-Add-method-to-remove-all-active-potion-effects.patch
+++ b/patches/api/0403-Add-method-to-remove-all-active-potion-effects.patch
diff --git a/patches/api/0405-Folia-scheduler-and-owned-region-API.patch b/patches/api/0404-Folia-scheduler-and-owned-region-API.patch
index e64ac7f52f..35af43df05 100644
--- a/patches/api/0405-Folia-scheduler-and-owned-region-API.patch
+++ b/patches/api/0404-Folia-scheduler-and-owned-region-API.patch
@@ -499,10 +499,10 @@ index 0000000000000000000000000000000000000000..a6b50c9d8af589cc4747e14d343d2045
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 3e774080b5877b25759d001520eacbfb7e49cba0..382421ca3a66ae18c00ff2ed46e4ada2cf5278ff 100644
+index 8028a9dd43e161556dcd97aa50648b05ae6ff188..53e86d17867e5c2eae2db6a10bfbed788019a1ad 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2676,6 +2676,141 @@ public final class Bukkit {
+@@ -2658,6 +2658,141 @@ public final class Bukkit {
      }
      // Paper end
  
@@ -645,10 +645,10 @@ index 3e774080b5877b25759d001520eacbfb7e49cba0..382421ca3a66ae18c00ff2ed46e4ada2
      public static Server.Spigot spigot() {
          return server.spigot();
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index ea6ba08e9016928dd5e5844161e6c99571a1f495..9df85626142d8e7b704d378d76278e9b955f9687 100644
+index 65620c67da99af7e84357fe91d90878ebe84798b..e9773ebcc76fb637ed19dce203ae0dfe226b0066 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2335,4 +2335,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2319,4 +2319,119 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
      // Paper end
diff --git a/patches/api/0406-Add-event-for-player-editing-sign.patch b/patches/api/0405-Add-event-for-player-editing-sign.patch
index ec38bf008b..ec38bf008b 100644
--- a/patches/api/0406-Add-event-for-player-editing-sign.patch
+++ b/patches/api/0405-Add-event-for-player-editing-sign.patch
diff --git a/patches/api/0407-Add-Sign-getInteractableSideFor.patch b/patches/api/0406-Add-Sign-getInteractableSideFor.patch
index 1e085323ca..1e085323ca 100644
--- a/patches/api/0407-Add-Sign-getInteractableSideFor.patch
+++ b/patches/api/0406-Add-Sign-getInteractableSideFor.patch
diff --git a/patches/api/0408-Fix-BanList-API.patch b/patches/api/0407-Fix-BanList-API.patch
index a9640f44a2..a9640f44a2 100644
--- a/patches/api/0408-Fix-BanList-API.patch
+++ b/patches/api/0407-Fix-BanList-API.patch
diff --git a/patches/api/0409-Add-whitelist-events.patch b/patches/api/0408-Add-whitelist-events.patch
index 75458e78df..75458e78df 100644
--- a/patches/api/0409-Add-whitelist-events.patch
+++ b/patches/api/0408-Add-whitelist-events.patch
diff --git a/patches/api/0410-API-for-updating-recipes-on-clients.patch b/patches/api/0409-API-for-updating-recipes-on-clients.patch
index 6dfda16a0b..a3b3f4bb59 100644
--- a/patches/api/0410-API-for-updating-recipes-on-clients.patch
+++ b/patches/api/0409-API-for-updating-recipes-on-clients.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] API for updating recipes on clients
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 382421ca3a66ae18c00ff2ed46e4ada2cf5278ff..801cd170bedaac84446a8687412e3efdae525d86 100644
+index 53e86d17867e5c2eae2db6a10bfbed788019a1ad..89b797c3468f401a208ef2351ba9f91b234455fd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -990,6 +990,26 @@ public final class Bukkit {
@@ -82,7 +82,7 @@ index 382421ca3a66ae18c00ff2ed46e4ada2cf5278ff..801cd170bedaac84446a8687412e3efd
       * Gets a list of command aliases defined in the server properties.
       *
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 9df85626142d8e7b704d378d76278e9b955f9687..989ad0c2b86c47ccd644fd0a604e40db2dd66770 100644
+index e9773ebcc76fb637ed19dce203ae0dfe226b0066..f834dd696d3a40af72ab03f4bd03a784ff5ef23e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -839,6 +839,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0411-Add-PlayerFailMoveEvent.patch b/patches/api/0410-Add-PlayerFailMoveEvent.patch
index c0687e2ae0..c0687e2ae0 100644
--- a/patches/api/0411-Add-PlayerFailMoveEvent.patch
+++ b/patches/api/0410-Add-PlayerFailMoveEvent.patch
diff --git a/patches/api/0412-Fix-custom-statistic-criteria-creation.patch b/patches/api/0411-Fix-custom-statistic-criteria-creation.patch
index f4070d7bb4..f4070d7bb4 100644
--- a/patches/api/0412-Fix-custom-statistic-criteria-creation.patch
+++ b/patches/api/0411-Fix-custom-statistic-criteria-creation.patch
diff --git a/patches/api/0413-SculkCatalyst-bloom-API.patch b/patches/api/0412-SculkCatalyst-bloom-API.patch
index 49d8c8c2bd..49d8c8c2bd 100644
--- a/patches/api/0413-SculkCatalyst-bloom-API.patch
+++ b/patches/api/0412-SculkCatalyst-bloom-API.patch
diff --git a/patches/api/0414-API-for-an-entity-s-scoreboard-name.patch b/patches/api/0413-API-for-an-entity-s-scoreboard-name.patch
index 1fb9128be8..1fb9128be8 100644
--- a/patches/api/0414-API-for-an-entity-s-scoreboard-name.patch
+++ b/patches/api/0413-API-for-an-entity-s-scoreboard-name.patch
diff --git a/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch b/patches/api/0414-Deprecate-and-replace-methods-with-old-StructureType.patch
index f4cfd76261..b1f1fc1cfc 100644
--- a/patches/api/0415-Deprecate-and-replace-methods-with-old-StructureType.patch
+++ b/patches/api/0414-Deprecate-and-replace-methods-with-old-StructureType.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Deprecate and replace methods with old StructureType
 
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 801cd170bedaac84446a8687412e3efdae525d86..031e9a41b44bf405686d3b210a8354cb9520be2e 100644
+index 89b797c3468f401a208ef2351ba9f91b234455fd..50d6784c488041ce416845373efebce14321b1ec 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -935,9 +935,6 @@ public final class Bukkit {
@@ -84,7 +84,7 @@ index 801cd170bedaac84446a8687412e3efdae525d86..031e9a41b44bf405686d3b210a8354cb
      /**
       * Reloads the server, refreshing settings and plugin information.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 989ad0c2b86c47ccd644fd0a604e40db2dd66770..876267814d25da46f3596448b9036b5901d2c4e0 100644
+index f834dd696d3a40af72ab03f4bd03a784ff5ef23e..23af0b4fa239de8926a36346f38224a00f85284e 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -803,16 +803,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0416-Add-Listing-API-for-Player.patch b/patches/api/0415-Add-Listing-API-for-Player.patch
index 47a8946b80..47a8946b80 100644
--- a/patches/api/0416-Add-Listing-API-for-Player.patch
+++ b/patches/api/0415-Add-Listing-API-for-Player.patch
diff --git a/patches/api/0417-Expose-clicked-BlockFace-during-BlockDamageEvent.patch b/patches/api/0416-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
index 34d1940866..34d1940866 100644
--- a/patches/api/0417-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
+++ b/patches/api/0416-Expose-clicked-BlockFace-during-BlockDamageEvent.patch
diff --git a/patches/api/0418-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0417-Fix-NPE-on-Boat-getStatus.patch
index 1cf6096a92..1cf6096a92 100644
--- a/patches/api/0418-Fix-NPE-on-Boat-getStatus.patch
+++ b/patches/api/0417-Fix-NPE-on-Boat-getStatus.patch
diff --git a/patches/api/0419-Expand-Pose-API.patch b/patches/api/0418-Expand-Pose-API.patch
index a7ac9f7567..a7ac9f7567 100644
--- a/patches/api/0419-Expand-Pose-API.patch
+++ b/patches/api/0418-Expand-Pose-API.patch
diff --git a/patches/api/0420-MerchantRecipe-add-copy-constructor.patch b/patches/api/0419-MerchantRecipe-add-copy-constructor.patch
index 1c5ba2803c..1c5ba2803c 100644
--- a/patches/api/0420-MerchantRecipe-add-copy-constructor.patch
+++ b/patches/api/0419-MerchantRecipe-add-copy-constructor.patch
diff --git a/patches/api/0421-More-DragonBattle-API.patch b/patches/api/0420-More-DragonBattle-API.patch
index e25208ec19..e25208ec19 100644
--- a/patches/api/0421-More-DragonBattle-API.patch
+++ b/patches/api/0420-More-DragonBattle-API.patch
diff --git a/patches/api/0422-Add-PlayerPickItemEvent.patch b/patches/api/0421-Add-PlayerPickItemEvent.patch
index 6dd0be80a8..6dd0be80a8 100644
--- a/patches/api/0422-Add-PlayerPickItemEvent.patch
+++ b/patches/api/0421-Add-PlayerPickItemEvent.patch
diff --git a/patches/api/0423-Allow-trident-custom-damage.patch b/patches/api/0422-Allow-trident-custom-damage.patch
index 870b735548..870b735548 100644
--- a/patches/api/0423-Allow-trident-custom-damage.patch
+++ b/patches/api/0422-Allow-trident-custom-damage.patch
diff --git a/patches/api/0424-Expose-hand-during-BlockCanBuildEvent.patch b/patches/api/0423-Expose-hand-during-BlockCanBuildEvent.patch
index 97d99a40d2..97d99a40d2 100644
--- a/patches/api/0424-Expose-hand-during-BlockCanBuildEvent.patch
+++ b/patches/api/0423-Expose-hand-during-BlockCanBuildEvent.patch
diff --git a/patches/api/0425-Limit-setBurnTime-to-valid-short-values.patch b/patches/api/0424-Limit-setBurnTime-to-valid-short-values.patch
index 2faac56fd8..2faac56fd8 100644
--- a/patches/api/0425-Limit-setBurnTime-to-valid-short-values.patch
+++ b/patches/api/0424-Limit-setBurnTime-to-valid-short-values.patch
diff --git a/patches/api/0426-Add-OfflinePlayer-isConnected.patch b/patches/api/0425-Add-OfflinePlayer-isConnected.patch
index 08e2f91095..08e2f91095 100644
--- a/patches/api/0426-Add-OfflinePlayer-isConnected.patch
+++ b/patches/api/0425-Add-OfflinePlayer-isConnected.patch
diff --git a/patches/api/0427-Add-titleOverride-to-InventoryOpenEvent.patch b/patches/api/0426-Add-titleOverride-to-InventoryOpenEvent.patch
index 68e755f010..68e755f010 100644
--- a/patches/api/0427-Add-titleOverride-to-InventoryOpenEvent.patch
+++ b/patches/api/0426-Add-titleOverride-to-InventoryOpenEvent.patch
diff --git a/patches/api/0428-Allow-proper-checking-of-empty-item-stacks.patch b/patches/api/0427-Allow-proper-checking-of-empty-item-stacks.patch
index ab2cc037cd..7c74a0781c 100644
--- a/patches/api/0428-Allow-proper-checking-of-empty-item-stacks.patch
+++ b/patches/api/0427-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 3c48ba63c62d44096762251e730c226f7e189b31..a6a066fee62c7a66b8fefd7eca550eaf3644815e 100644
+index db128d14931ec2afea5205faa58fb5410ec9a54c..9d397c395d777f337a421fac8fea064680065661 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1018,5 +1018,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1017,5 +1017,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/0429-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch b/patches/api/0428-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
index e72f86be5d..e72f86be5d 100644
--- a/patches/api/0429-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
+++ b/patches/api/0428-Fix-PlayerSwapHandItemsEvent-throwing-exception-when.patch
diff --git a/patches/api/0430-Add-player-idle-duration-API.patch b/patches/api/0429-Add-player-idle-duration-API.patch
index 2fbfc5dc58..2fbfc5dc58 100644
--- a/patches/api/0430-Add-player-idle-duration-API.patch
+++ b/patches/api/0429-Add-player-idle-duration-API.patch
diff --git a/patches/api/0431-Add-API-to-get-the-collision-shape-of-a-block-before.patch b/patches/api/0430-Add-API-to-get-the-collision-shape-of-a-block-before.patch
index 0481690ad4..0481690ad4 100644
--- a/patches/api/0431-Add-API-to-get-the-collision-shape-of-a-block-before.patch
+++ b/patches/api/0430-Add-API-to-get-the-collision-shape-of-a-block-before.patch
diff --git a/patches/api/0432-Add-predicate-for-blocks-when-raytracing.patch b/patches/api/0431-Add-predicate-for-blocks-when-raytracing.patch
index 77d36bec08..77d36bec08 100644
--- a/patches/api/0432-Add-predicate-for-blocks-when-raytracing.patch
+++ b/patches/api/0431-Add-predicate-for-blocks-when-raytracing.patch
diff --git a/patches/api/0433-Add-hand-to-fish-event-for-all-player-interactions.patch b/patches/api/0432-Add-hand-to-fish-event-for-all-player-interactions.patch
index b431332b9a..b431332b9a 100644
--- a/patches/api/0433-Add-hand-to-fish-event-for-all-player-interactions.patch
+++ b/patches/api/0432-Add-hand-to-fish-event-for-all-player-interactions.patch
diff --git a/patches/api/0433-Add-UUID-attribute-modifier-API.patch b/patches/api/0433-Add-UUID-attribute-modifier-API.patch
new file mode 100644
index 0000000000..64de52c83e
--- /dev/null
+++ b/patches/api/0433-Add-UUID-attribute-modifier-API.patch
@@ -0,0 +1,93 @@
+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
+
+
+diff --git a/src/main/java/org/bukkit/attribute/AttributeInstance.java b/src/main/java/org/bukkit/attribute/AttributeInstance.java
+index 5513174ea545bb5b4fdc028cbaa4c1bb763e2c6d..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 {
+     @NotNull
+     Collection<AttributeModifier> getModifiers();
+ 
++    // Paper start
++    /**
++     * Gets the modifier with the corresponding key.
++     *
++     * @param key the jey of the modifier
++     * @return the modifier, if it exists
++     */
++    @org.jetbrains.annotations.Nullable AttributeModifier getModifier(@NotNull net.kyori.adventure.key.Key key);
++
++    /**
++     * Remove a modifier with the corresponding key from this instance.
++     *
++     * @param key the key of the modifier
++     */
++    void removeModifier(@NotNull net.kyori.adventure.key.Key key);
++
++    /**
++     * Gets the modifier with the corresponding UUID.
++     *
++     * @param uuid the UUID of the modifier
++     * @return the modifier, if it exists
++     * @deprecated use {@link #getModifier(net.kyori.adventure.key.Key)}, modifiers are no longer stored by UUID
++     */
++    @Deprecated(forRemoval = true, since = "1.21")
++    @org.jetbrains.annotations.Nullable AttributeModifier getModifier(@NotNull java.util.UUID uuid);
++
++    /**
++     * Remove a modifier with the corresponding UUID from this instance.
++     *
++     * @param uuid the UUID of the modifier
++     * @deprecated use {@link #removeModifier(net.kyori.adventure.key.Key)}, modifiers are no longer stored by UUID
++     */
++    @Deprecated(forRemoval = true, since = "1.21")
++    void removeModifier(@NotNull java.util.UUID uuid);
++    // Paper end
++
+     /**
+      * Add a modifier to 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
+--- 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 {
+     private final Operation operation;
+     private final EquipmentSlotGroup slot;
+ 
+-    @Deprecated
++    @Deprecated(forRemoval = true, since = "1.21")
+     public AttributeModifier(@NotNull String name, double amount, @NotNull Operation operation) {
+         this(UUID.randomUUID(), name, amount, operation);
+     }
+ 
+-    @Deprecated
++    @Deprecated(forRemoval = true, since = "1.21")
+     public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation) {
+         this(uuid, name, amount, operation, (EquipmentSlot) null);
+     }
+ 
+-    @Deprecated
++    @Deprecated(forRemoval = true, since = "1.21")
+     public AttributeModifier(@NotNull UUID uuid, @NotNull String name, double amount, @NotNull Operation operation, @Nullable EquipmentSlot slot) {
+         this(uuid, name, amount, operation, (slot) == null ? EquipmentSlotGroup.ANY : slot.getGroup());
+     }
+ 
+-    @Deprecated
++    @Deprecated(forRemoval = true, since = "1.21")
+     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 {
+      * @deprecated attributes are now identified by keys
+      */
+     @NotNull
+-    @Deprecated
++    @Deprecated(forRemoval = true, since = "1.21")
+     public UUID getUniqueId() {
+         return UUID.fromString(getKey().toString());
+     }
diff --git a/patches/api/0434-Add-UUID-attribute-modifier-API.patch b/patches/api/0434-Add-UUID-attribute-modifier-API.patch
deleted file mode 100644
index 251ae6e425..0000000000
--- a/patches/api/0434-Add-UUID-attribute-modifier-API.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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
-
-
-diff --git a/src/main/java/org/bukkit/attribute/AttributeInstance.java b/src/main/java/org/bukkit/attribute/AttributeInstance.java
-index 5513174ea545bb5b4fdc028cbaa4c1bb763e2c6d..3cffffe8106387847b10ac39f96687bb075ef686 100644
---- a/src/main/java/org/bukkit/attribute/AttributeInstance.java
-+++ b/src/main/java/org/bukkit/attribute/AttributeInstance.java
-@@ -39,6 +39,23 @@ public interface AttributeInstance {
-     @NotNull
-     Collection<AttributeModifier> getModifiers();
- 
-+    // Paper start
-+    /**
-+     * Gets the modifier with the corresponding UUID.
-+     *
-+     * @param uuid the UUID of the modifier
-+     * @return the modifier, if it exists
-+     */
-+    @org.jetbrains.annotations.Nullable AttributeModifier getModifier(@NotNull java.util.UUID uuid);
-+
-+    /**
-+     * Remove a modifier with the corresponding UUID from this instance.
-+     *
-+     * @param uuid the UUID of the modifier
-+     */
-+    void removeModifier(@NotNull java.util.UUID uuid);
-+    // Paper end
-+
-     /**
-      * Add a modifier to this instance.
-      *
diff --git a/patches/api/0435-Expand-LingeringPotion-API.patch b/patches/api/0434-Expand-LingeringPotion-API.patch
index 40b5a5f547..40b5a5f547 100644
--- a/patches/api/0435-Expand-LingeringPotion-API.patch
+++ b/patches/api/0434-Expand-LingeringPotion-API.patch
diff --git a/patches/api/0436-Remove-unnecessary-durability-check-in-ItemStack-isS.patch b/patches/api/0435-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
index 1c5227e973..72deb7498e 100644
--- a/patches/api/0436-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
+++ b/patches/api/0435-Remove-unnecessary-durability-check-in-ItemStack-isS.patch
@@ -9,10 +9,10 @@ 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 a6a066fee62c7a66b8fefd7eca550eaf3644815e..b413703266b5037b85c26089f2c3e208016fcf8b 100644
+index 9d397c395d777f337a421fac8fea064680065661..c5e22bca27f3199eb2a466f41aa82047f5fd0e44 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -308,7 +308,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -307,7 +307,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
              return true;
          }
          Material comparisonType = (this.type.isLegacy()) ? Bukkit.getUnsafe().fromLegacy(this.getData(), true) : this.type; // This may be called from legacy item stacks, try to get the right material
diff --git a/patches/api/0437-Add-Structure-check-API.patch b/patches/api/0436-Add-Structure-check-API.patch
index ee0adfe254..ee0adfe254 100644
--- a/patches/api/0437-Add-Structure-check-API.patch
+++ b/patches/api/0436-Add-Structure-check-API.patch
diff --git a/patches/api/0438-add-missing-Experimental-annotations.patch b/patches/api/0437-add-missing-Experimental-annotations.patch
index 9cd3d827a6..9cd3d827a6 100644
--- a/patches/api/0438-add-missing-Experimental-annotations.patch
+++ b/patches/api/0437-add-missing-Experimental-annotations.patch
diff --git a/patches/api/0439-Add-more-scoreboard-API.patch b/patches/api/0438-Add-more-scoreboard-API.patch
index 201af36b0c..201af36b0c 100644
--- a/patches/api/0439-Add-more-scoreboard-API.patch
+++ b/patches/api/0438-Add-more-scoreboard-API.patch
diff --git a/patches/api/0440-Improve-Registry.patch b/patches/api/0439-Improve-Registry.patch
index a106bba08d..a106bba08d 100644
--- a/patches/api/0440-Improve-Registry.patch
+++ b/patches/api/0439-Improve-Registry.patch
diff --git a/patches/api/0441-Add-experience-points-API.patch b/patches/api/0440-Add-experience-points-API.patch
index 9b489a9ded..9b489a9ded 100644
--- a/patches/api/0441-Add-experience-points-API.patch
+++ b/patches/api/0440-Add-experience-points-API.patch
diff --git a/patches/api/0442-Add-missing-InventoryType.patch b/patches/api/0441-Add-missing-InventoryType.patch
index 88ed48c3e6..88ed48c3e6 100644
--- a/patches/api/0442-Add-missing-InventoryType.patch
+++ b/patches/api/0441-Add-missing-InventoryType.patch
diff --git a/patches/api/0443-Add-drops-to-shear-events.patch b/patches/api/0442-Add-drops-to-shear-events.patch
index c87460e48d..c87460e48d 100644
--- a/patches/api/0443-Add-drops-to-shear-events.patch
+++ b/patches/api/0442-Add-drops-to-shear-events.patch
diff --git a/patches/api/0444-Add-HiddenPotionEffect-API.patch b/patches/api/0443-Add-HiddenPotionEffect-API.patch
index 94799bbf65..94799bbf65 100644
--- a/patches/api/0444-Add-HiddenPotionEffect-API.patch
+++ b/patches/api/0443-Add-HiddenPotionEffect-API.patch
diff --git a/patches/api/0445-Add-PlayerShieldDisableEvent.patch b/patches/api/0444-Add-PlayerShieldDisableEvent.patch
index 29c7daa0e3..29c7daa0e3 100644
--- a/patches/api/0445-Add-PlayerShieldDisableEvent.patch
+++ b/patches/api/0444-Add-PlayerShieldDisableEvent.patch
diff --git a/patches/api/0446-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch b/patches/api/0445-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
index 93ba48c77c..93ba48c77c 100644
--- a/patches/api/0446-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
+++ b/patches/api/0445-Return-null-for-empty-String-in-NamespacedKey.fromSt.patch
diff --git a/patches/api/0447-Add-BlockStateMeta-clearBlockState.patch b/patches/api/0446-Add-BlockStateMeta-clearBlockState.patch
index 7e8c47a8e2..7e8c47a8e2 100644
--- a/patches/api/0447-Add-BlockStateMeta-clearBlockState.patch
+++ b/patches/api/0446-Add-BlockStateMeta-clearBlockState.patch
diff --git a/patches/api/0448-Expose-LootTable-of-DecoratedPot.patch b/patches/api/0447-Expose-LootTable-of-DecoratedPot.patch
index 42a8de4123..42a8de4123 100644
--- a/patches/api/0448-Expose-LootTable-of-DecoratedPot.patch
+++ b/patches/api/0447-Expose-LootTable-of-DecoratedPot.patch
diff --git a/patches/api/0449-Add-ShulkerDuplicateEvent.patch b/patches/api/0448-Add-ShulkerDuplicateEvent.patch
index a0a81094ce..a0a81094ce 100644
--- a/patches/api/0449-Add-ShulkerDuplicateEvent.patch
+++ b/patches/api/0448-Add-ShulkerDuplicateEvent.patch
diff --git a/patches/api/0450-Add-api-for-spawn-egg-texture-colors.patch b/patches/api/0449-Add-api-for-spawn-egg-texture-colors.patch
index 23541c0b38..23541c0b38 100644
--- a/patches/api/0450-Add-api-for-spawn-egg-texture-colors.patch
+++ b/patches/api/0449-Add-api-for-spawn-egg-texture-colors.patch
diff --git a/patches/api/0451-Add-Lifecycle-Event-system.patch b/patches/api/0450-Add-Lifecycle-Event-system.patch
index d4b3f0411e..d4b3f0411e 100644
--- a/patches/api/0451-Add-Lifecycle-Event-system.patch
+++ b/patches/api/0450-Add-Lifecycle-Event-system.patch
diff --git a/patches/api/0452-ItemStack-Tooltip-API.patch b/patches/api/0451-ItemStack-Tooltip-API.patch
index 91a7aacc6b..7fa28ddc99 100644
--- a/patches/api/0452-ItemStack-Tooltip-API.patch
+++ b/patches/api/0451-ItemStack-Tooltip-API.patch
@@ -119,10 +119,10 @@ index 3f1b48fd65df954e874e6dc6b9093cb12370e2c5..0e9ccfee7a03d341e7c4d271f53b4ed1
 +    @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 b413703266b5037b85c26089f2c3e208016fcf8b..782dc4f31a391896c3d568fb9903e6e5e032c0a3 100644
+index c5e22bca27f3199eb2a466f41aa82047f5fd0e44..235d41b0078bb513470b17a0dad46fae3ac73a16 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -1038,4 +1038,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -1037,4 +1037,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
          return type.isAir() || amount <= 0;
      }
      // Paper end
diff --git a/patches/api/0453-Add-getChunkSnapshot-includeLightData-parameter.patch b/patches/api/0452-Add-getChunkSnapshot-includeLightData-parameter.patch
index 9b950f9493..9b950f9493 100644
--- a/patches/api/0453-Add-getChunkSnapshot-includeLightData-parameter.patch
+++ b/patches/api/0452-Add-getChunkSnapshot-includeLightData-parameter.patch
diff --git a/patches/api/0454-Add-FluidState-API.patch b/patches/api/0453-Add-FluidState-API.patch
index 3235c393f5..3235c393f5 100644
--- a/patches/api/0454-Add-FluidState-API.patch
+++ b/patches/api/0453-Add-FluidState-API.patch
diff --git a/patches/api/0455-add-number-format-api.patch b/patches/api/0454-add-number-format-api.patch
index 6d32302ad0..6d32302ad0 100644
--- a/patches/api/0455-add-number-format-api.patch
+++ b/patches/api/0454-add-number-format-api.patch
diff --git a/patches/api/0456-improve-BanList-types.patch b/patches/api/0455-improve-BanList-types.patch
index fb48003a0d..f392d209de 100644
--- a/patches/api/0456-improve-BanList-types.patch
+++ b/patches/api/0455-improve-BanList-types.patch
@@ -68,7 +68,7 @@ index a77c0411a68a9bad33ddfb335b7a996a843e478c..739d9d3ec789e58c10c8d818a9ca59ce
          /**
           * Banned player names
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 031e9a41b44bf405686d3b210a8354cb9520be2e..3f0ead8b57a73c788b1cb0fc0799b8fa914e2519 100644
+index 50d6784c488041ce416845373efebce14321b1ec..b9b751ea0d11381e846d5f35f39f285c075c171a 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1649,11 +1649,27 @@ public final class Bukkit {
@@ -100,7 +100,7 @@ index 031e9a41b44bf405686d3b210a8354cb9520be2e..3f0ead8b57a73c788b1cb0fc0799b8fa
      /**
       * Gets a set containing all player operators.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 876267814d25da46f3596448b9036b5901d2c4e0..b6b4bc19e8348096469fd47d93cc5ae6cae9e516 100644
+index 23af0b4fa239de8926a36346f38224a00f85284e..bbc4d7d3ca84642828f9a3f788ca26bba900d15b 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1411,10 +1411,25 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
diff --git a/patches/api/0457-Suspicious-Effect-Entry-API.patch b/patches/api/0456-Suspicious-Effect-Entry-API.patch
index bcf3db2033..bcf3db2033 100644
--- a/patches/api/0457-Suspicious-Effect-Entry-API.patch
+++ b/patches/api/0456-Suspicious-Effect-Entry-API.patch
diff --git a/patches/api/0458-Fix-DamageSource-API.patch b/patches/api/0457-Fix-DamageSource-API.patch
index efe4403e2c..efe4403e2c 100644
--- a/patches/api/0458-Fix-DamageSource-API.patch
+++ b/patches/api/0457-Fix-DamageSource-API.patch
diff --git a/patches/api/0459-Expanded-Hopper-API.patch b/patches/api/0458-Expanded-Hopper-API.patch
index 51cb6dfee2..51cb6dfee2 100644
--- a/patches/api/0459-Expanded-Hopper-API.patch
+++ b/patches/api/0458-Expanded-Hopper-API.patch
diff --git a/patches/api/0460-Clone-mutables-to-prevent-unexpected-issues.patch b/patches/api/0459-Clone-mutables-to-prevent-unexpected-issues.patch
index e84ea7d3aa..e84ea7d3aa 100644
--- a/patches/api/0460-Clone-mutables-to-prevent-unexpected-issues.patch
+++ b/patches/api/0459-Clone-mutables-to-prevent-unexpected-issues.patch
diff --git a/patches/api/0461-Add-BlockBreakProgressUpdateEvent.patch b/patches/api/0460-Add-BlockBreakProgressUpdateEvent.patch
index a2b5a83baf..a2b5a83baf 100644
--- a/patches/api/0461-Add-BlockBreakProgressUpdateEvent.patch
+++ b/patches/api/0460-Add-BlockBreakProgressUpdateEvent.patch
diff --git a/patches/api/0462-Deprecate-ItemStack-setType.patch b/patches/api/0461-Deprecate-ItemStack-setType.patch
index e9bee06119..910f35e09e 100644
--- a/patches/api/0462-Deprecate-ItemStack-setType.patch
+++ b/patches/api/0461-Deprecate-ItemStack-setType.patch
@@ -5,10 +5,10 @@ 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 782dc4f31a391896c3d568fb9903e6e5e032c0a3..40802479d2238b832e99ca52b64bccd44c7436aa 100644
+index 235d41b0078bb513470b17a0dad46fae3ac73a16..2866f10f954f6d3fb1d58c216a2d5ae1372adbad 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -144,8 +144,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -143,8 +143,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
       * {@link Material#isItem()} returns false.</b>
       *
       * @param type New type to set the items in this stack to
@@ -27,7 +27,7 @@ index 782dc4f31a391896c3d568fb9903e6e5e032c0a3..40802479d2238b832e99ca52b64bccd4
      public void setType(@NotNull Material type) {
          Preconditions.checkArgument(type != null, "Material cannot be null");
          this.type = type;
-@@ -158,6 +168,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -157,6 +167,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
              this.data = null;
          }
      }
diff --git a/patches/api/0463-Item-Mutation-Fixes.patch b/patches/api/0462-Item-Mutation-Fixes.patch
index ccd77b7fbc..ccd77b7fbc 100644
--- a/patches/api/0463-Item-Mutation-Fixes.patch
+++ b/patches/api/0462-Item-Mutation-Fixes.patch
diff --git a/patches/api/0464-API-for-checking-sent-chunks.patch b/patches/api/0463-API-for-checking-sent-chunks.patch
index a3844b5401..a3844b5401 100644
--- a/patches/api/0464-API-for-checking-sent-chunks.patch
+++ b/patches/api/0463-API-for-checking-sent-chunks.patch
diff --git a/patches/api/0465-Add-CartographyItemEvent.patch b/patches/api/0464-Add-CartographyItemEvent.patch
index 1f19663c9f..1f19663c9f 100644
--- a/patches/api/0465-Add-CartographyItemEvent.patch
+++ b/patches/api/0464-Add-CartographyItemEvent.patch
diff --git a/patches/api/0466-More-Raid-API.patch b/patches/api/0465-More-Raid-API.patch
index 9ea371ec7a..9ea371ec7a 100644
--- a/patches/api/0466-More-Raid-API.patch
+++ b/patches/api/0465-More-Raid-API.patch
diff --git a/patches/api/0467-Fix-SpawnerEntry-Equipment-API.patch b/patches/api/0466-Fix-SpawnerEntry-Equipment-API.patch
index 0a16b34cd5..0a16b34cd5 100644
--- a/patches/api/0467-Fix-SpawnerEntry-Equipment-API.patch
+++ b/patches/api/0466-Fix-SpawnerEntry-Equipment-API.patch
diff --git a/patches/api/0468-Fix-ItemFlags.patch b/patches/api/0467-Fix-ItemFlags.patch
index 6b7fdf98b9..1b1eb619b9 100644
--- a/patches/api/0468-Fix-ItemFlags.patch
+++ b/patches/api/0467-Fix-ItemFlags.patch
@@ -47,10 +47,10 @@ index 5b8dac777bb1640dc00bbe98feb6460c36eebb98..1af15fd327e0613cd1a179bd7fef1e83
      /**
       * Setting to show/hide item-specific information, including, but not limited to:
 diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
-index 40802479d2238b832e99ca52b64bccd44c7436aa..35338358aec881c30ba4e004ed5f36708366fc12 100644
+index 2866f10f954f6d3fb1d58c216a2d5ae1372adbad..7f5633e7689b82b937d5b985c3e6ae15dc94a20f 100644
 --- a/src/main/java/org/bukkit/inventory/ItemStack.java
 +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
-@@ -589,6 +589,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
+@@ -588,6 +588,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
              Object raw = args.get("meta");
              if (raw instanceof ItemMeta) {
                  ((ItemMeta) raw).setVersion(version);
diff --git a/patches/api/0469-Allow-modifying-library-loader-jars-bytecode.patch b/patches/api/0468-Allow-modifying-library-loader-jars-bytecode.patch
index 0c0311e790..0c0311e790 100644
--- a/patches/api/0469-Allow-modifying-library-loader-jars-bytecode.patch
+++ b/patches/api/0468-Allow-modifying-library-loader-jars-bytecode.patch
diff --git a/patches/api/0470-Add-hook-to-remap-library-jars.patch b/patches/api/0469-Add-hook-to-remap-library-jars.patch
index fe1609629e..fe1609629e 100644
--- a/patches/api/0470-Add-hook-to-remap-library-jars.patch
+++ b/patches/api/0469-Add-hook-to-remap-library-jars.patch
diff --git a/patches/api/0471-Add-GameMode-isInvulnerable.patch b/patches/api/0470-Add-GameMode-isInvulnerable.patch
index b4b81c5f52..b4b81c5f52 100644
--- a/patches/api/0471-Add-GameMode-isInvulnerable.patch
+++ b/patches/api/0470-Add-GameMode-isInvulnerable.patch
diff --git a/patches/api/0472-Expose-hasColor-to-leather-armor.patch b/patches/api/0471-Expose-hasColor-to-leather-armor.patch
index e2c609b4f0..e2c609b4f0 100644
--- a/patches/api/0472-Expose-hasColor-to-leather-armor.patch
+++ b/patches/api/0471-Expose-hasColor-to-leather-armor.patch
diff --git a/patches/api/0473-Add-missing-wind-charge-damage-type.patch b/patches/api/0472-Add-missing-wind-charge-damage-type.patch
index 8b5bd35be7..8b5bd35be7 100644
--- a/patches/api/0473-Add-missing-wind-charge-damage-type.patch
+++ b/patches/api/0472-Add-missing-wind-charge-damage-type.patch
diff --git a/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch b/patches/api/0473-Added-API-to-get-player-ha-proxy-address.patch
index b1702bee61..b1702bee61 100644
--- a/patches/api/0474-Added-API-to-get-player-ha-proxy-address.patch
+++ b/patches/api/0473-Added-API-to-get-player-ha-proxy-address.patch
diff --git a/patches/api/0475-More-Chest-Block-API.patch b/patches/api/0474-More-Chest-Block-API.patch
index 1fc3614c74..1fc3614c74 100644
--- a/patches/api/0475-More-Chest-Block-API.patch
+++ b/patches/api/0474-More-Chest-Block-API.patch
diff --git a/patches/api/0476-Brigadier-based-command-API.patch b/patches/api/0475-Brigadier-based-command-API.patch
index 20c58c3c82..20c58c3c82 100644
--- a/patches/api/0476-Brigadier-based-command-API.patch
+++ b/patches/api/0475-Brigadier-based-command-API.patch
diff --git a/patches/api/0477-Fix-issues-with-recipe-API.patch b/patches/api/0476-Fix-issues-with-recipe-API.patch
index 19c045290e..19c045290e 100644
--- a/patches/api/0477-Fix-issues-with-recipe-API.patch
+++ b/patches/api/0476-Fix-issues-with-recipe-API.patch
diff --git a/patches/api/0478-Fix-equipment-slot-and-group-API.patch b/patches/api/0477-Fix-equipment-slot-and-group-API.patch
index fe72e478bc..d79d0c3cd2 100644
--- a/patches/api/0478-Fix-equipment-slot-and-group-API.patch
+++ b/patches/api/0477-Fix-equipment-slot-and-group-API.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix equipment slot and group API
 was missing the 'body' slot group
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index d66502c9df2592cd18694481e7e90a71a5c3a359..ed54c85c2370a47f4531eb1302ff82ddfc0f5672 100644
+index 90f18f355a6a236a7e4273cc1258e7c8034b8276..a0750d457a9cd7cf3ab9c45bb28ce5a2aef35298 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 {
diff --git a/patches/api/0479-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch b/patches/api/0478-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
index 8a0f6e9468..8a0f6e9468 100644
--- a/patches/api/0479-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
+++ b/patches/api/0478-Allow-Bukkit-plugin-to-use-Paper-PluginLoader-API.patch
diff --git a/patches/api/0480-Allow-to-define-new-map-cursor-types.patch b/patches/api/0479-Allow-to-define-new-map-cursor-types.patch
index d80375bc03..d80375bc03 100644
--- a/patches/api/0480-Allow-to-define-new-map-cursor-types.patch
+++ b/patches/api/0479-Allow-to-define-new-map-cursor-types.patch
diff --git a/patches/api/0481-General-ItemMeta-fixes.patch b/patches/api/0480-General-ItemMeta-fixes.patch
index 22f1db839c..22f1db839c 100644
--- a/patches/api/0481-General-ItemMeta-fixes.patch
+++ b/patches/api/0480-General-ItemMeta-fixes.patch
diff --git a/patches/api/0482-Add-missing-fishing-event-state.patch b/patches/api/0481-Add-missing-fishing-event-state.patch
index 94cba543ec..94cba543ec 100644
--- a/patches/api/0482-Add-missing-fishing-event-state.patch
+++ b/patches/api/0481-Add-missing-fishing-event-state.patch
diff --git a/patches/api/0483-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch b/patches/api/0482-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
index 3efcc02654..3efcc02654 100644
--- a/patches/api/0483-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch
+++ b/patches/api/0482-Deprecate-InvAction-HOTBAR_MOVE_AND_READD.patch