Paper/patches/api/0443-add-missing-Experimental-annotations.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Sat, 9 Dec 2023 11:47:53 -0800
Subject: [PATCH] add missing Experimental annotations


diff --git a/src/main/java/org/bukkit/FeatureFlag.java b/src/main/java/org/bukkit/FeatureFlag.java
index 5269df59f0e8099a72c6b628ac1b8c84a0d1a5d5..775fda4b299e1d6dba9b293b2f98505ee65186bb 100644
--- a/src/main/java/org/bukkit/FeatureFlag.java
+++ b/src/main/java/org/bukkit/FeatureFlag.java
@@ -14,6 +14,7 @@ public interface FeatureFlag extends Keyed {
     public static final FeatureFlag VANILLA = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("vanilla"));
 
     @MinecraftExperimental
+    @ApiStatus.Experimental // Paper - add missing annotation
     public static final FeatureFlag BUNDLE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("bundle"));
 
     /**
@@ -26,8 +27,10 @@ public interface FeatureFlag extends Keyed {
     public static final FeatureFlag UPDATE_1_20 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_20"));
 
     @MinecraftExperimental
+    @ApiStatus.Experimental // Paper - add missing annotation
     public static final FeatureFlag TRADE_REBALANCE = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("trade_rebalance"));
 
     @MinecraftExperimental
+    @ApiStatus.Experimental // Paper - add missing annotation
     public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
 }
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index fab8dfb1bd80490f6891687914997cc8580542cd..8e3ab18ca453f407c201e0838ce112dd5e73b830 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -145,54 +145,67 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      * BlockData: {@link Slab}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_SLAB(19305, Slab.class),
     /**
      * BlockData: {@link Stairs}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_STAIRS(11268, Stairs.class),
     /**
      * BlockData: {@link Wall}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_WALL(24395, Wall.class),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     CHISELED_TUFF(15831),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     POLISHED_TUFF(17801),
     /**
      * BlockData: {@link Slab}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     POLISHED_TUFF_SLAB(31096, Slab.class),
     /**
      * BlockData: {@link Stairs}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     POLISHED_TUFF_STAIRS(7964, Stairs.class),
     /**
      * BlockData: {@link Wall}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     POLISHED_TUFF_WALL(28886, Wall.class),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_BRICKS(26276),
     /**
      * BlockData: {@link Slab}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_BRICK_SLAB(11843, Slab.class),
     /**
      * BlockData: {@link Stairs}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_BRICK_STAIRS(30753, Stairs.class),
     /**
      * BlockData: {@link Wall}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TUFF_BRICK_WALL(11761, Wall.class),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     CHISELED_TUFF_BRICKS(8601),
     DRIPSTONE_BLOCK(26227),
     /**
@@ -299,6 +312,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     HEAVY_CORE(15788, Waterlogged.class),
     AMETHYST_BLOCK(18919),
     BUDDING_AMETHYST(13963),
@@ -311,12 +325,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     WEATHERED_COPPER(19699),
     OXIDIZED_COPPER(19490),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     CHISELED_COPPER(12143),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EXPOSED_CHISELED_COPPER(4570),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WEATHERED_CHISELED_COPPER(30876),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OXIDIZED_CHISELED_COPPER(27719),
     CUT_COPPER(32519),
     EXPOSED_CUT_COPPER(18000),
@@ -359,12 +377,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     WAXED_WEATHERED_COPPER(5960),
     WAXED_OXIDIZED_COPPER(25626),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_CHISELED_COPPER(7500),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_EXPOSED_CHISELED_COPPER(30658),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_WEATHERED_CHISELED_COPPER(5970),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_OXIDIZED_CHISELED_COPPER(7735),
     WAXED_CUT_COPPER(11030),
     WAXED_EXPOSED_CUT_COPPER(30043),
@@ -2106,41 +2128,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     COPPER_DOOR(26809, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EXPOSED_COPPER_DOOR(13236, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WEATHERED_COPPER_DOOR(10208, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OXIDIZED_COPPER_DOOR(5348, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_COPPER_DOOR(9954, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_EXPOSED_COPPER_DOOR(20748, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_WEATHERED_COPPER_DOOR(25073, Door.class),
     /**
      * BlockData: {@link Door}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class),
     /**
      * BlockData: {@link TrapDoor}
@@ -2194,41 +2224,49 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     COPPER_TRAPDOOR(12110, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EXPOSED_COPPER_TRAPDOOR(19219, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WEATHERED_COPPER_TRAPDOOR(28254, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OXIDIZED_COPPER_TRAPDOOR(26518, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_COPPER_TRAPDOOR(12626, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_EXPOSED_COPPER_TRAPDOOR(11010, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_WEATHERED_COPPER_TRAPDOOR(30709, TrapDoor.class),
     /**
      * BlockData: {@link TrapDoor}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class),
     /**
      * BlockData: {@link Gate}
@@ -2530,6 +2568,8 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     EGG(21603, 16),
     COMPASS(24139),
     RECOVERY_COMPASS(12710),
+    @MinecraftExperimental // Paper - add missing annotation
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BUNDLE(16835, 1),
     FISHING_ROD(4167, 1, 64),
     CLOCK(14980),
@@ -2636,6 +2676,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      * BlockData: {@link Crafter}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     CRAFTER(25243, Crafter.class),
     FILLED_MAP(23504),
     SHEARS(27971, 1, 238),
@@ -2676,8 +2717,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     BEE_SPAWN_EGG(22924),
     BLAZE_SPAWN_EGG(4759),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BOGGED_SPAWN_EGG(12042),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BREEZE_SPAWN_EGG(7580),
     CAT_SPAWN_EGG(29583),
     CAMEL_SPAWN_EGG(14760),
@@ -2754,10 +2797,12 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     EXPERIENCE_BOTTLE(12858),
     FIRE_CHARGE(4842),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WIND_CHARGE(23928),
     WRITABLE_BOOK(13393, 1),
     WRITTEN_BOOK(24164, 16),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     MACE(4771, 1, 250),
     ITEM_FRAME(27318),
     GLOW_ITEM_FRAME(26473),
@@ -3156,8 +3201,10 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     RAISER_ARMOR_TRIM_SMITHING_TEMPLATE(29116),
     HOST_ARMOR_TRIM_SMITHING_TEMPLATE(12165),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     FLOW_ARMOR_TRIM_SMITHING_TEMPLATE(29175),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BOLT_ARMOR_TRIM_SMITHING_TEMPLATE(9698),
     ANGLER_POTTERY_SHERD(9952),
     ARCHER_POTTERY_SHERD(21629),
@@ -3168,9 +3215,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     DANGER_POTTERY_SHERD(30506),
     EXPLORER_POTTERY_SHERD(5124),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     FLOW_POTTERY_SHERD(4896),
     FRIEND_POTTERY_SHERD(18221),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     GUSTER_POTTERY_SHERD(28193),
     HEART_POTTERY_SHERD(17607),
     HEARTBREAK_POTTERY_SHERD(21108),
@@ -3180,6 +3229,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     PLENTY_POTTERY_SHERD(28236),
     PRIZE_POTTERY_SHERD(4341),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     SCRAPE_POTTERY_SHERD(30034),
     SHEAF_POTTERY_SHERD(23652),
     SHELTER_POTTERY_SHERD(28390),
@@ -3189,99 +3239,121 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     COPPER_GRATE(16221, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EXPOSED_COPPER_GRATE(7783, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WEATHERED_COPPER_GRATE(24954, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OXIDIZED_COPPER_GRATE(14122, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_COPPER_GRATE(11230, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_EXPOSED_COPPER_GRATE(20520, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_WEATHERED_COPPER_GRATE(16533, Waterlogged.class),
     /**
      * BlockData: {@link Waterlogged}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_OXIDIZED_COPPER_GRATE(32010, Waterlogged.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     COPPER_BULB(21370, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EXPOSED_COPPER_BULB(11944, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WEATHERED_COPPER_BULB(10800, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OXIDIZED_COPPER_BULB(22421, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_COPPER_BULB(23756, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_EXPOSED_COPPER_BULB(5530, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_WEATHERED_COPPER_BULB(13239, CopperBulb.class),
     /**
      * BlockData: {@link CopperBulb}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WAXED_OXIDIZED_COPPER_BULB(26892, CopperBulb.class),
     /**
      * BlockData: {@link TrialSpawner}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_SPAWNER(19902, TrialSpawner.class),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_KEY(12725),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OMINOUS_TRIAL_KEY(4986),
     /**
      * BlockData: {@link Vault}
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     VAULT(6288, Vault.class),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OMINOUS_BOTTLE(26321),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BREEZE_ROD(14281),
     /**
      * BlockData: {@link Levelled}
diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java
index 690cf2aedf558396a71b20ba2b8ce737c61dfe43..bf855d67eb022a35d1926553a43be8494d93fb4d 100644
--- a/src/main/java/org/bukkit/Particle.java
+++ b/src/main/java/org/bukkit/Particle.java
@@ -129,33 +129,46 @@ public enum Particle implements Keyed {
     DUST_PLUME("dust_plume"),
     WHITE_SMOKE("white_smoke"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     GUST("gust"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     SMALL_GUST("small_gust"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     GUST_EMITTER_LARGE("gust_emitter_large"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     GUST_EMITTER_SMALL("gust_emitter_small"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_SPAWNER_DETECTION("trial_spawner_detection"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     VAULT_CONNECTION("vault_connection"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     INFESTED("infested"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_COBWEB("item_cobweb"),
     /**
      * Uses {@link BlockData} as DataType
      */
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     DUST_PILLAR("dust_pillar", BlockData.class),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OMINOUS_SPAWNING("ominous_spawning"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     RAID_OMEN("raid_omen"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_OMEN("trial_omen"),
     /**
      * Uses {@link BlockData} as DataType
diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java
index ddc4c5097214371108dc945371e1d28811352c38..653e5eb126c599aac7de03f22b84d6cfafe48102 100644
--- a/src/main/java/org/bukkit/Sound.java
+++ b/src/main/java/org/bukkit/Sound.java
@@ -220,40 +220,56 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     BLOCK_CONDUIT_DEACTIVATE("block.conduit.deactivate"),
     BLOCK_COPPER_BREAK("block.copper.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_BREAK("block.copper_bulb.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_FALL("block.copper_bulb.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_HIT("block.copper_bulb.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_PLACE("block.copper_bulb.place"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_STEP("block.copper_bulb.step"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_TURN_OFF("block.copper_bulb.turn_off"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_BULB_TURN_ON("block.copper_bulb.turn_on"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_DOOR_CLOSE("block.copper_door.close"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_DOOR_OPEN("block.copper_door.open"),
     BLOCK_COPPER_FALL("block.copper.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_GRATE_BREAK("block.copper_grate.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_GRATE_FALL("block.copper_grate.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_GRATE_HIT("block.copper_grate.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_GRATE_PLACE("block.copper_grate.place"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_GRATE_STEP("block.copper_grate.step"),
     BLOCK_COPPER_HIT("block.copper.hit"),
     BLOCK_COPPER_PLACE("block.copper.place"),
     BLOCK_COPPER_STEP("block.copper.step"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_TRAPDOOR_CLOSE("block.copper_trapdoor.close"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_COPPER_TRAPDOOR_OPEN("block.copper_trapdoor.open"),
     BLOCK_CORAL_BLOCK_BREAK("block.coral_block.break"),
     BLOCK_CORAL_BLOCK_FALL("block.coral_block.fall"),
@@ -360,14 +376,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     BLOCK_HANGING_SIGN_STEP("block.hanging_sign.step"),
     BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL("block.hanging_sign.waxed_interact_fail"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_HEAVY_CORE_BREAK("block.heavy_core.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_HEAVY_CORE_FALL("block.heavy_core.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_HEAVY_CORE_HIT("block.heavy_core.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_HEAVY_CORE_PLACE("block.heavy_core.place"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_HEAVY_CORE_STEP("block.heavy_core.step"),
     BLOCK_HONEY_BLOCK_BREAK("block.honey_block.break"),
     BLOCK_HONEY_BLOCK_FALL("block.honey_block.fall"),
@@ -546,14 +567,19 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     BLOCK_POLISHED_DEEPSLATE_PLACE("block.polished_deepslate.place"),
     BLOCK_POLISHED_DEEPSLATE_STEP("block.polished_deepslate.step"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_POLISHED_TUFF_BREAK("block.polished_tuff.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_POLISHED_TUFF_FALL("block.polished_tuff.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_POLISHED_TUFF_HIT("block.polished_tuff.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_POLISHED_TUFF_PLACE("block.polished_tuff.place"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_POLISHED_TUFF_STEP("block.polished_tuff.step"),
     BLOCK_PORTAL_AMBIENT("block.portal.ambient"),
     BLOCK_PORTAL_TRAVEL("block.portal.travel"),
@@ -701,34 +727,46 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     @MinecraftExperimental
     BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"),
     @MinecraftExperimental
     BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_DETECT_PLAYER("block.trial_spawner.detect_player"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_EJECT_ITEM("block.trial_spawner.eject_item"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_FALL("block.trial_spawner.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_HIT("block.trial_spawner.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER("block.trial_spawner.open_shutter"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"),
     @MinecraftExperimental
     BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"),
     @MinecraftExperimental
     BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TRIAL_SPAWNER_STEP("block.trial_spawner.step"),
     BLOCK_TRIPWIRE_ATTACH("block.tripwire.attach"),
     BLOCK_TRIPWIRE_CLICK_OFF("block.tripwire.click_off"),
@@ -736,44 +774,62 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     BLOCK_TRIPWIRE_DETACH("block.tripwire.detach"),
     BLOCK_TUFF_BREAK("block.tuff.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TUFF_BRICKS_BREAK("block.tuff_bricks.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TUFF_BRICKS_FALL("block.tuff_bricks.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TUFF_BRICKS_HIT("block.tuff_bricks.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TUFF_BRICKS_PLACE("block.tuff_bricks.place"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_TUFF_BRICKS_STEP("block.tuff_bricks.step"),
     BLOCK_TUFF_FALL("block.tuff.fall"),
     BLOCK_TUFF_HIT("block.tuff.hit"),
     BLOCK_TUFF_PLACE("block.tuff.place"),
     BLOCK_TUFF_STEP("block.tuff.step"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_ACTIVATE("block.vault.activate"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_AMBIENT("block.vault.ambient"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_BREAK("block.vault.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_CLOSE_SHUTTER("block.vault.close_shutter"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_DEACTIVATE("block.vault.deactivate"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_EJECT_ITEM("block.vault.eject_item"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_FALL("block.vault.fall"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_HIT("block.vault.hit"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_INSERT_ITEM("block.vault.insert_item"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_INSERT_ITEM_FAIL("block.vault.insert_item_fail"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_OPEN_SHUTTER("block.vault.open_shutter"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_PLACE("block.vault.place"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     BLOCK_VAULT_STEP("block.vault.step"),
     BLOCK_VINE_BREAK("block.vine.break"),
     BLOCK_VINE_FALL("block.vine.fall"),
@@ -874,40 +930,58 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"),
     ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BOGGED_DEATH("entity.bogged.death"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BOGGED_HURT("entity.bogged.hurt"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BOGGED_SHEAR("entity.bogged.shear"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BOGGED_STEP("entity.bogged.step"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_CHARGE("entity.breeze.charge"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_DEATH("entity.breeze.death"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_HURT("entity.breeze.hurt"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_IDLE_AIR("entity.breeze.idle_air"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_IDLE_GROUND("entity.breeze.idle_ground"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_INHALE("entity.breeze.inhale"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_JUMP("entity.breeze.jump"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_LAND("entity.breeze.land"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_SHOOT("entity.breeze.shoot"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_SLIDE("entity.breeze.slide"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_WHIRL("entity.breeze.whirl"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_BREEZE_WIND_BURST("entity.breeze.wind_burst"),
     ENTITY_CAMEL_AMBIENT("entity.camel.ambient"),
     ENTITY_CAMEL_DASH("entity.camel.dash"),
@@ -1207,8 +1281,10 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     ENTITY_PARROT_HURT("entity.parrot.hurt"),
     ENTITY_PARROT_IMITATE_BLAZE("entity.parrot.imitate.blaze"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_PARROT_IMITATE_BREEZE("entity.parrot.imitate.breeze"),
     ENTITY_PARROT_IMITATE_CREEPER("entity.parrot.imitate.creeper"),
     ENTITY_PARROT_IMITATE_DROWNED("entity.parrot.imitate.drowned"),
@@ -1488,8 +1564,10 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     ENTITY_WARDEN_STEP("entity.warden.step"),
     ENTITY_WARDEN_TENDRIL_CLICKS("entity.warden.tendril_clicks"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_WIND_CHARGE_THROW("entity.wind_charge.throw"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ENTITY_WIND_CHARGE_WIND_BURST("entity.wind_charge.wind_burst"),
     ENTITY_WITCH_AMBIENT("entity.witch.ambient"),
     ENTITY_WITCH_CELEBRATE("entity.witch.celebrate"),
@@ -1546,10 +1624,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     ENTITY_ZOMBIFIED_PIGLIN_DEATH("entity.zombified_piglin.death"),
     ENTITY_ZOMBIFIED_PIGLIN_HURT("entity.zombified_piglin.hurt"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EVENT_MOB_EFFECT_BAD_OMEN("event.mob_effect.bad_omen"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EVENT_MOB_EFFECT_RAID_OMEN("event.mob_effect.raid_omen"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     EVENT_MOB_EFFECT_TRIAL_OMEN("event.mob_effect.trial_omen"),
     EVENT_RAID_HORN("event.raid.horn"),
     INTENTIONALLY_EMPTY("intentionally_empty"),
@@ -1591,10 +1672,13 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     ITEM_BUCKET_FILL_POWDER_SNOW("item.bucket.fill_powder_snow"),
     ITEM_BUCKET_FILL_TADPOLE("item.bucket.fill_tadpole"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_BUNDLE_INSERT("item.bundle.insert"),
     @MinecraftExperimental
+    @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"),
@@ -1649,12 +1733,16 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa
     ITEM_TRIDENT_THROW("item.trident.throw"),
     ITEM_TRIDENT_THUNDER("item.trident.thunder"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_WOLF_ARMOR_BREAK("item.wolf_armor.break"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_WOLF_ARMOR_CRACK("item.wolf_armor.crack"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_WOLF_ARMOR_DAMAGE("item.wolf_armor.damage"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     ITEM_WOLF_ARMOR_REPAIR("item.wolf_armor.repair"),
     MUSIC_CREATIVE("music.creative"),
     MUSIC_CREDITS("music.credits"),
diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java
index cb5890e0e7bccfee2ba32dd4776f1ae1fdd539e8..7f1dc4288c2d324281e11dc582b6f4ef54bde632 100644
--- a/src/main/java/org/bukkit/Tag.java
+++ b/src/main/java/org/bukkit/Tag.java
@@ -1234,6 +1234,7 @@ public interface Tag<T extends Keyed> extends Keyed {
     /**
      * Vanilla tag representing entities which deflect projectiles.
      */
+    @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
     Tag<EntityType> ENTITY_TYPES_DEFLECTS_PROJECTILES = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("deflects_projectiles"), EntityType.class);
     /**
      * Vanilla tag representing entities which deflect arrows.
@@ -1244,6 +1245,7 @@ public interface Tag<T extends Keyed> extends Keyed {
     /**
      * Vanilla tag representing entities which can turn in boats.
      */
+    @org.jetbrains.annotations.ApiStatus.Experimental @MinecraftExperimental // Paper - add missing annotation
     Tag<EntityType> ENTITY_TYPES_CAN_TURN_IN_BOATS = Bukkit.getTag(REGISTRY_ENTITY_TYPES, NamespacedKey.minecraft("can_turn_in_boats"), EntityType.class);
     /**
      * Vanilla tag representing all entities sensitive to illager enchantments.
diff --git a/src/main/java/org/bukkit/generator/structure/Structure.java b/src/main/java/org/bukkit/generator/structure/Structure.java
index 65d3d8fd5f00114dc388d65321a9affe1b32ce20..8e39f282c771ddafe5d890dcf065c56f0c633647 100644
--- a/src/main/java/org/bukkit/generator/structure/Structure.java
+++ b/src/main/java/org/bukkit/generator/structure/Structure.java
@@ -49,6 +49,7 @@ public abstract class Structure implements Keyed {
     public static final Structure ANCIENT_CITY = getStructure("ancient_city");
     public static final Structure TRAIL_RUINS = getStructure("trail_ruins");
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     public static final Structure TRIAL_CHAMBERS = getStructure("trial_chambers");
 
     private static Structure getStructure(String name) {
diff --git a/src/main/java/org/bukkit/loot/LootTables.java b/src/main/java/org/bukkit/loot/LootTables.java
index 0a3bce3b9d27e6a978e0c40d9f16afb8b2e14e9b..49e3ff6725c656ace6040312a866063494878a5b 100644
--- a/src/main/java/org/bukkit/loot/LootTables.java
+++ b/src/main/java/org/bukkit/loot/LootTables.java
@@ -35,38 +35,55 @@ public enum LootTables implements Keyed {
     ANCIENT_CITY_ICE_BOX("chests/ancient_city_ice_box"),
     RUINED_PORTAL("chests/ruined_portal"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_CORRIDOR("chests/trial_chambers/corridor"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_INTERSECTION("chests/trial_chambers/intersection"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_INTERSECTION_BARREL("chests/trial_chambers/intersection_barrel"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_ENTRANCE("chests/trial_chambers/entrance"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_CORRIDOR_DISPENSER("dispensers/trial_chambers/corridor"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_CHAMBER_DISPENSER("dispensers/trial_chambers/chamber"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_WATER_DISPENSER("dispensers/trial_chambers/water"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"),
     @MinecraftExperimental
     EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"),
@@ -201,14 +218,19 @@ public enum LootTables implements Keyed {
     PIGLIN_BARTERING("gameplay/piglin_bartering"),
     // Spawners
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBER_KEY("spawners/trial_chamber/key"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OMINOUS_TRIAL_CHAMBER_CONSUMABLES("spawners/ominous/trial_chamber/consumables"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     TRIAL_CHAMBER_ITEMS_TO_DROP_WHEN_OMINOUS("spawners/trial_chamber/items_to_drop_when_ominous"),
     // Shearing
     SHEARING_BOGGED("shearing/bogged"),
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
index 310833ace16b541392b92d12967f75039990b341..4649cc5c1fa690de34ed540e33c20f9bf0b17835 100644
--- a/src/main/java/org/bukkit/potion/PotionType.java
+++ b/src/main/java/org/bukkit/potion/PotionType.java
@@ -59,12 +59,16 @@ public enum PotionType implements Keyed {
     SLOW_FALLING("slow_falling"),
     LONG_SLOW_FALLING("long_slow_falling"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WIND_CHARGED("wind_charged"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     WEAVING("weaving"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     OOZING("oozing"),
     @MinecraftExperimental
+    @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation
     INFESTED("infested"),
     ;