Fix new tags not being plural

Fixes FabricMC#3807 Matches neoforged/NeoForge#1030
TelepathicGrunt · Jun 12, 2024 · fa9d46d · fa9d46d
1 parent 41bc64c
commit fa9d46d
Show file tree

Hide file tree

Showing 11 changed files with 131 additions and 8 deletions.
diff --git a/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java b/...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
@@ -482,5 +482,7 @@ private void generateBackwardsCompatTags() {
 		getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_BLOCKS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_blocks"));
 		getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_SLABS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_slabs"));
 		getOrCreateTagBuilder(ConventionalBlockTags.UNCOLORED_SANDSTONE_STAIRS).addOptionalTag(Identifier.of(TagUtil.C_TAG_NAMESPACE, "uncolored_sandstone_stairs"));
+		getOrCreateTagBuilder(ConventionalBlockTags.GLAZED_TERRACOTTAS).addOptionalTag(ConventionalBlockTags.GLAZED_TERRACOTTA);
+		getOrCreateTagBuilder(ConventionalBlockTags.CONCRETES).addOptionalTag(ConventionalBlockTags.CONCRETE);
 	}
 }
diff --git a/...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java b/...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
@@ -50,8 +50,10 @@ 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.GLAZED_TERRACOTTAS, "Glaze Terracottas");
+		translationBuilder.add(ConventionalBlockTags.CONCRETES, "Concretes");
+		translationBuilder.add(ConventionalBlockTags.GLAZED_TERRACOTTA, "Glaze Terracotta");
 		translationBuilder.add(ConventionalBlockTags.CONCRETE, "Concrete");
 		translationBuilder.add(ConventionalBlockTags.BUDDING_BLOCKS, "Budding Blocks");
 		translationBuilder.add(ConventionalBlockTags.BUDS, "Buds");
@@ -194,10 +196,13 @@ 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.GLAZED_TERRACOTTAS, "Glaze 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, "Glaze Terracotta");
 		translationBuilder.add(ConventionalItemTags.BUDDING_BLOCKS, "Budding Blocks");
 		translationBuilder.add(ConventionalItemTags.BUDS, "Buds");
 		translationBuilder.add(ConventionalItemTags.CLUSTERS, "Clusters");

diff --git a/...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java b/...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
@@ -60,7 +60,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);
 		getOrCreateTagBuilder(ConventionalItemTags.SHULKER_BOXES)
 				.add(Items.SHULKER_BOX)
 				.add(Items.WHITE_SHULKER_BOX)
@@ -79,7 +78,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);
+		getOrCreateTagBuilder(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);
 		getOrCreateTagBuilder(ConventionalItemTags.CONCRETE_POWDER)
 				.add(Items.WHITE_CONCRETE_POWDER)
 				.add(Items.ORANGE_CONCRETE_POWDER)
@@ -733,5 +752,8 @@ private void generateBackwardsCompatTags() {
 		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"));
+		getOrCreateTagBuilder(ConventionalItemTags.GLAZED_TERRACOTTAS).addOptionalTag(ConventionalItemTags.GLAZED_TERRACOTTA);
+		getOrCreateTagBuilder(ConventionalItemTags.CONCRETES).addOptionalTag(ConventionalItemTags.CONCRETE);
+		getOrCreateTagBuilder(ConventionalItemTags.CONCRETE_POWDERS).addOptionalTag(ConventionalItemTags.CONCRETE_POWDER);
 	}
 }
diff --git a/...nvention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json b/...nvention-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",
@@ -30,6 +31,7 @@
   "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_terracottas": "Glaze 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",
@@ -170,6 +174,7 @@
   "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_terracottas": "Glaze 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
@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:concrete",
+      "required": false
+    }
+  ]
+}
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
@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:glazed_terracotta",
+      "required": false
+    }
+  ]
+}
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
@@ -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
+    }
+  ]
+}
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
@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#c:concrete",
+      "required": false
+    },
+    {
+      "id": "#c:concrete",
+      "required": false
+    }
+  ]
+}
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
@@ -0,0 +1,12 @@
+{
+  "values": [
+    {
+      "id": "#c:glazed_terracotta",
+      "required": false
+    },
+    {
+      "id": "#c:glazed_terracotta",
+      "required": false
+    }
+  ]
+}
diff --git a/...ags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java b/...ags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
@@ -50,8 +50,8 @@ private ConventionalBlockTags() {
 	public static final TagKey<Block> WOODEN_CHESTS = register("chests/wooden");
 	public static final TagKey<Block> GLASS_BLOCKS = register("glass_blocks");
 	public static final TagKey<Block> GLASS_PANES = register("glass_panes");
-	public static final TagKey<Block> GLAZED_TERRACOTTA = register("glazed_terracotta");
-	public static final TagKey<Block> CONCRETE = register("concrete");
+	public static final TagKey<Block> GLAZED_TERRACOTTAS = register("glazed_terracottas");
+	public static final TagKey<Block> CONCRETES = register("concretes");
 
 	// Related to budding mechanics
 	/**
@@ -157,6 +157,16 @@ private ConventionalBlockTags() {
 	 */
 	@Deprecated
 	public static final TagKey<Block> SHULKER_BOXES = register("shulker_boxes");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalBlockTags#GLAZED_TERRACOTTAS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Block> GLAZED_TERRACOTTA = register("glazed_terracotta");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalBlockTags#CONCRETES} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Block> CONCRETE = register("concrete");
 
 	private static TagKey<Block> register(String tagId) {
 		return TagRegistration.BLOCK_TAG.registerC(tagId);

diff --git a/...tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java b/...tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
@@ -173,12 +173,12 @@ private ConventionalItemTags() {
 	 * Block tag equivalent is {@link BlockTags#SHULKER_BOXES}.
 	 */
 	public static final TagKey<Item> SHULKER_BOXES = register("shulker_boxes");
-	public static final TagKey<Item> GLAZED_TERRACOTTA = register("glazed_terracotta");
-	public static final TagKey<Item> CONCRETE = register("concrete");
+	public static final TagKey<Item> GLAZED_TERRACOTTAS = register("glazed_terracottas");
+	public static final TagKey<Item> CONCRETES = register("concretes");
 	/**
 	 * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER}.
 	 */
-	public static final TagKey<Item> CONCRETE_POWDER = register("concrete_powder");
+	public static final TagKey<Item> CONCRETE_POWDERS = register("concrete_powders");
 
 	// Related to budding mechanics
 	public static final TagKey<Item> BUDDING_BLOCKS = register("budding_blocks");
@@ -376,6 +376,21 @@ private ConventionalItemTags() {
 	 */
 	@Deprecated
 	public static final TagKey<Item> MINING_TOOLS = register("tools/mining_tools");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#GLAZED_TERRACOTTAS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> GLAZED_TERRACOTTA = register("glazed_terracotta");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#CONCRETES} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> CONCRETE = register("concrete");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#CONCRETE_POWDERS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> CONCRETE_POWDER = register("concrete_powder");
 
 	private static TagKey<Item> register(String tagId) {
 		return TagRegistration.ITEM_TAG.registerC(tagId);