diff --git a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java index de217e1609..0caa1ef776 100644 --- a/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java +++ b/deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java @@ -29,6 +29,7 @@ import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; @@ -115,10 +116,10 @@ private enum LogWarningMode { createMapEntry(ConventionalItemTags.LAPIS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.LAPIS_GEMS), createMapEntry(ConventionalItemTags.EMERALDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.EMERALD_GEMS), createMapEntry(ConventionalItemTags.QUARTZ, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.QUARTZ_GEMS), - createMapEntry(ConventionalItemTags.SHEARS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHEARS_TOOLS), - createMapEntry(ConventionalItemTags.SPEARS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SPEARS_TOOLS), - createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOWS_TOOLS), - createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELDS_TOOLS), + createMapEntry(ConventionalItemTags.SHEARS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHEAR_TOOLS), + createMapEntry(ConventionalItemTags.SPEARS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SPEAR_TOOLS), + createMapEntry(ConventionalItemTags.BOWS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOW_TOOLS), + createMapEntry(ConventionalItemTags.SHIELDS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELD_TOOLS), createMapEntry(ConventionalEnchantmentTags.INCREASES_BLOCK_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_BLOCK_DROPS), createMapEntry(ConventionalEnchantmentTags.INCREASES_ENTITY_DROPS, net.fabricmc.fabric.api.tag.convention.v2.ConventionalEnchantmentTags.INCREASE_ENTITY_DROPS), @@ -209,8 +210,26 @@ private enum LogWarningMode { createMapEntry(RegistryKeys.ITEM, "stew", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS), createMapEntry(RegistryKeys.ITEM, "candy", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS), - createMapEntry(RegistryKeys.ITEM, "candies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS) - + createMapEntry(RegistryKeys.ITEM, "candies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS), + createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "music_discs")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MUSIC_DISCS), + + // V2 tags that are now discouraged + createMapEntry(ConventionalItemTags.COAL, ItemTags.COALS), + createMapEntry(RegistryKeys.ITEM, "tools/shears", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHEAR_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/spears", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SPEAR_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/bows", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BOW_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/crossbows", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CROSSBOW_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/shields", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SHIELD_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/fishing_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FISHING_ROD_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/brushes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BRUSH_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/melee_weapons", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MELEE_WEAPON_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/ranged_weapons", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RANGED_WEAPON_TOOLS), + createMapEntry(RegistryKeys.ITEM, "tools/mining_tools", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MINING_TOOL_TOOLS), + createMapEntry(RegistryKeys.ITEM, "raw_blocks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS), + createMapEntry(RegistryKeys.ITEM, "raw_blocks/copper", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS_RAW_COPPER), + createMapEntry(RegistryKeys.ITEM, "raw_blocks/gold", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS_RAW_GOLD), + createMapEntry(RegistryKeys.ITEM, "raw_blocks/iron", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.STORAGE_BLOCKS_RAW_IRON), + createMapEntry(net.fabricmc.fabric.api.tag.convention.v2.ConventionalBlockTags.SHULKER_BOXES, BlockTags.SHULKER_BOXES) ); @Override diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java index 3345fb1386..130e43b5c3 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BiomeTagGenerator.java @@ -248,7 +248,6 @@ private void generateClimateAndVegetationTags() { getOrCreateTagBuilder(ConventionalBiomeTags.IS_VEGETATION_SPARSE_OVERWORLD) .add(BiomeKeys.WOODED_BADLANDS) - .add(BiomeKeys.ERODED_BADLANDS) .add(BiomeKeys.SAVANNA) .add(BiomeKeys.SAVANNA_PLATEAU) .add(BiomeKeys.WINDSWEPT_SAVANNA) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java index c5e3588539..7d137f2981 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java @@ -94,7 +94,8 @@ protected void configure(RegistryWrapper.WrapperLookup registries) { getOrCreateTagBuilder(ConventionalBlockTags.BOOKSHELVES) .add(Blocks.BOOKSHELF); generateGlassTags(); - generateShulkerTag(); + generateGlazeTerracottaTags(); + generateConcreteTags(); getOrCreateTagBuilder(ConventionalBlockTags.WOODEN_BARRELS) .add(Blocks.BARREL); getOrCreateTagBuilder(ConventionalBlockTags.BARRELS) @@ -182,27 +183,6 @@ private void generateBuddingTags() { .add(Blocks.AMETHYST_CLUSTER); } - private void generateShulkerTag() { - getOrCreateTagBuilder(ConventionalBlockTags.SHULKER_BOXES) - .add(Blocks.SHULKER_BOX) - .add(Blocks.WHITE_SHULKER_BOX) - .add(Blocks.ORANGE_SHULKER_BOX) - .add(Blocks.MAGENTA_SHULKER_BOX) - .add(Blocks.LIGHT_BLUE_SHULKER_BOX) - .add(Blocks.YELLOW_SHULKER_BOX) - .add(Blocks.LIME_SHULKER_BOX) - .add(Blocks.PINK_SHULKER_BOX) - .add(Blocks.GRAY_SHULKER_BOX) - .add(Blocks.LIGHT_GRAY_SHULKER_BOX) - .add(Blocks.CYAN_SHULKER_BOX) - .add(Blocks.PURPLE_SHULKER_BOX) - .add(Blocks.BLUE_SHULKER_BOX) - .add(Blocks.BROWN_SHULKER_BOX) - .add(Blocks.GREEN_SHULKER_BOX) - .add(Blocks.RED_SHULKER_BOX) - .add(Blocks.BLACK_SHULKER_BOX); - } - private void generateGlassTags() { getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS) .add(Blocks.GLASS) @@ -243,6 +223,46 @@ private void generateGlassTags() { .add(Blocks.RED_STAINED_GLASS_PANE); } + private void generateGlazeTerracottaTags() { + getOrCreateTagBuilder(ConventionalBlockTags.GLAZED_TERRACOTTA) + .add(Blocks.WHITE_GLAZED_TERRACOTTA) + .add(Blocks.ORANGE_GLAZED_TERRACOTTA) + .add(Blocks.MAGENTA_GLAZED_TERRACOTTA) + .add(Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA) + .add(Blocks.YELLOW_GLAZED_TERRACOTTA) + .add(Blocks.LIME_GLAZED_TERRACOTTA) + .add(Blocks.PINK_GLAZED_TERRACOTTA) + .add(Blocks.GRAY_GLAZED_TERRACOTTA) + .add(Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA) + .add(Blocks.CYAN_GLAZED_TERRACOTTA) + .add(Blocks.PURPLE_GLAZED_TERRACOTTA) + .add(Blocks.BLUE_GLAZED_TERRACOTTA) + .add(Blocks.BROWN_GLAZED_TERRACOTTA) + .add(Blocks.GREEN_GLAZED_TERRACOTTA) + .add(Blocks.BLACK_GLAZED_TERRACOTTA) + .add(Blocks.RED_GLAZED_TERRACOTTA); + } + + private void generateConcreteTags() { + getOrCreateTagBuilder(ConventionalBlockTags.CONCRETE) + .add(Blocks.WHITE_CONCRETE) + .add(Blocks.ORANGE_CONCRETE) + .add(Blocks.MAGENTA_CONCRETE) + .add(Blocks.LIGHT_BLUE_CONCRETE) + .add(Blocks.YELLOW_CONCRETE) + .add(Blocks.LIME_CONCRETE) + .add(Blocks.PINK_CONCRETE) + .add(Blocks.GRAY_CONCRETE) + .add(Blocks.LIGHT_GRAY_CONCRETE) + .add(Blocks.CYAN_CONCRETE) + .add(Blocks.PURPLE_CONCRETE) + .add(Blocks.BLUE_CONCRETE) + .add(Blocks.BROWN_CONCRETE) + .add(Blocks.GREEN_CONCRETE) + .add(Blocks.BLACK_CONCRETE) + .add(Blocks.RED_CONCRETE); + } + private void generateDyedTags() { getOrCreateTagBuilder(ConventionalBlockTags.BLACK_DYED) .add(Blocks.BLACK_BANNER).add(Blocks.BLACK_BED).add(Blocks.BLACK_CANDLE).add(Blocks.BLACK_CARPET) diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java index aa5897d3ab..cc437ae7d0 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java @@ -50,7 +50,9 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalBlockTags.WOODEN_CHESTS, "Wooden Chests"); translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks"); translationBuilder.add(ConventionalBlockTags.GLASS_PANES, "Glass Panes"); + translationBuilder.add(ConventionalBlockTags.GLAZED_TERRACOTTA, "Glaze Terracotta"); translationBuilder.add(ConventionalBlockTags.SHULKER_BOXES, "Shulker Boxes"); + translationBuilder.add(ConventionalBlockTags.CONCRETE, "Concrete"); translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks"); translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); translationBuilder.add(ConventionalBlockTags.CLUSTERS, "Clusters"); @@ -110,6 +112,16 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.STONES, "Stones"); translationBuilder.add(ConventionalItemTags.COBBLESTONES, "Cobblestones"); translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); + translationBuilder.add(ConventionalItemTags.SHEAR_TOOLS, "Shears"); + translationBuilder.add(ConventionalItemTags.SPEAR_TOOLS, "Spears"); + translationBuilder.add(ConventionalItemTags.BOW_TOOLS, "Bows"); + translationBuilder.add(ConventionalItemTags.CROSSBOW_TOOLS, "Crossbows"); + translationBuilder.add(ConventionalItemTags.SHIELD_TOOLS, "Shields"); + translationBuilder.add(ConventionalItemTags.FISHING_ROD_TOOLS, "Fishing Rods"); + translationBuilder.add(ConventionalItemTags.BRUSH_TOOLS, "Brushes"); + translationBuilder.add(ConventionalItemTags.MELEE_WEAPON_TOOLS, "Melee Weapons"); + translationBuilder.add(ConventionalItemTags.RANGED_WEAPON_TOOLS, "Ranged Weapons"); + translationBuilder.add(ConventionalItemTags.MINING_TOOL_TOOLS, "Mining Tools"); translationBuilder.add(ConventionalItemTags.SHEARS_TOOLS, "Shears"); translationBuilder.add(ConventionalItemTags.SPEARS_TOOLS, "Spears"); translationBuilder.add(ConventionalItemTags.BOWS_TOOLS, "Bows"); @@ -182,7 +194,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.WOODEN_CHESTS, "Wooden Chests"); translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks"); translationBuilder.add(ConventionalItemTags.GLASS_PANES, "Glass Panes"); + translationBuilder.add(ConventionalItemTags.GLAZED_TERRACOTTA, "Glaze Terracotta"); translationBuilder.add(ConventionalItemTags.SHULKER_BOXES, "Shulker Boxes"); + translationBuilder.add(ConventionalItemTags.CONCRETE, "Concrete"); + translationBuilder.add(ConventionalItemTags.CONCRETE_POWDER, "Concrete Powder"); translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks"); translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); @@ -250,6 +265,7 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables"); translationBuilder.add(ConventionalItemTags.PLAYER_WORKSTATIONS_FURNACES, "Furnaces"); translationBuilder.add(ConventionalItemTags.STRINGS, "Strings"); + translationBuilder.add(ConventionalItemTags.MUSIC_DISCS, "Music Discs"); translationBuilder.add(ConventionalItemTags.RODS, "Rods"); translationBuilder.add(ConventionalItemTags.WOODEN_RODS, "Wooden Rods"); translationBuilder.add(ConventionalItemTags.BLAZE_RODS, "Blaze Rods"); diff --git a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java index 2d6483a702..dbd1f10ec5 100644 --- a/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java +++ b/fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java @@ -60,7 +60,43 @@ private void copyItemTags() { copy(ConventionalBlockTags.WOODEN_CHESTS, ConventionalItemTags.WOODEN_CHESTS); copy(ConventionalBlockTags.GLASS_BLOCKS, ConventionalItemTags.GLASS_BLOCKS); copy(ConventionalBlockTags.GLASS_PANES, ConventionalItemTags.GLASS_PANES); - copy(ConventionalBlockTags.SHULKER_BOXES, ConventionalItemTags.SHULKER_BOXES); + copy(ConventionalBlockTags.GLAZED_TERRACOTTA, ConventionalItemTags.GLAZED_TERRACOTTA); + getOrCreateTagBuilder(ConventionalItemTags.SHULKER_BOXES) + .add(Items.SHULKER_BOX) + .add(Items.WHITE_SHULKER_BOX) + .add(Items.ORANGE_SHULKER_BOX) + .add(Items.MAGENTA_SHULKER_BOX) + .add(Items.LIGHT_BLUE_SHULKER_BOX) + .add(Items.YELLOW_SHULKER_BOX) + .add(Items.LIME_SHULKER_BOX) + .add(Items.PINK_SHULKER_BOX) + .add(Items.GRAY_SHULKER_BOX) + .add(Items.LIGHT_GRAY_SHULKER_BOX) + .add(Items.CYAN_SHULKER_BOX) + .add(Items.PURPLE_SHULKER_BOX) + .add(Items.BLUE_SHULKER_BOX) + .add(Items.BROWN_SHULKER_BOX) + .add(Items.GREEN_SHULKER_BOX) + .add(Items.RED_SHULKER_BOX) + .add(Items.BLACK_SHULKER_BOX); + copy(ConventionalBlockTags.CONCRETE, ConventionalItemTags.CONCRETE); + getOrCreateTagBuilder(ConventionalItemTags.CONCRETE_POWDER) + .add(Items.WHITE_CONCRETE_POWDER) + .add(Items.ORANGE_CONCRETE_POWDER) + .add(Items.MAGENTA_CONCRETE_POWDER) + .add(Items.LIGHT_BLUE_CONCRETE_POWDER) + .add(Items.YELLOW_CONCRETE_POWDER) + .add(Items.LIME_CONCRETE_POWDER) + .add(Items.PINK_CONCRETE_POWDER) + .add(Items.GRAY_CONCRETE_POWDER) + .add(Items.LIGHT_GRAY_CONCRETE_POWDER) + .add(Items.CYAN_CONCRETE_POWDER) + .add(Items.PURPLE_CONCRETE_POWDER) + .add(Items.BLUE_CONCRETE_POWDER) + .add(Items.BROWN_CONCRETE_POWDER) + .add(Items.GREEN_CONCRETE_POWDER) + .add(Items.RED_CONCRETE_POWDER) + .add(Items.BLACK_CONCRETE_POWDER); copy(ConventionalBlockTags.BUDDING_BLOCKS, ConventionalItemTags.BUDDING_BLOCKS); copy(ConventionalBlockTags.BUDS, ConventionalItemTags.BUDS); @@ -301,6 +337,7 @@ private void generateOreAndRelatedTags() { .addOptionalTag(ConventionalItemTags.COPPER_RAW_MATERIALS) .addOptionalTag(ConventionalItemTags.IRON_RAW_MATERIALS) .addOptionalTag(ConventionalItemTags.GOLD_RAW_MATERIALS); + getOrCreateTagBuilder(ConventionalItemTags.RAW_BLOCKS) .addOptionalTag(ConventionalItemTags.COPPER_RAW_BLOCKS) .addOptionalTag(ConventionalItemTags.GOLD_RAW_BLOCKS) @@ -368,17 +405,90 @@ private void generateToolTags() { .addOptionalTag(ItemTags.PICKAXES) .addOptionalTag(ItemTags.SHOVELS) .addOptionalTag(ItemTags.SWORDS) - .addOptionalTag(ConventionalItemTags.BOWS_TOOLS) - .addOptionalTag(ConventionalItemTags.BRUSHES_TOOLS) - .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS) - .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS) - .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS) - .addOptionalTag(ConventionalItemTags.SHIELDS_TOOLS) - .addOptionalTag(ConventionalItemTags.SPEARS_TOOLS) - .addOptionalTag(ConventionalItemTags.MINING_TOOLS) - .addOptionalTag(ConventionalItemTags.MELEE_WEAPONS_TOOLS) + .addOptionalTag(ConventionalItemTags.BOW_TOOLS) + .addOptionalTag(ConventionalItemTags.BRUSH_TOOLS) + .addOptionalTag(ConventionalItemTags.CROSSBOW_TOOLS) + .addOptionalTag(ConventionalItemTags.FISHING_ROD_TOOLS) + .addOptionalTag(ConventionalItemTags.SHEAR_TOOLS) + .addOptionalTag(ConventionalItemTags.SHIELD_TOOLS) + .addOptionalTag(ConventionalItemTags.SPEAR_TOOLS) + .addOptionalTag(ConventionalItemTags.MINING_TOOL_TOOLS) + .addOptionalTag(ConventionalItemTags.MELEE_WEAPON_TOOLS) + .addOptionalTag(ConventionalItemTags.RANGED_WEAPON_TOOLS); + + getOrCreateTagBuilder(ConventionalItemTags.BOW_TOOLS) + .add(Items.BOW) + .addOptionalTag(ConventionalItemTags.BOWS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.CROSSBOW_TOOLS) + .add(Items.CROSSBOW) + .addOptionalTag(ConventionalItemTags.CROSSBOWS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.SHEAR_TOOLS) + .add(Items.SHEARS) + .addOptionalTag(ConventionalItemTags.SHEARS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.SHIELD_TOOLS) + .add(Items.SHIELD) + .addOptionalTag(ConventionalItemTags.SHIELDS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.SPEAR_TOOLS) + .add(Items.TRIDENT) + .addOptionalTag(ConventionalItemTags.SPEARS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.FISHING_ROD_TOOLS) + .add(Items.FISHING_ROD) + .addOptionalTag(ConventionalItemTags.FISHING_RODS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.BRUSH_TOOLS) + .add(Items.BRUSH) + .addOptionalTag(ConventionalItemTags.BRUSHES_TOOLS); + + getOrCreateTagBuilder(ConventionalItemTags.MINING_TOOL_TOOLS) + .add(Items.WOODEN_PICKAXE) + .add(Items.STONE_PICKAXE) + .add(Items.GOLDEN_PICKAXE) + .add(Items.IRON_PICKAXE) + .add(Items.DIAMOND_PICKAXE) + .add(Items.NETHERITE_PICKAXE) + .addOptionalTag(ConventionalItemTags.MINING_TOOLS); + + getOrCreateTagBuilder(ConventionalItemTags.MELEE_WEAPON_TOOLS) + .add(Items.WOODEN_SWORD) + .add(Items.STONE_SWORD) + .add(Items.GOLDEN_SWORD) + .add(Items.IRON_SWORD) + .add(Items.DIAMOND_SWORD) + .add(Items.NETHERITE_SWORD) + .add(Items.WOODEN_AXE) + .add(Items.STONE_AXE) + .add(Items.GOLDEN_AXE) + .add(Items.IRON_AXE) + .add(Items.DIAMOND_AXE) + .add(Items.NETHERITE_AXE) + .addOptionalTag(ConventionalItemTags.MELEE_WEAPONS_TOOLS); + + getOrCreateTagBuilder(ConventionalItemTags.RANGED_WEAPON_TOOLS) + .add(Items.BOW) + .add(Items.CROSSBOW) + .add(Items.TRIDENT) .addOptionalTag(ConventionalItemTags.RANGED_WEAPONS_TOOLS); + getOrCreateTagBuilder(ConventionalItemTags.ARMORS) + .addOptionalTag(ItemTags.HEAD_ARMOR) + .addOptionalTag(ItemTags.CHEST_ARMOR) + .addOptionalTag(ItemTags.LEG_ARMOR) + .addOptionalTag(ItemTags.FOOT_ARMOR); + + getOrCreateTagBuilder(ConventionalItemTags.ENCHANTABLES) + .addOptionalTag(ItemTags.ARMOR_ENCHANTABLE) + .addOptionalTag(ItemTags.EQUIPPABLE_ENCHANTABLE) + .addOptionalTag(ItemTags.WEAPON_ENCHANTABLE) + .addOptionalTag(ItemTags.SWORD_ENCHANTABLE) + .addOptionalTag(ItemTags.MINING_ENCHANTABLE) + .addOptionalTag(ItemTags.MINING_LOOT_ENCHANTABLE) + .addOptionalTag(ItemTags.FISHING_ENCHANTABLE) + .addOptionalTag(ItemTags.TRIDENT_ENCHANTABLE) + .addOptionalTag(ItemTags.BOW_ENCHANTABLE) + .addOptionalTag(ItemTags.CROSSBOW_ENCHANTABLE) + .addOptionalTag(ItemTags.MACE_ENCHANTABLE) + .addOptionalTag(ItemTags.FIRE_ASPECT_ENCHANTABLE) + .addOptionalTag(ItemTags.DURABILITY_ENCHANTABLE); + getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS) .add(Items.BOW); getOrCreateTagBuilder(ConventionalItemTags.CROSSBOWS_TOOLS) @@ -420,27 +530,6 @@ private void generateToolTags() { .add(Items.BOW) .add(Items.CROSSBOW) .add(Items.TRIDENT); - - getOrCreateTagBuilder(ConventionalItemTags.ARMORS) - .addOptionalTag(ItemTags.HEAD_ARMOR) - .addOptionalTag(ItemTags.CHEST_ARMOR) - .addOptionalTag(ItemTags.LEG_ARMOR) - .addOptionalTag(ItemTags.FOOT_ARMOR); - - getOrCreateTagBuilder(ConventionalItemTags.ENCHANTABLES) - .addOptionalTag(ItemTags.ARMOR_ENCHANTABLE) - .addOptionalTag(ItemTags.EQUIPPABLE_ENCHANTABLE) - .addOptionalTag(ItemTags.WEAPON_ENCHANTABLE) - .addOptionalTag(ItemTags.SWORD_ENCHANTABLE) - .addOptionalTag(ItemTags.MINING_ENCHANTABLE) - .addOptionalTag(ItemTags.MINING_LOOT_ENCHANTABLE) - .addOptionalTag(ItemTags.FISHING_ENCHANTABLE) - .addOptionalTag(ItemTags.TRIDENT_ENCHANTABLE) - .addOptionalTag(ItemTags.BOW_ENCHANTABLE) - .addOptionalTag(ItemTags.CROSSBOW_ENCHANTABLE) - .addOptionalTag(ItemTags.MACE_ENCHANTABLE) - .addOptionalTag(ItemTags.FIRE_ASPECT_ENCHANTABLE) - .addOptionalTag(ItemTags.DURABILITY_ENCHANTABLE); } private void generateVillagerJobSites() { @@ -460,6 +549,15 @@ private void generateOtherTags() { getOrCreateTagBuilder(ConventionalItemTags.STRINGS) .add(Items.STRING); + getOrCreateTagBuilder(ConventionalItemTags.LEATHERS) + .add(Items.LEATHER); + + getOrCreateTagBuilder(ConventionalItemTags.MUSIC_DISCS) + .add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, + Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, + Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT, Items.MUSIC_DISC_OTHERSIDE, Items.MUSIC_DISC_5, Items.MUSIC_DISC_PIGSTEP, + Items.MUSIC_DISC_RELIC, Items.MUSIC_DISC_CREATOR, Items.MUSIC_DISC_CREATOR_MUSIC_BOX, Items.MUSIC_DISC_PRECIPICE); + getOrCreateTagBuilder(ConventionalItemTags.WOODEN_RODS) .add(Items.STICK); @@ -630,10 +728,10 @@ private void generateBackwardsCompatTags() { getOrCreateTagBuilder(ConventionalItemTags.LAPIS_GEMS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "lapis")); getOrCreateTagBuilder(ConventionalItemTags.EMERALD_GEMS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "emeralds")); getOrCreateTagBuilder(ConventionalItemTags.QUARTZ_GEMS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "quartz")); - getOrCreateTagBuilder(ConventionalItemTags.SHEARS_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "shears")); - getOrCreateTagBuilder(ConventionalItemTags.SPEARS_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "spears")); - getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "bows")); - getOrCreateTagBuilder(ConventionalItemTags.SHIELDS_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "shields")); + getOrCreateTagBuilder(ConventionalItemTags.SHEAR_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "shears")); + getOrCreateTagBuilder(ConventionalItemTags.SPEAR_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "spears")); + getOrCreateTagBuilder(ConventionalItemTags.BOW_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "bows")); + getOrCreateTagBuilder(ConventionalItemTags.SHIELD_TOOLS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "shields")); getOrCreateTagBuilder(ConventionalItemTags.STRINGS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "string")); } } diff --git a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json index 8a79315130..e40332974b 100644 --- a/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json +++ b/fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json @@ -9,6 +9,7 @@ "tag.block.c.chests.wooden": "Wooden Chests", "tag.block.c.clusters": "Clusters", "tag.block.c.cobblestones": "Cobblestones", + "tag.block.c.concrete": "Concrete", "tag.block.c.dyed": "Dyed Blocks", "tag.block.c.dyed.black": "Black Dyed Blocks", "tag.block.c.dyed.blue": "Blue Dyed Blocks", @@ -28,6 +29,7 @@ "tag.block.c.dyed.yellow": "Yellow Dyed Blocks", "tag.block.c.glass_blocks": "Glass Blocks", "tag.block.c.glass_panes": "Glass Panes", + "tag.block.c.glazed_terracotta": "Glaze Terracotta", "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.block.c.ores": "Ores", "tag.block.c.ores.netherite_scrap": "Netherite Scrap Ores", @@ -104,6 +106,8 @@ "tag.item.c.clusters": "Clusters", "tag.item.c.coal": "Coal", "tag.item.c.cobblestones": "Cobblestones", + "tag.item.c.concrete": "Concrete", + "tag.item.c.concrete_powder": "Concrete Powder", "tag.item.c.dusts": "Dusts", "tag.item.c.dusts.glowstone": "Glowstone Dusts", "tag.item.c.dusts.redstone": "Redstone Dusts", @@ -165,12 +169,14 @@ "tag.item.c.gems.quartz": "Quartz Gems", "tag.item.c.glass_blocks": "Glass Blocks", "tag.item.c.glass_panes": "Glass Panes", + "tag.item.c.glazed_terracotta": "Glaze Terracotta", "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.item.c.ingots": "Ingots", "tag.item.c.ingots.copper": "Copper Ingots", "tag.item.c.ingots.gold": "Gold Ingots", "tag.item.c.ingots.iron": "Iron Ingots", "tag.item.c.ingots.netherite": "Netherite Ingots", + "tag.item.c.music_discs": "Music Discs", "tag.item.c.nuggets": "Nuggets", "tag.item.c.ores": "Ores", "tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores", @@ -221,15 +227,25 @@ "tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks", "tag.item.c.strings": "Strings", "tag.item.c.tools": "Tools", + "tag.item.c.tools.bow": "Bows", "tag.item.c.tools.bows": "Bows", + "tag.item.c.tools.brush": "Brushes", "tag.item.c.tools.brushes": "Brushes", + "tag.item.c.tools.crossbow": "Crossbows", "tag.item.c.tools.crossbows": "Crossbows", + "tag.item.c.tools.fishing_rod": "Fishing Rods", "tag.item.c.tools.fishing_rods": "Fishing Rods", + "tag.item.c.tools.melee_weapon": "Melee Weapons", "tag.item.c.tools.melee_weapons": "Melee Weapons", + "tag.item.c.tools.mining_tool": "Mining Tools", "tag.item.c.tools.mining_tools": "Mining Tools", + "tag.item.c.tools.ranged_weapon": "Ranged Weapons", "tag.item.c.tools.ranged_weapons": "Ranged Weapons", + "tag.item.c.tools.shear": "Shears", "tag.item.c.tools.shears": "Shears", + "tag.item.c.tools.shield": "Shields", "tag.item.c.tools.shields": "Shields", + "tag.item.c.tools.spear": "Spears", "tag.item.c.tools.spears": "Spears", "tag.item.c.villager_job_sites": "Villager Job Sites", "tag.worldgen.biome.c.hidden_from_locator_selection": "Hidden From Locator Selection", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concrete.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concrete.json new file mode 100644 index 0000000000..a3e28485cf --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concrete.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:black_concrete", + "minecraft:red_concrete" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracotta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracotta.json new file mode 100644 index 0000000000..c1afe11c71 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracotta.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:black_glazed_terracotta", + "minecraft:red_glazed_terracotta" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/shulker_boxes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/shulker_boxes.json deleted file mode 100644 index 8ffa83c158..0000000000 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/shulker_boxes.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "values": [ - "minecraft:shulker_box", - "minecraft:white_shulker_box", - "minecraft:orange_shulker_box", - "minecraft:magenta_shulker_box", - "minecraft:light_blue_shulker_box", - "minecraft:yellow_shulker_box", - "minecraft:lime_shulker_box", - "minecraft:pink_shulker_box", - "minecraft:gray_shulker_box", - "minecraft:light_gray_shulker_box", - "minecraft:cyan_shulker_box", - "minecraft:purple_shulker_box", - "minecraft:blue_shulker_box", - "minecraft:brown_shulker_box", - "minecraft:green_shulker_box", - "minecraft:red_shulker_box", - "minecraft:black_shulker_box" - ] -} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete.json new file mode 100644 index 0000000000..a3e28485cf --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:black_concrete", + "minecraft:red_concrete" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powder.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powder.json new file mode 100644 index 0000000000..57a09c9b25 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powder.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete_powder", + "minecraft:orange_concrete_powder", + "minecraft:magenta_concrete_powder", + "minecraft:light_blue_concrete_powder", + "minecraft:yellow_concrete_powder", + "minecraft:lime_concrete_powder", + "minecraft:pink_concrete_powder", + "minecraft:gray_concrete_powder", + "minecraft:light_gray_concrete_powder", + "minecraft:cyan_concrete_powder", + "minecraft:purple_concrete_powder", + "minecraft:blue_concrete_powder", + "minecraft:brown_concrete_powder", + "minecraft:green_concrete_powder", + "minecraft:red_concrete_powder", + "minecraft:black_concrete_powder" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracotta.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracotta.json new file mode 100644 index 0000000000..c1afe11c71 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracotta.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:black_glazed_terracotta", + "minecraft:red_glazed_terracotta" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/leathers.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/leathers.json new file mode 100644 index 0000000000..71b797d35b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/leathers.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:leather" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json new file mode 100644 index 0000000000..4cfc035e4f --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/music_discs.json @@ -0,0 +1,23 @@ +{ + "values": [ + "minecraft:music_disc_13", + "minecraft:music_disc_cat", + "minecraft:music_disc_blocks", + "minecraft:music_disc_chirp", + "minecraft:music_disc_far", + "minecraft:music_disc_mall", + "minecraft:music_disc_mellohi", + "minecraft:music_disc_stal", + "minecraft:music_disc_strad", + "minecraft:music_disc_ward", + "minecraft:music_disc_11", + "minecraft:music_disc_wait", + "minecraft:music_disc_otherside", + "minecraft:music_disc_5", + "minecraft:music_disc_pigstep", + "minecraft:music_disc_relic", + "minecraft:music_disc_creator", + "minecraft:music_disc_creator_music_box", + "minecraft:music_disc_precipice" + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools.json index e6f97c30f8..56add0b05f 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools.json @@ -21,43 +21,43 @@ "required": false }, { - "id": "#c:tools/bows", + "id": "#c:tools/bow", "required": false }, { - "id": "#c:tools/brushes", + "id": "#c:tools/brush", "required": false }, { - "id": "#c:tools/crossbows", + "id": "#c:tools/crossbow", "required": false }, { - "id": "#c:tools/fishing_rods", + "id": "#c:tools/fishing_rod", "required": false }, { - "id": "#c:tools/shears", + "id": "#c:tools/shear", "required": false }, { - "id": "#c:tools/shields", + "id": "#c:tools/shield", "required": false }, { - "id": "#c:tools/spears", + "id": "#c:tools/spear", "required": false }, { - "id": "#c:tools/mining_tools", + "id": "#c:tools/mining_tool", "required": false }, { - "id": "#c:tools/melee_weapons", + "id": "#c:tools/melee_weapon", "required": false }, { - "id": "#c:tools/ranged_weapons", + "id": "#c:tools/ranged_weapon", "required": false } ] diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bow.json new file mode 100644 index 0000000000..b1e8b3731a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bow.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:bow", + { + "id": "#c:tools/bows", + "required": false + }, + { + "id": "#c:bows", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bows.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bows.json index def29d61bf..a1c8a443dc 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bows.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/bows.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:bow", - { - "id": "#c:bows", - "required": false - } + "minecraft:bow" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/brush.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/brush.json new file mode 100644 index 0000000000..6ba7120fda --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/brush.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:brush", + { + "id": "#c:tools/brushes", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/crossbow.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/crossbow.json new file mode 100644 index 0000000000..6366e8007a --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/crossbow.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:crossbow", + { + "id": "#c:tools/crossbows", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/fishing_rod.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/fishing_rod.json new file mode 100644 index 0000000000..97ef521500 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/fishing_rod.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:fishing_rod", + { + "id": "#c:tools/fishing_rods", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json new file mode 100644 index 0000000000..13e3086261 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/melee_weapon.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:wooden_sword", + "minecraft:stone_sword", + "minecraft:golden_sword", + "minecraft:iron_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword", + "minecraft:wooden_axe", + "minecraft:stone_axe", + "minecraft:golden_axe", + "minecraft:iron_axe", + "minecraft:diamond_axe", + "minecraft:netherite_axe", + { + "id": "#c:tools/melee_weapons", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/mining_tool.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/mining_tool.json new file mode 100644 index 0000000000..453cb53c57 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/mining_tool.json @@ -0,0 +1,14 @@ +{ + "values": [ + "minecraft:wooden_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:iron_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe", + { + "id": "#c:tools/mining_tools", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/ranged_weapon.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/ranged_weapon.json new file mode 100644 index 0000000000..f0fcd2f2e6 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/ranged_weapon.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:bow", + "minecraft:crossbow", + "minecraft:trident", + { + "id": "#c:tools/ranged_weapons", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shear.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shear.json new file mode 100644 index 0000000000..f084470d36 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shear.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:shears", + { + "id": "#c:tools/shears", + "required": false + }, + { + "id": "#c:shears", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shears.json index 2974368476..2400078166 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shears.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shears.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:shears", - { - "id": "#c:shears", - "required": false - } + "minecraft:shears" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shield.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shield.json new file mode 100644 index 0000000000..36d20485bd --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shield.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:shield", + { + "id": "#c:tools/shields", + "required": false + }, + { + "id": "#c:shields", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shields.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shields.json index cb55f6df61..0f2454ce04 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shields.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/shields.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:shield", - { - "id": "#c:shields", - "required": false - } + "minecraft:shield" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spear.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spear.json new file mode 100644 index 0000000000..4cdae04f4b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spear.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:trident", + { + "id": "#c:tools/spears", + "required": false + }, + { + "id": "#c:spears", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spears.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spears.json index 5ee455d5d1..7a2c450bc7 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spears.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/spears.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:trident", - { - "id": "#c:spears", - "required": false - } + "minecraft:trident" ] } \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index 3565ae3956..a9d66dafd0 100644 --- a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -1,7 +1,6 @@ { "values": [ "minecraft:wooded_badlands", - "minecraft:eroded_badlands", "minecraft:savanna", "minecraft:savanna_plateau", "minecraft:windswept_savanna", diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java index 6813e657ba..f7653475f0 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java @@ -50,7 +50,8 @@ private ConventionalBlockTags() { public static final TagKey WOODEN_CHESTS = register("chests/wooden"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_PANES = register("glass_panes"); - public static final TagKey SHULKER_BOXES = register("shulker_boxes"); + public static final TagKey GLAZED_TERRACOTTA = register("glazed_terracotta"); + public static final TagKey CONCRETE = register("concrete"); // Related to budding mechanics /** @@ -151,6 +152,12 @@ private ConventionalBlockTags() { */ public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); + /** + * This tag is redundant. Please use {@link net.minecraft.registry.tag.BlockTags#SHULKER_BOXES} tag instead. + */ + @Deprecated + public static final TagKey SHULKER_BOXES = register("shulker_boxes"); + private static TagKey register(String tagId) { return TagRegistration.BLOCK_TAG.registerC(tagId); } diff --git a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java index 84596cadd4..3a82768f6f 100644 --- a/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java +++ b/fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java @@ -17,6 +17,7 @@ package net.fabricmc.fabric.api.tag.convention.v2; import net.minecraft.item.Item; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.TagKey; import net.fabricmc.fabric.impl.tag.convention.v2.TagRegistration; @@ -37,22 +38,22 @@ private ConventionalItemTags() { // Tool tags public static final TagKey TOOLS = register("tools"); - public static final TagKey SHEARS_TOOLS = register("tools/shears"); + public static final TagKey SHEAR_TOOLS = register("tools/shear"); /** * For spear tools, like Minecraft's tridents. * Note, other weapons like boomerangs and throwing knives are best put into their own tools tag. */ - public static final TagKey SPEARS_TOOLS = register("tools/spears"); - public static final TagKey BOWS_TOOLS = register("tools/bows"); - public static final TagKey CROSSBOWS_TOOLS = register("tools/crossbows"); - public static final TagKey SHIELDS_TOOLS = register("tools/shields"); - public static final TagKey FISHING_RODS_TOOLS = register("tools/fishing_rods"); - public static final TagKey BRUSHES_TOOLS = register("tools/brushes"); + public static final TagKey SPEAR_TOOLS = register("tools/spear"); + public static final TagKey BOW_TOOLS = register("tools/bow"); + public static final TagKey CROSSBOW_TOOLS = register("tools/crossbow"); + public static final TagKey SHIELD_TOOLS = register("tools/shield"); + public static final TagKey FISHING_ROD_TOOLS = register("tools/fishing_rod"); + public static final TagKey BRUSH_TOOLS = register("tools/brush"); // Action-based tool tags - public static final TagKey MELEE_WEAPONS_TOOLS = register("tools/melee_weapons"); - public static final TagKey RANGED_WEAPONS_TOOLS = register("tools/ranged_weapons"); - public static final TagKey MINING_TOOLS = register("tools/mining_tools"); + public static final TagKey MELEE_WEAPON_TOOLS = register("tools/melee_weapon"); + public static final TagKey RANGED_WEAPON_TOOLS = register("tools/ranged_weapon"); + public static final TagKey MINING_TOOL_TOOLS = register("tools/mining_tool"); // Armor tags /** @@ -74,15 +75,11 @@ private ConventionalItemTags() { public static final TagKey NUGGETS = register("nuggets"); public static final TagKey ORES = register("ores"); public static final TagKey RAW_MATERIALS = register("raw_materials"); - public static final TagKey RAW_BLOCKS = register("raw_blocks"); // Raw material and blocks - vanilla instances public static final TagKey IRON_RAW_MATERIALS = register("raw_materials/iron"); public static final TagKey GOLD_RAW_MATERIALS = register("raw_materials/gold"); public static final TagKey COPPER_RAW_MATERIALS = register("raw_materials/copper"); - public static final TagKey IRON_RAW_BLOCKS = register("raw_blocks/iron"); - public static final TagKey GOLD_RAW_BLOCKS = register("raw_blocks/gold"); - public static final TagKey COPPER_RAW_BLOCKS = register("raw_blocks/copper"); // Bricks - vanilla instances public static final TagKey NORMAL_BRICKS = register("bricks/normal"); @@ -109,7 +106,6 @@ private ConventionalItemTags() { // Dusts and Misc - vanilla instances public static final TagKey REDSTONE_DUSTS = register("dusts/redstone"); public static final TagKey GLOWSTONE_DUSTS = register("dusts/glowstone"); - public static final TagKey COAL = register("coal"); // Consumables public static final TagKey POTIONS = register("potions"); @@ -173,7 +169,16 @@ private ConventionalItemTags() { public static final TagKey WOODEN_CHESTS = register("chests/wooden"); public static final TagKey GLASS_BLOCKS = register("glass_blocks"); public static final TagKey GLASS_PANES = register("glass_panes"); + /** + * Block tag equivalent is {@link BlockTags#SHULKER_BOXES}. + */ public static final TagKey SHULKER_BOXES = register("shulker_boxes"); + public static final TagKey GLAZED_TERRACOTTA = register("glazed_terracotta"); + public static final TagKey CONCRETE = register("concrete"); + /** + * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER}. + */ + public static final TagKey CONCRETE_POWDER = register("concrete_powder"); // Related to budding mechanics public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); @@ -271,6 +276,12 @@ private ConventionalItemTags() { public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = register("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = register("player_workstations/furnaces"); public static final TagKey STRINGS = register("strings"); + public static final TagKey LEATHERS = register("leathers"); + /** + * For music disc-like materials to be used in recipes. + * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. + */ + public static final TagKey MUSIC_DISCS = register("music_discs"); /** * For rod-like materials to be used in recipes. */ @@ -290,6 +301,82 @@ private ConventionalItemTags() { */ public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = register("hidden_from_recipe_viewers"); + /** + * This tag is redundant. Please use {@link ConventionalItemTags#STORAGE_BLOCKS} tag instead. + */ + @Deprecated + public static final TagKey RAW_BLOCKS = register("raw_blocks"); + /** + * This tag is redundant. Please use {@link ConventionalItemTags#STORAGE_BLOCKS_RAW_IRON} tag instead. + */ + @Deprecated + public static final TagKey IRON_RAW_BLOCKS = register("raw_blocks/iron"); + /** + * This tag is redundant. Please use {@link ConventionalItemTags#STORAGE_BLOCKS_RAW_GOLD} tag instead. + */ + @Deprecated + public static final TagKey GOLD_RAW_BLOCKS = register("raw_blocks/gold"); + /** + * This tag is redundant. Please use {@link ConventionalItemTags#STORAGE_BLOCKS_RAW_COPPER} tag instead. + */ + @Deprecated + public static final TagKey COPPER_RAW_BLOCKS = register("raw_blocks/copper"); + /** + * This tag is redundant. Please use {@link net.minecraft.registry.tag.ItemTags#COALS} tag instead. + */ + @Deprecated + public static final TagKey COAL = register("coal"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#SHEAR_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey SHEARS_TOOLS = register("tools/shears"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#SPEAR_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey SPEARS_TOOLS = register("tools/spears"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#BOW_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey BOWS_TOOLS = register("tools/bows"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#CROSSBOW_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey CROSSBOWS_TOOLS = register("tools/crossbows"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#SHIELD_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey SHIELDS_TOOLS = register("tools/shields"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#FISHING_ROD_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey FISHING_RODS_TOOLS = register("tools/fishing_rods"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#BRUSH_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey BRUSHES_TOOLS = register("tools/brushes"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#MELEE_WEAPON_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey MELEE_WEAPONS_TOOLS = register("tools/melee_weapons"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#RANGED_WEAPON_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey RANGED_WEAPONS_TOOLS = register("tools/ranged_weapons"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#MINING_TOOL_TOOLS} tag instead. + */ + @Deprecated + public static final TagKey MINING_TOOLS = register("tools/mining_tools"); + private static TagKey register(String tagId) { return TagRegistration.ITEM_TAG.registerC(tagId); }