diff --git a/patches/api/Adventure.patch b/patches/api/Adventure.patch index 3b165686b..28bbf09cd 100644 --- a/patches/api/Adventure.patch +++ b/patches/api/Adventure.patch @@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/build.gradle.kts @@ -0,0 +0,0 @@ java { - val annotationsVersion = "24.0.1" + val annotationsVersion = "24.1.0" val bungeeCordChatVersion = "1.20-R0.2" +val adventureVersion = "4.17.0-SNAPSHOT" +val apiAndDocs: Configuration by configurations.creating { @@ -5110,6 +5110,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - * @deprecated use {@link #registerNewObjective(String, Criteria, String)} + * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)} */ + @Deprecated @NotNull + @Deprecated // Paper Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName); @@ -5122,6 +5123,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - * @deprecated use {@link #registerNewObjective(String, Criteria, String, RenderType)} + * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)} */ + @Deprecated @NotNull + @Deprecated // Paper Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName, @NotNull RenderType renderType); diff --git a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch index 5174caab9..060378dca 100644 --- a/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/Allow-plugins-to-use-SLF4J-for-logging.patch @@ -18,7 +18,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -0,0 +0,0 @@ java { - val annotationsVersion = "24.0.1" + val annotationsVersion = "24.1.0" val bungeeCordChatVersion = "1.20-R0.2" val adventureVersion = "4.17.0-SNAPSHOT" +val slf4jVersion = "2.0.9" diff --git a/patches/api/Build-system-changes.patch b/patches/api/Build-system-changes.patch index a3eddbaa2..ff417ed46 100644 --- a/patches/api/Build-system-changes.patch +++ b/patches/api/Build-system-changes.patch @@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // Paper end + testImplementation("org.apache.commons:commons-lang3:3.12.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.hamcrest:hamcrest:2.2") @@ -0,0 +0,0 @@ tasks.withType { options.links( diff --git a/patches/api/Code-Generation.patch b/patches/api/Code-Generation.patch index fa436e409..b6ea8dd98 100644 --- a/patches/api/Code-Generation.patch +++ b/patches/api/Code-Generation.patch @@ -249,9 +249,10 @@ diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/MinecraftExperimental.java +++ b/src/main/java/org/bukkit/MinecraftExperimental.java -@@ -0,0 +0,0 @@ import org.jetbrains.annotations.ApiStatus; - }) - @ApiStatus.Internal - public @interface MinecraftExperimental { -+ String value() default ""; // Paper +@@ -0,0 +0,0 @@ public @interface MinecraftExperimental { + + UPDATE_1_21 + } ++ ++ String desc() default ""; // Paper } diff --git a/patches/api/Convert-project-to-Gradle.patch b/patches/api/Convert-project-to-Gradle.patch index ad0b25c88..008323009 100644 --- a/patches/api/Convert-project-to-Gradle.patch +++ b/patches/api/Convert-project-to-Gradle.patch @@ -41,7 +41,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + withJavadocJar() +} + -+val annotationsVersion = "24.0.1" ++val annotationsVersion = "24.1.0" +val bungeeCordChatVersion = "1.20-R0.2" + +dependencies { @@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + testCompileOnly(annotations) + + testImplementation("org.apache.commons:commons-lang3:3.12.0") -+ testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") ++ testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testImplementation("org.hamcrest:hamcrest:2.2") + testImplementation("org.mockito:mockito-core:5.11.0") + testImplementation("org.ow2.asm:asm-tree:9.7") @@ -217,14 +217,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.jetbrains - annotations-java5 -- 24.0.1 +- 24.1.0 - provided - - - - org.junit.jupiter - junit-jupiter -- 5.10.0 +- 5.10.2 - test - - @@ -267,23 +267,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - maven-compiler-plugin - 3.13.0 - -- -- eclipse - - false - -- -- -- org.codehaus.plexus -- plexus-compiler-eclipse -- 2.15.0 -- -- - - - org.apache.maven.plugins - maven-jar-plugin -- 3.3.0 +- 3.4.1 - - - @@ -298,7 +289,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-shade-plugin -- 3.5.0 +- 3.5.3 - - - package @@ -325,10 +316,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-javadoc-plugin -- 3.5.0 +- 3.6.3 - - -- https://guava.dev/releases/31.1-jre/api/docs/ +- https://guava.dev/releases/32.1.2-jre/api/docs/ - - - @@ -342,7 +333,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-surefire-plugin -- 3.1.0 +- 3.2.5 - - - @@ -358,7 +349,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-checkstyle-plugin -- 3.3.0 +- 3.3.1 - - - process-classes diff --git a/patches/api/Fix-Spigot-annotation-mistakes.patch b/patches/api/Fix-Spigot-annotation-mistakes.patch index 328c28845..e782e537a 100644 --- a/patches/api/Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/Fix-Spigot-annotation-mistakes.patch @@ -822,6 +822,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + * @deprecated should not be used for anything, use {@link ThrownPotion} and + * set the potion via the methods there. */ +-@Deprecated +@Deprecated(forRemoval = true) // Paper public interface LingeringPotion extends ThrownPotion { } diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -985,8 +986,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 */ + @Deprecated // Paper @NotNull + @Deprecated public int[] getExpLevelCostsOffered() { - int[] levelOffers = new int[offers.length]; @@ -0,0 +0,0 @@ public class PrepareItemEnchantEvent extends InventoryEvent implements Cancellab * * @return list of available enchantment offers @@ -1430,14 +1431,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import org.bukkit.Utility; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.enchantments.Enchantment; -@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat - * @param damage durability / damage - * @deprecated see {@link #setDurability(short)} - */ -+ @Deprecated // Paper - public ItemStack(@NotNull final Material type, final int amount, final short damage) { - this(type, amount, damage, null); - } @@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat * Gets the MaterialData for this stack of items * @@ -1868,8 +1861,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 */ + @Deprecated // Paper @Override + @Deprecated protected int getTextureIndex() { - return getData() & 0x7; diff --git a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java b/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/material/types/MushroomBlockTexture.java diff --git a/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch index 808f650fb..35fe86c08 100644 --- a/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch +++ b/patches/api/Replace-ItemFlag.HIDE_POTION_EFFECTS.patch @@ -8,16 +8,6 @@ diff --git a/src/main/java/org/bukkit/inventory/ItemFlag.java b/src/main/java/or index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/inventory/ItemFlag.java +++ b/src/main/java/org/bukkit/inventory/ItemFlag.java -@@ -0,0 +0,0 @@ public enum ItemFlag { - /** - * Setting to show/hide potion effects, book and firework information, map - * tooltips, patterns of banners, and enchantments of enchanted books. -+ * @deprecated misleading name and description, use {@link #HIDE_ITEM_SPECIFICS} - */ -+ @Deprecated // Paper - HIDE_POTION_EFFECTS, - /** - * Setting to show/hide dyes from colored leather armor. @@ -0,0 +0,0 @@ public enum ItemFlag { * Setting to show/hide armor trim from armor. */ @@ -41,6 +31,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + *
  • Spawner descriptions
    • + * + */ -+ public static final ItemFlag HIDE_ITEM_SPECIFICS = HIDE_POTION_EFFECTS; ++ @Deprecated ++ public static final ItemFlag HIDE_ITEM_SPECIFICS = HIDE_ADDITIONAL_TOOLTIP; + // Paper end } diff --git a/patches/api/add-missing-Experimental-annotations.patch b/patches/api/add-missing-Experimental-annotations.patch index 5f90bf2eb..ad9eb05a7 100644 --- a/patches/api/add-missing-Experimental-annotations.patch +++ b/patches/api/add-missing-Experimental-annotations.patch @@ -9,21 +9,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/FeatureFlag.java +++ b/src/main/java/org/bukkit/FeatureFlag.java @@ -0,0 +0,0 @@ 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")); /** @@ -0,0 +0,0 @@ public interface FeatureFlag extends Keyed { + @Deprecated 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")); } @@ -34,67 +33,67 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Slab} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_SLAB(19305, Slab.class), /** * BlockData: {@link Stairs} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_STAIRS(11268, Stairs.class), /** * BlockData: {@link Wall} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_WALL(24395, Wall.class), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation CHISELED_TUFF(15831), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation POLISHED_TUFF(17801), /** * BlockData: {@link Slab} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation POLISHED_TUFF_SLAB(31096, Slab.class), /** * BlockData: {@link Stairs} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation POLISHED_TUFF_STAIRS(7964, Stairs.class), /** * BlockData: {@link Wall} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation POLISHED_TUFF_WALL(28886, Wall.class), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_BRICKS(26276), /** * BlockData: {@link Slab} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_BRICK_SLAB(11843, Slab.class), /** * BlockData: {@link Stairs} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_BRICK_STAIRS(30753, Stairs.class), /** * BlockData: {@link Wall} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TUFF_BRICK_WALL(11761, Wall.class), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation CHISELED_TUFF_BRICKS(8601), DRIPSTONE_BLOCK(26227), @@ -102,7 +101,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation HEAVY_CORE(15788, Waterlogged.class), AMETHYST_BLOCK(18919), @@ -110,16 +109,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla WEATHERED_COPPER(19699), OXIDIZED_COPPER(19490), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation CHISELED_COPPER(12143), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EXPOSED_CHISELED_COPPER(4570), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WEATHERED_CHISELED_COPPER(30876), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OXIDIZED_CHISELED_COPPER(27719), CUT_COPPER(32519), @@ -127,16 +126,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla WAXED_WEATHERED_COPPER(5960), WAXED_OXIDIZED_COPPER(25626), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_CHISELED_COPPER(7500), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_EXPOSED_CHISELED_COPPER(30658), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_WEATHERED_CHISELED_COPPER(5970), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_OXIDIZED_CHISELED_COPPER(7735), WAXED_CUT_COPPER(11030), @@ -144,49 +143,49 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation COPPER_DOOR(26809, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EXPOSED_COPPER_DOOR(13236, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WEATHERED_COPPER_DOOR(10208, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OXIDIZED_COPPER_DOOR(5348, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_COPPER_DOOR(9954, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_EXPOSED_COPPER_DOOR(20748, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_WEATHERED_COPPER_DOOR(25073, Door.class), /** * BlockData: {@link Door} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_OXIDIZED_COPPER_DOOR(23888, Door.class), /** @@ -194,49 +193,49 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation COPPER_TRAPDOOR(12110, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EXPOSED_COPPER_TRAPDOOR(19219, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WEATHERED_COPPER_TRAPDOOR(28254, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OXIDIZED_COPPER_TRAPDOOR(26518, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_COPPER_TRAPDOOR(12626, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_EXPOSED_COPPER_TRAPDOOR(11010, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_WEATHERED_COPPER_TRAPDOOR(30709, TrapDoor.class), /** * BlockData: {@link TrapDoor} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_OXIDIZED_COPPER_TRAPDOOR(21450, TrapDoor.class), /** @@ -245,7 +244,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 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), @@ -253,7 +251,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Crafter} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation CRAFTER(25243, Crafter.class), FILLED_MAP(23504), @@ -261,10 +259,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla BEE_SPAWN_EGG(22924), BLAZE_SPAWN_EGG(4759), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BOGGED_SPAWN_EGG(12042), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BREEZE_SPAWN_EGG(7580), CAT_SPAWN_EGG(29583), @@ -272,12 +270,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla EXPERIENCE_BOTTLE(12858), FIRE_CHARGE(4842), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WIND_CHARGE(23928), WRITABLE_BOOK(13393, 1), WRITTEN_BOOK(24164, 16), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation MACE(4771, 1, 250), ITEM_FRAME(27318), @@ -285,10 +283,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla RAISER_ARMOR_TRIM_SMITHING_TEMPLATE(29116), HOST_ARMOR_TRIM_SMITHING_TEMPLATE(12165), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation FLOW_ARMOR_TRIM_SMITHING_TEMPLATE(29175), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BOLT_ARMOR_TRIM_SMITHING_TEMPLATE(9698), ANGLER_POTTERY_SHERD(9952), @@ -296,11 +294,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla DANGER_POTTERY_SHERD(30506), EXPLORER_POTTERY_SHERD(5124), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation FLOW_POTTERY_SHERD(4896), FRIEND_POTTERY_SHERD(18221), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation GUSTER_POTTERY_SHERD(28193), HEART_POTTERY_SHERD(17607), @@ -308,7 +306,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla PLENTY_POTTERY_SHERD(28236), PRIZE_POTTERY_SHERD(4341), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation SCRAPE_POTTERY_SHERD(30034), SHEAF_POTTERY_SHERD(23652), @@ -316,121 +314,121 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation COPPER_GRATE(16221, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EXPOSED_COPPER_GRATE(7783, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WEATHERED_COPPER_GRATE(24954, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OXIDIZED_COPPER_GRATE(14122, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_COPPER_GRATE(11230, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_EXPOSED_COPPER_GRATE(20520, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_WEATHERED_COPPER_GRATE(16533, Waterlogged.class), /** * BlockData: {@link Waterlogged} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_OXIDIZED_COPPER_GRATE(32010, Waterlogged.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation COPPER_BULB(21370, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EXPOSED_COPPER_BULB(11944, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WEATHERED_COPPER_BULB(10800, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OXIDIZED_COPPER_BULB(22421, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_COPPER_BULB(23756, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_EXPOSED_COPPER_BULB(5530, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_WEATHERED_COPPER_BULB(13239, CopperBulb.class), /** * BlockData: {@link CopperBulb} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WAXED_OXIDIZED_COPPER_BULB(26892, CopperBulb.class), /** * BlockData: {@link TrialSpawner} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_SPAWNER(19902, TrialSpawner.class), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_KEY(12725), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_TRIAL_KEY(4986), /** * BlockData: {@link Vault} */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation VAULT(6288, Vault.class), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_BOTTLE(26321), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BREEZE_ROD(14281), /** @@ -442,46 +440,46 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum Particle implements Keyed { DUST_PLUME("dust_plume"), WHITE_SMOKE("white_smoke"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation GUST("gust"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation SMALL_GUST("small_gust"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation GUST_EMITTER_LARGE("gust_emitter_large"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation GUST_EMITTER_SMALL("gust_emitter_small"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_SPAWNER_DETECTION("trial_spawner_detection"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_SPAWNER_DETECTION_OMINOUS("trial_spawner_detection_ominous"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation VAULT_CONNECTION("vault_connection"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation INFESTED("infested"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_COBWEB("item_cobweb"), /** * Uses {@link BlockData} as DataType */ - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation DUST_PILLAR("dust_pillar", BlockData.class), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_SPAWNING("ominous_spawning"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation RAID_OMEN("raid_omen"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_OMEN("trial_omen"), /** @@ -493,56 +491,56 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_BREAK("block.copper_bulb.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_FALL("block.copper_bulb.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_HIT("block.copper_bulb.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_PLACE("block.copper_bulb.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_STEP("block.copper_bulb.step"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_TURN_OFF("block.copper_bulb.turn_off"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_BULB_TURN_ON("block.copper_bulb.turn_on"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_DOOR_CLOSE("block.copper_door.close"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_DOOR_OPEN("block.copper_door.open"), BLOCK_COPPER_FALL("block.copper.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_GRATE_BREAK("block.copper_grate.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_GRATE_FALL("block.copper_grate.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_GRATE_HIT("block.copper_grate.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_GRATE_PLACE("block.copper_grate.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_COPPER_TRAPDOOR_CLOSE("block.copper_trapdoor.close"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), @@ -550,19 +548,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_HEAVY_CORE_BREAK("block.heavy_core.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_HEAVY_CORE_FALL("block.heavy_core.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_HEAVY_CORE_HIT("block.heavy_core.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_HEAVY_CORE_PLACE("block.heavy_core.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), @@ -570,66 +568,72 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_POLISHED_TUFF_BREAK("block.polished_tuff.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_POLISHED_TUFF_FALL("block.polished_tuff.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_POLISHED_TUFF_HIT("block.polished_tuff.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_POLISHED_TUFF_PLACE("block.polished_tuff.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), @@ -0,0 +0,0 @@ public enum Sound implements Keyed, net.kyori.adventure.sound.Sound.Type { // Pa - @MinecraftExperimental + BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"), + BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"), + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_ABOUT_TO_SPAWN_ITEM("block.trial_spawner.about_to_spawn_item"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_AMBIENT("block.trial_spawner.ambient"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_AMBIENT_CHARGED("block.trial_spawner.ambient_charged"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_BREAK("block.trial_spawner.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_CHARGE_ACTIVATE("block.trial_spawner.charge_activate"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_CLOSE_SHUTTER("block.trial_spawner.close_shutter"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_DETECT_PLAYER("block.trial_spawner.detect_player"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_EJECT_ITEM("block.trial_spawner.eject_item"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_FALL("block.trial_spawner.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_HIT("block.trial_spawner.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_OPEN_SHUTTER("block.trial_spawner.open_shutter"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_PLACE("block.trial_spawner.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_SPAWN_ITEM("block.trial_spawner.spawn_item"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_SPAWN_ITEM_BEGIN("block.trial_spawner.spawn_item_begin"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_SPAWN_MOB("block.trial_spawner.spawn_mob"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TRIAL_SPAWNER_STEP("block.trial_spawner.step"), BLOCK_TRIPWIRE_ATTACH("block.tripwire.attach"), @@ -637,62 +641,62 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TUFF_BRICKS_BREAK("block.tuff_bricks.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TUFF_BRICKS_FALL("block.tuff_bricks.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TUFF_BRICKS_HIT("block.tuff_bricks.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_TUFF_BRICKS_PLACE("block.tuff_bricks.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_ACTIVATE("block.vault.activate"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_AMBIENT("block.vault.ambient"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_BREAK("block.vault.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_CLOSE_SHUTTER("block.vault.close_shutter"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_DEACTIVATE("block.vault.deactivate"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_EJECT_ITEM("block.vault.eject_item"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_FALL("block.vault.fall"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_HIT("block.vault.hit"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_INSERT_ITEM("block.vault.insert_item"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_INSERT_ITEM_FAIL("block.vault.insert_item_fail"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_OPEN_SHUTTER("block.vault.open_shutter"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_PLACE("block.vault.place"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation BLOCK_VAULT_STEP("block.vault.step"), BLOCK_VINE_BREAK("block.vine.break"), @@ -700,58 +704,58 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BOGGED_AMBIENT("entity.bogged.ambient"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BOGGED_DEATH("entity.bogged.death"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BOGGED_HURT("entity.bogged.hurt"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BOGGED_SHEAR("entity.bogged.shear"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BOGGED_STEP("entity.bogged.step"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_CHARGE("entity.breeze.charge"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_DEATH("entity.breeze.death"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_DEFLECT("entity.breeze.deflect"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_HURT("entity.breeze.hurt"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_IDLE_AIR("entity.breeze.idle_air"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_IDLE_GROUND("entity.breeze.idle_ground"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_INHALE("entity.breeze.inhale"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_JUMP("entity.breeze.jump"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_LAND("entity.breeze.land"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_SHOOT("entity.breeze.shoot"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_SLIDE("entity.breeze.slide"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_WHIRL("entity.breeze.whirl"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_BREEZE_WIND_BURST("entity.breeze.wind_burst"), ENTITY_CAMEL_AMBIENT("entity.camel.ambient"), @@ -759,10 +763,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_PARROT_IMITATE_BOGGED("entity.parrot.imitate.bogged"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), @@ -770,10 +774,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ENTITY_WIND_CHARGE_THROW("entity.wind_charge.throw"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), @@ -781,44 +785,48 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EVENT_MOB_EFFECT_BAD_OMEN("event.mob_effect.bad_omen"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EVENT_MOB_EFFECT_RAID_OMEN("event.mob_effect.raid_omen"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), @@ -0,0 +0,0 @@ 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 + ITEM_INK_SAC_USE("item.ink_sac.use"), + ITEM_LODESTONE_COMPASS_LOCK("item.lodestone_compass.lock"), + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_BUNDLE_DROP_CONTENTS("item.bundle.drop_contents"), - @MinecraftExperimental + ITEM_MACE_SMASH_AIR("item.mace.smash_air"), + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation - ITEM_BUNDLE_INSERT("item.bundle.insert"), - @MinecraftExperimental + ITEM_MACE_SMASH_GROUND("item.mace.smash_ground"), + @MinecraftExperimental(Requires.UPDATE_1_21) + @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"), + ITEM_MACE_SMASH_GROUND_HEAVY("item.mace.smash_ground_heavy"), + ITEM_NETHER_WART_PLANT("item.nether_wart.plant"), + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + ITEM_OMINOUS_BOTTLE_DISPOSE("item.ominous_bottle.dispose"), + ITEM_SHIELD_BLOCK("item.shield.block"), + ITEM_SHIELD_BREAK("item.shield.break"), @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_WOLF_ARMOR_BREAK("item.wolf_armor.break"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_WOLF_ARMOR_CRACK("item.wolf_armor.crack"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_WOLF_ARMOR_DAMAGE("item.wolf_armor.damage"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation ITEM_WOLF_ARMOR_REPAIR("item.wolf_armor.repair"), MUSIC_CREATIVE("music.creative"), @@ -850,7 +858,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ 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 + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation public static final Structure TRIAL_CHAMBERS = getStructure("trial_chambers"); @@ -862,75 +870,84 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum LootTables implements Keyed { ANCIENT_CITY_ICE_BOX("chests/ancient_city_ice_box"), RUINED_PORTAL("chests/ruined_portal"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD("chests/trial_chambers/reward"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_COMMON("chests/trial_chambers/reward_common"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_RARE("chests/trial_chambers/reward_rare"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_UNIQUE("chests/trial_chambers/reward_unique"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_OMINOUS("chests/trial_chambers/reward_ominous"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_OMINOUS_COMMON("chests/trial_chambers/reward_ominous_common"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_OMINOUS_RARE("chests/trial_chambers/reward_ominous_rare"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_REWARD_OMINOUS_UNIQUE("chests/trial_chambers/reward_ominous_unique"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_SUPPLY("chests/trial_chambers/supply"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_CORRIDOR("chests/trial_chambers/corridor"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_INTERSECTION("chests/trial_chambers/intersection"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_INTERSECTION_BARREL("chests/trial_chambers/intersection_barrel"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_ENTRANCE("chests/trial_chambers/entrance"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_CORRIDOR_DISPENSER("dispensers/trial_chambers/corridor"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_CHAMBER_DISPENSER("dispensers/trial_chambers/chamber"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_WATER_DISPENSER("dispensers/trial_chambers/water"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBERS_CORRIDOR_POT("pots/trial_chambers/corridor"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation EQUIPMENT_TRIAL_CHAMBER("equipment/trial_chamber"), + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + EQUIPMENT_TRIAL_CHAMBER_RANGED("equipment/trial_chamber_ranged"), + @MinecraftExperimental(Requires.UPDATE_1_21) ++ @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation + EQUIPMENT_TRIAL_CHAMBER_MELEE("equipment/trial_chamber_melee"), + SHIPWRECK_MAP("chests/shipwreck_map"), + SHIPWRECK_SUPPLY("chests/shipwreck_supply"), @@ -0,0 +0,0 @@ public enum LootTables implements Keyed { PIGLIN_BARTERING("gameplay/piglin_bartering"), // Spawners - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBER_KEY("spawners/trial_chamber/key"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation TRIAL_CHAMBER_CONSUMABLES("spawners/trial_chamber/consumables"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_TRIAL_CHAMBER_KEY("spawners/ominous/trial_chamber/key"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OMINOUS_TRIAL_CHAMBER_CONSUMABLES("spawners/ominous/trial_chamber/consumables"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @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 @@ -942,16 +959,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @@ -0,0 +0,0 @@ public enum PotionType implements Keyed { SLOW_FALLING("slow_falling"), LONG_SLOW_FALLING("long_slow_falling"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WIND_CHARGED("wind_charged"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation WEAVING("weaving"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation OOZING("oozing"), - @MinecraftExperimental + @MinecraftExperimental(Requires.UPDATE_1_21) + @org.jetbrains.annotations.ApiStatus.Experimental // Paper - add missing annotation INFESTED("infested"), ; diff --git a/patches/server/Adventure.patch b/patches/server/Adventure.patch index f7adefefc..aa8520601 100644 --- a/patches/server/Adventure.patch +++ b/patches/server/Adventure.patch @@ -2821,9 +2821,9 @@ diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListener index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -0,0 +0,0 @@ import net.minecraft.nbt.CompoundTag; +@@ -0,0 +0,0 @@ import net.minecraft.core.registries.Registries; + import net.minecraft.nbt.CompoundTag; import net.minecraft.network.Connection; - import net.minecraft.network.ConnectionProtocol; import net.minecraft.network.TickablePacketListener; +import net.minecraft.network.chat.ChatDecorator; import net.minecraft.network.chat.ChatType; @@ -4221,19 +4221,10 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + + private void sendSignChange0(Component[] components, Location loc, DyeColor dyeColor, boolean hasGlowingText) { - SignBlockEntity sign = new SignBlockEntity(CraftLocation.toBlockPosition(loc), Blocks.OAK_SIGN.defaultBlockState()); - sign.setLevel(this.getHandle().level()); - SignText text = sign.getFrontText(); -@@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - } - sign.setText(text, true); - -- this.getHandle().connection.send(sign.getUpdatePacket()); -+ getHandle().connection.send(sign.getUpdatePacket()); + // Paper end - } - - @Override + SignBlockEntity sign = new SignBlockEntity(CraftLocation.toBlockPosition(loc), Blocks.OAK_SIGN.defaultBlockState()); + SignText text = sign.getFrontText(); + text = text.setColor(net.minecraft.world.item.DyeColor.byId(dyeColor.getWoolData())); @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { @Override diff --git a/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch index 146931d50..8d5850693 100644 --- a/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/patches/server/Expand-World.spawnParticle-API-and-add-Builder.patch @@ -47,13 +47,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + @Override + public void spawnParticle(Particle particle, List receivers, Player sender, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) { + // Paper end - Particle API - data = CraftParticle.convertLegacy(data); - if (data != null) { - Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType()); - } ++ data = CraftParticle.convertLegacy(data); ++ if (data != null) { ++ Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType()); ++ } this.getHandle().sendParticles( - null, // Sender -+ receivers == null ? getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper - Particle API ++ receivers == null ? this.getHandle().players() : receivers.stream().map(player -> ((CraftPlayer) player).getHandle()).collect(java.util.stream.Collectors.toList()), // Paper - Particle API + sender != null ? ((CraftPlayer) sender).getHandle() : null, // Sender // Paper - Particle API CraftParticle.createParticleParam(particle, data), // Particle x, y, z, // Position diff --git a/patches/server/Expose-client-protocol-version-and-virtual-host.patch b/patches/server/Expose-client-protocol-version-and-virtual-host.patch index 05936ea47..cb10e68ef 100644 --- a/patches/server/Expose-client-protocol-version-and-virtual-host.patch +++ b/patches/server/Expose-client-protocol-version-and-virtual-host.patch @@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - this.getHandle().transferCookieConnection.send(new ClientboundTransferPacket(host, port)); + this.getHandle().transferCookieConnection.sendPacket(new ClientboundTransferPacket(host, port)); } + // Paper start - Implement NetworkClient diff --git a/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch b/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch index 144d9dba8..1ec96e1ca 100644 --- a/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch +++ b/patches/server/Fix-Player-spawnParticle-x-y-z-precision-loss.patch @@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - if (data != null) { - Preconditions.checkArgument(particle.getDataType().isInstance(data), "data (%s) should be %s", data.getClass(), particle.getDataType()); - } + + @Override + public void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data) { - ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), true, (float) x, (float) y, (float) z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); -+ ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), true, x, y, z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); // Paper - Fix x/y/z coordinate precision loss ++ ClientboundLevelParticlesPacket packetplayoutworldparticles = new ClientboundLevelParticlesPacket(CraftParticle.createParticleParam(particle, data), true, x, y, z, (float) offsetX, (float) offsetY, (float) offsetZ, (float) extra, count); // Paper - fix x/y/z precision loss this.getHandle().connection.send(packetplayoutworldparticles); } diff --git a/patches/server/Hook-into-CB-plugin-rewrites.patch b/patches/server/Hook-into-CB-plugin-rewrites.patch index be7eade97..93e52f0c9 100644 --- a/patches/server/Hook-into-CB-plugin-rewrites.patch +++ b/patches/server/Hook-into-CB-plugin-rewrites.patch @@ -28,8 +28,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 import joptsimple.OptionSet; import joptsimple.OptionSpec; @@ -0,0 +0,0 @@ public class Commodore { - "org/spigotmc/event/entity/EntityDismountEvent", "org/bukkit/event/entity/EntityDismountEvent" - ); + public static final List> REROUTES = new ArrayList<>(); // Only used for testing + private static final Map FIELD_RENAME_METHOD_REROUTE = Commodore.createReroutes(FieldRename.class); + // Paper start - Plugin rewrites + private static final Map SEARCH_AND_REMOVE = initReplacementsMap(); @@ -65,9 +65,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end - Plugin rewrites + - private static final Map FIELD_RENAME_METHOD_REROUTE = RerouteBuilder.buildFromClass(FieldRename.class); - public static void main(String[] args) { + OptionParser parser = new OptionParser(); + OptionSpec inputFlag = parser.acceptsAll(Arrays.asList("i", "input")).withRequiredArg().ofType(File.class).required(); @@ -0,0 +0,0 @@ public class Commodore { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { diff --git a/patches/server/Implement-Mob-Goal-API.patch b/patches/server/Implement-Mob-Goal-API.patch index 9e48781de..475bb942a 100644 --- a/patches/server/Implement-Mob-Goal-API.patch +++ b/patches/server/Implement-Mob-Goal-API.patch @@ -13,7 +13,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test - testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") testImplementation("org.hamcrest:hamcrest:2.2") testImplementation("org.mockito:mockito-core:5.11.0") diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java diff --git a/patches/server/Optimize-Hoppers.patch b/patches/server/Optimize-Hoppers.patch index ead8a9181..9a91c7ed7 100644 --- a/patches/server/Optimize-Hoppers.patch +++ b/patches/server/Optimize-Hoppers.patch @@ -388,7 +388,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - destinationInventory = new CraftInventory(iinventory); - } - -- InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack, destinationInventory, true); +- InventoryMoveItemEvent event = new InventoryMoveItemEvent(blockEntity.getOwner().getInventory(), oitemstack, destinationInventory, true); - world.getCraftServer().getPluginManager().callEvent(event); - if (event.isCancelled()) { - blockEntity.setItem(i, itemstack); @@ -431,7 +431,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + // destinationInventory = new CraftInventory(iinventory); + // } + -+ // InventoryMoveItemEvent event = new InventoryMoveItemEvent(iinventory.getOwner().getInventory(), oitemstack, destinationInventory, true); ++ // InventoryMoveItemEvent event = new InventoryMoveItemEvent(tileentityhopper.getOwner().getInventory(), oitemstack, destinationInventory, true); + // world.getCraftServer().getPluginManager().callEvent(event); + // if (event.isCancelled()) { + // blockEntity.setItem(i, itemstack); diff --git a/patches/server/Remap-reflection-calls-in-plugins-using-internals.patch b/patches/server/Remap-reflection-calls-in-plugins-using-internals.patch index dba2a1b6f..e76791281 100644 --- a/patches/server/Remap-reflection-calls-in-plugins-using-internals.patch +++ b/patches/server/Remap-reflection-calls-in-plugins-using-internals.patch @@ -662,7 +662,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java @@ -0,0 +0,0 @@ public class Commodore { - ); + private static final Map FIELD_RENAME_METHOD_REROUTE = Commodore.createReroutes(FieldRename.class); // Paper start - Plugin rewrites - private static final Map SEARCH_AND_REMOVE = initReplacementsMap(); diff --git a/patches/server/Sanitize-sent-BlockEntity-NBT.patch b/patches/server/Sanitize-sent-BlockEntity-NBT.patch index 6ad7ed40f..8c12d1712 100644 --- a/patches/server/Sanitize-sent-BlockEntity-NBT.patch +++ b/patches/server/Sanitize-sent-BlockEntity-NBT.patch @@ -9,11 +9,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java +++ b/src/main/java/net/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket.java @@ -0,0 +0,0 @@ public class ClientboundBlockEntityDataPacket implements Packet nbtGetter) { - RegistryAccess registryAccess = blockEntity.getLevel().registryAccess(); -- return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), nbtGetter.apply(blockEntity, registryAccess)); -+ return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity, registryAccess))); // Paper - Sanitize sent data + RegistryAccess iregistrycustom = blockEntity.getLevel().registryAccess(); + +- return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), (CompoundTag) nbtGetter.apply(blockEntity, iregistrycustom)); ++ return new ClientboundBlockEntityDataPacket(blockEntity.getBlockPos(), blockEntity.getType(), (CompoundTag) blockEntity.sanitizeSentNbt(nbtGetter.apply(blockEntity, iregistrycustom))); // Paper - Sanitize sent data } public static ClientboundBlockEntityDataPacket create(BlockEntity blockEntity) { diff --git a/patches/server/Setup-Gradle-project.patch b/patches/server/Setup-Gradle-project.patch index c8a39c1fd..a296f4060 100644 --- a/patches/server/Setup-Gradle-project.patch +++ b/patches/server/Setup-Gradle-project.patch @@ -55,7 +55,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18") + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + -+ testImplementation("org.junit.jupiter:junit-jupiter:5.10.0") ++ testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testImplementation("org.hamcrest:hamcrest:2.2") + testImplementation("org.mockito:mockito-core:5.11.0") + testImplementation("org.ow2.asm:asm-tree:9.7") @@ -435,14 +435,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.jetbrains - annotations-java5 -- 24.0.1 +- 24.1.0 - provided - - - - org.junit.jupiter - junit-jupiter -- 5.10.0 +- 5.10.2 - test - - @@ -515,7 +515,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-jar-plugin -- 3.3.0 +- 3.4.1 - - - @@ -557,7 +557,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-shade-plugin -- 3.5.0 +- 3.5.3 - - - package @@ -588,7 +588,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - net.md-5 - specialsource-maven-plugin -- 2.0.2 +- 2.0.3 - - - package @@ -634,7 +634,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-assembly-plugin -- 3.6.0 +- 3.7.1 - - - package @@ -663,23 +663,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - maven-compiler-plugin - 3.13.0 - -- -- eclipse - - false - -- -- -- org.codehaus.plexus -- plexus-compiler-eclipse -- 2.15.0 -- -- - - - org.apache.maven.plugins - maven-surefire-plugin -- 3.1.0 +- 3.2.5 - - ${basedir}/target/test-server - @@ -708,7 +699,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 - - org.apache.maven.plugins - maven-checkstyle-plugin -- 3.3.0 +- 3.3.1 - - - test-compile diff --git a/work/Bukkit b/work/Bukkit index 9ea9bb32f..69fa46950 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 9ea9bb32fe341b8308f6071bcc5f31c1e73a9d26 +Subproject commit 69fa46950cc65264d4e4db9f22e58d5f57e47f46 diff --git a/work/CraftBukkit b/work/CraftBukkit index 062d2bb13..90f1059ba 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 062d2bb13b341b2bcc9a504677b2196c6f68ecb3 +Subproject commit 90f1059bae911966b5629b3ec1ff242d109fde7f