From 5698f89ba9c2a2eb43b5124d4e667fbaf8f8a6ea Mon Sep 17 00:00:00 2001 From: TelepathicGrunt <40846040+TelepathicGrunt@users.noreply.github.com> Date: Mon, 17 Jun 2024 13:10:55 -0400 Subject: [PATCH] Fix some new tags not being plural (#3848) * Fix new tags not being plural Fixes https://github.com/FabricMC/fabric/pull/3807 Matches https://github.com/neoforged/NeoForge/pull/1030 * Fixed concrete and terracotta * Update fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * Update fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> * regen data --------- Co-authored-by: haykam821 <24855774+haykam821@users.noreply.github.com> --- .../datagen/generators/BlockTagGenerator.java | 36 +++++++++++++++++++ .../generators/EnglishTagLangGenerator.java | 9 +++-- .../datagen/generators/ItemTagGenerator.java | 22 +++++++++++- .../fabric-convention-tags-v2/lang/en_us.json | 9 +++-- .../data/c/tags/block/concretes.json | 24 +++++++++++++ .../data/c/tags/block/glazed_terracottas.json | 24 +++++++++++++ .../data/c/tags/item/concrete_powders.json | 24 +++++++++++++ .../resources/data/c/tags/item/concretes.json | 24 +++++++++++++ .../data/c/tags/item/glazed_terracottas.json | 24 +++++++++++++ .../convention/v2/ConventionalBlockTags.java | 14 ++++++-- .../convention/v2/ConventionalItemTags.java | 23 +++++++++--- 11 files changed, 222 insertions(+), 11 deletions(-) create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powders.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json create mode 100644 fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json 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 bb426532a..80a7dd220 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 @@ -222,6 +222,23 @@ private void generateGlassTags() { } private void generateGlazeTerracottaTags() { + tag(ConventionalBlockTags.GLAZED_TERRACOTTAS) + .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); tag(ConventionalBlockTags.GLAZED_TERRACOTTA) .add(Blocks.WHITE_GLAZED_TERRACOTTA) .add(Blocks.ORANGE_GLAZED_TERRACOTTA) @@ -242,6 +259,23 @@ private void generateGlazeTerracottaTags() { } private void generateConcreteTags() { + tag(ConventionalBlockTags.CONCRETES) + .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); tag(ConventionalBlockTags.CONCRETE) .add(Blocks.WHITE_CONCRETE) .add(Blocks.ORANGE_CONCRETE) @@ -480,5 +514,7 @@ private void generateBackwardsCompatTags() { tag(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS).addOptionalTag(ResourceLocation.fromNamespaceAndPath(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks")); tag(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS).addOptionalTag(ResourceLocation.fromNamespaceAndPath(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs")); tag(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS).addOptionalTag(ResourceLocation.fromNamespaceAndPath(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_stairs")); + tag(ConventionalBlockTags.GLAZED_TERRACOTTAS).addOptionalTag(ConventionalBlockTags.GLAZED_TERRACOTTA); + tag(ConventionalBlockTags.CONCRETES).addOptionalTag(ConventionalBlockTags.CONCRETE); } } 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 73ac36ed6..7d97c9697 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 @@ -48,8 +48,10 @@ public void generateTranslations(HolderLookup.Provider registryLookup, Translati 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.GLAZED_TERRACOTTAS, "Glazed Terracottas"); + translationBuilder.add(ConventionalBlockTags.CONCRETES, "Concretes"); + translationBuilder.add(ConventionalBlockTags.GLAZED_TERRACOTTA, "Glazed Terracotta"); translationBuilder.add(ConventionalBlockTags.CONCRETE, "Concrete"); translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks"); translationBuilder.add(ConventionalBlockTags.BUDS, "Buds"); @@ -192,10 +194,13 @@ public void generateTranslations(HolderLookup.Provider registryLookup, Translati 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.GLAZED_TERRACOTTAS, "Glazed Terracottas"); + translationBuilder.add(ConventionalItemTags.CONCRETES, "Concretes"); + translationBuilder.add(ConventionalItemTags.CONCRETE_POWDERS, "Concrete Powders"); translationBuilder.add(ConventionalItemTags.CONCRETE, "Concrete"); translationBuilder.add(ConventionalItemTags.CONCRETE_POWDER, "Concrete Powder"); + translationBuilder.add(ConventionalItemTags.GLAZED_TERRACOTTA, "Glazed Terracotta"); translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks"); translationBuilder.add(ConventionalItemTags.BUDS, "Buds"); translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters"); 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 9580ffd64..9d9a08bc1 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 @@ -58,7 +58,6 @@ 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.GLAZED_TERRACOTTA, ConventionalItemTags.GLAZED_TERRACOTTA); tag(ConventionalItemTags.SHULKER_BOXES) .add(Items.SHULKER_BOX) .add(Items.WHITE_SHULKER_BOX) @@ -77,7 +76,27 @@ private void copyItemTags() { .add(Items.GREEN_SHULKER_BOX) .add(Items.RED_SHULKER_BOX) .add(Items.BLACK_SHULKER_BOX); + copy(ConventionalBlockTags.GLAZED_TERRACOTTAS, ConventionalItemTags.GLAZED_TERRACOTTAS); + copy(ConventionalBlockTags.GLAZED_TERRACOTTA, ConventionalItemTags.GLAZED_TERRACOTTA); + copy(ConventionalBlockTags.CONCRETES, ConventionalItemTags.CONCRETES); copy(ConventionalBlockTags.CONCRETE, ConventionalItemTags.CONCRETE); + tag(ConventionalItemTags.CONCRETE_POWDERS) + .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); tag(ConventionalItemTags.CONCRETE_POWDER) .add(Items.WHITE_CONCRETE_POWDER) .add(Items.ORANGE_CONCRETE_POWDER) @@ -731,5 +750,6 @@ private void generateBackwardsCompatTags() { tag(ConventionalItemTags.BOW_TOOLS).addOptionalTag(ResourceLocation.fromNamespaceAndPath(TagUtil.C_TAG_NAMESPACE, "bows")); tag(ConventionalItemTags.SHIELD_TOOLS).addOptionalTag(ResourceLocation.fromNamespaceAndPath(TagUtil.C_TAG_NAMESPACE, "shields")); tag(ConventionalItemTags.STRINGS).addOptionalTag(ResourceLocation.fromNamespaceAndPath(TagUtil.C_TAG_NAMESPACE, "string")); + tag(ConventionalItemTags.CONCRETE_POWDERS).addOptionalTag(ConventionalItemTags.CONCRETE_POWDER); } } 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 653b24b02..c655c9533 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 @@ -10,6 +10,7 @@ "tag.block.c.clusters": "Clusters", "tag.block.c.cobblestones": "Cobblestones", "tag.block.c.concrete": "Concrete", + "tag.block.c.concretes": "Concretes", "tag.block.c.dyed": "Dyed Blocks", "tag.block.c.dyed.black": "Black Dyed Blocks", "tag.block.c.dyed.blue": "Blue Dyed Blocks", @@ -29,7 +30,8 @@ "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.glazed_terracotta": "Glazed Terracotta", + "tag.block.c.glazed_terracottas": "Glazed Terracottas", "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", @@ -108,6 +110,8 @@ "tag.item.c.cobblestones": "Cobblestones", "tag.item.c.concrete": "Concrete", "tag.item.c.concrete_powder": "Concrete Powder", + "tag.item.c.concrete_powders": "Concrete Powders", + "tag.item.c.concretes": "Concretes", "tag.item.c.dusts": "Dusts", "tag.item.c.dusts.glowstone": "Glowstone Dusts", "tag.item.c.dusts.redstone": "Redstone Dusts", @@ -169,7 +173,8 @@ "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.glazed_terracotta": "Glazed Terracotta", + "tag.item.c.glazed_terracottas": "Glazed Terracottas", "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.item.c.ingots": "Ingots", "tag.item.c.ingots.copper": "Copper Ingots", diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json new file mode 100644 index 000000000..4a750b3d1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/concretes.json @@ -0,0 +1,24 @@ +{ + "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", + { + "id": "#c:concrete", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json new file mode 100644 index 000000000..e87747d55 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glazed_terracottas.json @@ -0,0 +1,24 @@ +{ + "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", + { + "id": "#c:glazed_terracotta", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powders.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powders.json new file mode 100644 index 000000000..88da85d8b --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concrete_powders.json @@ -0,0 +1,24 @@ +{ + "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", + { + "id": "#c:concrete_powder", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json new file mode 100644 index 000000000..4a750b3d1 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/concretes.json @@ -0,0 +1,24 @@ +{ + "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", + { + "id": "#c:concrete", + "required": false + } + ] +} \ No newline at end of file diff --git a/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json new file mode 100644 index 000000000..e87747d55 --- /dev/null +++ b/fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glazed_terracottas.json @@ -0,0 +1,24 @@ +{ + "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", + { + "id": "#c:glazed_terracotta", + "required": false + } + ] +} \ No newline at end of file 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 43eff4892..40e66d4bf 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 @@ -49,8 +49,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 GLAZED_TERRACOTTA = register("glazed_terracotta"); - public static final TagKey CONCRETE = register("concrete"); + public static final TagKey GLAZED_TERRACOTTAS = register("glazed_terracottas"); + public static final TagKey CONCRETES = register("concretes"); // Related to budding mechanics /** @@ -156,6 +156,16 @@ private ConventionalBlockTags() { */ @Deprecated public static final TagKey SHULKER_BOXES = register("shulker_boxes"); + /** + * This tag was typoed. Please use {@link ConventionalBlockTags#GLAZED_TERRACOTTAS} tag instead. + */ + @Deprecated + public static final TagKey GLAZED_TERRACOTTA = register("glazed_terracotta"); + /** + * This tag was typoed. Please use {@link ConventionalBlockTags#CONCRETES} tag instead. + */ + @Deprecated + public static final TagKey CONCRETE = register("concrete"); 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 55e4404c0..40737a3d4 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 @@ -172,12 +172,12 @@ private ConventionalItemTags() { * 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"); + public static final TagKey GLAZED_TERRACOTTAS = register("glazed_terracottas"); + public static final TagKey CONCRETES = register("concretes"); /** - * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER}. + * Block tag equivalent is {@link BlockTags#CONCRETE_POWDERS}. */ - public static final TagKey CONCRETE_POWDER = register("concrete_powder"); + public static final TagKey CONCRETE_POWDERS = register("concrete_powders"); // Related to budding mechanics public static final TagKey BUDDING_BLOCKS = register("budding_blocks"); @@ -375,6 +375,21 @@ private ConventionalItemTags() { */ @Deprecated public static final TagKey MINING_TOOLS = register("tools/mining_tools"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#GLAZED_TERRACOTTAS} tag instead. + */ + @Deprecated + public static final TagKey GLAZED_TERRACOTTA = register("glazed_terracotta"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#CONCRETES} tag instead. + */ + @Deprecated + public static final TagKey CONCRETE = register("concrete"); + /** + * This tag was typoed. Please use {@link ConventionalItemTags#CONCRETE_POWDERS} tag instead. + */ + @Deprecated + public static final TagKey CONCRETE_POWDER = register("concrete_powder"); private static TagKey register(String tagId) { return TagRegistration.ITEM_TAG.registerC(tagId);