Several tag fixes and additions (#3912)

* Make food files not plural when inside `foods` folder

* Add flint and steel tool

closes https://github.com/FabricMC/fabric/issues/3895

* Add ender pearl tag and glass block/pane variant tags

Closes https://github.com/FabricMC/fabric/issues/3869

* Add golden food tag

closes https://github.com/FabricMC/fabric/issues/3899

* remove deprecated tags from log warning since fapi would trigger it itself

* checkstyle goes brrr

deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java

@@ -191,30 +191,30 @@ public class ConventionLogWarnings implements ModInitializer {
 			createMapEntry(RegistryKeys.ITEM, "sticks", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS),
 			createMapEntry(RegistryKeys.ITEM, "wooden_rods", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WOODEN_RODS),
 			createMapEntry(RegistryKeys.ITEM, "food", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FOODS),
-			createMapEntry(RegistryKeys.ITEM, "fruit", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUITS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "fruit", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUIT_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "fruits", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUITS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "fruits", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.FRUIT_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "vegetable", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.VEGETABLES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "vegetable", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.VEGETABLE_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "vegetables", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.VEGETABLES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "vegetables", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.VEGETABLE_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "berry", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BERRIES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "berry", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BERRY_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "berries", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BERRIES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "berries", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BERRY_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "bread", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BREADS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "bread", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BREAD_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "breads", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BREADS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "breads", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BREAD_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "cookie", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKIES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "cookie", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKIE_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "cookies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKIES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "cookies", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKIE_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "raw_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEAT_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "raw_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEATS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "raw_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_MEAT_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "raw_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISHES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "raw_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISH_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "raw_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISHES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "raw_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.RAW_FISH_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "cooked_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEATS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "cooked_meat", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEAT_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "cooked_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEATS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "cooked_meats", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_MEAT_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "cooked_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "cooked_fish", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISH_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISHES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "cooked_fishes", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.COOKED_FISH_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "soup", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "soup", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUP_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "soups", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "soups", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUP_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "stew", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "stew", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUP_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUPS_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "stews", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.SOUP_FOODS),
-			createMapEntry(RegistryKeys.ITEM, "candy", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDIES_FOODS),
+			createMapEntry(RegistryKeys.ITEM, "candy", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CANDY_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.CANDY_FOODS),
 			createMapEntry(TagKey.of(RegistryKeys.ITEM, Identifier.of("minecraft", "music_discs")), net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.MUSIC_DISCS)
 	);
 

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java

@@ -185,8 +185,13 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
 
 	private void generateGlassTags() {
 		getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS)
+				.addOptionalTag(ConventionalBlockTags.GLASS_BLOCKS_COLORLESS)
+				.addOptionalTag(ConventionalBlockTags.GLASS_BLOCKS_CHEAP)
+				.addOptionalTag(ConventionalBlockTags.GLASS_BLOCKS_TINTED);
+		getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS_COLORLESS)
+				.add(Blocks.GLASS);
+		getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS_CHEAP)
 				.add(Blocks.GLASS)
-				.add(Blocks.TINTED_GLASS)
 				.add(Blocks.WHITE_STAINED_GLASS)
 				.add(Blocks.ORANGE_STAINED_GLASS)
 				.add(Blocks.MAGENTA_STAINED_GLASS)
@@ -203,8 +208,9 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
 				.add(Blocks.GREEN_STAINED_GLASS)
 				.add(Blocks.BLACK_STAINED_GLASS)
 				.add(Blocks.RED_STAINED_GLASS);
+		getOrCreateTagBuilder(ConventionalBlockTags.GLASS_BLOCKS_TINTED)
+				.add(Blocks.TINTED_GLASS);
 		getOrCreateTagBuilder(ConventionalBlockTags.GLASS_PANES)
-				.add(Blocks.GLASS_PANE)
 				.add(Blocks.WHITE_STAINED_GLASS_PANE)
 				.add(Blocks.ORANGE_STAINED_GLASS_PANE)
 				.add(Blocks.MAGENTA_STAINED_GLASS_PANE)
@@ -220,7 +226,10 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
 				.add(Blocks.BROWN_STAINED_GLASS_PANE)
 				.add(Blocks.GREEN_STAINED_GLASS_PANE)
 				.add(Blocks.BLACK_STAINED_GLASS_PANE)
-				.add(Blocks.RED_STAINED_GLASS_PANE);
+				.add(Blocks.RED_STAINED_GLASS_PANE)
+				.addOptionalTag(ConventionalBlockTags.GLASS_PANES_COLORLESS);
+		getOrCreateTagBuilder(ConventionalBlockTags.GLASS_PANES_COLORLESS)
+				.add(Blocks.GLASS_PANE);
 	}
 
 	private void generateGlazeTerracottaTags() {

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java

@@ -49,7 +49,11 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
 		translationBuilder.add(ConventionalBlockTags.CHESTS, "Chests");
 		translationBuilder.add(ConventionalBlockTags.WOODEN_CHESTS, "Wooden Chests");
 		translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS, "Glass Blocks");
+		translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS_TINTED, "Tinted Glass Blocks");
+		translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS_CHEAP, "Cheap Glass Blocks");
+		translationBuilder.add(ConventionalBlockTags.GLASS_BLOCKS_COLORLESS, "Colorless Glass Blocks");
 		translationBuilder.add(ConventionalBlockTags.GLASS_PANES, "Glass Panes");
+		translationBuilder.add(ConventionalBlockTags.GLASS_PANES_COLORLESS, "Colorless Glass Panes");
 		translationBuilder.add(ConventionalBlockTags.SHULKER_BOXES, "Shulker Boxes");
 		translationBuilder.add(ConventionalBlockTags.GLAZED_TERRACOTTAS, "Glazed Terracottas");
 		translationBuilder.add(ConventionalBlockTags.CONCRETES, "Concretes");
@@ -121,6 +125,7 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
 		translationBuilder.add(ConventionalItemTags.SHIELD_TOOLS, "Shields");
 		translationBuilder.add(ConventionalItemTags.FISHING_ROD_TOOLS, "Fishing Rods");
 		translationBuilder.add(ConventionalItemTags.BRUSH_TOOLS, "Brushes");
+		translationBuilder.add(ConventionalItemTags.IGNITER_TOOLS, "Igniters");
 		translationBuilder.add(ConventionalItemTags.MACE_TOOLS, "Maces");
 		translationBuilder.add(ConventionalItemTags.MELEE_WEAPON_TOOLS, "Melee Weapons");
 		translationBuilder.add(ConventionalItemTags.RANGED_WEAPON_TOOLS, "Ranged Weapons");
@@ -170,6 +175,20 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
 		translationBuilder.add(ConventionalItemTags.COAL, "Coal");
 		translationBuilder.add(ConventionalItemTags.POTIONS, "Potions");
 		translationBuilder.add(ConventionalItemTags.FOODS, "Foods");
+		translationBuilder.add(ConventionalItemTags.FRUIT_FOODS, "Fruits");
+		translationBuilder.add(ConventionalItemTags.VEGETABLE_FOODS, "Vegetables");
+		translationBuilder.add(ConventionalItemTags.BERRY_FOODS, "Berries");
+		translationBuilder.add(ConventionalItemTags.BREAD_FOODS, "Breads");
+		translationBuilder.add(ConventionalItemTags.COOKIE_FOODS, "Cookies");
+		translationBuilder.add(ConventionalItemTags.RAW_MEAT_FOODS, "Raw Meats");
+		translationBuilder.add(ConventionalItemTags.COOKED_MEAT_FOODS, "Cooked Meats");
+		translationBuilder.add(ConventionalItemTags.RAW_FISH_FOODS, "Raw Fishes");
+		translationBuilder.add(ConventionalItemTags.COOKED_FISH_FOODS, "Cooked Fishes");
+		translationBuilder.add(ConventionalItemTags.SOUP_FOODS, "Soups");
+		translationBuilder.add(ConventionalItemTags.CANDY_FOODS, "Candies");
+		translationBuilder.add(ConventionalItemTags.GOLDEN_FOODS, "Golden Foods");
+		translationBuilder.add(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS, "Edible When Placed");
+		translationBuilder.add(ConventionalItemTags.FOOD_POISONING_FOODS, "Food Poisoning");
 		translationBuilder.add(ConventionalItemTags.FRUITS_FOODS, "Fruits");
 		translationBuilder.add(ConventionalItemTags.VEGETABLES_FOODS, "Vegetables");
 		translationBuilder.add(ConventionalItemTags.BERRIES_FOODS, "Berries");
@@ -181,8 +200,6 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
 		translationBuilder.add(ConventionalItemTags.COOKED_FISHES_FOODS, "Cooked Fishes");
 		translationBuilder.add(ConventionalItemTags.SOUPS_FOODS, "Soups");
 		translationBuilder.add(ConventionalItemTags.CANDIES_FOODS, "Candies");
-		translationBuilder.add(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS, "Edible When Placed");
-		translationBuilder.add(ConventionalItemTags.FOOD_POISONING_FOODS, "Food Poisoning");
 		translationBuilder.add(ConventionalItemTags.BUCKETS, "Buckets");
 		translationBuilder.add(ConventionalItemTags.WATER_BUCKETS, "Water Buckets");
 		translationBuilder.add(ConventionalItemTags.ENTITY_WATER_BUCKETS, "Entity Water Buckets");
@@ -196,7 +213,11 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
 		translationBuilder.add(ConventionalItemTags.CHESTS, "Chests");
 		translationBuilder.add(ConventionalItemTags.WOODEN_CHESTS, "Wooden Chests");
 		translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS, "Glass Blocks");
+		translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS_TINTED, "Tinted Glass Blocks");
+		translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS_CHEAP, "Cheap Glass Blocks");
+		translationBuilder.add(ConventionalItemTags.GLASS_BLOCKS_COLORLESS, "Colorless Glass Blocks");
 		translationBuilder.add(ConventionalItemTags.GLASS_PANES, "Glass Panes");
+		translationBuilder.add(ConventionalItemTags.GLASS_PANES_COLORLESS, "Colorless Glass Panes");
 		translationBuilder.add(ConventionalItemTags.SHULKER_BOXES, "Shulker Boxes");
 		translationBuilder.add(ConventionalItemTags.GLAZED_TERRACOTTAS, "Glazed Terracottas");
 		translationBuilder.add(ConventionalItemTags.CONCRETES, "Concretes");
@@ -279,6 +300,7 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
 		translationBuilder.add(ConventionalItemTags.BREEZE_RODS, "Breeze Rods");
 		translationBuilder.add(ConventionalItemTags.ROPES, "Ropes");
 		translationBuilder.add(ConventionalItemTags.CHAINS, "Chains");
+		translationBuilder.add(ConventionalItemTags.ENDER_PEARLS, "Ender Pearls");
 		translationBuilder.add(ConventionalItemTags.HIDDEN_FROM_RECIPE_VIEWERS, "Hidden From Recipe Viewers");
 
 		// Enchantments

fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java

@@ -59,7 +59,11 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 		copy(ConventionalBlockTags.CHESTS, ConventionalItemTags.CHESTS);
 		copy(ConventionalBlockTags.WOODEN_CHESTS, ConventionalItemTags.WOODEN_CHESTS);
 		copy(ConventionalBlockTags.GLASS_BLOCKS, ConventionalItemTags.GLASS_BLOCKS);
+		copy(ConventionalBlockTags.GLASS_BLOCKS_COLORLESS, ConventionalItemTags.GLASS_BLOCKS_COLORLESS);
+		copy(ConventionalBlockTags.GLASS_BLOCKS_TINTED, ConventionalItemTags.GLASS_BLOCKS_TINTED);
+		copy(ConventionalBlockTags.GLASS_BLOCKS_CHEAP, ConventionalItemTags.GLASS_BLOCKS_CHEAP);
 		copy(ConventionalBlockTags.GLASS_PANES, ConventionalItemTags.GLASS_PANES);
+		copy(ConventionalBlockTags.GLASS_PANES_COLORLESS, ConventionalItemTags.GLASS_PANES_COLORLESS);
 		getOrCreateTagBuilder(ConventionalItemTags.SHULKER_BOXES)
 				.add(Items.SHULKER_BOX)
 				.add(Items.WHITE_SHULKER_BOX)
@@ -210,6 +214,109 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 	}
 
 	private void generateFoodTags() {
+		getOrCreateTagBuilder(ConventionalItemTags.FRUIT_FOODS)
+				.add(Items.APPLE)
+				.add(Items.GOLDEN_APPLE)
+				.add(Items.ENCHANTED_GOLDEN_APPLE)
+				.addOptionalTag(ConventionalItemTags.FRUITS_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.VEGETABLE_FOODS)
+				.add(Items.CARROT)
+				.add(Items.GOLDEN_CARROT)
+				.add(Items.POTATO)
+				.add(Items.MELON_SLICE)
+				.add(Items.BEETROOT)
+				.addOptionalTag(ConventionalItemTags.VEGETABLES_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.BERRY_FOODS)
+				.add(Items.SWEET_BERRIES)
+				.add(Items.GLOW_BERRIES)
+				.addOptionalTag(ConventionalItemTags.BERRIES_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.BREAD_FOODS)
+				.add(Items.BREAD)
+				.addOptionalTag(ConventionalItemTags.BREADS_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.COOKIE_FOODS)
+				.add(Items.COOKIE)
+				.addOptionalTag(ConventionalItemTags.COOKIES_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.RAW_MEAT_FOODS)
+				.add(Items.BEEF)
+				.add(Items.PORKCHOP)
+				.add(Items.CHICKEN)
+				.add(Items.RABBIT)
+				.add(Items.MUTTON)
+				.addOptionalTag(ConventionalItemTags.RAW_MEATS_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.RAW_FISH_FOODS)
+				.add(Items.COD)
+				.add(Items.SALMON)
+				.add(Items.TROPICAL_FISH)
+				.add(Items.PUFFERFISH)
+				.addOptionalTag(ConventionalItemTags.RAW_FISHES_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.COOKED_MEAT_FOODS)
+				.add(Items.COOKED_BEEF)
+				.add(Items.COOKED_PORKCHOP)
+				.add(Items.COOKED_CHICKEN)
+				.add(Items.COOKED_RABBIT)
+				.add(Items.COOKED_MUTTON)
+				.addOptionalTag(ConventionalItemTags.COOKED_MEATS_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.COOKED_FISH_FOODS)
+				.add(Items.COOKED_COD)
+				.add(Items.COOKED_SALMON)
+				.addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.SOUP_FOODS)
+				.add(Items.BEETROOT_SOUP)
+				.add(Items.MUSHROOM_STEW)
+				.add(Items.RABBIT_STEW)
+				.add(Items.SUSPICIOUS_STEW)
+				.addOptionalTag(ConventionalItemTags.SOUPS_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.CANDY_FOODS)
+				.addOptionalTag(ConventionalItemTags.CANDIES_FOODS);
+
+		getOrCreateTagBuilder(ConventionalItemTags.GOLDEN_FOODS)
+				.add(Items.GOLDEN_APPLE)
+				.add(Items.ENCHANTED_GOLDEN_APPLE)
+				.add(Items.GOLDEN_CARROT)
+				.add(Items.GLISTERING_MELON_SLICE);
+
+		getOrCreateTagBuilder(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS)
+				.add(Items.CAKE);
+
+		getOrCreateTagBuilder(ConventionalItemTags.FOOD_POISONING_FOODS)
+				.add(Items.POISONOUS_POTATO)
+				.add(Items.PUFFERFISH)
+				.add(Items.SPIDER_EYE)
+				.add(Items.CHICKEN)
+				.add(Items.ROTTEN_FLESH);
+
+		getOrCreateTagBuilder(ConventionalItemTags.FOODS)
+				.add(Items.BAKED_POTATO)
+				.add(Items.PUMPKIN_PIE)
+				.add(Items.HONEY_BOTTLE)
+				.add(Items.OMINOUS_BOTTLE)
+				.add(Items.DRIED_KELP)
+				.addOptionalTag(ConventionalItemTags.FRUIT_FOODS)
+				.addOptionalTag(ConventionalItemTags.VEGETABLE_FOODS)
+				.addOptionalTag(ConventionalItemTags.BERRY_FOODS)
+				.addOptionalTag(ConventionalItemTags.BREAD_FOODS)
+				.addOptionalTag(ConventionalItemTags.COOKIE_FOODS)
+				.addOptionalTag(ConventionalItemTags.RAW_MEAT_FOODS)
+				.addOptionalTag(ConventionalItemTags.RAW_FISH_FOODS)
+				.addOptionalTag(ConventionalItemTags.COOKED_MEAT_FOODS)
+				.addOptionalTag(ConventionalItemTags.COOKED_FISH_FOODS)
+				.addOptionalTag(ConventionalItemTags.SOUP_FOODS)
+				.addOptionalTag(ConventionalItemTags.CANDY_FOODS)
+				.addOptionalTag(ConventionalItemTags.GOLDEN_FOODS)
+				.addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS)
+				.addOptionalTag(ConventionalItemTags.FOOD_POISONING_FOODS);
+
+		// Deprecated tags below
 		getOrCreateTagBuilder(ConventionalItemTags.FRUITS_FOODS)
 				.add(Items.APPLE)
 				.add(Items.GOLDEN_APPLE)
@@ -263,36 +370,6 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 				.add(Items.SUSPICIOUS_STEW);
 
 		getOrCreateTagBuilder(ConventionalItemTags.CANDIES_FOODS);
-
-		getOrCreateTagBuilder(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS)
-				.add(Items.CAKE);
-
-		getOrCreateTagBuilder(ConventionalItemTags.FOOD_POISONING_FOODS)
-				.add(Items.POISONOUS_POTATO)
-				.add(Items.PUFFERFISH)
-				.add(Items.SPIDER_EYE)
-				.add(Items.CHICKEN)
-				.add(Items.ROTTEN_FLESH);
-
-		getOrCreateTagBuilder(ConventionalItemTags.FOODS)
-				.add(Items.BAKED_POTATO)
-				.add(Items.PUMPKIN_PIE)
-				.add(Items.HONEY_BOTTLE)
-				.add(Items.OMINOUS_BOTTLE)
-				.add(Items.DRIED_KELP)
-				.addOptionalTag(ConventionalItemTags.FRUITS_FOODS)
-				.addOptionalTag(ConventionalItemTags.VEGETABLES_FOODS)
-				.addOptionalTag(ConventionalItemTags.BERRIES_FOODS)
-				.addOptionalTag(ConventionalItemTags.BREADS_FOODS)
-				.addOptionalTag(ConventionalItemTags.COOKIES_FOODS)
-				.addOptionalTag(ConventionalItemTags.RAW_MEATS_FOODS)
-				.addOptionalTag(ConventionalItemTags.RAW_FISHES_FOODS)
-				.addOptionalTag(ConventionalItemTags.COOKED_MEATS_FOODS)
-				.addOptionalTag(ConventionalItemTags.COOKED_FISHES_FOODS)
-				.addOptionalTag(ConventionalItemTags.SOUPS_FOODS)
-				.addOptionalTag(ConventionalItemTags.CANDIES_FOODS)
-				.addOptionalTag(ConventionalItemTags.EDIBLE_WHEN_PLACED_FOODS)
-				.addOptionalTag(ConventionalItemTags.FOOD_POISONING_FOODS);
 	}
 
 	private void generateBucketTags() {
@@ -428,6 +505,7 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 				.addOptionalTag(ConventionalItemTags.BRUSH_TOOLS)
 				.addOptionalTag(ConventionalItemTags.CROSSBOW_TOOLS)
 				.addOptionalTag(ConventionalItemTags.FISHING_ROD_TOOLS)
+				.addOptionalTag(ConventionalItemTags.IGNITER_TOOLS)
 				.addOptionalTag(ConventionalItemTags.SHEAR_TOOLS)
 				.addOptionalTag(ConventionalItemTags.SHIELD_TOOLS)
 				.addOptionalTag(ConventionalItemTags.SPEAR_TOOLS)
@@ -456,6 +534,8 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 		getOrCreateTagBuilder(ConventionalItemTags.BRUSH_TOOLS)
 				.add(Items.BRUSH)
 				.addOptionalTag(ConventionalItemTags.BRUSHES_TOOLS);
+		getOrCreateTagBuilder(ConventionalItemTags.IGNITER_TOOLS)
+				.add(Items.FLINT_AND_STEEL);
 		getOrCreateTagBuilder(ConventionalItemTags.MACE_TOOLS)
 				.add(Items.MACE);
 
@@ -511,6 +591,8 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 				.addOptionalTag(ItemTags.FIRE_ASPECT_ENCHANTABLE)
 				.addOptionalTag(ItemTags.DURABILITY_ENCHANTABLE);
 
+		// Deprecated tags below
+
 		getOrCreateTagBuilder(ConventionalItemTags.BOWS_TOOLS)
 				.add(Items.BOW);
 		getOrCreateTagBuilder(ConventionalItemTags.CROSSBOWS_TOOLS)
@@ -599,6 +681,9 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
 		getOrCreateTagBuilder(ConventionalItemTags.CHAINS)
 				.add(Items.CHAIN);
 
+		getOrCreateTagBuilder(ConventionalItemTags.ENDER_PEARLS)
+				.add(Items.ENDER_PEARL);
+
 		getOrCreateTagBuilder(ConventionalItemTags.HIDDEN_FROM_RECIPE_VIEWERS); // Generate tag so others can see it exists through JSON.
 	}
 

fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json

@@ -29,7 +29,11 @@
   "tag.block.c.dyed.white": "White Dyed Blocks",
   "tag.block.c.dyed.yellow": "Yellow Dyed Blocks",
   "tag.block.c.glass_blocks": "Glass Blocks",
+  "tag.block.c.glass_blocks.cheap": "Cheap Glass Blocks",
+  "tag.block.c.glass_blocks.colorless": "Colorless Glass Blocks",
+  "tag.block.c.glass_blocks.tinted": "Tinted Glass Blocks",
   "tag.block.c.glass_panes": "Glass Panes",
+  "tag.block.c.glass_panes.colorless": "Colorless Glass Panes",
   "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",
@@ -150,19 +154,32 @@
   "tag.item.c.dyes.white": "White Dyes",
   "tag.item.c.dyes.yellow": "Yellow Dyes",
   "tag.item.c.enchantables": "Enchantables",
+  "tag.item.c.ender_pearls": "Ender Pearls",
   "tag.item.c.foods": "Foods",
   "tag.item.c.foods.berries": "Berries",
+  "tag.item.c.foods.berry": "Berries",
+  "tag.item.c.foods.bread": "Breads",
   "tag.item.c.foods.breads": "Breads",
   "tag.item.c.foods.candies": "Candies",
+  "tag.item.c.foods.candy": "Candies",
+  "tag.item.c.foods.cooked_fish": "Cooked Fishes",
   "tag.item.c.foods.cooked_fishes": "Cooked Fishes",
+  "tag.item.c.foods.cooked_meat": "Cooked Meats",
   "tag.item.c.foods.cooked_meats": "Cooked Meats",
+  "tag.item.c.foods.cookie": "Cookies",
   "tag.item.c.foods.cookies": "Cookies",
   "tag.item.c.foods.edible_when_placed": "Edible When Placed",
   "tag.item.c.foods.food_poisoning": "Food Poisoning",
+  "tag.item.c.foods.fruit": "Fruits",
   "tag.item.c.foods.fruits": "Fruits",
+  "tag.item.c.foods.golden": "Golden Foods",
+  "tag.item.c.foods.raw_fishe": "Raw Fishes",
   "tag.item.c.foods.raw_fishes": "Raw Fishes",
+  "tag.item.c.foods.raw_meat": "Raw Meats",
   "tag.item.c.foods.raw_meats": "Raw Meats",
+  "tag.item.c.foods.soup": "Soups",
   "tag.item.c.foods.soups": "Soups",
+  "tag.item.c.foods.vegetable": "Vegetables",
   "tag.item.c.foods.vegetables": "Vegetables",
   "tag.item.c.gems": "Gems",
   "tag.item.c.gems.amethyst": "Amethyst Gems",
@@ -172,7 +189,11 @@
   "tag.item.c.gems.prismarine": "Prismarine Gems",
   "tag.item.c.gems.quartz": "Quartz Gems",
   "tag.item.c.glass_blocks": "Glass Blocks",
+  "tag.item.c.glass_blocks.cheap": "Cheap Glass Blocks",
+  "tag.item.c.glass_blocks.colorless": "Colorless Glass Blocks",
+  "tag.item.c.glass_blocks.tinted": "Tinted Glass Blocks",
   "tag.item.c.glass_panes": "Glass Panes",
+  "tag.item.c.glass_panes.colorless": "Colorless Glass Panes",
   "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",
@@ -241,6 +262,7 @@
   "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.igniter": "Igniters",
   "tag.item.c.tools.mace": "Maces",
   "tag.item.c.tools.melee_weapon": "Melee Weapons",
   "tag.item.c.tools.melee_weapons": "Melee Weapons",

fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks.json

@@ -1,22 +1,16 @@
 {
   "values": [
-    "minecraft:glass",
+    {
-    "minecraft:tinted_glass",
+      "id": "#c:glass_blocks/colorless",
-    "minecraft:white_stained_glass",
+      "required": false
-    "minecraft:orange_stained_glass",
+    },
-    "minecraft:magenta_stained_glass",
+    {
-    "minecraft:light_blue_stained_glass",
+      "id": "#c:glass_blocks/cheap",
-    "minecraft:yellow_stained_glass",
+      "required": false
-    "minecraft:lime_stained_glass",
+    },
-    "minecraft:pink_stained_glass",
+    {
-    "minecraft:gray_stained_glass",
+      "id": "#c:glass_blocks/tinted",
-    "minecraft:light_gray_stained_glass",
+      "required": false
-    "minecraft:cyan_stained_glass",
+    }
-    "minecraft:purple_stained_glass",
-    "minecraft:blue_stained_glass",
-    "minecraft:brown_stained_glass",
-    "minecraft:green_stained_glass",
-    "minecraft:black_stained_glass",
-    "minecraft:red_stained_glass"
   ]
 }

fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/cheap.json

@@ -0,0 +1,21 @@
+{
+  "values": [
+    "minecraft:glass",
+    "minecraft:white_stained_glass",
+    "minecraft:orange_stained_glass",
+    "minecraft:magenta_stained_glass",
+    "minecraft:light_blue_stained_glass",
+    "minecraft:yellow_stained_glass",
+    "minecraft:lime_stained_glass",
+    "minecraft:pink_stained_glass",
+    "minecraft:gray_stained_glass",
+    "minecraft:light_gray_stained_glass",
+    "minecraft:cyan_stained_glass",
+    "minecraft:purple_stained_glass",
+    "minecraft:blue_stained_glass",
+    "minecraft:brown_stained_glass",
+    "minecraft:green_stained_glass",
+    "minecraft:black_stained_glass",
+    "minecraft:red_stained_glass"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/colorless.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:glass"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_blocks/tinted.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:tinted_glass"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_panes.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "minecraft:glass_pane",
     "minecraft:white_stained_glass_pane",
     "minecraft:orange_stained_glass_pane",
     "minecraft:magenta_stained_glass_pane",
@@ -16,6 +15,10 @@
     "minecraft:brown_stained_glass_pane",
     "minecraft:green_stained_glass_pane",
     "minecraft:black_stained_glass_pane",
-    "minecraft:red_stained_glass_pane"
+    "minecraft:red_stained_glass_pane",
+    {
+      "id": "#c:glass_panes/colorless",
+      "required": false
+    }
   ]
 }

fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/glass_panes/colorless.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:glass_pane"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/ender_pearls.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:ender_pearl"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods.json

@@ -6,47 +6,51 @@
     "minecraft:ominous_bottle",
     "minecraft:dried_kelp",
     {
-      "id": "#c:foods/fruits",
+      "id": "#c:foods/fruit",
       "required": false
     },
     {
-      "id": "#c:foods/vegetables",
+      "id": "#c:foods/vegetable",
       "required": false
     },
     {
-      "id": "#c:foods/berries",
+      "id": "#c:foods/berry",
       "required": false
     },
     {
-      "id": "#c:foods/breads",
+      "id": "#c:foods/bread",
       "required": false
     },
     {
-      "id": "#c:foods/cookies",
+      "id": "#c:foods/cookie",
       "required": false
     },
     {
-      "id": "#c:foods/raw_meats",
+      "id": "#c:foods/raw_meat",
       "required": false
     },
     {
-      "id": "#c:foods/raw_fishes",
+      "id": "#c:foods/raw_fishe",
       "required": false
     },
     {
-      "id": "#c:foods/cooked_meats",
+      "id": "#c:foods/cooked_meat",
       "required": false
     },
     {
-      "id": "#c:foods/cooked_fishes",
+      "id": "#c:foods/cooked_fish",
       "required": false
     },
     {
-      "id": "#c:foods/soups",
+      "id": "#c:foods/soup",
       "required": false
     },
     {
-      "id": "#c:foods/candies",
+      "id": "#c:foods/candy",
+      "required": false
+    },
+    {
+      "id": "#c:foods/golden",
       "required": false
     },
     {

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/berry.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "minecraft:sweet_berries",
+    "minecraft:glow_berries",
+    {
+      "id": "#c:foods/berries",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/bread.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:bread",
+    {
+      "id": "#c:foods/breads",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/candy.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "#c:foods/candies",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/cooked_fish.json

@@ -0,0 +1,10 @@
+{
+  "values": [
+    "minecraft:cooked_cod",
+    "minecraft:cooked_salmon",
+    {
+      "id": "#c:foods/cooked_fishes",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/cooked_meat.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:cooked_beef",
+    "minecraft:cooked_porkchop",
+    "minecraft:cooked_chicken",
+    "minecraft:cooked_rabbit",
+    "minecraft:cooked_mutton",
+    {
+      "id": "#c:foods/cooked_meats",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/cookie.json

@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:cookie",
+    {
+      "id": "#c:foods/cookies",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/fruit.json

@@ -0,0 +1,11 @@
+{
+  "values": [
+    "minecraft:apple",
+    "minecraft:golden_apple",
+    "minecraft:enchanted_golden_apple",
+    {
+      "id": "#c:foods/fruits",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/golden.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    "minecraft:golden_apple",
+    "minecraft:enchanted_golden_apple",
+    "minecraft:golden_carrot",
+    "minecraft:glistering_melon_slice"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/raw_fishe.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    "minecraft:cod",
+    "minecraft:salmon",
+    "minecraft:tropical_fish",
+    "minecraft:pufferfish",
+    {
+      "id": "#c:foods/raw_fishes",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/raw_meat.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:beef",
+    "minecraft:porkchop",
+    "minecraft:chicken",
+    "minecraft:rabbit",
+    "minecraft:mutton",
+    {
+      "id": "#c:foods/raw_meats",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/soup.json

@@ -0,0 +1,12 @@
+{
+  "values": [
+    "minecraft:beetroot_soup",
+    "minecraft:mushroom_stew",
+    "minecraft:rabbit_stew",
+    "minecraft:suspicious_stew",
+    {
+      "id": "#c:foods/soups",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/foods/vegetable.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:carrot",
+    "minecraft:golden_carrot",
+    "minecraft:potato",
+    "minecraft:melon_slice",
+    "minecraft:beetroot",
+    {
+      "id": "#c:foods/vegetables",
+      "required": false
+    }
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks.json

@@ -1,22 +1,16 @@
 {
   "values": [
-    "minecraft:glass",
+    {
-    "minecraft:tinted_glass",
+      "id": "#c:glass_blocks/colorless",
-    "minecraft:white_stained_glass",
+      "required": false
-    "minecraft:orange_stained_glass",
+    },
-    "minecraft:magenta_stained_glass",
+    {
-    "minecraft:light_blue_stained_glass",
+      "id": "#c:glass_blocks/cheap",
-    "minecraft:yellow_stained_glass",
+      "required": false
-    "minecraft:lime_stained_glass",
+    },
-    "minecraft:pink_stained_glass",
+    {
-    "minecraft:gray_stained_glass",
+      "id": "#c:glass_blocks/tinted",
-    "minecraft:light_gray_stained_glass",
+      "required": false
-    "minecraft:cyan_stained_glass",
+    }
-    "minecraft:purple_stained_glass",
-    "minecraft:blue_stained_glass",
-    "minecraft:brown_stained_glass",
-    "minecraft:green_stained_glass",
-    "minecraft:black_stained_glass",
-    "minecraft:red_stained_glass"
   ]
 }

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/cheap.json

@@ -0,0 +1,21 @@
+{
+  "values": [
+    "minecraft:glass",
+    "minecraft:white_stained_glass",
+    "minecraft:orange_stained_glass",
+    "minecraft:magenta_stained_glass",
+    "minecraft:light_blue_stained_glass",
+    "minecraft:yellow_stained_glass",
+    "minecraft:lime_stained_glass",
+    "minecraft:pink_stained_glass",
+    "minecraft:gray_stained_glass",
+    "minecraft:light_gray_stained_glass",
+    "minecraft:cyan_stained_glass",
+    "minecraft:purple_stained_glass",
+    "minecraft:blue_stained_glass",
+    "minecraft:brown_stained_glass",
+    "minecraft:green_stained_glass",
+    "minecraft:black_stained_glass",
+    "minecraft:red_stained_glass"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/colorless.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:glass"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_blocks/tinted.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:tinted_glass"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_panes.json

@@ -1,6 +1,5 @@
 {
   "values": [
-    "minecraft:glass_pane",
     "minecraft:white_stained_glass_pane",
     "minecraft:orange_stained_glass_pane",
     "minecraft:magenta_stained_glass_pane",
@@ -16,6 +15,10 @@
     "minecraft:brown_stained_glass_pane",
     "minecraft:green_stained_glass_pane",
     "minecraft:black_stained_glass_pane",
-    "minecraft:red_stained_glass_pane"
+    "minecraft:red_stained_glass_pane",
+    {
+      "id": "#c:glass_panes/colorless",
+      "required": false
+    }
   ]
 }

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/glass_panes/colorless.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:glass_pane"
+  ]
+}

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools.json

@@ -36,6 +36,10 @@
       "id": "#c:tools/fishing_rod",
       "required": false
     },
+    {
+      "id": "#c:tools/igniter",
+      "required": false
+    },
     {
       "id": "#c:tools/shear",
       "required": false

fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/igniter.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:flint_and_steel"
+  ]
+}

fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java

@@ -49,7 +49,14 @@ public final class ConventionalBlockTags {
 	public static final TagKey<Block> CHESTS = register("chests");
 	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_BLOCKS_COLORLESS = register("glass_blocks/colorless");
+	/**
+	 * Glass which is made from cheap resources like sand and only minor additional ingredients like dyes.
+	 */
+	public static final TagKey<Block> GLASS_BLOCKS_CHEAP = register("glass_blocks/cheap");
+	public static final TagKey<Block> GLASS_BLOCKS_TINTED = register("glass_blocks/tinted");
 	public static final TagKey<Block> GLASS_PANES = register("glass_panes");
+	public static final TagKey<Block> GLASS_PANES_COLORLESS = register("glass_panes/colorless");
 	public static final TagKey<Block> GLAZED_TERRACOTTAS = register("glazed_terracottas");
 	public static final TagKey<Block> CONCRETES = register("concretes");
 

fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java

@@ -49,6 +49,11 @@ public final class ConventionalItemTags {
 	public static final TagKey<Item> SHIELD_TOOLS = register("tools/shield");
 	public static final TagKey<Item> FISHING_ROD_TOOLS = register("tools/fishing_rod");
 	public static final TagKey<Item> BRUSH_TOOLS = register("tools/brush");
+	/**
+	 * A tag containing all existing fire starting tools such as Flint and Steel.
+	 * Fire Charge is not a tool (no durability) and thus, does not go in this tag.
+	 */
+	public static final TagKey<Item> IGNITER_TOOLS = register("tools/igniter");
 	public static final TagKey<Item> MACE_TOOLS = register("tools/mace");
 
 	// Action-based tool tags
@@ -117,30 +122,34 @@ public final class ConventionalItemTags {
 	 * Apples and other foods that are considered fruits in the culinary field belong in this tag.
 	 * Cherries would go here as they are considered a "stone fruit" within culinary fields.
 	 */
-	public static final TagKey<Item> FRUITS_FOODS = register("foods/fruits");
+	public static final TagKey<Item> FRUIT_FOODS = register("foods/fruit");
 	/**
 	 * Tomatoes and other foods that are considered vegetables in the culinary field belong in this tag.
 	 */
-	public static final TagKey<Item> VEGETABLES_FOODS = register("foods/vegetables");
+	public static final TagKey<Item> VEGETABLE_FOODS = register("foods/vegetable");
 	/**
 	 * Strawberries, raspberries, and other berry foods belong in this tag.
 	 * Cherries would NOT go here as they are considered a "stone fruit" within culinary fields.
 	 */
-	public static final TagKey<Item> BERRIES_FOODS = register("foods/berries");
+	public static final TagKey<Item> BERRY_FOODS = register("foods/berry");
-	public static final TagKey<Item> BREADS_FOODS = register("foods/breads");
+	public static final TagKey<Item> BREAD_FOODS = register("foods/bread");
-	public static final TagKey<Item> COOKIES_FOODS = register("foods/cookies");
+	public static final TagKey<Item> COOKIE_FOODS = register("foods/cookie");
-	public static final TagKey<Item> RAW_MEATS_FOODS = register("foods/raw_meats");
+	public static final TagKey<Item> RAW_MEAT_FOODS = register("foods/raw_meat");
-	public static final TagKey<Item> COOKED_MEATS_FOODS = register("foods/cooked_meats");
+	public static final TagKey<Item> COOKED_MEAT_FOODS = register("foods/cooked_meat");
-	public static final TagKey<Item> RAW_FISHES_FOODS = register("foods/raw_fishes");
+	public static final TagKey<Item> RAW_FISH_FOODS = register("foods/raw_fishe");
-	public static final TagKey<Item> COOKED_FISHES_FOODS = register("foods/cooked_fishes");
+	public static final TagKey<Item> COOKED_FISH_FOODS = register("foods/cooked_fish");
 	/**
 	 * Soups, stews, and other liquid food in bowls belongs in this tag.
 	 */
-	public static final TagKey<Item> SOUPS_FOODS = register("foods/soups");
+	public static final TagKey<Item> SOUP_FOODS = register("foods/soup");
 	/**
 	 * Sweets and candies like lollipops or chocolate belong in this tag.
 	 */
-	public static final TagKey<Item> CANDIES_FOODS = register("foods/candies");
+	public static final TagKey<Item> CANDY_FOODS = register("foods/candy");
+	/**
+	 * Any gold-based foods would go in this tag. Such as Golden Apples or Glistering Melon Slice.
+	 */
+	public static final TagKey<Item> GOLDEN_FOODS = register("foods/golden");
 	/**
 	 * Foods like cake that can be eaten when placed in the world belong in this tag.
 	 */
@@ -169,7 +178,14 @@ public final class ConventionalItemTags {
 	public static final TagKey<Item> CHESTS = register("chests");
 	public static final TagKey<Item> WOODEN_CHESTS = register("chests/wooden");
 	public static final TagKey<Item> GLASS_BLOCKS = register("glass_blocks");
+	public static final TagKey<Item> GLASS_BLOCKS_COLORLESS = register("glass_blocks/colorless");
+	/**
+	 * Glass which is made from cheap resources like sand and only minor additional ingredients like dyes.
+	 */
+	public static final TagKey<Item> GLASS_BLOCKS_CHEAP = register("glass_blocks/cheap");
+	public static final TagKey<Item> GLASS_BLOCKS_TINTED = register("glass_blocks/tinted");
 	public static final TagKey<Item> GLASS_PANES = register("glass_panes");
+	public static final TagKey<Item> GLASS_PANES_COLORLESS = register("glass_panes/colorless");
 	/**
 	 * Block tag equivalent is {@link BlockTags#SHULKER_BOXES}.
 	 */
@@ -296,6 +312,7 @@ public final class ConventionalItemTags {
 	public static final TagKey<Item> BREEZE_RODS = register("rods/breeze");
 	public static final TagKey<Item> ROPES = register("ropes");
 	public static final TagKey<Item> CHAINS = register("chains");
+	public static final TagKey<Item> ENDER_PEARLS = register("ender_pearls");
 
 	/**
 	 * Tag that holds all items that recipe viewers should not show to users.
@@ -392,6 +409,61 @@ public final class ConventionalItemTags {
 	 */
 	@Deprecated
 	public static final TagKey<Item> CONCRETE_POWDER = register("concrete_powder");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#FRUIT_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> FRUITS_FOODS = register("foods/fruits");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#VEGETABLE_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> VEGETABLES_FOODS = register("foods/vegetables");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#BERRY_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> BERRIES_FOODS = register("foods/berries");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#BREAD_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> BREADS_FOODS = register("foods/breads");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#COOKIE_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> COOKIES_FOODS = register("foods/cookies");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#RAW_MEAT_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> RAW_MEATS_FOODS = register("foods/raw_meats");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#COOKED_MEAT_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> COOKED_MEATS_FOODS = register("foods/cooked_meats");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#RAW_FISH_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> RAW_FISHES_FOODS = register("foods/raw_fishes");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#COOKED_FISH_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> COOKED_FISHES_FOODS = register("foods/cooked_fishes");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#SOUP_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> SOUPS_FOODS = register("foods/soups");
+	/**
+	 * This tag was typoed. Please use {@link ConventionalItemTags#CANDY_FOODS} tag instead.
+	 */
+	@Deprecated
+	public static final TagKey<Item> CANDIES_FOODS = register("foods/candies");
 
 	private static TagKey<Item> register(String tagId) {
 		return TagRegistration.ITEM_TAG.registerC(tagId);