From aecac94dbfb97aa61f32e2215192835e69c9a536 Mon Sep 17 00:00:00 2001
From: Noah van der Aa <ndvdaa@gmail.com>
Date: Tue, 22 Oct 2024 18:43:46 +0200
Subject: [PATCH] Bundles are no longer experimental (thanks lynx)

---
 patches/api/Code-Generation.patch             |  2 +-
 .../api/Experimental-annotations-change.patch | 47 -------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/patches/api/Code-Generation.patch b/patches/api/Code-Generation.patch
index 32417fb8c7..ff4b79b860 100644
--- a/patches/api/Code-Generation.patch
+++ b/patches/api/Code-Generation.patch
@@ -373,6 +373,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public enum Requires {
  
          WINTER_DROP,
-+        BUNDLE, TRADE_REBALANCE // Paper
++        TRADE_REBALANCE // Paper
      }
  }
diff --git a/patches/api/Experimental-annotations-change.patch b/patches/api/Experimental-annotations-change.patch
index b14d11e915..9cd1d9779b 100644
--- a/patches/api/Experimental-annotations-change.patch
+++ b/patches/api/Experimental-annotations-change.patch
@@ -30,41 +30,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public static final FeatureFlag MINECART_IMPROVEMENTS = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("minecart_improvements"));
  
  }
-diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
-     EGG(21603, 16),
-     COMPASS(24139),
-     RECOVERY_COMPASS(12710),
-+    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-+    @ApiStatus.Experimental // Paper - add missing annotation
-     BUNDLE(16835, 1),
-     WHITE_BUNDLE(12072, 1),
-     ORANGE_BUNDLE(18288, 1),
-diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/Sound.java
-+++ b/src/main/java/org/bukkit/Sound.java
-@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
-     ITEM_BUCKET_FILL_LAVA("item.bucket.fill_lava"),
-     ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
-     ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
-+    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"),
-+    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ITEM_BUNDLE_INSERT("item.bundle.insert"),
-+    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ITEM_BUNDLE_INSERT_FAIL("item.bundle.insert_fail"),
-+    @MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
-+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
-     ITEM_BUNDLE_REMOVE_ONE("item.bundle.remove_one"),
-     ITEM_CHORUS_FRUIT_TELEPORT("item.chorus_fruit.teleport"),
-     ITEM_CROP_PLANT("item.crop.plant"),
 diff --git a/src/main/java/org/bukkit/block/Crafter.java b/src/main/java/org/bukkit/block/Crafter.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/Crafter.java
@@ -192,18 +157,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
   */
 -@ApiStatus.Experimental
  public interface CrafterInventory extends Inventory { }
-diff --git a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
-@@ -0,0 +0,0 @@ import org.jetbrains.annotations.ApiStatus;
- import org.jetbrains.annotations.NotNull;
- import org.jetbrains.annotations.Nullable;
- 
-+@org.bukkit.MinecraftExperimental(org.bukkit.MinecraftExperimental.Requires.BUNDLE) // Paper - add missing annotation
- @ApiStatus.Experimental
- public interface BundleMeta extends ItemMeta {
- 
 diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java