diff --git a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java index 09930832c5..1e14900a66 100644 --- a/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java +++ b/src/main/java/org/spongepowered/api/event/cause/entity/damage/DamageType.java @@ -29,7 +29,6 @@ import org.spongepowered.api.entity.Entity; import org.spongepowered.api.event.cause.entity.damage.source.DamageSource; import org.spongepowered.api.registry.DefaultedRegistryValue; -import org.spongepowered.api.tag.Tag; import org.spongepowered.api.tag.Taggable; import org.spongepowered.api.util.CopyableBuilder; import org.spongepowered.api.util.Nameable; @@ -65,15 +64,6 @@ static Builder builder() { */ double exhaustion(); - /** - * Checks whether this damage types matches a damage type tag. - * - * @param tag The tag to check. - * @return true if this damage type matches the damage type tag. - */ - @Override - boolean is(Tag tag); - /** * Returns the damage scaling. * diff --git a/src/main/java/org/spongepowered/api/registry/Registry.java b/src/main/java/org/spongepowered/api/registry/Registry.java index 47ed441b07..63e5a1e414 100644 --- a/src/main/java/org/spongepowered/api/registry/Registry.java +++ b/src/main/java/org/spongepowered/api/registry/Registry.java @@ -30,7 +30,6 @@ import java.util.Objects; import java.util.Optional; -import java.util.Set; import java.util.stream.Stream; /** @@ -128,7 +127,7 @@ default Optional findValue(final RegistryKey key) { * * @return The registered types associated with given tag */ - Set taggedValues(Tag tag); + Stream taggedValues(Tag tag); /** * Gets the tags associated with this registry. diff --git a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java index 037752fe32..640b2d59d2 100644 --- a/src/main/java/org/spongepowered/api/registry/RegistryTypes.java +++ b/src/main/java/org/spongepowered/api/registry/RegistryTypes.java @@ -24,7 +24,6 @@ */ package org.spongepowered.api.registry; -import org.checkerframework.checker.nullness.qual.NonNull; import org.spongepowered.api.ResourceKey; import org.spongepowered.api.Sponge; import org.spongepowered.api.advancement.Advancement; @@ -103,7 +102,6 @@ import org.spongepowered.api.effect.potion.PotionEffectType; import org.spongepowered.api.effect.sound.SoundType; import org.spongepowered.api.effect.sound.music.MusicDisc; -import org.spongepowered.api.entity.Entity; import org.spongepowered.api.entity.EntityCategory; import org.spongepowered.api.entity.EntityType; import org.spongepowered.api.entity.ai.goal.GoalExecutorType; @@ -234,7 +232,7 @@ public final class RegistryTypes { public static final DefaultedRegistryType ENTITY_CATEGORY = RegistryTypes.spongeKeyInGame("mob_category"); - public static final DefaultedRegistryType> ENTITY_TYPE = RegistryTypes.minecraftKeyInGame("entity_type"); + public static final DefaultedRegistryType> ENTITY_TYPE = RegistryTypes.minecraftKeyInGame("entity_type"); public static final DefaultedRegistryType FEATURE = RegistryTypes.minecraftKeyInServer("worldgen/configured_feature"); @@ -270,7 +268,7 @@ public final class RegistryTypes { public static final DefaultedRegistryType POTION_TYPE = RegistryTypes.minecraftKeyInGame("potion"); - public static final DefaultedRegistryType>> RECIPE_TYPE = RegistryTypes.minecraftKeyInGame("recipe_type"); + public static final DefaultedRegistryType> RECIPE_TYPE = RegistryTypes.minecraftKeyInGame("recipe_type"); public static final DefaultedRegistryType SOUND_TYPE = RegistryTypes.minecraftKeyInGame("sound_event"); @@ -284,7 +282,7 @@ public final class RegistryTypes { public static final DefaultedRegistryType STRUCTURE_TYPE = RegistryTypes.minecraftKeyInGame("worldgen/structure_type"); - public static final DefaultedRegistryType> TRIGGER = RegistryTypes.minecraftKeyInGame("trigger_type"); + public static final DefaultedRegistryType> TRIGGER = RegistryTypes.minecraftKeyInGame("trigger_type"); public static final DefaultedRegistryType TRIM_MATERIAL = RegistryTypes.minecraftKeyInServer("trim_material"); @@ -337,7 +335,7 @@ public final class RegistryTypes { public static final DefaultedRegistryType> COMMAND_REGISTRAR_TYPE = RegistryTypes.spongeKeyInGame("command_registrar_type"); - public static final DefaultedRegistryType> COMMAND_TREE_NODE_TYPE = RegistryTypes.spongeKeyInServer("command_tree_node_type"); + public static final DefaultedRegistryType> COMMAND_TREE_NODE_TYPE = RegistryTypes.spongeKeyInServer("command_tree_node_type"); public static final DefaultedRegistryType COMPARATOR_MODE = RegistryTypes.spongeKeyInGame("comparator_mode"); diff --git a/src/main/java/org/spongepowered/api/tag/BiomeTags.java b/src/main/java/org/spongepowered/api/tag/BiomeTags.java index c7d7e68f00..4e003c82ef 100644 --- a/src/main/java/org/spongepowered/api/tag/BiomeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BiomeTags.java @@ -37,150 +37,150 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BiomeTags { - public static final Tag ALLOWS_SURFACE_SLIME_SPAWNS = BiomeTags.key(ResourceKey.minecraft("allows_surface_slime_spawns")); + public static final DefaultedTag ALLOWS_SURFACE_SLIME_SPAWNS = BiomeTags.key(ResourceKey.minecraft("allows_surface_slime_spawns")); - public static final Tag ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = BiomeTags.key(ResourceKey.minecraft("allows_tropical_fish_spawns_at_any_height")); + public static final DefaultedTag ALLOWS_TROPICAL_FISH_SPAWNS_AT_ANY_HEIGHT = BiomeTags.key(ResourceKey.minecraft("allows_tropical_fish_spawns_at_any_height")); - public static final Tag HAS_CLOSER_WATER_FOG = BiomeTags.key(ResourceKey.minecraft("has_closer_water_fog")); + public static final DefaultedTag HAS_CLOSER_WATER_FOG = BiomeTags.key(ResourceKey.minecraft("has_closer_water_fog")); - public static final Tag HAS_STRUCTURE_ANCIENT_CITY = BiomeTags.key(ResourceKey.minecraft("has_structure/ancient_city")); + public static final DefaultedTag HAS_STRUCTURE_ANCIENT_CITY = BiomeTags.key(ResourceKey.minecraft("has_structure/ancient_city")); - public static final Tag HAS_STRUCTURE_BASTION_REMNANT = BiomeTags.key(ResourceKey.minecraft("has_structure/bastion_remnant")); + public static final DefaultedTag HAS_STRUCTURE_BASTION_REMNANT = BiomeTags.key(ResourceKey.minecraft("has_structure/bastion_remnant")); - public static final Tag HAS_STRUCTURE_BURIED_TREASURE = BiomeTags.key(ResourceKey.minecraft("has_structure/buried_treasure")); + public static final DefaultedTag HAS_STRUCTURE_BURIED_TREASURE = BiomeTags.key(ResourceKey.minecraft("has_structure/buried_treasure")); - public static final Tag HAS_STRUCTURE_DESERT_PYRAMID = BiomeTags.key(ResourceKey.minecraft("has_structure/desert_pyramid")); + public static final DefaultedTag HAS_STRUCTURE_DESERT_PYRAMID = BiomeTags.key(ResourceKey.minecraft("has_structure/desert_pyramid")); - public static final Tag HAS_STRUCTURE_END_CITY = BiomeTags.key(ResourceKey.minecraft("has_structure/end_city")); + public static final DefaultedTag HAS_STRUCTURE_END_CITY = BiomeTags.key(ResourceKey.minecraft("has_structure/end_city")); - public static final Tag HAS_STRUCTURE_IGLOO = BiomeTags.key(ResourceKey.minecraft("has_structure/igloo")); + public static final DefaultedTag HAS_STRUCTURE_IGLOO = BiomeTags.key(ResourceKey.minecraft("has_structure/igloo")); - public static final Tag HAS_STRUCTURE_JUNGLE_TEMPLE = BiomeTags.key(ResourceKey.minecraft("has_structure/jungle_temple")); + public static final DefaultedTag HAS_STRUCTURE_JUNGLE_TEMPLE = BiomeTags.key(ResourceKey.minecraft("has_structure/jungle_temple")); - public static final Tag HAS_STRUCTURE_MINESHAFT = BiomeTags.key(ResourceKey.minecraft("has_structure/mineshaft")); + public static final DefaultedTag HAS_STRUCTURE_MINESHAFT = BiomeTags.key(ResourceKey.minecraft("has_structure/mineshaft")); - public static final Tag HAS_STRUCTURE_MINESHAFT_MESA = BiomeTags.key(ResourceKey.minecraft("has_structure/mineshaft_mesa")); + public static final DefaultedTag HAS_STRUCTURE_MINESHAFT_MESA = BiomeTags.key(ResourceKey.minecraft("has_structure/mineshaft_mesa")); - public static final Tag HAS_STRUCTURE_NETHER_FORTRESS = BiomeTags.key(ResourceKey.minecraft("has_structure/nether_fortress")); + public static final DefaultedTag HAS_STRUCTURE_NETHER_FORTRESS = BiomeTags.key(ResourceKey.minecraft("has_structure/nether_fortress")); - public static final Tag HAS_STRUCTURE_NETHER_FOSSIL = BiomeTags.key(ResourceKey.minecraft("has_structure/nether_fossil")); + public static final DefaultedTag HAS_STRUCTURE_NETHER_FOSSIL = BiomeTags.key(ResourceKey.minecraft("has_structure/nether_fossil")); - public static final Tag HAS_STRUCTURE_OCEAN_MONUMENT = BiomeTags.key(ResourceKey.minecraft("has_structure/ocean_monument")); + public static final DefaultedTag HAS_STRUCTURE_OCEAN_MONUMENT = BiomeTags.key(ResourceKey.minecraft("has_structure/ocean_monument")); - public static final Tag HAS_STRUCTURE_OCEAN_RUIN_COLD = BiomeTags.key(ResourceKey.minecraft("has_structure/ocean_ruin_cold")); + public static final DefaultedTag HAS_STRUCTURE_OCEAN_RUIN_COLD = BiomeTags.key(ResourceKey.minecraft("has_structure/ocean_ruin_cold")); - public static final Tag HAS_STRUCTURE_OCEAN_RUIN_WARM = BiomeTags.key(ResourceKey.minecraft("has_structure/ocean_ruin_warm")); + public static final DefaultedTag HAS_STRUCTURE_OCEAN_RUIN_WARM = BiomeTags.key(ResourceKey.minecraft("has_structure/ocean_ruin_warm")); - public static final Tag HAS_STRUCTURE_PILLAGER_OUTPOST = BiomeTags.key(ResourceKey.minecraft("has_structure/pillager_outpost")); + public static final DefaultedTag HAS_STRUCTURE_PILLAGER_OUTPOST = BiomeTags.key(ResourceKey.minecraft("has_structure/pillager_outpost")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_DESERT = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_desert")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_DESERT = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_desert")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_JUNGLE = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_jungle")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_JUNGLE = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_jungle")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_MOUNTAIN = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_mountain")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_MOUNTAIN = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_mountain")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_NETHER = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_nether")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_NETHER = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_nether")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_OCEAN = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_ocean")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_OCEAN = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_ocean")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_STANDARD = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_standard")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_STANDARD = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_standard")); - public static final Tag HAS_STRUCTURE_RUINED_PORTAL_SWAMP = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_swamp")); + public static final DefaultedTag HAS_STRUCTURE_RUINED_PORTAL_SWAMP = BiomeTags.key(ResourceKey.minecraft("has_structure/ruined_portal_swamp")); - public static final Tag HAS_STRUCTURE_SHIPWRECK = BiomeTags.key(ResourceKey.minecraft("has_structure/shipwreck")); + public static final DefaultedTag HAS_STRUCTURE_SHIPWRECK = BiomeTags.key(ResourceKey.minecraft("has_structure/shipwreck")); - public static final Tag HAS_STRUCTURE_SHIPWRECK_BEACHED = BiomeTags.key(ResourceKey.minecraft("has_structure/shipwreck_beached")); + public static final DefaultedTag HAS_STRUCTURE_SHIPWRECK_BEACHED = BiomeTags.key(ResourceKey.minecraft("has_structure/shipwreck_beached")); - public static final Tag HAS_STRUCTURE_STRONGHOLD = BiomeTags.key(ResourceKey.minecraft("has_structure/stronghold")); + public static final DefaultedTag HAS_STRUCTURE_STRONGHOLD = BiomeTags.key(ResourceKey.minecraft("has_structure/stronghold")); - public static final Tag HAS_STRUCTURE_SWAMP_HUT = BiomeTags.key(ResourceKey.minecraft("has_structure/swamp_hut")); + public static final DefaultedTag HAS_STRUCTURE_SWAMP_HUT = BiomeTags.key(ResourceKey.minecraft("has_structure/swamp_hut")); - public static final Tag HAS_STRUCTURE_TRAIL_RUINS = BiomeTags.key(ResourceKey.minecraft("has_structure/trail_ruins")); + public static final DefaultedTag HAS_STRUCTURE_TRAIL_RUINS = BiomeTags.key(ResourceKey.minecraft("has_structure/trail_ruins")); - public static final Tag HAS_STRUCTURE_TRIAL_CHAMBERS = BiomeTags.key(ResourceKey.minecraft("has_structure/trial_chambers")); + public static final DefaultedTag HAS_STRUCTURE_TRIAL_CHAMBERS = BiomeTags.key(ResourceKey.minecraft("has_structure/trial_chambers")); - public static final Tag HAS_STRUCTURE_VILLAGE_DESERT = BiomeTags.key(ResourceKey.minecraft("has_structure/village_desert")); + public static final DefaultedTag HAS_STRUCTURE_VILLAGE_DESERT = BiomeTags.key(ResourceKey.minecraft("has_structure/village_desert")); - public static final Tag HAS_STRUCTURE_VILLAGE_PLAINS = BiomeTags.key(ResourceKey.minecraft("has_structure/village_plains")); + public static final DefaultedTag HAS_STRUCTURE_VILLAGE_PLAINS = BiomeTags.key(ResourceKey.minecraft("has_structure/village_plains")); - public static final Tag HAS_STRUCTURE_VILLAGE_SAVANNA = BiomeTags.key(ResourceKey.minecraft("has_structure/village_savanna")); + public static final DefaultedTag HAS_STRUCTURE_VILLAGE_SAVANNA = BiomeTags.key(ResourceKey.minecraft("has_structure/village_savanna")); - public static final Tag HAS_STRUCTURE_VILLAGE_SNOWY = BiomeTags.key(ResourceKey.minecraft("has_structure/village_snowy")); + public static final DefaultedTag HAS_STRUCTURE_VILLAGE_SNOWY = BiomeTags.key(ResourceKey.minecraft("has_structure/village_snowy")); - public static final Tag HAS_STRUCTURE_VILLAGE_TAIGA = BiomeTags.key(ResourceKey.minecraft("has_structure/village_taiga")); + public static final DefaultedTag HAS_STRUCTURE_VILLAGE_TAIGA = BiomeTags.key(ResourceKey.minecraft("has_structure/village_taiga")); - public static final Tag HAS_STRUCTURE_WOODLAND_MANSION = BiomeTags.key(ResourceKey.minecraft("has_structure/woodland_mansion")); + public static final DefaultedTag HAS_STRUCTURE_WOODLAND_MANSION = BiomeTags.key(ResourceKey.minecraft("has_structure/woodland_mansion")); - public static final Tag INCREASED_FIRE_BURNOUT = BiomeTags.key(ResourceKey.minecraft("increased_fire_burnout")); + public static final DefaultedTag INCREASED_FIRE_BURNOUT = BiomeTags.key(ResourceKey.minecraft("increased_fire_burnout")); - public static final Tag IS_BADLANDS = BiomeTags.key(ResourceKey.minecraft("is_badlands")); + public static final DefaultedTag IS_BADLANDS = BiomeTags.key(ResourceKey.minecraft("is_badlands")); - public static final Tag IS_BEACH = BiomeTags.key(ResourceKey.minecraft("is_beach")); + public static final DefaultedTag IS_BEACH = BiomeTags.key(ResourceKey.minecraft("is_beach")); - public static final Tag IS_DEEP_OCEAN = BiomeTags.key(ResourceKey.minecraft("is_deep_ocean")); + public static final DefaultedTag IS_DEEP_OCEAN = BiomeTags.key(ResourceKey.minecraft("is_deep_ocean")); - public static final Tag IS_END = BiomeTags.key(ResourceKey.minecraft("is_end")); + public static final DefaultedTag IS_END = BiomeTags.key(ResourceKey.minecraft("is_end")); - public static final Tag IS_FOREST = BiomeTags.key(ResourceKey.minecraft("is_forest")); + public static final DefaultedTag IS_FOREST = BiomeTags.key(ResourceKey.minecraft("is_forest")); - public static final Tag IS_HILL = BiomeTags.key(ResourceKey.minecraft("is_hill")); + public static final DefaultedTag IS_HILL = BiomeTags.key(ResourceKey.minecraft("is_hill")); - public static final Tag IS_JUNGLE = BiomeTags.key(ResourceKey.minecraft("is_jungle")); + public static final DefaultedTag IS_JUNGLE = BiomeTags.key(ResourceKey.minecraft("is_jungle")); - public static final Tag IS_MOUNTAIN = BiomeTags.key(ResourceKey.minecraft("is_mountain")); + public static final DefaultedTag IS_MOUNTAIN = BiomeTags.key(ResourceKey.minecraft("is_mountain")); - public static final Tag IS_NETHER = BiomeTags.key(ResourceKey.minecraft("is_nether")); + public static final DefaultedTag IS_NETHER = BiomeTags.key(ResourceKey.minecraft("is_nether")); - public static final Tag IS_OCEAN = BiomeTags.key(ResourceKey.minecraft("is_ocean")); + public static final DefaultedTag IS_OCEAN = BiomeTags.key(ResourceKey.minecraft("is_ocean")); - public static final Tag IS_OVERWORLD = BiomeTags.key(ResourceKey.minecraft("is_overworld")); + public static final DefaultedTag IS_OVERWORLD = BiomeTags.key(ResourceKey.minecraft("is_overworld")); - public static final Tag IS_RIVER = BiomeTags.key(ResourceKey.minecraft("is_river")); + public static final DefaultedTag IS_RIVER = BiomeTags.key(ResourceKey.minecraft("is_river")); - public static final Tag IS_SAVANNA = BiomeTags.key(ResourceKey.minecraft("is_savanna")); + public static final DefaultedTag IS_SAVANNA = BiomeTags.key(ResourceKey.minecraft("is_savanna")); - public static final Tag IS_TAIGA = BiomeTags.key(ResourceKey.minecraft("is_taiga")); + public static final DefaultedTag IS_TAIGA = BiomeTags.key(ResourceKey.minecraft("is_taiga")); - public static final Tag MINESHAFT_BLOCKING = BiomeTags.key(ResourceKey.minecraft("mineshaft_blocking")); + public static final DefaultedTag MINESHAFT_BLOCKING = BiomeTags.key(ResourceKey.minecraft("mineshaft_blocking")); - public static final Tag MORE_FREQUENT_DROWNED_SPAWNS = BiomeTags.key(ResourceKey.minecraft("more_frequent_drowned_spawns")); + public static final DefaultedTag MORE_FREQUENT_DROWNED_SPAWNS = BiomeTags.key(ResourceKey.minecraft("more_frequent_drowned_spawns")); - public static final Tag PLAYS_UNDERWATER_MUSIC = BiomeTags.key(ResourceKey.minecraft("plays_underwater_music")); + public static final DefaultedTag PLAYS_UNDERWATER_MUSIC = BiomeTags.key(ResourceKey.minecraft("plays_underwater_music")); - public static final Tag POLAR_BEARS_SPAWN_ON_ALTERNATE_BLOCKS = BiomeTags.key(ResourceKey.minecraft("polar_bears_spawn_on_alternate_blocks")); + public static final DefaultedTag POLAR_BEARS_SPAWN_ON_ALTERNATE_BLOCKS = BiomeTags.key(ResourceKey.minecraft("polar_bears_spawn_on_alternate_blocks")); - public static final Tag PRODUCES_CORALS_FROM_BONEMEAL = BiomeTags.key(ResourceKey.minecraft("produces_corals_from_bonemeal")); + public static final DefaultedTag PRODUCES_CORALS_FROM_BONEMEAL = BiomeTags.key(ResourceKey.minecraft("produces_corals_from_bonemeal")); - public static final Tag REDUCE_WATER_AMBIENT_SPAWNS = BiomeTags.key(ResourceKey.minecraft("reduce_water_ambient_spawns")); + public static final DefaultedTag REDUCE_WATER_AMBIENT_SPAWNS = BiomeTags.key(ResourceKey.minecraft("reduce_water_ambient_spawns")); - public static final Tag REQUIRED_OCEAN_MONUMENT_SURROUNDING = BiomeTags.key(ResourceKey.minecraft("required_ocean_monument_surrounding")); + public static final DefaultedTag REQUIRED_OCEAN_MONUMENT_SURROUNDING = BiomeTags.key(ResourceKey.minecraft("required_ocean_monument_surrounding")); - public static final Tag SNOW_GOLEM_MELTS = BiomeTags.key(ResourceKey.minecraft("snow_golem_melts")); + public static final DefaultedTag SNOW_GOLEM_MELTS = BiomeTags.key(ResourceKey.minecraft("snow_golem_melts")); - public static final Tag SPAWNS_COLD_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_cold_variant_frogs")); + public static final DefaultedTag SPAWNS_COLD_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_cold_variant_frogs")); - public static final Tag SPAWNS_GOLD_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_gold_rabbits")); + public static final DefaultedTag SPAWNS_GOLD_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_gold_rabbits")); - public static final Tag SPAWNS_SNOW_FOXES = BiomeTags.key(ResourceKey.minecraft("spawns_snow_foxes")); + public static final DefaultedTag SPAWNS_SNOW_FOXES = BiomeTags.key(ResourceKey.minecraft("spawns_snow_foxes")); - public static final Tag SPAWNS_WARM_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_warm_variant_frogs")); + public static final DefaultedTag SPAWNS_WARM_VARIANT_FROGS = BiomeTags.key(ResourceKey.minecraft("spawns_warm_variant_frogs")); - public static final Tag SPAWNS_WHITE_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_white_rabbits")); + public static final DefaultedTag SPAWNS_WHITE_RABBITS = BiomeTags.key(ResourceKey.minecraft("spawns_white_rabbits")); - public static final Tag STRONGHOLD_BIASED_TO = BiomeTags.key(ResourceKey.minecraft("stronghold_biased_to")); + public static final DefaultedTag STRONGHOLD_BIASED_TO = BiomeTags.key(ResourceKey.minecraft("stronghold_biased_to")); - public static final Tag WATER_ON_MAP_OUTLINES = BiomeTags.key(ResourceKey.minecraft("water_on_map_outlines")); + public static final DefaultedTag WATER_ON_MAP_OUTLINES = BiomeTags.key(ResourceKey.minecraft("water_on_map_outlines")); - public static final Tag WITHOUT_PATROL_SPAWNS = BiomeTags.key(ResourceKey.minecraft("without_patrol_spawns")); + public static final DefaultedTag WITHOUT_PATROL_SPAWNS = BiomeTags.key(ResourceKey.minecraft("without_patrol_spawns")); - public static final Tag WITHOUT_WANDERING_TRADER_SPAWNS = BiomeTags.key(ResourceKey.minecraft("without_wandering_trader_spawns")); + public static final DefaultedTag WITHOUT_WANDERING_TRADER_SPAWNS = BiomeTags.key(ResourceKey.minecraft("without_wandering_trader_spawns")); - public static final Tag WITHOUT_ZOMBIE_SIEGES = BiomeTags.key(ResourceKey.minecraft("without_zombie_sieges")); + public static final DefaultedTag WITHOUT_ZOMBIE_SIEGES = BiomeTags.key(ResourceKey.minecraft("without_zombie_sieges")); private BiomeTags() { } - private static Tag key(final ResourceKey key) { - return Tag.of(RegistryTypes.BIOME, key); + private static DefaultedTag key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.BIOME, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java index 9651c7b606..5f2e6311f7 100644 --- a/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/BlockTypeTags.java @@ -37,382 +37,382 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class BlockTypeTags { - public static final Tag ACACIA_LOGS = BlockTypeTags.key(ResourceKey.minecraft("acacia_logs")); + public static final DefaultedTag ACACIA_LOGS = BlockTypeTags.key(ResourceKey.minecraft("acacia_logs")); - public static final Tag AIR = BlockTypeTags.key(ResourceKey.minecraft("air")); + public static final DefaultedTag AIR = BlockTypeTags.key(ResourceKey.minecraft("air")); - public static final Tag ALL_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("all_hanging_signs")); + public static final DefaultedTag ALL_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("all_hanging_signs")); - public static final Tag ALL_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("all_signs")); + public static final DefaultedTag ALL_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("all_signs")); - public static final Tag ANCIENT_CITY_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("ancient_city_replaceable")); + public static final DefaultedTag ANCIENT_CITY_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("ancient_city_replaceable")); - public static final Tag ANIMALS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("animals_spawnable_on")); + public static final DefaultedTag ANIMALS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("animals_spawnable_on")); - public static final Tag ANVIL = BlockTypeTags.key(ResourceKey.minecraft("anvil")); + public static final DefaultedTag ANVIL = BlockTypeTags.key(ResourceKey.minecraft("anvil")); - public static final Tag ARMADILLO_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("armadillo_spawnable_on")); + public static final DefaultedTag ARMADILLO_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("armadillo_spawnable_on")); - public static final Tag AXOLOTLS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("axolotls_spawnable_on")); + public static final DefaultedTag AXOLOTLS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("axolotls_spawnable_on")); - public static final Tag AZALEA_GROWS_ON = BlockTypeTags.key(ResourceKey.minecraft("azalea_grows_on")); + public static final DefaultedTag AZALEA_GROWS_ON = BlockTypeTags.key(ResourceKey.minecraft("azalea_grows_on")); - public static final Tag AZALEA_ROOT_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("azalea_root_replaceable")); + public static final DefaultedTag AZALEA_ROOT_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("azalea_root_replaceable")); - public static final Tag BADLANDS_TERRACOTTA = BlockTypeTags.key(ResourceKey.minecraft("badlands_terracotta")); + public static final DefaultedTag BADLANDS_TERRACOTTA = BlockTypeTags.key(ResourceKey.minecraft("badlands_terracotta")); - public static final Tag BAMBOO_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("bamboo_blocks")); + public static final DefaultedTag BAMBOO_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("bamboo_blocks")); - public static final Tag BAMBOO_PLANTABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("bamboo_plantable_on")); + public static final DefaultedTag BAMBOO_PLANTABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("bamboo_plantable_on")); - public static final Tag BANNERS = BlockTypeTags.key(ResourceKey.minecraft("banners")); + public static final DefaultedTag BANNERS = BlockTypeTags.key(ResourceKey.minecraft("banners")); - public static final Tag BASE_STONE_NETHER = BlockTypeTags.key(ResourceKey.minecraft("base_stone_nether")); + public static final DefaultedTag BASE_STONE_NETHER = BlockTypeTags.key(ResourceKey.minecraft("base_stone_nether")); - public static final Tag BASE_STONE_OVERWORLD = BlockTypeTags.key(ResourceKey.minecraft("base_stone_overworld")); + public static final DefaultedTag BASE_STONE_OVERWORLD = BlockTypeTags.key(ResourceKey.minecraft("base_stone_overworld")); - public static final Tag BATS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("bats_spawnable_on")); + public static final DefaultedTag BATS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("bats_spawnable_on")); - public static final Tag BEACON_BASE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("beacon_base_blocks")); + public static final DefaultedTag BEACON_BASE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("beacon_base_blocks")); - public static final Tag BEDS = BlockTypeTags.key(ResourceKey.minecraft("beds")); + public static final DefaultedTag BEDS = BlockTypeTags.key(ResourceKey.minecraft("beds")); - public static final Tag BEE_ATTRACTIVE = BlockTypeTags.key(ResourceKey.minecraft("bee_attractive")); + public static final DefaultedTag BEE_ATTRACTIVE = BlockTypeTags.key(ResourceKey.minecraft("bee_attractive")); - public static final Tag BEE_GROWABLES = BlockTypeTags.key(ResourceKey.minecraft("bee_growables")); + public static final DefaultedTag BEE_GROWABLES = BlockTypeTags.key(ResourceKey.minecraft("bee_growables")); - public static final Tag BEEHIVES = BlockTypeTags.key(ResourceKey.minecraft("beehives")); + public static final DefaultedTag BEEHIVES = BlockTypeTags.key(ResourceKey.minecraft("beehives")); - public static final Tag BIG_DRIPLEAF_PLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("big_dripleaf_placeable")); + public static final DefaultedTag BIG_DRIPLEAF_PLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("big_dripleaf_placeable")); - public static final Tag BIRCH_LOGS = BlockTypeTags.key(ResourceKey.minecraft("birch_logs")); + public static final DefaultedTag BIRCH_LOGS = BlockTypeTags.key(ResourceKey.minecraft("birch_logs")); - public static final Tag BLOCKS_WIND_CHARGE_EXPLOSIONS = BlockTypeTags.key(ResourceKey.minecraft("blocks_wind_charge_explosions")); + public static final DefaultedTag BLOCKS_WIND_CHARGE_EXPLOSIONS = BlockTypeTags.key(ResourceKey.minecraft("blocks_wind_charge_explosions")); - public static final Tag BUTTONS = BlockTypeTags.key(ResourceKey.minecraft("buttons")); + public static final DefaultedTag BUTTONS = BlockTypeTags.key(ResourceKey.minecraft("buttons")); - public static final Tag CAMEL_SAND_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("camel_sand_step_sound_blocks")); + public static final DefaultedTag CAMEL_SAND_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("camel_sand_step_sound_blocks")); - public static final Tag CAMPFIRES = BlockTypeTags.key(ResourceKey.minecraft("campfires")); + public static final DefaultedTag CAMPFIRES = BlockTypeTags.key(ResourceKey.minecraft("campfires")); - public static final Tag CANDLE_CAKES = BlockTypeTags.key(ResourceKey.minecraft("candle_cakes")); + public static final DefaultedTag CANDLE_CAKES = BlockTypeTags.key(ResourceKey.minecraft("candle_cakes")); - public static final Tag CANDLES = BlockTypeTags.key(ResourceKey.minecraft("candles")); + public static final DefaultedTag CANDLES = BlockTypeTags.key(ResourceKey.minecraft("candles")); - public static final Tag CAULDRONS = BlockTypeTags.key(ResourceKey.minecraft("cauldrons")); + public static final DefaultedTag CAULDRONS = BlockTypeTags.key(ResourceKey.minecraft("cauldrons")); - public static final Tag CAVE_VINES = BlockTypeTags.key(ResourceKey.minecraft("cave_vines")); + public static final DefaultedTag CAVE_VINES = BlockTypeTags.key(ResourceKey.minecraft("cave_vines")); - public static final Tag CEILING_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("ceiling_hanging_signs")); + public static final DefaultedTag CEILING_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("ceiling_hanging_signs")); - public static final Tag CHERRY_LOGS = BlockTypeTags.key(ResourceKey.minecraft("cherry_logs")); + public static final DefaultedTag CHERRY_LOGS = BlockTypeTags.key(ResourceKey.minecraft("cherry_logs")); - public static final Tag CLIMBABLE = BlockTypeTags.key(ResourceKey.minecraft("climbable")); + public static final DefaultedTag CLIMBABLE = BlockTypeTags.key(ResourceKey.minecraft("climbable")); - public static final Tag COAL_ORES = BlockTypeTags.key(ResourceKey.minecraft("coal_ores")); + public static final DefaultedTag COAL_ORES = BlockTypeTags.key(ResourceKey.minecraft("coal_ores")); - public static final Tag COMBINATION_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("combination_step_sound_blocks")); + public static final DefaultedTag COMBINATION_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("combination_step_sound_blocks")); - public static final Tag COMPLETES_FIND_TREE_TUTORIAL = BlockTypeTags.key(ResourceKey.minecraft("completes_find_tree_tutorial")); + public static final DefaultedTag COMPLETES_FIND_TREE_TUTORIAL = BlockTypeTags.key(ResourceKey.minecraft("completes_find_tree_tutorial")); - public static final Tag CONCRETE_POWDER = BlockTypeTags.key(ResourceKey.minecraft("concrete_powder")); + public static final DefaultedTag CONCRETE_POWDER = BlockTypeTags.key(ResourceKey.minecraft("concrete_powder")); - public static final Tag CONVERTABLE_TO_MUD = BlockTypeTags.key(ResourceKey.minecraft("convertable_to_mud")); + public static final DefaultedTag CONVERTABLE_TO_MUD = BlockTypeTags.key(ResourceKey.minecraft("convertable_to_mud")); - public static final Tag COPPER_ORES = BlockTypeTags.key(ResourceKey.minecraft("copper_ores")); + public static final DefaultedTag COPPER_ORES = BlockTypeTags.key(ResourceKey.minecraft("copper_ores")); - public static final Tag CORAL_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("coral_blocks")); + public static final DefaultedTag CORAL_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("coral_blocks")); - public static final Tag CORAL_PLANTS = BlockTypeTags.key(ResourceKey.minecraft("coral_plants")); + public static final DefaultedTag CORAL_PLANTS = BlockTypeTags.key(ResourceKey.minecraft("coral_plants")); - public static final Tag CORALS = BlockTypeTags.key(ResourceKey.minecraft("corals")); + public static final DefaultedTag CORALS = BlockTypeTags.key(ResourceKey.minecraft("corals")); - public static final Tag CRIMSON_STEMS = BlockTypeTags.key(ResourceKey.minecraft("crimson_stems")); + public static final DefaultedTag CRIMSON_STEMS = BlockTypeTags.key(ResourceKey.minecraft("crimson_stems")); - public static final Tag CROPS = BlockTypeTags.key(ResourceKey.minecraft("crops")); + public static final DefaultedTag CROPS = BlockTypeTags.key(ResourceKey.minecraft("crops")); - public static final Tag CRYSTAL_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("crystal_sound_blocks")); + public static final DefaultedTag CRYSTAL_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("crystal_sound_blocks")); - public static final Tag DAMPENS_VIBRATIONS = BlockTypeTags.key(ResourceKey.minecraft("dampens_vibrations")); + public static final DefaultedTag DAMPENS_VIBRATIONS = BlockTypeTags.key(ResourceKey.minecraft("dampens_vibrations")); - public static final Tag DARK_OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("dark_oak_logs")); + public static final DefaultedTag DARK_OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("dark_oak_logs")); - public static final Tag DEAD_BUSH_MAY_PLACE_ON = BlockTypeTags.key(ResourceKey.minecraft("dead_bush_may_place_on")); + public static final DefaultedTag DEAD_BUSH_MAY_PLACE_ON = BlockTypeTags.key(ResourceKey.minecraft("dead_bush_may_place_on")); - public static final Tag DEEPSLATE_ORE_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("deepslate_ore_replaceables")); + public static final DefaultedTag DEEPSLATE_ORE_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("deepslate_ore_replaceables")); - public static final Tag DIAMOND_ORES = BlockTypeTags.key(ResourceKey.minecraft("diamond_ores")); + public static final DefaultedTag DIAMOND_ORES = BlockTypeTags.key(ResourceKey.minecraft("diamond_ores")); - public static final Tag DIRT = BlockTypeTags.key(ResourceKey.minecraft("dirt")); + public static final DefaultedTag DIRT = BlockTypeTags.key(ResourceKey.minecraft("dirt")); - public static final Tag DOES_NOT_BLOCK_HOPPERS = BlockTypeTags.key(ResourceKey.minecraft("does_not_block_hoppers")); + public static final DefaultedTag DOES_NOT_BLOCK_HOPPERS = BlockTypeTags.key(ResourceKey.minecraft("does_not_block_hoppers")); - public static final Tag DOORS = BlockTypeTags.key(ResourceKey.minecraft("doors")); + public static final DefaultedTag DOORS = BlockTypeTags.key(ResourceKey.minecraft("doors")); - public static final Tag DRAGON_IMMUNE = BlockTypeTags.key(ResourceKey.minecraft("dragon_immune")); + public static final DefaultedTag DRAGON_IMMUNE = BlockTypeTags.key(ResourceKey.minecraft("dragon_immune")); - public static final Tag DRAGON_TRANSPARENT = BlockTypeTags.key(ResourceKey.minecraft("dragon_transparent")); + public static final DefaultedTag DRAGON_TRANSPARENT = BlockTypeTags.key(ResourceKey.minecraft("dragon_transparent")); - public static final Tag DRIPSTONE_REPLACEABLE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("dripstone_replaceable_blocks")); + public static final DefaultedTag DRIPSTONE_REPLACEABLE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("dripstone_replaceable_blocks")); - public static final Tag EMERALD_ORES = BlockTypeTags.key(ResourceKey.minecraft("emerald_ores")); + public static final DefaultedTag EMERALD_ORES = BlockTypeTags.key(ResourceKey.minecraft("emerald_ores")); - public static final Tag ENCHANTMENT_POWER_PROVIDER = BlockTypeTags.key(ResourceKey.minecraft("enchantment_power_provider")); + public static final DefaultedTag ENCHANTMENT_POWER_PROVIDER = BlockTypeTags.key(ResourceKey.minecraft("enchantment_power_provider")); - public static final Tag ENCHANTMENT_POWER_TRANSMITTER = BlockTypeTags.key(ResourceKey.minecraft("enchantment_power_transmitter")); + public static final DefaultedTag ENCHANTMENT_POWER_TRANSMITTER = BlockTypeTags.key(ResourceKey.minecraft("enchantment_power_transmitter")); - public static final Tag ENDERMAN_HOLDABLE = BlockTypeTags.key(ResourceKey.minecraft("enderman_holdable")); + public static final DefaultedTag ENDERMAN_HOLDABLE = BlockTypeTags.key(ResourceKey.minecraft("enderman_holdable")); - public static final Tag FALL_DAMAGE_RESETTING = BlockTypeTags.key(ResourceKey.minecraft("fall_damage_resetting")); + public static final DefaultedTag FALL_DAMAGE_RESETTING = BlockTypeTags.key(ResourceKey.minecraft("fall_damage_resetting")); - public static final Tag FEATURES_CANNOT_REPLACE = BlockTypeTags.key(ResourceKey.minecraft("features_cannot_replace")); + public static final DefaultedTag FEATURES_CANNOT_REPLACE = BlockTypeTags.key(ResourceKey.minecraft("features_cannot_replace")); - public static final Tag FENCE_GATES = BlockTypeTags.key(ResourceKey.minecraft("fence_gates")); + public static final DefaultedTag FENCE_GATES = BlockTypeTags.key(ResourceKey.minecraft("fence_gates")); - public static final Tag FENCES = BlockTypeTags.key(ResourceKey.minecraft("fences")); + public static final DefaultedTag FENCES = BlockTypeTags.key(ResourceKey.minecraft("fences")); - public static final Tag FIRE = BlockTypeTags.key(ResourceKey.minecraft("fire")); + public static final DefaultedTag FIRE = BlockTypeTags.key(ResourceKey.minecraft("fire")); - public static final Tag FLOWER_POTS = BlockTypeTags.key(ResourceKey.minecraft("flower_pots")); + public static final DefaultedTag FLOWER_POTS = BlockTypeTags.key(ResourceKey.minecraft("flower_pots")); - public static final Tag FLOWERS = BlockTypeTags.key(ResourceKey.minecraft("flowers")); + public static final DefaultedTag FLOWERS = BlockTypeTags.key(ResourceKey.minecraft("flowers")); - public static final Tag FOXES_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("foxes_spawnable_on")); + public static final DefaultedTag FOXES_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("foxes_spawnable_on")); - public static final Tag FROG_PREFER_JUMP_TO = BlockTypeTags.key(ResourceKey.minecraft("frog_prefer_jump_to")); + public static final DefaultedTag FROG_PREFER_JUMP_TO = BlockTypeTags.key(ResourceKey.minecraft("frog_prefer_jump_to")); - public static final Tag FROGS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("frogs_spawnable_on")); + public static final DefaultedTag FROGS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("frogs_spawnable_on")); - public static final Tag GEODE_INVALID_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("geode_invalid_blocks")); + public static final DefaultedTag GEODE_INVALID_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("geode_invalid_blocks")); - public static final Tag GOATS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("goats_spawnable_on")); + public static final DefaultedTag GOATS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("goats_spawnable_on")); - public static final Tag GOLD_ORES = BlockTypeTags.key(ResourceKey.minecraft("gold_ores")); + public static final DefaultedTag GOLD_ORES = BlockTypeTags.key(ResourceKey.minecraft("gold_ores")); - public static final Tag GUARDED_BY_PIGLINS = BlockTypeTags.key(ResourceKey.minecraft("guarded_by_piglins")); + public static final DefaultedTag GUARDED_BY_PIGLINS = BlockTypeTags.key(ResourceKey.minecraft("guarded_by_piglins")); - public static final Tag HOGLIN_REPELLENTS = BlockTypeTags.key(ResourceKey.minecraft("hoglin_repellents")); + public static final DefaultedTag HOGLIN_REPELLENTS = BlockTypeTags.key(ResourceKey.minecraft("hoglin_repellents")); - public static final Tag ICE = BlockTypeTags.key(ResourceKey.minecraft("ice")); + public static final DefaultedTag ICE = BlockTypeTags.key(ResourceKey.minecraft("ice")); - public static final Tag IMPERMEABLE = BlockTypeTags.key(ResourceKey.minecraft("impermeable")); + public static final DefaultedTag IMPERMEABLE = BlockTypeTags.key(ResourceKey.minecraft("impermeable")); - public static final Tag INCORRECT_FOR_DIAMOND_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_diamond_tool")); + public static final DefaultedTag INCORRECT_FOR_DIAMOND_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_diamond_tool")); - public static final Tag INCORRECT_FOR_GOLD_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_gold_tool")); + public static final DefaultedTag INCORRECT_FOR_GOLD_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_gold_tool")); - public static final Tag INCORRECT_FOR_IRON_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_iron_tool")); + public static final DefaultedTag INCORRECT_FOR_IRON_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_iron_tool")); - public static final Tag INCORRECT_FOR_NETHERITE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_netherite_tool")); + public static final DefaultedTag INCORRECT_FOR_NETHERITE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_netherite_tool")); - public static final Tag INCORRECT_FOR_STONE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_stone_tool")); + public static final DefaultedTag INCORRECT_FOR_STONE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_stone_tool")); - public static final Tag INCORRECT_FOR_WOODEN_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_wooden_tool")); + public static final DefaultedTag INCORRECT_FOR_WOODEN_TOOL = BlockTypeTags.key(ResourceKey.minecraft("incorrect_for_wooden_tool")); - public static final Tag INFINIBURN_END = BlockTypeTags.key(ResourceKey.minecraft("infiniburn_end")); + public static final DefaultedTag INFINIBURN_END = BlockTypeTags.key(ResourceKey.minecraft("infiniburn_end")); - public static final Tag INFINIBURN_NETHER = BlockTypeTags.key(ResourceKey.minecraft("infiniburn_nether")); + public static final DefaultedTag INFINIBURN_NETHER = BlockTypeTags.key(ResourceKey.minecraft("infiniburn_nether")); - public static final Tag INFINIBURN_OVERWORLD = BlockTypeTags.key(ResourceKey.minecraft("infiniburn_overworld")); + public static final DefaultedTag INFINIBURN_OVERWORLD = BlockTypeTags.key(ResourceKey.minecraft("infiniburn_overworld")); - public static final Tag INSIDE_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("inside_step_sound_blocks")); + public static final DefaultedTag INSIDE_STEP_SOUND_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("inside_step_sound_blocks")); - public static final Tag INVALID_SPAWN_INSIDE = BlockTypeTags.key(ResourceKey.minecraft("invalid_spawn_inside")); + public static final DefaultedTag INVALID_SPAWN_INSIDE = BlockTypeTags.key(ResourceKey.minecraft("invalid_spawn_inside")); - public static final Tag IRON_ORES = BlockTypeTags.key(ResourceKey.minecraft("iron_ores")); + public static final DefaultedTag IRON_ORES = BlockTypeTags.key(ResourceKey.minecraft("iron_ores")); - public static final Tag JUNGLE_LOGS = BlockTypeTags.key(ResourceKey.minecraft("jungle_logs")); + public static final DefaultedTag JUNGLE_LOGS = BlockTypeTags.key(ResourceKey.minecraft("jungle_logs")); - public static final Tag LAPIS_ORES = BlockTypeTags.key(ResourceKey.minecraft("lapis_ores")); + public static final DefaultedTag LAPIS_ORES = BlockTypeTags.key(ResourceKey.minecraft("lapis_ores")); - public static final Tag LAVA_POOL_STONE_CANNOT_REPLACE = BlockTypeTags.key(ResourceKey.minecraft("lava_pool_stone_cannot_replace")); + public static final DefaultedTag LAVA_POOL_STONE_CANNOT_REPLACE = BlockTypeTags.key(ResourceKey.minecraft("lava_pool_stone_cannot_replace")); - public static final Tag LEAVES = BlockTypeTags.key(ResourceKey.minecraft("leaves")); + public static final DefaultedTag LEAVES = BlockTypeTags.key(ResourceKey.minecraft("leaves")); - public static final Tag LOGS = BlockTypeTags.key(ResourceKey.minecraft("logs")); + public static final DefaultedTag LOGS = BlockTypeTags.key(ResourceKey.minecraft("logs")); - public static final Tag LOGS_THAT_BURN = BlockTypeTags.key(ResourceKey.minecraft("logs_that_burn")); + public static final DefaultedTag LOGS_THAT_BURN = BlockTypeTags.key(ResourceKey.minecraft("logs_that_burn")); - public static final Tag LUSH_GROUND_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("lush_ground_replaceable")); + public static final DefaultedTag LUSH_GROUND_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("lush_ground_replaceable")); - public static final Tag MAINTAINS_FARMLAND = BlockTypeTags.key(ResourceKey.minecraft("maintains_farmland")); + public static final DefaultedTag MAINTAINS_FARMLAND = BlockTypeTags.key(ResourceKey.minecraft("maintains_farmland")); - public static final Tag MANGROVE_LOGS = BlockTypeTags.key(ResourceKey.minecraft("mangrove_logs")); + public static final DefaultedTag MANGROVE_LOGS = BlockTypeTags.key(ResourceKey.minecraft("mangrove_logs")); - public static final Tag MANGROVE_LOGS_CAN_GROW_THROUGH = BlockTypeTags.key(ResourceKey.minecraft("mangrove_logs_can_grow_through")); + public static final DefaultedTag MANGROVE_LOGS_CAN_GROW_THROUGH = BlockTypeTags.key(ResourceKey.minecraft("mangrove_logs_can_grow_through")); - public static final Tag MANGROVE_ROOTS_CAN_GROW_THROUGH = BlockTypeTags.key(ResourceKey.minecraft("mangrove_roots_can_grow_through")); + public static final DefaultedTag MANGROVE_ROOTS_CAN_GROW_THROUGH = BlockTypeTags.key(ResourceKey.minecraft("mangrove_roots_can_grow_through")); - public static final Tag MINEABLE_AXE = BlockTypeTags.key(ResourceKey.minecraft("mineable/axe")); + public static final DefaultedTag MINEABLE_AXE = BlockTypeTags.key(ResourceKey.minecraft("mineable/axe")); - public static final Tag MINEABLE_HOE = BlockTypeTags.key(ResourceKey.minecraft("mineable/hoe")); + public static final DefaultedTag MINEABLE_HOE = BlockTypeTags.key(ResourceKey.minecraft("mineable/hoe")); - public static final Tag MINEABLE_PICKAXE = BlockTypeTags.key(ResourceKey.minecraft("mineable/pickaxe")); + public static final DefaultedTag MINEABLE_PICKAXE = BlockTypeTags.key(ResourceKey.minecraft("mineable/pickaxe")); - public static final Tag MINEABLE_SHOVEL = BlockTypeTags.key(ResourceKey.minecraft("mineable/shovel")); + public static final DefaultedTag MINEABLE_SHOVEL = BlockTypeTags.key(ResourceKey.minecraft("mineable/shovel")); - public static final Tag MOB_INTERACTABLE_DOORS = BlockTypeTags.key(ResourceKey.minecraft("mob_interactable_doors")); + public static final DefaultedTag MOB_INTERACTABLE_DOORS = BlockTypeTags.key(ResourceKey.minecraft("mob_interactable_doors")); - public static final Tag MOOSHROOMS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("mooshrooms_spawnable_on")); + public static final DefaultedTag MOOSHROOMS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("mooshrooms_spawnable_on")); - public static final Tag MOSS_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("moss_replaceable")); + public static final DefaultedTag MOSS_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("moss_replaceable")); - public static final Tag MUSHROOM_GROW_BLOCK = BlockTypeTags.key(ResourceKey.minecraft("mushroom_grow_block")); + public static final DefaultedTag MUSHROOM_GROW_BLOCK = BlockTypeTags.key(ResourceKey.minecraft("mushroom_grow_block")); - public static final Tag NEEDS_DIAMOND_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_diamond_tool")); + public static final DefaultedTag NEEDS_DIAMOND_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_diamond_tool")); - public static final Tag NEEDS_IRON_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_iron_tool")); + public static final DefaultedTag NEEDS_IRON_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_iron_tool")); - public static final Tag NEEDS_STONE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_stone_tool")); + public static final DefaultedTag NEEDS_STONE_TOOL = BlockTypeTags.key(ResourceKey.minecraft("needs_stone_tool")); - public static final Tag NETHER_CARVER_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("nether_carver_replaceables")); + public static final DefaultedTag NETHER_CARVER_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("nether_carver_replaceables")); - public static final Tag NYLIUM = BlockTypeTags.key(ResourceKey.minecraft("nylium")); + public static final DefaultedTag NYLIUM = BlockTypeTags.key(ResourceKey.minecraft("nylium")); - public static final Tag OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("oak_logs")); + public static final DefaultedTag OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("oak_logs")); - public static final Tag OCCLUDES_VIBRATION_SIGNALS = BlockTypeTags.key(ResourceKey.minecraft("occludes_vibration_signals")); + public static final DefaultedTag OCCLUDES_VIBRATION_SIGNALS = BlockTypeTags.key(ResourceKey.minecraft("occludes_vibration_signals")); - public static final Tag OVERWORLD_CARVER_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("overworld_carver_replaceables")); + public static final DefaultedTag OVERWORLD_CARVER_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("overworld_carver_replaceables")); - public static final Tag OVERWORLD_NATURAL_LOGS = BlockTypeTags.key(ResourceKey.minecraft("overworld_natural_logs")); + public static final DefaultedTag OVERWORLD_NATURAL_LOGS = BlockTypeTags.key(ResourceKey.minecraft("overworld_natural_logs")); - public static final Tag PALE_OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("pale_oak_logs")); + public static final DefaultedTag PALE_OAK_LOGS = BlockTypeTags.key(ResourceKey.minecraft("pale_oak_logs")); - public static final Tag PARROTS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("parrots_spawnable_on")); + public static final DefaultedTag PARROTS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("parrots_spawnable_on")); - public static final Tag PIGLIN_REPELLENTS = BlockTypeTags.key(ResourceKey.minecraft("piglin_repellents")); + public static final DefaultedTag PIGLIN_REPELLENTS = BlockTypeTags.key(ResourceKey.minecraft("piglin_repellents")); - public static final Tag PLANKS = BlockTypeTags.key(ResourceKey.minecraft("planks")); + public static final DefaultedTag PLANKS = BlockTypeTags.key(ResourceKey.minecraft("planks")); - public static final Tag POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = BlockTypeTags.key(ResourceKey.minecraft("polar_bears_spawnable_on_alternate")); + public static final DefaultedTag POLAR_BEARS_SPAWNABLE_ON_ALTERNATE = BlockTypeTags.key(ResourceKey.minecraft("polar_bears_spawnable_on_alternate")); - public static final Tag PORTALS = BlockTypeTags.key(ResourceKey.minecraft("portals")); + public static final DefaultedTag PORTALS = BlockTypeTags.key(ResourceKey.minecraft("portals")); - public static final Tag PRESSURE_PLATES = BlockTypeTags.key(ResourceKey.minecraft("pressure_plates")); + public static final DefaultedTag PRESSURE_PLATES = BlockTypeTags.key(ResourceKey.minecraft("pressure_plates")); - public static final Tag PREVENT_MOB_SPAWNING_INSIDE = BlockTypeTags.key(ResourceKey.minecraft("prevent_mob_spawning_inside")); + public static final DefaultedTag PREVENT_MOB_SPAWNING_INSIDE = BlockTypeTags.key(ResourceKey.minecraft("prevent_mob_spawning_inside")); - public static final Tag RABBITS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("rabbits_spawnable_on")); + public static final DefaultedTag RABBITS_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("rabbits_spawnable_on")); - public static final Tag RAILS = BlockTypeTags.key(ResourceKey.minecraft("rails")); + public static final DefaultedTag RAILS = BlockTypeTags.key(ResourceKey.minecraft("rails")); - public static final Tag REDSTONE_ORES = BlockTypeTags.key(ResourceKey.minecraft("redstone_ores")); + public static final DefaultedTag REDSTONE_ORES = BlockTypeTags.key(ResourceKey.minecraft("redstone_ores")); - public static final Tag REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("replaceable")); + public static final DefaultedTag REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("replaceable")); - public static final Tag REPLACEABLE_BY_TREES = BlockTypeTags.key(ResourceKey.minecraft("replaceable_by_trees")); + public static final DefaultedTag REPLACEABLE_BY_TREES = BlockTypeTags.key(ResourceKey.minecraft("replaceable_by_trees")); - public static final Tag SAND = BlockTypeTags.key(ResourceKey.minecraft("sand")); + public static final DefaultedTag SAND = BlockTypeTags.key(ResourceKey.minecraft("sand")); - public static final Tag SAPLINGS = BlockTypeTags.key(ResourceKey.minecraft("saplings")); + public static final DefaultedTag SAPLINGS = BlockTypeTags.key(ResourceKey.minecraft("saplings")); - public static final Tag SCULK_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("sculk_replaceable")); + public static final DefaultedTag SCULK_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("sculk_replaceable")); - public static final Tag SCULK_REPLACEABLE_WORLD_GEN = BlockTypeTags.key(ResourceKey.minecraft("sculk_replaceable_world_gen")); + public static final DefaultedTag SCULK_REPLACEABLE_WORLD_GEN = BlockTypeTags.key(ResourceKey.minecraft("sculk_replaceable_world_gen")); - public static final Tag SHULKER_BOXES = BlockTypeTags.key(ResourceKey.minecraft("shulker_boxes")); + public static final DefaultedTag SHULKER_BOXES = BlockTypeTags.key(ResourceKey.minecraft("shulker_boxes")); - public static final Tag SIGNS = BlockTypeTags.key(ResourceKey.minecraft("signs")); + public static final DefaultedTag SIGNS = BlockTypeTags.key(ResourceKey.minecraft("signs")); - public static final Tag SLABS = BlockTypeTags.key(ResourceKey.minecraft("slabs")); + public static final DefaultedTag SLABS = BlockTypeTags.key(ResourceKey.minecraft("slabs")); - public static final Tag SMALL_DRIPLEAF_PLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("small_dripleaf_placeable")); + public static final DefaultedTag SMALL_DRIPLEAF_PLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("small_dripleaf_placeable")); - public static final Tag SMALL_FLOWERS = BlockTypeTags.key(ResourceKey.minecraft("small_flowers")); + public static final DefaultedTag SMALL_FLOWERS = BlockTypeTags.key(ResourceKey.minecraft("small_flowers")); - public static final Tag SMELTS_TO_GLASS = BlockTypeTags.key(ResourceKey.minecraft("smelts_to_glass")); + public static final DefaultedTag SMELTS_TO_GLASS = BlockTypeTags.key(ResourceKey.minecraft("smelts_to_glass")); - public static final Tag SNAPS_GOAT_HORN = BlockTypeTags.key(ResourceKey.minecraft("snaps_goat_horn")); + public static final DefaultedTag SNAPS_GOAT_HORN = BlockTypeTags.key(ResourceKey.minecraft("snaps_goat_horn")); - public static final Tag SNIFFER_DIGGABLE_BLOCK = BlockTypeTags.key(ResourceKey.minecraft("sniffer_diggable_block")); + public static final DefaultedTag SNIFFER_DIGGABLE_BLOCK = BlockTypeTags.key(ResourceKey.minecraft("sniffer_diggable_block")); - public static final Tag SNIFFER_EGG_HATCH_BOOST = BlockTypeTags.key(ResourceKey.minecraft("sniffer_egg_hatch_boost")); + public static final DefaultedTag SNIFFER_EGG_HATCH_BOOST = BlockTypeTags.key(ResourceKey.minecraft("sniffer_egg_hatch_boost")); - public static final Tag SNOW = BlockTypeTags.key(ResourceKey.minecraft("snow")); + public static final DefaultedTag SNOW = BlockTypeTags.key(ResourceKey.minecraft("snow")); - public static final Tag SNOW_LAYER_CAN_SURVIVE_ON = BlockTypeTags.key(ResourceKey.minecraft("snow_layer_can_survive_on")); + public static final DefaultedTag SNOW_LAYER_CAN_SURVIVE_ON = BlockTypeTags.key(ResourceKey.minecraft("snow_layer_can_survive_on")); - public static final Tag SNOW_LAYER_CANNOT_SURVIVE_ON = BlockTypeTags.key(ResourceKey.minecraft("snow_layer_cannot_survive_on")); + public static final DefaultedTag SNOW_LAYER_CANNOT_SURVIVE_ON = BlockTypeTags.key(ResourceKey.minecraft("snow_layer_cannot_survive_on")); - public static final Tag SOUL_FIRE_BASE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("soul_fire_base_blocks")); + public static final DefaultedTag SOUL_FIRE_BASE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("soul_fire_base_blocks")); - public static final Tag SOUL_SPEED_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("soul_speed_blocks")); + public static final DefaultedTag SOUL_SPEED_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("soul_speed_blocks")); - public static final Tag SPRUCE_LOGS = BlockTypeTags.key(ResourceKey.minecraft("spruce_logs")); + public static final DefaultedTag SPRUCE_LOGS = BlockTypeTags.key(ResourceKey.minecraft("spruce_logs")); - public static final Tag STAIRS = BlockTypeTags.key(ResourceKey.minecraft("stairs")); + public static final DefaultedTag STAIRS = BlockTypeTags.key(ResourceKey.minecraft("stairs")); - public static final Tag STANDING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("standing_signs")); + public static final DefaultedTag STANDING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("standing_signs")); - public static final Tag STONE_BRICKS = BlockTypeTags.key(ResourceKey.minecraft("stone_bricks")); + public static final DefaultedTag STONE_BRICKS = BlockTypeTags.key(ResourceKey.minecraft("stone_bricks")); - public static final Tag STONE_BUTTONS = BlockTypeTags.key(ResourceKey.minecraft("stone_buttons")); + public static final DefaultedTag STONE_BUTTONS = BlockTypeTags.key(ResourceKey.minecraft("stone_buttons")); - public static final Tag STONE_ORE_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("stone_ore_replaceables")); + public static final DefaultedTag STONE_ORE_REPLACEABLES = BlockTypeTags.key(ResourceKey.minecraft("stone_ore_replaceables")); - public static final Tag STONE_PRESSURE_PLATES = BlockTypeTags.key(ResourceKey.minecraft("stone_pressure_plates")); + public static final DefaultedTag STONE_PRESSURE_PLATES = BlockTypeTags.key(ResourceKey.minecraft("stone_pressure_plates")); - public static final Tag STRIDER_WARM_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("strider_warm_blocks")); + public static final DefaultedTag STRIDER_WARM_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("strider_warm_blocks")); - public static final Tag SWORD_EFFICIENT = BlockTypeTags.key(ResourceKey.minecraft("sword_efficient")); + public static final DefaultedTag SWORD_EFFICIENT = BlockTypeTags.key(ResourceKey.minecraft("sword_efficient")); - public static final Tag TERRACOTTA = BlockTypeTags.key(ResourceKey.minecraft("terracotta")); + public static final DefaultedTag TERRACOTTA = BlockTypeTags.key(ResourceKey.minecraft("terracotta")); - public static final Tag TRAIL_RUINS_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("trail_ruins_replaceable")); + public static final DefaultedTag TRAIL_RUINS_REPLACEABLE = BlockTypeTags.key(ResourceKey.minecraft("trail_ruins_replaceable")); - public static final Tag TRAPDOORS = BlockTypeTags.key(ResourceKey.minecraft("trapdoors")); + public static final DefaultedTag TRAPDOORS = BlockTypeTags.key(ResourceKey.minecraft("trapdoors")); - public static final Tag UNDERWATER_BONEMEALS = BlockTypeTags.key(ResourceKey.minecraft("underwater_bonemeals")); + public static final DefaultedTag UNDERWATER_BONEMEALS = BlockTypeTags.key(ResourceKey.minecraft("underwater_bonemeals")); - public static final Tag UNSTABLE_BOTTOM_CENTER = BlockTypeTags.key(ResourceKey.minecraft("unstable_bottom_center")); + public static final DefaultedTag UNSTABLE_BOTTOM_CENTER = BlockTypeTags.key(ResourceKey.minecraft("unstable_bottom_center")); - public static final Tag VALID_SPAWN = BlockTypeTags.key(ResourceKey.minecraft("valid_spawn")); + public static final DefaultedTag VALID_SPAWN = BlockTypeTags.key(ResourceKey.minecraft("valid_spawn")); - public static final Tag VIBRATION_RESONATORS = BlockTypeTags.key(ResourceKey.minecraft("vibration_resonators")); + public static final DefaultedTag VIBRATION_RESONATORS = BlockTypeTags.key(ResourceKey.minecraft("vibration_resonators")); - public static final Tag WALL_CORALS = BlockTypeTags.key(ResourceKey.minecraft("wall_corals")); + public static final DefaultedTag WALL_CORALS = BlockTypeTags.key(ResourceKey.minecraft("wall_corals")); - public static final Tag WALL_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("wall_hanging_signs")); + public static final DefaultedTag WALL_HANGING_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("wall_hanging_signs")); - public static final Tag WALL_POST_OVERRIDE = BlockTypeTags.key(ResourceKey.minecraft("wall_post_override")); + public static final DefaultedTag WALL_POST_OVERRIDE = BlockTypeTags.key(ResourceKey.minecraft("wall_post_override")); - public static final Tag WALL_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("wall_signs")); + public static final DefaultedTag WALL_SIGNS = BlockTypeTags.key(ResourceKey.minecraft("wall_signs")); - public static final Tag WALLS = BlockTypeTags.key(ResourceKey.minecraft("walls")); + public static final DefaultedTag WALLS = BlockTypeTags.key(ResourceKey.minecraft("walls")); - public static final Tag WARPED_STEMS = BlockTypeTags.key(ResourceKey.minecraft("warped_stems")); + public static final DefaultedTag WARPED_STEMS = BlockTypeTags.key(ResourceKey.minecraft("warped_stems")); - public static final Tag WART_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("wart_blocks")); + public static final DefaultedTag WART_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("wart_blocks")); - public static final Tag WITHER_IMMUNE = BlockTypeTags.key(ResourceKey.minecraft("wither_immune")); + public static final DefaultedTag WITHER_IMMUNE = BlockTypeTags.key(ResourceKey.minecraft("wither_immune")); - public static final Tag WITHER_SUMMON_BASE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("wither_summon_base_blocks")); + public static final DefaultedTag WITHER_SUMMON_BASE_BLOCKS = BlockTypeTags.key(ResourceKey.minecraft("wither_summon_base_blocks")); - public static final Tag WOLVES_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("wolves_spawnable_on")); + public static final DefaultedTag WOLVES_SPAWNABLE_ON = BlockTypeTags.key(ResourceKey.minecraft("wolves_spawnable_on")); - public static final Tag WOODEN_BUTTONS = BlockTypeTags.key(ResourceKey.minecraft("wooden_buttons")); + public static final DefaultedTag WOODEN_BUTTONS = BlockTypeTags.key(ResourceKey.minecraft("wooden_buttons")); - public static final Tag WOODEN_DOORS = BlockTypeTags.key(ResourceKey.minecraft("wooden_doors")); + public static final DefaultedTag WOODEN_DOORS = BlockTypeTags.key(ResourceKey.minecraft("wooden_doors")); - public static final Tag WOODEN_FENCES = BlockTypeTags.key(ResourceKey.minecraft("wooden_fences")); + public static final DefaultedTag WOODEN_FENCES = BlockTypeTags.key(ResourceKey.minecraft("wooden_fences")); - public static final Tag WOODEN_PRESSURE_PLATES = BlockTypeTags.key(ResourceKey.minecraft("wooden_pressure_plates")); + public static final DefaultedTag WOODEN_PRESSURE_PLATES = BlockTypeTags.key(ResourceKey.minecraft("wooden_pressure_plates")); - public static final Tag WOODEN_SLABS = BlockTypeTags.key(ResourceKey.minecraft("wooden_slabs")); + public static final DefaultedTag WOODEN_SLABS = BlockTypeTags.key(ResourceKey.minecraft("wooden_slabs")); - public static final Tag WOODEN_STAIRS = BlockTypeTags.key(ResourceKey.minecraft("wooden_stairs")); + public static final DefaultedTag WOODEN_STAIRS = BlockTypeTags.key(ResourceKey.minecraft("wooden_stairs")); - public static final Tag WOODEN_TRAPDOORS = BlockTypeTags.key(ResourceKey.minecraft("wooden_trapdoors")); + public static final DefaultedTag WOODEN_TRAPDOORS = BlockTypeTags.key(ResourceKey.minecraft("wooden_trapdoors")); - public static final Tag WOOL = BlockTypeTags.key(ResourceKey.minecraft("wool")); + public static final DefaultedTag WOOL = BlockTypeTags.key(ResourceKey.minecraft("wool")); - public static final Tag WOOL_CARPETS = BlockTypeTags.key(ResourceKey.minecraft("wool_carpets")); + public static final DefaultedTag WOOL_CARPETS = BlockTypeTags.key(ResourceKey.minecraft("wool_carpets")); private BlockTypeTags() { } - private static Tag key(final ResourceKey key) { - return Tag.of(RegistryTypes.BLOCK_TYPE, key); + private static DefaultedTag key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.BLOCK_TYPE, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java b/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java index 223a04dc6a..742bc524b7 100644 --- a/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/DamageTypeTags.java @@ -37,76 +37,76 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class DamageTypeTags { - public static final Tag ALWAYS_HURTS_ENDER_DRAGONS = DamageTypeTags.key(ResourceKey.minecraft("always_hurts_ender_dragons")); + public static final DefaultedTag ALWAYS_HURTS_ENDER_DRAGONS = DamageTypeTags.key(ResourceKey.minecraft("always_hurts_ender_dragons")); - public static final Tag ALWAYS_KILLS_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("always_kills_armor_stands")); + public static final DefaultedTag ALWAYS_KILLS_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("always_kills_armor_stands")); - public static final Tag ALWAYS_MOST_SIGNIFICANT_FALL = DamageTypeTags.key(ResourceKey.minecraft("always_most_significant_fall")); + public static final DefaultedTag ALWAYS_MOST_SIGNIFICANT_FALL = DamageTypeTags.key(ResourceKey.minecraft("always_most_significant_fall")); - public static final Tag ALWAYS_TRIGGERS_SILVERFISH = DamageTypeTags.key(ResourceKey.minecraft("always_triggers_silverfish")); + public static final DefaultedTag ALWAYS_TRIGGERS_SILVERFISH = DamageTypeTags.key(ResourceKey.minecraft("always_triggers_silverfish")); - public static final Tag AVOIDS_GUARDIAN_THORNS = DamageTypeTags.key(ResourceKey.minecraft("avoids_guardian_thorns")); + public static final DefaultedTag AVOIDS_GUARDIAN_THORNS = DamageTypeTags.key(ResourceKey.minecraft("avoids_guardian_thorns")); - public static final Tag BURN_FROM_STEPPING = DamageTypeTags.key(ResourceKey.minecraft("burn_from_stepping")); + public static final DefaultedTag BURN_FROM_STEPPING = DamageTypeTags.key(ResourceKey.minecraft("burn_from_stepping")); - public static final Tag BURNS_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("burns_armor_stands")); + public static final DefaultedTag BURNS_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("burns_armor_stands")); - public static final Tag BYPASSES_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_armor")); + public static final DefaultedTag BYPASSES_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_armor")); - public static final Tag BYPASSES_EFFECTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_effects")); + public static final DefaultedTag BYPASSES_EFFECTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_effects")); - public static final Tag BYPASSES_ENCHANTMENTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_enchantments")); + public static final DefaultedTag BYPASSES_ENCHANTMENTS = DamageTypeTags.key(ResourceKey.minecraft("bypasses_enchantments")); - public static final Tag BYPASSES_INVULNERABILITY = DamageTypeTags.key(ResourceKey.minecraft("bypasses_invulnerability")); + public static final DefaultedTag BYPASSES_INVULNERABILITY = DamageTypeTags.key(ResourceKey.minecraft("bypasses_invulnerability")); - public static final Tag BYPASSES_RESISTANCE = DamageTypeTags.key(ResourceKey.minecraft("bypasses_resistance")); + public static final DefaultedTag BYPASSES_RESISTANCE = DamageTypeTags.key(ResourceKey.minecraft("bypasses_resistance")); - public static final Tag BYPASSES_SHIELD = DamageTypeTags.key(ResourceKey.minecraft("bypasses_shield")); + public static final DefaultedTag BYPASSES_SHIELD = DamageTypeTags.key(ResourceKey.minecraft("bypasses_shield")); - public static final Tag BYPASSES_WOLF_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_wolf_armor")); + public static final DefaultedTag BYPASSES_WOLF_ARMOR = DamageTypeTags.key(ResourceKey.minecraft("bypasses_wolf_armor")); - public static final Tag CAN_BREAK_ARMOR_STAND = DamageTypeTags.key(ResourceKey.minecraft("can_break_armor_stand")); + public static final DefaultedTag CAN_BREAK_ARMOR_STAND = DamageTypeTags.key(ResourceKey.minecraft("can_break_armor_stand")); - public static final Tag DAMAGES_HELMET = DamageTypeTags.key(ResourceKey.minecraft("damages_helmet")); + public static final DefaultedTag DAMAGES_HELMET = DamageTypeTags.key(ResourceKey.minecraft("damages_helmet")); - public static final Tag IGNITES_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("ignites_armor_stands")); + public static final DefaultedTag IGNITES_ARMOR_STANDS = DamageTypeTags.key(ResourceKey.minecraft("ignites_armor_stands")); - public static final Tag IS_DROWNING = DamageTypeTags.key(ResourceKey.minecraft("is_drowning")); + public static final DefaultedTag IS_DROWNING = DamageTypeTags.key(ResourceKey.minecraft("is_drowning")); - public static final Tag IS_EXPLOSION = DamageTypeTags.key(ResourceKey.minecraft("is_explosion")); + public static final DefaultedTag IS_EXPLOSION = DamageTypeTags.key(ResourceKey.minecraft("is_explosion")); - public static final Tag IS_FALL = DamageTypeTags.key(ResourceKey.minecraft("is_fall")); + public static final DefaultedTag IS_FALL = DamageTypeTags.key(ResourceKey.minecraft("is_fall")); - public static final Tag IS_FIRE = DamageTypeTags.key(ResourceKey.minecraft("is_fire")); + public static final DefaultedTag IS_FIRE = DamageTypeTags.key(ResourceKey.minecraft("is_fire")); - public static final Tag IS_FREEZING = DamageTypeTags.key(ResourceKey.minecraft("is_freezing")); + public static final DefaultedTag IS_FREEZING = DamageTypeTags.key(ResourceKey.minecraft("is_freezing")); - public static final Tag IS_LIGHTNING = DamageTypeTags.key(ResourceKey.minecraft("is_lightning")); + public static final DefaultedTag IS_LIGHTNING = DamageTypeTags.key(ResourceKey.minecraft("is_lightning")); - public static final Tag IS_PLAYER_ATTACK = DamageTypeTags.key(ResourceKey.minecraft("is_player_attack")); + public static final DefaultedTag IS_PLAYER_ATTACK = DamageTypeTags.key(ResourceKey.minecraft("is_player_attack")); - public static final Tag IS_PROJECTILE = DamageTypeTags.key(ResourceKey.minecraft("is_projectile")); + public static final DefaultedTag IS_PROJECTILE = DamageTypeTags.key(ResourceKey.minecraft("is_projectile")); - public static final Tag MACE_SMASH = DamageTypeTags.key(ResourceKey.minecraft("mace_smash")); + public static final DefaultedTag MACE_SMASH = DamageTypeTags.key(ResourceKey.minecraft("mace_smash")); - public static final Tag NO_ANGER = DamageTypeTags.key(ResourceKey.minecraft("no_anger")); + public static final DefaultedTag NO_ANGER = DamageTypeTags.key(ResourceKey.minecraft("no_anger")); - public static final Tag NO_IMPACT = DamageTypeTags.key(ResourceKey.minecraft("no_impact")); + public static final DefaultedTag NO_IMPACT = DamageTypeTags.key(ResourceKey.minecraft("no_impact")); - public static final Tag NO_KNOCKBACK = DamageTypeTags.key(ResourceKey.minecraft("no_knockback")); + public static final DefaultedTag NO_KNOCKBACK = DamageTypeTags.key(ResourceKey.minecraft("no_knockback")); - public static final Tag PANIC_CAUSES = DamageTypeTags.key(ResourceKey.minecraft("panic_causes")); + public static final DefaultedTag PANIC_CAUSES = DamageTypeTags.key(ResourceKey.minecraft("panic_causes")); - public static final Tag PANIC_ENVIRONMENTAL_CAUSES = DamageTypeTags.key(ResourceKey.minecraft("panic_environmental_causes")); + public static final DefaultedTag PANIC_ENVIRONMENTAL_CAUSES = DamageTypeTags.key(ResourceKey.minecraft("panic_environmental_causes")); - public static final Tag WITCH_RESISTANT_TO = DamageTypeTags.key(ResourceKey.minecraft("witch_resistant_to")); + public static final DefaultedTag WITCH_RESISTANT_TO = DamageTypeTags.key(ResourceKey.minecraft("witch_resistant_to")); - public static final Tag WITHER_IMMUNE_TO = DamageTypeTags.key(ResourceKey.minecraft("wither_immune_to")); + public static final DefaultedTag WITHER_IMMUNE_TO = DamageTypeTags.key(ResourceKey.minecraft("wither_immune_to")); private DamageTypeTags() { } - private static Tag key(final ResourceKey key) { - return Tag.of(RegistryTypes.DAMAGE_TYPE, key); + private static DefaultedTag key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.DAMAGE_TYPE, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/DefaultedTag.java b/src/main/java/org/spongepowered/api/tag/DefaultedTag.java new file mode 100644 index 0000000000..41d3fe99af --- /dev/null +++ b/src/main/java/org/spongepowered/api/tag/DefaultedTag.java @@ -0,0 +1,77 @@ +/* + * This file is part of SpongeAPI, licensed under the MIT License (MIT). + * + * Copyright (c) SpongePowered + * Copyright (c) contributors + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package org.spongepowered.api.tag; + +import org.spongepowered.api.ResourceKey; +import org.spongepowered.api.registry.DefaultedRegistryType; +import org.spongepowered.api.registry.RegistryHolder; +import org.spongepowered.api.registry.ValueNotFoundException; + +import java.util.function.Supplier; +import java.util.stream.Stream; + +/** + * A {@link Tag} paired with the {@link RegistryHolder}. + */ +public interface DefaultedTag extends Tag { + + static DefaultedTag of(final DefaultedRegistryType registryType, final ResourceKey location) { + return Tag.of(registryType, location).asDefaultedTag(registryType.defaultHolder()); + } + + Supplier defaultHolder(); + + /** + * Returns the {@link Stream} of values tagged by this tag. + * + *

Great care needs to be made in calling this method with any uncertainty as to + * if the {@link #registry()} will exist in the holder. Should the key lack a value, + * a {@link ValueNotFoundException} will be thrown. Therefore, it is advised to call + * {@link #findValues()} instead.

+ * + * @return The {@link Stream} of values + */ + default Stream values() { + return this.defaultHolder().get().registry(this.registry()).taggedValues(this); + } + + /** + * Returns the {@link Stream} of values tagged by this tag in the holder + * if it contains this tag's {@link #registry()}, or {@link Stream#empty()} otherwise. + * + * @return The {@link Stream} of values + */ + default Stream findValues() { + return this.defaultHolder().get().findRegistry(this.registry()).map(r -> r.taggedValues(this)).orElseGet(Stream::empty); + } + + /** + * Returns whether this tag is associated with the given value. + * + * @param value The value + * @return true if this tag is associated with the given value + */ + boolean contains(T value); +} diff --git a/src/main/java/org/spongepowered/api/tag/EnchantmenTypeTags.java b/src/main/java/org/spongepowered/api/tag/EnchantmenTypeTags.java index 8aa8690bbf..16c706638b 100644 --- a/src/main/java/org/spongepowered/api/tag/EnchantmenTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/EnchantmenTypeTags.java @@ -37,54 +37,54 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class EnchantmenTypeTags { - public static final Tag CURSE = EnchantmenTypeTags.key(ResourceKey.minecraft("curse")); + public static final DefaultedTag CURSE = EnchantmenTypeTags.key(ResourceKey.minecraft("curse")); - public static final Tag DOUBLE_TRADE_PRICE = EnchantmenTypeTags.key(ResourceKey.minecraft("double_trade_price")); + public static final DefaultedTag DOUBLE_TRADE_PRICE = EnchantmenTypeTags.key(ResourceKey.minecraft("double_trade_price")); - public static final Tag EXCLUSIVE_SET_ARMOR = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/armor")); + public static final DefaultedTag EXCLUSIVE_SET_ARMOR = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/armor")); - public static final Tag EXCLUSIVE_SET_BOOTS = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/boots")); + public static final DefaultedTag EXCLUSIVE_SET_BOOTS = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/boots")); - public static final Tag EXCLUSIVE_SET_BOW = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/bow")); + public static final DefaultedTag EXCLUSIVE_SET_BOW = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/bow")); - public static final Tag EXCLUSIVE_SET_CROSSBOW = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/crossbow")); + public static final DefaultedTag EXCLUSIVE_SET_CROSSBOW = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/crossbow")); - public static final Tag EXCLUSIVE_SET_DAMAGE = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/damage")); + public static final DefaultedTag EXCLUSIVE_SET_DAMAGE = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/damage")); - public static final Tag EXCLUSIVE_SET_MINING = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/mining")); + public static final DefaultedTag EXCLUSIVE_SET_MINING = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/mining")); - public static final Tag EXCLUSIVE_SET_RIPTIDE = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/riptide")); + public static final DefaultedTag EXCLUSIVE_SET_RIPTIDE = EnchantmenTypeTags.key(ResourceKey.minecraft("exclusive_set/riptide")); - public static final Tag IN_ENCHANTING_TABLE = EnchantmenTypeTags.key(ResourceKey.minecraft("in_enchanting_table")); + public static final DefaultedTag IN_ENCHANTING_TABLE = EnchantmenTypeTags.key(ResourceKey.minecraft("in_enchanting_table")); - public static final Tag NON_TREASURE = EnchantmenTypeTags.key(ResourceKey.minecraft("non_treasure")); + public static final DefaultedTag NON_TREASURE = EnchantmenTypeTags.key(ResourceKey.minecraft("non_treasure")); - public static final Tag ON_MOB_SPAWN_EQUIPMENT = EnchantmenTypeTags.key(ResourceKey.minecraft("on_mob_spawn_equipment")); + public static final DefaultedTag ON_MOB_SPAWN_EQUIPMENT = EnchantmenTypeTags.key(ResourceKey.minecraft("on_mob_spawn_equipment")); - public static final Tag ON_RANDOM_LOOT = EnchantmenTypeTags.key(ResourceKey.minecraft("on_random_loot")); + public static final DefaultedTag ON_RANDOM_LOOT = EnchantmenTypeTags.key(ResourceKey.minecraft("on_random_loot")); - public static final Tag ON_TRADED_EQUIPMENT = EnchantmenTypeTags.key(ResourceKey.minecraft("on_traded_equipment")); + public static final DefaultedTag ON_TRADED_EQUIPMENT = EnchantmenTypeTags.key(ResourceKey.minecraft("on_traded_equipment")); - public static final Tag PREVENTS_BEE_SPAWNS_WHEN_MINING = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_bee_spawns_when_mining")); + public static final DefaultedTag PREVENTS_BEE_SPAWNS_WHEN_MINING = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_bee_spawns_when_mining")); - public static final Tag PREVENTS_DECORATED_POT_SHATTERING = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_decorated_pot_shattering")); + public static final DefaultedTag PREVENTS_DECORATED_POT_SHATTERING = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_decorated_pot_shattering")); - public static final Tag PREVENTS_ICE_MELTING = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_ice_melting")); + public static final DefaultedTag PREVENTS_ICE_MELTING = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_ice_melting")); - public static final Tag PREVENTS_INFESTED_SPAWNS = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_infested_spawns")); + public static final DefaultedTag PREVENTS_INFESTED_SPAWNS = EnchantmenTypeTags.key(ResourceKey.minecraft("prevents_infested_spawns")); - public static final Tag SMELTS_LOOT = EnchantmenTypeTags.key(ResourceKey.minecraft("smelts_loot")); + public static final DefaultedTag SMELTS_LOOT = EnchantmenTypeTags.key(ResourceKey.minecraft("smelts_loot")); - public static final Tag TOOLTIP_ORDER = EnchantmenTypeTags.key(ResourceKey.minecraft("tooltip_order")); + public static final DefaultedTag TOOLTIP_ORDER = EnchantmenTypeTags.key(ResourceKey.minecraft("tooltip_order")); - public static final Tag TRADEABLE = EnchantmenTypeTags.key(ResourceKey.minecraft("tradeable")); + public static final DefaultedTag TRADEABLE = EnchantmenTypeTags.key(ResourceKey.minecraft("tradeable")); - public static final Tag TREASURE = EnchantmenTypeTags.key(ResourceKey.minecraft("treasure")); + public static final DefaultedTag TREASURE = EnchantmenTypeTags.key(ResourceKey.minecraft("treasure")); private EnchantmenTypeTags() { } - private static Tag key(final ResourceKey key) { - return Tag.of(RegistryTypes.ENCHANTMENT_TYPE, key); + private static DefaultedTag key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.ENCHANTMENT_TYPE, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java index 11667a8654..efc76b9848 100644 --- a/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/EntityTypeTags.java @@ -37,80 +37,80 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class EntityTypeTags { - public static final Tag> AQUATIC = EntityTypeTags.key(ResourceKey.minecraft("aquatic")); + public static final DefaultedTag> AQUATIC = EntityTypeTags.key(ResourceKey.minecraft("aquatic")); - public static final Tag> ARROWS = EntityTypeTags.key(ResourceKey.minecraft("arrows")); + public static final DefaultedTag> ARROWS = EntityTypeTags.key(ResourceKey.minecraft("arrows")); - public static final Tag> ARTHROPOD = EntityTypeTags.key(ResourceKey.minecraft("arthropod")); + public static final DefaultedTag> ARTHROPOD = EntityTypeTags.key(ResourceKey.minecraft("arthropod")); - public static final Tag> AXOLOTL_ALWAYS_HOSTILES = EntityTypeTags.key(ResourceKey.minecraft("axolotl_always_hostiles")); + public static final DefaultedTag> AXOLOTL_ALWAYS_HOSTILES = EntityTypeTags.key(ResourceKey.minecraft("axolotl_always_hostiles")); - public static final Tag> AXOLOTL_HUNT_TARGETS = EntityTypeTags.key(ResourceKey.minecraft("axolotl_hunt_targets")); + public static final DefaultedTag> AXOLOTL_HUNT_TARGETS = EntityTypeTags.key(ResourceKey.minecraft("axolotl_hunt_targets")); - public static final Tag> BEEHIVE_INHABITORS = EntityTypeTags.key(ResourceKey.minecraft("beehive_inhabitors")); + public static final DefaultedTag> BEEHIVE_INHABITORS = EntityTypeTags.key(ResourceKey.minecraft("beehive_inhabitors")); - public static final Tag> BOAT = EntityTypeTags.key(ResourceKey.minecraft("boat")); + public static final DefaultedTag> BOAT = EntityTypeTags.key(ResourceKey.minecraft("boat")); - public static final Tag> CAN_BREATHE_UNDER_WATER = EntityTypeTags.key(ResourceKey.minecraft("can_breathe_under_water")); + public static final DefaultedTag> CAN_BREATHE_UNDER_WATER = EntityTypeTags.key(ResourceKey.minecraft("can_breathe_under_water")); - public static final Tag> CAN_TURN_IN_BOATS = EntityTypeTags.key(ResourceKey.minecraft("can_turn_in_boats")); + public static final DefaultedTag> CAN_TURN_IN_BOATS = EntityTypeTags.key(ResourceKey.minecraft("can_turn_in_boats")); - public static final Tag> DEFLECTS_PROJECTILES = EntityTypeTags.key(ResourceKey.minecraft("deflects_projectiles")); + public static final DefaultedTag> DEFLECTS_PROJECTILES = EntityTypeTags.key(ResourceKey.minecraft("deflects_projectiles")); - public static final Tag> DISMOUNTS_UNDERWATER = EntityTypeTags.key(ResourceKey.minecraft("dismounts_underwater")); + public static final DefaultedTag> DISMOUNTS_UNDERWATER = EntityTypeTags.key(ResourceKey.minecraft("dismounts_underwater")); - public static final Tag> FALL_DAMAGE_IMMUNE = EntityTypeTags.key(ResourceKey.minecraft("fall_damage_immune")); + public static final DefaultedTag> FALL_DAMAGE_IMMUNE = EntityTypeTags.key(ResourceKey.minecraft("fall_damage_immune")); - public static final Tag> FREEZE_HURTS_EXTRA_TYPES = EntityTypeTags.key(ResourceKey.minecraft("freeze_hurts_extra_types")); + public static final DefaultedTag> FREEZE_HURTS_EXTRA_TYPES = EntityTypeTags.key(ResourceKey.minecraft("freeze_hurts_extra_types")); - public static final Tag> FREEZE_IMMUNE_ENTITY_TYPES = EntityTypeTags.key(ResourceKey.minecraft("freeze_immune_entity_types")); + public static final DefaultedTag> FREEZE_IMMUNE_ENTITY_TYPES = EntityTypeTags.key(ResourceKey.minecraft("freeze_immune_entity_types")); - public static final Tag> FROG_FOOD = EntityTypeTags.key(ResourceKey.minecraft("frog_food")); + public static final DefaultedTag> FROG_FOOD = EntityTypeTags.key(ResourceKey.minecraft("frog_food")); - public static final Tag> IGNORES_POISON_AND_REGEN = EntityTypeTags.key(ResourceKey.minecraft("ignores_poison_and_regen")); + public static final DefaultedTag> IGNORES_POISON_AND_REGEN = EntityTypeTags.key(ResourceKey.minecraft("ignores_poison_and_regen")); - public static final Tag> ILLAGER = EntityTypeTags.key(ResourceKey.minecraft("illager")); + public static final DefaultedTag> ILLAGER = EntityTypeTags.key(ResourceKey.minecraft("illager")); - public static final Tag> ILLAGER_FRIENDS = EntityTypeTags.key(ResourceKey.minecraft("illager_friends")); + public static final DefaultedTag> ILLAGER_FRIENDS = EntityTypeTags.key(ResourceKey.minecraft("illager_friends")); - public static final Tag> IMMUNE_TO_INFESTED = EntityTypeTags.key(ResourceKey.minecraft("immune_to_infested")); + public static final DefaultedTag> IMMUNE_TO_INFESTED = EntityTypeTags.key(ResourceKey.minecraft("immune_to_infested")); - public static final Tag> IMMUNE_TO_OOZING = EntityTypeTags.key(ResourceKey.minecraft("immune_to_oozing")); + public static final DefaultedTag> IMMUNE_TO_OOZING = EntityTypeTags.key(ResourceKey.minecraft("immune_to_oozing")); - public static final Tag> IMPACT_PROJECTILES = EntityTypeTags.key(ResourceKey.minecraft("impact_projectiles")); + public static final DefaultedTag> IMPACT_PROJECTILES = EntityTypeTags.key(ResourceKey.minecraft("impact_projectiles")); - public static final Tag> INVERTED_HEALING_AND_HARM = EntityTypeTags.key(ResourceKey.minecraft("inverted_healing_and_harm")); + public static final DefaultedTag> INVERTED_HEALING_AND_HARM = EntityTypeTags.key(ResourceKey.minecraft("inverted_healing_and_harm")); - public static final Tag> NO_ANGER_FROM_WIND_CHARGE = EntityTypeTags.key(ResourceKey.minecraft("no_anger_from_wind_charge")); + public static final DefaultedTag> NO_ANGER_FROM_WIND_CHARGE = EntityTypeTags.key(ResourceKey.minecraft("no_anger_from_wind_charge")); - public static final Tag> NON_CONTROLLING_RIDER = EntityTypeTags.key(ResourceKey.minecraft("non_controlling_rider")); + public static final DefaultedTag> NON_CONTROLLING_RIDER = EntityTypeTags.key(ResourceKey.minecraft("non_controlling_rider")); - public static final Tag> NOT_SCARY_FOR_PUFFERFISH = EntityTypeTags.key(ResourceKey.minecraft("not_scary_for_pufferfish")); + public static final DefaultedTag> NOT_SCARY_FOR_PUFFERFISH = EntityTypeTags.key(ResourceKey.minecraft("not_scary_for_pufferfish")); - public static final Tag> POWDER_SNOW_WALKABLE_MOBS = EntityTypeTags.key(ResourceKey.minecraft("powder_snow_walkable_mobs")); + public static final DefaultedTag> POWDER_SNOW_WALKABLE_MOBS = EntityTypeTags.key(ResourceKey.minecraft("powder_snow_walkable_mobs")); - public static final Tag> RAIDERS = EntityTypeTags.key(ResourceKey.minecraft("raiders")); + public static final DefaultedTag> RAIDERS = EntityTypeTags.key(ResourceKey.minecraft("raiders")); - public static final Tag> REDIRECTABLE_PROJECTILE = EntityTypeTags.key(ResourceKey.minecraft("redirectable_projectile")); + public static final DefaultedTag> REDIRECTABLE_PROJECTILE = EntityTypeTags.key(ResourceKey.minecraft("redirectable_projectile")); - public static final Tag> SENSITIVE_TO_BANE_OF_ARTHROPODS = EntityTypeTags.key(ResourceKey.minecraft("sensitive_to_bane_of_arthropods")); + public static final DefaultedTag> SENSITIVE_TO_BANE_OF_ARTHROPODS = EntityTypeTags.key(ResourceKey.minecraft("sensitive_to_bane_of_arthropods")); - public static final Tag> SENSITIVE_TO_IMPALING = EntityTypeTags.key(ResourceKey.minecraft("sensitive_to_impaling")); + public static final DefaultedTag> SENSITIVE_TO_IMPALING = EntityTypeTags.key(ResourceKey.minecraft("sensitive_to_impaling")); - public static final Tag> SENSITIVE_TO_SMITE = EntityTypeTags.key(ResourceKey.minecraft("sensitive_to_smite")); + public static final DefaultedTag> SENSITIVE_TO_SMITE = EntityTypeTags.key(ResourceKey.minecraft("sensitive_to_smite")); - public static final Tag> SKELETONS = EntityTypeTags.key(ResourceKey.minecraft("skeletons")); + public static final DefaultedTag> SKELETONS = EntityTypeTags.key(ResourceKey.minecraft("skeletons")); - public static final Tag> UNDEAD = EntityTypeTags.key(ResourceKey.minecraft("undead")); + public static final DefaultedTag> UNDEAD = EntityTypeTags.key(ResourceKey.minecraft("undead")); - public static final Tag> WITHER_FRIENDS = EntityTypeTags.key(ResourceKey.minecraft("wither_friends")); + public static final DefaultedTag> WITHER_FRIENDS = EntityTypeTags.key(ResourceKey.minecraft("wither_friends")); - public static final Tag> ZOMBIES = EntityTypeTags.key(ResourceKey.minecraft("zombies")); + public static final DefaultedTag> ZOMBIES = EntityTypeTags.key(ResourceKey.minecraft("zombies")); private EntityTypeTags() { } - private static Tag> key(final ResourceKey key) { - return Tag.of(RegistryTypes.ENTITY_TYPE, key); + private static DefaultedTag> key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.ENTITY_TYPE, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java b/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java index 7e6e151e92..303932643c 100644 --- a/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/FluidTypeTags.java @@ -37,14 +37,14 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class FluidTypeTags { - public static final Tag LAVA = FluidTypeTags.key(ResourceKey.minecraft("lava")); + public static final DefaultedTag LAVA = FluidTypeTags.key(ResourceKey.minecraft("lava")); - public static final Tag WATER = FluidTypeTags.key(ResourceKey.minecraft("water")); + public static final DefaultedTag WATER = FluidTypeTags.key(ResourceKey.minecraft("water")); private FluidTypeTags() { } - private static Tag key(final ResourceKey key) { - return Tag.of(RegistryTypes.FLUID_TYPE, key); + private static DefaultedTag key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.FLUID_TYPE, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java index 4d11bb1546..fd73f645ed 100644 --- a/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java +++ b/src/main/java/org/spongepowered/api/tag/ItemTypeTags.java @@ -37,356 +37,356 @@ @RegistryScopes(scopes = RegistryScope.GAME) public final class ItemTypeTags { - public static final Tag ACACIA_LOGS = ItemTypeTags.key(ResourceKey.minecraft("acacia_logs")); + public static final DefaultedTag ACACIA_LOGS = ItemTypeTags.key(ResourceKey.minecraft("acacia_logs")); - public static final Tag ANVIL = ItemTypeTags.key(ResourceKey.minecraft("anvil")); + public static final DefaultedTag ANVIL = ItemTypeTags.key(ResourceKey.minecraft("anvil")); - public static final Tag ARMADILLO_FOOD = ItemTypeTags.key(ResourceKey.minecraft("armadillo_food")); + public static final DefaultedTag ARMADILLO_FOOD = ItemTypeTags.key(ResourceKey.minecraft("armadillo_food")); - public static final Tag ARROWS = ItemTypeTags.key(ResourceKey.minecraft("arrows")); + public static final DefaultedTag ARROWS = ItemTypeTags.key(ResourceKey.minecraft("arrows")); - public static final Tag AXES = ItemTypeTags.key(ResourceKey.minecraft("axes")); + public static final DefaultedTag AXES = ItemTypeTags.key(ResourceKey.minecraft("axes")); - public static final Tag AXOLOTL_FOOD = ItemTypeTags.key(ResourceKey.minecraft("axolotl_food")); + public static final DefaultedTag AXOLOTL_FOOD = ItemTypeTags.key(ResourceKey.minecraft("axolotl_food")); - public static final Tag BAMBOO_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("bamboo_blocks")); + public static final DefaultedTag BAMBOO_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("bamboo_blocks")); - public static final Tag BANNERS = ItemTypeTags.key(ResourceKey.minecraft("banners")); + public static final DefaultedTag BANNERS = ItemTypeTags.key(ResourceKey.minecraft("banners")); - public static final Tag BEACON_PAYMENT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("beacon_payment_items")); + public static final DefaultedTag BEACON_PAYMENT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("beacon_payment_items")); - public static final Tag BEDS = ItemTypeTags.key(ResourceKey.minecraft("beds")); + public static final DefaultedTag BEDS = ItemTypeTags.key(ResourceKey.minecraft("beds")); - public static final Tag BEE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("bee_food")); + public static final DefaultedTag BEE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("bee_food")); - public static final Tag BIRCH_LOGS = ItemTypeTags.key(ResourceKey.minecraft("birch_logs")); + public static final DefaultedTag BIRCH_LOGS = ItemTypeTags.key(ResourceKey.minecraft("birch_logs")); - public static final Tag BOATS = ItemTypeTags.key(ResourceKey.minecraft("boats")); + public static final DefaultedTag BOATS = ItemTypeTags.key(ResourceKey.minecraft("boats")); - public static final Tag BOOKSHELF_BOOKS = ItemTypeTags.key(ResourceKey.minecraft("bookshelf_books")); + public static final DefaultedTag BOOKSHELF_BOOKS = ItemTypeTags.key(ResourceKey.minecraft("bookshelf_books")); - public static final Tag BREAKS_DECORATED_POTS = ItemTypeTags.key(ResourceKey.minecraft("breaks_decorated_pots")); + public static final DefaultedTag BREAKS_DECORATED_POTS = ItemTypeTags.key(ResourceKey.minecraft("breaks_decorated_pots")); - public static final Tag BREWING_FUEL = ItemTypeTags.key(ResourceKey.minecraft("brewing_fuel")); + public static final DefaultedTag BREWING_FUEL = ItemTypeTags.key(ResourceKey.minecraft("brewing_fuel")); - public static final Tag BUNDLES = ItemTypeTags.key(ResourceKey.minecraft("bundles")); + public static final DefaultedTag BUNDLES = ItemTypeTags.key(ResourceKey.minecraft("bundles")); - public static final Tag BUTTONS = ItemTypeTags.key(ResourceKey.minecraft("buttons")); + public static final DefaultedTag BUTTONS = ItemTypeTags.key(ResourceKey.minecraft("buttons")); - public static final Tag CAMEL_FOOD = ItemTypeTags.key(ResourceKey.minecraft("camel_food")); + public static final DefaultedTag CAMEL_FOOD = ItemTypeTags.key(ResourceKey.minecraft("camel_food")); - public static final Tag CANDLES = ItemTypeTags.key(ResourceKey.minecraft("candles")); + public static final DefaultedTag CANDLES = ItemTypeTags.key(ResourceKey.minecraft("candles")); - public static final Tag CAT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("cat_food")); + public static final DefaultedTag CAT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("cat_food")); - public static final Tag CHERRY_LOGS = ItemTypeTags.key(ResourceKey.minecraft("cherry_logs")); + public static final DefaultedTag CHERRY_LOGS = ItemTypeTags.key(ResourceKey.minecraft("cherry_logs")); - public static final Tag CHEST_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("chest_armor")); + public static final DefaultedTag CHEST_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("chest_armor")); - public static final Tag CHEST_BOATS = ItemTypeTags.key(ResourceKey.minecraft("chest_boats")); + public static final DefaultedTag CHEST_BOATS = ItemTypeTags.key(ResourceKey.minecraft("chest_boats")); - public static final Tag CHICKEN_FOOD = ItemTypeTags.key(ResourceKey.minecraft("chicken_food")); + public static final DefaultedTag CHICKEN_FOOD = ItemTypeTags.key(ResourceKey.minecraft("chicken_food")); - public static final Tag CLUSTER_MAX_HARVESTABLES = ItemTypeTags.key(ResourceKey.minecraft("cluster_max_harvestables")); + public static final DefaultedTag CLUSTER_MAX_HARVESTABLES = ItemTypeTags.key(ResourceKey.minecraft("cluster_max_harvestables")); - public static final Tag COAL_ORES = ItemTypeTags.key(ResourceKey.minecraft("coal_ores")); + public static final DefaultedTag COAL_ORES = ItemTypeTags.key(ResourceKey.minecraft("coal_ores")); - public static final Tag COALS = ItemTypeTags.key(ResourceKey.minecraft("coals")); + public static final DefaultedTag COALS = ItemTypeTags.key(ResourceKey.minecraft("coals")); - public static final Tag COMPASSES = ItemTypeTags.key(ResourceKey.minecraft("compasses")); + public static final DefaultedTag COMPASSES = ItemTypeTags.key(ResourceKey.minecraft("compasses")); - public static final Tag COMPLETES_FIND_TREE_TUTORIAL = ItemTypeTags.key(ResourceKey.minecraft("completes_find_tree_tutorial")); + public static final DefaultedTag COMPLETES_FIND_TREE_TUTORIAL = ItemTypeTags.key(ResourceKey.minecraft("completes_find_tree_tutorial")); - public static final Tag COPPER_ORES = ItemTypeTags.key(ResourceKey.minecraft("copper_ores")); + public static final DefaultedTag COPPER_ORES = ItemTypeTags.key(ResourceKey.minecraft("copper_ores")); - public static final Tag COW_FOOD = ItemTypeTags.key(ResourceKey.minecraft("cow_food")); + public static final DefaultedTag COW_FOOD = ItemTypeTags.key(ResourceKey.minecraft("cow_food")); - public static final Tag CREEPER_DROP_MUSIC_DISCS = ItemTypeTags.key(ResourceKey.minecraft("creeper_drop_music_discs")); + public static final DefaultedTag CREEPER_DROP_MUSIC_DISCS = ItemTypeTags.key(ResourceKey.minecraft("creeper_drop_music_discs")); - public static final Tag CREEPER_IGNITERS = ItemTypeTags.key(ResourceKey.minecraft("creeper_igniters")); + public static final DefaultedTag CREEPER_IGNITERS = ItemTypeTags.key(ResourceKey.minecraft("creeper_igniters")); - public static final Tag CRIMSON_STEMS = ItemTypeTags.key(ResourceKey.minecraft("crimson_stems")); + public static final DefaultedTag CRIMSON_STEMS = ItemTypeTags.key(ResourceKey.minecraft("crimson_stems")); - public static final Tag DAMPENS_VIBRATIONS = ItemTypeTags.key(ResourceKey.minecraft("dampens_vibrations")); + public static final DefaultedTag DAMPENS_VIBRATIONS = ItemTypeTags.key(ResourceKey.minecraft("dampens_vibrations")); - public static final Tag DARK_OAK_LOGS = ItemTypeTags.key(ResourceKey.minecraft("dark_oak_logs")); + public static final DefaultedTag DARK_OAK_LOGS = ItemTypeTags.key(ResourceKey.minecraft("dark_oak_logs")); - public static final Tag DECORATED_POT_INGREDIENTS = ItemTypeTags.key(ResourceKey.minecraft("decorated_pot_ingredients")); + public static final DefaultedTag DECORATED_POT_INGREDIENTS = ItemTypeTags.key(ResourceKey.minecraft("decorated_pot_ingredients")); - public static final Tag DECORATED_POT_SHERDS = ItemTypeTags.key(ResourceKey.minecraft("decorated_pot_sherds")); + public static final DefaultedTag DECORATED_POT_SHERDS = ItemTypeTags.key(ResourceKey.minecraft("decorated_pot_sherds")); - public static final Tag DIAMOND_ORES = ItemTypeTags.key(ResourceKey.minecraft("diamond_ores")); + public static final DefaultedTag DIAMOND_ORES = ItemTypeTags.key(ResourceKey.minecraft("diamond_ores")); - public static final Tag DIAMOND_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("diamond_tool_materials")); + public static final DefaultedTag DIAMOND_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("diamond_tool_materials")); - public static final Tag DIRT = ItemTypeTags.key(ResourceKey.minecraft("dirt")); + public static final DefaultedTag DIRT = ItemTypeTags.key(ResourceKey.minecraft("dirt")); - public static final Tag DOORS = ItemTypeTags.key(ResourceKey.minecraft("doors")); + public static final DefaultedTag DOORS = ItemTypeTags.key(ResourceKey.minecraft("doors")); - public static final Tag DROWNED_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("drowned_preferred_weapons")); + public static final DefaultedTag DROWNED_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("drowned_preferred_weapons")); - public static final Tag DUPLICATES_ALLAYS = ItemTypeTags.key(ResourceKey.minecraft("duplicates_allays")); + public static final DefaultedTag DUPLICATES_ALLAYS = ItemTypeTags.key(ResourceKey.minecraft("duplicates_allays")); - public static final Tag DYEABLE = ItemTypeTags.key(ResourceKey.minecraft("dyeable")); + public static final DefaultedTag DYEABLE = ItemTypeTags.key(ResourceKey.minecraft("dyeable")); - public static final Tag EMERALD_ORES = ItemTypeTags.key(ResourceKey.minecraft("emerald_ores")); + public static final DefaultedTag EMERALD_ORES = ItemTypeTags.key(ResourceKey.minecraft("emerald_ores")); - public static final Tag ENCHANTABLE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/armor")); + public static final DefaultedTag ENCHANTABLE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/armor")); - public static final Tag ENCHANTABLE_BOW = ItemTypeTags.key(ResourceKey.minecraft("enchantable/bow")); + public static final DefaultedTag ENCHANTABLE_BOW = ItemTypeTags.key(ResourceKey.minecraft("enchantable/bow")); - public static final Tag ENCHANTABLE_CHEST_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/chest_armor")); + public static final DefaultedTag ENCHANTABLE_CHEST_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/chest_armor")); - public static final Tag ENCHANTABLE_CROSSBOW = ItemTypeTags.key(ResourceKey.minecraft("enchantable/crossbow")); + public static final DefaultedTag ENCHANTABLE_CROSSBOW = ItemTypeTags.key(ResourceKey.minecraft("enchantable/crossbow")); - public static final Tag ENCHANTABLE_DURABILITY = ItemTypeTags.key(ResourceKey.minecraft("enchantable/durability")); + public static final DefaultedTag ENCHANTABLE_DURABILITY = ItemTypeTags.key(ResourceKey.minecraft("enchantable/durability")); - public static final Tag ENCHANTABLE_EQUIPPABLE = ItemTypeTags.key(ResourceKey.minecraft("enchantable/equippable")); + public static final DefaultedTag ENCHANTABLE_EQUIPPABLE = ItemTypeTags.key(ResourceKey.minecraft("enchantable/equippable")); - public static final Tag ENCHANTABLE_FIRE_ASPECT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/fire_aspect")); + public static final DefaultedTag ENCHANTABLE_FIRE_ASPECT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/fire_aspect")); - public static final Tag ENCHANTABLE_FISHING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/fishing")); + public static final DefaultedTag ENCHANTABLE_FISHING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/fishing")); - public static final Tag ENCHANTABLE_FOOT_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/foot_armor")); + public static final DefaultedTag ENCHANTABLE_FOOT_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/foot_armor")); - public static final Tag ENCHANTABLE_HEAD_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/head_armor")); + public static final DefaultedTag ENCHANTABLE_HEAD_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/head_armor")); - public static final Tag ENCHANTABLE_LEG_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/leg_armor")); + public static final DefaultedTag ENCHANTABLE_LEG_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("enchantable/leg_armor")); - public static final Tag ENCHANTABLE_MACE = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mace")); + public static final DefaultedTag ENCHANTABLE_MACE = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mace")); - public static final Tag ENCHANTABLE_MINING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mining")); + public static final DefaultedTag ENCHANTABLE_MINING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mining")); - public static final Tag ENCHANTABLE_MINING_LOOT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mining_loot")); + public static final DefaultedTag ENCHANTABLE_MINING_LOOT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/mining_loot")); - public static final Tag ENCHANTABLE_SHARP_WEAPON = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sharp_weapon")); + public static final DefaultedTag ENCHANTABLE_SHARP_WEAPON = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sharp_weapon")); - public static final Tag ENCHANTABLE_SWORD = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sword")); + public static final DefaultedTag ENCHANTABLE_SWORD = ItemTypeTags.key(ResourceKey.minecraft("enchantable/sword")); - public static final Tag ENCHANTABLE_TRIDENT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/trident")); + public static final DefaultedTag ENCHANTABLE_TRIDENT = ItemTypeTags.key(ResourceKey.minecraft("enchantable/trident")); - public static final Tag ENCHANTABLE_VANISHING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/vanishing")); + public static final DefaultedTag ENCHANTABLE_VANISHING = ItemTypeTags.key(ResourceKey.minecraft("enchantable/vanishing")); - public static final Tag ENCHANTABLE_WEAPON = ItemTypeTags.key(ResourceKey.minecraft("enchantable/weapon")); + public static final DefaultedTag ENCHANTABLE_WEAPON = ItemTypeTags.key(ResourceKey.minecraft("enchantable/weapon")); - public static final Tag FENCE_GATES = ItemTypeTags.key(ResourceKey.minecraft("fence_gates")); + public static final DefaultedTag FENCE_GATES = ItemTypeTags.key(ResourceKey.minecraft("fence_gates")); - public static final Tag FENCES = ItemTypeTags.key(ResourceKey.minecraft("fences")); + public static final DefaultedTag FENCES = ItemTypeTags.key(ResourceKey.minecraft("fences")); - public static final Tag FISHES = ItemTypeTags.key(ResourceKey.minecraft("fishes")); + public static final DefaultedTag FISHES = ItemTypeTags.key(ResourceKey.minecraft("fishes")); - public static final Tag FOOT_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("foot_armor")); + public static final DefaultedTag FOOT_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("foot_armor")); - public static final Tag FOX_FOOD = ItemTypeTags.key(ResourceKey.minecraft("fox_food")); + public static final DefaultedTag FOX_FOOD = ItemTypeTags.key(ResourceKey.minecraft("fox_food")); - public static final Tag FREEZE_IMMUNE_WEARABLES = ItemTypeTags.key(ResourceKey.minecraft("freeze_immune_wearables")); + public static final DefaultedTag FREEZE_IMMUNE_WEARABLES = ItemTypeTags.key(ResourceKey.minecraft("freeze_immune_wearables")); - public static final Tag FROG_FOOD = ItemTypeTags.key(ResourceKey.minecraft("frog_food")); + public static final DefaultedTag FROG_FOOD = ItemTypeTags.key(ResourceKey.minecraft("frog_food")); - public static final Tag FURNACE_MINECART_FUEL = ItemTypeTags.key(ResourceKey.minecraft("furnace_minecart_fuel")); + public static final DefaultedTag FURNACE_MINECART_FUEL = ItemTypeTags.key(ResourceKey.minecraft("furnace_minecart_fuel")); - public static final Tag GAZE_DISGUISE_EQUIPMENT = ItemTypeTags.key(ResourceKey.minecraft("gaze_disguise_equipment")); + public static final DefaultedTag GAZE_DISGUISE_EQUIPMENT = ItemTypeTags.key(ResourceKey.minecraft("gaze_disguise_equipment")); - public static final Tag GOAT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("goat_food")); + public static final DefaultedTag GOAT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("goat_food")); - public static final Tag GOLD_ORES = ItemTypeTags.key(ResourceKey.minecraft("gold_ores")); + public static final DefaultedTag GOLD_ORES = ItemTypeTags.key(ResourceKey.minecraft("gold_ores")); - public static final Tag GOLD_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("gold_tool_materials")); + public static final DefaultedTag GOLD_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("gold_tool_materials")); - public static final Tag HANGING_SIGNS = ItemTypeTags.key(ResourceKey.minecraft("hanging_signs")); + public static final DefaultedTag HANGING_SIGNS = ItemTypeTags.key(ResourceKey.minecraft("hanging_signs")); - public static final Tag HEAD_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("head_armor")); + public static final DefaultedTag HEAD_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("head_armor")); - public static final Tag HOES = ItemTypeTags.key(ResourceKey.minecraft("hoes")); + public static final DefaultedTag HOES = ItemTypeTags.key(ResourceKey.minecraft("hoes")); - public static final Tag HOGLIN_FOOD = ItemTypeTags.key(ResourceKey.minecraft("hoglin_food")); + public static final DefaultedTag HOGLIN_FOOD = ItemTypeTags.key(ResourceKey.minecraft("hoglin_food")); - public static final Tag HORSE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("horse_food")); + public static final DefaultedTag HORSE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("horse_food")); - public static final Tag HORSE_TEMPT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("horse_tempt_items")); + public static final DefaultedTag HORSE_TEMPT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("horse_tempt_items")); - public static final Tag IGNORED_BY_PIGLIN_BABIES = ItemTypeTags.key(ResourceKey.minecraft("ignored_by_piglin_babies")); + public static final DefaultedTag IGNORED_BY_PIGLIN_BABIES = ItemTypeTags.key(ResourceKey.minecraft("ignored_by_piglin_babies")); - public static final Tag IRON_ORES = ItemTypeTags.key(ResourceKey.minecraft("iron_ores")); + public static final DefaultedTag IRON_ORES = ItemTypeTags.key(ResourceKey.minecraft("iron_ores")); - public static final Tag IRON_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("iron_tool_materials")); + public static final DefaultedTag IRON_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("iron_tool_materials")); - public static final Tag JUNGLE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("jungle_logs")); + public static final DefaultedTag JUNGLE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("jungle_logs")); - public static final Tag LAPIS_ORES = ItemTypeTags.key(ResourceKey.minecraft("lapis_ores")); + public static final DefaultedTag LAPIS_ORES = ItemTypeTags.key(ResourceKey.minecraft("lapis_ores")); - public static final Tag LEAVES = ItemTypeTags.key(ResourceKey.minecraft("leaves")); + public static final DefaultedTag LEAVES = ItemTypeTags.key(ResourceKey.minecraft("leaves")); - public static final Tag LECTERN_BOOKS = ItemTypeTags.key(ResourceKey.minecraft("lectern_books")); + public static final DefaultedTag LECTERN_BOOKS = ItemTypeTags.key(ResourceKey.minecraft("lectern_books")); - public static final Tag LEG_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("leg_armor")); + public static final DefaultedTag LEG_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("leg_armor")); - public static final Tag LLAMA_FOOD = ItemTypeTags.key(ResourceKey.minecraft("llama_food")); + public static final DefaultedTag LLAMA_FOOD = ItemTypeTags.key(ResourceKey.minecraft("llama_food")); - public static final Tag LLAMA_TEMPT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("llama_tempt_items")); + public static final DefaultedTag LLAMA_TEMPT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("llama_tempt_items")); - public static final Tag LOGS = ItemTypeTags.key(ResourceKey.minecraft("logs")); + public static final DefaultedTag LOGS = ItemTypeTags.key(ResourceKey.minecraft("logs")); - public static final Tag LOGS_THAT_BURN = ItemTypeTags.key(ResourceKey.minecraft("logs_that_burn")); + public static final DefaultedTag LOGS_THAT_BURN = ItemTypeTags.key(ResourceKey.minecraft("logs_that_burn")); - public static final Tag MANGROVE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("mangrove_logs")); + public static final DefaultedTag MANGROVE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("mangrove_logs")); - public static final Tag MAP_INVISIBILITY_EQUIPMENT = ItemTypeTags.key(ResourceKey.minecraft("map_invisibility_equipment")); + public static final DefaultedTag MAP_INVISIBILITY_EQUIPMENT = ItemTypeTags.key(ResourceKey.minecraft("map_invisibility_equipment")); - public static final Tag MEAT = ItemTypeTags.key(ResourceKey.minecraft("meat")); + public static final DefaultedTag MEAT = ItemTypeTags.key(ResourceKey.minecraft("meat")); - public static final Tag NETHERITE_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("netherite_tool_materials")); + public static final DefaultedTag NETHERITE_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("netherite_tool_materials")); - public static final Tag NON_FLAMMABLE_WOOD = ItemTypeTags.key(ResourceKey.minecraft("non_flammable_wood")); + public static final DefaultedTag NON_FLAMMABLE_WOOD = ItemTypeTags.key(ResourceKey.minecraft("non_flammable_wood")); - public static final Tag NOTEBLOCK_TOP_INSTRUMENTS = ItemTypeTags.key(ResourceKey.minecraft("noteblock_top_instruments")); + public static final DefaultedTag NOTEBLOCK_TOP_INSTRUMENTS = ItemTypeTags.key(ResourceKey.minecraft("noteblock_top_instruments")); - public static final Tag OAK_LOGS = ItemTypeTags.key(ResourceKey.minecraft("oak_logs")); + public static final DefaultedTag OAK_LOGS = ItemTypeTags.key(ResourceKey.minecraft("oak_logs")); - public static final Tag OCELOT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("ocelot_food")); + public static final DefaultedTag OCELOT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("ocelot_food")); - public static final Tag PALE_OAK_LOGS = ItemTypeTags.key(ResourceKey.minecraft("pale_oak_logs")); + public static final DefaultedTag PALE_OAK_LOGS = ItemTypeTags.key(ResourceKey.minecraft("pale_oak_logs")); - public static final Tag PANDA_EATS_FROM_GROUND = ItemTypeTags.key(ResourceKey.minecraft("panda_eats_from_ground")); + public static final DefaultedTag PANDA_EATS_FROM_GROUND = ItemTypeTags.key(ResourceKey.minecraft("panda_eats_from_ground")); - public static final Tag PANDA_FOOD = ItemTypeTags.key(ResourceKey.minecraft("panda_food")); + public static final DefaultedTag PANDA_FOOD = ItemTypeTags.key(ResourceKey.minecraft("panda_food")); - public static final Tag PARROT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("parrot_food")); + public static final DefaultedTag PARROT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("parrot_food")); - public static final Tag PARROT_POISONOUS_FOOD = ItemTypeTags.key(ResourceKey.minecraft("parrot_poisonous_food")); + public static final DefaultedTag PARROT_POISONOUS_FOOD = ItemTypeTags.key(ResourceKey.minecraft("parrot_poisonous_food")); - public static final Tag PICKAXES = ItemTypeTags.key(ResourceKey.minecraft("pickaxes")); + public static final DefaultedTag PICKAXES = ItemTypeTags.key(ResourceKey.minecraft("pickaxes")); - public static final Tag PIG_FOOD = ItemTypeTags.key(ResourceKey.minecraft("pig_food")); + public static final DefaultedTag PIG_FOOD = ItemTypeTags.key(ResourceKey.minecraft("pig_food")); - public static final Tag PIGLIN_FOOD = ItemTypeTags.key(ResourceKey.minecraft("piglin_food")); + public static final DefaultedTag PIGLIN_FOOD = ItemTypeTags.key(ResourceKey.minecraft("piglin_food")); - public static final Tag PIGLIN_LOVED = ItemTypeTags.key(ResourceKey.minecraft("piglin_loved")); + public static final DefaultedTag PIGLIN_LOVED = ItemTypeTags.key(ResourceKey.minecraft("piglin_loved")); - public static final Tag PIGLIN_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("piglin_preferred_weapons")); + public static final DefaultedTag PIGLIN_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("piglin_preferred_weapons")); - public static final Tag PIGLIN_REPELLENTS = ItemTypeTags.key(ResourceKey.minecraft("piglin_repellents")); + public static final DefaultedTag PIGLIN_REPELLENTS = ItemTypeTags.key(ResourceKey.minecraft("piglin_repellents")); - public static final Tag PIGLIN_SAFE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("piglin_safe_armor")); + public static final DefaultedTag PIGLIN_SAFE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("piglin_safe_armor")); - public static final Tag PILLAGER_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("pillager_preferred_weapons")); + public static final DefaultedTag PILLAGER_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("pillager_preferred_weapons")); - public static final Tag PLANKS = ItemTypeTags.key(ResourceKey.minecraft("planks")); + public static final DefaultedTag PLANKS = ItemTypeTags.key(ResourceKey.minecraft("planks")); - public static final Tag RABBIT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("rabbit_food")); + public static final DefaultedTag RABBIT_FOOD = ItemTypeTags.key(ResourceKey.minecraft("rabbit_food")); - public static final Tag RAILS = ItemTypeTags.key(ResourceKey.minecraft("rails")); + public static final DefaultedTag RAILS = ItemTypeTags.key(ResourceKey.minecraft("rails")); - public static final Tag REDSTONE_ORES = ItemTypeTags.key(ResourceKey.minecraft("redstone_ores")); + public static final DefaultedTag REDSTONE_ORES = ItemTypeTags.key(ResourceKey.minecraft("redstone_ores")); - public static final Tag REPAIRS_CHAIN_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_chain_armor")); + public static final DefaultedTag REPAIRS_CHAIN_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_chain_armor")); - public static final Tag REPAIRS_DIAMOND_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_diamond_armor")); + public static final DefaultedTag REPAIRS_DIAMOND_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_diamond_armor")); - public static final Tag REPAIRS_GOLD_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_gold_armor")); + public static final DefaultedTag REPAIRS_GOLD_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_gold_armor")); - public static final Tag REPAIRS_IRON_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_iron_armor")); + public static final DefaultedTag REPAIRS_IRON_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_iron_armor")); - public static final Tag REPAIRS_LEATHER_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_leather_armor")); + public static final DefaultedTag REPAIRS_LEATHER_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_leather_armor")); - public static final Tag REPAIRS_NETHERITE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_netherite_armor")); + public static final DefaultedTag REPAIRS_NETHERITE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_netherite_armor")); - public static final Tag REPAIRS_TURTLE_HELMET = ItemTypeTags.key(ResourceKey.minecraft("repairs_turtle_helmet")); + public static final DefaultedTag REPAIRS_TURTLE_HELMET = ItemTypeTags.key(ResourceKey.minecraft("repairs_turtle_helmet")); - public static final Tag REPAIRS_WOLF_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_wolf_armor")); + public static final DefaultedTag REPAIRS_WOLF_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("repairs_wolf_armor")); - public static final Tag SAND = ItemTypeTags.key(ResourceKey.minecraft("sand")); + public static final DefaultedTag SAND = ItemTypeTags.key(ResourceKey.minecraft("sand")); - public static final Tag SAPLINGS = ItemTypeTags.key(ResourceKey.minecraft("saplings")); + public static final DefaultedTag SAPLINGS = ItemTypeTags.key(ResourceKey.minecraft("saplings")); - public static final Tag SHEEP_FOOD = ItemTypeTags.key(ResourceKey.minecraft("sheep_food")); + public static final DefaultedTag SHEEP_FOOD = ItemTypeTags.key(ResourceKey.minecraft("sheep_food")); - public static final Tag SHOVELS = ItemTypeTags.key(ResourceKey.minecraft("shovels")); + public static final DefaultedTag SHOVELS = ItemTypeTags.key(ResourceKey.minecraft("shovels")); - public static final Tag SHULKER_BOXES = ItemTypeTags.key(ResourceKey.minecraft("shulker_boxes")); + public static final DefaultedTag SHULKER_BOXES = ItemTypeTags.key(ResourceKey.minecraft("shulker_boxes")); - public static final Tag SIGNS = ItemTypeTags.key(ResourceKey.minecraft("signs")); + public static final DefaultedTag SIGNS = ItemTypeTags.key(ResourceKey.minecraft("signs")); - public static final Tag SKELETON_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("skeleton_preferred_weapons")); + public static final DefaultedTag SKELETON_PREFERRED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("skeleton_preferred_weapons")); - public static final Tag SKULLS = ItemTypeTags.key(ResourceKey.minecraft("skulls")); + public static final DefaultedTag SKULLS = ItemTypeTags.key(ResourceKey.minecraft("skulls")); - public static final Tag SLABS = ItemTypeTags.key(ResourceKey.minecraft("slabs")); + public static final DefaultedTag SLABS = ItemTypeTags.key(ResourceKey.minecraft("slabs")); - public static final Tag SMALL_FLOWERS = ItemTypeTags.key(ResourceKey.minecraft("small_flowers")); + public static final DefaultedTag SMALL_FLOWERS = ItemTypeTags.key(ResourceKey.minecraft("small_flowers")); - public static final Tag SMELTS_TO_GLASS = ItemTypeTags.key(ResourceKey.minecraft("smelts_to_glass")); + public static final DefaultedTag SMELTS_TO_GLASS = ItemTypeTags.key(ResourceKey.minecraft("smelts_to_glass")); - public static final Tag SNIFFER_FOOD = ItemTypeTags.key(ResourceKey.minecraft("sniffer_food")); + public static final DefaultedTag SNIFFER_FOOD = ItemTypeTags.key(ResourceKey.minecraft("sniffer_food")); - public static final Tag SOUL_FIRE_BASE_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("soul_fire_base_blocks")); + public static final DefaultedTag SOUL_FIRE_BASE_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("soul_fire_base_blocks")); - public static final Tag SPRUCE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("spruce_logs")); + public static final DefaultedTag SPRUCE_LOGS = ItemTypeTags.key(ResourceKey.minecraft("spruce_logs")); - public static final Tag STAIRS = ItemTypeTags.key(ResourceKey.minecraft("stairs")); + public static final DefaultedTag STAIRS = ItemTypeTags.key(ResourceKey.minecraft("stairs")); - public static final Tag STONE_BRICKS = ItemTypeTags.key(ResourceKey.minecraft("stone_bricks")); + public static final DefaultedTag STONE_BRICKS = ItemTypeTags.key(ResourceKey.minecraft("stone_bricks")); - public static final Tag STONE_BUTTONS = ItemTypeTags.key(ResourceKey.minecraft("stone_buttons")); + public static final DefaultedTag STONE_BUTTONS = ItemTypeTags.key(ResourceKey.minecraft("stone_buttons")); - public static final Tag STONE_CRAFTING_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("stone_crafting_materials")); + public static final DefaultedTag STONE_CRAFTING_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("stone_crafting_materials")); - public static final Tag STONE_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("stone_tool_materials")); + public static final DefaultedTag STONE_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("stone_tool_materials")); - public static final Tag STRIDER_FOOD = ItemTypeTags.key(ResourceKey.minecraft("strider_food")); + public static final DefaultedTag STRIDER_FOOD = ItemTypeTags.key(ResourceKey.minecraft("strider_food")); - public static final Tag STRIDER_TEMPT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("strider_tempt_items")); + public static final DefaultedTag STRIDER_TEMPT_ITEMS = ItemTypeTags.key(ResourceKey.minecraft("strider_tempt_items")); - public static final Tag SWORDS = ItemTypeTags.key(ResourceKey.minecraft("swords")); + public static final DefaultedTag SWORDS = ItemTypeTags.key(ResourceKey.minecraft("swords")); - public static final Tag TERRACOTTA = ItemTypeTags.key(ResourceKey.minecraft("terracotta")); + public static final DefaultedTag TERRACOTTA = ItemTypeTags.key(ResourceKey.minecraft("terracotta")); - public static final Tag TRAPDOORS = ItemTypeTags.key(ResourceKey.minecraft("trapdoors")); + public static final DefaultedTag TRAPDOORS = ItemTypeTags.key(ResourceKey.minecraft("trapdoors")); - public static final Tag TRIM_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("trim_materials")); + public static final DefaultedTag TRIM_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("trim_materials")); - public static final Tag TRIMMABLE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("trimmable_armor")); + public static final DefaultedTag TRIMMABLE_ARMOR = ItemTypeTags.key(ResourceKey.minecraft("trimmable_armor")); - public static final Tag TURTLE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("turtle_food")); + public static final DefaultedTag TURTLE_FOOD = ItemTypeTags.key(ResourceKey.minecraft("turtle_food")); - public static final Tag VILLAGER_PICKS_UP = ItemTypeTags.key(ResourceKey.minecraft("villager_picks_up")); + public static final DefaultedTag VILLAGER_PICKS_UP = ItemTypeTags.key(ResourceKey.minecraft("villager_picks_up")); - public static final Tag VILLAGER_PLANTABLE_SEEDS = ItemTypeTags.key(ResourceKey.minecraft("villager_plantable_seeds")); + public static final DefaultedTag VILLAGER_PLANTABLE_SEEDS = ItemTypeTags.key(ResourceKey.minecraft("villager_plantable_seeds")); - public static final Tag WALLS = ItemTypeTags.key(ResourceKey.minecraft("walls")); + public static final DefaultedTag WALLS = ItemTypeTags.key(ResourceKey.minecraft("walls")); - public static final Tag WARPED_STEMS = ItemTypeTags.key(ResourceKey.minecraft("warped_stems")); + public static final DefaultedTag WARPED_STEMS = ItemTypeTags.key(ResourceKey.minecraft("warped_stems")); - public static final Tag WART_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("wart_blocks")); + public static final DefaultedTag WART_BLOCKS = ItemTypeTags.key(ResourceKey.minecraft("wart_blocks")); - public static final Tag WITHER_SKELETON_DISLIKED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("wither_skeleton_disliked_weapons")); + public static final DefaultedTag WITHER_SKELETON_DISLIKED_WEAPONS = ItemTypeTags.key(ResourceKey.minecraft("wither_skeleton_disliked_weapons")); - public static final Tag WOLF_FOOD = ItemTypeTags.key(ResourceKey.minecraft("wolf_food")); + public static final DefaultedTag WOLF_FOOD = ItemTypeTags.key(ResourceKey.minecraft("wolf_food")); - public static final Tag WOODEN_BUTTONS = ItemTypeTags.key(ResourceKey.minecraft("wooden_buttons")); + public static final DefaultedTag WOODEN_BUTTONS = ItemTypeTags.key(ResourceKey.minecraft("wooden_buttons")); - public static final Tag WOODEN_DOORS = ItemTypeTags.key(ResourceKey.minecraft("wooden_doors")); + public static final DefaultedTag WOODEN_DOORS = ItemTypeTags.key(ResourceKey.minecraft("wooden_doors")); - public static final Tag WOODEN_FENCES = ItemTypeTags.key(ResourceKey.minecraft("wooden_fences")); + public static final DefaultedTag WOODEN_FENCES = ItemTypeTags.key(ResourceKey.minecraft("wooden_fences")); - public static final Tag WOODEN_PRESSURE_PLATES = ItemTypeTags.key(ResourceKey.minecraft("wooden_pressure_plates")); + public static final DefaultedTag WOODEN_PRESSURE_PLATES = ItemTypeTags.key(ResourceKey.minecraft("wooden_pressure_plates")); - public static final Tag WOODEN_SLABS = ItemTypeTags.key(ResourceKey.minecraft("wooden_slabs")); + public static final DefaultedTag WOODEN_SLABS = ItemTypeTags.key(ResourceKey.minecraft("wooden_slabs")); - public static final Tag WOODEN_STAIRS = ItemTypeTags.key(ResourceKey.minecraft("wooden_stairs")); + public static final DefaultedTag WOODEN_STAIRS = ItemTypeTags.key(ResourceKey.minecraft("wooden_stairs")); - public static final Tag WOODEN_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("wooden_tool_materials")); + public static final DefaultedTag WOODEN_TOOL_MATERIALS = ItemTypeTags.key(ResourceKey.minecraft("wooden_tool_materials")); - public static final Tag WOODEN_TRAPDOORS = ItemTypeTags.key(ResourceKey.minecraft("wooden_trapdoors")); + public static final DefaultedTag WOODEN_TRAPDOORS = ItemTypeTags.key(ResourceKey.minecraft("wooden_trapdoors")); - public static final Tag WOOL = ItemTypeTags.key(ResourceKey.minecraft("wool")); + public static final DefaultedTag WOOL = ItemTypeTags.key(ResourceKey.minecraft("wool")); - public static final Tag WOOL_CARPETS = ItemTypeTags.key(ResourceKey.minecraft("wool_carpets")); + public static final DefaultedTag WOOL_CARPETS = ItemTypeTags.key(ResourceKey.minecraft("wool_carpets")); private ItemTypeTags() { } - private static Tag key(final ResourceKey key) { - return Tag.of(RegistryTypes.ITEM_TYPE, key); + private static DefaultedTag key(final ResourceKey key) { + return DefaultedTag.of(RegistryTypes.ITEM_TYPE, key); } } diff --git a/src/main/java/org/spongepowered/api/tag/Tag.java b/src/main/java/org/spongepowered/api/tag/Tag.java index 42d4b2f4a7..0e237911f5 100644 --- a/src/main/java/org/spongepowered/api/tag/Tag.java +++ b/src/main/java/org/spongepowered/api/tag/Tag.java @@ -29,9 +29,11 @@ import org.spongepowered.api.ResourceKeyed; import org.spongepowered.api.Sponge; import org.spongepowered.api.block.BlockType; -import org.spongepowered.api.registry.DefaultedRegistryType; +import org.spongepowered.api.registry.RegistryHolder; import org.spongepowered.api.registry.RegistryType; +import java.util.function.Supplier; + /** * A {@link ResourceKey resource keyed} collection of {@link Taggable} values * (of type {@code T}). @@ -50,6 +52,10 @@ */ public interface Tag extends ResourceKeyed { + static Tag of(final RegistryType registryType, final ResourceKey key) { + return Sponge.game().factoryProvider().provide(Tag.Factory.class).of(registryType, key); + } + /** * Gets the {@link RegistryType location} defining the parent registry. * @@ -57,19 +63,11 @@ public interface Tag extends ResourceKeyed { */ RegistryType registry(); - interface Factory { - default Tag of(DefaultedRegistryType registryType, ResourceKey key) { - return this.of((RegistryType) registryType, key); - } + DefaultedTag asDefaultedTag(Supplier holder); - Tag of(RegistryType registryType, ResourceKey key); - } + DefaultedTag asScopedTag(); - static Tag of(DefaultedRegistryType registryType, ResourceKey key) { - return Sponge.game().factoryProvider().provide(Tag.Factory.class).of(registryType, key); - } - - static Tag of(RegistryType registryType, ResourceKey key) { - return Sponge.game().factoryProvider().provide(Tag.Factory.class).of(registryType, key); + interface Factory { + Tag of(RegistryType registryType, ResourceKey key); } } diff --git a/src/main/java/org/spongepowered/api/tag/Taggable.java b/src/main/java/org/spongepowered/api/tag/Taggable.java index 716e204217..443b3dc9a0 100644 --- a/src/main/java/org/spongepowered/api/tag/Taggable.java +++ b/src/main/java/org/spongepowered/api/tag/Taggable.java @@ -26,9 +26,8 @@ import org.spongepowered.api.registry.DefaultedRegistryType; import org.spongepowered.api.registry.DefaultedRegistryValue; -import org.spongepowered.api.registry.RegistryType; -import java.util.Collection; +import java.util.stream.Stream; /** * A type that may be included in one or more {@link Tag} collections. @@ -36,25 +35,20 @@ public interface Taggable> extends DefaultedRegistryValue { /** - * Gets the {@link RegistryType} that holds the types of {@link Tag tags} - * that can be associated with this object. + * Gets all {@link Tag}s that have been associated with this object in the given registry. * - * @return The {@link RegistryType} + * @return The {@link Stream} of {@link Tag}s. */ - DefaultedRegistryType registryType(); + Stream> tags(DefaultedRegistryType registryType); /** - * Gets all {@link Tag tags} that have been associated with this object. + * Returns whether the given tag is associated with this object. * - * @return The {@link Collection} of {@link Tag}s. - */ - Collection> tags(); - - /** - * Returns true when given tag is associated with this object * @param tag The tag - * @return true when given tag is associated with this object + * @return true if the given tag is associated with this object */ - boolean is(Tag tag); - + @SuppressWarnings("unchecked") + default boolean is(DefaultedTag tag) { + return tag.contains((T) this); + } }