Tag cleanup and additions for 1.21 (#1030)

src/generated/resources/assets/c/lang/en_us.json

@@ -15,6 +15,7 @@
   "tag.block.c.cobblestones.infested": "Infested Cobblestones",
   "tag.block.c.cobblestones.mossy": "Mossy Cobblestones",
   "tag.block.c.cobblestones.normal": "Normal Cobblestones",
+  "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",
@@ -44,6 +45,7 @@
   "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_terracottas": "Glazed Terracottas",
   "tag.block.c.gravels": "Gravels",
   "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
   "tag.block.c.netherracks": "Netherracks",
@@ -158,6 +160,8 @@
   "tag.item.c.cobblestones.infested": "Infested Cobblestones",
   "tag.item.c.cobblestones.mossy": "Mossy Cobblestones",
   "tag.item.c.cobblestones.normal": "Normal Cobblestones",
+  "tag.item.c.concrete_powders": "Concrete Powders",
+  "tag.item.c.concretes": "Concretes",
   "tag.item.c.crops": "Crops",
   "tag.item.c.crops.beetroot": "Beetroot Crops",
   "tag.item.c.crops.carrot": "Carrot Crops",
@@ -238,6 +242,7 @@
   "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_terracottas": "Glazed Terracottas",
   "tag.item.c.gravels": "Gravels",
   "tag.item.c.gunpowders": "Gunpowders",
   "tag.item.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
@@ -248,6 +253,7 @@
   "tag.item.c.ingots.netherite": "Netherite Ingots",
   "tag.item.c.leathers": "Leathers",
   "tag.item.c.mushrooms": "Mushrooms",
+  "tag.item.c.music_discs": "Music Discs",
   "tag.item.c.nether_stars": "Nether Stars",
   "tag.item.c.netherracks": "Netherracks",
   "tag.item.c.nuggets": "Nuggets",
@@ -276,10 +282,6 @@
   "tag.item.c.ores_in_ground.stone": "Stone Ores In Ground",
   "tag.item.c.player_workstations.crafting_tables": "Crafting Tables",
   "tag.item.c.player_workstations.furnaces": "Furnaces",
-  "tag.item.c.raw_blocks": "Raw Blocks",
-  "tag.item.c.raw_blocks.copper": "Copper Raw Blocks",
-  "tag.item.c.raw_blocks.gold": "Gold Raw Blocks",
-  "tag.item.c.raw_blocks.iron": "Iron Raw Blocks",
   "tag.item.c.raw_materials": "Raw Materials",
   "tag.item.c.raw_materials.copper": "Copper Raw Materials",
   "tag.item.c.raw_materials.gold": "Gold Raw Materials",
@@ -306,6 +308,7 @@
   "tag.item.c.seeds.melon": "Melon Seeds",
   "tag.item.c.seeds.pumpkin": "Pumpkin Seeds",
   "tag.item.c.seeds.wheat": "Wheat Seeds",
+  "tag.item.c.shulker_boxes": "Shulker Boxes",
   "tag.item.c.slimeballs": "Slimeballs",
   "tag.item.c.stones": "Stones",
   "tag.item.c.storage_blocks": "Storage Blocks",
@@ -327,13 +330,13 @@
   "tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks",
   "tag.item.c.strings": "Strings",
   "tag.item.c.tools": "Tools",
-  "tag.item.c.tools.bows": "Bows",
-  "tag.item.c.tools.brushes": "Brushes",
-  "tag.item.c.tools.crossbows": "Crossbows",
-  "tag.item.c.tools.fishing_rods": "Fishing Rods",
-  "tag.item.c.tools.shears": "Shears",
-  "tag.item.c.tools.shields": "Shields",
-  "tag.item.c.tools.spears": "Spears",
+  "tag.item.c.tools.bow": "Bows",
+  "tag.item.c.tools.brush": "Brushes",
+  "tag.item.c.tools.crossbow": "Crossbows",
+  "tag.item.c.tools.fishing_rod": "Fishing Rods",
+  "tag.item.c.tools.shear": "Shears",
+  "tag.item.c.tools.shield": "Shields",
+  "tag.item.c.tools.spear": "Spears",
   "tag.item.c.villager_job_sites": "Villager Job Sites",
   "tag.item.neoforge.enchanting_fuels": "Enchanting Fuels",
   "tag.worldgen.biome.c.hidden_from_locator_selection": "Hidden From Locator's Selection",

src/generated/resources/data/c/tags/block/concretes.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:red_concrete",
+    "minecraft:black_concrete"
+  ]
+}

src/generated/resources/data/c/tags/block/glass_blocks/cheap.json

@@ -15,7 +15,6 @@
     "minecraft:blue_stained_glass",
     "minecraft:brown_stained_glass",
     "minecraft:green_stained_glass",
-    "minecraft:green_stained_glass",
     "minecraft:red_stained_glass",
     "minecraft:black_stained_glass",
     {

src/generated/resources/data/c/tags/block/glazed_terracottas.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:red_glazed_terracotta",
+    "minecraft:black_glazed_terracotta"
+  ]
+}

src/generated/resources/data/c/tags/item/concrete_powders.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"
+  ]
+}

src/generated/resources/data/c/tags/item/concretes.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:red_concrete",
+    "minecraft:black_concrete"
+  ]
+}

src/generated/resources/data/c/tags/item/glass_blocks/cheap.json

@@ -15,7 +15,6 @@
     "minecraft:blue_stained_glass",
     "minecraft:brown_stained_glass",
     "minecraft:green_stained_glass",
-    "minecraft:green_stained_glass",
     "minecraft:red_stained_glass",
     "minecraft:black_stained_glass",
     {

src/generated/resources/data/c/tags/item/glazed_terracottas.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:red_glazed_terracotta",
+    "minecraft:black_glazed_terracotta"
+  ]
+}

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"
+  ]
+}

src/generated/resources/data/c/tags/item/shulker_boxes.json

@@ -0,0 +1,21 @@
+{
+  "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"
+  ]
+}

src/generated/resources/data/c/tags/item/tools.json

@@ -5,13 +5,13 @@
     "#minecraft:pickaxes",
     "#minecraft:shovels",
     "#minecraft:swords",
-    "#c:tools/bows",
-    "#c:tools/brushes",
-    "#c:tools/crossbows",
-    "#c:tools/fishing_rods",
-    "#c:tools/shears",
-    "#c:tools/shields",
-    "#c:tools/spears",
+    "#c:tools/bow",
+    "#c:tools/brush",
+    "#c:tools/crossbow",
+    "#c:tools/fishing_rod",
+    "#c:tools/shear",
+    "#c:tools/shield",
+    "#c:tools/spear",
     {
       "id": "#forge:tools",
       "required": false

src/generated/resources/data/c/tags/item/tools/bow.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:brush",
+    {
+      "id": "#c:tools/brushes",
+      "required": false
+    },
+    {
+      "id": "#c:tools/bows",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/c/tags/item/tools/brush.json

@@ -0,0 +1,13 @@
+{
+  "values": [
+    "minecraft:brush",
+    {
+      "id": "#forge:tools/brushes",
+      "required": false
+    },
+    {
+      "id": "#c:tools/brushes",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/c/tags/item/tools/crossbows.json → src/generated/resources/data/c/tags/item/tools/crossbow.json

@@ -4,6 +4,10 @@
     {
       "id": "#forge:tools/crossbows",
       "required": false
+    },
+    {
+      "id": "#c:tools/crossbows",
+      "required": false
     }
   ]
 }

src/generated/resources/data/c/tags/item/tools/fishing_rods.json → src/generated/resources/data/c/tags/item/tools/fishing_rod.json

@@ -4,6 +4,10 @@
     {
       "id": "#forge:tools/fishing_rods",
       "required": false
+    },
+    {
+      "id": "#c:tools/fishing_rods",
+      "required": false
     }
   ]
 }

src/generated/resources/data/c/tags/item/tools/shear.json

@@ -0,0 +1,17 @@
+{
+  "values": [
+    "minecraft:shears",
+    {
+      "id": "#forge:shears",
+      "required": false
+    },
+    {
+      "id": "#forge:tools/shears",
+      "required": false
+    },
+    {
+      "id": "#c:tools/shears",
+      "required": false
+    }
+  ]
+}