Bundles are no longer experimental (thanks lynx)

patches/api/0004-Code-Generation.patch

@@ -366,13 +366,13 @@ index 0000000000000000000000000000000000000000..99375deaa6b90b33cd6a77e0df651236
 +record TypedKeyImpl<T>(Key key, RegistryKey<T> registryKey) implements TypedKey<T> {
 +}
 diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java
-index b7845523e8587e13b86516c0012fe097d904846c..08d1deb42b17987b24699aa42d1166e08fbe846e 100644
+index b7845523e8587e13b86516c0012fe097d904846c..765a691f5b4f91425bb3057ceb4bbff06c6df1e8 100644
 --- a/src/main/java/org/bukkit/MinecraftExperimental.java
 +++ b/src/main/java/org/bukkit/MinecraftExperimental.java
 @@ -48,5 +48,6 @@ public @interface MinecraftExperimental {
      public enum Requires {
  
          WINTER_DROP,
-+        BUNDLE, TRADE_REBALANCE // Paper
++        TRADE_REBALANCE // Paper
      }
  }

patches/api/0428-Experimental-annotations-change.patch

@@ -30,41 +30,6 @@ index 710f8e6242eab7b638e4f42e4e9790007f4c67b7..82f9ba32256bfc1125ee970a7fed0895
      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 615eb24ffdd8f6d55ccd4f21760b809c1098bc68..f4ccb19107464e92744fbf66d55bf81fd50dfcc3 100644
---- a/src/main/java/org/bukkit/Material.java
-+++ b/src/main/java/org/bukkit/Material.java
-@@ -2631,6 +2631,8 @@ 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 cf17af024b1953b6f21f18885411ea6a0baa1d4c..2f951b0aa7e383a89e3e4244ffcae4e1b3a108e7 100644
---- a/src/main/java/org/bukkit/Sound.java
-+++ b/src/main/java/org/bukkit/Sound.java
-@@ -1530,9 +1530,17 @@ 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 8d2dd78fc588a6817dfede8040b9909a7d5bde67..f737a2aae3f57a1bfe4cf68ea66f603da4eebd47 100644
 --- a/src/main/java/org/bukkit/block/Crafter.java
@@ -192,18 +157,6 @@ index bb1fb5e0518c6a62ef8b206733ee51d831f1f85b..49d0a37bbeb0b8fa9207164c74245ef0
   */
 -@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 e404cd1e2ba44e4c2d09524bc7cf730d8ffbdabd..cea0ebf50876dd32ab7fba6025b30f297d0a69c4 100644
---- a/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
-+++ b/src/main/java/org/bukkit/inventory/meta/BundleMeta.java
-@@ -6,6 +6,7 @@ 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 0899981b9ab1f98dacc617156d12779421e4c275..6c33fbf720a2e11655e254aeb516e08831c2adf4 100644
 --- a/src/main/java/org/bukkit/map/MapCursor.java

patches/api/0430-Improve-Registry.patch

@@ -146,10 +146,10 @@ index 6112db5d1153d045f2271038bada6b46d1a6a051..67cf3fcad21a8977d6fad172cc776b62
      }
  }
 diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
-index 2f951b0aa7e383a89e3e4244ffcae4e1b3a108e7..c866613ee1fb47daf89179dd30d74489c90be96d 100644
+index cf17af024b1953b6f21f18885411ea6a0baa1d4c..f32a035317f3f8e200bb8076e6a326cb1e87cfe1 100644
 --- a/src/main/java/org/bukkit/Sound.java
 +++ b/src/main/java/org/bukkit/Sound.java
-@@ -1663,6 +1663,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
+@@ -1655,6 +1655,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
          this.key = NamespacedKey.minecraft(key);
      }