Fix more compile issues

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;
 +        }

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);
      }

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
       */

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);
      }
  

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);
      }

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);
      }

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());
      }

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
      }
  

patches/api/0319-Allow-delegation-to-vanilla-chunk-gen.patch

@@ -1,89 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: MiniDigger <admin@benndorf.dev>
-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.

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

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();

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

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

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);
      }

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

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