From 1cecc24cadd1ebae6299c8113d3378aaa93704c7 Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Sun, 11 Aug 2024 00:11:57 +0200 Subject: Fix tag key generator output inconsistencies (#11218) * Fix tag key generator output inconsistencies * use NonNull instead of NotNull for generated api --------- Co-authored-by: Jake Potrebic --- .../destroystokyo/paper/entity/ai/VanillaGoal.java | 6 +- .../io/papermc/paper/registry/keys/BiomeKeys.java | 6 +- .../paper/registry/keys/DamageTypeKeys.java | 6 +- .../paper/registry/keys/EnchantmentKeys.java | 4 +- .../papermc/paper/registry/keys/GameEventKeys.java | 4 +- .../paper/registry/keys/InstrumentKeys.java | 4 +- .../papermc/paper/registry/keys/ItemTypeKeys.java | 4 +- .../papermc/paper/registry/keys/MobEffectKeys.java | 4 +- .../papermc/paper/registry/keys/StructureKeys.java | 6 +- .../paper/registry/keys/StructureTypeKeys.java | 4 +- .../paper/registry/keys/TrimMaterialKeys.java | 6 +- .../paper/registry/keys/TrimPatternKeys.java | 6 +- .../paper/registry/keys/WolfVariantKeys.java | 6 +- .../registry/keys/tags/EnchantmentTagKeys.java | 174 +++--- .../paper/registry/keys/tags/ItemTypeTagKeys.java | 590 ++++++++++----------- .../papermc/generator/types/GeneratedKeyType.java | 10 +- .../generator/types/GeneratedTagKeyType.java | 22 +- .../generator/types/goal/MobGoalGenerator.java | 3 +- .../io/papermc/generator/utils/Annotations.java | 10 +- .../papermc/generator/utils/CollectingContext.java | 1 - .../io/papermc/generator/utils/TagCollector.java | 8 +- .../1021-Add-registry-entry-and-builders.patch | 4 +- 22 files changed, 434 insertions(+), 454 deletions(-) diff --git a/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java index 8f929d636f..02411466bd 100644 --- a/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java +++ b/paper-api-generator/generated/com/destroystokyo/paper/entity/ai/VanillaGoal.java @@ -51,7 +51,7 @@ import org.bukkit.entity.WanderingTrader; import org.bukkit.entity.Wither; import org.bukkit.entity.Wolf; import org.bukkit.entity.Zombie; -import org.jetbrains.annotations.NotNull; +import org.checkerframework.checker.nullness.qual.NonNull; /** * Vanilla keys for Mob Goals. @@ -436,8 +436,8 @@ public interface VanillaGoal extends Goal { GoalKey ZOMBIE_ATTACK_TURTLE_EGG = create("zombie_attack_turtle_egg", Zombie.class); - private static @NotNull GoalKey create(final @NotNull String key, - final @NotNull Class type) { + private static @NonNull GoalKey create(final @NonNull String key, + final @NonNull Class type) { return GoalKey.of(type, NamespacedKey.minecraft(key)); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java index 70d27cf7b6..f0c6abf8bf 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/BiomeKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.block.Biome; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#BIOME}. @@ -478,13 +478,13 @@ public final class BiomeKeys { } /** - * Creates a key for {@link Biome} in a registry. + * Creates a key for {@link Biome} in the registry {@code minecraft:worldgen/biome}. * * @param key the value's key in the registry * @return a new typed key */ @ApiStatus.Experimental - public static @NotNull TypedKey create(final @NotNull Key key) { + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.BIOME, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java index b258a4422f..9cb651fb14 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/DamageTypeKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.damage.DamageType; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#DAMAGE_TYPE}. @@ -359,13 +359,13 @@ public final class DamageTypeKeys { } /** - * Creates a key for {@link DamageType} in a registry. + * Creates a key for {@link DamageType} in the registry {@code minecraft:damage_type}. * * @param key the value's key in the registry * @return a new typed key */ @ApiStatus.Experimental - public static @NotNull TypedKey create(final @NotNull Key key) { + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.DAMAGE_TYPE, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java index dd15885acd..8a7b691af6 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/EnchantmentKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.enchantments.Enchantment; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#ENCHANTMENT}. @@ -323,7 +323,7 @@ public final class EnchantmentKeys { private EnchantmentKeys() { } - private static @NotNull TypedKey create(final @NotNull Key key) { + private static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.ENCHANTMENT, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java index 18649e5336..e8a8e5f89a 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/GameEventKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.GameEvent; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#GAME_EVENT}. @@ -449,7 +449,7 @@ public final class GameEventKeys { private GameEventKeys() { } - private static @NotNull TypedKey create(final @NotNull Key key) { + private static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.GAME_EVENT, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java index 79bc6c061e..4d59a6b6e1 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/InstrumentKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.MusicInstrument; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#INSTRUMENT}. @@ -85,7 +85,7 @@ public final class InstrumentKeys { private InstrumentKeys() { } - private static @NotNull TypedKey create(final @NotNull Key key) { + private static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.INSTRUMENT, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java index 5532156b2b..052d129630 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/ItemTypeKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.inventory.ItemType; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#ITEM}. @@ -9360,7 +9360,7 @@ public final class ItemTypeKeys { private ItemTypeKeys() { } - private static @NotNull TypedKey create(final @NotNull Key key) { + private static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.ITEM, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java index 10e0a8ce2e..621705fe8a 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/MobEffectKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.potion.PotionEffectType; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#MOB_EFFECT}. @@ -302,7 +302,7 @@ public final class MobEffectKeys { private MobEffectKeys() { } - private static @NotNull TypedKey create(final @NotNull Key key) { + private static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.MOB_EFFECT, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java index e53a14ca3d..a49c8cff2e 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.generator.structure.Structure; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#STRUCTURE}. @@ -268,13 +268,13 @@ public final class StructureKeys { } /** - * Creates a key for {@link Structure} in a registry. + * Creates a key for {@link Structure} in the registry {@code minecraft:worldgen/structure}. * * @param key the value's key in the registry * @return a new typed key */ @ApiStatus.Experimental - public static @NotNull TypedKey create(final @NotNull Key key) { + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.STRUCTURE, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java index 06d5fa4d56..353c0fa302 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/StructureTypeKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.generator.structure.StructureType; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#STRUCTURE_TYPE}. @@ -141,7 +141,7 @@ public final class StructureTypeKeys { private StructureTypeKeys() { } - private static @NotNull TypedKey create(final @NotNull Key key) { + private static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.STRUCTURE_TYPE, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java index c02ea8a98b..e75f850a31 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimMaterialKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.inventory.meta.trim.TrimMaterial; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#TRIM_MATERIAL}. @@ -100,13 +100,13 @@ public final class TrimMaterialKeys { } /** - * Creates a key for {@link TrimMaterial} in a registry. + * Creates a key for {@link TrimMaterial} in the registry {@code minecraft:trim_material}. * * @param key the value's key in the registry * @return a new typed key */ @ApiStatus.Experimental - public static @NotNull TypedKey create(final @NotNull Key key) { + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.TRIM_MATERIAL, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java index e32d647ebd..65d2d63e85 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/TrimPatternKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.inventory.meta.trim.TrimPattern; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#TRIM_PATTERN}. @@ -156,13 +156,13 @@ public final class TrimPatternKeys { } /** - * Creates a key for {@link TrimPattern} in a registry. + * Creates a key for {@link TrimPattern} in the registry {@code minecraft:trim_pattern}. * * @param key the value's key in the registry * @return a new typed key */ @ApiStatus.Experimental - public static @NotNull TypedKey create(final @NotNull Key key) { + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.TRIM_PATTERN, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java index ba84940943..7108d41c8d 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/WolfVariantKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.TypedKey; import net.kyori.adventure.key.Key; import org.bukkit.entity.Wolf; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#WOLF_VARIANT}. @@ -93,13 +93,13 @@ public final class WolfVariantKeys { } /** - * Creates a key for {@link Wolf.Variant} in a registry. + * Creates a key for {@link Wolf.Variant} in the registry {@code minecraft:wolf_variant}. * * @param key the value's key in the registry * @return a new typed key */ @ApiStatus.Experimental - public static @NotNull TypedKey create(final @NotNull Key key) { + public static @NonNull TypedKey create(final @NonNull Key key) { return TypedKey.create(RegistryKey.WOLF_VARIANT, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java index 085263e66b..5d2a22742f 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/EnchantmentTagKeys.java @@ -8,8 +8,8 @@ import io.papermc.paper.registry.tag.TagKey; import net.kyori.adventure.key.Key; import org.bukkit.MinecraftExperimental; import org.bukkit.enchantments.Enchantment; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#ENCHANTMENT}. @@ -28,87 +28,81 @@ import org.jetbrains.annotations.NotNull; @ApiStatus.Experimental public final class EnchantmentTagKeys { /** - * {@code #minecraft:trades/savanna_special} + * {@code #minecraft:curse} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_SAVANNA_SPECIAL = create(key("trades/savanna_special")); + public static final TagKey CURSE = create(key("curse")); /** - * {@code #minecraft:smelts_loot} + * {@code #minecraft:double_trade_price} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SMELTS_LOOT = create(key("smelts_loot")); + public static final TagKey DOUBLE_TRADE_PRICE = create(key("double_trade_price")); /** - * {@code #minecraft:exclusive_set/crossbow} + * {@code #minecraft:exclusive_set/armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_CROSSBOW = create(key("exclusive_set/crossbow")); + public static final TagKey EXCLUSIVE_SET_ARMOR = create(key("exclusive_set/armor")); /** - * {@code #minecraft:tradeable} + * {@code #minecraft:exclusive_set/boots} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TRADEABLE = create(key("tradeable")); + public static final TagKey EXCLUSIVE_SET_BOOTS = create(key("exclusive_set/boots")); /** - * {@code #minecraft:exclusive_set/damage} + * {@code #minecraft:exclusive_set/bow} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_DAMAGE = create(key("exclusive_set/damage")); + public static final TagKey EXCLUSIVE_SET_BOW = create(key("exclusive_set/bow")); /** - * {@code #minecraft:prevents_bee_spawns_when_mining} + * {@code #minecraft:exclusive_set/crossbow} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PREVENTS_BEE_SPAWNS_WHEN_MINING = create(key("prevents_bee_spawns_when_mining")); + public static final TagKey EXCLUSIVE_SET_CROSSBOW = create(key("exclusive_set/crossbow")); /** - * {@code #minecraft:in_enchanting_table} + * {@code #minecraft:exclusive_set/damage} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey IN_ENCHANTING_TABLE = create(key("in_enchanting_table")); + public static final TagKey EXCLUSIVE_SET_DAMAGE = create(key("exclusive_set/damage")); /** - * {@code #minecraft:treasure} + * {@code #minecraft:exclusive_set/mining} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TREASURE = create(key("treasure")); + public static final TagKey EXCLUSIVE_SET_MINING = create(key("exclusive_set/mining")); /** - * {@code #minecraft:exclusive_set/mining} + * {@code #minecraft:exclusive_set/riptide} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_MINING = create(key("exclusive_set/mining")); + public static final TagKey EXCLUSIVE_SET_RIPTIDE = create(key("exclusive_set/riptide")); /** - * {@code #minecraft:trades/taiga_special} + * {@code #minecraft:in_enchanting_table} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_TAIGA_SPECIAL = create(key("trades/taiga_special")); + public static final TagKey IN_ENCHANTING_TABLE = create(key("in_enchanting_table")); /** - * {@code #minecraft:trades/plains_common} + * {@code #minecraft:non_treasure} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_PLAINS_COMMON = create(key("trades/plains_common")); + public static final TagKey NON_TREASURE = create(key("non_treasure")); /** * {@code #minecraft:on_mob_spawn_equipment} @@ -118,139 +112,139 @@ public final class EnchantmentTagKeys { public static final TagKey ON_MOB_SPAWN_EQUIPMENT = create(key("on_mob_spawn_equipment")); /** - * {@code #minecraft:exclusive_set/armor} + * {@code #minecraft:on_random_loot} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_ARMOR = create(key("exclusive_set/armor")); + public static final TagKey ON_RANDOM_LOOT = create(key("on_random_loot")); /** - * {@code #minecraft:non_treasure} + * {@code #minecraft:on_traded_equipment} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey NON_TREASURE = create(key("non_treasure")); + public static final TagKey ON_TRADED_EQUIPMENT = create(key("on_traded_equipment")); /** - * {@code #minecraft:trades/snow_special} + * {@code #minecraft:prevents_bee_spawns_when_mining} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_SNOW_SPECIAL = create(key("trades/snow_special")); + public static final TagKey PREVENTS_BEE_SPAWNS_WHEN_MINING = create(key("prevents_bee_spawns_when_mining")); /** - * {@code #minecraft:trades/plains_special} + * {@code #minecraft:prevents_decorated_pot_shattering} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_PLAINS_SPECIAL = create(key("trades/plains_special")); + public static final TagKey PREVENTS_DECORATED_POT_SHATTERING = create(key("prevents_decorated_pot_shattering")); /** - * {@code #minecraft:trades/jungle_common} + * {@code #minecraft:prevents_ice_melting} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_JUNGLE_COMMON = create(key("trades/jungle_common")); + public static final TagKey PREVENTS_ICE_MELTING = create(key("prevents_ice_melting")); /** - * {@code #minecraft:trades/jungle_special} + * {@code #minecraft:prevents_infested_spawns} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_JUNGLE_SPECIAL = create(key("trades/jungle_special")); + public static final TagKey PREVENTS_INFESTED_SPAWNS = create(key("prevents_infested_spawns")); /** - * {@code #minecraft:trades/savanna_common} + * {@code #minecraft:smelts_loot} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - @ApiStatus.Experimental - @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_SAVANNA_COMMON = create(key("trades/savanna_common")); + public static final TagKey SMELTS_LOOT = create(key("smelts_loot")); /** - * {@code #minecraft:curse} + * {@code #minecraft:tooltip_order} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CURSE = create(key("curse")); + public static final TagKey TOOLTIP_ORDER = create(key("tooltip_order")); /** - * {@code #minecraft:prevents_infested_spawns} + * {@code #minecraft:tradeable} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PREVENTS_INFESTED_SPAWNS = create(key("prevents_infested_spawns")); + public static final TagKey TRADEABLE = create(key("tradeable")); /** - * {@code #minecraft:exclusive_set/bow} + * {@code #minecraft:trades/desert_common} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_BOW = create(key("exclusive_set/bow")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_DESERT_COMMON = create(key("trades/desert_common")); /** - * {@code #minecraft:on_random_loot} + * {@code #minecraft:trades/desert_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ON_RANDOM_LOOT = create(key("on_random_loot")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_DESERT_SPECIAL = create(key("trades/desert_special")); /** - * {@code #minecraft:exclusive_set/boots} + * {@code #minecraft:trades/jungle_common} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_BOOTS = create(key("exclusive_set/boots")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_JUNGLE_COMMON = create(key("trades/jungle_common")); /** - * {@code #minecraft:trades/taiga_common} + * {@code #minecraft:trades/jungle_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ @ApiStatus.Experimental @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_TAIGA_COMMON = create(key("trades/taiga_common")); + public static final TagKey TRADES_JUNGLE_SPECIAL = create(key("trades/jungle_special")); /** - * {@code #minecraft:trades/desert_special} + * {@code #minecraft:trades/plains_common} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ @ApiStatus.Experimental @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_DESERT_SPECIAL = create(key("trades/desert_special")); + public static final TagKey TRADES_PLAINS_COMMON = create(key("trades/plains_common")); /** - * {@code #minecraft:exclusive_set/riptide} + * {@code #minecraft:trades/plains_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EXCLUSIVE_SET_RIPTIDE = create(key("exclusive_set/riptide")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_PLAINS_SPECIAL = create(key("trades/plains_special")); /** - * {@code #minecraft:trades/swamp_special} + * {@code #minecraft:trades/savanna_common} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ @ApiStatus.Experimental @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_SWAMP_SPECIAL = create(key("trades/swamp_special")); + public static final TagKey TRADES_SAVANNA_COMMON = create(key("trades/savanna_common")); /** - * {@code #minecraft:prevents_ice_melting} + * {@code #minecraft:trades/savanna_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PREVENTS_ICE_MELTING = create(key("prevents_ice_melting")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_SAVANNA_SPECIAL = create(key("trades/savanna_special")); /** * {@code #minecraft:trades/snow_common} @@ -262,62 +256,68 @@ public final class EnchantmentTagKeys { public static final TagKey TRADES_SNOW_COMMON = create(key("trades/snow_common")); /** - * {@code #minecraft:on_traded_equipment} + * {@code #minecraft:trades/snow_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ON_TRADED_EQUIPMENT = create(key("on_traded_equipment")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_SNOW_SPECIAL = create(key("trades/snow_special")); /** - * {@code #minecraft:double_trade_price} + * {@code #minecraft:trades/swamp_common} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DOUBLE_TRADE_PRICE = create(key("double_trade_price")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_SWAMP_COMMON = create(key("trades/swamp_common")); /** - * {@code #minecraft:trades/swamp_common} + * {@code #minecraft:trades/swamp_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ @ApiStatus.Experimental @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_SWAMP_COMMON = create(key("trades/swamp_common")); + public static final TagKey TRADES_SWAMP_SPECIAL = create(key("trades/swamp_special")); /** - * {@code #minecraft:trades/desert_common} + * {@code #minecraft:trades/taiga_common} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ @ApiStatus.Experimental @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) - public static final TagKey TRADES_DESERT_COMMON = create(key("trades/desert_common")); + public static final TagKey TRADES_TAIGA_COMMON = create(key("trades/taiga_common")); /** - * {@code #minecraft:prevents_decorated_pot_shattering} + * {@code #minecraft:trades/taiga_special} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PREVENTS_DECORATED_POT_SHATTERING = create(key("prevents_decorated_pot_shattering")); + @ApiStatus.Experimental + @MinecraftExperimental(MinecraftExperimental.Requires.TRADE_REBALANCE) + public static final TagKey TRADES_TAIGA_SPECIAL = create(key("trades/taiga_special")); /** - * {@code #minecraft:tooltip_order} + * {@code #minecraft:treasure} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TOOLTIP_ORDER = create(key("tooltip_order")); + public static final TagKey TREASURE = create(key("treasure")); private EnchantmentTagKeys() { } /** - * Creates a tag key for {@link Enchantment} in the registry {@code minecraft:root}. + * Creates a tag key for {@link Enchantment} in the registry {@code minecraft:enchantment}. * * @param key the tag key's key * @return a new tag key */ @ApiStatus.Experimental - public static @NotNull TagKey create(final @NotNull Key key) { + public static @NonNull TagKey create(final @NonNull Key key) { return TagKey.create(RegistryKey.ENCHANTMENT, key); } } diff --git a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java b/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java index 98441a5943..b0a153f670 100644 --- a/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java +++ b/paper-api-generator/generated/io/papermc/paper/registry/keys/tags/ItemTypeTagKeys.java @@ -7,8 +7,8 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.tag.TagKey; import net.kyori.adventure.key.Key; import org.bukkit.inventory.ItemType; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; /** * Vanilla keys for {@link RegistryKey#ITEM}. @@ -27,690 +27,690 @@ import org.jetbrains.annotations.NotNull; @ApiStatus.Experimental public final class ItemTypeTagKeys { /** - * {@code #minecraft:wooden_pressure_plates} + * {@code #minecraft:acacia_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_PRESSURE_PLATES = create(key("wooden_pressure_plates")); + public static final TagKey ACACIA_LOGS = create(key("acacia_logs")); /** - * {@code #minecraft:bookshelf_books} + * {@code #minecraft:anvil} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BOOKSHELF_BOOKS = create(key("bookshelf_books")); + public static final TagKey ANVIL = create(key("anvil")); /** - * {@code #minecraft:anvil} + * {@code #minecraft:armadillo_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ANVIL = create(key("anvil")); + public static final TagKey ARMADILLO_FOOD = create(key("armadillo_food")); /** - * {@code #minecraft:wooden_buttons} + * {@code #minecraft:arrows} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_BUTTONS = create(key("wooden_buttons")); + public static final TagKey ARROWS = create(key("arrows")); /** - * {@code #minecraft:iron_ores} + * {@code #minecraft:axes} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey IRON_ORES = create(key("iron_ores")); + public static final TagKey AXES = create(key("axes")); /** - * {@code #minecraft:lapis_ores} + * {@code #minecraft:axolotl_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LAPIS_ORES = create(key("lapis_ores")); + public static final TagKey AXOLOTL_FOOD = create(key("axolotl_food")); /** - * {@code #minecraft:sand} + * {@code #minecraft:bamboo_blocks} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SAND = create(key("sand")); + public static final TagKey BAMBOO_BLOCKS = create(key("bamboo_blocks")); /** - * {@code #minecraft:rabbit_food} + * {@code #minecraft:banners} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey RABBIT_FOOD = create(key("rabbit_food")); + public static final TagKey BANNERS = create(key("banners")); /** - * {@code #minecraft:saplings} + * {@code #minecraft:beacon_payment_items} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SAPLINGS = create(key("saplings")); + public static final TagKey BEACON_PAYMENT_ITEMS = create(key("beacon_payment_items")); /** - * {@code #minecraft:leg_armor} + * {@code #minecraft:beds} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LEG_ARMOR = create(key("leg_armor")); + public static final TagKey BEDS = create(key("beds")); /** - * {@code #minecraft:cow_food} + * {@code #minecraft:bee_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey COW_FOOD = create(key("cow_food")); + public static final TagKey BEE_FOOD = create(key("bee_food")); /** - * {@code #minecraft:enchantable/weapon} + * {@code #minecraft:birch_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_WEAPON = create(key("enchantable/weapon")); + public static final TagKey BIRCH_LOGS = create(key("birch_logs")); /** - * {@code #minecraft:strider_food} + * {@code #minecraft:boats} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STRIDER_FOOD = create(key("strider_food")); + public static final TagKey BOATS = create(key("boats")); /** - * {@code #minecraft:banners} + * {@code #minecraft:bookshelf_books} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BANNERS = create(key("banners")); + public static final TagKey BOOKSHELF_BOOKS = create(key("bookshelf_books")); /** - * {@code #minecraft:fishes} + * {@code #minecraft:breaks_decorated_pots} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FISHES = create(key("fishes")); + public static final TagKey BREAKS_DECORATED_POTS = create(key("breaks_decorated_pots")); /** - * {@code #minecraft:strider_tempt_items} + * {@code #minecraft:buttons} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STRIDER_TEMPT_ITEMS = create(key("strider_tempt_items")); + public static final TagKey BUTTONS = create(key("buttons")); /** - * {@code #minecraft:enchantable/trident} + * {@code #minecraft:camel_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_TRIDENT = create(key("enchantable/trident")); + public static final TagKey CAMEL_FOOD = create(key("camel_food")); /** - * {@code #minecraft:bee_food} + * {@code #minecraft:candles} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BEE_FOOD = create(key("bee_food")); + public static final TagKey CANDLES = create(key("candles")); /** - * {@code #minecraft:decorated_pot_sherds} + * {@code #minecraft:cat_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DECORATED_POT_SHERDS = create(key("decorated_pot_sherds")); + public static final TagKey CAT_FOOD = create(key("cat_food")); /** - * {@code #minecraft:wool_carpets} + * {@code #minecraft:cherry_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOOL_CARPETS = create(key("wool_carpets")); + public static final TagKey CHERRY_LOGS = create(key("cherry_logs")); /** - * {@code #minecraft:acacia_logs} + * {@code #minecraft:chest_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ACACIA_LOGS = create(key("acacia_logs")); + public static final TagKey CHEST_ARMOR = create(key("chest_armor")); /** - * {@code #minecraft:wart_blocks} + * {@code #minecraft:chest_boats} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WART_BLOCKS = create(key("wart_blocks")); + public static final TagKey CHEST_BOATS = create(key("chest_boats")); /** - * {@code #minecraft:stairs} + * {@code #minecraft:chicken_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STAIRS = create(key("stairs")); + public static final TagKey CHICKEN_FOOD = create(key("chicken_food")); /** - * {@code #minecraft:breaks_decorated_pots} + * {@code #minecraft:cluster_max_harvestables} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BREAKS_DECORATED_POTS = create(key("breaks_decorated_pots")); + public static final TagKey CLUSTER_MAX_HARVESTABLES = create(key("cluster_max_harvestables")); /** - * {@code #minecraft:wool} + * {@code #minecraft:coal_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOOL = create(key("wool")); + public static final TagKey COAL_ORES = create(key("coal_ores")); /** - * {@code #minecraft:crimson_stems} + * {@code #minecraft:coals} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CRIMSON_STEMS = create(key("crimson_stems")); + public static final TagKey COALS = create(key("coals")); /** - * {@code #minecraft:enchantable/durability} + * {@code #minecraft:compasses} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_DURABILITY = create(key("enchantable/durability")); + public static final TagKey COMPASSES = create(key("compasses")); /** - * {@code #minecraft:boats} + * {@code #minecraft:completes_find_tree_tutorial} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BOATS = create(key("boats")); + public static final TagKey COMPLETES_FIND_TREE_TUTORIAL = create(key("completes_find_tree_tutorial")); /** - * {@code #minecraft:sniffer_food} + * {@code #minecraft:copper_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SNIFFER_FOOD = create(key("sniffer_food")); + public static final TagKey COPPER_ORES = create(key("copper_ores")); /** - * {@code #minecraft:piglin_food} + * {@code #minecraft:cow_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PIGLIN_FOOD = create(key("piglin_food")); + public static final TagKey COW_FOOD = create(key("cow_food")); /** - * {@code #minecraft:logs} + * {@code #minecraft:creeper_drop_music_discs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LOGS = create(key("logs")); + public static final TagKey CREEPER_DROP_MUSIC_DISCS = create(key("creeper_drop_music_discs")); /** - * {@code #minecraft:pickaxes} + * {@code #minecraft:creeper_igniters} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PICKAXES = create(key("pickaxes")); + public static final TagKey CREEPER_IGNITERS = create(key("creeper_igniters")); /** - * {@code #minecraft:piglin_loved} + * {@code #minecraft:crimson_stems} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PIGLIN_LOVED = create(key("piglin_loved")); + public static final TagKey CRIMSON_STEMS = create(key("crimson_stems")); /** - * {@code #minecraft:fox_food} + * {@code #minecraft:dampens_vibrations} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FOX_FOOD = create(key("fox_food")); + public static final TagKey DAMPENS_VIBRATIONS = create(key("dampens_vibrations")); /** - * {@code #minecraft:wolf_food} + * {@code #minecraft:dark_oak_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOLF_FOOD = create(key("wolf_food")); + public static final TagKey DARK_OAK_LOGS = create(key("dark_oak_logs")); /** - * {@code #minecraft:terracotta} + * {@code #minecraft:decorated_pot_ingredients} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TERRACOTTA = create(key("terracotta")); + public static final TagKey DECORATED_POT_INGREDIENTS = create(key("decorated_pot_ingredients")); /** - * {@code #minecraft:enchantable/bow} + * {@code #minecraft:decorated_pot_sherds} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_BOW = create(key("enchantable/bow")); + public static final TagKey DECORATED_POT_SHERDS = create(key("decorated_pot_sherds")); /** - * {@code #minecraft:lectern_books} + * {@code #minecraft:diamond_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LECTERN_BOOKS = create(key("lectern_books")); + public static final TagKey DIAMOND_ORES = create(key("diamond_ores")); /** - * {@code #minecraft:smelts_to_glass} + * {@code #minecraft:dirt} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SMELTS_TO_GLASS = create(key("smelts_to_glass")); + public static final TagKey DIRT = create(key("dirt")); /** - * {@code #minecraft:copper_ores} + * {@code #minecraft:doors} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey COPPER_ORES = create(key("copper_ores")); + public static final TagKey DOORS = create(key("doors")); /** - * {@code #minecraft:wooden_trapdoors} + * {@code #minecraft:dyeable} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_TRAPDOORS = create(key("wooden_trapdoors")); + public static final TagKey DYEABLE = create(key("dyeable")); /** - * {@code #minecraft:enchantable/armor} + * {@code #minecraft:emerald_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_ARMOR = create(key("enchantable/armor")); + public static final TagKey EMERALD_ORES = create(key("emerald_ores")); /** - * {@code #minecraft:enchantable/sharp_weapon} + * {@code #minecraft:enchantable/armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_SHARP_WEAPON = create(key("enchantable/sharp_weapon")); + public static final TagKey ENCHANTABLE_ARMOR = create(key("enchantable/armor")); /** - * {@code #minecraft:non_flammable_wood} + * {@code #minecraft:enchantable/bow} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey NON_FLAMMABLE_WOOD = create(key("non_flammable_wood")); + public static final TagKey ENCHANTABLE_BOW = create(key("enchantable/bow")); /** - * {@code #minecraft:decorated_pot_ingredients} + * {@code #minecraft:enchantable/chest_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DECORATED_POT_INGREDIENTS = create(key("decorated_pot_ingredients")); + public static final TagKey ENCHANTABLE_CHEST_ARMOR = create(key("enchantable/chest_armor")); /** - * {@code #minecraft:enchantable/sword} + * {@code #minecraft:enchantable/crossbow} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_SWORD = create(key("enchantable/sword")); + public static final TagKey ENCHANTABLE_CROSSBOW = create(key("enchantable/crossbow")); /** - * {@code #minecraft:stone_crafting_materials} + * {@code #minecraft:enchantable/durability} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STONE_CRAFTING_MATERIALS = create(key("stone_crafting_materials")); + public static final TagKey ENCHANTABLE_DURABILITY = create(key("enchantable/durability")); /** - * {@code #minecraft:hanging_signs} + * {@code #minecraft:enchantable/equippable} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey HANGING_SIGNS = create(key("hanging_signs")); + public static final TagKey ENCHANTABLE_EQUIPPABLE = create(key("enchantable/equippable")); /** - * {@code #minecraft:flowers} + * {@code #minecraft:enchantable/fire_aspect} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FLOWERS = create(key("flowers")); + public static final TagKey ENCHANTABLE_FIRE_ASPECT = create(key("enchantable/fire_aspect")); /** - * {@code #minecraft:emerald_ores} + * {@code #minecraft:enchantable/fishing} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey EMERALD_ORES = create(key("emerald_ores")); + public static final TagKey ENCHANTABLE_FISHING = create(key("enchantable/fishing")); /** - * {@code #minecraft:chest_armor} + * {@code #minecraft:enchantable/foot_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CHEST_ARMOR = create(key("chest_armor")); + public static final TagKey ENCHANTABLE_FOOT_ARMOR = create(key("enchantable/foot_armor")); /** - * {@code #minecraft:buttons} + * {@code #minecraft:enchantable/head_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BUTTONS = create(key("buttons")); + public static final TagKey ENCHANTABLE_HEAD_ARMOR = create(key("enchantable/head_armor")); /** - * {@code #minecraft:leaves} + * {@code #minecraft:enchantable/leg_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LEAVES = create(key("leaves")); + public static final TagKey ENCHANTABLE_LEG_ARMOR = create(key("enchantable/leg_armor")); /** - * {@code #minecraft:sheep_food} + * {@code #minecraft:enchantable/mace} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SHEEP_FOOD = create(key("sheep_food")); + public static final TagKey ENCHANTABLE_MACE = create(key("enchantable/mace")); /** - * {@code #minecraft:fence_gates} + * {@code #minecraft:enchantable/mining} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FENCE_GATES = create(key("fence_gates")); + public static final TagKey ENCHANTABLE_MINING = create(key("enchantable/mining")); /** - * {@code #minecraft:horse_food} + * {@code #minecraft:enchantable/mining_loot} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey HORSE_FOOD = create(key("horse_food")); + public static final TagKey ENCHANTABLE_MINING_LOOT = create(key("enchantable/mining_loot")); /** - * {@code #minecraft:enchantable/fishing} + * {@code #minecraft:enchantable/sharp_weapon} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_FISHING = create(key("enchantable/fishing")); + public static final TagKey ENCHANTABLE_SHARP_WEAPON = create(key("enchantable/sharp_weapon")); /** - * {@code #minecraft:piglin_repellents} + * {@code #minecraft:enchantable/sword} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PIGLIN_REPELLENTS = create(key("piglin_repellents")); + public static final TagKey ENCHANTABLE_SWORD = create(key("enchantable/sword")); /** - * {@code #minecraft:goat_food} + * {@code #minecraft:enchantable/trident} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey GOAT_FOOD = create(key("goat_food")); + public static final TagKey ENCHANTABLE_TRIDENT = create(key("enchantable/trident")); /** - * {@code #minecraft:frog_food} + * {@code #minecraft:enchantable/vanishing} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FROG_FOOD = create(key("frog_food")); + public static final TagKey ENCHANTABLE_VANISHING = create(key("enchantable/vanishing")); /** - * {@code #minecraft:axolotl_food} + * {@code #minecraft:enchantable/weapon} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey AXOLOTL_FOOD = create(key("axolotl_food")); + public static final TagKey ENCHANTABLE_WEAPON = create(key("enchantable/weapon")); /** - * {@code #minecraft:warped_stems} + * {@code #minecraft:fence_gates} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WARPED_STEMS = create(key("warped_stems")); + public static final TagKey FENCE_GATES = create(key("fence_gates")); /** - * {@code #minecraft:slabs} + * {@code #minecraft:fences} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SLABS = create(key("slabs")); + public static final TagKey FENCES = create(key("fences")); /** - * {@code #minecraft:walls} + * {@code #minecraft:fishes} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WALLS = create(key("walls")); + public static final TagKey FISHES = create(key("fishes")); /** - * {@code #minecraft:stone_buttons} + * {@code #minecraft:flowers} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STONE_BUTTONS = create(key("stone_buttons")); + public static final TagKey FLOWERS = create(key("flowers")); /** - * {@code #minecraft:axes} + * {@code #minecraft:foot_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey AXES = create(key("axes")); + public static final TagKey FOOT_ARMOR = create(key("foot_armor")); /** - * {@code #minecraft:enchantable/chest_armor} + * {@code #minecraft:fox_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_CHEST_ARMOR = create(key("enchantable/chest_armor")); + public static final TagKey FOX_FOOD = create(key("fox_food")); /** - * {@code #minecraft:coals} + * {@code #minecraft:freeze_immune_wearables} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey COALS = create(key("coals")); + public static final TagKey FREEZE_IMMUNE_WEARABLES = create(key("freeze_immune_wearables")); /** - * {@code #minecraft:noteblock_top_instruments} + * {@code #minecraft:frog_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey NOTEBLOCK_TOP_INSTRUMENTS = create(key("noteblock_top_instruments")); + public static final TagKey FROG_FOOD = create(key("frog_food")); /** - * {@code #minecraft:beacon_payment_items} + * {@code #minecraft:goat_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BEACON_PAYMENT_ITEMS = create(key("beacon_payment_items")); + public static final TagKey GOAT_FOOD = create(key("goat_food")); /** - * {@code #minecraft:signs} + * {@code #minecraft:gold_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SIGNS = create(key("signs")); + public static final TagKey GOLD_ORES = create(key("gold_ores")); /** - * {@code #minecraft:chest_boats} + * {@code #minecraft:hanging_signs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CHEST_BOATS = create(key("chest_boats")); + public static final TagKey HANGING_SIGNS = create(key("hanging_signs")); /** - * {@code #minecraft:completes_find_tree_tutorial} + * {@code #minecraft:head_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey COMPLETES_FIND_TREE_TUTORIAL = create(key("completes_find_tree_tutorial")); + public static final TagKey HEAD_ARMOR = create(key("head_armor")); /** - * {@code #minecraft:foot_armor} + * {@code #minecraft:hoes} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FOOT_ARMOR = create(key("foot_armor")); + public static final TagKey HOES = create(key("hoes")); /** - * {@code #minecraft:wooden_doors} + * {@code #minecraft:hoglin_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_DOORS = create(key("wooden_doors")); + public static final TagKey HOGLIN_FOOD = create(key("hoglin_food")); /** - * {@code #minecraft:small_flowers} + * {@code #minecraft:horse_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SMALL_FLOWERS = create(key("small_flowers")); + public static final TagKey HORSE_FOOD = create(key("horse_food")); /** - * {@code #minecraft:diamond_ores} + * {@code #minecraft:horse_tempt_items} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DIAMOND_ORES = create(key("diamond_ores")); + public static final TagKey HORSE_TEMPT_ITEMS = create(key("horse_tempt_items")); /** - * {@code #minecraft:llama_food} + * {@code #minecraft:ignored_by_piglin_babies} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LLAMA_FOOD = create(key("llama_food")); + public static final TagKey IGNORED_BY_PIGLIN_BABIES = create(key("ignored_by_piglin_babies")); /** - * {@code #minecraft:planks} + * {@code #minecraft:iron_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PLANKS = create(key("planks")); + public static final TagKey IRON_ORES = create(key("iron_ores")); /** - * {@code #minecraft:hoes} + * {@code #minecraft:jungle_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey HOES = create(key("hoes")); + public static final TagKey JUNGLE_LOGS = create(key("jungle_logs")); /** - * {@code #minecraft:oak_logs} + * {@code #minecraft:lapis_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey OAK_LOGS = create(key("oak_logs")); + public static final TagKey LAPIS_ORES = create(key("lapis_ores")); /** - * {@code #minecraft:beds} + * {@code #minecraft:leaves} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BEDS = create(key("beds")); + public static final TagKey LEAVES = create(key("leaves")); /** - * {@code #minecraft:compasses} + * {@code #minecraft:lectern_books} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey COMPASSES = create(key("compasses")); + public static final TagKey LECTERN_BOOKS = create(key("lectern_books")); /** - * {@code #minecraft:enchantable/vanishing} + * {@code #minecraft:leg_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_VANISHING = create(key("enchantable/vanishing")); + public static final TagKey LEG_ARMOR = create(key("leg_armor")); /** - * {@code #minecraft:shovels} + * {@code #minecraft:llama_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SHOVELS = create(key("shovels")); + public static final TagKey LLAMA_FOOD = create(key("llama_food")); /** - * {@code #minecraft:creeper_igniters} + * {@code #minecraft:llama_tempt_items} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CREEPER_IGNITERS = create(key("creeper_igniters")); + public static final TagKey LLAMA_TEMPT_ITEMS = create(key("llama_tempt_items")); /** - * {@code #minecraft:meat} + * {@code #minecraft:logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey MEAT = create(key("meat")); + public static final TagKey LOGS = create(key("logs")); /** - * {@code #minecraft:ignored_by_piglin_babies} + * {@code #minecraft:logs_that_burn} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey IGNORED_BY_PIGLIN_BABIES = create(key("ignored_by_piglin_babies")); + public static final TagKey LOGS_THAT_BURN = create(key("logs_that_burn")); /** - * {@code #minecraft:coal_ores} + * {@code #minecraft:mangrove_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey COAL_ORES = create(key("coal_ores")); + public static final TagKey MANGROVE_LOGS = create(key("mangrove_logs")); /** - * {@code #minecraft:enchantable/foot_armor} + * {@code #minecraft:meat} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_FOOT_ARMOR = create(key("enchantable/foot_armor")); + public static final TagKey MEAT = create(key("meat")); /** - * {@code #minecraft:skulls} + * {@code #minecraft:non_flammable_wood} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SKULLS = create(key("skulls")); + public static final TagKey NON_FLAMMABLE_WOOD = create(key("non_flammable_wood")); /** - * {@code #minecraft:trimmable_armor} + * {@code #minecraft:noteblock_top_instruments} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TRIMMABLE_ARMOR = create(key("trimmable_armor")); + public static final TagKey NOTEBLOCK_TOP_INSTRUMENTS = create(key("noteblock_top_instruments")); /** - * {@code #minecraft:panda_food} + * {@code #minecraft:oak_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PANDA_FOOD = create(key("panda_food")); + public static final TagKey OAK_LOGS = create(key("oak_logs")); /** - * {@code #minecraft:dark_oak_logs} + * {@code #minecraft:ocelot_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DARK_OAK_LOGS = create(key("dark_oak_logs")); + public static final TagKey OCELOT_FOOD = create(key("ocelot_food")); /** - * {@code #minecraft:enchantable/mining} + * {@code #minecraft:panda_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_MINING = create(key("enchantable/mining")); + public static final TagKey PANDA_FOOD = create(key("panda_food")); /** - * {@code #minecraft:dampens_vibrations} + * {@code #minecraft:parrot_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DAMPENS_VIBRATIONS = create(key("dampens_vibrations")); + public static final TagKey PARROT_FOOD = create(key("parrot_food")); /** - * {@code #minecraft:fences} + * {@code #minecraft:parrot_poisonous_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FENCES = create(key("fences")); + public static final TagKey PARROT_POISONOUS_FOOD = create(key("parrot_poisonous_food")); /** - * {@code #minecraft:redstone_ores} + * {@code #minecraft:pickaxes} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey REDSTONE_ORES = create(key("redstone_ores")); + public static final TagKey PICKAXES = create(key("pickaxes")); /** * {@code #minecraft:pig_food} @@ -720,352 +720,352 @@ public final class ItemTypeTagKeys { public static final TagKey PIG_FOOD = create(key("pig_food")); /** - * {@code #minecraft:doors} + * {@code #minecraft:piglin_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DOORS = create(key("doors")); + public static final TagKey PIGLIN_FOOD = create(key("piglin_food")); /** - * {@code #minecraft:ocelot_food} + * {@code #minecraft:piglin_loved} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey OCELOT_FOOD = create(key("ocelot_food")); + public static final TagKey PIGLIN_LOVED = create(key("piglin_loved")); /** - * {@code #minecraft:cluster_max_harvestables} + * {@code #minecraft:piglin_repellents} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CLUSTER_MAX_HARVESTABLES = create(key("cluster_max_harvestables")); + public static final TagKey PIGLIN_REPELLENTS = create(key("piglin_repellents")); /** - * {@code #minecraft:villager_plantable_seeds} + * {@code #minecraft:planks} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey VILLAGER_PLANTABLE_SEEDS = create(key("villager_plantable_seeds")); + public static final TagKey PLANKS = create(key("planks")); /** - * {@code #minecraft:jungle_logs} + * {@code #minecraft:rabbit_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey JUNGLE_LOGS = create(key("jungle_logs")); + public static final TagKey RABBIT_FOOD = create(key("rabbit_food")); /** - * {@code #minecraft:wooden_slabs} + * {@code #minecraft:rails} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_SLABS = create(key("wooden_slabs")); + public static final TagKey RAILS = create(key("rails")); /** - * {@code #minecraft:dyeable} + * {@code #minecraft:redstone_ores} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DYEABLE = create(key("dyeable")); + public static final TagKey REDSTONE_ORES = create(key("redstone_ores")); /** - * {@code #minecraft:trapdoors} + * {@code #minecraft:sand} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TRAPDOORS = create(key("trapdoors")); + public static final TagKey SAND = create(key("sand")); /** - * {@code #minecraft:swords} + * {@code #minecraft:saplings} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SWORDS = create(key("swords")); + public static final TagKey SAPLINGS = create(key("saplings")); /** - * {@code #minecraft:cherry_logs} + * {@code #minecraft:sheep_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CHERRY_LOGS = create(key("cherry_logs")); + public static final TagKey SHEEP_FOOD = create(key("sheep_food")); /** - * {@code #minecraft:tall_flowers} + * {@code #minecraft:shovels} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TALL_FLOWERS = create(key("tall_flowers")); + public static final TagKey SHOVELS = create(key("shovels")); /** - * {@code #minecraft:mangrove_logs} + * {@code #minecraft:signs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey MANGROVE_LOGS = create(key("mangrove_logs")); + public static final TagKey SIGNS = create(key("signs")); /** - * {@code #minecraft:birch_logs} + * {@code #minecraft:skulls} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BIRCH_LOGS = create(key("birch_logs")); + public static final TagKey SKULLS = create(key("skulls")); /** - * {@code #minecraft:soul_fire_base_blocks} + * {@code #minecraft:slabs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SOUL_FIRE_BASE_BLOCKS = create(key("soul_fire_base_blocks")); + public static final TagKey SLABS = create(key("slabs")); /** - * {@code #minecraft:chicken_food} + * {@code #minecraft:small_flowers} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CHICKEN_FOOD = create(key("chicken_food")); + public static final TagKey SMALL_FLOWERS = create(key("small_flowers")); /** - * {@code #minecraft:turtle_food} + * {@code #minecraft:smelts_to_glass} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TURTLE_FOOD = create(key("turtle_food")); + public static final TagKey SMELTS_TO_GLASS = create(key("smelts_to_glass")); /** - * {@code #minecraft:freeze_immune_wearables} + * {@code #minecraft:sniffer_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey FREEZE_IMMUNE_WEARABLES = create(key("freeze_immune_wearables")); + public static final TagKey SNIFFER_FOOD = create(key("sniffer_food")); /** - * {@code #minecraft:enchantable/fire_aspect} + * {@code #minecraft:soul_fire_base_blocks} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_FIRE_ASPECT = create(key("enchantable/fire_aspect")); + public static final TagKey SOUL_FIRE_BASE_BLOCKS = create(key("soul_fire_base_blocks")); /** - * {@code #minecraft:rails} + * {@code #minecraft:spruce_logs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey RAILS = create(key("rails")); + public static final TagKey SPRUCE_LOGS = create(key("spruce_logs")); /** - * {@code #minecraft:trim_materials} + * {@code #minecraft:stairs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TRIM_MATERIALS = create(key("trim_materials")); + public static final TagKey STAIRS = create(key("stairs")); /** - * {@code #minecraft:parrot_poisonous_food} + * {@code #minecraft:stone_bricks} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PARROT_POISONOUS_FOOD = create(key("parrot_poisonous_food")); + public static final TagKey STONE_BRICKS = create(key("stone_bricks")); /** - * {@code #minecraft:wooden_fences} + * {@code #minecraft:stone_buttons} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_FENCES = create(key("wooden_fences")); + public static final TagKey STONE_BUTTONS = create(key("stone_buttons")); /** - * {@code #minecraft:head_armor} + * {@code #minecraft:stone_crafting_materials} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey HEAD_ARMOR = create(key("head_armor")); + public static final TagKey STONE_CRAFTING_MATERIALS = create(key("stone_crafting_materials")); /** - * {@code #minecraft:stone_bricks} + * {@code #minecraft:stone_tool_materials} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STONE_BRICKS = create(key("stone_bricks")); + public static final TagKey STONE_TOOL_MATERIALS = create(key("stone_tool_materials")); /** - * {@code #minecraft:stone_tool_materials} + * {@code #minecraft:strider_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey STONE_TOOL_MATERIALS = create(key("stone_tool_materials")); + public static final TagKey STRIDER_FOOD = create(key("strider_food")); /** - * {@code #minecraft:llama_tempt_items} + * {@code #minecraft:strider_tempt_items} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LLAMA_TEMPT_ITEMS = create(key("llama_tempt_items")); + public static final TagKey STRIDER_TEMPT_ITEMS = create(key("strider_tempt_items")); /** - * {@code #minecraft:gold_ores} + * {@code #minecraft:swords} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey GOLD_ORES = create(key("gold_ores")); + public static final TagKey SWORDS = create(key("swords")); /** - * {@code #minecraft:cat_food} + * {@code #minecraft:tall_flowers} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CAT_FOOD = create(key("cat_food")); + public static final TagKey TALL_FLOWERS = create(key("tall_flowers")); /** - * {@code #minecraft:trim_templates} + * {@code #minecraft:terracotta} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey TRIM_TEMPLATES = create(key("trim_templates")); + public static final TagKey TERRACOTTA = create(key("terracotta")); /** - * {@code #minecraft:hoglin_food} + * {@code #minecraft:trapdoors} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey HOGLIN_FOOD = create(key("hoglin_food")); + public static final TagKey TRAPDOORS = create(key("trapdoors")); /** - * {@code #minecraft:logs_that_burn} + * {@code #minecraft:trim_materials} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey LOGS_THAT_BURN = create(key("logs_that_burn")); + public static final TagKey TRIM_MATERIALS = create(key("trim_materials")); /** - * {@code #minecraft:wooden_stairs} + * {@code #minecraft:trim_templates} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey WOODEN_STAIRS = create(key("wooden_stairs")); + public static final TagKey TRIM_TEMPLATES = create(key("trim_templates")); /** - * {@code #minecraft:enchantable/crossbow} + * {@code #minecraft:trimmable_armor} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_CROSSBOW = create(key("enchantable/crossbow")); + public static final TagKey TRIMMABLE_ARMOR = create(key("trimmable_armor")); /** - * {@code #minecraft:enchantable/mace} + * {@code #minecraft:turtle_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_MACE = create(key("enchantable/mace")); + public static final TagKey TURTLE_FOOD = create(key("turtle_food")); /** - * {@code #minecraft:arrows} + * {@code #minecraft:villager_plantable_seeds} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ARROWS = create(key("arrows")); + public static final TagKey VILLAGER_PLANTABLE_SEEDS = create(key("villager_plantable_seeds")); /** - * {@code #minecraft:parrot_food} + * {@code #minecraft:walls} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey PARROT_FOOD = create(key("parrot_food")); + public static final TagKey WALLS = create(key("walls")); /** - * {@code #minecraft:bamboo_blocks} + * {@code #minecraft:warped_stems} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey BAMBOO_BLOCKS = create(key("bamboo_blocks")); + public static final TagKey WARPED_STEMS = create(key("warped_stems")); /** - * {@code #minecraft:horse_tempt_items} + * {@code #minecraft:wart_blocks} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey HORSE_TEMPT_ITEMS = create(key("horse_tempt_items")); + public static final TagKey WART_BLOCKS = create(key("wart_blocks")); /** - * {@code #minecraft:creeper_drop_music_discs} + * {@code #minecraft:wolf_food} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CREEPER_DROP_MUSIC_DISCS = create(key("creeper_drop_music_discs")); + public static final TagKey WOLF_FOOD = create(key("wolf_food")); /** - * {@code #minecraft:enchantable/equippable} + * {@code #minecraft:wooden_buttons} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_EQUIPPABLE = create(key("enchantable/equippable")); + public static final TagKey WOODEN_BUTTONS = create(key("wooden_buttons")); /** - * {@code #minecraft:camel_food} + * {@code #minecraft:wooden_doors} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CAMEL_FOOD = create(key("camel_food")); + public static final TagKey WOODEN_DOORS = create(key("wooden_doors")); /** - * {@code #minecraft:enchantable/mining_loot} + * {@code #minecraft:wooden_fences} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_MINING_LOOT = create(key("enchantable/mining_loot")); + public static final TagKey WOODEN_FENCES = create(key("wooden_fences")); /** - * {@code #minecraft:armadillo_food} + * {@code #minecraft:wooden_pressure_plates} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ARMADILLO_FOOD = create(key("armadillo_food")); + public static final TagKey WOODEN_PRESSURE_PLATES = create(key("wooden_pressure_plates")); /** - * {@code #minecraft:candles} + * {@code #minecraft:wooden_slabs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey CANDLES = create(key("candles")); + public static final TagKey WOODEN_SLABS = create(key("wooden_slabs")); /** - * {@code #minecraft:spruce_logs} + * {@code #minecraft:wooden_stairs} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey SPRUCE_LOGS = create(key("spruce_logs")); + public static final TagKey WOODEN_STAIRS = create(key("wooden_stairs")); /** - * {@code #minecraft:dirt} + * {@code #minecraft:wooden_trapdoors} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey DIRT = create(key("dirt")); + public static final TagKey WOODEN_TRAPDOORS = create(key("wooden_trapdoors")); /** - * {@code #minecraft:enchantable/head_armor} + * {@code #minecraft:wool} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_HEAD_ARMOR = create(key("enchantable/head_armor")); + public static final TagKey WOOL = create(key("wool")); /** - * {@code #minecraft:enchantable/leg_armor} + * {@code #minecraft:wool_carpets} * * @apiNote This field is version-dependant and may be removed in future Minecraft versions */ - public static final TagKey ENCHANTABLE_LEG_ARMOR = create(key("enchantable/leg_armor")); + public static final TagKey WOOL_CARPETS = create(key("wool_carpets")); private ItemTypeTagKeys() { } /** - * Creates a tag key for {@link ItemType} in the registry {@code minecraft:root}. + * Creates a tag key for {@link ItemType} in the registry {@code minecraft:item}. * * @param key the tag key's key * @return a new tag key */ @ApiStatus.Experimental - public static @NotNull TagKey create(final @NotNull Key key) { + public static @NonNull TagKey create(final @NonNull Key key) { return TagKey.create(RegistryKey.ITEM, key); } } diff --git a/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java b/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java index 19cbf63cd4..cf6846134a 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedKeyType.java @@ -31,8 +31,6 @@ import net.minecraft.core.RegistrySetBuilder; import net.minecraft.data.registries.VanillaRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.world.flag.FeatureElement; -import net.minecraft.world.flag.FeatureFlags; -import org.bukkit.MinecraftExperimental; import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.Nullable; import org.checkerframework.framework.qual.DefaultQualifier; @@ -72,7 +70,7 @@ public class GeneratedKeyType extends SimpleGenerator { } private static final String CREATE_JAVADOC = """ - Creates a key for {@link $T} in a registry. + Creates a key for {@link $T} in the registry {@code $L}. @param key the value's key in the registry @return a new typed key @@ -102,7 +100,7 @@ public class GeneratedKeyType extends SimpleGenerator { .returns(returnType.annotated(NOT_NULL)); if (this.publicCreateKeyMethod) { create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental - create.addJavadoc(CREATE_JAVADOC, this.apiType); + create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString()); } return create; } @@ -190,8 +188,6 @@ public class GeneratedKeyType extends SimpleGenerator { @Override protected JavaFile.Builder file(final JavaFile.Builder builder) { return builder - .skipJavaLangImports(true) - .addStaticImport(Key.class, "key") - .indent(" "); + .addStaticImport(Key.class, "key"); } } diff --git a/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedTagKeyType.java b/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedTagKeyType.java index 88079df443..ff8d8b612c 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedTagKeyType.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/types/GeneratedTagKeyType.java @@ -15,15 +15,11 @@ import io.papermc.paper.registry.RegistryKey; import io.papermc.paper.registry.tag.TagKey; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.stream.Collectors; import net.kyori.adventure.key.Key; import net.minecraft.core.Registry; -import net.minecraft.core.RegistrySetBuilder; -import net.minecraft.data.registries.VanillaRegistries; import net.minecraft.resources.ResourceKey; import org.bukkit.MinecraftExperimental; @@ -39,11 +35,6 @@ import static javax.lang.model.element.Modifier.STATIC; public class GeneratedTagKeyType extends SimpleGenerator { - private static final Map>, RegistrySetBuilder.RegistryBootstrap> VANILLA_REGISTRY_ENTRIES = VanillaRegistries.BUILDER.entries.stream() - .collect(Collectors.toMap(RegistrySetBuilder.RegistryStub::key, RegistrySetBuilder.RegistryStub::bootstrap)); - - private static final Map>, RegistrySetBuilder.RegistryBootstrap> EXPERIMENTAL_REGISTRY_ENTRIES = Collections.emptyMap(); // Update for Experimental API - private static final Map, String> REGISTRY_KEY_FIELD_NAMES; static { final Map, String> map = new HashMap<>(); @@ -91,7 +82,7 @@ public class GeneratedTagKeyType extends SimpleGenerator { .returns(returnType.annotated(NOT_NULL)); if (this.publicCreateKeyMethod) { create.addAnnotation(EXPERIMENTAL_API_ANNOTATION); // TODO remove once not experimental - create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.registry().toString()); + create.addJavadoc(CREATE_JAVADOC, this.apiType, this.registryKey.location().toString()); } return create; } @@ -102,8 +93,8 @@ public class GeneratedTagKeyType extends SimpleGenerator { .addJavadoc(Javadocs.getVersionDependentClassHeader("{@link $T#$L}"), RegistryKey.class, REGISTRY_KEY_FIELD_NAMES.get(this.apiRegistryKey)) .addAnnotations(Annotations.CLASS_HEADER) .addMethod(MethodSpec.constructorBuilder() - .addModifiers(PRIVATE) - .build() + .addModifiers(PRIVATE) + .build() ); } @@ -117,8 +108,7 @@ public class GeneratedTagKeyType extends SimpleGenerator { final Registry registry = Main.REGISTRY_ACCESS.registryOrThrow(this.registryKey); final AtomicBoolean allExperimental = new AtomicBoolean(true); - registry.getTags().forEach(pair -> { - final net.minecraft.tags.TagKey nmsTagKey = pair.getFirst(); + registry.getTagNames().sorted(Formatting.alphabeticKeyOrder(nmsTagKey -> nmsTagKey.location().getPath())).forEach(nmsTagKey -> { final String fieldName = Formatting.formatKeyAsField(nmsTagKey.location().getPath()); final FieldSpec.Builder fieldBuilder = FieldSpec.builder(tagKey, fieldName, PUBLIC, STATIC, FINAL) .initializer("$N(key($S))", createMethod.build(), nmsTagKey.location().getPath()) @@ -142,8 +132,6 @@ public class GeneratedTagKeyType extends SimpleGenerator { @Override protected JavaFile.Builder file(final JavaFile.Builder builder) { return builder - .skipJavaLangImports(true) - .addStaticImport(Key.class, "key") - .indent(" "); + .addStaticImport(Key.class, "key"); } } diff --git a/paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalGenerator.java b/paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalGenerator.java index aaa6e6ad19..ffe3c48572 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalGenerator.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/types/goal/MobGoalGenerator.java @@ -132,8 +132,7 @@ public class MobGoalGenerator extends SimpleGenerator { @Override protected JavaFile.Builder file(JavaFile.Builder builder) { - return builder - .skipJavaLangImports(true); + return builder; } record DeprecatedEntry(Class entity, String entryName, @Nullable String removalVersion, diff --git a/paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java b/paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java index 52c876edba..f625c25a55 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/utils/Annotations.java @@ -7,8 +7,8 @@ import java.util.List; import io.papermc.paper.generated.GeneratedFrom; import net.minecraft.SharedConstants; import org.bukkit.MinecraftExperimental; +import org.checkerframework.checker.nullness.qual.NonNull; import org.jetbrains.annotations.ApiStatus; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public final class Annotations { @@ -26,10 +26,10 @@ public final class Annotations { return annotationSpecs; } - public static AnnotationSpec deprecatedVersioned(final @Nullable String version, boolean forRemoval) { - AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class); + public static AnnotationSpec deprecatedVersioned(final @Nullable String version, final boolean forRemoval) { + final AnnotationSpec.Builder annotationSpec = AnnotationSpec.builder(Deprecated.class); if (forRemoval) { - annotationSpec.addMember("forRemoval", "$L", forRemoval); + annotationSpec.addMember("forRemoval", "$L", true); } if (version != null) { annotationSpec.addMember("since", "$S", version); @@ -46,7 +46,7 @@ public final class Annotations { @ApiStatus.Experimental public static final AnnotationSpec EXPERIMENTAL_API_ANNOTATION = AnnotationSpec.builder(ApiStatus.Experimental.class).build(); - public static final AnnotationSpec NOT_NULL = AnnotationSpec.builder(NotNull.class).build(); + public static final AnnotationSpec NOT_NULL = AnnotationSpec.builder(NonNull.class).build(); private static final AnnotationSpec SUPPRESS_WARNINGS = AnnotationSpec.builder(SuppressWarnings.class) .addMember("value", "$S", "unused") .addMember("value", "$S", "SpellCheckingInspection") diff --git a/paper-api-generator/src/main/java/io/papermc/generator/utils/CollectingContext.java b/paper-api-generator/src/main/java/io/papermc/generator/utils/CollectingContext.java index 15cb4ac3e7..bb0687aa24 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/utils/CollectingContext.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/utils/CollectingContext.java @@ -2,7 +2,6 @@ package io.papermc.generator.utils; import com.mojang.serialization.Lifecycle; import io.papermc.generator.Main; -import java.util.List; import java.util.Set; import net.minecraft.core.Holder; import net.minecraft.core.HolderGetter; diff --git a/paper-api-generator/src/main/java/io/papermc/generator/utils/TagCollector.java b/paper-api-generator/src/main/java/io/papermc/generator/utils/TagCollector.java index 5254478c41..2c537dba93 100644 --- a/paper-api-generator/src/main/java/io/papermc/generator/utils/TagCollector.java +++ b/paper-api-generator/src/main/java/io/papermc/generator/utils/TagCollector.java @@ -4,7 +4,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.mojang.logging.LogUtils; import io.papermc.generator.Main; -import io.papermc.generator.utils.Formatting; import java.util.Collections; import java.util.IdentityHashMap; import java.util.Map; @@ -19,7 +18,6 @@ import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.repository.BuiltInPackSource; import net.minecraft.server.packs.resources.MultiPackResourceManager; import net.minecraft.tags.TagKey; -import net.minecraft.tags.TagManager; import org.slf4j.Logger; // collect all the tags by grabbing the json from the data-packs @@ -50,9 +48,9 @@ public final class TagCollector { } result.put(entry.value().getTagNames() - .filter(tagKey -> tagKey.location().getPath().equals(path)) - .findFirst() - .orElseThrow(), packId); + .filter(tagKey -> tagKey.location().getPath().equals(path)) + .findFirst() + .orElseThrow(), packId); }); }); return Collections.unmodifiableMap(result); diff --git a/patches/server/1021-Add-registry-entry-and-builders.patch b/patches/server/1021-Add-registry-entry-and-builders.patch index ff658dd1be..7978bd6ce2 100644 --- a/patches/server/1021-Add-registry-entry-and-builders.patch +++ b/patches/server/1021-Add-registry-entry-and-builders.patch @@ -340,7 +340,7 @@ index 0000000000000000000000000000000000000000..18f9463ae23ba2d9c65ffb7531a87c92 +} diff --git a/src/main/java/io/papermc/paper/registry/data/util/Checks.java b/src/main/java/io/papermc/paper/registry/data/util/Checks.java new file mode 100644 -index 0000000000000000000000000000000000000000..a66cebe2b918a22b84e346127ffb671621050e5f +index 0000000000000000000000000000000000000000..3241a94731fe8163876614efdcf30f8b551535af --- /dev/null +++ b/src/main/java/io/papermc/paper/registry/data/util/Checks.java @@ -0,0 +1,48 @@ @@ -370,7 +370,7 @@ index 0000000000000000000000000000000000000000..a66cebe2b918a22b84e346127ffb6716 + + public static T asArgument(final @Nullable T value, final String field) { + if (value == null) { -+ throw new IllegalArgumentException("argument " + value + " cannot be null"); ++ throw new IllegalArgumentException("argument " + field + " cannot be null"); + } + return value; + } -- cgit v1.2.3