From d2bcd5358b8350418ac21ec5387c72006676fc4b Mon Sep 17 00:00:00 2001 From: Jake Potrebic <jake.m.potrebic@gmail.com> Date: Tue, 14 Mar 2023 12:47:27 -0700 Subject: [PATCH] Add more experimental annotations --- .../api/Mark-experimental-api-as-such.patch | 629 ++++++++++++++---- patches/api/fix-Instruments.patch | 14 +- 2 files changed, 512 insertions(+), 131 deletions(-) diff --git a/patches/api/Mark-experimental-api-as-such.patch b/patches/api/Mark-experimental-api-as-such.patch index 6daab5b473..955db23a76 100644 --- a/patches/api/Mark-experimental-api-as-such.patch +++ b/patches/api/Mark-experimental-api-as-such.patch @@ -12,15 +12,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 BIRCH_PLANKS(29322), JUNGLE_PLANKS(26445), ACACIA_PLANKS(31312), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_PLANKS(8354), DARK_OAK_PLANKS(20869), MANGROVE_PLANKS(7078), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_PLANKS(8520), CRIMSON_PLANKS(18812), WARPED_PLANKS(16045), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_MOSAIC(10715), /** * BlockData: {@link Sapling} @@ -28,7 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Sapling} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_SAPLING(25204, Sapling.class), /** * BlockData: {@link Sapling} @@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link SuspiciousSand} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SUSPICIOUS_SAND(18410, SuspiciousSand.class), RED_SAND(16279), GRAVEL(7804), @@ -44,7 +44,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Orientable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_LOG(20847, Orientable.class), /** * BlockData: {@link Orientable} @@ -52,7 +52,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Orientable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_BLOCK(20770, Orientable.class), /** * BlockData: {@link Orientable} @@ -60,7 +60,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Orientable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 STRIPPED_CHERRY_LOG(18061, Orientable.class), /** * BlockData: {@link Orientable} @@ -68,7 +68,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Orientable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 STRIPPED_CHERRY_WOOD(19647, Orientable.class), /** * BlockData: {@link Orientable} @@ -76,7 +76,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Orientable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 STRIPPED_BAMBOO_BLOCK(14799, Orientable.class), /** * BlockData: {@link Orientable} @@ -84,7 +84,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Orientable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_WOOD(9826, Orientable.class), /** * BlockData: {@link Orientable} @@ -92,7 +92,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Leaves} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_LEAVES(20856, Leaves.class), /** * BlockData: {@link Leaves} @@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 CORNFLOWER(15405), LILY_OF_THE_VALLEY(7185), WITHER_ROSE(8619), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 TORCHFLOWER(4501), SPORE_BLOSSOM(20627), BROWN_MUSHROOM(9665), @@ -108,7 +108,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link PinkPetals} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 PINK_PETALS(10420, PinkPetals.class), MOSS_BLOCK(9175), /** @@ -116,7 +116,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Slab} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_SLAB(16673, Slab.class), /** * BlockData: {@link Slab} @@ -124,12 +124,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Slab} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_SLAB(17798, Slab.class), /** * BlockData: {@link Slab} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_MOSAIC_SLAB(22118, Slab.class), /** * BlockData: {@link Slab} @@ -137,12 +137,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link ChiseledBookshelf} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHISELED_BOOKSHELF(8099, ChiseledBookshelf.class), /** * BlockData: {@link DecoratedPot} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 DECORATED_POT(8720, 1, DecoratedPot.class), MOSSY_COBBLESTONE(21900), OBSIDIAN(32723), @@ -150,7 +150,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Fence} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_FENCE(32047, Fence.class), /** * BlockData: {@link Fence} @@ -158,7 +158,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Fence} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_FENCE(17207, Fence.class), /** * BlockData: {@link Fence} @@ -166,7 +166,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Stairs} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_STAIRS(18380, Stairs.class), /** * BlockData: {@link Stairs} @@ -174,12 +174,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Stairs} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_STAIRS(25674, Stairs.class), /** * BlockData: {@link Stairs} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_MOSAIC_STAIRS(20977, Stairs.class), /** * BlockData: {@link Stairs} @@ -187,7 +187,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Switch} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_BUTTON(9058, Switch.class), /** * BlockData: {@link Switch} @@ -195,7 +195,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Switch} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_BUTTON(21810, Switch.class), /** * BlockData: {@link Switch} @@ -203,7 +203,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Powerable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_PRESSURE_PLATE(8651, Powerable.class), /** * BlockData: {@link Powerable} @@ -211,7 +211,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Powerable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_PRESSURE_PLATE(26740, Powerable.class), /** * BlockData: {@link Powerable} @@ -219,7 +219,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Door} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_DOOR(12684, Door.class), /** * BlockData: {@link Door} @@ -227,7 +227,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Door} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_DOOR(19971, Door.class), /** * BlockData: {@link Door} @@ -235,7 +235,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link TrapDoor} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_TRAPDOOR(6293, TrapDoor.class), /** * BlockData: {@link TrapDoor} @@ -243,7 +243,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link TrapDoor} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_TRAPDOOR(9174, TrapDoor.class), /** * BlockData: {@link TrapDoor} @@ -251,7 +251,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Gate} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_FENCE_GATE(28222, Gate.class), /** * BlockData: {@link Gate} @@ -259,7 +259,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Gate} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_FENCE_GATE(14290, Gate.class), /** * BlockData: {@link Gate} @@ -267,17 +267,17 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 JUNGLE_CHEST_BOAT(20133, 1), ACACIA_BOAT(27326, 1), ACACIA_CHEST_BOAT(28455, 1), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_BOAT(13628, 1), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_CHEST_BOAT(7165, 1), DARK_OAK_BOAT(28618, 1), DARK_OAK_CHEST_BOAT(8733, 1), MANGROVE_BOAT(20792, 1), MANGROVE_CHEST_BOAT(18572, 1), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_RAFT(25901, 1), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_CHEST_RAFT(20056, 1), /** * BlockData: {@link StructureBlock} @@ -285,7 +285,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Sign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_SIGN(16520, 16, Sign.class), /** * BlockData: {@link Sign} @@ -293,7 +293,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Sign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_SIGN(26139, 16, Sign.class), /** * BlockData: {@link Sign} @@ -301,57 +301,57 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 OAK_HANGING_SIGN(20116, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SPRUCE_HANGING_SIGN(24371, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BIRCH_HANGING_SIGN(17938, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 JUNGLE_HANGING_SIGN(27671, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 ACACIA_HANGING_SIGN(30257, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_HANGING_SIGN(5088, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 DARK_OAK_HANGING_SIGN(23360, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 MANGROVE_HANGING_SIGN(25106, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_HANGING_SIGN(4726, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CRIMSON_HANGING_SIGN(20696, 16, HangingSign.class), /** * BlockData: {@link HangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 WARPED_HANGING_SIGN(8195, 16, HangingSign.class), BUCKET(15215, 16), WATER_BUCKET(8802, 1), @@ -359,7 +359,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 EGG(21603, 16), COMPASS(24139), RECOVERY_COMPASS(12710), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BUNDLE(16835, 1), FISHING_ROD(4167, 1, 64), CLOCK(14980), @@ -367,7 +367,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 BEE_SPAWN_EGG(22924), BLAZE_SPAWN_EGG(4759), CAT_SPAWN_EGG(29583), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CAMEL_SPAWN_EGG(14760), CAVE_SPIDER_SPAWN_EGG(23341), CHICKEN_SPAWN_EGG(5462), @@ -375,7 +375,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 SKELETON_SPAWN_EGG(15261), SKELETON_HORSE_SPAWN_EGG(21356), SLIME_SPAWN_EGG(17196), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SNIFFER_SPAWN_EGG(27473), SNOW_GOLEM_SPAWN_EGG(24732), SPIDER_SPAWN_EGG(14984), @@ -383,7 +383,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Rotatable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 PIGLIN_HEAD(5512, Rotatable.class), NETHER_STAR(12469), PUMPKIN_PIE(28725), @@ -391,7 +391,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 END_CRYSTAL(19090), CHORUS_FRUIT(7652), POPPED_CHORUS_FRUIT(27844), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 TORCHFLOWER_SEEDS(18153), BEETROOT(23305), BEETROOT_SEEDS(21282), @@ -399,7 +399,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 NAUTILUS_SHELL(19989), HEART_OF_THE_SEA(11807), CROSSBOW(4340, 1, 465), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SUSPICIOUS_STEW(8173, 1), /** * BlockData: {@link Directional} @@ -407,39 +407,39 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 PEARLESCENT_FROGLIGHT(21441, Orientable.class), FROGSPAWN(8350), ECHO_SHARD(12529), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BRUSH(30569, 1, 64), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 NETHERITE_UPGRADE_SMITHING_TEMPLATE(7615), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE(16124), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 DUNE_ARMOR_TRIM_SMITHING_TEMPLATE(30925), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 COAST_ARMOR_TRIM_SMITHING_TEMPLATE(25501), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 WILD_ARMOR_TRIM_SMITHING_TEMPLATE(5870), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 WARD_ARMOR_TRIM_SMITHING_TEMPLATE(24534), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 EYE_ARMOR_TRIM_SMITHING_TEMPLATE(14663), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 VEX_ARMOR_TRIM_SMITHING_TEMPLATE(25818), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 TIDE_ARMOR_TRIM_SMITHING_TEMPLATE(20420), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE(14386), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 RIB_ARMOR_TRIM_SMITHING_TEMPLATE(6010), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE(29143), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 POTTERY_SHARD_ARCHER(26154), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 POTTERY_SHARD_PRIZE(31677), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 POTTERY_SHARD_ARMS_UP(29222), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 POTTERY_SHARD_SKULL(14619), /** * BlockData: {@link Levelled} @@ -447,7 +447,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link WallSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_WALL_SIGN(20188, 16, WallSign.class), /** * BlockData: {@link WallSign} @@ -455,62 +455,62 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link WallSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_WALL_SIGN(18857, 16, WallSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 OAK_WALL_HANGING_SIGN(15637, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SPRUCE_WALL_HANGING_SIGN(18833, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BIRCH_WALL_HANGING_SIGN(15937, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 ACACIA_WALL_HANGING_SIGN(22477, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY_WALL_HANGING_SIGN(10953, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 JUNGLE_WALL_HANGING_SIGN(16691, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 DARK_OAK_WALL_HANGING_SIGN(14296, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 MANGROVE_WALL_HANGING_SIGN(16974, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CRIMSON_WALL_HANGING_SIGN(28982, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 WARPED_WALL_HANGING_SIGN(20605, WallHangingSign.class), /** * BlockData: {@link WallHangingSign} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO_WALL_HANGING_SIGN(6669, WallHangingSign.class), /** * BlockData: {@link RedstoneWallTorch} @@ -518,14 +518,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * BlockData: {@link Tripwire} */ TRIPWIRE(8810, Tripwire.class), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 POTTED_TORCHFLOWER(21278), POTTED_OAK_SAPLING(11905), POTTED_SPRUCE_SAPLING(29498), POTTED_BIRCH_SAPLING(32484), POTTED_JUNGLE_SAPLING(7525), POTTED_ACACIA_SAPLING(14096), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 POTTED_CHERRY_SAPLING(30785), POTTED_DARK_OAK_SAPLING(6486), POTTED_MANGROVE_PROPAGULE(22003), @@ -533,7 +533,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Directional} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 PIGLIN_WALL_HEAD(4446, Directional.class), /** * BlockData: {@link Directional} @@ -541,19 +541,340 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * BlockData: {@link Ageable} */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 TORCHFLOWER_CROP(28460, Ageable.class), /** * BlockData: {@link Ageable} +diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/Particle.java ++++ b/src/main/java/org/bukkit/Particle.java +@@ -0,0 +0,0 @@ public enum Particle { + SCULK_CHARGE(Float.class), + SCULK_CHARGE_POP, + SHRIEK(Integer.class), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + DRIPPING_CHERRY_LEAVES, ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + FALLING_CHERRY_LEAVES, ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + LANDING_CHERRY_LEAVES, + /** + * Uses {@link BlockData} as DataType +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 + BLOCK_BAMBOO_SAPLING_HIT("block.bamboo_sapling.hit"), + BLOCK_BAMBOO_SAPLING_PLACE("block.bamboo_sapling.place"), + BLOCK_BAMBOO_STEP("block.bamboo.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_BREAK("block.bamboo_wood.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_BUTTON_CLICK_OFF("block.bamboo_wood_button.click_off"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_BUTTON_CLICK_ON("block.bamboo_wood_button.click_on"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_DOOR_CLOSE("block.bamboo_wood_door.close"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_DOOR_OPEN("block.bamboo_wood_door.open"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_FALL("block.bamboo_wood.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_FENCE_GATE_CLOSE("block.bamboo_wood_fence_gate.close"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_FENCE_GATE_OPEN("block.bamboo_wood_fence_gate.open"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_HANGING_SIGN_BREAK("block.bamboo_wood_hanging_sign.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_HANGING_SIGN_FALL("block.bamboo_wood_hanging_sign.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_HANGING_SIGN_HIT("block.bamboo_wood_hanging_sign.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_HANGING_SIGN_PLACE("block.bamboo_wood_hanging_sign.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_HANGING_SIGN_STEP("block.bamboo_wood_hanging_sign.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_HIT("block.bamboo_wood.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_PLACE("block.bamboo_wood.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_OFF("block.bamboo_wood_pressure_plate.click_off"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_PRESSURE_PLATE_CLICK_ON("block.bamboo_wood_pressure_plate.click_on"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_STEP("block.bamboo_wood.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_TRAPDOOR_CLOSE("block.bamboo_wood_trapdoor.close"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_BAMBOO_WOOD_TRAPDOOR_OPEN("block.bamboo_wood_trapdoor.open"), + BLOCK_BARREL_CLOSE("block.barrel.close"), + BLOCK_BARREL_OPEN("block.barrel.open"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_CHAIN_HIT("block.chain.hit"), + BLOCK_CHAIN_PLACE("block.chain.place"), + BLOCK_CHAIN_STEP("block.chain.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_LEAVES_BREAK("block.cherry_leaves.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_LEAVES_FALL("block.cherry_leaves.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_LEAVES_HIT("block.cherry_leaves.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_LEAVES_PLACE("block.cherry_leaves.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_LEAVES_STEP("block.cherry_leaves.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_SAPLING_BREAK("block.cherry_sapling.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_SAPLING_FALL("block.cherry_sapling.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_SAPLING_HIT("block.cherry_sapling.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_SAPLING_PLACE("block.cherry_sapling.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_SAPLING_STEP("block.cherry_sapling.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_BREAK("block.cherry_wood.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_BUTTON_CLICK_OFF("block.cherry_wood_button.click_off"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_BUTTON_CLICK_ON("block.cherry_wood_button.click_on"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_DOOR_CLOSE("block.cherry_wood_door.close"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_DOOR_OPEN("block.cherry_wood_door.open"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_FALL("block.cherry_wood.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_FENCE_GATE_CLOSE("block.cherry_wood_fence_gate.close"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_FENCE_GATE_OPEN("block.cherry_wood_fence_gate.open"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_HANGING_SIGN_BREAK("block.cherry_wood_hanging_sign.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_HANGING_SIGN_FALL("block.cherry_wood_hanging_sign.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_HANGING_SIGN_HIT("block.cherry_wood_hanging_sign.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_HANGING_SIGN_PLACE("block.cherry_wood_hanging_sign.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_HANGING_SIGN_STEP("block.cherry_wood_hanging_sign.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_HIT("block.cherry_wood.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_PLACE("block.cherry_wood.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_OFF("block.cherry_wood_pressure_plate.click_off"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_PRESSURE_PLATE_CLICK_ON("block.cherry_wood_pressure_plate.click_on"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_STEP("block.cherry_wood.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_TRAPDOOR_CLOSE("block.cherry_wood_trapdoor.close"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHERRY_WOOD_TRAPDOOR_OPEN("block.cherry_wood_trapdoor.open"), + BLOCK_CHEST_CLOSE("block.chest.close"), + BLOCK_CHEST_LOCKED("block.chest.locked"), + BLOCK_CHEST_OPEN("block.chest.open"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_BREAK("block.chiseled_bookshelf.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_FALL("block.chiseled_bookshelf.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_HIT("block.chiseled_bookshelf.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_INSERT("block.chiseled_bookshelf.insert"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_INSERT_ENCHANTED("block.chiseled_bookshelf.insert.enchanted"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_PICKUP("block.chiseled_bookshelf.pickup"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_PICKUP_ENCHANTED("block.chiseled_bookshelf.pickup.enchanted"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_PLACE("block.chiseled_bookshelf.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_CHISELED_BOOKSHELF_STEP("block.chiseled_bookshelf.step"), + BLOCK_CHORUS_FLOWER_DEATH("block.chorus_flower.death"), + BLOCK_CHORUS_FLOWER_GROW("block.chorus_flower.grow"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_CORAL_BLOCK_PLACE("block.coral_block.place"), + BLOCK_CORAL_BLOCK_STEP("block.coral_block.step"), + BLOCK_CROP_BREAK("block.crop.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_DECORATED_POT_BREAK("block.decorated_pot.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_DECORATED_POT_FALL("block.decorated_pot.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_DECORATED_POT_HIT("block.decorated_pot.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_DECORATED_POT_PLACE("block.decorated_pot.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_DECORATED_POT_SHATTER("block.decorated_pot.shatter"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_DECORATED_POT_STEP("block.decorated_pot.step"), + BLOCK_DEEPSLATE_BREAK("block.deepslate.break"), + BLOCK_DEEPSLATE_BRICKS_BREAK("block.deepslate_bricks.break"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_HANGING_ROOTS_HIT("block.hanging_roots.hit"), + BLOCK_HANGING_ROOTS_PLACE("block.hanging_roots.place"), + BLOCK_HANGING_ROOTS_STEP("block.hanging_roots.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_HANGING_SIGN_BREAK("block.hanging_sign.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_HANGING_SIGN_FALL("block.hanging_sign.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_HANGING_SIGN_HIT("block.hanging_sign.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_HANGING_SIGN_PLACE("block.hanging_sign.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_HANGING_SIGN_STEP("block.hanging_sign.step"), + BLOCK_HONEY_BLOCK_BREAK("block.honey_block.break"), + BLOCK_HONEY_BLOCK_FALL("block.honey_block.fall"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_NOTE_BLOCK_GUITAR("block.note_block.guitar"), + BLOCK_NOTE_BLOCK_HARP("block.note_block.harp"), + BLOCK_NOTE_BLOCK_HAT("block.note_block.hat"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_NOTE_BLOCK_IMITATE_CREEPER("block.note_block.imitate.creeper"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_NOTE_BLOCK_IMITATE_ENDER_DRAGON("block.note_block.imitate.ender_dragon"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_NOTE_BLOCK_IMITATE_PIGLIN("block.note_block.imitate.piglin"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_NOTE_BLOCK_IMITATE_SKELETON("block.note_block.imitate.skeleton"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_NOTE_BLOCK_IMITATE_WITHER_SKELETON("block.note_block.imitate.wither_skeleton"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_NOTE_BLOCK_IMITATE_ZOMBIE("block.note_block.imitate.zombie"), + BLOCK_NOTE_BLOCK_IRON_XYLOPHONE("block.note_block.iron_xylophone"), + BLOCK_NOTE_BLOCK_PLING("block.note_block.pling"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_PACKED_MUD_HIT("block.packed_mud.hit"), + BLOCK_PACKED_MUD_PLACE("block.packed_mud.place"), + BLOCK_PACKED_MUD_STEP("block.packed_mud.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_PINK_PETALS_BREAK("block.pink_petals.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_PINK_PETALS_FALL("block.pink_petals.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_PINK_PETALS_HIT("block.pink_petals.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_PINK_PETALS_PLACE("block.pink_petals.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_PINK_PETALS_STEP("block.pink_petals.step"), + BLOCK_PISTON_CONTRACT("block.piston.contract"), + BLOCK_PISTON_EXTEND("block.piston.extend"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + BLOCK_STONE_PRESSURE_PLATE_CLICK_OFF("block.stone_pressure_plate.click_off"), + BLOCK_STONE_PRESSURE_PLATE_CLICK_ON("block.stone_pressure_plate.click_on"), + BLOCK_STONE_STEP("block.stone.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_SUSPICIOUS_SAND_BREAK("block.suspicious_sand.break"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_SUSPICIOUS_SAND_FALL("block.suspicious_sand.fall"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_SUSPICIOUS_SAND_HIT("block.suspicious_sand.hit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_SUSPICIOUS_SAND_PLACE("block.suspicious_sand.place"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + BLOCK_SUSPICIOUS_SAND_STEP("block.suspicious_sand.step"), + BLOCK_SWEET_BERRY_BUSH_BREAK("block.sweet_berry_bush.break"), + BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ENTITY_BLAZE_SHOOT("entity.blaze.shoot"), + ENTITY_BOAT_PADDLE_LAND("entity.boat.paddle_land"), + ENTITY_BOAT_PADDLE_WATER("entity.boat.paddle_water"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_DASH("entity.camel.dash"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_DASH_READY("entity.camel.dash_ready"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_DEATH("entity.camel.death"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_EAT("entity.camel.eat"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_HURT("entity.camel.hurt"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_SADDLE("entity.camel.saddle"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_SIT("entity.camel.sit"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_STAND("entity.camel.stand"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_STEP("entity.camel.step"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_CAMEL_STEP_SAND("entity.camel.step_sand"), + ENTITY_CAT_AMBIENT("entity.cat.ambient"), + ENTITY_CAT_BEG_FOR_FOOD("entity.cat.beg_for_food"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ENTITY_SLIME_JUMP_SMALL("entity.slime.jump_small"), + ENTITY_SLIME_SQUISH("entity.slime.squish"), + ENTITY_SLIME_SQUISH_SMALL("entity.slime.squish_small"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_DEATH("entity.sniffer.death"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_DIGGING("entity.sniffer.digging"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_DIGGING_STOP("entity.sniffer.digging_stop"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_DROP_SEED("entity.sniffer.drop_seed"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_EAT("entity.sniffer.eat"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_HAPPY("entity.sniffer.happy"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_HURT("entity.sniffer.hurt"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_IDLE("entity.sniffer.idle"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_SCENTING("entity.sniffer.scenting"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_SEARCHING("entity.sniffer.searching"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_SNIFFING("entity.sniffer.sniffing"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ENTITY_SNIFFER_STEP("entity.sniffer.step"), + ENTITY_SNOWBALL_THROW("entity.snowball.throw"), + ENTITY_SNOW_GOLEM_AMBIENT("entity.snow_golem.ambient"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + ITEM_BOTTLE_EMPTY("item.bottle.empty"), + ITEM_BOTTLE_FILL("item.bottle.fill"), + ITEM_BOTTLE_FILL_DRAGONBREATH("item.bottle.fill_dragonbreath"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ITEM_BRUSH_BRUSHING("item.brush.brushing"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ITEM_BRUSH_BRUSH_SAND_COMPLETED("item.brush.brush_sand_completed"), + ITEM_BUCKET_EMPTY("item.bucket.empty"), + ITEM_BUCKET_EMPTY_AXOLOTL("item.bucket.empty_axolotl"), +@@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa + MUSIC_NETHER_NETHER_WASTES("music.nether.nether_wastes"), + MUSIC_NETHER_SOUL_SAND_VALLEY("music.nether.soul_sand_valley"), + MUSIC_NETHER_WARPED_FOREST("music.nether.warped_forest"), ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + MUSIC_OVERWORLD_CHERRY_GROVE("music.overworld.cherry_grove"), + MUSIC_OVERWORLD_DEEP_DARK("music.overworld.deep_dark"), + MUSIC_OVERWORLD_DRIPSTONE_CAVES("music.overworld.dripstone_caves"), diff --git a/src/main/java/org/bukkit/Tag.java b/src/main/java/org/bukkit/Tag.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/Tag.java +++ b/src/main/java/org/bukkit/Tag.java +@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed { + /** + * Vanilla block tag representing all cherry log and bark variants. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> CHERRY_LOGS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("cherry_logs"), Material.class); + /** + * Vanilla block tag representing all jungle log and bark variants. @@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed { /** * Vanilla block tag representing all bamboo blocks. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 Tag<Material> BAMBOO_BLOCKS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("bamboo_blocks"), Material.class); /** * Vanilla block tag representing all banner blocks. @@ -561,25 +882,33 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Vanilla block tag representing all ceiling signs. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 Tag<Material> CEILING_HANGING_SIGNS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("ceiling_hanging_signs"), Material.class); /** * Vanilla block tag representing all wall hanging signs. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 Tag<Material> WALL_HANGING_SIGNS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("wall_hanging_signs"), Material.class); /** * Vanilla block tag representing all hanging signs. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 Tag<Material> ALL_HANGING_SIGNS = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("all_hanging_signs"), Material.class); /** * Vanilla block tag representing all signs, regardless of type. +@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed { + /** + * Vanilla block tag representing blocks which can be dug by sniffers. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> SNIFFER_DIGGABLE_BLOCK = Bukkit.getTag(REGISTRY_BLOCKS, NamespacedKey.minecraft("sniffer_diggable_block"), Material.class); + /** + * Key for the built in item registry. @@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed { /** * Vanilla item tag representing all books that may be placed on bookshelves. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 Tag<Material> ITEMS_BOOKSHELF_BOOKS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("bookshelf_books"), Material.class); /** * Vanilla item tag representing all items that may be placed in beacons. @@ -587,10 +916,62 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Vanilla item tag representing all hanging signs. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 Tag<Material> ITEMS_HANGING_SIGNS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("hanging_signs"), Material.class); /** * Vanilla item tag representing all items which will ignite creepers when +@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed { + /** + * Vanilla item tag representing all items which modify note block sounds when placed on top. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_NOTE_BLOCK_TOP_INSTRUMENTS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("noteblock_top_instruments"), Material.class); + /** + * Vanilla item tag representing all trimmable armor items. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_TRIMMABLE_ARMOR = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("trimmable_armor"), Material.class); + /** + * Vanilla item tag representing all materials which can be used for trimming armor. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_TRIM_MATERIALS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("trim_materials"), Material.class); + /** + * Vanilla item tag representing all trimming templates. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_TRIM_TEMPLATES = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("trim_templates"), Material.class); + /** + * Vanilla item tag representing all food for sniffers. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_SNIFFER_FOOD = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("sniffer_food"), Material.class); + /** + * Vanilla item tag representing all decorated pot shards. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_DECORATED_POT_SHARDS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("decorated_pot_shards"), Material.class); + /** + * Vanilla item tag representing all swords. +@@ -0,0 +0,0 @@ public interface Tag<T extends Keyed> extends Keyed { + /** + * Vanilla item tag representing all item which break decorated pots. + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + Tag<Material> ITEMS_BREAKS_DECORATED_POTS = Bukkit.getTag(REGISTRY_ITEMS, NamespacedKey.minecraft("breaks_decorated_pots"), Material.class); + /** + * Vanilla item tag representing all items that confer freeze immunity on +diff --git a/src/main/java/org/bukkit/TreeType.java b/src/main/java/org/bukkit/TreeType.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/TreeType.java ++++ b/src/main/java/org/bukkit/TreeType.java +@@ -0,0 +0,0 @@ public enum TreeType { + /** + * Cherry tree + */ ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + CHERRY, + } diff --git a/src/main/java/org/bukkit/block/ChiseledBookshelf.java b/src/main/java/org/bukkit/block/ChiseledBookshelf.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/block/ChiseledBookshelf.java @@ -599,7 +980,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a captured state of a chiseled bookshelf. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface ChiseledBookshelf extends TileState, BlockInventoryHolder { /** @@ -611,7 +992,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a captured state of a decorated pot. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface DecoratedPot extends TileState { /** @@ -623,7 +1004,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a captured state of a hanging sign. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface HangingSign extends Sign { } diff --git a/src/main/java/org/bukkit/block/Skull.java b/src/main/java/org/bukkit/block/Skull.java @@ -634,7 +1015,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * * @return the key of the sound, or null */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 @Nullable public NamespacedKey getNoteBlockSound(); @@ -642,7 +1023,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * * @param noteBlockSound the key of the sound to be played, or null */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public void setNoteBlockSound(@Nullable NamespacedKey noteBlockSound); /** @@ -654,7 +1035,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a captured state of suspicious sand. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface SuspiciousSand extends Lootable, TileState { /** @@ -666,7 +1047,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * <br> * Block may have 0, 1... {@link #getMaximumOccupiedSlots()}-1 occupied slots. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface ChiseledBookshelf extends Directional { /** @@ -678,7 +1059,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.block.data.Directional; import org.bukkit.block.data.Waterlogged; -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface DecoratedPot extends Directional, Waterlogged { } diff --git a/src/main/java/org/bukkit/block/data/type/HangingSign.java b/src/main/java/org/bukkit/block/data/type/HangingSign.java @@ -689,7 +1070,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.block.data.Rotatable; import org.bukkit.block.data.Waterlogged; -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface HangingSign extends Attachable, Rotatable, Waterlogged { } diff --git a/src/main/java/org/bukkit/block/data/type/PinkPetals.java b/src/main/java/org/bukkit/block/data/type/PinkPetals.java @@ -700,7 +1081,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * 'flower_amount' represents the number of petals. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface PinkPetals extends Directional { /** @@ -712,7 +1093,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * 'dusted' represents how far uncovered by brush the block is. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface SuspiciousSand extends BlockData { /** @@ -724,7 +1105,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.block.data.Directional; import org.bukkit.block.data.Waterlogged; -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface WallHangingSign extends Directional, Waterlogged { } diff --git a/src/main/java/org/bukkit/entity/Boat.java b/src/main/java/org/bukkit/entity/Boat.java @@ -735,11 +1116,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 BIRCH(Material.BIRCH_PLANKS), JUNGLE(Material.JUNGLE_PLANKS), ACACIA(Material.ACACIA_PLANKS), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHERRY(Material.CHERRY_PLANKS), DARK_OAK(Material.DARK_OAK_PLANKS), MANGROVE(Material.MANGROVE_PLANKS), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 BAMBOO(Material.BAMBOO_PLANKS), ; @@ -751,7 +1132,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a Camel. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface Camel extends AbstractHorse, Sittable { /** @@ -763,12 +1144,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 FROG("frog", Frog.class, -1), TADPOLE("tadpole", Tadpole.class, -1), WARDEN("warden", Warden.class, -1), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CAMEL("camel", Camel.class, -1), BLOCK_DISPLAY("block_display", BlockDisplay.class, -1), INTERACTION("interaction", Interaction.class, -1), ITEM_DISPLAY("item_display", ItemDisplay.class, -1), -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SNIFFER("sniffer", Sniffer.class, -1), TEXT_DISPLAY("text_display", TextDisplay.class, -1), /** @@ -780,7 +1161,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a Sniffer. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface Sniffer extends Animals { } @@ -792,7 +1173,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 public static final MemoryKey<Location> LIKED_NOTEBLOCK_POSITION = new MemoryKey<>(NamespacedKey.minecraft("liked_noteblock"), Location.class); public static final MemoryKey<Integer> LIKED_NOTEBLOCK_COOLDOWN_TICKS = new MemoryKey<>(NamespacedKey.minecraft("liked_noteblock_cooldown_ticks"), Integer.class); public static final MemoryKey<Integer> ITEM_PICKUP_COOLDOWN_TICKS = new MemoryKey<>(NamespacedKey.minecraft("item_pickup_cooldown_ticks"), Integer.class); -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public static final MemoryKey<Location> SNIFFER_EXPLORED_POSITIONS = new MemoryKey<>(NamespacedKey.minecraft("sniffer_explored_positions"), Location.class); /** @@ -804,7 +1185,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Pseudo chiseled bookshelf inventory, with 6 slots of undefined type. */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 CHISELED_BOOKSHELF(6, "Chiseled Bookshelf"), /** * The new smithing inventory, with 3 CRAFTING slots and 1 RESULT slot. @@ -812,7 +1193,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * @deprecated draft, experimental 1.20 API */ - @Deprecated -+ @Deprecated @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @Deprecated @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 SMITHING_NEW(4, "Upgrade Gear"), ; @@ -824,7 +1205,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Interface to the inventory of a chiseled bookshelf. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface ChiseledBookshelfInventory extends Inventory { @Nullable @@ -836,7 +1217,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a smithing transform recipe. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public class SmithingTransformRecipe extends SmithingRecipe { private final RecipeChoice template; @@ -848,7 +1229,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 /** * Represents a smithing trim recipe. */ -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public class SmithingTrimRecipe extends SmithingRecipe implements ComplexRecipe { private final RecipeChoice template; @@ -860,7 +1241,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -+@org.jetbrains.annotations.ApiStatus.Experimental // Paper ++@org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 public interface BundleMeta extends ItemMeta { /** @@ -872,7 +1253,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * * @param noteBlockSound the key of the sound to be played, or null */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 void setNoteBlockSound(@Nullable NamespacedKey noteBlockSound); /** @@ -880,7 +1261,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * * @return the key of the sound, or null */ -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 @Nullable NamespacedKey getNoteBlockSound(); diff --git a/patches/api/fix-Instruments.patch b/patches/api/fix-Instruments.patch index 9e9c49e6b9..bc8dc4492f 100644 --- a/patches/api/fix-Instruments.patch +++ b/patches/api/fix-Instruments.patch @@ -33,43 +33,43 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 * Zombie is normally played when a Zombie Head is on top of the note block. */ - ZOMBIE, -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + ZOMBIE(0x10), // Paper /** * Skeleton is normally played when a Skeleton Head is on top of the note block. */ - SKELETON, -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + SKELETON(0x11), // Paper /** * Creeper is normally played when a Creeper Head is on top of the note block. */ - CREEPER, -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + CREEPER(0x12), // Paper /** * Dragon is normally played when a Dragon Head is on top of the note block. */ - DRAGON, -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + DRAGON(0x13), // Paper /** * Wither Skeleton is normally played when a Wither Skeleton Head is on top of the note block. */ - WITHER_SKELETON, -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + WITHER_SKELETON(0x14), // Paper /** * Piglin is normally played when a Piglin Head is on top of the note block. */ - PIGLIN, -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + PIGLIN(0x15), // Paper /** * Custom Sound is normally played when a Player Head with the required data is on top of the note block. */ - CUSTOM_HEAD; -+ @org.jetbrains.annotations.ApiStatus.Experimental // Paper ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - 1.20 + CUSTOM_HEAD(0x16); // Paper private final byte type;