diff --git a/src/main/generated/data/c/tags/block/dyed/black.json b/src/main/generated/data/c/tags/block/dyed/black.json index 52e29dcd46..d751a8001c 100644 --- a/src/main/generated/data/c/tags/block/dyed/black.json +++ b/src/main/generated/data/c/tags/block/dyed/black.json @@ -12,14 +12,6 @@ "minecraft:black_stained_glass_pane", "minecraft:black_terracotta", "minecraft:black_wall_banner", - "minecraft:black_wool", - { - "id": "#forge:glass/black", - "required": false - }, - { - "id": "#forge:stained_glass/black", - "required": false - } + "minecraft:black_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/blue.json b/src/main/generated/data/c/tags/block/dyed/blue.json index aa6f32d07c..6aa8440457 100644 --- a/src/main/generated/data/c/tags/block/dyed/blue.json +++ b/src/main/generated/data/c/tags/block/dyed/blue.json @@ -12,14 +12,6 @@ "minecraft:blue_stained_glass_pane", "minecraft:blue_terracotta", "minecraft:blue_wall_banner", - "minecraft:blue_wool", - { - "id": "#forge:glass/blue", - "required": false - }, - { - "id": "#forge:stained_glass/blue", - "required": false - } + "minecraft:blue_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/brown.json b/src/main/generated/data/c/tags/block/dyed/brown.json index 94d1d0a7c7..b8307f7246 100644 --- a/src/main/generated/data/c/tags/block/dyed/brown.json +++ b/src/main/generated/data/c/tags/block/dyed/brown.json @@ -12,14 +12,6 @@ "minecraft:brown_stained_glass_pane", "minecraft:brown_terracotta", "minecraft:brown_wall_banner", - "minecraft:brown_wool", - { - "id": "#forge:glass/brown", - "required": false - }, - { - "id": "#forge:stained_glass/brown", - "required": false - } + "minecraft:brown_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/cyan.json b/src/main/generated/data/c/tags/block/dyed/cyan.json index b67187d66d..6e5c8123b6 100644 --- a/src/main/generated/data/c/tags/block/dyed/cyan.json +++ b/src/main/generated/data/c/tags/block/dyed/cyan.json @@ -12,14 +12,6 @@ "minecraft:cyan_stained_glass_pane", "minecraft:cyan_terracotta", "minecraft:cyan_wall_banner", - "minecraft:cyan_wool", - { - "id": "#forge:glass/cyan", - "required": false - }, - { - "id": "#forge:stained_glass/cyan", - "required": false - } + "minecraft:cyan_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/gray.json b/src/main/generated/data/c/tags/block/dyed/gray.json index 172655a1a5..f71d3c8250 100644 --- a/src/main/generated/data/c/tags/block/dyed/gray.json +++ b/src/main/generated/data/c/tags/block/dyed/gray.json @@ -12,14 +12,6 @@ "minecraft:gray_stained_glass_pane", "minecraft:gray_terracotta", "minecraft:gray_wall_banner", - "minecraft:gray_wool", - { - "id": "#forge:glass/gray", - "required": false - }, - { - "id": "#forge:stained_glass/gray", - "required": false - } + "minecraft:gray_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/green.json b/src/main/generated/data/c/tags/block/dyed/green.json index 12dd3904fc..55e2fb08a1 100644 --- a/src/main/generated/data/c/tags/block/dyed/green.json +++ b/src/main/generated/data/c/tags/block/dyed/green.json @@ -12,14 +12,6 @@ "minecraft:green_stained_glass_pane", "minecraft:green_terracotta", "minecraft:green_wall_banner", - "minecraft:green_wool", - { - "id": "#forge:glass/green", - "required": false - }, - { - "id": "#forge:stained_glass/green", - "required": false - } + "minecraft:green_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/light_blue.json b/src/main/generated/data/c/tags/block/dyed/light_blue.json index ce884b573d..c13fe22e48 100644 --- a/src/main/generated/data/c/tags/block/dyed/light_blue.json +++ b/src/main/generated/data/c/tags/block/dyed/light_blue.json @@ -12,14 +12,6 @@ "minecraft:light_blue_stained_glass_pane", "minecraft:light_blue_terracotta", "minecraft:light_blue_wall_banner", - "minecraft:light_blue_wool", - { - "id": "#forge:glass/light_blue", - "required": false - }, - { - "id": "#forge:stained_glass/light_blue", - "required": false - } + "minecraft:light_blue_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/light_gray.json b/src/main/generated/data/c/tags/block/dyed/light_gray.json index 439c12aec8..ec0eb75bf4 100644 --- a/src/main/generated/data/c/tags/block/dyed/light_gray.json +++ b/src/main/generated/data/c/tags/block/dyed/light_gray.json @@ -12,14 +12,6 @@ "minecraft:light_gray_stained_glass_pane", "minecraft:light_gray_terracotta", "minecraft:light_gray_wall_banner", - "minecraft:light_gray_wool", - { - "id": "#forge:glass/light_gray", - "required": false - }, - { - "id": "#forge:stained_glass/light_gray", - "required": false - } + "minecraft:light_gray_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/lime.json b/src/main/generated/data/c/tags/block/dyed/lime.json index 17e5b7ddf5..5a32316c66 100644 --- a/src/main/generated/data/c/tags/block/dyed/lime.json +++ b/src/main/generated/data/c/tags/block/dyed/lime.json @@ -12,14 +12,6 @@ "minecraft:lime_stained_glass_pane", "minecraft:lime_terracotta", "minecraft:lime_wall_banner", - "minecraft:lime_wool", - { - "id": "#forge:glass/lime", - "required": false - }, - { - "id": "#forge:stained_glass/lime", - "required": false - } + "minecraft:lime_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/magenta.json b/src/main/generated/data/c/tags/block/dyed/magenta.json index f833d1210a..98aee6c88e 100644 --- a/src/main/generated/data/c/tags/block/dyed/magenta.json +++ b/src/main/generated/data/c/tags/block/dyed/magenta.json @@ -12,22 +12,6 @@ "minecraft:magenta_stained_glass_pane", "minecraft:magenta_terracotta", "minecraft:magenta_wall_banner", - "minecraft:magenta_wool", - { - "id": "#forge:glass/magenta", - "required": false - }, - { - "id": "#forge:stained_glass/magenta", - "required": false - }, - { - "id": "#forge:glass/magenta", - "required": false - }, - { - "id": "#forge:stained_glass/magenta", - "required": false - } + "minecraft:magenta_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/orange.json b/src/main/generated/data/c/tags/block/dyed/orange.json index 20076162d7..22d7b60a3d 100644 --- a/src/main/generated/data/c/tags/block/dyed/orange.json +++ b/src/main/generated/data/c/tags/block/dyed/orange.json @@ -12,14 +12,6 @@ "minecraft:orange_stained_glass_pane", "minecraft:orange_terracotta", "minecraft:orange_wall_banner", - "minecraft:orange_wool", - { - "id": "#forge:glass/orange", - "required": false - }, - { - "id": "#forge:stained_glass/orange", - "required": false - } + "minecraft:orange_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/pink.json b/src/main/generated/data/c/tags/block/dyed/pink.json index f9bdfe6c02..c45b47d69b 100644 --- a/src/main/generated/data/c/tags/block/dyed/pink.json +++ b/src/main/generated/data/c/tags/block/dyed/pink.json @@ -12,14 +12,6 @@ "minecraft:pink_stained_glass_pane", "minecraft:pink_terracotta", "minecraft:pink_wall_banner", - "minecraft:pink_wool", - { - "id": "#forge:glass/pink", - "required": false - }, - { - "id": "#forge:stained_glass/pink", - "required": false - } + "minecraft:pink_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/purple.json b/src/main/generated/data/c/tags/block/dyed/purple.json index 8d443e3a8b..1d8bd2dcf5 100644 --- a/src/main/generated/data/c/tags/block/dyed/purple.json +++ b/src/main/generated/data/c/tags/block/dyed/purple.json @@ -12,14 +12,6 @@ "minecraft:purple_stained_glass_pane", "minecraft:purple_terracotta", "minecraft:purple_wall_banner", - "minecraft:purple_wool", - { - "id": "#forge:glass/purple", - "required": false - }, - { - "id": "#forge:stained_glass/purple", - "required": false - } + "minecraft:purple_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/red.json b/src/main/generated/data/c/tags/block/dyed/red.json index 88ae73f677..8e900dceab 100644 --- a/src/main/generated/data/c/tags/block/dyed/red.json +++ b/src/main/generated/data/c/tags/block/dyed/red.json @@ -12,14 +12,6 @@ "minecraft:red_stained_glass_pane", "minecraft:red_terracotta", "minecraft:red_wall_banner", - "minecraft:red_wool", - { - "id": "#forge:glass/red", - "required": false - }, - { - "id": "#forge:stained_glass/red", - "required": false - } + "minecraft:red_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/white.json b/src/main/generated/data/c/tags/block/dyed/white.json index 86c2a01789..e534cdf69c 100644 --- a/src/main/generated/data/c/tags/block/dyed/white.json +++ b/src/main/generated/data/c/tags/block/dyed/white.json @@ -12,14 +12,6 @@ "minecraft:white_stained_glass_pane", "minecraft:white_terracotta", "minecraft:white_wall_banner", - "minecraft:white_wool", - { - "id": "#forge:glass/white", - "required": false - }, - { - "id": "#forge:stained_glass/white", - "required": false - } + "minecraft:white_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/yellow.json b/src/main/generated/data/c/tags/block/dyed/yellow.json index 31711d5459..9086f0dd8f 100644 --- a/src/main/generated/data/c/tags/block/dyed/yellow.json +++ b/src/main/generated/data/c/tags/block/dyed/yellow.json @@ -12,14 +12,6 @@ "minecraft:yellow_stained_glass_pane", "minecraft:yellow_terracotta", "minecraft:yellow_wall_banner", - "minecraft:yellow_wool", - { - "id": "#forge:glass/yellow", - "required": false - }, - { - "id": "#forge:stained_glass/yellow", - "required": false - } + "minecraft:yellow_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/glass_blocks/cheap.json b/src/main/generated/data/c/tags/block/glass_blocks/cheap.json index ccd28136a6..067bd8f78d 100644 --- a/src/main/generated/data/c/tags/block/glass_blocks/cheap.json +++ b/src/main/generated/data/c/tags/block/glass_blocks/cheap.json @@ -18,7 +18,7 @@ "minecraft:red_stained_glass", "minecraft:black_stained_glass", { - "id": "#forge:glass_silica", + "id": "#forge:glass/silica", "required": false } ] diff --git a/src/main/generated/data/c/tags/block/glass_blocks/colorless.json b/src/main/generated/data/c/tags/block/glass_blocks/colorless.json index 7d2e81b6c4..e46e8e25ba 100644 --- a/src/main/generated/data/c/tags/block/glass_blocks/colorless.json +++ b/src/main/generated/data/c/tags/block/glass_blocks/colorless.json @@ -2,7 +2,7 @@ "values": [ "minecraft:glass", { - "id": "#forge:glass_colorless", + "id": "#forge:glass/colorless", "required": false } ] diff --git a/src/main/generated/data/c/tags/block/glass_blocks/tinted.json b/src/main/generated/data/c/tags/block/glass_blocks/tinted.json index 0a7d0f3f00..e7fe6f40f0 100644 --- a/src/main/generated/data/c/tags/block/glass_blocks/tinted.json +++ b/src/main/generated/data/c/tags/block/glass_blocks/tinted.json @@ -2,7 +2,7 @@ "values": [ "minecraft:tinted_glass", { - "id": "#forge:glass_tinted", + "id": "#forge:glass/tinted", "required": false } ] diff --git a/src/main/generated/data/c/tags/block/glass_panes.json b/src/main/generated/data/c/tags/block/glass_panes.json index c4bdf8ea3f..869c6fe993 100644 --- a/src/main/generated/data/c/tags/block/glass_panes.json +++ b/src/main/generated/data/c/tags/block/glass_panes.json @@ -16,6 +16,10 @@ "minecraft:brown_stained_glass_pane", "minecraft:green_stained_glass_pane", "minecraft:red_stained_glass_pane", - "minecraft:black_stained_glass_pane" + "minecraft:black_stained_glass_pane", + { + "id": "#forge:glass_panes", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/glass_panes/colorless.json b/src/main/generated/data/c/tags/block/glass_panes/colorless.json index b7d7245a6a..5390c3bbd6 100644 --- a/src/main/generated/data/c/tags/block/glass_panes/colorless.json +++ b/src/main/generated/data/c/tags/block/glass_panes/colorless.json @@ -2,7 +2,7 @@ "values": [ "minecraft:glass_pane", { - "id": "#forge:glass_panes_colorless", + "id": "#forge:glass_panes/colorless", "required": false } ] diff --git a/src/main/generated/data/c/tags/block/relocation_not_supported.json b/src/main/generated/data/c/tags/block/relocation_not_supported.json index 0c0cf3a08f..f72d209df7 100644 --- a/src/main/generated/data/c/tags/block/relocation_not_supported.json +++ b/src/main/generated/data/c/tags/block/relocation_not_supported.json @@ -1,12 +1,3 @@ { - "values": [ - { - "id": "#forge:relocation_not_supported", - "required": false - }, - { - "id": "#forge:immovable", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/stones.json b/src/main/generated/data/c/tags/block/stones.json index 2848998459..c95195f10c 100644 --- a/src/main/generated/data/c/tags/block/stones.json +++ b/src/main/generated/data/c/tags/block/stones.json @@ -5,10 +5,6 @@ "minecraft:granite", "minecraft:stone", "minecraft:deepslate", - "minecraft:tuff", - { - "id": "#forge:stone", - "required": false - } + "minecraft:tuff" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks.json b/src/main/generated/data/c/tags/block/storage_blocks.json index 7bf4a38117..4354b34619 100644 --- a/src/main/generated/data/c/tags/block/storage_blocks.json +++ b/src/main/generated/data/c/tags/block/storage_blocks.json @@ -17,7 +17,51 @@ "#c:storage_blocks/slime", "#c:storage_blocks/wheat", { - "id": "#forge:storage_blocks", + "id": "#forge:storage_blocks/coal", + "required": false + }, + { + "id": "#forge:storage_blocks/copper", + "required": false + }, + { + "id": "#forge:storage_blocks/diamond", + "required": false + }, + { + "id": "#forge:storage_blocks/emerald", + "required": false + }, + { + "id": "#forge:storage_blocks/gold", + "required": false + }, + { + "id": "#forge:storage_blocks/iron", + "required": false + }, + { + "id": "#forge:storage_blocks/lapis", + "required": false + }, + { + "id": "#forge:storage_blocks/netherite", + "required": false + }, + { + "id": "#forge:storage_blocks/raw_copper", + "required": false + }, + { + "id": "#forge:storage_blocks/raw_gold", + "required": false + }, + { + "id": "#forge:storage_blocks/raw_iron", + "required": false + }, + { + "id": "#forge:storage_blocks/redstone", "required": false } ] diff --git a/src/main/generated/data/c/tags/entity_type/boats.json b/src/main/generated/data/c/tags/entity_type/boats.json index 58e89216d1..5d453e0a99 100644 --- a/src/main/generated/data/c/tags/entity_type/boats.json +++ b/src/main/generated/data/c/tags/entity_type/boats.json @@ -1,10 +1,6 @@ { "values": [ "minecraft:boat", - "minecraft:chest_boat", - { - "id": "#forge:boats", - "required": false - } + "minecraft:chest_boat" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/entity_type/minecarts.json b/src/main/generated/data/c/tags/entity_type/minecarts.json index 6b7fe052ea..a29375ad2e 100644 --- a/src/main/generated/data/c/tags/entity_type/minecarts.json +++ b/src/main/generated/data/c/tags/entity_type/minecarts.json @@ -6,10 +6,6 @@ "minecraft:hopper_minecart", "minecraft:spawner_minecart", "minecraft:tnt_minecart", - "minecraft:command_block_minecart", - { - "id": "#forge:minecarts", - "required": false - } + "minecraft:command_block_minecart" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/honey.json b/src/main/generated/data/c/tags/fluid/honey.json index 5b2fe217e2..f72d209df7 100644 --- a/src/main/generated/data/c/tags/fluid/honey.json +++ b/src/main/generated/data/c/tags/fluid/honey.json @@ -1,8 +1,3 @@ { - "values": [ - { - "id": "#forge:honey", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/milk.json b/src/main/generated/data/c/tags/fluid/milk.json index 5e27201a7e..3bab1951b3 100644 --- a/src/main/generated/data/c/tags/fluid/milk.json +++ b/src/main/generated/data/c/tags/fluid/milk.json @@ -7,10 +7,6 @@ { "id": "minecraft:flowing_milk", "required": false - }, - { - "id": "#forge:milk", - "required": false } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bricks/nether.json b/src/main/generated/data/c/tags/item/bricks/nether.json index 3f63a414f0..ec7ed3ee9a 100644 --- a/src/main/generated/data/c/tags/item/bricks/nether.json +++ b/src/main/generated/data/c/tags/item/bricks/nether.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:nether_brick", - { - "id": "#forge:ingots/nether_brick", - "required": false - } + "minecraft:nether_brick" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bricks/normal.json b/src/main/generated/data/c/tags/item/bricks/normal.json index a40223a69b..8f632e499a 100644 --- a/src/main/generated/data/c/tags/item/bricks/normal.json +++ b/src/main/generated/data/c/tags/item/bricks/normal.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:brick", - { - "id": "#forge:ingots/brick", - "required": false - } + "minecraft:brick" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dusts.json b/src/main/generated/data/c/tags/item/dusts.json index 45f697f1b0..4642bb1cb7 100644 --- a/src/main/generated/data/c/tags/item/dusts.json +++ b/src/main/generated/data/c/tags/item/dusts.json @@ -1,10 +1,6 @@ { "values": [ "#c:dusts/glowstone", - "#c:dusts/redstone", - { - "id": "#forge:dusts", - "required": false - } + "#c:dusts/redstone" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/black.json b/src/main/generated/data/c/tags/item/dyed/black.json index 493e96b6c0..174ba5e3c4 100644 --- a/src/main/generated/data/c/tags/item/dyed/black.json +++ b/src/main/generated/data/c/tags/item/dyed/black.json @@ -11,14 +11,6 @@ "minecraft:black_stained_glass", "minecraft:black_stained_glass_pane", "minecraft:black_terracotta", - "minecraft:black_wool", - { - "id": "#forge:glass/black", - "required": false - }, - { - "id": "#forge:stained_glass/black", - "required": false - } + "minecraft:black_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/blue.json b/src/main/generated/data/c/tags/item/dyed/blue.json index 0704821f98..ca4b83cd7d 100644 --- a/src/main/generated/data/c/tags/item/dyed/blue.json +++ b/src/main/generated/data/c/tags/item/dyed/blue.json @@ -11,14 +11,6 @@ "minecraft:blue_stained_glass", "minecraft:blue_stained_glass_pane", "minecraft:blue_terracotta", - "minecraft:blue_wool", - { - "id": "#forge:glass/blue", - "required": false - }, - { - "id": "#forge:stained_glass/blue", - "required": false - } + "minecraft:blue_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/brown.json b/src/main/generated/data/c/tags/item/dyed/brown.json index 41b1bc3f6f..502f5bccec 100644 --- a/src/main/generated/data/c/tags/item/dyed/brown.json +++ b/src/main/generated/data/c/tags/item/dyed/brown.json @@ -11,14 +11,6 @@ "minecraft:brown_stained_glass", "minecraft:brown_stained_glass_pane", "minecraft:brown_terracotta", - "minecraft:brown_wool", - { - "id": "#forge:glass/brown", - "required": false - }, - { - "id": "#forge:stained_glass/brown", - "required": false - } + "minecraft:brown_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/cyan.json b/src/main/generated/data/c/tags/item/dyed/cyan.json index a09984e063..f3e0d24c65 100644 --- a/src/main/generated/data/c/tags/item/dyed/cyan.json +++ b/src/main/generated/data/c/tags/item/dyed/cyan.json @@ -11,14 +11,6 @@ "minecraft:cyan_stained_glass", "minecraft:cyan_stained_glass_pane", "minecraft:cyan_terracotta", - "minecraft:cyan_wool", - { - "id": "#forge:glass/cyan", - "required": false - }, - { - "id": "#forge:stained_glass/cyan", - "required": false - } + "minecraft:cyan_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/gray.json b/src/main/generated/data/c/tags/item/dyed/gray.json index 191db19733..58a9ff3549 100644 --- a/src/main/generated/data/c/tags/item/dyed/gray.json +++ b/src/main/generated/data/c/tags/item/dyed/gray.json @@ -11,14 +11,6 @@ "minecraft:gray_stained_glass", "minecraft:gray_stained_glass_pane", "minecraft:gray_terracotta", - "minecraft:gray_wool", - { - "id": "#forge:glass/gray", - "required": false - }, - { - "id": "#forge:stained_glass/gray", - "required": false - } + "minecraft:gray_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/green.json b/src/main/generated/data/c/tags/item/dyed/green.json index 80e3b0bcd1..27dc841609 100644 --- a/src/main/generated/data/c/tags/item/dyed/green.json +++ b/src/main/generated/data/c/tags/item/dyed/green.json @@ -11,14 +11,6 @@ "minecraft:green_stained_glass", "minecraft:green_stained_glass_pane", "minecraft:green_terracotta", - "minecraft:green_wool", - { - "id": "#forge:glass/green", - "required": false - }, - { - "id": "#forge:stained_glass/green", - "required": false - } + "minecraft:green_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/light_blue.json b/src/main/generated/data/c/tags/item/dyed/light_blue.json index 73525eab12..63e842c4e0 100644 --- a/src/main/generated/data/c/tags/item/dyed/light_blue.json +++ b/src/main/generated/data/c/tags/item/dyed/light_blue.json @@ -11,14 +11,6 @@ "minecraft:light_blue_stained_glass", "minecraft:light_blue_stained_glass_pane", "minecraft:light_blue_terracotta", - "minecraft:light_blue_wool", - { - "id": "#forge:glass/light_blue", - "required": false - }, - { - "id": "#forge:stained_glass/light_blue", - "required": false - } + "minecraft:light_blue_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/light_gray.json b/src/main/generated/data/c/tags/item/dyed/light_gray.json index ddfb3e54ad..5a46bc1a15 100644 --- a/src/main/generated/data/c/tags/item/dyed/light_gray.json +++ b/src/main/generated/data/c/tags/item/dyed/light_gray.json @@ -11,14 +11,6 @@ "minecraft:light_gray_stained_glass", "minecraft:light_gray_stained_glass_pane", "minecraft:light_gray_terracotta", - "minecraft:light_gray_wool", - { - "id": "#forge:glass/light_gray", - "required": false - }, - { - "id": "#forge:stained_glass/light_gray", - "required": false - } + "minecraft:light_gray_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/lime.json b/src/main/generated/data/c/tags/item/dyed/lime.json index aa46340608..56f424525c 100644 --- a/src/main/generated/data/c/tags/item/dyed/lime.json +++ b/src/main/generated/data/c/tags/item/dyed/lime.json @@ -11,14 +11,6 @@ "minecraft:lime_stained_glass", "minecraft:lime_stained_glass_pane", "minecraft:lime_terracotta", - "minecraft:lime_wool", - { - "id": "#forge:glass/lime", - "required": false - }, - { - "id": "#forge:stained_glass/lime", - "required": false - } + "minecraft:lime_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/magenta.json b/src/main/generated/data/c/tags/item/dyed/magenta.json index fe71a097ba..f837aefc8a 100644 --- a/src/main/generated/data/c/tags/item/dyed/magenta.json +++ b/src/main/generated/data/c/tags/item/dyed/magenta.json @@ -11,22 +11,6 @@ "minecraft:magenta_stained_glass", "minecraft:magenta_stained_glass_pane", "minecraft:magenta_terracotta", - "minecraft:magenta_wool", - { - "id": "#forge:glass/magenta", - "required": false - }, - { - "id": "#forge:stained_glass/magenta", - "required": false - }, - { - "id": "#forge:glass/magenta", - "required": false - }, - { - "id": "#forge:stained_glass/magenta", - "required": false - } + "minecraft:magenta_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/orange.json b/src/main/generated/data/c/tags/item/dyed/orange.json index 6641433e65..7fa2a7ef84 100644 --- a/src/main/generated/data/c/tags/item/dyed/orange.json +++ b/src/main/generated/data/c/tags/item/dyed/orange.json @@ -11,14 +11,6 @@ "minecraft:orange_stained_glass", "minecraft:orange_stained_glass_pane", "minecraft:orange_terracotta", - "minecraft:orange_wool", - { - "id": "#forge:glass/orange", - "required": false - }, - { - "id": "#forge:stained_glass/orange", - "required": false - } + "minecraft:orange_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/pink.json b/src/main/generated/data/c/tags/item/dyed/pink.json index edca352827..7538cceb02 100644 --- a/src/main/generated/data/c/tags/item/dyed/pink.json +++ b/src/main/generated/data/c/tags/item/dyed/pink.json @@ -11,14 +11,6 @@ "minecraft:pink_stained_glass", "minecraft:pink_stained_glass_pane", "minecraft:pink_terracotta", - "minecraft:pink_wool", - { - "id": "#forge:glass/pink", - "required": false - }, - { - "id": "#forge:stained_glass/pink", - "required": false - } + "minecraft:pink_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/purple.json b/src/main/generated/data/c/tags/item/dyed/purple.json index 3be40b64c6..61355c9ae2 100644 --- a/src/main/generated/data/c/tags/item/dyed/purple.json +++ b/src/main/generated/data/c/tags/item/dyed/purple.json @@ -11,14 +11,6 @@ "minecraft:purple_stained_glass", "minecraft:purple_stained_glass_pane", "minecraft:purple_terracotta", - "minecraft:purple_wool", - { - "id": "#forge:glass/purple", - "required": false - }, - { - "id": "#forge:stained_glass/purple", - "required": false - } + "minecraft:purple_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/red.json b/src/main/generated/data/c/tags/item/dyed/red.json index 7dea013276..252f4660e0 100644 --- a/src/main/generated/data/c/tags/item/dyed/red.json +++ b/src/main/generated/data/c/tags/item/dyed/red.json @@ -11,14 +11,6 @@ "minecraft:red_stained_glass", "minecraft:red_stained_glass_pane", "minecraft:red_terracotta", - "minecraft:red_wool", - { - "id": "#forge:glass/red", - "required": false - }, - { - "id": "#forge:stained_glass/red", - "required": false - } + "minecraft:red_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/white.json b/src/main/generated/data/c/tags/item/dyed/white.json index 9edbf324cc..2e1979e814 100644 --- a/src/main/generated/data/c/tags/item/dyed/white.json +++ b/src/main/generated/data/c/tags/item/dyed/white.json @@ -11,14 +11,6 @@ "minecraft:white_stained_glass", "minecraft:white_stained_glass_pane", "minecraft:white_terracotta", - "minecraft:white_wool", - { - "id": "#forge:glass/white", - "required": false - }, - { - "id": "#forge:stained_glass/white", - "required": false - } + "minecraft:white_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed/yellow.json b/src/main/generated/data/c/tags/item/dyed/yellow.json index 57aeacb16f..0e353cc64e 100644 --- a/src/main/generated/data/c/tags/item/dyed/yellow.json +++ b/src/main/generated/data/c/tags/item/dyed/yellow.json @@ -11,14 +11,6 @@ "minecraft:yellow_stained_glass", "minecraft:yellow_stained_glass_pane", "minecraft:yellow_terracotta", - "minecraft:yellow_wool", - { - "id": "#forge:glass/yellow", - "required": false - }, - { - "id": "#forge:stained_glass/yellow", - "required": false - } + "minecraft:yellow_wool" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/black.json b/src/main/generated/data/c/tags/item/dyes/black.json index 516aeff755..a2ecf55c46 100644 --- a/src/main/generated/data/c/tags/item/dyes/black.json +++ b/src/main/generated/data/c/tags/item/dyes/black.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:black_dye", - { - "id": "#forge:dyes/black", - "required": false - } + "minecraft:black_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/blue.json b/src/main/generated/data/c/tags/item/dyes/blue.json index d64a97e464..e7b78e12a3 100644 --- a/src/main/generated/data/c/tags/item/dyes/blue.json +++ b/src/main/generated/data/c/tags/item/dyes/blue.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:blue_dye", - { - "id": "#forge:dyes/blue", - "required": false - } + "minecraft:blue_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/brown.json b/src/main/generated/data/c/tags/item/dyes/brown.json index 220ece0dfe..8c7249234e 100644 --- a/src/main/generated/data/c/tags/item/dyes/brown.json +++ b/src/main/generated/data/c/tags/item/dyes/brown.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:brown_dye", - { - "id": "#forge:dyes/brown", - "required": false - } + "minecraft:brown_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/cyan.json b/src/main/generated/data/c/tags/item/dyes/cyan.json index 275830210e..f0c5a44002 100644 --- a/src/main/generated/data/c/tags/item/dyes/cyan.json +++ b/src/main/generated/data/c/tags/item/dyes/cyan.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:cyan_dye", - { - "id": "#forge:dyes/cyan", - "required": false - } + "minecraft:cyan_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/gray.json b/src/main/generated/data/c/tags/item/dyes/gray.json index 56f595ede5..6cdbb27a49 100644 --- a/src/main/generated/data/c/tags/item/dyes/gray.json +++ b/src/main/generated/data/c/tags/item/dyes/gray.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:gray_dye", - { - "id": "#forge:dyes/gray", - "required": false - } + "minecraft:gray_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/green.json b/src/main/generated/data/c/tags/item/dyes/green.json index 9f9a8311cf..89fe8ccaf3 100644 --- a/src/main/generated/data/c/tags/item/dyes/green.json +++ b/src/main/generated/data/c/tags/item/dyes/green.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:green_dye", - { - "id": "#forge:dyes/green", - "required": false - } + "minecraft:green_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/light_blue.json b/src/main/generated/data/c/tags/item/dyes/light_blue.json index e5a48d1fed..76f1a7786c 100644 --- a/src/main/generated/data/c/tags/item/dyes/light_blue.json +++ b/src/main/generated/data/c/tags/item/dyes/light_blue.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:light_blue_dye", - { - "id": "#forge:dyes/light_blue", - "required": false - } + "minecraft:light_blue_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/light_gray.json b/src/main/generated/data/c/tags/item/dyes/light_gray.json index 6627597c69..596b2efb37 100644 --- a/src/main/generated/data/c/tags/item/dyes/light_gray.json +++ b/src/main/generated/data/c/tags/item/dyes/light_gray.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:light_gray_dye", - { - "id": "#forge:dyes/light_gray", - "required": false - } + "minecraft:light_gray_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/lime.json b/src/main/generated/data/c/tags/item/dyes/lime.json index fc0af1757b..b0ac91f97e 100644 --- a/src/main/generated/data/c/tags/item/dyes/lime.json +++ b/src/main/generated/data/c/tags/item/dyes/lime.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:lime_dye", - { - "id": "#forge:dyes/lime", - "required": false - } + "minecraft:lime_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/magenta.json b/src/main/generated/data/c/tags/item/dyes/magenta.json index d2032d3de2..f6898d4c9b 100644 --- a/src/main/generated/data/c/tags/item/dyes/magenta.json +++ b/src/main/generated/data/c/tags/item/dyes/magenta.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:magenta_dye", - { - "id": "#forge:dyes/magenta", - "required": false - } + "minecraft:magenta_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/orange.json b/src/main/generated/data/c/tags/item/dyes/orange.json index 3534947be3..df54849c59 100644 --- a/src/main/generated/data/c/tags/item/dyes/orange.json +++ b/src/main/generated/data/c/tags/item/dyes/orange.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:orange_dye", - { - "id": "#forge:dyes/orange", - "required": false - } + "minecraft:orange_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/pink.json b/src/main/generated/data/c/tags/item/dyes/pink.json index f7ffc037f0..d9f2898629 100644 --- a/src/main/generated/data/c/tags/item/dyes/pink.json +++ b/src/main/generated/data/c/tags/item/dyes/pink.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:pink_dye", - { - "id": "#forge:dyes/pink", - "required": false - } + "minecraft:pink_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/purple.json b/src/main/generated/data/c/tags/item/dyes/purple.json index 38a9a29868..b3ebfe3c26 100644 --- a/src/main/generated/data/c/tags/item/dyes/purple.json +++ b/src/main/generated/data/c/tags/item/dyes/purple.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:purple_dye", - { - "id": "#forge:dyes/purple", - "required": false - } + "minecraft:purple_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/red.json b/src/main/generated/data/c/tags/item/dyes/red.json index f36b684e01..9c6fe34671 100644 --- a/src/main/generated/data/c/tags/item/dyes/red.json +++ b/src/main/generated/data/c/tags/item/dyes/red.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:red_dye", - { - "id": "#forge:dyes/red", - "required": false - } + "minecraft:red_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/white.json b/src/main/generated/data/c/tags/item/dyes/white.json index 217dfda5c3..3a30d72b10 100644 --- a/src/main/generated/data/c/tags/item/dyes/white.json +++ b/src/main/generated/data/c/tags/item/dyes/white.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:white_dye", - { - "id": "#forge:dyes/white", - "required": false - } + "minecraft:white_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes/yellow.json b/src/main/generated/data/c/tags/item/dyes/yellow.json index 8f469111bf..4349959836 100644 --- a/src/main/generated/data/c/tags/item/dyes/yellow.json +++ b/src/main/generated/data/c/tags/item/dyes/yellow.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:yellow_dye", - { - "id": "#forge:dyes/yellow", - "required": false - } + "minecraft:yellow_dye" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/glass_blocks/cheap.json b/src/main/generated/data/c/tags/item/glass_blocks/cheap.json index ccd28136a6..067bd8f78d 100644 --- a/src/main/generated/data/c/tags/item/glass_blocks/cheap.json +++ b/src/main/generated/data/c/tags/item/glass_blocks/cheap.json @@ -18,7 +18,7 @@ "minecraft:red_stained_glass", "minecraft:black_stained_glass", { - "id": "#forge:glass_silica", + "id": "#forge:glass/silica", "required": false } ] diff --git a/src/main/generated/data/c/tags/item/glass_blocks/colorless.json b/src/main/generated/data/c/tags/item/glass_blocks/colorless.json index 7d2e81b6c4..e46e8e25ba 100644 --- a/src/main/generated/data/c/tags/item/glass_blocks/colorless.json +++ b/src/main/generated/data/c/tags/item/glass_blocks/colorless.json @@ -2,7 +2,7 @@ "values": [ "minecraft:glass", { - "id": "#forge:glass_colorless", + "id": "#forge:glass/colorless", "required": false } ] diff --git a/src/main/generated/data/c/tags/item/glass_blocks/tinted.json b/src/main/generated/data/c/tags/item/glass_blocks/tinted.json index 0a7d0f3f00..e7fe6f40f0 100644 --- a/src/main/generated/data/c/tags/item/glass_blocks/tinted.json +++ b/src/main/generated/data/c/tags/item/glass_blocks/tinted.json @@ -2,7 +2,7 @@ "values": [ "minecraft:tinted_glass", { - "id": "#forge:glass_tinted", + "id": "#forge:glass/tinted", "required": false } ] diff --git a/src/main/generated/data/c/tags/item/glass_panes.json b/src/main/generated/data/c/tags/item/glass_panes.json index c4bdf8ea3f..869c6fe993 100644 --- a/src/main/generated/data/c/tags/item/glass_panes.json +++ b/src/main/generated/data/c/tags/item/glass_panes.json @@ -16,6 +16,10 @@ "minecraft:brown_stained_glass_pane", "minecraft:green_stained_glass_pane", "minecraft:red_stained_glass_pane", - "minecraft:black_stained_glass_pane" + "minecraft:black_stained_glass_pane", + { + "id": "#forge:glass_panes", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/glass_panes/colorless.json b/src/main/generated/data/c/tags/item/glass_panes/colorless.json index b7d7245a6a..5390c3bbd6 100644 --- a/src/main/generated/data/c/tags/item/glass_panes/colorless.json +++ b/src/main/generated/data/c/tags/item/glass_panes/colorless.json @@ -2,7 +2,7 @@ "values": [ "minecraft:glass_pane", { - "id": "#forge:glass_panes_colorless", + "id": "#forge:glass_panes/colorless", "required": false } ] diff --git a/src/main/generated/data/c/tags/item/ingots.json b/src/main/generated/data/c/tags/item/ingots.json index 4584668355..a1e5ead59a 100644 --- a/src/main/generated/data/c/tags/item/ingots.json +++ b/src/main/generated/data/c/tags/item/ingots.json @@ -3,10 +3,6 @@ "#c:ingots/copper", "#c:ingots/gold", "#c:ingots/iron", - "#c:ingots/netherite", - { - "id": "#forge:ingots", - "required": false - } + "#c:ingots/netherite" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/stones.json b/src/main/generated/data/c/tags/item/stones.json index 2848998459..c95195f10c 100644 --- a/src/main/generated/data/c/tags/item/stones.json +++ b/src/main/generated/data/c/tags/item/stones.json @@ -5,10 +5,6 @@ "minecraft:granite", "minecraft:stone", "minecraft:deepslate", - "minecraft:tuff", - { - "id": "#forge:stone", - "required": false - } + "minecraft:tuff" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks.json b/src/main/generated/data/c/tags/item/storage_blocks.json index 7bf4a38117..4354b34619 100644 --- a/src/main/generated/data/c/tags/item/storage_blocks.json +++ b/src/main/generated/data/c/tags/item/storage_blocks.json @@ -17,7 +17,51 @@ "#c:storage_blocks/slime", "#c:storage_blocks/wheat", { - "id": "#forge:storage_blocks", + "id": "#forge:storage_blocks/coal", + "required": false + }, + { + "id": "#forge:storage_blocks/copper", + "required": false + }, + { + "id": "#forge:storage_blocks/diamond", + "required": false + }, + { + "id": "#forge:storage_blocks/emerald", + "required": false + }, + { + "id": "#forge:storage_blocks/gold", + "required": false + }, + { + "id": "#forge:storage_blocks/iron", + "required": false + }, + { + "id": "#forge:storage_blocks/lapis", + "required": false + }, + { + "id": "#forge:storage_blocks/netherite", + "required": false + }, + { + "id": "#forge:storage_blocks/raw_copper", + "required": false + }, + { + "id": "#forge:storage_blocks/raw_gold", + "required": false + }, + { + "id": "#forge:storage_blocks/raw_iron", + "required": false + }, + { + "id": "#forge:storage_blocks/redstone", "required": false } ] diff --git a/src/main/generated/data/c/tags/item/tools.json b/src/main/generated/data/c/tags/item/tools.json index 14b99aa54e..98a56516e0 100644 --- a/src/main/generated/data/c/tags/item/tools.json +++ b/src/main/generated/data/c/tags/item/tools.json @@ -16,10 +16,6 @@ "#c:tools/mace", "#c:tools/mining_tool", "#c:tools/melee_weapon", - "#c:tools/ranged_weapon", - { - "id": "#forge:tools", - "required": false - } + "#c:tools/ranged_weapon" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/brush.json b/src/main/generated/data/c/tags/item/tools/brush.json index 30f5564ba5..8b2fb219ea 100644 --- a/src/main/generated/data/c/tags/item/tools/brush.json +++ b/src/main/generated/data/c/tags/item/tools/brush.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:brush", - { - "id": "#forge:tools/brushes", - "required": false - } + "minecraft:brush" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/shear.json b/src/main/generated/data/c/tags/item/tools/shear.json index 1c2ad36f72..6ee404543e 100644 --- a/src/main/generated/data/c/tags/item/tools/shear.json +++ b/src/main/generated/data/c/tags/item/tools/shear.json @@ -2,7 +2,7 @@ "values": [ "minecraft:shears", { - "id": "#forge:shears", + "id": "#forge:tools/shears", "required": false } ] diff --git a/src/main/generated/data/c/tags/item/tools/spear.json b/src/main/generated/data/c/tags/item/tools/spear.json index c5b8b99af6..7a2c450bc7 100644 --- a/src/main/generated/data/c/tags/item/tools/spear.json +++ b/src/main/generated/data/c/tags/item/tools/spear.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:trident", - { - "id": "#forge:tools/tridents", - "required": false - } + "minecraft:trident" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_aquatic.json b/src/main/generated/data/c/tags/worldgen/biome/is_aquatic.json index 77bf3cac1a..0c764d624a 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_aquatic.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_aquatic.json @@ -1,10 +1,6 @@ { "values": [ "#c:is_ocean", - "#c:is_river", - { - "id": "#forge:is_water", - "required": false - } + "#c:is_river" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_cold.json b/src/main/generated/data/c/tags/worldgen/biome/is_cold.json index cf12ef88d5..09882a2325 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_cold.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_cold.json @@ -5,10 +5,6 @@ "id": "#forge:is_cold/nether", "required": false }, - "#c:is_cold/end", - { - "id": "#forge:is_cold", - "required": false - } + "#c:is_cold/end" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation.json b/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation.json index 4eb83501aa..078ef904dd 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation.json @@ -8,10 +8,6 @@ { "id": "#forge:is_dense/end", "required": false - }, - { - "id": "#forge:is_dense", - "required": false } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_desert.json b/src/main/generated/data/c/tags/worldgen/biome/is_desert.json index 7f6b11f3b4..f1a8ccb642 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_desert.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_desert.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:desert", - { - "id": "#forge:is_desert", - "required": false - } + "minecraft:desert" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_end.json b/src/main/generated/data/c/tags/worldgen/biome/is_end.json index 2e43e7a97b..3bbfe0bf59 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_end.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_end.json @@ -1,9 +1,5 @@ { "values": [ - "#minecraft:is_end", - { - "id": "#forge:is_end", - "required": false - } + "#minecraft:is_end" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_floral.json b/src/main/generated/data/c/tags/worldgen/biome/is_floral.json index 32cfdbacc2..6b464cc9bb 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_floral.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_floral.json @@ -3,10 +3,6 @@ "#c:is_flower_forest", "minecraft:sunflower_plains", "minecraft:cherry_grove", - "minecraft:meadow", - { - "id": "#forge:is_floral", - "required": false - } + "minecraft:meadow" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_hot.json b/src/main/generated/data/c/tags/worldgen/biome/is_hot.json index 6ec024d660..5a591ca1bc 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_hot.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_hot.json @@ -5,10 +5,6 @@ { "id": "#forge:is_hot/end", "required": false - }, - { - "id": "#forge:is_hot", - "required": false } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_mountain.json b/src/main/generated/data/c/tags/worldgen/biome/is_mountain.json index 0ad5197c18..f6976e0670 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_mountain.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mountain.json @@ -2,10 +2,6 @@ "values": [ "#minecraft:is_mountain", "#c:is_mountain/peak", - "#c:is_mountain/slope", - { - "id": "#forge:is_mountain", - "required": false - } + "#c:is_mountain/slope" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_mountain/slope.json b/src/main/generated/data/c/tags/worldgen/biome/is_mountain/slope.json index b534783957..f3a1e55d57 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_mountain/slope.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mountain/slope.json @@ -3,10 +3,6 @@ "minecraft:snowy_slopes", "minecraft:meadow", "minecraft:grove", - "minecraft:cherry_grove", - { - "id": "#forge:is_slope", - "required": false - } + "minecraft:cherry_grove" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_mushroom.json b/src/main/generated/data/c/tags/worldgen/biome/is_mushroom.json index e83f4e0c45..05d85d951d 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_mushroom.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mushroom.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:mushroom_fields", - { - "id": "#forge:is_mushroom", - "required": false - } + "minecraft:mushroom_fields" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_nether.json b/src/main/generated/data/c/tags/worldgen/biome/is_nether.json index 8775f39f6f..f7e672b8c8 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_nether.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_nether.json @@ -1,9 +1,5 @@ { "values": [ - "#minecraft:is_nether", - { - "id": "#forge:is_nether", - "required": false - } + "#minecraft:is_nether" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_overworld.json index e1bd80c754..d3152c5b09 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_overworld.json @@ -1,9 +1,5 @@ { "values": [ - "#minecraft:is_overworld", - { - "id": "#forge:is_overworld", - "required": false - } + "#minecraft:is_overworld" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_plains.json b/src/main/generated/data/c/tags/worldgen/biome/is_plains.json index 4e23e1e56f..c88810bc13 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_plains.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_plains.json @@ -1,10 +1,6 @@ { "values": [ "minecraft:plains", - "minecraft:sunflower_plains", - { - "id": "#forge:is_plains", - "required": false - } + "minecraft:sunflower_plains" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_snowy.json b/src/main/generated/data/c/tags/worldgen/biome/is_snowy.json index 8d5168ef6c..193255cf45 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_snowy.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_snowy.json @@ -7,10 +7,6 @@ "minecraft:grove", "minecraft:snowy_slopes", "minecraft:jagged_peaks", - "minecraft:frozen_peaks", - { - "id": "#forge:is_snowy", - "required": false - } + "minecraft:frozen_peaks" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation.json b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation.json index c8d60b7cbd..370b410454 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation.json @@ -8,14 +8,6 @@ { "id": "#forge:is_sparse/end", "required": false - }, - { - "id": "#forge:is_sparse_vegetation", - "required": false - }, - { - "id": "#forge:is_sparse", - "required": false } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index 905b2bfe66..50e66eff68 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -10,14 +10,6 @@ "minecraft:windswept_gravelly_hills", "minecraft:snowy_slopes", "minecraft:jagged_peaks", - "minecraft:frozen_peaks", - { - "id": "#forge:is_sparse_vegetation/overworld", - "required": false - }, - { - "id": "#forge:is_sparse/overworld", - "required": false - } + "minecraft:frozen_peaks" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_swamp.json b/src/main/generated/data/c/tags/worldgen/biome/is_swamp.json index 7f7d1c742b..0f5eb22e0c 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_swamp.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_swamp.json @@ -1,10 +1,6 @@ { "values": [ "minecraft:swamp", - "minecraft:mangrove_swamp", - { - "id": "#forge:is_swamp", - "required": false - } + "minecraft:mangrove_swamp" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_tree/coniferous.json b/src/main/generated/data/c/tags/worldgen/biome/is_tree/coniferous.json index 62d147cff9..490b4750b0 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_tree/coniferous.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_tree/coniferous.json @@ -3,7 +3,7 @@ "#c:is_taiga", "minecraft:grove", { - "id": "#forge:is_tree/coniferous", + "id": "#forge:is_coniferous", "required": false } ] diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_void.json b/src/main/generated/data/c/tags/worldgen/biome/is_void.json index f6048857ff..f55aea6671 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_void.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_void.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:the_void", - { - "id": "#forge:is_void", - "required": false - } + "minecraft:the_void" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_wasteland.json b/src/main/generated/data/c/tags/worldgen/biome/is_wasteland.json index 6d11db61bc..f72d209df7 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_wasteland.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_wasteland.json @@ -1,8 +1,3 @@ { - "values": [ - { - "id": "#forge:is_wasteland", - "required": false - } - ] + "values": [] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_wet.json b/src/main/generated/data/c/tags/worldgen/biome/is_wet.json index 24379033c4..259e57decf 100644 --- a/src/main/generated/data/c/tags/worldgen/biome/is_wet.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_wet.json @@ -8,10 +8,6 @@ { "id": "#forge:is_wet/end", "required": false - }, - { - "id": "#forge:is_wet", - "required": false } ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/barrels.json b/src/main/generated/data/forge/tags/block/barrels.json new file mode 100644 index 0000000000..1cfb5782c5 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/barrels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:barrels/wooden" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/barrels/wooden.json b/src/main/generated/data/forge/tags/block/barrels/wooden.json new file mode 100644 index 0000000000..b07daae1c0 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/barrels/wooden.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:barrel" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/bookshelves.json b/src/main/generated/data/forge/tags/block/bookshelves.json new file mode 100644 index 0000000000..c09b2185bd --- /dev/null +++ b/src/main/generated/data/forge/tags/block/bookshelves.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bookshelf" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/chests.json b/src/main/generated/data/forge/tags/block/chests.json new file mode 100644 index 0000000000..9afff2b15a --- /dev/null +++ b/src/main/generated/data/forge/tags/block/chests.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:chests/ender", + "#forge:chests/trapped", + "#forge:chests/wooden" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/chests/wooden.json b/src/main/generated/data/forge/tags/block/chests/wooden.json new file mode 100644 index 0000000000..86533f935b --- /dev/null +++ b/src/main/generated/data/forge/tags/block/chests/wooden.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:chest", + "minecraft:trapped_chest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/cobblestone.json b/src/main/generated/data/forge/tags/block/cobblestone.json new file mode 100644 index 0000000000..f0ae95b5fc --- /dev/null +++ b/src/main/generated/data/forge/tags/block/cobblestone.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#forge:cobblestone/normal", + "#forge:cobblestone/infested", + "#forge:cobblestone/mossy", + "#forge:cobblestone/deepslate" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass.json b/src/main/generated/data/forge/tags/block/glass.json new file mode 100644 index 0000000000..fec31169ee --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:glass/colorless", + "#forge:stained_glass", + "#forge:glass/tinted" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/black.json b/src/main/generated/data/forge/tags/block/glass/black.json new file mode 100644 index 0000000000..9965b5e8b4 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/blue.json b/src/main/generated/data/forge/tags/block/glass/blue.json new file mode 100644 index 0000000000..f59e58c6bf --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/brown.json b/src/main/generated/data/forge/tags/block/glass/brown.json new file mode 100644 index 0000000000..490015cbb5 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brown_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/colorless.json b/src/main/generated/data/forge/tags/block/glass/colorless.json new file mode 100644 index 0000000000..ac8b5e5086 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/colorless.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/cyan.json b/src/main/generated/data/forge/tags/block/glass/cyan.json new file mode 100644 index 0000000000..24d84747fa --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cyan_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/gray.json b/src/main/generated/data/forge/tags/block/glass/gray.json new file mode 100644 index 0000000000..2f309170ca --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/green.json b/src/main/generated/data/forge/tags/block/glass/green.json new file mode 100644 index 0000000000..d7946c1aca --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:green_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/light_blue.json b/src/main/generated/data/forge/tags/block/glass/light_blue.json new file mode 100644 index 0000000000..dc8e6b7148 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/light_gray.json b/src/main/generated/data/forge/tags/block/glass/light_gray.json new file mode 100644 index 0000000000..f165a46c90 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/lime.json b/src/main/generated/data/forge/tags/block/glass/lime.json new file mode 100644 index 0000000000..b6bb1d9415 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lime_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/magenta.json b/src/main/generated/data/forge/tags/block/glass/magenta.json new file mode 100644 index 0000000000..aa6a4825e8 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:magenta_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/orange.json b/src/main/generated/data/forge/tags/block/glass/orange.json new file mode 100644 index 0000000000..9322f51fe4 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:orange_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/pink.json b/src/main/generated/data/forge/tags/block/glass/pink.json new file mode 100644 index 0000000000..58b65891fc --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pink_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/purple.json b/src/main/generated/data/forge/tags/block/glass/purple.json new file mode 100644 index 0000000000..d75a9e7308 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:purple_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/red.json b/src/main/generated/data/forge/tags/block/glass/red.json new file mode 100644 index 0000000000..72af78c029 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/silica.json b/src/main/generated/data/forge/tags/block/glass/silica.json new file mode 100644 index 0000000000..74544c770d --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/silica.json @@ -0,0 +1,21 @@ +{ + "values": [ + "minecraft:glass", + "minecraft:black_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:green_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:red_stained_glass", + "minecraft:white_stained_glass", + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/tinted.json b/src/main/generated/data/forge/tags/block/glass/tinted.json new file mode 100644 index 0000000000..4075a1556b --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/tinted.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:tinted_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/white.json b/src/main/generated/data/forge/tags/block/glass/white.json new file mode 100644 index 0000000000..fb180e703e --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:white_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/yellow.json b/src/main/generated/data/forge/tags/block/glass/yellow.json new file mode 100644 index 0000000000..0831bea4cc --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes.json b/src/main/generated/data/forge/tags/block/glass_panes.json new file mode 100644 index 0000000000..4b95330d4f --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:glass_panes/colorless", + "#forge:stained_glass_panes" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/black.json b/src/main/generated/data/forge/tags/block/glass_panes/black.json new file mode 100644 index 0000000000..ebda555dcd --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/blue.json b/src/main/generated/data/forge/tags/block/glass_panes/blue.json new file mode 100644 index 0000000000..2762890aa9 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/brown.json b/src/main/generated/data/forge/tags/block/glass_panes/brown.json new file mode 100644 index 0000000000..0b5b727491 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brown_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/colorless.json b/src/main/generated/data/forge/tags/block/glass_panes/colorless.json new file mode 100644 index 0000000000..eb5756f964 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/colorless.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/cyan.json b/src/main/generated/data/forge/tags/block/glass_panes/cyan.json new file mode 100644 index 0000000000..9913e90a96 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cyan_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/gray.json b/src/main/generated/data/forge/tags/block/glass_panes/gray.json new file mode 100644 index 0000000000..9fe30b26a8 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/green.json b/src/main/generated/data/forge/tags/block/glass_panes/green.json new file mode 100644 index 0000000000..ab91321028 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:green_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/light_blue.json b/src/main/generated/data/forge/tags/block/glass_panes/light_blue.json new file mode 100644 index 0000000000..cd6d399022 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/light_gray.json b/src/main/generated/data/forge/tags/block/glass_panes/light_gray.json new file mode 100644 index 0000000000..7be6a4ce81 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/lime.json b/src/main/generated/data/forge/tags/block/glass_panes/lime.json new file mode 100644 index 0000000000..46dec64b22 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lime_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/magenta.json b/src/main/generated/data/forge/tags/block/glass_panes/magenta.json new file mode 100644 index 0000000000..7504bc3fa3 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:magenta_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/orange.json b/src/main/generated/data/forge/tags/block/glass_panes/orange.json new file mode 100644 index 0000000000..1c47e34616 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:orange_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/pink.json b/src/main/generated/data/forge/tags/block/glass_panes/pink.json new file mode 100644 index 0000000000..28e36b973f --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pink_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/purple.json b/src/main/generated/data/forge/tags/block/glass_panes/purple.json new file mode 100644 index 0000000000..a3cff33a14 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:purple_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/red.json b/src/main/generated/data/forge/tags/block/glass_panes/red.json new file mode 100644 index 0000000000..5edd855d71 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/white.json b/src/main/generated/data/forge/tags/block/glass_panes/white.json new file mode 100644 index 0000000000..b514a2839f --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:white_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass_panes/yellow.json b/src/main/generated/data/forge/tags/block/glass_panes/yellow.json new file mode 100644 index 0000000000..a293eb9dc8 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/glass_panes/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:yellow_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/obsidian.json b/src/main/generated/data/forge/tags/block/obsidian.json new file mode 100644 index 0000000000..170248454b --- /dev/null +++ b/src/main/generated/data/forge/tags/block/obsidian.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:obsidian" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/ores.json b/src/main/generated/data/forge/tags/block/ores.json new file mode 100644 index 0000000000..2c4beabc55 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/ores.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#forge:ores/coal", + "#forge:ores/copper", + "#forge:ores/diamond", + "#forge:ores/emerald", + "#forge:ores/gold", + "#forge:ores/iron", + "#forge:ores/lapis", + "#forge:ores/redstone", + "#forge:ores/quartz", + "#forge:ores/netherite_scrap" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/ores/netherite_scrap.json b/src/main/generated/data/forge/tags/block/ores/netherite_scrap.json new file mode 100644 index 0000000000..910d1fb8e6 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/ores/netherite_scrap.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ancient_debris" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/ores/quartz.json b/src/main/generated/data/forge/tags/block/ores/quartz.json new file mode 100644 index 0000000000..f0bc7a4657 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/ores/quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/sandstone.json b/src/main/generated/data/forge/tags/block/sandstone.json new file mode 100644 index 0000000000..bb7fb03ee3 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/sandstone.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:sandstone", + "minecraft:cut_sandstone", + "minecraft:chiseled_sandstone", + "minecraft:smooth_sandstone", + "minecraft:red_sandstone", + "minecraft:cut_red_sandstone", + "minecraft:chiseled_red_sandstone", + "minecraft:smooth_red_sandstone" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/stained_glass.json b/src/main/generated/data/forge/tags/block/stained_glass.json new file mode 100644 index 0000000000..2db7aef9df --- /dev/null +++ b/src/main/generated/data/forge/tags/block/stained_glass.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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:red_stained_glass", + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/stained_glass_panes.json b/src/main/generated/data/forge/tags/block/stained_glass_panes.json new file mode 100644 index 0000000000..65f2adb8f9 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/stained_glass_panes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_stained_glass_pane", + "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", + "minecraft:blue_stained_glass_pane", + "minecraft:brown_stained_glass_pane", + "minecraft:green_stained_glass_pane", + "minecraft:red_stained_glass_pane", + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/stone.json b/src/main/generated/data/forge/tags/block/stone.json new file mode 100644 index 0000000000..958f6e25c7 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/stone.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:polished_andesite", + "minecraft:polished_diorite", + "minecraft:polished_granite", + "minecraft:deepslate", + "minecraft:polished_deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks.json b/src/main/generated/data/forge/tags/block/storage_blocks.json new file mode 100644 index 0000000000..5f2a7d417e --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks.json @@ -0,0 +1,18 @@ +{ + "values": [ + "#forge:storage_blocks/amethyst", + "#forge:storage_blocks/coal", + "#forge:storage_blocks/copper", + "#forge:storage_blocks/diamond", + "#forge:storage_blocks/emerald", + "#forge:storage_blocks/gold", + "#forge:storage_blocks/iron", + "#forge:storage_blocks/lapis", + "#forge:storage_blocks/quartz", + "#forge:storage_blocks/raw_copper", + "#forge:storage_blocks/raw_gold", + "#forge:storage_blocks/raw_iron", + "#forge:storage_blocks/redstone", + "#forge:storage_blocks/netherite" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/amethyst.json b/src/main/generated/data/forge/tags/block/storage_blocks/amethyst.json new file mode 100644 index 0000000000..7f66725ab4 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/amethyst.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:amethyst_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/coal.json b/src/main/generated/data/forge/tags/block/storage_blocks/coal.json new file mode 100644 index 0000000000..4b7921705b --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/coal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:coal_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/copper.json b/src/main/generated/data/forge/tags/block/storage_blocks/copper.json new file mode 100644 index 0000000000..015bec70c3 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:copper_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/diamond.json b/src/main/generated/data/forge/tags/block/storage_blocks/diamond.json new file mode 100644 index 0000000000..acd7f52de5 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/diamond.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:diamond_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/emerald.json b/src/main/generated/data/forge/tags/block/storage_blocks/emerald.json new file mode 100644 index 0000000000..152063ec6c --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/emerald.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:emerald_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/gold.json b/src/main/generated/data/forge/tags/block/storage_blocks/gold.json new file mode 100644 index 0000000000..546dde03c9 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gold_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/iron.json b/src/main/generated/data/forge/tags/block/storage_blocks/iron.json new file mode 100644 index 0000000000..01fb2965f2 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/lapis.json b/src/main/generated/data/forge/tags/block/storage_blocks/lapis.json new file mode 100644 index 0000000000..f4ca82bbd4 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/lapis.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lapis_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/netherite.json b/src/main/generated/data/forge/tags/block/storage_blocks/netherite.json new file mode 100644 index 0000000000..83433d44eb --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/netherite.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherite_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/quartz.json b/src/main/generated/data/forge/tags/block/storage_blocks/quartz.json new file mode 100644 index 0000000000..9d2533c64a --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:quartz_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/raw_copper.json b/src/main/generated/data/forge/tags/block/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..1a21e230ef --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/raw_copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_copper_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/raw_gold.json b/src/main/generated/data/forge/tags/block/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..80781ce667 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/raw_gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_gold_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/raw_iron.json b/src/main/generated/data/forge/tags/block/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..13ed9fc651 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/raw_iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_iron_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/storage_blocks/redstone.json b/src/main/generated/data/forge/tags/block/storage_blocks/redstone.json new file mode 100644 index 0000000000..f5fd89c541 --- /dev/null +++ b/src/main/generated/data/forge/tags/block/storage_blocks/redstone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:redstone_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/entity_type/bosses.json b/src/main/generated/data/forge/tags/entity_type/bosses.json new file mode 100644 index 0000000000..4be4cce831 --- /dev/null +++ b/src/main/generated/data/forge/tags/entity_type/bosses.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:ender_dragon", + "minecraft:wither" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/milk.json b/src/main/generated/data/forge/tags/fluid/milk.json new file mode 100644 index 0000000000..3bab1951b3 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/milk.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "minecraft:milk", + "required": false + }, + { + "id": "minecraft:flowing_milk", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/armors.json b/src/main/generated/data/forge/tags/item/armors.json new file mode 100644 index 0000000000..1f895dcedf --- /dev/null +++ b/src/main/generated/data/forge/tags/item/armors.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#forge:armors/helmets", + "#forge:armors/chestplates", + "#forge:armors/leggings", + "#forge:armors/boots" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/armors/boots.json b/src/main/generated/data/forge/tags/item/armors/boots.json new file mode 100644 index 0000000000..b68cf3908d --- /dev/null +++ b/src/main/generated/data/forge/tags/item/armors/boots.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:leather_boots", + "minecraft:chainmail_boots", + "minecraft:iron_boots", + "minecraft:golden_boots", + "minecraft:diamond_boots", + "minecraft:netherite_boots" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/armors/chestplates.json b/src/main/generated/data/forge/tags/item/armors/chestplates.json new file mode 100644 index 0000000000..3f17463c56 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/armors/chestplates.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:leather_chestplate", + "minecraft:chainmail_chestplate", + "minecraft:iron_chestplate", + "minecraft:golden_chestplate", + "minecraft:diamond_chestplate", + "minecraft:netherite_chestplate" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/armors/helmets.json b/src/main/generated/data/forge/tags/item/armors/helmets.json new file mode 100644 index 0000000000..9c9b657c45 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/armors/helmets.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:leather_helmet", + "minecraft:turtle_helmet", + "minecraft:chainmail_helmet", + "minecraft:iron_helmet", + "minecraft:golden_helmet", + "minecraft:diamond_helmet", + "minecraft:netherite_helmet" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/armors/leggings.json b/src/main/generated/data/forge/tags/item/armors/leggings.json new file mode 100644 index 0000000000..8969323c7c --- /dev/null +++ b/src/main/generated/data/forge/tags/item/armors/leggings.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:leather_leggings", + "minecraft:chainmail_leggings", + "minecraft:iron_leggings", + "minecraft:golden_leggings", + "minecraft:diamond_leggings", + "minecraft:netherite_leggings" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/barrels.json b/src/main/generated/data/forge/tags/item/barrels.json new file mode 100644 index 0000000000..1cfb5782c5 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/barrels.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:barrels/wooden" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/barrels/wooden.json b/src/main/generated/data/forge/tags/item/barrels/wooden.json new file mode 100644 index 0000000000..b07daae1c0 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/barrels/wooden.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:barrel" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/bones.json b/src/main/generated/data/forge/tags/item/bones.json index 5af534fcff..80fcbc586a 100644 --- a/src/main/generated/data/forge/tags/item/bones.json +++ b/src/main/generated/data/forge/tags/item/bones.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:bone", "minecraft:bone" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/bookshelves.json b/src/main/generated/data/forge/tags/item/bookshelves.json new file mode 100644 index 0000000000..c09b2185bd --- /dev/null +++ b/src/main/generated/data/forge/tags/item/bookshelves.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bookshelf" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/chests.json b/src/main/generated/data/forge/tags/item/chests.json new file mode 100644 index 0000000000..9afff2b15a --- /dev/null +++ b/src/main/generated/data/forge/tags/item/chests.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:chests/ender", + "#forge:chests/trapped", + "#forge:chests/wooden" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/chests/wooden.json b/src/main/generated/data/forge/tags/item/chests/wooden.json new file mode 100644 index 0000000000..86533f935b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/chests/wooden.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:chest", + "minecraft:trapped_chest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/cobblestone.json b/src/main/generated/data/forge/tags/item/cobblestone.json new file mode 100644 index 0000000000..f0ae95b5fc --- /dev/null +++ b/src/main/generated/data/forge/tags/item/cobblestone.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#forge:cobblestone/normal", + "#forge:cobblestone/infested", + "#forge:cobblestone/mossy", + "#forge:cobblestone/deepslate" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/crops.json b/src/main/generated/data/forge/tags/item/crops.json new file mode 100644 index 0000000000..ae5f647fbe --- /dev/null +++ b/src/main/generated/data/forge/tags/item/crops.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#forge:crops/beetroot", + "#forge:crops/carrot", + "#forge:crops/nether_wart", + "#forge:crops/potato", + "#forge:crops/wheat" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/crops/beetroot.json b/src/main/generated/data/forge/tags/item/crops/beetroot.json new file mode 100644 index 0000000000..b28b723c4b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/crops/beetroot.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:beetroot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/crops/carrot.json b/src/main/generated/data/forge/tags/item/crops/carrot.json new file mode 100644 index 0000000000..f9630d1347 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/crops/carrot.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:carrot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/crops/nether_wart.json b/src/main/generated/data/forge/tags/item/crops/nether_wart.json new file mode 100644 index 0000000000..5960d80cb9 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/crops/nether_wart.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_wart" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/crops/potato.json b/src/main/generated/data/forge/tags/item/crops/potato.json new file mode 100644 index 0000000000..47fc151cd1 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/crops/potato.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:potato" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/crops/wheat.json b/src/main/generated/data/forge/tags/item/crops/wheat.json new file mode 100644 index 0000000000..498cb445f6 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/crops/wheat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:wheat" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dusts.json b/src/main/generated/data/forge/tags/item/dusts.json new file mode 100644 index 0000000000..87f0fee447 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dusts.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:dusts/glowstone", + "#forge:dusts/prismarine", + "#forge:dusts/redstone" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dusts/glowstone.json b/src/main/generated/data/forge/tags/item/dusts/glowstone.json new file mode 100644 index 0000000000..668258c523 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dusts/glowstone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:glowstone_dust" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dusts/prismarine.json b/src/main/generated/data/forge/tags/item/dusts/prismarine.json new file mode 100644 index 0000000000..3773c1f116 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dusts/prismarine.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:prismarine_shard" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dusts/redstone.json b/src/main/generated/data/forge/tags/item/dusts/redstone.json new file mode 100644 index 0000000000..a096239ec1 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dusts/redstone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:redstone" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes.json b/src/main/generated/data/forge/tags/item/dyes.json new file mode 100644 index 0000000000..c8f72c5b6f --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#forge:dyes/white", + "#forge:dyes/orange", + "#forge:dyes/magenta", + "#forge:dyes/light_blue", + "#forge:dyes/yellow", + "#forge:dyes/lime", + "#forge:dyes/pink", + "#forge:dyes/gray", + "#forge:dyes/light_gray", + "#forge:dyes/cyan", + "#forge:dyes/purple", + "#forge:dyes/blue", + "#forge:dyes/brown", + "#forge:dyes/green", + "#forge:dyes/red", + "#forge:dyes/black" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/black.json b/src/main/generated/data/forge/tags/item/dyes/black.json new file mode 100644 index 0000000000..a2ecf55c46 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:black_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/blue.json b/src/main/generated/data/forge/tags/item/dyes/blue.json new file mode 100644 index 0000000000..e7b78e12a3 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blue_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/brown.json b/src/main/generated/data/forge/tags/item/dyes/brown.json new file mode 100644 index 0000000000..8c7249234e --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brown_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/cyan.json b/src/main/generated/data/forge/tags/item/dyes/cyan.json new file mode 100644 index 0000000000..f0c5a44002 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cyan_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/gray.json b/src/main/generated/data/forge/tags/item/dyes/gray.json new file mode 100644 index 0000000000..6cdbb27a49 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gray_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/green.json b/src/main/generated/data/forge/tags/item/dyes/green.json new file mode 100644 index 0000000000..89fe8ccaf3 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:green_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/light_blue.json b/src/main/generated/data/forge/tags/item/dyes/light_blue.json new file mode 100644 index 0000000000..76f1a7786c --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_blue_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/light_gray.json b/src/main/generated/data/forge/tags/item/dyes/light_gray.json new file mode 100644 index 0000000000..596b2efb37 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_gray_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/lime.json b/src/main/generated/data/forge/tags/item/dyes/lime.json new file mode 100644 index 0000000000..b0ac91f97e --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lime_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/magenta.json b/src/main/generated/data/forge/tags/item/dyes/magenta.json new file mode 100644 index 0000000000..f6898d4c9b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:magenta_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/orange.json b/src/main/generated/data/forge/tags/item/dyes/orange.json new file mode 100644 index 0000000000..df54849c59 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:orange_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/pink.json b/src/main/generated/data/forge/tags/item/dyes/pink.json new file mode 100644 index 0000000000..d9f2898629 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pink_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/purple.json b/src/main/generated/data/forge/tags/item/dyes/purple.json new file mode 100644 index 0000000000..b3ebfe3c26 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:purple_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/red.json b/src/main/generated/data/forge/tags/item/dyes/red.json new file mode 100644 index 0000000000..9c6fe34671 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/white.json b/src/main/generated/data/forge/tags/item/dyes/white.json new file mode 100644 index 0000000000..3a30d72b10 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:white_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/dyes/yellow.json b/src/main/generated/data/forge/tags/item/dyes/yellow.json new file mode 100644 index 0000000000..4349959836 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/dyes/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:yellow_dye" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/eggs.json b/src/main/generated/data/forge/tags/item/eggs.json index cbcbec3c4e..4cc54b7acb 100644 --- a/src/main/generated/data/forge/tags/item/eggs.json +++ b/src/main/generated/data/forge/tags/item/eggs.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:egg", "minecraft:egg" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/enchanting_fuels.json b/src/main/generated/data/forge/tags/item/enchanting_fuels.json index 2a4a029cca..5ee9fdf84e 100644 --- a/src/main/generated/data/forge/tags/item/enchanting_fuels.json +++ b/src/main/generated/data/forge/tags/item/enchanting_fuels.json @@ -1,5 +1,6 @@ { "values": [ + "#c:gems/lapis", "#forge:gems/lapis" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ender_pearls.json b/src/main/generated/data/forge/tags/item/ender_pearls.json new file mode 100644 index 0000000000..135cd1d776 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ender_pearls.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ender_pearl" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/feathers.json b/src/main/generated/data/forge/tags/item/feathers.json index 8086200700..0a7bf89c15 100644 --- a/src/main/generated/data/forge/tags/item/feathers.json +++ b/src/main/generated/data/forge/tags/item/feathers.json @@ -1,5 +1,10 @@ { "values": [ + "minecraft:feather", + { + "id": "#forge:feathers", + "required": false + }, "minecraft:feather" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems.json b/src/main/generated/data/forge/tags/item/gems.json new file mode 100644 index 0000000000..60af4bab68 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#forge:gems/amethyst", + "#forge:gems/diamond", + "#forge:gems/emerald", + "#forge:gems/lapis", + "#forge:gems/prismarine", + "#forge:gems/quartz" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems/amethyst.json b/src/main/generated/data/forge/tags/item/gems/amethyst.json new file mode 100644 index 0000000000..742ef896d5 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems/amethyst.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:amethyst_shard" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems/diamond.json b/src/main/generated/data/forge/tags/item/gems/diamond.json new file mode 100644 index 0000000000..f44f30dd55 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems/diamond.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:diamond" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems/emerald.json b/src/main/generated/data/forge/tags/item/gems/emerald.json new file mode 100644 index 0000000000..07a0982118 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems/emerald.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:emerald" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems/lapis.json b/src/main/generated/data/forge/tags/item/gems/lapis.json new file mode 100644 index 0000000000..614441df46 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems/lapis.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lapis_lazuli" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems/prismarine.json b/src/main/generated/data/forge/tags/item/gems/prismarine.json new file mode 100644 index 0000000000..150e7ff711 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems/prismarine.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:prismarine_crystals" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gems/quartz.json b/src/main/generated/data/forge/tags/item/gems/quartz.json new file mode 100644 index 0000000000..aad2eef95b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/gems/quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:quartz" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass.json b/src/main/generated/data/forge/tags/item/glass.json new file mode 100644 index 0000000000..fec31169ee --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:glass/colorless", + "#forge:stained_glass", + "#forge:glass/tinted" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/black.json b/src/main/generated/data/forge/tags/item/glass/black.json new file mode 100644 index 0000000000..9965b5e8b4 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/blue.json b/src/main/generated/data/forge/tags/item/glass/blue.json new file mode 100644 index 0000000000..f59e58c6bf --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/brown.json b/src/main/generated/data/forge/tags/item/glass/brown.json new file mode 100644 index 0000000000..490015cbb5 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brown_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/colorless.json b/src/main/generated/data/forge/tags/item/glass/colorless.json new file mode 100644 index 0000000000..ac8b5e5086 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/colorless.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/cyan.json b/src/main/generated/data/forge/tags/item/glass/cyan.json new file mode 100644 index 0000000000..24d84747fa --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cyan_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/gray.json b/src/main/generated/data/forge/tags/item/glass/gray.json new file mode 100644 index 0000000000..2f309170ca --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/green.json b/src/main/generated/data/forge/tags/item/glass/green.json new file mode 100644 index 0000000000..d7946c1aca --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:green_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/light_blue.json b/src/main/generated/data/forge/tags/item/glass/light_blue.json new file mode 100644 index 0000000000..dc8e6b7148 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_blue_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/light_gray.json b/src/main/generated/data/forge/tags/item/glass/light_gray.json new file mode 100644 index 0000000000..f165a46c90 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_gray_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/lime.json b/src/main/generated/data/forge/tags/item/glass/lime.json new file mode 100644 index 0000000000..b6bb1d9415 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lime_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/magenta.json b/src/main/generated/data/forge/tags/item/glass/magenta.json new file mode 100644 index 0000000000..aa6a4825e8 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:magenta_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/orange.json b/src/main/generated/data/forge/tags/item/glass/orange.json new file mode 100644 index 0000000000..9322f51fe4 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:orange_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/pink.json b/src/main/generated/data/forge/tags/item/glass/pink.json new file mode 100644 index 0000000000..58b65891fc --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pink_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/purple.json b/src/main/generated/data/forge/tags/item/glass/purple.json new file mode 100644 index 0000000000..d75a9e7308 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:purple_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/red.json b/src/main/generated/data/forge/tags/item/glass/red.json new file mode 100644 index 0000000000..72af78c029 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/silica.json b/src/main/generated/data/forge/tags/item/glass/silica.json new file mode 100644 index 0000000000..74544c770d --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/silica.json @@ -0,0 +1,21 @@ +{ + "values": [ + "minecraft:glass", + "minecraft:black_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:green_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:red_stained_glass", + "minecraft:white_stained_glass", + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/tinted.json b/src/main/generated/data/forge/tags/item/glass/tinted.json new file mode 100644 index 0000000000..4075a1556b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/tinted.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:tinted_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/white.json b/src/main/generated/data/forge/tags/item/glass/white.json new file mode 100644 index 0000000000..fb180e703e --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:white_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/yellow.json b/src/main/generated/data/forge/tags/item/glass/yellow.json new file mode 100644 index 0000000000..0831bea4cc --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes.json b/src/main/generated/data/forge/tags/item/glass_panes.json new file mode 100644 index 0000000000..4b95330d4f --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:glass_panes/colorless", + "#forge:stained_glass_panes" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/black.json b/src/main/generated/data/forge/tags/item/glass_panes/black.json new file mode 100644 index 0000000000..ebda555dcd --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/black.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/blue.json b/src/main/generated/data/forge/tags/item/glass_panes/blue.json new file mode 100644 index 0000000000..2762890aa9 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/brown.json b/src/main/generated/data/forge/tags/item/glass_panes/brown.json new file mode 100644 index 0000000000..0b5b727491 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/brown.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brown_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/colorless.json b/src/main/generated/data/forge/tags/item/glass_panes/colorless.json new file mode 100644 index 0000000000..eb5756f964 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/colorless.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/cyan.json b/src/main/generated/data/forge/tags/item/glass_panes/cyan.json new file mode 100644 index 0000000000..9913e90a96 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/cyan.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cyan_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/gray.json b/src/main/generated/data/forge/tags/item/glass_panes/gray.json new file mode 100644 index 0000000000..9fe30b26a8 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/green.json b/src/main/generated/data/forge/tags/item/glass_panes/green.json new file mode 100644 index 0000000000..ab91321028 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/green.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:green_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/light_blue.json b/src/main/generated/data/forge/tags/item/glass_panes/light_blue.json new file mode 100644 index 0000000000..cd6d399022 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/light_blue.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_blue_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/light_gray.json b/src/main/generated/data/forge/tags/item/glass_panes/light_gray.json new file mode 100644 index 0000000000..7be6a4ce81 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/light_gray.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:light_gray_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/lime.json b/src/main/generated/data/forge/tags/item/glass_panes/lime.json new file mode 100644 index 0000000000..46dec64b22 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/lime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lime_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/magenta.json b/src/main/generated/data/forge/tags/item/glass_panes/magenta.json new file mode 100644 index 0000000000..7504bc3fa3 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/magenta.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:magenta_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/orange.json b/src/main/generated/data/forge/tags/item/glass_panes/orange.json new file mode 100644 index 0000000000..1c47e34616 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/orange.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:orange_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/pink.json b/src/main/generated/data/forge/tags/item/glass_panes/pink.json new file mode 100644 index 0000000000..28e36b973f --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/pink.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pink_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/purple.json b/src/main/generated/data/forge/tags/item/glass_panes/purple.json new file mode 100644 index 0000000000..a3cff33a14 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/purple.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:purple_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/red.json b/src/main/generated/data/forge/tags/item/glass_panes/red.json new file mode 100644 index 0000000000..5edd855d71 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/red.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:red_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/white.json b/src/main/generated/data/forge/tags/item/glass_panes/white.json new file mode 100644 index 0000000000..b514a2839f --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/white.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:white_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass_panes/yellow.json b/src/main/generated/data/forge/tags/item/glass_panes/yellow.json new file mode 100644 index 0000000000..a293eb9dc8 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/glass_panes/yellow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:yellow_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/gunpowder.json b/src/main/generated/data/forge/tags/item/gunpowder.json index d5835ce7f9..7120fe3fba 100644 --- a/src/main/generated/data/forge/tags/item/gunpowder.json +++ b/src/main/generated/data/forge/tags/item/gunpowder.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:gunpowder", "minecraft:gunpowder" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/heads.json b/src/main/generated/data/forge/tags/item/heads.json new file mode 100644 index 0000000000..430af37ee5 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/heads.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:creeper_head", + "minecraft:dragon_head", + "minecraft:player_head", + "minecraft:skeleton_skull", + "minecraft:wither_skeleton_skull", + "minecraft:zombie_head" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots.json b/src/main/generated/data/forge/tags/item/ingots.json new file mode 100644 index 0000000000..e9756bb39c --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#forge:ingots/brick", + "#forge:ingots/copper", + "#forge:ingots/gold", + "#forge:ingots/iron", + "#forge:ingots/netherite", + "#forge:ingots/nether_brick" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots/brick.json b/src/main/generated/data/forge/tags/item/ingots/brick.json new file mode 100644 index 0000000000..8f632e499a --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots/brick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:brick" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots/copper.json b/src/main/generated/data/forge/tags/item/ingots/copper.json new file mode 100644 index 0000000000..1cc1f065c5 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:copper_ingot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots/gold.json b/src/main/generated/data/forge/tags/item/ingots/gold.json new file mode 100644 index 0000000000..07e9f66a30 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots/gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gold_ingot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots/iron.json b/src/main/generated/data/forge/tags/item/ingots/iron.json new file mode 100644 index 0000000000..c656021bdb --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_ingot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots/nether_brick.json b/src/main/generated/data/forge/tags/item/ingots/nether_brick.json new file mode 100644 index 0000000000..ec7ed3ee9a --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots/nether_brick.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_brick" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ingots/netherite.json b/src/main/generated/data/forge/tags/item/ingots/netherite.json new file mode 100644 index 0000000000..bd6929df75 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ingots/netherite.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherite_ingot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/leather.json b/src/main/generated/data/forge/tags/item/leather.json new file mode 100644 index 0000000000..71b797d35b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/leather.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:leather" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/mushrooms.json b/src/main/generated/data/forge/tags/item/mushrooms.json index 471cd77f07..67f853554a 100644 --- a/src/main/generated/data/forge/tags/item/mushrooms.json +++ b/src/main/generated/data/forge/tags/item/mushrooms.json @@ -1,5 +1,11 @@ { "values": [ + "minecraft:brown_mushroom", + "minecraft:red_mushroom", + { + "id": "#forge:mushrooms", + "required": false + }, "minecraft:brown_mushroom", "minecraft:red_mushroom" ] diff --git a/src/main/generated/data/forge/tags/item/nether_stars.json b/src/main/generated/data/forge/tags/item/nether_stars.json index 737a95d083..e28072445c 100644 --- a/src/main/generated/data/forge/tags/item/nether_stars.json +++ b/src/main/generated/data/forge/tags/item/nether_stars.json @@ -1,5 +1,10 @@ { "values": [ + "minecraft:nether_star", + { + "id": "#forge:nether_stars", + "required": false + }, "minecraft:nether_star" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/nuggets.json b/src/main/generated/data/forge/tags/item/nuggets.json new file mode 100644 index 0000000000..fb0dc26ecd --- /dev/null +++ b/src/main/generated/data/forge/tags/item/nuggets.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:nuggets/iron", + "#forge:nuggets/gold" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/nuggets/gold.json b/src/main/generated/data/forge/tags/item/nuggets/gold.json new file mode 100644 index 0000000000..4d94345957 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/nuggets/gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gold_nugget" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/nuggets/iron.json b/src/main/generated/data/forge/tags/item/nuggets/iron.json new file mode 100644 index 0000000000..cbd20ac6e4 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/nuggets/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_nugget" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/obsidian.json b/src/main/generated/data/forge/tags/item/obsidian.json new file mode 100644 index 0000000000..170248454b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/obsidian.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:obsidian" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ores.json b/src/main/generated/data/forge/tags/item/ores.json new file mode 100644 index 0000000000..2c4beabc55 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ores.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#forge:ores/coal", + "#forge:ores/copper", + "#forge:ores/diamond", + "#forge:ores/emerald", + "#forge:ores/gold", + "#forge:ores/iron", + "#forge:ores/lapis", + "#forge:ores/redstone", + "#forge:ores/quartz", + "#forge:ores/netherite_scrap" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ores/netherite_scrap.json b/src/main/generated/data/forge/tags/item/ores/netherite_scrap.json new file mode 100644 index 0000000000..910d1fb8e6 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ores/netherite_scrap.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:ancient_debris" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/ores/quartz.json b/src/main/generated/data/forge/tags/item/ores/quartz.json new file mode 100644 index 0000000000..f0bc7a4657 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/ores/quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/raw_materials.json b/src/main/generated/data/forge/tags/item/raw_materials.json new file mode 100644 index 0000000000..35208231e0 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/raw_materials.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:raw_materials/copper", + "#forge:raw_materials/gold", + "#forge:raw_materials/iron" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/raw_materials/copper.json b/src/main/generated/data/forge/tags/item/raw_materials/copper.json new file mode 100644 index 0000000000..3e03ab9ca8 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/raw_materials/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_copper" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/raw_materials/gold.json b/src/main/generated/data/forge/tags/item/raw_materials/gold.json new file mode 100644 index 0000000000..3d1252e5f9 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/raw_materials/gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_gold" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/raw_materials/iron.json b/src/main/generated/data/forge/tags/item/raw_materials/iron.json new file mode 100644 index 0000000000..8f9af48d8e --- /dev/null +++ b/src/main/generated/data/forge/tags/item/raw_materials/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_iron" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/rods.json b/src/main/generated/data/forge/tags/item/rods.json new file mode 100644 index 0000000000..11b8cb3844 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/rods.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:rods/blaze", + "#forge:rods/wooden" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/rods/blaze.json b/src/main/generated/data/forge/tags/item/rods/blaze.json new file mode 100644 index 0000000000..5d2eff8311 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/rods/blaze.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:blaze_rod" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/rods/wooden.json b/src/main/generated/data/forge/tags/item/rods/wooden.json new file mode 100644 index 0000000000..019b63dd31 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/rods/wooden.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:stick" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/sandstone.json b/src/main/generated/data/forge/tags/item/sandstone.json new file mode 100644 index 0000000000..bb7fb03ee3 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/sandstone.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:sandstone", + "minecraft:cut_sandstone", + "minecraft:chiseled_sandstone", + "minecraft:smooth_sandstone", + "minecraft:red_sandstone", + "minecraft:cut_red_sandstone", + "minecraft:chiseled_red_sandstone", + "minecraft:smooth_red_sandstone" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/seeds.json b/src/main/generated/data/forge/tags/item/seeds.json index 423d5bb52d..756a7a4dab 100644 --- a/src/main/generated/data/forge/tags/item/seeds.json +++ b/src/main/generated/data/forge/tags/item/seeds.json @@ -1,5 +1,9 @@ { "values": [ + "#forge:seeds/beetroot", + "#forge:seeds/melon", + "#forge:seeds/pumpkin", + "#forge:seeds/wheat", "#forge:seeds/beetroot", "#forge:seeds/melon", "#forge:seeds/pumpkin", diff --git a/src/main/generated/data/forge/tags/item/seeds/beetroot.json b/src/main/generated/data/forge/tags/item/seeds/beetroot.json index da5a4ab7ef..63fc2592fc 100644 --- a/src/main/generated/data/forge/tags/item/seeds/beetroot.json +++ b/src/main/generated/data/forge/tags/item/seeds/beetroot.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:beetroot_seeds", "minecraft:beetroot_seeds" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/seeds/melon.json b/src/main/generated/data/forge/tags/item/seeds/melon.json index 973c52ea12..0d33d81334 100644 --- a/src/main/generated/data/forge/tags/item/seeds/melon.json +++ b/src/main/generated/data/forge/tags/item/seeds/melon.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:melon_seeds", "minecraft:melon_seeds" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/seeds/pumpkin.json b/src/main/generated/data/forge/tags/item/seeds/pumpkin.json index 264c06bf04..72b5f3536b 100644 --- a/src/main/generated/data/forge/tags/item/seeds/pumpkin.json +++ b/src/main/generated/data/forge/tags/item/seeds/pumpkin.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:pumpkin_seeds", "minecraft:pumpkin_seeds" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/seeds/wheat.json b/src/main/generated/data/forge/tags/item/seeds/wheat.json index b90459c291..7e7a9943ab 100644 --- a/src/main/generated/data/forge/tags/item/seeds/wheat.json +++ b/src/main/generated/data/forge/tags/item/seeds/wheat.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:wheat_seeds", "minecraft:wheat_seeds" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/shears.json b/src/main/generated/data/forge/tags/item/shears.json new file mode 100644 index 0000000000..2400078166 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/shears.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:shears" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/slimeballs.json b/src/main/generated/data/forge/tags/item/slimeballs.json new file mode 100644 index 0000000000..533c25d916 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/slimeballs.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:slime_ball" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/stained_glass.json b/src/main/generated/data/forge/tags/item/stained_glass.json new file mode 100644 index 0000000000..2db7aef9df --- /dev/null +++ b/src/main/generated/data/forge/tags/item/stained_glass.json @@ -0,0 +1,20 @@ +{ + "values": [ + "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:red_stained_glass", + "minecraft:black_stained_glass" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/stained_glass_panes.json b/src/main/generated/data/forge/tags/item/stained_glass_panes.json new file mode 100644 index 0000000000..65f2adb8f9 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/stained_glass_panes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_stained_glass_pane", + "minecraft:orange_stained_glass_pane", + "minecraft:magenta_stained_glass_pane", + "minecraft:light_blue_stained_glass_pane", + "minecraft:yellow_stained_glass_pane", + "minecraft:lime_stained_glass_pane", + "minecraft:pink_stained_glass_pane", + "minecraft:gray_stained_glass_pane", + "minecraft:light_gray_stained_glass_pane", + "minecraft:cyan_stained_glass_pane", + "minecraft:purple_stained_glass_pane", + "minecraft:blue_stained_glass_pane", + "minecraft:brown_stained_glass_pane", + "minecraft:green_stained_glass_pane", + "minecraft:red_stained_glass_pane", + "minecraft:black_stained_glass_pane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/stone.json b/src/main/generated/data/forge/tags/item/stone.json new file mode 100644 index 0000000000..958f6e25c7 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/stone.json @@ -0,0 +1,16 @@ +{ + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:infested_stone", + "minecraft:stone", + "minecraft:polished_andesite", + "minecraft:polished_diorite", + "minecraft:polished_granite", + "minecraft:deepslate", + "minecraft:polished_deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks.json b/src/main/generated/data/forge/tags/item/storage_blocks.json new file mode 100644 index 0000000000..5f2a7d417e --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks.json @@ -0,0 +1,18 @@ +{ + "values": [ + "#forge:storage_blocks/amethyst", + "#forge:storage_blocks/coal", + "#forge:storage_blocks/copper", + "#forge:storage_blocks/diamond", + "#forge:storage_blocks/emerald", + "#forge:storage_blocks/gold", + "#forge:storage_blocks/iron", + "#forge:storage_blocks/lapis", + "#forge:storage_blocks/quartz", + "#forge:storage_blocks/raw_copper", + "#forge:storage_blocks/raw_gold", + "#forge:storage_blocks/raw_iron", + "#forge:storage_blocks/redstone", + "#forge:storage_blocks/netherite" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/amethyst.json b/src/main/generated/data/forge/tags/item/storage_blocks/amethyst.json new file mode 100644 index 0000000000..7f66725ab4 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/amethyst.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:amethyst_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/coal.json b/src/main/generated/data/forge/tags/item/storage_blocks/coal.json new file mode 100644 index 0000000000..4b7921705b --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/coal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:coal_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/copper.json b/src/main/generated/data/forge/tags/item/storage_blocks/copper.json new file mode 100644 index 0000000000..015bec70c3 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:copper_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/diamond.json b/src/main/generated/data/forge/tags/item/storage_blocks/diamond.json new file mode 100644 index 0000000000..acd7f52de5 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/diamond.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:diamond_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/emerald.json b/src/main/generated/data/forge/tags/item/storage_blocks/emerald.json new file mode 100644 index 0000000000..152063ec6c --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/emerald.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:emerald_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/gold.json b/src/main/generated/data/forge/tags/item/storage_blocks/gold.json new file mode 100644 index 0000000000..546dde03c9 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:gold_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/iron.json b/src/main/generated/data/forge/tags/item/storage_blocks/iron.json new file mode 100644 index 0000000000..01fb2965f2 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/lapis.json b/src/main/generated/data/forge/tags/item/storage_blocks/lapis.json new file mode 100644 index 0000000000..f4ca82bbd4 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/lapis.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lapis_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/netherite.json b/src/main/generated/data/forge/tags/item/storage_blocks/netherite.json new file mode 100644 index 0000000000..83433d44eb --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/netherite.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:netherite_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/quartz.json b/src/main/generated/data/forge/tags/item/storage_blocks/quartz.json new file mode 100644 index 0000000000..9d2533c64a --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/quartz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:quartz_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/raw_copper.json b/src/main/generated/data/forge/tags/item/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..1a21e230ef --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/raw_copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_copper_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/raw_gold.json b/src/main/generated/data/forge/tags/item/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..80781ce667 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/raw_gold.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_gold_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/raw_iron.json b/src/main/generated/data/forge/tags/item/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..13ed9fc651 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/raw_iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:raw_iron_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/storage_blocks/redstone.json b/src/main/generated/data/forge/tags/item/storage_blocks/redstone.json new file mode 100644 index 0000000000..f5fd89c541 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/storage_blocks/redstone.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:redstone_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/string.json b/src/main/generated/data/forge/tags/item/string.json new file mode 100644 index 0000000000..d018256cf8 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/string.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:string" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools.json b/src/main/generated/data/forge/tags/item/tools.json new file mode 100644 index 0000000000..acbfe2ae9d --- /dev/null +++ b/src/main/generated/data/forge/tags/item/tools.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#minecraft:swords", + "#minecraft:axes", + "#minecraft:pickaxes", + "#minecraft:shovels", + "#minecraft:hoes", + "#forge:tools/shields", + "#forge:tools/bows", + "#forge:tools/crossbows", + "#forge:tools/fishing_rods", + "#forge:tools/tridents" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools/bows.json b/src/main/generated/data/forge/tags/item/tools/bows.json new file mode 100644 index 0000000000..a1c8a443dc --- /dev/null +++ b/src/main/generated/data/forge/tags/item/tools/bows.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bow" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools/crossbows.json b/src/main/generated/data/forge/tags/item/tools/crossbows.json new file mode 100644 index 0000000000..848f97bc22 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/tools/crossbows.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crossbow" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools/fishing_rods.json b/src/main/generated/data/forge/tags/item/tools/fishing_rods.json new file mode 100644 index 0000000000..e97941e9dc --- /dev/null +++ b/src/main/generated/data/forge/tags/item/tools/fishing_rods.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:fishing_rod" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools/shields.json b/src/main/generated/data/forge/tags/item/tools/shields.json new file mode 100644 index 0000000000..0f2454ce04 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/tools/shields.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:shield" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools/tridents.json b/src/main/generated/data/forge/tags/item/tools/tridents.json new file mode 100644 index 0000000000..7a2c450bc7 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/tools/tridents.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:trident" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_cave.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cave.json new file mode 100644 index 0000000000..21a70cfeec --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_cave.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:lush_caves", + "minecraft:dripstone_caves", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_cold.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold.json new file mode 100644 index 0000000000..75f9c80b3d --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_cold.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#forge:is_cold/overworld", + { + "id": "#forge:is_cold/nether", + "required": false + }, + "#forge:is_cold/end" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json new file mode 100644 index 0000000000..73d3eff3b0 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:the_end", + "minecraft:small_end_islands", + "minecraft:end_midlands", + "minecraft:end_highlands", + "minecraft:end_barrens" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json new file mode 100644 index 0000000000..4d7cf8a957 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json @@ -0,0 +1,19 @@ +{ + "values": [ + "minecraft:taiga", + "minecraft:frozen_ocean", + "minecraft:frozen_river", + "minecraft:snowy_plains", + "minecraft:snowy_beach", + "minecraft:snowy_taiga", + "minecraft:old_growth_pine_taiga", + "minecraft:grove", + "minecraft:snowy_slopes", + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", + "minecraft:cold_ocean", + "minecraft:deep_cold_ocean", + "minecraft:deep_frozen_ocean", + "minecraft:ice_spikes" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_coniferous.json b/src/main/generated/data/forge/tags/worldgen/biome/is_coniferous.json new file mode 100644 index 0000000000..6c114dbc65 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_coniferous.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:taiga", + "minecraft:snowy_taiga", + "minecraft:old_growth_pine_taiga", + "minecraft:grove" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dead.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dead.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dead.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dense.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dense.json new file mode 100644 index 0000000000..fa16b4cc6b --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dense.json @@ -0,0 +1,13 @@ +{ + "values": [ + "#forge:is_dense/overworld", + { + "id": "#forge:is_dense/nether", + "required": false + }, + { + "id": "#forge:is_dense/end", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json new file mode 100644 index 0000000000..9491a24bc8 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:jungle", + "minecraft:dark_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_spruce_taiga" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_desert.json b/src/main/generated/data/forge/tags/worldgen/biome/is_desert.json new file mode 100644 index 0000000000..f1a8ccb642 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_desert.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:desert" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dry.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry.json new file mode 100644 index 0000000000..28d35de201 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dry.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:is_dry/overworld", + "#forge:is_dry/nether", + "#forge:is_dry/end" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json new file mode 100644 index 0000000000..73d3eff3b0 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:the_end", + "minecraft:small_end_islands", + "minecraft:end_midlands", + "minecraft:end_highlands", + "minecraft:end_barrens" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json new file mode 100644 index 0000000000..340c9d161b --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_wastes", + "minecraft:soul_sand_valley", + "minecraft:crimson_forest", + "minecraft:warped_forest", + "minecraft:basalt_deltas" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json new file mode 100644 index 0000000000..5f0fa0bfee --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:windswept_savanna", + "minecraft:eroded_badlands" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_hot.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot.json new file mode 100644 index 0000000000..6559f017e6 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_hot.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#forge:is_hot/overworld", + "#forge:is_hot/nether", + { + "id": "#forge:is_hot/end", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json new file mode 100644 index 0000000000..340c9d161b --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_wastes", + "minecraft:soul_sand_valley", + "minecraft:crimson_forest", + "minecraft:warped_forest", + "minecraft:basalt_deltas" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json new file mode 100644 index 0000000000..f283627eb9 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:desert", + "minecraft:jungle", + "minecraft:sparse_jungle", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:stony_peaks", + "minecraft:warm_ocean", + "minecraft:windswept_savanna", + "minecraft:eroded_badlands", + "minecraft:bamboo_jungle", + "minecraft:mangrove_swamp" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_lush.json b/src/main/generated/data/forge/tags/worldgen/biome/is_lush.json index 14035f0a54..c91691a230 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_lush.json +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_lush.json @@ -1,5 +1,6 @@ { "values": [ + "minecraft:lush_caves", "minecraft:lush_caves" ] } \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_mountain.json b/src/main/generated/data/forge/tags/worldgen/biome/is_mountain.json new file mode 100644 index 0000000000..859b350079 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_mountain.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:is_peak", + "#forge:is_slope" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_mushroom.json b/src/main/generated/data/forge/tags/worldgen/biome/is_mushroom.json new file mode 100644 index 0000000000..05d85d951d --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_mushroom.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mushroom_fields" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_peak.json b/src/main/generated/data/forge/tags/worldgen/biome/is_peak.json new file mode 100644 index 0000000000..c9597b86d0 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_peak.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", + "minecraft:stony_peaks" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_plains.json b/src/main/generated/data/forge/tags/worldgen/biome/is_plains.json new file mode 100644 index 0000000000..9028b691af --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_plains.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:plains", + "minecraft:snowy_plains", + "minecraft:meadow", + "minecraft:sunflower_plains" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_plateau.json b/src/main/generated/data/forge/tags/worldgen/biome/is_plateau.json index 2fb321e9b7..0f5655a8c3 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_plateau.json +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_plateau.json @@ -1,5 +1,9 @@ { "values": [ + "minecraft:wooded_badlands", + "minecraft:savanna_plateau", + "minecraft:cherry_grove", + "minecraft:meadow", "minecraft:savanna_plateau", "minecraft:wooded_badlands", "minecraft:meadow" diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_rare.json b/src/main/generated/data/forge/tags/worldgen/biome/is_rare.json index 490abd4392..fa912d7481 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_rare.json +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_rare.json @@ -1,5 +1,18 @@ { "values": [ + "minecraft:sunflower_plains", + "minecraft:flower_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_spruce_taiga", + "minecraft:bamboo_jungle", + "minecraft:sparse_jungle", + "minecraft:eroded_badlands", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", + "minecraft:ice_spikes", + "minecraft:windswept_gravelly_hills", + "minecraft:mushroom_fields", + "minecraft:deep_dark", "minecraft:mushroom_fields", "minecraft:sparse_jungle", "minecraft:savanna_plateau", diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_sandy.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sandy.json index 1ae7158316..1dd432aa43 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_sandy.json +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_sandy.json @@ -1,5 +1,10 @@ { "values": [ + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", + "minecraft:beach", "minecraft:desert", "minecraft:beach", "minecraft:badlands", diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_slope.json b/src/main/generated/data/forge/tags/worldgen/biome/is_slope.json new file mode 100644 index 0000000000..453f828613 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_slope.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:savanna_plateau", + "minecraft:wooded_badlands", + "minecraft:meadow", + "minecraft:grove", + "minecraft:snowy_slopes" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json b/src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json new file mode 100644 index 0000000000..e1310e08ee --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json @@ -0,0 +1,14 @@ +{ + "values": [ + "minecraft:frozen_ocean", + "minecraft:frozen_river", + "minecraft:snowy_plains", + "minecraft:snowy_beach", + "minecraft:snowy_taiga", + "minecraft:grove", + "minecraft:snowy_slopes", + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", + "minecraft:ice_spikes" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json new file mode 100644 index 0000000000..7680132431 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json @@ -0,0 +1,13 @@ +{ + "values": [ + "#forge:is_sparse/overworld", + { + "id": "#forge:is_sparse/nether", + "required": false + }, + { + "id": "#forge:is_sparse/end", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json new file mode 100644 index 0000000000..e9652824e6 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:windswept_forest", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:wooded_badlands", + "minecraft:snowy_slopes", + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_savanna", + "minecraft:eroded_badlands", + "minecraft:dripstone_caves" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_spooky.json b/src/main/generated/data/forge/tags/worldgen/biome/is_spooky.json index 9255238fa6..05c4f74dc5 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_spooky.json +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_spooky.json @@ -1,5 +1,7 @@ { "values": [ + "minecraft:dark_forest", + "minecraft:deep_dark", "minecraft:dark_forest", "minecraft:deep_dark" ] diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_swamp.json b/src/main/generated/data/forge/tags/worldgen/biome/is_swamp.json new file mode 100644 index 0000000000..0f5eb22e0c --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_swamp.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:swamp", + "minecraft:mangrove_swamp" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_underground.json b/src/main/generated/data/forge/tags/worldgen/biome/is_underground.json new file mode 100644 index 0000000000..c55f2d526e --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_underground.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:is_cave" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_void.json b/src/main/generated/data/forge/tags/worldgen/biome/is_void.json new file mode 100644 index 0000000000..f55aea6671 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_void.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:the_void" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_wasteland.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wasteland.json new file mode 100644 index 0000000000..05a22cb3c9 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_wasteland.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:snowy_plains" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_water.json b/src/main/generated/data/forge/tags/worldgen/biome/is_water.json new file mode 100644 index 0000000000..800c17196b --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_water.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#minecraft:is_ocean", + "#minecraft:is_river" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_wet.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wet.json new file mode 100644 index 0000000000..b355261275 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_wet.json @@ -0,0 +1,13 @@ +{ + "values": [ + "#forge:is_wet/overworld", + { + "id": "#forge:is_wet/nether", + "required": false + }, + { + "id": "#forge:is_wet/end", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json new file mode 100644 index 0000000000..e5e5a885c5 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:swamp", + "minecraft:jungle", + "minecraft:sparse_jungle", + "minecraft:beach", + "minecraft:bamboo_jungle", + "minecraft:lush_caves", + "minecraft:mangrove_swamp" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/recipe/acacia_chest_boat.json b/src/main/generated/data/minecraft/recipe/acacia_chest_boat.json index 5fd961adc7..c677340129 100644 --- a/src/main/generated/data/minecraft/recipe/acacia_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/acacia_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:acacia_boat" diff --git a/src/main/generated/data/minecraft/recipe/acacia_fence.json b/src/main/generated/data/minecraft/recipe/acacia_fence.json index 703625a37e..1df661b7b1 100644 --- a/src/main/generated/data/minecraft/recipe/acacia_fence.json +++ b/src/main/generated/data/minecraft/recipe/acacia_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:acacia_planks" diff --git a/src/main/generated/data/minecraft/recipe/acacia_fence_gate.json b/src/main/generated/data/minecraft/recipe/acacia_fence_gate.json index 68a5ec59f1..01c8f1d461 100644 --- a/src/main/generated/data/minecraft/recipe/acacia_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/acacia_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:acacia_planks" diff --git a/src/main/generated/data/minecraft/recipe/acacia_sign.json b/src/main/generated/data/minecraft/recipe/acacia_sign.json index 374bc7a676..8591a10c68 100644 --- a/src/main/generated/data/minecraft/recipe/acacia_sign.json +++ b/src/main/generated/data/minecraft/recipe/acacia_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:acacia_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/activator_rail.json b/src/main/generated/data/minecraft/recipe/activator_rail.json index 53b3dde6a0..f3e8a6d92a 100644 --- a/src/main/generated/data/minecraft/recipe/activator_rail.json +++ b/src/main/generated/data/minecraft/recipe/activator_rail.json @@ -6,10 +6,10 @@ "item": "minecraft:redstone_torch" }, "S": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/anvil.json b/src/main/generated/data/minecraft/recipe/anvil.json index 309ede352d..405668a7af 100644 --- a/src/main/generated/data/minecraft/recipe/anvil.json +++ b/src/main/generated/data/minecraft/recipe/anvil.json @@ -6,7 +6,7 @@ "item": "minecraft:iron_block" }, "i": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/armor_stand.json b/src/main/generated/data/minecraft/recipe/armor_stand.json index d902e13f9e..55e7dbeaff 100644 --- a/src/main/generated/data/minecraft/recipe/armor_stand.json +++ b/src/main/generated/data/minecraft/recipe/armor_stand.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "/": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "_": { "item": "minecraft:smooth_stone_slab" diff --git a/src/main/generated/data/minecraft/recipe/arrow.json b/src/main/generated/data/minecraft/recipe/arrow.json index 94ac427382..5b160e1c5a 100644 --- a/src/main/generated/data/minecraft/recipe/arrow.json +++ b/src/main/generated/data/minecraft/recipe/arrow.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "item": "minecraft:flint" diff --git a/src/main/generated/data/minecraft/recipe/bamboo_chest_raft.json b/src/main/generated/data/minecraft/recipe/bamboo_chest_raft.json index 7622276dbe..f50400493b 100644 --- a/src/main/generated/data/minecraft/recipe/bamboo_chest_raft.json +++ b/src/main/generated/data/minecraft/recipe/bamboo_chest_raft.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:bamboo_raft" diff --git a/src/main/generated/data/minecraft/recipe/bamboo_fence.json b/src/main/generated/data/minecraft/recipe/bamboo_fence.json index 171403e8c5..190c83b690 100644 --- a/src/main/generated/data/minecraft/recipe/bamboo_fence.json +++ b/src/main/generated/data/minecraft/recipe/bamboo_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:bamboo_planks" diff --git a/src/main/generated/data/minecraft/recipe/bamboo_fence_gate.json b/src/main/generated/data/minecraft/recipe/bamboo_fence_gate.json index 8effebacef..1d2e0f107b 100644 --- a/src/main/generated/data/minecraft/recipe/bamboo_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/bamboo_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:bamboo_planks" diff --git a/src/main/generated/data/minecraft/recipe/bamboo_sign.json b/src/main/generated/data/minecraft/recipe/bamboo_sign.json index 886608f9d2..2ea528857f 100644 --- a/src/main/generated/data/minecraft/recipe/bamboo_sign.json +++ b/src/main/generated/data/minecraft/recipe/bamboo_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:bamboo_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/birch_chest_boat.json b/src/main/generated/data/minecraft/recipe/birch_chest_boat.json index 6dfbb297f9..6d5286ebbe 100644 --- a/src/main/generated/data/minecraft/recipe/birch_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/birch_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:birch_boat" diff --git a/src/main/generated/data/minecraft/recipe/birch_fence.json b/src/main/generated/data/minecraft/recipe/birch_fence.json index d8237d2cac..fef03a747d 100644 --- a/src/main/generated/data/minecraft/recipe/birch_fence.json +++ b/src/main/generated/data/minecraft/recipe/birch_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:birch_planks" diff --git a/src/main/generated/data/minecraft/recipe/birch_fence_gate.json b/src/main/generated/data/minecraft/recipe/birch_fence_gate.json index 1fb9a55a35..c0f380a750 100644 --- a/src/main/generated/data/minecraft/recipe/birch_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/birch_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:birch_planks" diff --git a/src/main/generated/data/minecraft/recipe/birch_sign.json b/src/main/generated/data/minecraft/recipe/birch_sign.json index 7ed02f64d4..c7a1c36a77 100644 --- a/src/main/generated/data/minecraft/recipe/birch_sign.json +++ b/src/main/generated/data/minecraft/recipe/birch_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:birch_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/black_banner.json b/src/main/generated/data/minecraft/recipe/black_banner.json index c985e981fa..26cb29a877 100644 --- a/src/main/generated/data/minecraft/recipe/black_banner.json +++ b/src/main/generated/data/minecraft/recipe/black_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:black_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/blast_furnace.json b/src/main/generated/data/minecraft/recipe/blast_furnace.json index f6e082c3b9..6b73dce306 100644 --- a/src/main/generated/data/minecraft/recipe/blast_furnace.json +++ b/src/main/generated/data/minecraft/recipe/blast_furnace.json @@ -6,7 +6,7 @@ "item": "minecraft:smooth_stone" }, "I": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "X": { "item": "minecraft:furnace" diff --git a/src/main/generated/data/minecraft/recipe/blue_banner.json b/src/main/generated/data/minecraft/recipe/blue_banner.json index e635e9e4b7..afb3cddb99 100644 --- a/src/main/generated/data/minecraft/recipe/blue_banner.json +++ b/src/main/generated/data/minecraft/recipe/blue_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:blue_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/bolt_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/bolt_armor_trim_smithing_template.json index 04da927228..c7dcf7ebff 100644 --- a/src/main/generated/data/minecraft/recipe/bolt_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/bolt_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": [ { diff --git a/src/main/generated/data/minecraft/recipe/bow.json b/src/main/generated/data/minecraft/recipe/bow.json index bec8213e14..b531f496f4 100644 --- a/src/main/generated/data/minecraft/recipe/bow.json +++ b/src/main/generated/data/minecraft/recipe/bow.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/brown_banner.json b/src/main/generated/data/minecraft/recipe/brown_banner.json index 62b1f8182a..b3b8c24a19 100644 --- a/src/main/generated/data/minecraft/recipe/brown_banner.json +++ b/src/main/generated/data/minecraft/recipe/brown_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:brown_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/brush.json b/src/main/generated/data/minecraft/recipe/brush.json index 58ad243e4c..ff366537c6 100644 --- a/src/main/generated/data/minecraft/recipe/brush.json +++ b/src/main/generated/data/minecraft/recipe/brush.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" }, "I": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "item": "minecraft:feather" diff --git a/src/main/generated/data/minecraft/recipe/bucket.json b/src/main/generated/data/minecraft/recipe/bucket.json index 24775d35ea..6da8ba3ded 100644 --- a/src/main/generated/data/minecraft/recipe/bucket.json +++ b/src/main/generated/data/minecraft/recipe/bucket.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/calibrated_sculk_sensor.json b/src/main/generated/data/minecraft/recipe/calibrated_sculk_sensor.json index 604e3775cb..5cb919ad6c 100644 --- a/src/main/generated/data/minecraft/recipe/calibrated_sculk_sensor.json +++ b/src/main/generated/data/minecraft/recipe/calibrated_sculk_sensor.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:gems/amethyst" + "tag": "c:gems/amethyst" }, "X": { "item": "minecraft:sculk_sensor" diff --git a/src/main/generated/data/minecraft/recipe/campfire.json b/src/main/generated/data/minecraft/recipe/campfire.json index 5926f49c1b..de8dffe49a 100644 --- a/src/main/generated/data/minecraft/recipe/campfire.json +++ b/src/main/generated/data/minecraft/recipe/campfire.json @@ -9,7 +9,7 @@ "tag": "minecraft:logs" }, "S": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/candle.json b/src/main/generated/data/minecraft/recipe/candle.json index 74497a1cbf..c19d2b0e7b 100644 --- a/src/main/generated/data/minecraft/recipe/candle.json +++ b/src/main/generated/data/minecraft/recipe/candle.json @@ -6,7 +6,7 @@ "item": "minecraft:honeycomb" }, "S": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/cauldron.json b/src/main/generated/data/minecraft/recipe/cauldron.json index ff9f04b469..9fbb8b5af2 100644 --- a/src/main/generated/data/minecraft/recipe/cauldron.json +++ b/src/main/generated/data/minecraft/recipe/cauldron.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/chain.json b/src/main/generated/data/minecraft/recipe/chain.json index 35f853027d..f30618f0ba 100644 --- a/src/main/generated/data/minecraft/recipe/chain.json +++ b/src/main/generated/data/minecraft/recipe/chain.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "I": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "N": { "item": "minecraft:iron_nugget" diff --git a/src/main/generated/data/minecraft/recipe/cherry_chest_boat.json b/src/main/generated/data/minecraft/recipe/cherry_chest_boat.json index 4a97b67070..ee739ec5a2 100644 --- a/src/main/generated/data/minecraft/recipe/cherry_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/cherry_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:cherry_boat" diff --git a/src/main/generated/data/minecraft/recipe/cherry_fence.json b/src/main/generated/data/minecraft/recipe/cherry_fence.json index 33785d0974..c199386881 100644 --- a/src/main/generated/data/minecraft/recipe/cherry_fence.json +++ b/src/main/generated/data/minecraft/recipe/cherry_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:cherry_planks" diff --git a/src/main/generated/data/minecraft/recipe/cherry_fence_gate.json b/src/main/generated/data/minecraft/recipe/cherry_fence_gate.json index 39f103640d..d3f7509557 100644 --- a/src/main/generated/data/minecraft/recipe/cherry_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/cherry_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:cherry_planks" diff --git a/src/main/generated/data/minecraft/recipe/cherry_sign.json b/src/main/generated/data/minecraft/recipe/cherry_sign.json index 80b8c6ee23..fbd15b6ef9 100644 --- a/src/main/generated/data/minecraft/recipe/cherry_sign.json +++ b/src/main/generated/data/minecraft/recipe/cherry_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:cherry_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/chest_minecart.json b/src/main/generated/data/minecraft/recipe/chest_minecart.json index c05cc49207..bbf4896a30 100644 --- a/src/main/generated/data/minecraft/recipe/chest_minecart.json +++ b/src/main/generated/data/minecraft/recipe/chest_minecart.json @@ -3,7 +3,7 @@ "category": "misc", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:minecart" diff --git a/src/main/generated/data/minecraft/recipe/clock.json b/src/main/generated/data/minecraft/recipe/clock.json index 72012b9797..276fe557ef 100644 --- a/src/main/generated/data/minecraft/recipe/clock.json +++ b/src/main/generated/data/minecraft/recipe/clock.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" }, "X": { "item": "minecraft:redstone" diff --git a/src/main/generated/data/minecraft/recipe/coast_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/coast_armor_trim_smithing_template.json index 181489696b..14f50222b4 100644 --- a/src/main/generated/data/minecraft/recipe/coast_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/coast_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "tag": "forge:cobblestone/normal" diff --git a/src/main/generated/data/minecraft/recipe/compass.json b/src/main/generated/data/minecraft/recipe/compass.json index 2b51feb2ac..3c7cbcb015 100644 --- a/src/main/generated/data/minecraft/recipe/compass.json +++ b/src/main/generated/data/minecraft/recipe/compass.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "X": { "item": "minecraft:redstone" diff --git a/src/main/generated/data/minecraft/recipe/copper_door.json b/src/main/generated/data/minecraft/recipe/copper_door.json index ec766c5ea8..b4010399b8 100644 --- a/src/main/generated/data/minecraft/recipe/copper_door.json +++ b/src/main/generated/data/minecraft/recipe/copper_door.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/copper_trapdoor.json b/src/main/generated/data/minecraft/recipe/copper_trapdoor.json index 86fb486e31..2e8d8efe09 100644 --- a/src/main/generated/data/minecraft/recipe/copper_trapdoor.json +++ b/src/main/generated/data/minecraft/recipe/copper_trapdoor.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/crafter.json b/src/main/generated/data/minecraft/recipe/crafter.json index 314d971c70..b01e9c2509 100644 --- a/src/main/generated/data/minecraft/recipe/crafter.json +++ b/src/main/generated/data/minecraft/recipe/crafter.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "C": { "item": "minecraft:crafting_table" diff --git a/src/main/generated/data/minecraft/recipe/crimson_fence.json b/src/main/generated/data/minecraft/recipe/crimson_fence.json index 0221149187..7b9e174282 100644 --- a/src/main/generated/data/minecraft/recipe/crimson_fence.json +++ b/src/main/generated/data/minecraft/recipe/crimson_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:crimson_planks" diff --git a/src/main/generated/data/minecraft/recipe/crimson_fence_gate.json b/src/main/generated/data/minecraft/recipe/crimson_fence_gate.json index d48c0cdb26..6953799156 100644 --- a/src/main/generated/data/minecraft/recipe/crimson_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/crimson_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:crimson_planks" diff --git a/src/main/generated/data/minecraft/recipe/crimson_sign.json b/src/main/generated/data/minecraft/recipe/crimson_sign.json index f3601e46fd..3bb6d2cd40 100644 --- a/src/main/generated/data/minecraft/recipe/crimson_sign.json +++ b/src/main/generated/data/minecraft/recipe/crimson_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:crimson_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/crossbow.json b/src/main/generated/data/minecraft/recipe/crossbow.json index 67c055e31b..87d3fb5baf 100644 --- a/src/main/generated/data/minecraft/recipe/crossbow.json +++ b/src/main/generated/data/minecraft/recipe/crossbow.json @@ -3,16 +3,16 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "$": { "item": "minecraft:tripwire_hook" }, "&": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "~": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/cyan_banner.json b/src/main/generated/data/minecraft/recipe/cyan_banner.json index 182eeb1b4f..7c029672c6 100644 --- a/src/main/generated/data/minecraft/recipe/cyan_banner.json +++ b/src/main/generated/data/minecraft/recipe/cyan_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:cyan_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/dark_oak_chest_boat.json b/src/main/generated/data/minecraft/recipe/dark_oak_chest_boat.json index 91e1cb56f0..aae00295f7 100644 --- a/src/main/generated/data/minecraft/recipe/dark_oak_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/dark_oak_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:dark_oak_boat" diff --git a/src/main/generated/data/minecraft/recipe/dark_oak_fence.json b/src/main/generated/data/minecraft/recipe/dark_oak_fence.json index 5dd6fe5251..ba37e3f888 100644 --- a/src/main/generated/data/minecraft/recipe/dark_oak_fence.json +++ b/src/main/generated/data/minecraft/recipe/dark_oak_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:dark_oak_planks" diff --git a/src/main/generated/data/minecraft/recipe/dark_oak_fence_gate.json b/src/main/generated/data/minecraft/recipe/dark_oak_fence_gate.json index 3176272821..b8365d4a28 100644 --- a/src/main/generated/data/minecraft/recipe/dark_oak_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/dark_oak_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:dark_oak_planks" diff --git a/src/main/generated/data/minecraft/recipe/dark_oak_sign.json b/src/main/generated/data/minecraft/recipe/dark_oak_sign.json index 5bf030e3cc..4d53a6d24f 100644 --- a/src/main/generated/data/minecraft/recipe/dark_oak_sign.json +++ b/src/main/generated/data/minecraft/recipe/dark_oak_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:dark_oak_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/detector_rail.json b/src/main/generated/data/minecraft/recipe/detector_rail.json index 404b89b4b2..97238ca6e4 100644 --- a/src/main/generated/data/minecraft/recipe/detector_rail.json +++ b/src/main/generated/data/minecraft/recipe/detector_rail.json @@ -9,7 +9,7 @@ "item": "minecraft:redstone" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_axe.json b/src/main/generated/data/minecraft/recipe/diamond_axe.json index fe7138e260..118f99e563 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_axe.json +++ b/src/main/generated/data/minecraft/recipe/diamond_axe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_boots.json b/src/main/generated/data/minecraft/recipe/diamond_boots.json index 666fd9f64e..7d6ace85e7 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_boots.json +++ b/src/main/generated/data/minecraft/recipe/diamond_boots.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_chestplate.json b/src/main/generated/data/minecraft/recipe/diamond_chestplate.json index c591e77abd..46ad865dff 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_chestplate.json +++ b/src/main/generated/data/minecraft/recipe/diamond_chestplate.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_helmet.json b/src/main/generated/data/minecraft/recipe/diamond_helmet.json index 5e1275ac7f..50a88a0967 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_helmet.json +++ b/src/main/generated/data/minecraft/recipe/diamond_helmet.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_hoe.json b/src/main/generated/data/minecraft/recipe/diamond_hoe.json index 221b7feef1..b2bf02dd07 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_hoe.json +++ b/src/main/generated/data/minecraft/recipe/diamond_hoe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_leggings.json b/src/main/generated/data/minecraft/recipe/diamond_leggings.json index 4d8aaf1b90..5df5635836 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_leggings.json +++ b/src/main/generated/data/minecraft/recipe/diamond_leggings.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_pickaxe.json b/src/main/generated/data/minecraft/recipe/diamond_pickaxe.json index 64d7a3aa1e..3397993a01 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_pickaxe.json +++ b/src/main/generated/data/minecraft/recipe/diamond_pickaxe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_shovel.json b/src/main/generated/data/minecraft/recipe/diamond_shovel.json index b900245b8d..ae4f9eb985 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_shovel.json +++ b/src/main/generated/data/minecraft/recipe/diamond_shovel.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/diamond_sword.json b/src/main/generated/data/minecraft/recipe/diamond_sword.json index 775f8970e9..338ca63240 100644 --- a/src/main/generated/data/minecraft/recipe/diamond_sword.json +++ b/src/main/generated/data/minecraft/recipe/diamond_sword.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/dune_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/dune_armor_trim_smithing_template.json index 6beacb0184..905e1f3f0d 100644 --- a/src/main/generated/data/minecraft/recipe/dune_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/dune_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:sandstone" diff --git a/src/main/generated/data/minecraft/recipe/enchanting_table.json b/src/main/generated/data/minecraft/recipe/enchanting_table.json index c61097cb80..0b202c954e 100644 --- a/src/main/generated/data/minecraft/recipe/enchanting_table.json +++ b/src/main/generated/data/minecraft/recipe/enchanting_table.json @@ -9,7 +9,7 @@ "item": "minecraft:book" }, "D": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/eye_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/eye_armor_trim_smithing_template.json index 6c50da8466..f4183152ba 100644 --- a/src/main/generated/data/minecraft/recipe/eye_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/eye_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:end_stone" diff --git a/src/main/generated/data/minecraft/recipe/fishing_rod.json b/src/main/generated/data/minecraft/recipe/fishing_rod.json index 2ad4deb283..72690672d3 100644 --- a/src/main/generated/data/minecraft/recipe/fishing_rod.json +++ b/src/main/generated/data/minecraft/recipe/fishing_rod.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/flint_and_steel.json b/src/main/generated/data/minecraft/recipe/flint_and_steel.json index 1f5287d743..c1ecbca55f 100644 --- a/src/main/generated/data/minecraft/recipe/flint_and_steel.json +++ b/src/main/generated/data/minecraft/recipe/flint_and_steel.json @@ -3,7 +3,7 @@ "category": "equipment", "ingredients": [ { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, { "item": "minecraft:flint" diff --git a/src/main/generated/data/minecraft/recipe/flow_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/flow_armor_trim_smithing_template.json index aa1889a873..3b8d02a56d 100644 --- a/src/main/generated/data/minecraft/recipe/flow_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/flow_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:breeze_rod" diff --git a/src/main/generated/data/minecraft/recipe/golden_apple.json b/src/main/generated/data/minecraft/recipe/golden_apple.json index fb31a6440d..6839d31d1e 100644 --- a/src/main/generated/data/minecraft/recipe/golden_apple.json +++ b/src/main/generated/data/minecraft/recipe/golden_apple.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" }, "X": { "item": "minecraft:apple" diff --git a/src/main/generated/data/minecraft/recipe/golden_axe.json b/src/main/generated/data/minecraft/recipe/golden_axe.json index a11290c050..ed95ebdd0a 100644 --- a/src/main/generated/data/minecraft/recipe/golden_axe.json +++ b/src/main/generated/data/minecraft/recipe/golden_axe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_boots.json b/src/main/generated/data/minecraft/recipe/golden_boots.json index 239bb244ce..0b9010aa3c 100644 --- a/src/main/generated/data/minecraft/recipe/golden_boots.json +++ b/src/main/generated/data/minecraft/recipe/golden_boots.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_chestplate.json b/src/main/generated/data/minecraft/recipe/golden_chestplate.json index 515f55100a..edd79c9908 100644 --- a/src/main/generated/data/minecraft/recipe/golden_chestplate.json +++ b/src/main/generated/data/minecraft/recipe/golden_chestplate.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_helmet.json b/src/main/generated/data/minecraft/recipe/golden_helmet.json index 15c8788a47..f275fa7514 100644 --- a/src/main/generated/data/minecraft/recipe/golden_helmet.json +++ b/src/main/generated/data/minecraft/recipe/golden_helmet.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_hoe.json b/src/main/generated/data/minecraft/recipe/golden_hoe.json index 1d8de6dbb2..6a305f1b18 100644 --- a/src/main/generated/data/minecraft/recipe/golden_hoe.json +++ b/src/main/generated/data/minecraft/recipe/golden_hoe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_leggings.json b/src/main/generated/data/minecraft/recipe/golden_leggings.json index 64d4400810..54c8ae061e 100644 --- a/src/main/generated/data/minecraft/recipe/golden_leggings.json +++ b/src/main/generated/data/minecraft/recipe/golden_leggings.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_pickaxe.json b/src/main/generated/data/minecraft/recipe/golden_pickaxe.json index 073fca2609..be94e94d06 100644 --- a/src/main/generated/data/minecraft/recipe/golden_pickaxe.json +++ b/src/main/generated/data/minecraft/recipe/golden_pickaxe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_shovel.json b/src/main/generated/data/minecraft/recipe/golden_shovel.json index 207db046c2..b71a44cb47 100644 --- a/src/main/generated/data/minecraft/recipe/golden_shovel.json +++ b/src/main/generated/data/minecraft/recipe/golden_shovel.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/golden_sword.json b/src/main/generated/data/minecraft/recipe/golden_sword.json index bf3cb69d90..fdfc713b40 100644 --- a/src/main/generated/data/minecraft/recipe/golden_sword.json +++ b/src/main/generated/data/minecraft/recipe/golden_sword.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/gray_banner.json b/src/main/generated/data/minecraft/recipe/gray_banner.json index e31c6e3953..9a36e40aed 100644 --- a/src/main/generated/data/minecraft/recipe/gray_banner.json +++ b/src/main/generated/data/minecraft/recipe/gray_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:gray_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/green_banner.json b/src/main/generated/data/minecraft/recipe/green_banner.json index 9d60eec45d..3960ffd83b 100644 --- a/src/main/generated/data/minecraft/recipe/green_banner.json +++ b/src/main/generated/data/minecraft/recipe/green_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:green_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/grindstone.json b/src/main/generated/data/minecraft/recipe/grindstone.json index 447414e0db..234b5a8e4f 100644 --- a/src/main/generated/data/minecraft/recipe/grindstone.json +++ b/src/main/generated/data/minecraft/recipe/grindstone.json @@ -9,7 +9,7 @@ "item": "minecraft:stone_slab" }, "I": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/heavy_weighted_pressure_plate.json b/src/main/generated/data/minecraft/recipe/heavy_weighted_pressure_plate.json index 655f73eea7..ac9cd700dc 100644 --- a/src/main/generated/data/minecraft/recipe/heavy_weighted_pressure_plate.json +++ b/src/main/generated/data/minecraft/recipe/heavy_weighted_pressure_plate.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/hopper.json b/src/main/generated/data/minecraft/recipe/hopper.json index 927b1a67e7..09424bfd07 100644 --- a/src/main/generated/data/minecraft/recipe/hopper.json +++ b/src/main/generated/data/minecraft/recipe/hopper.json @@ -3,10 +3,10 @@ "category": "redstone", "key": { "C": { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, "I": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/host_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/host_armor_trim_smithing_template.json index 04403fefd1..f84de52ad6 100644 --- a/src/main/generated/data/minecraft/recipe/host_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/host_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:terracotta" diff --git a/src/main/generated/data/minecraft/recipe/iron_axe.json b/src/main/generated/data/minecraft/recipe/iron_axe.json index 201f97fa81..950fa6ac7a 100644 --- a/src/main/generated/data/minecraft/recipe/iron_axe.json +++ b/src/main/generated/data/minecraft/recipe/iron_axe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_bars.json b/src/main/generated/data/minecraft/recipe/iron_bars.json index fcff6a22c6..28be431fc6 100644 --- a/src/main/generated/data/minecraft/recipe/iron_bars.json +++ b/src/main/generated/data/minecraft/recipe/iron_bars.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_boots.json b/src/main/generated/data/minecraft/recipe/iron_boots.json index 41355032dd..f489f382e6 100644 --- a/src/main/generated/data/minecraft/recipe/iron_boots.json +++ b/src/main/generated/data/minecraft/recipe/iron_boots.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_chestplate.json b/src/main/generated/data/minecraft/recipe/iron_chestplate.json index 3356b627ca..67f70bc19c 100644 --- a/src/main/generated/data/minecraft/recipe/iron_chestplate.json +++ b/src/main/generated/data/minecraft/recipe/iron_chestplate.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_door.json b/src/main/generated/data/minecraft/recipe/iron_door.json index 889e015b2c..be3bbbf4da 100644 --- a/src/main/generated/data/minecraft/recipe/iron_door.json +++ b/src/main/generated/data/minecraft/recipe/iron_door.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_helmet.json b/src/main/generated/data/minecraft/recipe/iron_helmet.json index 843d002ee0..4b7326c79f 100644 --- a/src/main/generated/data/minecraft/recipe/iron_helmet.json +++ b/src/main/generated/data/minecraft/recipe/iron_helmet.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_hoe.json b/src/main/generated/data/minecraft/recipe/iron_hoe.json index 770f5d335f..e175c35d0c 100644 --- a/src/main/generated/data/minecraft/recipe/iron_hoe.json +++ b/src/main/generated/data/minecraft/recipe/iron_hoe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_leggings.json b/src/main/generated/data/minecraft/recipe/iron_leggings.json index ef619451a2..db1ad0850c 100644 --- a/src/main/generated/data/minecraft/recipe/iron_leggings.json +++ b/src/main/generated/data/minecraft/recipe/iron_leggings.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_pickaxe.json b/src/main/generated/data/minecraft/recipe/iron_pickaxe.json index 69e5633c9b..f829c9df56 100644 --- a/src/main/generated/data/minecraft/recipe/iron_pickaxe.json +++ b/src/main/generated/data/minecraft/recipe/iron_pickaxe.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_shovel.json b/src/main/generated/data/minecraft/recipe/iron_shovel.json index 4a2fa9c256..5a11203af5 100644 --- a/src/main/generated/data/minecraft/recipe/iron_shovel.json +++ b/src/main/generated/data/minecraft/recipe/iron_shovel.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_sword.json b/src/main/generated/data/minecraft/recipe/iron_sword.json index 4ad561140d..6f4c0a46cd 100644 --- a/src/main/generated/data/minecraft/recipe/iron_sword.json +++ b/src/main/generated/data/minecraft/recipe/iron_sword.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/iron_trapdoor.json b/src/main/generated/data/minecraft/recipe/iron_trapdoor.json index 444aee2d6a..45d3357442 100644 --- a/src/main/generated/data/minecraft/recipe/iron_trapdoor.json +++ b/src/main/generated/data/minecraft/recipe/iron_trapdoor.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/item_frame.json b/src/main/generated/data/minecraft/recipe/item_frame.json index c0daade8a4..f73e86feb5 100644 --- a/src/main/generated/data/minecraft/recipe/item_frame.json +++ b/src/main/generated/data/minecraft/recipe/item_frame.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "item": "minecraft:leather" diff --git a/src/main/generated/data/minecraft/recipe/jukebox.json b/src/main/generated/data/minecraft/recipe/jukebox.json index ae7df738d3..08f3d3b4d3 100644 --- a/src/main/generated/data/minecraft/recipe/jukebox.json +++ b/src/main/generated/data/minecraft/recipe/jukebox.json @@ -6,7 +6,7 @@ "tag": "minecraft:planks" }, "X": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/jungle_chest_boat.json b/src/main/generated/data/minecraft/recipe/jungle_chest_boat.json index 4a783b554d..43b367f49d 100644 --- a/src/main/generated/data/minecraft/recipe/jungle_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/jungle_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:jungle_boat" diff --git a/src/main/generated/data/minecraft/recipe/jungle_fence.json b/src/main/generated/data/minecraft/recipe/jungle_fence.json index 2de11023a4..b49a38c19a 100644 --- a/src/main/generated/data/minecraft/recipe/jungle_fence.json +++ b/src/main/generated/data/minecraft/recipe/jungle_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:jungle_planks" diff --git a/src/main/generated/data/minecraft/recipe/jungle_fence_gate.json b/src/main/generated/data/minecraft/recipe/jungle_fence_gate.json index fbfd10f333..a1dcfbde01 100644 --- a/src/main/generated/data/minecraft/recipe/jungle_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/jungle_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:jungle_planks" diff --git a/src/main/generated/data/minecraft/recipe/jungle_sign.json b/src/main/generated/data/minecraft/recipe/jungle_sign.json index 824fd4cfac..713c47d1fa 100644 --- a/src/main/generated/data/minecraft/recipe/jungle_sign.json +++ b/src/main/generated/data/minecraft/recipe/jungle_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:jungle_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/ladder.json b/src/main/generated/data/minecraft/recipe/ladder.json index db2a2e4a4d..8d64f336a8 100644 --- a/src/main/generated/data/minecraft/recipe/ladder.json +++ b/src/main/generated/data/minecraft/recipe/ladder.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/lead.json b/src/main/generated/data/minecraft/recipe/lead.json index eac3ce67ab..57ca6d0bbc 100644 --- a/src/main/generated/data/minecraft/recipe/lead.json +++ b/src/main/generated/data/minecraft/recipe/lead.json @@ -6,7 +6,7 @@ "item": "minecraft:slime_ball" }, "~": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/lever.json b/src/main/generated/data/minecraft/recipe/lever.json index 163ffc6659..1c3db9035f 100644 --- a/src/main/generated/data/minecraft/recipe/lever.json +++ b/src/main/generated/data/minecraft/recipe/lever.json @@ -6,7 +6,7 @@ "tag": "forge:cobblestone/normal" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/light_blue_banner.json b/src/main/generated/data/minecraft/recipe/light_blue_banner.json index 867c279872..1fb0a66d80 100644 --- a/src/main/generated/data/minecraft/recipe/light_blue_banner.json +++ b/src/main/generated/data/minecraft/recipe/light_blue_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:light_blue_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/light_gray_banner.json b/src/main/generated/data/minecraft/recipe/light_gray_banner.json index 23e5a8d215..35d93c6693 100644 --- a/src/main/generated/data/minecraft/recipe/light_gray_banner.json +++ b/src/main/generated/data/minecraft/recipe/light_gray_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:light_gray_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/light_weighted_pressure_plate.json b/src/main/generated/data/minecraft/recipe/light_weighted_pressure_plate.json index 2f4d1f2f2a..0d6eec2360 100644 --- a/src/main/generated/data/minecraft/recipe/light_weighted_pressure_plate.json +++ b/src/main/generated/data/minecraft/recipe/light_weighted_pressure_plate.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/lightning_rod.json b/src/main/generated/data/minecraft/recipe/lightning_rod.json index 088f10d61e..5a2186f659 100644 --- a/src/main/generated/data/minecraft/recipe/lightning_rod.json +++ b/src/main/generated/data/minecraft/recipe/lightning_rod.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/lime_banner.json b/src/main/generated/data/minecraft/recipe/lime_banner.json index 59396857ad..c076add05b 100644 --- a/src/main/generated/data/minecraft/recipe/lime_banner.json +++ b/src/main/generated/data/minecraft/recipe/lime_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:lime_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/lodestone.json b/src/main/generated/data/minecraft/recipe/lodestone.json index 269a87350b..5d1bc8a33a 100644 --- a/src/main/generated/data/minecraft/recipe/lodestone.json +++ b/src/main/generated/data/minecraft/recipe/lodestone.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/netherite" + "tag": "c:ingots/netherite" }, "S": { "item": "minecraft:chiseled_stone_bricks" diff --git a/src/main/generated/data/minecraft/recipe/loom.json b/src/main/generated/data/minecraft/recipe/loom.json index 1ac1072eb5..7fbb48dfe9 100644 --- a/src/main/generated/data/minecraft/recipe/loom.json +++ b/src/main/generated/data/minecraft/recipe/loom.json @@ -6,7 +6,7 @@ "tag": "minecraft:planks" }, "@": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/magenta_banner.json b/src/main/generated/data/minecraft/recipe/magenta_banner.json index 549b5fbad5..5996580e8d 100644 --- a/src/main/generated/data/minecraft/recipe/magenta_banner.json +++ b/src/main/generated/data/minecraft/recipe/magenta_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:magenta_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/mangrove_chest_boat.json b/src/main/generated/data/minecraft/recipe/mangrove_chest_boat.json index 7c8a0afb6a..233473f202 100644 --- a/src/main/generated/data/minecraft/recipe/mangrove_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/mangrove_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:mangrove_boat" diff --git a/src/main/generated/data/minecraft/recipe/mangrove_fence.json b/src/main/generated/data/minecraft/recipe/mangrove_fence.json index 1bdd4efc0d..01d6d24181 100644 --- a/src/main/generated/data/minecraft/recipe/mangrove_fence.json +++ b/src/main/generated/data/minecraft/recipe/mangrove_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:mangrove_planks" diff --git a/src/main/generated/data/minecraft/recipe/mangrove_fence_gate.json b/src/main/generated/data/minecraft/recipe/mangrove_fence_gate.json index de9a8d6bb0..3a0927be5e 100644 --- a/src/main/generated/data/minecraft/recipe/mangrove_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/mangrove_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:mangrove_planks" diff --git a/src/main/generated/data/minecraft/recipe/mangrove_sign.json b/src/main/generated/data/minecraft/recipe/mangrove_sign.json index b557bc8582..a55530fcd8 100644 --- a/src/main/generated/data/minecraft/recipe/mangrove_sign.json +++ b/src/main/generated/data/minecraft/recipe/mangrove_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:mangrove_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/minecart.json b/src/main/generated/data/minecraft/recipe/minecart.json index 55244ac2de..15fdd90d0e 100644 --- a/src/main/generated/data/minecraft/recipe/minecart.json +++ b/src/main/generated/data/minecraft/recipe/minecart.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/netherite_ingot.json b/src/main/generated/data/minecraft/recipe/netherite_ingot.json index 391bb43369..ffa224998e 100644 --- a/src/main/generated/data/minecraft/recipe/netherite_ingot.json +++ b/src/main/generated/data/minecraft/recipe/netherite_ingot.json @@ -16,16 +16,16 @@ "item": "minecraft:netherite_scrap" }, { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" }, { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" }, { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" }, { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } ], "result": { diff --git a/src/main/generated/data/minecraft/recipe/netherite_upgrade_smithing_template.json b/src/main/generated/data/minecraft/recipe/netherite_upgrade_smithing_template.json index 461c35d725..44fc480189 100644 --- a/src/main/generated/data/minecraft/recipe/netherite_upgrade_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/netherite_upgrade_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:netherrack" diff --git a/src/main/generated/data/minecraft/recipe/oak_chest_boat.json b/src/main/generated/data/minecraft/recipe/oak_chest_boat.json index 04762bc990..9c1869540b 100644 --- a/src/main/generated/data/minecraft/recipe/oak_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/oak_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:oak_boat" diff --git a/src/main/generated/data/minecraft/recipe/oak_fence.json b/src/main/generated/data/minecraft/recipe/oak_fence.json index 5e868f7af0..3227fa2bc7 100644 --- a/src/main/generated/data/minecraft/recipe/oak_fence.json +++ b/src/main/generated/data/minecraft/recipe/oak_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:oak_planks" diff --git a/src/main/generated/data/minecraft/recipe/oak_fence_gate.json b/src/main/generated/data/minecraft/recipe/oak_fence_gate.json index 5d2f53fbf9..45923171d8 100644 --- a/src/main/generated/data/minecraft/recipe/oak_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/oak_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:oak_planks" diff --git a/src/main/generated/data/minecraft/recipe/oak_sign.json b/src/main/generated/data/minecraft/recipe/oak_sign.json index a9387bdcfc..618d6d414a 100644 --- a/src/main/generated/data/minecraft/recipe/oak_sign.json +++ b/src/main/generated/data/minecraft/recipe/oak_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:oak_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/orange_banner.json b/src/main/generated/data/minecraft/recipe/orange_banner.json index 303b3d81ae..f2f3b03d6c 100644 --- a/src/main/generated/data/minecraft/recipe/orange_banner.json +++ b/src/main/generated/data/minecraft/recipe/orange_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:orange_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/painting.json b/src/main/generated/data/minecraft/recipe/painting.json index 3cc7157613..df1b6d324d 100644 --- a/src/main/generated/data/minecraft/recipe/painting.json +++ b/src/main/generated/data/minecraft/recipe/painting.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:wool" diff --git a/src/main/generated/data/minecraft/recipe/pink_banner.json b/src/main/generated/data/minecraft/recipe/pink_banner.json index 1848ebbf0a..951e77cedd 100644 --- a/src/main/generated/data/minecraft/recipe/pink_banner.json +++ b/src/main/generated/data/minecraft/recipe/pink_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:pink_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/piston.json b/src/main/generated/data/minecraft/recipe/piston.json index 90eed7fc1e..52bd6b7e15 100644 --- a/src/main/generated/data/minecraft/recipe/piston.json +++ b/src/main/generated/data/minecraft/recipe/piston.json @@ -12,7 +12,7 @@ "tag": "minecraft:planks" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/powered_rail.json b/src/main/generated/data/minecraft/recipe/powered_rail.json index 6573defe19..97f3e17964 100644 --- a/src/main/generated/data/minecraft/recipe/powered_rail.json +++ b/src/main/generated/data/minecraft/recipe/powered_rail.json @@ -3,13 +3,13 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "R": { "item": "minecraft:redstone" }, "X": { - "tag": "forge:ingots/gold" + "tag": "c:ingots/gold" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/purple_banner.json b/src/main/generated/data/minecraft/recipe/purple_banner.json index b8be8bf84a..5475bffc70 100644 --- a/src/main/generated/data/minecraft/recipe/purple_banner.json +++ b/src/main/generated/data/minecraft/recipe/purple_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:purple_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/rail.json b/src/main/generated/data/minecraft/recipe/rail.json index 927d917f76..481af10ee3 100644 --- a/src/main/generated/data/minecraft/recipe/rail.json +++ b/src/main/generated/data/minecraft/recipe/rail.json @@ -3,10 +3,10 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/raiser_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/raiser_armor_trim_smithing_template.json index d07fc6bd24..97a148d159 100644 --- a/src/main/generated/data/minecraft/recipe/raiser_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/raiser_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:terracotta" diff --git a/src/main/generated/data/minecraft/recipe/red_banner.json b/src/main/generated/data/minecraft/recipe/red_banner.json index 3fcd38c067..89b92a5470 100644 --- a/src/main/generated/data/minecraft/recipe/red_banner.json +++ b/src/main/generated/data/minecraft/recipe/red_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:red_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/redstone_torch.json b/src/main/generated/data/minecraft/recipe/redstone_torch.json index 06ce327652..378c0d7b88 100644 --- a/src/main/generated/data/minecraft/recipe/redstone_torch.json +++ b/src/main/generated/data/minecraft/recipe/redstone_torch.json @@ -3,7 +3,7 @@ "category": "redstone", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "item": "minecraft:redstone" diff --git a/src/main/generated/data/minecraft/recipe/rib_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/rib_armor_trim_smithing_template.json index 969475ef06..6ec72db0dd 100644 --- a/src/main/generated/data/minecraft/recipe/rib_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/rib_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:netherrack" diff --git a/src/main/generated/data/minecraft/recipe/scaffolding.json b/src/main/generated/data/minecraft/recipe/scaffolding.json index 6cbb8217cc..c0290aba8c 100644 --- a/src/main/generated/data/minecraft/recipe/scaffolding.json +++ b/src/main/generated/data/minecraft/recipe/scaffolding.json @@ -6,7 +6,7 @@ "item": "minecraft:bamboo" }, "~": { - "tag": "forge:string" + "tag": "c:strings" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/sentry_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/sentry_armor_trim_smithing_template.json index 7f61e4a2f8..a10dc55eba 100644 --- a/src/main/generated/data/minecraft/recipe/sentry_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/sentry_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "tag": "forge:cobblestone/normal" diff --git a/src/main/generated/data/minecraft/recipe/shaper_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/shaper_armor_trim_smithing_template.json index d0449b9df7..980b1d2108 100644 --- a/src/main/generated/data/minecraft/recipe/shaper_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/shaper_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:terracotta" diff --git a/src/main/generated/data/minecraft/recipe/shears.json b/src/main/generated/data/minecraft/recipe/shears.json index 50ac77b03b..cc526718eb 100644 --- a/src/main/generated/data/minecraft/recipe/shears.json +++ b/src/main/generated/data/minecraft/recipe/shears.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/shield.json b/src/main/generated/data/minecraft/recipe/shield.json index 4385c42213..46aa8fbe7d 100644 --- a/src/main/generated/data/minecraft/recipe/shield.json +++ b/src/main/generated/data/minecraft/recipe/shield.json @@ -6,7 +6,7 @@ "tag": "minecraft:planks" }, "o": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/shulker_box.json b/src/main/generated/data/minecraft/recipe/shulker_box.json index 18421b43c0..cfa4fed9ea 100644 --- a/src/main/generated/data/minecraft/recipe/shulker_box.json +++ b/src/main/generated/data/minecraft/recipe/shulker_box.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, "-": { "item": "minecraft:shulker_shell" diff --git a/src/main/generated/data/minecraft/recipe/silence_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/silence_armor_trim_smithing_template.json index 204b2bdcf3..d13cf955b0 100644 --- a/src/main/generated/data/minecraft/recipe/silence_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/silence_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "tag": "forge:cobblestone/deepslate" diff --git a/src/main/generated/data/minecraft/recipe/smithing_table.json b/src/main/generated/data/minecraft/recipe/smithing_table.json index 2f24008f09..e7dadd831c 100644 --- a/src/main/generated/data/minecraft/recipe/smithing_table.json +++ b/src/main/generated/data/minecraft/recipe/smithing_table.json @@ -6,7 +6,7 @@ "tag": "minecraft:planks" }, "@": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/snout_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/snout_armor_trim_smithing_template.json index 96ab3b1e0d..8aa0dd55c1 100644 --- a/src/main/generated/data/minecraft/recipe/snout_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/snout_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:blackstone" diff --git a/src/main/generated/data/minecraft/recipe/soul_campfire.json b/src/main/generated/data/minecraft/recipe/soul_campfire.json index 54c6c84b24..e7459aa07d 100644 --- a/src/main/generated/data/minecraft/recipe/soul_campfire.json +++ b/src/main/generated/data/minecraft/recipe/soul_campfire.json @@ -9,7 +9,7 @@ "tag": "minecraft:logs" }, "S": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/soul_torch.json b/src/main/generated/data/minecraft/recipe/soul_torch.json index 06598e3d8a..fc57b7b0d3 100644 --- a/src/main/generated/data/minecraft/recipe/soul_torch.json +++ b/src/main/generated/data/minecraft/recipe/soul_torch.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "S": { "tag": "minecraft:soul_fire_base_blocks" diff --git a/src/main/generated/data/minecraft/recipe/spire_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/spire_armor_trim_smithing_template.json index ead22db42f..4cd59d3d03 100644 --- a/src/main/generated/data/minecraft/recipe/spire_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/spire_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:purpur_block" diff --git a/src/main/generated/data/minecraft/recipe/spruce_chest_boat.json b/src/main/generated/data/minecraft/recipe/spruce_chest_boat.json index 7de6923cc9..f89eeea73e 100644 --- a/src/main/generated/data/minecraft/recipe/spruce_chest_boat.json +++ b/src/main/generated/data/minecraft/recipe/spruce_chest_boat.json @@ -4,7 +4,7 @@ "group": "chest_boat", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:spruce_boat" diff --git a/src/main/generated/data/minecraft/recipe/spruce_fence.json b/src/main/generated/data/minecraft/recipe/spruce_fence.json index 07b68fd0ae..d8790bce04 100644 --- a/src/main/generated/data/minecraft/recipe/spruce_fence.json +++ b/src/main/generated/data/minecraft/recipe/spruce_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:spruce_planks" diff --git a/src/main/generated/data/minecraft/recipe/spruce_fence_gate.json b/src/main/generated/data/minecraft/recipe/spruce_fence_gate.json index d7a967a6cc..61815e9606 100644 --- a/src/main/generated/data/minecraft/recipe/spruce_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/spruce_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:spruce_planks" diff --git a/src/main/generated/data/minecraft/recipe/spruce_sign.json b/src/main/generated/data/minecraft/recipe/spruce_sign.json index de06f65de8..03fb28133e 100644 --- a/src/main/generated/data/minecraft/recipe/spruce_sign.json +++ b/src/main/generated/data/minecraft/recipe/spruce_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:spruce_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/spyglass.json b/src/main/generated/data/minecraft/recipe/spyglass.json index 0dbfd0500b..ea680e3fb9 100644 --- a/src/main/generated/data/minecraft/recipe/spyglass.json +++ b/src/main/generated/data/minecraft/recipe/spyglass.json @@ -3,10 +3,10 @@ "category": "equipment", "key": { "#": { - "tag": "forge:gems/amethyst" + "tag": "c:gems/amethyst" }, "X": { - "tag": "forge:ingots/copper" + "tag": "c:ingots/copper" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/stone_axe.json b/src/main/generated/data/minecraft/recipe/stone_axe.json index 82d3b87b80..0bac2f1180 100644 --- a/src/main/generated/data/minecraft/recipe/stone_axe.json +++ b/src/main/generated/data/minecraft/recipe/stone_axe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:stone_tool_materials" diff --git a/src/main/generated/data/minecraft/recipe/stone_hoe.json b/src/main/generated/data/minecraft/recipe/stone_hoe.json index 134fb97266..8c5b5eceee 100644 --- a/src/main/generated/data/minecraft/recipe/stone_hoe.json +++ b/src/main/generated/data/minecraft/recipe/stone_hoe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:stone_tool_materials" diff --git a/src/main/generated/data/minecraft/recipe/stone_pickaxe.json b/src/main/generated/data/minecraft/recipe/stone_pickaxe.json index fb79525bcd..b366ac2065 100644 --- a/src/main/generated/data/minecraft/recipe/stone_pickaxe.json +++ b/src/main/generated/data/minecraft/recipe/stone_pickaxe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:stone_tool_materials" diff --git a/src/main/generated/data/minecraft/recipe/stone_shovel.json b/src/main/generated/data/minecraft/recipe/stone_shovel.json index 4880055697..d1fbdebd22 100644 --- a/src/main/generated/data/minecraft/recipe/stone_shovel.json +++ b/src/main/generated/data/minecraft/recipe/stone_shovel.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:stone_tool_materials" diff --git a/src/main/generated/data/minecraft/recipe/stone_sword.json b/src/main/generated/data/minecraft/recipe/stone_sword.json index 109c0729b6..559caac73d 100644 --- a/src/main/generated/data/minecraft/recipe/stone_sword.json +++ b/src/main/generated/data/minecraft/recipe/stone_sword.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:stone_tool_materials" diff --git a/src/main/generated/data/minecraft/recipe/stonecutter.json b/src/main/generated/data/minecraft/recipe/stonecutter.json index 60d93a46bd..e0820aeedb 100644 --- a/src/main/generated/data/minecraft/recipe/stonecutter.json +++ b/src/main/generated/data/minecraft/recipe/stonecutter.json @@ -6,7 +6,7 @@ "item": "minecraft:stone" }, "I": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/tide_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/tide_armor_trim_smithing_template.json index 3bdc887b6c..8292dd0993 100644 --- a/src/main/generated/data/minecraft/recipe/tide_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/tide_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:prismarine" diff --git a/src/main/generated/data/minecraft/recipe/tinted_glass.json b/src/main/generated/data/minecraft/recipe/tinted_glass.json index 46b280d96d..99d27ab3d3 100644 --- a/src/main/generated/data/minecraft/recipe/tinted_glass.json +++ b/src/main/generated/data/minecraft/recipe/tinted_glass.json @@ -6,7 +6,7 @@ "item": "minecraft:glass" }, "S": { - "tag": "forge:gems/amethyst" + "tag": "c:gems/amethyst" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/torch.json b/src/main/generated/data/minecraft/recipe/torch.json index 0167972ab3..031078faf0 100644 --- a/src/main/generated/data/minecraft/recipe/torch.json +++ b/src/main/generated/data/minecraft/recipe/torch.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": [ { diff --git a/src/main/generated/data/minecraft/recipe/trapped_chest.json b/src/main/generated/data/minecraft/recipe/trapped_chest.json index 2f61a7f613..1cf84155e9 100644 --- a/src/main/generated/data/minecraft/recipe/trapped_chest.json +++ b/src/main/generated/data/minecraft/recipe/trapped_chest.json @@ -3,7 +3,7 @@ "category": "redstone", "ingredients": [ { - "tag": "forge:chests/wooden" + "tag": "c:chests/wooden" }, { "item": "minecraft:tripwire_hook" diff --git a/src/main/generated/data/minecraft/recipe/tripwire_hook.json b/src/main/generated/data/minecraft/recipe/tripwire_hook.json index f4a08d358c..b966ce7a63 100644 --- a/src/main/generated/data/minecraft/recipe/tripwire_hook.json +++ b/src/main/generated/data/minecraft/recipe/tripwire_hook.json @@ -6,10 +6,10 @@ "tag": "minecraft:planks" }, "I": { - "tag": "forge:ingots/iron" + "tag": "c:ingots/iron" }, "S": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/vex_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/vex_armor_trim_smithing_template.json index edb9f53ba8..36b13fba54 100644 --- a/src/main/generated/data/minecraft/recipe/vex_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/vex_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "tag": "forge:cobblestone/normal" diff --git a/src/main/generated/data/minecraft/recipe/ward_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/ward_armor_trim_smithing_template.json index e2b473d3b1..008583f234 100644 --- a/src/main/generated/data/minecraft/recipe/ward_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/ward_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "tag": "forge:cobblestone/deepslate" diff --git a/src/main/generated/data/minecraft/recipe/warped_fence.json b/src/main/generated/data/minecraft/recipe/warped_fence.json index 32cfd1457f..715d558dd6 100644 --- a/src/main/generated/data/minecraft/recipe/warped_fence.json +++ b/src/main/generated/data/minecraft/recipe/warped_fence.json @@ -4,7 +4,7 @@ "group": "wooden_fence", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:warped_planks" diff --git a/src/main/generated/data/minecraft/recipe/warped_fence_gate.json b/src/main/generated/data/minecraft/recipe/warped_fence_gate.json index b2ac7eed9c..15dcad57d5 100644 --- a/src/main/generated/data/minecraft/recipe/warped_fence_gate.json +++ b/src/main/generated/data/minecraft/recipe/warped_fence_gate.json @@ -4,7 +4,7 @@ "group": "wooden_fence_gate", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "W": { "item": "minecraft:warped_planks" diff --git a/src/main/generated/data/minecraft/recipe/warped_sign.json b/src/main/generated/data/minecraft/recipe/warped_sign.json index 08315ccfc2..b0f4112a6d 100644 --- a/src/main/generated/data/minecraft/recipe/warped_sign.json +++ b/src/main/generated/data/minecraft/recipe/warped_sign.json @@ -7,7 +7,7 @@ "item": "minecraft:warped_planks" }, "X": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/wayfinder_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/wayfinder_armor_trim_smithing_template.json index 64d2fa3dd2..563776c2c5 100644 --- a/src/main/generated/data/minecraft/recipe/wayfinder_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/wayfinder_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:terracotta" diff --git a/src/main/generated/data/minecraft/recipe/white_banner.json b/src/main/generated/data/minecraft/recipe/white_banner.json index e6401a48ab..418906d5b9 100644 --- a/src/main/generated/data/minecraft/recipe/white_banner.json +++ b/src/main/generated/data/minecraft/recipe/white_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:white_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/generated/data/minecraft/recipe/wild_armor_trim_smithing_template.json b/src/main/generated/data/minecraft/recipe/wild_armor_trim_smithing_template.json index e0355182ae..8eec0dc5e9 100644 --- a/src/main/generated/data/minecraft/recipe/wild_armor_trim_smithing_template.json +++ b/src/main/generated/data/minecraft/recipe/wild_armor_trim_smithing_template.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "tag": "forge:gems/diamond" + "tag": "c:gems/diamond" }, "C": { "item": "minecraft:mossy_cobblestone" diff --git a/src/main/generated/data/minecraft/recipe/wooden_axe.json b/src/main/generated/data/minecraft/recipe/wooden_axe.json index c637ef036d..25cc73c46f 100644 --- a/src/main/generated/data/minecraft/recipe/wooden_axe.json +++ b/src/main/generated/data/minecraft/recipe/wooden_axe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:planks" diff --git a/src/main/generated/data/minecraft/recipe/wooden_hoe.json b/src/main/generated/data/minecraft/recipe/wooden_hoe.json index 41539fc6a1..a068c7fdc5 100644 --- a/src/main/generated/data/minecraft/recipe/wooden_hoe.json +++ b/src/main/generated/data/minecraft/recipe/wooden_hoe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:planks" diff --git a/src/main/generated/data/minecraft/recipe/wooden_pickaxe.json b/src/main/generated/data/minecraft/recipe/wooden_pickaxe.json index 027909c9ad..b09f9389ab 100644 --- a/src/main/generated/data/minecraft/recipe/wooden_pickaxe.json +++ b/src/main/generated/data/minecraft/recipe/wooden_pickaxe.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:planks" diff --git a/src/main/generated/data/minecraft/recipe/wooden_shovel.json b/src/main/generated/data/minecraft/recipe/wooden_shovel.json index f77ac8803f..dd2aa5e363 100644 --- a/src/main/generated/data/minecraft/recipe/wooden_shovel.json +++ b/src/main/generated/data/minecraft/recipe/wooden_shovel.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:planks" diff --git a/src/main/generated/data/minecraft/recipe/wooden_sword.json b/src/main/generated/data/minecraft/recipe/wooden_sword.json index 9eca62b965..8906ea876f 100644 --- a/src/main/generated/data/minecraft/recipe/wooden_sword.json +++ b/src/main/generated/data/minecraft/recipe/wooden_sword.json @@ -3,7 +3,7 @@ "category": "equipment", "key": { "#": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" }, "X": { "tag": "minecraft:planks" diff --git a/src/main/generated/data/minecraft/recipe/yellow_banner.json b/src/main/generated/data/minecraft/recipe/yellow_banner.json index 1a431e5792..5c1c07e88b 100644 --- a/src/main/generated/data/minecraft/recipe/yellow_banner.json +++ b/src/main/generated/data/minecraft/recipe/yellow_banner.json @@ -7,7 +7,7 @@ "item": "minecraft:yellow_wool" }, "|": { - "tag": "forge:rods/wooden" + "tag": "c:rods/wooden" } }, "pattern": [ diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java index 0661cb0fe2..3eb5c4d6ce 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java @@ -14,6 +14,7 @@ import net.minecraft.tags.BiomeTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biomes; +import net.minecraftforge.common.Tags; import org.jetbrains.annotations.ApiStatus; import java.util.concurrent.CompletableFuture; @@ -33,9 +34,9 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { tag(IS_VOID).add(Biomes.THE_VOID); - tag(IS_END).addTags(BiomeTags.IS_END); - tag(IS_NETHER).addTags(BiomeTags.IS_NETHER); - tag(IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD); + tag(IS_END).addTag(BiomeTags.IS_END); + tag(IS_NETHER).addTag(BiomeTags.IS_NETHER); + tag(IS_OVERWORLD).addTag(BiomeTags.IS_OVERWORLD); tag(IS_HOT_OVERWORLD) .add(Biomes.SWAMP) @@ -51,14 +52,16 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { .add(Biomes.SAVANNA_PLATEAU) .add(Biomes.WINDSWEPT_SAVANNA) .add(Biomes.STONY_PEAKS) - .add(Biomes.WARM_OCEAN); + .add(Biomes.WARM_OCEAN) + .addOptionalTag(forgeTagKey("is_hot/overworld")); tag(IS_HOT_NETHER) .add(Biomes.NETHER_WASTES) .add(Biomes.CRIMSON_FOREST) .add(Biomes.WARPED_FOREST) .add(Biomes.SOUL_SAND_VALLEY) - .add(Biomes.BASALT_DELTAS); - tag(IS_HOT_END); + .add(Biomes.BASALT_DELTAS) + .addOptionalTag(forgeTagKey("is_hot/nether")); + tag(IS_HOT_END); // forge:is_hot/end tag(IS_HOT).addTag(IS_HOT_OVERWORLD).addTag(IS_HOT_NETHER).addOptionalTag(IS_HOT_END.location()); tag(IS_COLD_OVERWORLD) @@ -81,16 +84,21 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { .add(Biomes.COLD_OCEAN) .add(Biomes.FROZEN_OCEAN) .add(Biomes.DEEP_COLD_OCEAN) - .add(Biomes.DEEP_FROZEN_OCEAN); - tag(IS_COLD_NETHER); + .add(Biomes.DEEP_FROZEN_OCEAN) + .addOptionalTag(forgeTagKey("is_cold/overworld")); + tag(IS_COLD_NETHER); // forge:is_cold/nether tag(IS_COLD_END) .add(Biomes.THE_END) .add(Biomes.SMALL_END_ISLANDS) .add(Biomes.END_MIDLANDS) .add(Biomes.END_HIGHLANDS) - .add(Biomes.END_BARRENS); + .add(Biomes.END_BARRENS) + .addOptionalTag(forgeTagKey("is_cold/end")); tag(IS_COLD).addTag(IS_COLD_OVERWORLD).addOptionalTag(IS_COLD_NETHER.location()).addTag(IS_COLD_END); + tag(IS_DEAD) + .addOptionalTag(forgeTagKey("is_dead")); + tag(IS_SPARSE_VEGETATION_OVERWORLD) .add(Biomes.WOODED_BADLANDS) .add(Biomes.SAVANNA) @@ -103,8 +111,9 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { .add(Biomes.SNOWY_SLOPES) .add(Biomes.JAGGED_PEAKS) .add(Biomes.FROZEN_PEAKS); - tag(IS_SPARSE_NETHER); - tag(IS_SPARSE_END); + //.addOptionalTag(forgeTagKey("is_sparse/overworld")); // can't because forge:is_sparse/overworld contains dripstone caves and eroded badlands, while c:is_sparse_vegetation/overworld does not + tag(IS_SPARSE_NETHER); // forge:is_sparse/nether + tag(IS_SPARSE_END); // forge:is_sparse/end tag(IS_SPARSE_VEGETATION).addTag(IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(IS_SPARSE_NETHER.location()).addOptionalTag(IS_SPARSE_END.location()); tag(IS_DENSE_VEGETATION_OVERWORLD) @@ -113,7 +122,8 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { .add(Biomes.OLD_GROWTH_SPRUCE_TAIGA) .add(Biomes.JUNGLE) .add(Biomes.BAMBOO_JUNGLE) - .add(Biomes.MANGROVE_SWAMP); + .add(Biomes.MANGROVE_SWAMP) + .addOptionalTag(forgeTagKey("is_dense/overworld")); tag(IS_DENSE_NETHER); tag(IS_DENSE_END); tag(IS_DENSE_VEGETATION).addTag(IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(IS_DENSE_NETHER.location()).addOptionalTag(IS_DENSE_END.location()); @@ -126,7 +136,8 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { .add(Biomes.SPARSE_JUNGLE) .add(Biomes.BEACH) .add(Biomes.LUSH_CAVES) - .add(Biomes.DRIPSTONE_CAVES); + .add(Biomes.DRIPSTONE_CAVES) + .addOptionalTag(forgeTagKey("is_wet/overworld")); tag(IS_WET_NETHER); tag(IS_WET_END); tag(IS_WET).addTag(IS_WET_OVERWORLD).addOptionalTag(IS_WET_NETHER.location()).addOptionalTag(IS_WET_END.location()); @@ -138,46 +149,60 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { .add(Biomes.ERODED_BADLANDS) .add(Biomes.SAVANNA) .add(Biomes.SAVANNA_PLATEAU) - .add(Biomes.WINDSWEPT_SAVANNA); + .add(Biomes.WINDSWEPT_SAVANNA) + .addOptionalTag(forgeTagKey("is_dry/overworld")); tag(IS_DRY_NETHER) .add(Biomes.NETHER_WASTES) .add(Biomes.CRIMSON_FOREST) .add(Biomes.WARPED_FOREST) .add(Biomes.SOUL_SAND_VALLEY) - .add(Biomes.BASALT_DELTAS); + .add(Biomes.BASALT_DELTAS) + .addOptionalTag(forgeTagKey("is_dry/nether")); tag(IS_DRY_END) .add(Biomes.THE_END) .add(Biomes.SMALL_END_ISLANDS) .add(Biomes.END_MIDLANDS) .add(Biomes.END_HIGHLANDS) - .add(Biomes.END_BARRENS); - tag(IS_DRY).addTag(IS_DRY_OVERWORLD).addTag(IS_DRY_NETHER).addTag(IS_DRY_END); + .add(Biomes.END_BARRENS) + .addOptionalTag(forgeTagKey("is_dry/end")); + tag(IS_DRY) + .addTag(IS_DRY_OVERWORLD).addTag(IS_DRY_NETHER).addTag(IS_DRY_END) + .addOptionalTag(forgeTagKey("is_dry")); - tag(IS_CONIFEROUS_TREE).addTags(IS_TAIGA).add(Biomes.GROVE); - tag(IS_SAVANNA_TREE).addTags(IS_SAVANNA); - tag(IS_JUNGLE_TREE).addTags(IS_JUNGLE); + tag(IS_CONIFEROUS_TREE) + .addTag(IS_TAIGA) + .add(Biomes.GROVE) + .addOptionalTag(forgeTagKey("is_coniferous")); + tag(IS_SAVANNA_TREE).addTag(IS_SAVANNA); + tag(IS_JUNGLE_TREE).addTag(IS_JUNGLE); tag(IS_DECIDUOUS_TREE).add(Biomes.FOREST).add(Biomes.FLOWER_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.DARK_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.WINDSWEPT_FOREST); tag(IS_MOUNTAIN_SLOPE).add(Biomes.SNOWY_SLOPES).add(Biomes.MEADOW).add(Biomes.GROVE).add(Biomes.CHERRY_GROVE); - tag(IS_MOUNTAIN_PEAK).add(Biomes.JAGGED_PEAKS).add(Biomes.FROZEN_PEAKS).add(Biomes.STONY_PEAKS); - tag(IS_MOUNTAIN).addTag(BiomeTags.IS_MOUNTAIN).addTag(IS_MOUNTAIN_PEAK).addTag(IS_MOUNTAIN_SLOPE); + tag(IS_MOUNTAIN_PEAK) + .add(Biomes.JAGGED_PEAKS).add(Biomes.FROZEN_PEAKS).add(Biomes.STONY_PEAKS) + .addOptionalTag(forgeTagKey("is_peak")); + tag(IS_MOUNTAIN) + .addTag(BiomeTags.IS_MOUNTAIN).addTag(IS_MOUNTAIN_PEAK).addTag(IS_MOUNTAIN_SLOPE); + //.addOptionalTag(forgeTagKey("is_mountain")); // can't because forge:is_mountain contains savanna plateau, while c:is_mountain does not - tag(IS_FOREST).addTags(BiomeTags.IS_FOREST); + tag(IS_FOREST).addTag(BiomeTags.IS_FOREST); tag(IS_BIRCH_FOREST).add(Biomes.BIRCH_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST); tag(IS_FLOWER_FOREST).add(Biomes.FLOWER_FOREST); - tag(IS_FLORAL).addTags(IS_FLOWER_FOREST).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW); - tag(IS_BEACH).addTags(BiomeTags.IS_BEACH); + tag(IS_FLORAL).addTag(IS_FLOWER_FOREST).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW); + tag(IS_BEACH).addTag(BiomeTags.IS_BEACH); tag(IS_STONY_SHORES).add(Biomes.STONY_SHORE); tag(IS_DESERT).add(Biomes.DESERT); - tag(IS_BADLANDS).addTags(BiomeTags.IS_BADLANDS); + tag(IS_BADLANDS).addTag(BiomeTags.IS_BADLANDS); tag(IS_PLAINS).add(Biomes.PLAINS).add(Biomes.SUNFLOWER_PLAINS); tag(IS_SNOWY_PLAINS).add(Biomes.SNOWY_PLAINS); - tag(IS_TAIGA).addTags(BiomeTags.IS_TAIGA); - tag(IS_HILL).addTags(BiomeTags.IS_HILL); + tag(IS_TAIGA).addTag(BiomeTags.IS_TAIGA); + tag(IS_HILL).addTag(BiomeTags.IS_HILL); tag(IS_WINDSWEPT).add(Biomes.WINDSWEPT_HILLS).add(Biomes.WINDSWEPT_GRAVELLY_HILLS).add(Biomes.WINDSWEPT_FOREST).add(Biomes.WINDSWEPT_SAVANNA); - tag(IS_SAVANNA).addTags(BiomeTags.IS_SAVANNA); - tag(IS_JUNGLE).addTags(BiomeTags.IS_JUNGLE); - tag(IS_SNOWY).add(Biomes.SNOWY_BEACH).add(Biomes.SNOWY_PLAINS).add(Biomes.ICE_SPIKES).add(Biomes.SNOWY_TAIGA).add(Biomes.GROVE).add(Biomes.SNOWY_SLOPES).add(Biomes.JAGGED_PEAKS).add(Biomes.FROZEN_PEAKS); + tag(IS_SAVANNA).addTag(BiomeTags.IS_SAVANNA); + tag(IS_JUNGLE).addTag(BiomeTags.IS_JUNGLE); + tag(IS_SNOWY) + .add(Biomes.SNOWY_BEACH, Biomes.SNOWY_PLAINS, Biomes.ICE_SPIKES, Biomes.SNOWY_TAIGA, Biomes.GROVE, Biomes.SNOWY_SLOPES, Biomes.JAGGED_PEAKS, Biomes.FROZEN_PEAKS); + //.addOptionalTag(forgeTagKey("is_snowy")); // can't add forge:is_snowy because it contains frozen ocean and frozen river, while c:is_snowy does not tag(IS_ICY).add(Biomes.ICE_SPIKES).add(Biomes.FROZEN_PEAKS); tag(IS_SWAMP).add(Biomes.SWAMP).add(Biomes.MANGROVE_SWAMP); tag(IS_OLD_GROWTH).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.OLD_GROWTH_PINE_TAIGA).add(Biomes.OLD_GROWTH_SPRUCE_TAIGA); @@ -191,58 +216,89 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { tag(IS_WASTELAND); tag(IS_RARE).add(Biomes.SUNFLOWER_PLAINS).add(Biomes.FLOWER_FOREST).add(Biomes.OLD_GROWTH_BIRCH_FOREST).add(Biomes.OLD_GROWTH_SPRUCE_TAIGA).add(Biomes.BAMBOO_JUNGLE).add(Biomes.SPARSE_JUNGLE).add(Biomes.ERODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.WINDSWEPT_SAVANNA).add(Biomes.ICE_SPIKES).add(Biomes.WINDSWEPT_GRAVELLY_HILLS).add(Biomes.MUSHROOM_FIELDS).add(Biomes.DEEP_DARK); - tag(IS_RIVER).addTags(BiomeTags.IS_RIVER); + tag(IS_RIVER).addTag(BiomeTags.IS_RIVER); tag(IS_SHALLOW_OCEAN).add(Biomes.OCEAN).add(Biomes.LUKEWARM_OCEAN).add(Biomes.WARM_OCEAN).add(Biomes.COLD_OCEAN).add(Biomes.FROZEN_OCEAN); - tag(IS_DEEP_OCEAN).addTags(BiomeTags.IS_DEEP_OCEAN); - tag(IS_OCEAN).addTags(BiomeTags.IS_OCEAN).addTags(IS_SHALLOW_OCEAN).addTags(IS_DEEP_OCEAN); + tag(IS_DEEP_OCEAN).addTag(BiomeTags.IS_DEEP_OCEAN); + tag(IS_OCEAN).addTag(BiomeTags.IS_OCEAN).addTag(IS_SHALLOW_OCEAN).addTag(IS_DEEP_OCEAN); tag(IS_AQUATIC_ICY).add(Biomes.FROZEN_RIVER).add(Biomes.DEEP_FROZEN_OCEAN).add(Biomes.FROZEN_OCEAN); tag(IS_AQUATIC).addTag(IS_OCEAN).addTag(IS_RIVER); - tag(IS_CAVE).add(Biomes.LUSH_CAVES).add(Biomes.DRIPSTONE_CAVES).add(Biomes.DEEP_DARK); + tag(IS_CAVE) + .add(Biomes.LUSH_CAVES).add(Biomes.DRIPSTONE_CAVES).add(Biomes.DEEP_DARK) + .addOptionalTag(forgeTagKey("is_cave")); tag(IS_UNDERGROUND).addTag(IS_CAVE); tag(IS_NETHER_FOREST).add(Biomes.CRIMSON_FOREST).add(Biomes.WARPED_FOREST); tag(IS_OUTER_END_ISLAND).add(Biomes.END_HIGHLANDS).add(Biomes.END_MIDLANDS).add(Biomes.END_BARRENS); - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // Backwards compat definitions for pre-1.21 legacy `forge:` tags. // TODO: Remove backwards compat tag entries in 1.22 - tag(IS_MOUNTAIN_SLOPE).addOptionalTag(forgeRl("is_slope")); - tag(IS_MOUNTAIN_PEAK).addOptionalTag(forgeRl("is_peak")); - tagWithOptionalLegacy(IS_MOUNTAIN); - tagWithOptionalLegacy(IS_HOT_OVERWORLD); - tagWithOptionalLegacy(IS_HOT_NETHER); - tagWithOptionalLegacy(IS_HOT); - tagWithOptionalLegacy(IS_COLD_OVERWORLD); - tagWithOptionalLegacy(IS_COLD_END); - tagWithOptionalLegacy(IS_COLD); - tagWithOptionalLegacy(IS_SPARSE_VEGETATION_OVERWORLD); - tagWithOptionalLegacy(IS_SPARSE_VEGETATION); - tag(IS_SPARSE_VEGETATION_OVERWORLD).addOptionalTag(forgeRl("is_sparse/overworld")); - tag(IS_SPARSE_VEGETATION).addOptionalTag(forgeRl("is_sparse")); - tag(IS_DENSE_VEGETATION_OVERWORLD).addOptionalTag(forgeRl("is_dense/overworld")); - tag(IS_DENSE_END); - tag(IS_DENSE_VEGETATION).addOptionalTag(forgeRl("is_dense")); - tagWithOptionalLegacy(IS_WET_OVERWORLD); - tagWithOptionalLegacy(IS_WET); - tagWithOptionalLegacy(IS_DRY_OVERWORLD); - tagWithOptionalLegacy(IS_DRY_NETHER); - tagWithOptionalLegacy(IS_DRY_END); - tagWithOptionalLegacy(IS_DRY); - tagWithOptionalLegacy(IS_CONIFEROUS_TREE); - tagWithOptionalLegacy(IS_DEAD); - tagWithOptionalLegacy(IS_MUSHROOM); - tagWithOptionalLegacy(IS_FLORAL); - tag(IS_AQUATIC).addOptionalTag(forgeRl("is_water")); - tagWithOptionalLegacy(IS_DESERT); - tagWithOptionalLegacy(IS_PLAINS); - tagWithOptionalLegacy(IS_SWAMP); - tagWithOptionalLegacy(IS_SNOWY); - tagWithOptionalLegacy(IS_WASTELAND); - tagWithOptionalLegacy(IS_VOID); - tagWithOptionalLegacy(IS_CAVE); - tagWithOptionalLegacy(IS_END); - tagWithOptionalLegacy(IS_NETHER); - tagWithOptionalLegacy(IS_OVERWORLD); + tag(Biomes.PLAINS, forgeTagKey("is_plains")); + tag(Biomes.DESERT, forgeTagKey("is_hot/overworld"), forgeTagKey("is_dry/overworld"), forgeTagKey("is_sandy"), forgeTagKey("is_desert")); + tag(Biomes.TAIGA, forgeTagKey("is_cold/overworld"), forgeTagKey("is_coniferous")); + tag(Biomes.SWAMP, forgeTagKey("is_wet/overworld"), forgeTagKey("is_swamp")); + tag(Biomes.NETHER_WASTES, forgeTagKey("is_hot/nether"), forgeTagKey("is_dry/nether")); + tag(Biomes.THE_END, forgeTagKey("is_cold/end"), forgeTagKey("is_dry/end")); + tag(Biomes.FROZEN_OCEAN, forgeTagKey("is_cold/overworld"), forgeTagKey("is_snowy")); + tag(Biomes.FROZEN_RIVER, forgeTagKey("is_cold/overworld"), forgeTagKey("is_snowy")); + tag(Biomes.SNOWY_PLAINS, forgeTagKey("is_cold/overworld"), forgeTagKey("is_snowy"), forgeTagKey("is_wasteland"), forgeTagKey("is_plains")); + tag(Biomes.MUSHROOM_FIELDS, forgeTagKey("is_mushroom"), forgeTagKey("is_rare")); + tag(Biomes.JUNGLE, forgeTagKey("is_hot/overworld"), forgeTagKey("is_wet/overworld"), forgeTagKey("is_dense/overworld")); + tag(Biomes.SPARSE_JUNGLE, forgeTagKey("is_hot/overworld"), forgeTagKey("is_wet/overworld"), forgeTagKey("is_rare")); + tag(Biomes.BEACH, forgeTagKey("is_wet/overworld"), forgeTagKey("is_sandy")); + tag(Biomes.SNOWY_BEACH, forgeTagKey("is_cold/overworld"), forgeTagKey("is_snowy")); + tag(Biomes.DARK_FOREST, forgeTagKey("is_spooky"), forgeTagKey("is_dense/overworld")); + tag(Biomes.SNOWY_TAIGA, forgeTagKey("is_cold/overworld"), forgeTagKey("is_coniferous"), forgeTagKey("is_snowy")); + tag(Biomes.OLD_GROWTH_PINE_TAIGA, forgeTagKey("is_cold/overworld"), forgeTagKey("is_coniferous")); + tag(Biomes.WINDSWEPT_FOREST, forgeTagKey("is_sparse/overworld")); + tag(Biomes.SAVANNA, forgeTagKey("is_hot/overworld"), forgeTagKey("is_sparse/overworld")); + tag(Biomes.SAVANNA_PLATEAU, forgeTagKey("is_hot/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_rare"), forgeTagKey("is_slope"), Tags.Biomes.IS_PLATEAU); + tag(Biomes.BADLANDS, forgeTagKey("is_sandy"), forgeTagKey("is_dry/overworld")); + tag(Biomes.WOODED_BADLANDS, forgeTagKey("is_sandy"), forgeTagKey("is_dry/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_slope"), Tags.Biomes.IS_PLATEAU); + tag(Biomes.MEADOW, forgeTagKey("is_plains"), Tags.Biomes.IS_PLATEAU, forgeTagKey("is_slope")); + tag(Biomes.GROVE, forgeTagKey("is_cold/overworld"), forgeTagKey("is_coniferous"), forgeTagKey("is_snowy"), forgeTagKey("is_slope")); + tag(Biomes.SNOWY_SLOPES, forgeTagKey("is_cold/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_snowy"), forgeTagKey("is_slope")); + tag(Biomes.JAGGED_PEAKS, forgeTagKey("is_cold/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_snowy"), forgeTagKey("is_peak")); + tag(Biomes.FROZEN_PEAKS, forgeTagKey("is_cold/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_snowy"), forgeTagKey("is_peak")); + tag(Biomes.STONY_PEAKS, forgeTagKey("is_hot/overworld"), forgeTagKey("is_peak")); + tag(Biomes.SMALL_END_ISLANDS, forgeTagKey("is_cold/end"), forgeTagKey("is_dry/end")); + tag(Biomes.END_MIDLANDS, forgeTagKey("is_cold/end"), forgeTagKey("is_dry/end")); + tag(Biomes.END_HIGHLANDS, forgeTagKey("is_cold/end"), forgeTagKey("is_dry/end")); + tag(Biomes.END_BARRENS, forgeTagKey("is_cold/end"), forgeTagKey("is_dry/end")); + tag(Biomes.WARM_OCEAN, forgeTagKey("is_hot/overworld")); + tag(Biomes.COLD_OCEAN, forgeTagKey("is_cold/overworld")); + tag(Biomes.DEEP_COLD_OCEAN, forgeTagKey("is_cold/overworld")); + tag(Biomes.DEEP_FROZEN_OCEAN, forgeTagKey("is_cold/overworld")); + tag(Biomes.THE_VOID, forgeTagKey("is_void")); + tag(Biomes.SUNFLOWER_PLAINS, forgeTagKey("is_plains"), forgeTagKey("is_rare")); + tag(Biomes.WINDSWEPT_GRAVELLY_HILLS, forgeTagKey("is_sparse/overworld"), forgeTagKey("is_rare")); + tag(Biomes.FLOWER_FOREST, forgeTagKey("is_rare")); + tag(Biomes.ICE_SPIKES, forgeTagKey("is_cold/overworld"), forgeTagKey("is_snowy"), forgeTagKey("is_rare")); + tag(Biomes.OLD_GROWTH_BIRCH_FOREST, forgeTagKey("is_dense/overworld"), forgeTagKey("is_rare")); + tag(Biomes.OLD_GROWTH_SPRUCE_TAIGA, forgeTagKey("is_dense/overworld"), forgeTagKey("is_rare")); + tag(Biomes.WINDSWEPT_SAVANNA, forgeTagKey("is_hot/overworld"), forgeTagKey("is_dry/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_rare")); + tag(Biomes.ERODED_BADLANDS, forgeTagKey("is_hot/overworld"), forgeTagKey("is_dry/overworld"), forgeTagKey("is_sparse/overworld"), forgeTagKey("is_rare")); + tag(Biomes.BAMBOO_JUNGLE, forgeTagKey("is_hot/overworld"), forgeTagKey("is_wet/overworld"), forgeTagKey("is_rare")); + tag(Biomes.LUSH_CAVES, forgeTagKey("is_cave"), forgeTagKey("is_lush"), forgeTagKey("is_wet/overworld")); + tag(Biomes.DRIPSTONE_CAVES, forgeTagKey("is_cave"), forgeTagKey("is_sparse/overworld")); + tag(Biomes.SOUL_SAND_VALLEY, forgeTagKey("is_hot/nether"), forgeTagKey("is_dry/nether")); + tag(Biomes.CRIMSON_FOREST, forgeTagKey("is_hot/nether"), forgeTagKey("is_dry/nether")); + tag(Biomes.WARPED_FOREST, forgeTagKey("is_hot/nether"), forgeTagKey("is_dry/nether")); + tag(Biomes.BASALT_DELTAS, forgeTagKey("is_hot/nether"), forgeTagKey("is_dry/nether")); + tag(Biomes.MANGROVE_SWAMP, forgeTagKey("is_wet/overworld"), forgeTagKey("is_hot/overworld"), forgeTagKey("is_swamp")); + tag(Biomes.DEEP_DARK, forgeTagKey("is_cave"), forgeTagKey("is_rare"), forgeTagKey("is_spooky")); + + tag(forgeTagKey("is_hot")).addTag(forgeTagKey("is_hot/overworld")).addTag(forgeTagKey("is_hot/nether")).addOptionalTag(Tags.Biomes.IS_HOT_END.location()); + tag(forgeTagKey("is_cold")).addTag(forgeTagKey("is_cold/overworld")).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(forgeTagKey("is_cold/end")); + tag(forgeTagKey("is_sparse")).addTag(forgeTagKey("is_sparse/overworld")).addOptionalTag(Tags.Biomes.IS_SPARSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_SPARSE_END.location()); + tag(forgeTagKey("is_dense")).addTag(forgeTagKey("is_dense/overworld")).addOptionalTag(Tags.Biomes.IS_DENSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_DENSE_END.location()); + tag(forgeTagKey("is_wet")).addTag(forgeTagKey("is_wet/overworld")).addOptionalTag(Tags.Biomes.IS_WET_NETHER.location()).addOptionalTag(Tags.Biomes.IS_WET_END.location()); + tag(forgeTagKey("is_dry")).addTag(forgeTagKey("is_dry/overworld")).addTag(forgeTagKey("is_dry/nether")).addTag(forgeTagKey("is_dry/end")); + tag(forgeTagKey("is_dead")); + + tag(forgeTagKey("is_water")).addTag(BiomeTags.IS_OCEAN).addTag(BiomeTags.IS_RIVER); + tag(forgeTagKey("is_mountain")).addTag(forgeTagKey("is_peak")).addTag(forgeTagKey("is_slope")); + tag(forgeTagKey("is_underground")).addTag(forgeTagKey("is_cave")); } @SafeVarargs @@ -260,6 +316,10 @@ public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { return ResourceLocation.fromNamespaceAndPath("forge", path); } + private static TagKey forgeTagKey(String path) { + return BiomeTags.create(ResourceLocation.fromNamespaceAndPath("forge", path)); + } + @Override public String getName() { return "Forge Biome Tags"; diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index a36fd21018..b8a5196061 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -35,22 +35,34 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { @SuppressWarnings("unchecked") @Override public void addTags(HolderLookup.Provider p_256380_) { - tag(BARRELS).addTag(BARRELS_WOODEN); - tag(BARRELS_WOODEN).add(Blocks.BARREL); - tag(BOOKSHELVES).add(Blocks.BOOKSHELF); + tag(BARRELS) + .addTag(BARRELS_WOODEN) + .addOptionalTag(forgeTagKey("barrels")); + tag(BARRELS_WOODEN) + .add(Blocks.BARREL) + .addOptionalTag(forgeTagKey("barrels/wooden")); + tag(BOOKSHELVES) + .add(Blocks.BOOKSHELF) + .addOptionalTag(forgeTagKey("bookshelves")); tag(BUDDING_BLOCKS).add(Blocks.BUDDING_AMETHYST); tag(BUDS).add(Blocks.SMALL_AMETHYST_BUD).add(Blocks.MEDIUM_AMETHYST_BUD).add(Blocks.LARGE_AMETHYST_BUD); tag(CHAINS).add(Blocks.CHAIN); - tag(CHESTS).addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN); - tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST); - tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST); - tag(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST); + tag(CHESTS) + .addTags(CHESTS_ENDER, CHESTS_TRAPPED, CHESTS_WOODEN) + .addOptionalTag(forgeTagKey("chests")); + tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST); // forge:chests/ender + tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST); // forge:chests/trapped + tag(CHESTS_WOODEN) + .add(Blocks.CHEST, Blocks.TRAPPED_CHEST) + .addOptionalTag(forgeTagKey("chests/wooden")); tag(CLUSTERS).add(Blocks.AMETHYST_CLUSTER); - tag(COBBLESTONES).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE); - tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE); - tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE); - tag(COBBLESTONE_MOSSY).add(Blocks.MOSSY_COBBLESTONE); - tag(COBBLESTONE_DEEPSLATE).add(Blocks.COBBLED_DEEPSLATE); + tag(COBBLESTONES) + .addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE) + .addOptionalTag(forgeTagKey("cobblestone")); + tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE); // forge:cobblestone/normal + tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE); // forge:cobblestone/infested + tag(COBBLESTONE_MOSSY).add(Blocks.MOSSY_COBBLESTONE); // forge:cobblestone/mossy + tag(COBBLESTONE_DEEPSLATE).add(Blocks.COBBLED_DEEPSLATE); // forge:cobblestone/deepslate tag(CONCRETES).add(Blocks.WHITE_CONCRETE, Blocks.ORANGE_CONCRETE, Blocks.MAGENTA_CONCRETE, Blocks.LIGHT_BLUE_CONCRETE, Blocks.YELLOW_CONCRETE, Blocks.LIME_CONCRETE, Blocks.PINK_CONCRETE, Blocks.GRAY_CONCRETE, Blocks.LIGHT_GRAY_CONCRETE, Blocks.CYAN_CONCRETE, Blocks.PURPLE_CONCRETE, Blocks.BLUE_CONCRETE, Blocks.BROWN_CONCRETE, Blocks.GREEN_CONCRETE, Blocks.RED_CONCRETE, Blocks.BLACK_CONCRETE); addColored(DYED, "{color}_banner"); addColored(DYED, "{color}_bed"); @@ -66,58 +78,80 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { addColored(DYED, "{color}_wall_banner"); addColored(DYED, "{color}_wool"); addColoredTags(tag(DYED)::addTag, DYED); - tag(END_STONES).add(Blocks.END_STONE); - tag(ENDERMAN_PLACE_ON_BLACKLIST); - tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN); + tag(END_STONES).add(Blocks.END_STONE); // forge:end_stones + tag(ENDERMAN_PLACE_ON_BLACKLIST); // forge:enderman_place_on_blacklist + tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN); // forge:fence_gates tag(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE, Blocks.MANGROVE_FENCE_GATE, Blocks.BAMBOO_FENCE_GATE, Blocks.CHERRY_FENCE_GATE); - tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN); - tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE); - tag(FENCES_WOODEN).addTag(BlockTags.WOODEN_FENCES); - tag(GLASS_BLOCKS).addTags(GLASS_BLOCKS_COLORLESS, GLASS_BLOCKS_CHEAP, GLASS_BLOCKS_TINTED); - tag(GLASS_BLOCKS_COLORLESS).add(Blocks.GLASS); - tag(GLASS_BLOCKS_CHEAP).add(Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS); - tag(GLASS_BLOCKS_TINTED).add(Blocks.TINTED_GLASS); - tag(GLASS_PANES).addTags(GLASS_PANES_COLORLESS).add(Blocks.WHITE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, Blocks.YELLOW_STAINED_GLASS_PANE, Blocks.LIME_STAINED_GLASS_PANE, Blocks.PINK_STAINED_GLASS_PANE, Blocks.GRAY_STAINED_GLASS_PANE, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, Blocks.CYAN_STAINED_GLASS_PANE, Blocks.PURPLE_STAINED_GLASS_PANE, Blocks.BLUE_STAINED_GLASS_PANE, Blocks.BROWN_STAINED_GLASS_PANE, Blocks.GREEN_STAINED_GLASS_PANE, Blocks.RED_STAINED_GLASS_PANE, Blocks.BLACK_STAINED_GLASS_PANE); - tag(GLASS_PANES_COLORLESS).add(Blocks.GLASS_PANE); + tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN); // forge:fences + tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE); // forge:fences/nether_brick + tag(FENCES_WOODEN).addTag(BlockTags.WOODEN_FENCES); // forge:fences/wooden + tag(GLASS_BLOCKS) + .addTags(GLASS_BLOCKS_COLORLESS, GLASS_BLOCKS_CHEAP, GLASS_BLOCKS_TINTED) + .addOptionalTag(forgeTagKey("glass")); + tag(GLASS_BLOCKS_COLORLESS) + .add(Blocks.GLASS) + .addOptionalTag(forgeTagKey("glass/colorless")); + tag(GLASS_BLOCKS_CHEAP) + .add(Blocks.GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.BLACK_STAINED_GLASS) + .addOptionalTag(forgeTagKey("glass/silica")); + tag(GLASS_BLOCKS_TINTED) + .add(Blocks.TINTED_GLASS) + .addOptionalTag(forgeTagKey("glass/tinted")); + tag(GLASS_PANES) + .addTags(GLASS_PANES_COLORLESS).add(Blocks.WHITE_STAINED_GLASS_PANE, Blocks.ORANGE_STAINED_GLASS_PANE, Blocks.MAGENTA_STAINED_GLASS_PANE, Blocks.LIGHT_BLUE_STAINED_GLASS_PANE, Blocks.YELLOW_STAINED_GLASS_PANE, Blocks.LIME_STAINED_GLASS_PANE, Blocks.PINK_STAINED_GLASS_PANE, Blocks.GRAY_STAINED_GLASS_PANE, Blocks.LIGHT_GRAY_STAINED_GLASS_PANE, Blocks.CYAN_STAINED_GLASS_PANE, Blocks.PURPLE_STAINED_GLASS_PANE, Blocks.BLUE_STAINED_GLASS_PANE, Blocks.BROWN_STAINED_GLASS_PANE, Blocks.GREEN_STAINED_GLASS_PANE, Blocks.RED_STAINED_GLASS_PANE, Blocks.BLACK_STAINED_GLASS_PANE) + .addOptionalTag(forgeTagKey("glass_panes")); + tag(GLASS_PANES_COLORLESS) + .add(Blocks.GLASS_PANE) + .addOptionalTag(forgeTagKey("glass_panes/colorless")); tag(GLAZED_TERRACOTTAS).add(Blocks.WHITE_GLAZED_TERRACOTTA, Blocks.ORANGE_GLAZED_TERRACOTTA, Blocks.MAGENTA_GLAZED_TERRACOTTA, Blocks.LIGHT_BLUE_GLAZED_TERRACOTTA, Blocks.YELLOW_GLAZED_TERRACOTTA, Blocks.LIME_GLAZED_TERRACOTTA, Blocks.PINK_GLAZED_TERRACOTTA, Blocks.GRAY_GLAZED_TERRACOTTA, Blocks.LIGHT_GRAY_GLAZED_TERRACOTTA, Blocks.CYAN_GLAZED_TERRACOTTA, Blocks.PURPLE_GLAZED_TERRACOTTA, Blocks.BLUE_GLAZED_TERRACOTTA, Blocks.BROWN_GLAZED_TERRACOTTA, Blocks.GREEN_GLAZED_TERRACOTTA, Blocks.RED_GLAZED_TERRACOTTA, Blocks.BLACK_GLAZED_TERRACOTTA); - tag(GRAVEL).add(Blocks.GRAVEL); + tag(GRAVEL).add(Blocks.GRAVEL); // forge:gravel tag(SKULLS).add(Blocks.SKELETON_SKULL, Blocks.SKELETON_WALL_SKULL, Blocks.WITHER_SKELETON_SKULL, Blocks.WITHER_SKELETON_WALL_SKULL, Blocks.PLAYER_HEAD, Blocks.PLAYER_WALL_HEAD, Blocks.ZOMBIE_HEAD, Blocks.ZOMBIE_WALL_HEAD, Blocks.CREEPER_HEAD, Blocks.CREEPER_WALL_HEAD, Blocks.PIGLIN_HEAD, Blocks.PIGLIN_WALL_HEAD, Blocks.DRAGON_HEAD, Blocks.DRAGON_WALL_HEAD); tag(HIDDEN_FROM_RECIPE_VIEWERS); - tag(NETHERRACK).add(Blocks.NETHERRACK); + tag(NETHERRACK).add(Blocks.NETHERRACK); // forge:netherrack tag(OBSIDIANS_NORMAL).add(Blocks.OBSIDIAN); tag(OBSIDIANS_CRYING).add(Blocks.CRYING_OBSIDIAN); - tag(OBSIDIANS).addTags(OBSIDIANS_NORMAL, OBSIDIANS_CRYING); - tag(ORE_BEARING_GROUND_DEEPSLATE).add(Blocks.DEEPSLATE); - tag(ORE_BEARING_GROUND_NETHERRACK).add(Blocks.NETHERRACK); - tag(ORE_BEARING_GROUND_STONE).add(Blocks.STONE); + tag(OBSIDIANS) + .addTags(OBSIDIANS_NORMAL, OBSIDIANS_CRYING) + .addOptionalTag(forgeTagKey("obsidian")); + tag(ORE_BEARING_GROUND_DEEPSLATE).add(Blocks.DEEPSLATE); // forge:ore_bearing_ground/deepslate + tag(ORE_BEARING_GROUND_NETHERRACK).add(Blocks.NETHERRACK); // forge:ore_bearing_ground/netherrack + tag(ORE_BEARING_GROUND_STONE).add(Blocks.STONE); // forge:ore_bearing_ground/stone tag(ORE_RATES_DENSE).add(Blocks.COPPER_ORE, Blocks.DEEPSLATE_COPPER_ORE, Blocks.DEEPSLATE_LAPIS_ORE, Blocks.DEEPSLATE_REDSTONE_ORE, Blocks.LAPIS_ORE, Blocks.REDSTONE_ORE); tag(ORE_RATES_SINGULAR).add(Blocks.ANCIENT_DEBRIS, Blocks.COAL_ORE, Blocks.DEEPSLATE_COAL_ORE, Blocks.DEEPSLATE_DIAMOND_ORE, Blocks.DEEPSLATE_EMERALD_ORE, Blocks.DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_IRON_ORE, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.GOLD_ORE, Blocks.IRON_ORE, Blocks.NETHER_QUARTZ_ORE); tag(ORE_RATES_SPARSE).add(Blocks.NETHER_GOLD_ORE); - tag(ORES).addTags(ORES_COAL, ORES_COPPER, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_NETHERITE_SCRAP, ORES_REDSTONE, ORES_QUARTZ); - tag(ORES_COAL).addTag(BlockTags.COAL_ORES); - tag(ORES_COPPER).addTag(BlockTags.COPPER_ORES); - tag(ORES_DIAMOND).addTag(BlockTags.DIAMOND_ORES); - tag(ORES_EMERALD).addTag(BlockTags.EMERALD_ORES); - tag(ORES_GOLD).addTag(BlockTags.GOLD_ORES); - tag(ORES_IRON).addTag(BlockTags.IRON_ORES); - tag(ORES_LAPIS).addTag(BlockTags.LAPIS_ORES); - tag(ORES_QUARTZ).add(Blocks.NETHER_QUARTZ_ORE); - tag(ORES_REDSTONE).addTag(BlockTags.REDSTONE_ORES); - tag(ORES_NETHERITE_SCRAP).add(Blocks.ANCIENT_DEBRIS); + tag(ORES) + .addTags(ORES_COAL, ORES_COPPER, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_NETHERITE_SCRAP, ORES_REDSTONE, ORES_QUARTZ) + .addOptionalTag(forgeTagKey("ores")); + tag(ORES_COAL).addTag(BlockTags.COAL_ORES); // forge:ores/coal + tag(ORES_COPPER).addTag(BlockTags.COPPER_ORES); // forge:ores/copper + tag(ORES_DIAMOND).addTag(BlockTags.DIAMOND_ORES); // forge:ores/diamond + tag(ORES_EMERALD).addTag(BlockTags.EMERALD_ORES); // forge:ores/emerald + tag(ORES_GOLD).addTag(BlockTags.GOLD_ORES); // forge:ores/gold + tag(ORES_IRON).addTag(BlockTags.IRON_ORES); // forge:ores/iron + tag(ORES_LAPIS).addTag(BlockTags.LAPIS_ORES); // forge:ores/lapis + tag(ORES_QUARTZ) + .add(Blocks.NETHER_QUARTZ_ORE) + .addOptionalTag(forgeTagKey("ores/quartz")); + tag(ORES_REDSTONE).addTag(BlockTags.REDSTONE_ORES); // forge:ores/redstone + tag(ORES_NETHERITE_SCRAP) + .add(Blocks.ANCIENT_DEBRIS) + .addOptionalTag(forgeTagKey("ores/netherite_scrap")); tag(ORES_IN_GROUND_DEEPSLATE).add(Blocks.DEEPSLATE_COAL_ORE, Blocks.DEEPSLATE_COPPER_ORE, Blocks.DEEPSLATE_DIAMOND_ORE, Blocks.DEEPSLATE_EMERALD_ORE, Blocks.DEEPSLATE_GOLD_ORE, Blocks.DEEPSLATE_IRON_ORE, Blocks.DEEPSLATE_LAPIS_ORE, Blocks.DEEPSLATE_REDSTONE_ORE); tag(ORES_IN_GROUND_NETHERRACK).add(Blocks.NETHER_GOLD_ORE, Blocks.NETHER_QUARTZ_ORE); tag(ORES_IN_GROUND_STONE).add(Blocks.COAL_ORE, Blocks.COPPER_ORE, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.GOLD_ORE, Blocks.IRON_ORE, Blocks.LAPIS_ORE, Blocks.REDSTONE_ORE); tag(PLAYER_WORKSTATIONS_CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE); tag(PLAYER_WORKSTATIONS_FURNACES).add(Blocks.FURNACE); - tag(SAND).addTags(SAND_COLORLESS, SAND_RED); + tag(SAND).addTags(SAND_COLORLESS, SAND_RED); // forge:sand tag(RELOCATION_NOT_SUPPORTED); tag(ROPES); - tag(SAND_COLORLESS).add(Blocks.SAND); - tag(SAND_RED).add(Blocks.RED_SAND); + tag(SAND_COLORLESS).add(Blocks.SAND); // forge:sand/colorless + tag(SAND_RED).add(Blocks.RED_SAND); // forge:sand/red tag(SANDSTONE_RED_BLOCKS).add(Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); tag(SANDSTONE_UNCOLORED_BLOCKS).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE); - tag(SANDSTONE_BLOCKS).addTags(SANDSTONE_RED_BLOCKS, SANDSTONE_UNCOLORED_BLOCKS); + tag(SANDSTONE_BLOCKS) + .addTags(SANDSTONE_RED_BLOCKS, SANDSTONE_UNCOLORED_BLOCKS) + .addOptionalTag(forgeTagKey("sandstone")); tag(SANDSTONE_RED_SLABS).add(Blocks.RED_SANDSTONE_SLAB, Blocks.CUT_RED_SANDSTONE_SLAB, Blocks.SMOOTH_RED_SANDSTONE_SLAB); tag(SANDSTONE_UNCOLORED_SLABS).add(Blocks.SANDSTONE_SLAB, Blocks.CUT_SANDSTONE_SLAB, Blocks.SMOOTH_SANDSTONE_SLAB); tag(SANDSTONE_SLABS).addTags(SANDSTONE_RED_SLABS, SANDSTONE_UNCOLORED_SLABS); @@ -125,27 +159,61 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { tag(SANDSTONE_UNCOLORED_STAIRS).add(Blocks.SANDSTONE_STAIRS, Blocks.SMOOTH_SANDSTONE_STAIRS); tag(SANDSTONE_STAIRS).addTags(SANDSTONE_RED_STAIRS, SANDSTONE_UNCOLORED_STAIRS); - tag(STONES).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.STONE, Blocks.DEEPSLATE, Blocks.TUFF); - tag(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_BONE_MEAL, STORAGE_BLOCKS_COAL, + tag(STONES) + .add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.STONE, Blocks.DEEPSLATE, Blocks.TUFF); + //.addOptionalTag(forgeTagKey("stone")); // can't add this because it would include infested/polished variants which aren't contained in Fabric's `c:stones` + tag(STORAGE_BLOCKS) + .addTags(STORAGE_BLOCKS_BONE_MEAL, STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_COPPER, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_DRIED_KELP, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_NETHERITE, STORAGE_BLOCKS_RAW_COPPER, STORAGE_BLOCKS_RAW_GOLD, STORAGE_BLOCKS_RAW_IRON, STORAGE_BLOCKS_REDSTONE, - STORAGE_BLOCKS_SLIME, STORAGE_BLOCKS_WHEAT); + STORAGE_BLOCKS_SLIME, STORAGE_BLOCKS_WHEAT) + //.addOptionalTag(forgeTagKey("storage_blocks")); // can't add this because it would include contents from the non-common forge:storage_blocks/amethyst and forge:storage_blocks/quartz, which are not in the c namespace + .addOptionalTags(forgeTagKey("storage_blocks/coal"), forgeTagKey("storage_blocks/copper"), + forgeTagKey("storage_blocks/diamond"), forgeTagKey("storage_blocks/emerald"), + forgeTagKey("storage_blocks/gold"), forgeTagKey("storage_blocks/iron"), + forgeTagKey("storage_blocks/lapis"), forgeTagKey("storage_blocks/netherite"), + forgeTagKey("storage_blocks/raw_copper"), forgeTagKey("storage_blocks/raw_gold"), + forgeTagKey("storage_blocks/raw_iron"), forgeTagKey("storage_blocks/redstone")); tag(STORAGE_BLOCKS_BONE_MEAL).add(Blocks.BONE_BLOCK); - tag(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK); - tag(STORAGE_BLOCKS_COPPER).add(Blocks.COPPER_BLOCK); - tag(STORAGE_BLOCKS_DIAMOND).add(Blocks.DIAMOND_BLOCK); + tag(STORAGE_BLOCKS_COAL) + .add(Blocks.COAL_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/coal")); + tag(STORAGE_BLOCKS_COPPER) + .add(Blocks.COPPER_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/copper")); + tag(STORAGE_BLOCKS_DIAMOND) + .add(Blocks.DIAMOND_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/diamond")); tag(STORAGE_BLOCKS_DRIED_KELP).add(Blocks.DRIED_KELP_BLOCK); - tag(STORAGE_BLOCKS_EMERALD).add(Blocks.EMERALD_BLOCK); - tag(STORAGE_BLOCKS_GOLD).add(Blocks.GOLD_BLOCK); - tag(STORAGE_BLOCKS_IRON).add(Blocks.IRON_BLOCK); - tag(STORAGE_BLOCKS_LAPIS).add(Blocks.LAPIS_BLOCK); - tag(STORAGE_BLOCKS_NETHERITE).add(Blocks.NETHERITE_BLOCK); - tag(STORAGE_BLOCKS_RAW_COPPER).add(Blocks.RAW_COPPER_BLOCK); - tag(STORAGE_BLOCKS_RAW_GOLD).add(Blocks.RAW_GOLD_BLOCK); - tag(STORAGE_BLOCKS_RAW_IRON).add(Blocks.RAW_IRON_BLOCK); - tag(STORAGE_BLOCKS_REDSTONE).add(Blocks.REDSTONE_BLOCK); + tag(STORAGE_BLOCKS_EMERALD) + .add(Blocks.EMERALD_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/emerald")); + tag(STORAGE_BLOCKS_GOLD) + .add(Blocks.GOLD_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/gold")); + tag(STORAGE_BLOCKS_IRON) + .add(Blocks.IRON_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/iron")); + tag(STORAGE_BLOCKS_LAPIS) + .add(Blocks.LAPIS_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/lapis")); + tag(STORAGE_BLOCKS_NETHERITE) + .add(Blocks.NETHERITE_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/netherite")); + tag(STORAGE_BLOCKS_RAW_COPPER) + .add(Blocks.RAW_COPPER_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/raw_copper")); + tag(STORAGE_BLOCKS_RAW_GOLD) + .add(Blocks.RAW_GOLD_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/raw_gold")); + tag(STORAGE_BLOCKS_RAW_IRON) + .add(Blocks.RAW_IRON_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/raw_iron")); + tag(STORAGE_BLOCKS_REDSTONE) + .add(Blocks.REDSTONE_BLOCK) + .addOptionalTag(forgeTagKey("storage_blocks/redstone")); tag(STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK); tag(STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK); tag(VILLAGER_JOB_SITES).add( @@ -154,104 +222,44 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { Blocks.COMPOSTER, Blocks.FLETCHING_TABLE, Blocks.GRINDSTONE, Blocks.LECTERN, Blocks.LOOM, Blocks.SMITHING_TABLE, Blocks.SMOKER, Blocks.STONECUTTER); - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // Backwards compat definitions for pre-1.21 legacy `forge:` tags. // TODO: Remove backwards compat tag entries in 1.22 - tagWithOptionalLegacy(BARRELS); - tagWithOptionalLegacy(BARRELS_WOODEN); - tagWithOptionalLegacy(BOOKSHELVES); - tagWithOptionalLegacy(CHESTS); - tag(CHESTS_ENDER); - tag(CHESTS_TRAPPED); - tagWithOptionalLegacy(CHESTS_WOODEN); - tag(COBBLESTONES).addOptionalTag(forgeRl("cobblestone")); - tag(DYED_BLACK) - .addOptionalTag(forgeRl("glass/black")) - .addOptionalTag(forgeRl("stained_glass/black")); - tag(DYED_BLUE) - .addOptionalTag(forgeRl("glass/blue")) - .addOptionalTag(forgeRl("stained_glass/blue")); - tag(DYED_BROWN) - .addOptionalTag(forgeRl("glass/brown")) - .addOptionalTag(forgeRl("stained_glass/brown")); - tag(DYED_CYAN) - .addOptionalTag(forgeRl("glass/cyan")) - .addOptionalTag(forgeRl("stained_glass/cyan")); - tag(DYED_GRAY) - .addOptionalTag(forgeRl("glass/gray")) - .addOptionalTag(forgeRl("stained_glass/gray")); - tag(DYED_GREEN) - .addOptionalTag(forgeRl("glass/green")) - .addOptionalTag(forgeRl("stained_glass/green")); - tag(DYED_LIGHT_BLUE) - .addOptionalTag(forgeRl("glass/light_blue")) - .addOptionalTag(forgeRl("stained_glass/light_blue")); - tag(DYED_LIGHT_GRAY) - .addOptionalTag(forgeRl("glass/light_gray")) - .addOptionalTag(forgeRl("stained_glass/light_gray")); - tag(DYED_LIME) - .addOptionalTag(forgeRl("glass/lime")) - .addOptionalTag(forgeRl("stained_glass/lime")); - tag(DYED_MAGENTA) - .addOptionalTag(forgeRl("glass/magenta")) - .addOptionalTag(forgeRl("stained_glass/magenta")); - tag(DYED_MAGENTA) - .addOptionalTag(forgeRl("glass/magenta")) - .addOptionalTag(forgeRl("stained_glass/magenta")); - tag(DYED_ORANGE) - .addOptionalTag(forgeRl("glass/orange")) - .addOptionalTag(forgeRl("stained_glass/orange")); - tag(DYED_PINK) - .addOptionalTag(forgeRl("glass/pink")) - .addOptionalTag(forgeRl("stained_glass/pink")); - tag(DYED_PURPLE) - .addOptionalTag(forgeRl("glass/purple")) - .addOptionalTag(forgeRl("stained_glass/purple")); - tag(DYED_RED) - .addOptionalTag(forgeRl("glass/red")) - .addOptionalTag(forgeRl("stained_glass/red")); - tag(DYED_WHITE) - .addOptionalTag(forgeRl("glass/white")) - .addOptionalTag(forgeRl("stained_glass/white")); - tag(DYED_YELLOW) - .addOptionalTag(forgeRl("glass/yellow")) - .addOptionalTag(forgeRl("stained_glass/yellow")); - tagWithOptionalLegacy(ENDERMAN_PLACE_ON_BLACKLIST); - tag(GLASS_BLOCKS).addOptionalTag(forgeRl("glass")); - tag(GLASS_BLOCKS_COLORLESS).addOptionalTag(forgeRl("glass_colorless")); - tag(GLASS_BLOCKS_CHEAP).addOptionalTag(forgeRl("glass_silica")); - tag(GLASS_BLOCKS_TINTED).addOptionalTag(forgeRl("glass_tinted")); - tag(GLASS_PANES_COLORLESS).addOptionalTag(forgeRl("glass_panes_colorless")); - tag(OBSIDIANS).addOptionalTag(forgeRl("obsidian")); - tagWithOptionalLegacy(ORES); - tagWithOptionalLegacy(ORES_QUARTZ); - tagWithOptionalLegacy(ORES_NETHERITE_SCRAP); - tag(STONES).addOptionalTag(forgeRl("stone")); - tagWithOptionalLegacy(STORAGE_BLOCKS); - tagWithOptionalLegacy(STORAGE_BLOCKS_COAL); - tagWithOptionalLegacy(STORAGE_BLOCKS_COPPER); - tagWithOptionalLegacy(STORAGE_BLOCKS_DIAMOND); - tagWithOptionalLegacy(STORAGE_BLOCKS_EMERALD); - tagWithOptionalLegacy(STORAGE_BLOCKS_GOLD); - tagWithOptionalLegacy(STORAGE_BLOCKS_IRON); - tagWithOptionalLegacy(STORAGE_BLOCKS_LAPIS); - tagWithOptionalLegacy(STORAGE_BLOCKS_RAW_COPPER); - tagWithOptionalLegacy(STORAGE_BLOCKS_RAW_GOLD); - tagWithOptionalLegacy(STORAGE_BLOCKS_RAW_IRON); - tagWithOptionalLegacy(STORAGE_BLOCKS_REDSTONE); - tagWithOptionalLegacy(STORAGE_BLOCKS_NETHERITE); - tag(RELOCATION_NOT_SUPPORTED) - .addOptionalTag(forgeRl("relocation_not_supported")) - .addOptionalTag(forgeRl("immovable")); - tag(SANDSTONE_BLOCKS).addOptionalTag(forgeRl("sandstone")); - } - - /** - * Shorthand for {@code tag(tag).addOptionalTag(forgeRl(tag.location().getPath()))} - */ - private IntrinsicHolderTagsProvider.IntrinsicTagAppender tagWithOptionalLegacy(TagKey tag) { - IntrinsicHolderTagsProvider.IntrinsicTagAppender tagAppender = tag(tag); - tagAppender.addOptionalTag(forgeRl(tag.location().getPath())); - return tagAppender; + tag(forgeTagKey("barrels")).addTag(forgeTagKey("barrels/wooden")); + tag(forgeTagKey("barrels/wooden")).add(Blocks.BARREL); + tag(forgeTagKey("bookshelves")).add(Blocks.BOOKSHELF); + tag(forgeTagKey("chests")).addTags(forgeTagKey("chests/ender"), forgeTagKey("chests/trapped"), forgeTagKey("chests/wooden")); + tag(forgeTagKey("chests/wooden")).add(Blocks.CHEST, Blocks.TRAPPED_CHEST); + tag(forgeTagKey("cobblestone")).addTags(forgeTagKey("cobblestone/normal"), forgeTagKey("cobblestone/infested"), forgeTagKey("cobblestone/mossy"), forgeTagKey("cobblestone/deepslate")); + tag(forgeTagKey("glass")).addTags(forgeTagKey("glass/colorless"), forgeTagKey("stained_glass"), forgeTagKey("glass/tinted")); + tag(forgeTagKey("glass/colorless")).add(Blocks.GLASS); + tag(forgeTagKey("glass/silica")).add(Blocks.GLASS, Blocks.BLACK_STAINED_GLASS, Blocks.BLUE_STAINED_GLASS, Blocks.BROWN_STAINED_GLASS, Blocks.CYAN_STAINED_GLASS, Blocks.GRAY_STAINED_GLASS, Blocks.GREEN_STAINED_GLASS, Blocks.LIGHT_BLUE_STAINED_GLASS, Blocks.LIGHT_GRAY_STAINED_GLASS, Blocks.LIME_STAINED_GLASS, Blocks.MAGENTA_STAINED_GLASS, Blocks.ORANGE_STAINED_GLASS, Blocks.PINK_STAINED_GLASS, Blocks.PURPLE_STAINED_GLASS, Blocks.RED_STAINED_GLASS, Blocks.WHITE_STAINED_GLASS, Blocks.YELLOW_STAINED_GLASS); + tag(forgeTagKey("glass/tinted")).add(Blocks.TINTED_GLASS); + addColored(tag(forgeTagKey("stained_glass"))::add, forgeTagKey("glass"), "{color}_stained_glass"); + tag(forgeTagKey("glass_panes")).addTags(forgeTagKey("glass_panes/colorless"), forgeTagKey("stained_glass_panes")); + tag(forgeTagKey("glass_panes/colorless")).add(Blocks.GLASS_PANE); + addColored(tag(forgeTagKey("stained_glass_panes"))::add, forgeTagKey("glass_panes"), "{color}_stained_glass_pane"); + tag(forgeTagKey("obsidian")).add(Blocks.OBSIDIAN); + tag(forgeTagKey("ores")).addTags(forgeTagKey("ores/coal"), forgeTagKey("ores/copper"), forgeTagKey("ores/diamond"), forgeTagKey("ores/emerald"), forgeTagKey("ores/gold"), forgeTagKey("ores/iron"), forgeTagKey("ores/lapis"), forgeTagKey("ores/redstone"), forgeTagKey("ores/quartz"), forgeTagKey("ores/netherite_scrap")); + tag(forgeTagKey("ores/quartz")).add(Blocks.NETHER_QUARTZ_ORE); + tag(forgeTagKey("ores/netherite_scrap")).add(Blocks.ANCIENT_DEBRIS); + tag(forgeTagKey("sandstone")).add(Blocks.SANDSTONE, Blocks.CUT_SANDSTONE, Blocks.CHISELED_SANDSTONE, Blocks.SMOOTH_SANDSTONE, Blocks.RED_SANDSTONE, Blocks.CUT_RED_SANDSTONE, Blocks.CHISELED_RED_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); + tag(forgeTagKey("stone")).add(Blocks.ANDESITE, Blocks.DIORITE, Blocks.GRANITE, Blocks.INFESTED_STONE, Blocks.STONE, Blocks.POLISHED_ANDESITE, Blocks.POLISHED_DIORITE, Blocks.POLISHED_GRANITE, Blocks.DEEPSLATE, Blocks.POLISHED_DEEPSLATE, Blocks.INFESTED_DEEPSLATE, Blocks.TUFF); + tag(forgeTagKey("storage_blocks")) + .addTags(forgeTagKey("storage_blocks/amethyst"), forgeTagKey("storage_blocks/coal"), forgeTagKey("storage_blocks/copper"), forgeTagKey("storage_blocks/diamond"), forgeTagKey("storage_blocks/emerald"), forgeTagKey("storage_blocks/gold"), forgeTagKey("storage_blocks/iron"), forgeTagKey("storage_blocks/lapis"), forgeTagKey("storage_blocks/quartz"), forgeTagKey("storage_blocks/raw_copper"), forgeTagKey("storage_blocks/raw_gold"), forgeTagKey("storage_blocks/raw_iron"), forgeTagKey("storage_blocks/redstone"), forgeTagKey("storage_blocks/netherite")); + tag(forgeTagKey("storage_blocks/amethyst")).add(Blocks.AMETHYST_BLOCK); + tag(forgeTagKey("storage_blocks/coal")).add(Blocks.COAL_BLOCK); + tag(forgeTagKey("storage_blocks/copper")).add(Blocks.COPPER_BLOCK); + tag(forgeTagKey("storage_blocks/diamond")).add(Blocks.DIAMOND_BLOCK); + tag(forgeTagKey("storage_blocks/emerald")).add(Blocks.EMERALD_BLOCK); + tag(forgeTagKey("storage_blocks/gold")).add(Blocks.GOLD_BLOCK); + tag(forgeTagKey("storage_blocks/iron")).add(Blocks.IRON_BLOCK); + tag(forgeTagKey("storage_blocks/lapis")).add(Blocks.LAPIS_BLOCK); + tag(forgeTagKey("storage_blocks/quartz")).add(Blocks.QUARTZ_BLOCK); + tag(forgeTagKey("storage_blocks/raw_copper")).add(Blocks.RAW_COPPER_BLOCK); + tag(forgeTagKey("storage_blocks/raw_gold")).add(Blocks.RAW_GOLD_BLOCK); + tag(forgeTagKey("storage_blocks/raw_iron")).add(Blocks.RAW_IRON_BLOCK); + tag(forgeTagKey("storage_blocks/redstone")).add(Blocks.REDSTONE_BLOCK); + tag(forgeTagKey("storage_blocks/netherite")).add(Blocks.NETHERITE_BLOCK); } private void addColored(TagKey group, String pattern) { @@ -266,6 +274,19 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { } } + private void addColored(Consumer consumer, TagKey group, String pattern) { + String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; + for (DyeColor color : DyeColor.values()) { + ResourceLocation key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName())); + TagKey tag = getForgeTag(prefix + color.getName()); + Block block = ForgeRegistries.BLOCKS.getValue(key); + if (block == null || block == Blocks.AIR) + throw new IllegalStateException("Unknown vanilla block: " + key.toString()); + tag(tag).add(block); + consumer.accept(block); + } + } + private static void addColoredTags(Consumer> consumer, TagKey group) { String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; for (var color : DyeColor.values()) { @@ -284,8 +305,8 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { } } - private static ResourceLocation forgeRl(String path) { - return ResourceLocation.fromNamespaceAndPath("forge", path); + private static TagKey forgeTagKey(String path) { + return BlockTags.create(ResourceLocation.fromNamespaceAndPath("forge", path)); } @Override diff --git a/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java index c72d6f5b4a..ba5c918d21 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java @@ -9,6 +9,8 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.EntityTypeTagsProvider; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.EntityTypeTags; +import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; import org.jetbrains.annotations.ApiStatus; @@ -24,21 +26,21 @@ public final class ForgeEntityTypeTagsProvider extends EntityTypeTagsProvider { @Override public void addTags(HolderLookup.Provider lookupProvider) { - tag(BOSSES).add(EntityType.ENDER_DRAGON, EntityType.WITHER); + tag(BOSSES) + .add(EntityType.ENDER_DRAGON, EntityType.WITHER) + .addOptionalTag(forgeTagKey("bosses")); tag(MINECARTS).add(EntityType.MINECART, EntityType.CHEST_MINECART, EntityType.FURNACE_MINECART, EntityType.HOPPER_MINECART, EntityType.SPAWNER_MINECART, EntityType.TNT_MINECART, EntityType.COMMAND_BLOCK_MINECART); tag(BOATS).add(EntityType.BOAT, EntityType.CHEST_BOAT); tag(CAPTURING_NOT_SUPPORTED); tag(TELEPORTING_NOT_SUPPORTED); - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // Backwards compat definitions for pre-1.21 legacy `forge:` tags. // TODO: Remove backwards compat tag entries in 1.22 - tag(BOSSES).addOptionalTag(forgeRl("bosses")); - tag(MINECARTS).addOptionalTag(forgeRl("minecarts")); - tag(BOATS).addOptionalTag(forgeRl("boats")); + tag(forgeTagKey("bosses")).add(EntityType.ENDER_DRAGON, EntityType.WITHER); } - private static ResourceLocation forgeRl(String path) { - return ResourceLocation.fromNamespaceAndPath("forge", path); + private static TagKey> forgeTagKey(String path) { + return EntityTypeTags.create(ResourceLocation.fromNamespaceAndPath("forge", path)); } @Override diff --git a/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java index 4f1820b59c..57c45daa01 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java @@ -10,12 +10,15 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.tags.FluidTagsProvider; import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.FluidTags; import net.minecraft.tags.TagKey; import net.minecraft.world.level.material.Fluid; import net.minecraftforge.common.ForgeMod; import org.jetbrains.annotations.ApiStatus; import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; import static net.minecraftforge.common.Tags.Fluids.*; @@ -39,16 +42,15 @@ public final class ForgeFluidTagsProvider extends FluidTagsProvider { tag(BEETROOT_SOUP); tag(HIDDEN_FROM_RECIPE_VIEWERS); - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // Backwards compat definitions for pre-1.21 legacy `forge:` tags. // TODO: Remove backwards compat tag entries in 1.22 - tagWithOptionalLegacy(MILK); - tagWithOptionalLegacy(HONEY); + tag(forgeTagKey("milk")) + .addOptional(ForgeMod.MILK.getId()) + .addOptional(ForgeMod.FLOWING_MILK.getId()); } - private IntrinsicHolderTagsProvider.IntrinsicTagAppender tagWithOptionalLegacy(TagKey tag) { - IntrinsicHolderTagsProvider.IntrinsicTagAppender tagAppender = tag(tag); - tagAppender.addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", tag.location().getPath())); - return tagAppender; + private static TagKey forgeTagKey(String path) { + return FluidTags.create(ResourceLocation.fromNamespaceAndPath("forge", path)); } @Override diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index af1a555d2d..96a1f8cc03 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -11,6 +11,7 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; @@ -18,6 +19,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; import net.minecraft.world.level.block.Block; import net.minecraftforge.common.Tags; +import net.minecraftforge.registries.ForgeRegistries; import org.jetbrains.annotations.ApiStatus; import java.util.Locale; @@ -73,17 +75,27 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { Tags.Items.CROPS_COCOA_BEAN, Tags.Items.CROPS_MELON, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_PUMPKIN, Tags.Items.CROPS_SUGAR_CANE, Tags.Items.CROPS_WHEAT - ); - tag(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT); + ).addOptionalTag(forgeItemTagKey("crops")); + tag(Tags.Items.CROPS_BEETROOT) + .add(Items.BEETROOT) + .addOptionalTag(forgeItemTagKey("crops/beetroot")); tag(Tags.Items.CROPS_CACTUS).add(Items.CACTUS); - tag(Tags.Items.CROPS_CARROT).add(Items.CARROT); + tag(Tags.Items.CROPS_CARROT) + .add(Items.CARROT) + .addOptionalTag(forgeItemTagKey("crops/carrot")); tag(Tags.Items.CROPS_COCOA_BEAN).add(Items.COCOA_BEANS); tag(Tags.Items.CROPS_MELON).add(Items.MELON); - tag(Tags.Items.CROPS_NETHER_WART).add(Items.NETHER_WART); - tag(Tags.Items.CROPS_POTATO).add(Items.POTATO); + tag(Tags.Items.CROPS_NETHER_WART) + .add(Items.NETHER_WART) + .addOptionalTag(forgeItemTagKey("crops/nether_wart")); + tag(Tags.Items.CROPS_POTATO) + .add(Items.POTATO) + .addOptionalTag(forgeItemTagKey("crops/potato")); tag(Tags.Items.CROPS_PUMPKIN).add(Items.PUMPKIN); tag(Tags.Items.CROPS_SUGAR_CANE).add(Items.SUGAR_CANE); - tag(Tags.Items.CROPS_WHEAT).add(Items.WHEAT); + tag(Tags.Items.CROPS_WHEAT) + .add(Items.WHEAT) + .addOptionalTag(forgeItemTagKey("crops/wheat")); addColored(Tags.Items.DYED, "{color}_banner"); addColored(Tags.Items.DYED, "{color}_bed"); addColored(Tags.Items.DYED, "{color}_candle"); @@ -98,15 +110,23 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { addColored(Tags.Items.DYED, "{color}_wool"); addColoredTags(tag(Tags.Items.DYED)::addTags, Tags.Items.DYED); tag(Tags.Items.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_REDSTONE); - tag(Tags.Items.DUSTS_GLOWSTONE).add(Items.GLOWSTONE_DUST); - tag(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE); + tag(Tags.Items.DUSTS_GLOWSTONE) + .add(Items.GLOWSTONE_DUST) + .addOptionalTag(forgeItemTagKey("dusts/glowstone")); + tag(Tags.Items.DUSTS_REDSTONE) + .add(Items.REDSTONE) + .addOptionalTag(forgeItemTagKey("dusts/redstone")); addColored(Tags.Items.DYES, "{color}_dye"); addColoredTags(tag(Tags.Items.DYES)::addTags, Tags.Items.DYES); - tag(Tags.Items.EGGS).add(Items.EGG); - tag(Tags.Items.ENCHANTING_FUELS).addTag(Tags.Items.GEMS_LAPIS); + tag(Tags.Items.EGGS).add(Items.EGG); // forge:eggs + tag(Tags.Items.ENCHANTING_FUELS).addTag(Tags.Items.GEMS_LAPIS); // forge:enchanting_fuels copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES); - tag(Tags.Items.ENDER_PEARLS).add(Items.ENDER_PEARL); - tag(Tags.Items.FEATHERS).add(Items.FEATHER); + tag(Tags.Items.ENDER_PEARLS) + .add(Items.ENDER_PEARL) + .addOptionalTag(forgeItemTagKey("ender_pearls")); + tag(Tags.Items.FEATHERS) + .add(Items.FEATHER) + .addOptionalTag(forgeItemTagKey("feathers")); copy(Tags.Blocks.FENCE_GATES, Tags.Items.FENCE_GATES); copy(Tags.Blocks.FENCE_GATES_WOODEN, Tags.Items.FENCE_GATES_WOODEN); copy(Tags.Blocks.FENCES, Tags.Items.FENCES); @@ -140,13 +160,27 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { ItemTags.GOAT_FOOD, ItemTags.HOGLIN_FOOD, ItemTags.HORSE_FOOD, ItemTags.LLAMA_FOOD, ItemTags.OCELOT_FOOD, ItemTags.PANDA_FOOD, ItemTags.PARROT_FOOD, ItemTags.PIG_FOOD, ItemTags.PIGLIN_FOOD, ItemTags.RABBIT_FOOD, ItemTags.SHEEP_FOOD, ItemTags.SNIFFER_FOOD, ItemTags.STRIDER_FOOD, ItemTags.TURTLE_FOOD, ItemTags.WOLF_FOOD); - tag(Tags.Items.GEMS).addTags(Tags.Items.GEMS_AMETHYST, Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ); - tag(Tags.Items.GEMS_AMETHYST).add(Items.AMETHYST_SHARD); - tag(Tags.Items.GEMS_DIAMOND).add(Items.DIAMOND); - tag(Tags.Items.GEMS_EMERALD).add(Items.EMERALD); - tag(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI); - tag(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS); - tag(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ); + tag(Tags.Items.GEMS) + .addTags(Tags.Items.GEMS_AMETHYST, Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ) + .addOptionalTag(forgeItemTagKey("gems")); + tag(Tags.Items.GEMS_AMETHYST) + .add(Items.AMETHYST_SHARD) + .addOptionalTag(forgeItemTagKey("gems/amethyst")); + tag(Tags.Items.GEMS_DIAMOND) + .add(Items.DIAMOND) + .addOptionalTag(forgeItemTagKey("gems/diamond")); + tag(Tags.Items.GEMS_EMERALD) + .add(Items.EMERALD) + .addOptionalTag(forgeItemTagKey("gems/emerald")); + tag(Tags.Items.GEMS_LAPIS) + .add(Items.LAPIS_LAZULI) + .addOptionalTag(forgeItemTagKey("gems/lapis")); + tag(Tags.Items.GEMS_PRISMARINE) + .add(Items.PRISMARINE_CRYSTALS) + .addOptionalTag(forgeItemTagKey("gems/prismarine")); + tag(Tags.Items.GEMS_QUARTZ) + .add(Items.QUARTZ) + .addOptionalTag(forgeItemTagKey("gems/quartz")); copy(Tags.Blocks.GLASS_BLOCKS, Tags.Items.GLASS_BLOCKS); copy(Tags.Blocks.GLASS_BLOCKS_COLORLESS, Tags.Items.GLASS_BLOCKS_COLORLESS); copy(Tags.Blocks.GLASS_BLOCKS_TINTED, Tags.Items.GLASS_BLOCKS_TINTED); @@ -155,25 +189,47 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { copy(Tags.Blocks.GLASS_PANES_COLORLESS, Tags.Items.GLASS_PANES_COLORLESS); copy(Tags.Blocks.GLAZED_TERRACOTTAS, Tags.Items.GLAZED_TERRACOTTAS); copy(Tags.Blocks.GRAVEL, Tags.Items.GRAVEL); - tag(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER); + tag(Tags.Items.GUNPOWDER).add(Items.GUNPOWDER); // forge:gunpowder tag(Tags.Items.HIDDEN_FROM_RECIPE_VIEWERS); - tag(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_COPPER, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_NETHERITE); - tag(Tags.Items.INGOTS_COPPER).add(Items.COPPER_INGOT); - tag(Tags.Items.INGOTS_GOLD).add(Items.GOLD_INGOT); - tag(Tags.Items.INGOTS_IRON).add(Items.IRON_INGOT); - tag(Tags.Items.INGOTS_NETHERITE).add(Items.NETHERITE_INGOT); - tag(Tags.Items.LEATHERS).add(Items.LEATHER); - tag(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM); + tag(Tags.Items.INGOTS) + .addTags(Tags.Items.INGOTS_COPPER, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_NETHERITE); + //.addOptionalTag(forgeItemTagKey("ingots")); // can't add because it would contain the contents of forge:ingots/brick and forge:ingots/nether_brick which are not in the c namespace + tag(Tags.Items.INGOTS_COPPER) + .add(Items.COPPER_INGOT) + .addOptionalTag(forgeItemTagKey("ingots/copper")); + tag(Tags.Items.INGOTS_GOLD) + .add(Items.GOLD_INGOT) + .addOptionalTag(forgeItemTagKey("ingots/gold")); + tag(Tags.Items.INGOTS_IRON) + .add(Items.IRON_INGOT) + .addOptionalTag(forgeItemTagKey("ingots/iron")); + tag(Tags.Items.INGOTS_NETHERITE) + .add(Items.NETHERITE_INGOT) + .addOptionalTag(forgeItemTagKey("ingots/netherite")); + tag(Tags.Items.LEATHERS) + .add(Items.LEATHER) + .addOptionalTag(forgeItemTagKey("leather")); + tag(Tags.Items.MUSHROOMS) + .add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM) + .addOptionalTag(forgeItemTagKey("mushrooms")); tag(Tags.Items.MUSIC_DISCS).add(Items.MUSIC_DISC_13, Items.MUSIC_DISC_CAT, Items.MUSIC_DISC_BLOCKS, Items.MUSIC_DISC_CHIRP, Items.MUSIC_DISC_FAR, Items.MUSIC_DISC_MALL, Items.MUSIC_DISC_MELLOHI, Items.MUSIC_DISC_STAL, Items.MUSIC_DISC_STRAD, Items.MUSIC_DISC_WARD, Items.MUSIC_DISC_11, Items.MUSIC_DISC_WAIT, Items.MUSIC_DISC_OTHERSIDE, Items.MUSIC_DISC_5, Items.MUSIC_DISC_PIGSTEP, Items.MUSIC_DISC_RELIC, Items.MUSIC_DISC_CREATOR, Items.MUSIC_DISC_CREATOR_MUSIC_BOX, Items.MUSIC_DISC_PRECIPICE); - tag(Tags.Items.NETHER_STARS).add(Items.NETHER_STAR); + tag(Tags.Items.NETHER_STARS) + .add(Items.NETHER_STAR) + .addOptionalTag(forgeItemTagKey("nether_stars")); copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK); - tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON); - tag(Tags.Items.NUGGETS_IRON).add(Items.IRON_NUGGET); - tag(Tags.Items.NUGGETS_GOLD).add(Items.GOLD_NUGGET); + tag(Tags.Items.NUGGETS) + .addTags(Tags.Items.NUGGETS_GOLD, Tags.Items.NUGGETS_IRON) + .addOptionalTag(forgeItemTagKey("nuggets")); + tag(Tags.Items.NUGGETS_IRON) + .add(Items.IRON_NUGGET) + .addOptionalTag(forgeItemTagKey("nuggets/iron")); + tag(Tags.Items.NUGGETS_GOLD) + .add(Items.GOLD_NUGGET) + .addOptionalTag(forgeItemTagKey("nuggets/gold")); copy(Tags.Blocks.OBSIDIANS, Tags.Items.OBSIDIANS); copy(Tags.Blocks.OBSIDIANS_NORMAL, Tags.Items.OBSIDIANS_NORMAL); copy(Tags.Blocks.OBSIDIANS_CRYING, Tags.Items.OBSIDIANS_CRYING); @@ -199,18 +255,32 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE); copy(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES); copy(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES); - tag(Tags.Items.RAW_MATERIALS).addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON); - tag(Tags.Items.RAW_MATERIALS_COPPER).add(Items.RAW_COPPER); - tag(Tags.Items.RAW_MATERIALS_GOLD).add(Items.RAW_GOLD); - tag(Tags.Items.RAW_MATERIALS_IRON).add(Items.RAW_IRON); - tag(Tags.Items.RODS).addTags(Tags.Items.RODS_WOODEN, Tags.Items.RODS_BLAZE, Tags.Items.RODS_BREEZE); - tag(Tags.Items.RODS_BLAZE).add(Items.BLAZE_ROD); + tag(Tags.Items.RAW_MATERIALS) + .addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON) + .addOptionalTag(forgeItemTagKey("raw_materials")); + tag(Tags.Items.RAW_MATERIALS_COPPER) + .add(Items.RAW_COPPER) + .addOptionalTag(forgeItemTagKey("raw_materials/copper")); + tag(Tags.Items.RAW_MATERIALS_GOLD) + .add(Items.RAW_GOLD) + .addOptionalTag(forgeItemTagKey("raw_materials/gold")); + tag(Tags.Items.RAW_MATERIALS_IRON) + .add(Items.RAW_IRON) + .addOptionalTag(forgeItemTagKey("raw_materials/iron")); + tag(Tags.Items.RODS) + .addTags(Tags.Items.RODS_WOODEN, Tags.Items.RODS_BLAZE, Tags.Items.RODS_BREEZE) + .addOptionalTag(forgeItemTagKey("rods")); + tag(Tags.Items.RODS_BLAZE) + .add(Items.BLAZE_ROD) + .addOptionalTag(forgeItemTagKey("rods/blaze")); tag(Tags.Items.RODS_BREEZE).add(Items.BREEZE_ROD); - tag(Tags.Items.RODS_WOODEN).add(Items.STICK); + tag(Tags.Items.RODS_WOODEN) + .add(Items.STICK) + .addOptionalTag(forgeItemTagKey("rods/wooden")); copy(Tags.Blocks.ROPES, Tags.Items.ROPES); - copy(Tags.Blocks.SAND, Tags.Items.SAND); - copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS); - copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED); + copy(Tags.Blocks.SAND, Tags.Items.SAND); // forge:sand + copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS); // forge:sand/colorless + copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED); // forge:sand/red copy(Tags.Blocks.SANDSTONE_BLOCKS, Tags.Items.SANDSTONE_BLOCKS); copy(Tags.Blocks.SANDSTONE_SLABS, Tags.Items.SANDSTONE_SLABS); copy(Tags.Blocks.SANDSTONE_STAIRS, Tags.Items.SANDSTONE_STAIRS); @@ -225,7 +295,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { tag(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS); tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS); tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS); - tag(Tags.Items.SLIME_BALLS).add(Items.SLIME_BALL); + tag(Tags.Items.SLIME_BALLS) + .add(Items.SLIME_BALL) + .addOptionalTag(forgeItemTagKey("slimeballs")); tag(Tags.Items.SHULKER_BOXES) .add(Items.SHULKER_BOX, Items.WHITE_SHULKER_BOX, Items.ORANGE_SHULKER_BOX, Items.MAGENTA_SHULKER_BOX, Items.LIGHT_BLUE_SHULKER_BOX, Items.YELLOW_SHULKER_BOX, @@ -251,19 +323,31 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE); copy(Tags.Blocks.STORAGE_BLOCKS_SLIME, Tags.Items.STORAGE_BLOCKS_SLIME); copy(Tags.Blocks.STORAGE_BLOCKS_WHEAT, Tags.Items.STORAGE_BLOCKS_WHEAT); - tag(Tags.Items.STRINGS).add(Items.STRING); + tag(Tags.Items.STRINGS) + .add(Items.STRING) + .addOptionalTag(forgeItemTagKey("strings")); tag(Tags.Items.VILLAGER_JOB_SITES).add( Items.BARREL, Items.BLAST_FURNACE, Items.BREWING_STAND, Items.CARTOGRAPHY_TABLE, Items.CAULDRON, Items.COMPOSTER, Items.FLETCHING_TABLE, Items.GRINDSTONE, Items.LECTERN, Items.LOOM, Items.SMITHING_TABLE, Items.SMOKER, Items.STONECUTTER); // Tools and Armors - tag(Tags.Items.TOOLS_SHIELD).add(Items.SHIELD); - tag(Tags.Items.TOOLS_BOW).add(Items.BOW); + tag(Tags.Items.TOOLS_SHIELD) + .add(Items.SHIELD) + .addOptionalTag(forgeItemTagKey("tools/shields")); + tag(Tags.Items.TOOLS_BOW) + .add(Items.BOW) + .addOptionalTag(forgeItemTagKey("tools/bows")); tag(Tags.Items.TOOLS_BRUSH).add(Items.BRUSH); - tag(Tags.Items.TOOLS_CROSSBOW).add(Items.CROSSBOW); - tag(Tags.Items.TOOLS_FISHING_ROD).add(Items.FISHING_ROD); - tag(Tags.Items.TOOLS_SHEAR).add(Items.SHEARS); + tag(Tags.Items.TOOLS_CROSSBOW) + .add(Items.CROSSBOW) + .addOptionalTag(forgeItemTagKey("tools/crossbows")); + tag(Tags.Items.TOOLS_FISHING_ROD) + .add(Items.FISHING_ROD) + .addOptionalTag(forgeItemTagKey("tools/fishing_rods")); + tag(Tags.Items.TOOLS_SHEAR) + .add(Items.SHEARS) + .addOptionalTag(forgeItemTagKey("tools/shears")); tag(Tags.Items.TOOLS_SPEAR).add(Items.TRIDENT); tag(Tags.Items.TOOLS_MACE).add(Items.MACE); tag(Tags.Items.TOOLS_IGNITER).add(Items.FLINT_AND_STEEL); @@ -277,127 +361,155 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { tag(Tags.Items.TOOLS) .addTags(ItemTags.AXES, ItemTags.HOES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.SWORDS) .addTags(Tags.Items.TOOLS_BOW, Tags.Items.TOOLS_BRUSH, Tags.Items.TOOLS_CROSSBOW, Tags.Items.TOOLS_FISHING_ROD, Tags.Items.TOOLS_SHEAR, Tags.Items.TOOLS_IGNITER, Tags.Items.TOOLS_SHIELD, Tags.Items.TOOLS_SPEAR, Tags.Items.TOOLS_MACE, Tags.Items.MINING_TOOL_TOOLS, Tags.Items.MELEE_WEAPON_TOOLS, Tags.Items.RANGED_WEAPON_TOOLS); - tag(Tags.Items.ARMORS).addTags(ItemTags.HEAD_ARMOR, ItemTags.CHEST_ARMOR, ItemTags.LEG_ARMOR, ItemTags.FOOT_ARMOR); + tag(Tags.Items.ARMORS) + .addTags(ItemTags.HEAD_ARMOR, ItemTags.CHEST_ARMOR, ItemTags.LEG_ARMOR, ItemTags.FOOT_ARMOR) + .addOptionalTag(forgeItemTagKey("armors")); tag(Tags.Items.ENCHANTABLES).addTags(ItemTags.ARMOR_ENCHANTABLE, ItemTags.EQUIPPABLE_ENCHANTABLE, ItemTags.WEAPON_ENCHANTABLE, ItemTags.SWORD_ENCHANTABLE, ItemTags.MINING_ENCHANTABLE, ItemTags.MINING_LOOT_ENCHANTABLE, ItemTags.FISHING_ENCHANTABLE, ItemTags.TRIDENT_ENCHANTABLE, ItemTags.BOW_ENCHANTABLE, ItemTags.CROSSBOW_ENCHANTABLE, ItemTags.MACE_ENCHANTABLE, ItemTags.FIRE_ASPECT_ENCHANTABLE, ItemTags.DURABILITY_ENCHANTABLE, ItemTags.VANISHING_ENCHANTABLE); - // Backwards compat with pre-1.21 tags. Done after so optional tag is last for better readability. + // Backwards compat definitions for pre-1.21 legacy `forge:` tags. // TODO: Remove backwards compat tag entries in 1.22 - tagWithOptionalLegacy(Tags.Items.BONES); - tag(Tags.Items.BRICKS_NORMAL).addOptionalTag(forgeRl("ingots/brick")); - tag(Tags.Items.BRICKS_NETHER).addOptionalTag(forgeRl("ingots/nether_brick")); - tagWithOptionalLegacy(Tags.Items.CROPS); - tagWithOptionalLegacy(Tags.Items.CROPS_BEETROOT); - tagWithOptionalLegacy(Tags.Items.CROPS_CARROT); - tagWithOptionalLegacy(Tags.Items.CROPS_NETHER_WART); - tagWithOptionalLegacy(Tags.Items.CROPS_POTATO); - tagWithOptionalLegacy(Tags.Items.CROPS_WHEAT); - tagWithOptionalLegacy(Tags.Items.DUSTS); - tagWithOptionalLegacy(Tags.Items.DUSTS_GLOWSTONE); - tagWithOptionalLegacy(Tags.Items.DUSTS_REDSTONE); - tagColoredWithOptionalLegacy(Tags.Items.DYES); - tag(Tags.Items.DYED_BLACK) - .addOptionalTag(forgeRl("glass/black")) - .addOptionalTag(forgeRl("stained_glass/black")); - tag(Tags.Items.DYED_BLUE) - .addOptionalTag(forgeRl("glass/blue")) - .addOptionalTag(forgeRl("stained_glass/blue")); - tag(Tags.Items.DYED_BROWN) - .addOptionalTag(forgeRl("glass/brown")) - .addOptionalTag(forgeRl("stained_glass/brown")); - tag(Tags.Items.DYED_CYAN) - .addOptionalTag(forgeRl("glass/cyan")) - .addOptionalTag(forgeRl("stained_glass/cyan")); - tag(Tags.Items.DYED_GRAY) - .addOptionalTag(forgeRl("glass/gray")) - .addOptionalTag(forgeRl("stained_glass/gray")); - tag(Tags.Items.DYED_GREEN) - .addOptionalTag(forgeRl("glass/green")) - .addOptionalTag(forgeRl("stained_glass/green")); - tag(Tags.Items.DYED_LIGHT_BLUE) - .addOptionalTag(forgeRl("glass/light_blue")) - .addOptionalTag(forgeRl("stained_glass/light_blue")); - tag(Tags.Items.DYED_LIGHT_GRAY) - .addOptionalTag(forgeRl("glass/light_gray")) - .addOptionalTag(forgeRl("stained_glass/light_gray")); - tag(Tags.Items.DYED_LIME) - .addOptionalTag(forgeRl("glass/lime")) - .addOptionalTag(forgeRl("stained_glass/lime")); - tag(Tags.Items.DYED_MAGENTA) - .addOptionalTag(forgeRl("glass/magenta")) - .addOptionalTag(forgeRl("stained_glass/magenta")); - tag(Tags.Items.DYED_MAGENTA) - .addOptionalTag(forgeRl("glass/magenta")) - .addOptionalTag(forgeRl("stained_glass/magenta")); - tag(Tags.Items.DYED_ORANGE) - .addOptionalTag(forgeRl("glass/orange")) - .addOptionalTag(forgeRl("stained_glass/orange")); - tag(Tags.Items.DYED_PINK) - .addOptionalTag(forgeRl("glass/pink")) - .addOptionalTag(forgeRl("stained_glass/pink")); - tag(Tags.Items.DYED_PURPLE) - .addOptionalTag(forgeRl("glass/purple")) - .addOptionalTag(forgeRl("stained_glass/purple")); - tag(Tags.Items.DYED_RED) - .addOptionalTag(forgeRl("glass/red")) - .addOptionalTag(forgeRl("stained_glass/red")); - tag(Tags.Items.DYED_WHITE) - .addOptionalTag(forgeRl("glass/white")) - .addOptionalTag(forgeRl("stained_glass/white")); - tag(Tags.Items.DYED_YELLOW) - .addOptionalTag(forgeRl("glass/yellow")) - .addOptionalTag(forgeRl("stained_glass/yellow")); - tagWithOptionalLegacy(Tags.Items.ENDER_PEARLS); - tagWithOptionalLegacy(Tags.Items.GEMS); - tagWithOptionalLegacy(Tags.Items.GEMS_AMETHYST); - tagWithOptionalLegacy(Tags.Items.GEMS_DIAMOND); - tagWithOptionalLegacy(Tags.Items.GEMS_EMERALD); - tagWithOptionalLegacy(Tags.Items.GEMS_LAPIS); - tagWithOptionalLegacy(Tags.Items.GEMS_PRISMARINE); - tagWithOptionalLegacy(Tags.Items.GEMS_QUARTZ); - tagWithOptionalLegacy(Tags.Items.INGOTS); - tagWithOptionalLegacy(Tags.Items.INGOTS_COPPER); - tagWithOptionalLegacy(Tags.Items.INGOTS_GOLD); - tagWithOptionalLegacy(Tags.Items.INGOTS_IRON); - tagWithOptionalLegacy(Tags.Items.INGOTS_NETHERITE); - tag(Tags.Items.LEATHERS).addOptionalTag(forgeRl("leather")); - tagWithOptionalLegacy(Tags.Items.NUGGETS); - tagWithOptionalLegacy(Tags.Items.NUGGETS_IRON); - tagWithOptionalLegacy(Tags.Items.NUGGETS_GOLD); - tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS); - tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS_COPPER); - tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS_GOLD); - tagWithOptionalLegacy(Tags.Items.RAW_MATERIALS_IRON); - tagWithOptionalLegacy(Tags.Items.RODS); - tagWithOptionalLegacy(Tags.Items.RODS_BLAZE); - tagWithOptionalLegacy(Tags.Items.RODS_WOODEN); - tag(Tags.Items.SLIME_BALLS).addOptionalTag(forgeRl("slimeballs")); - tagWithOptionalLegacy(Tags.Items.STRINGS); - tagWithOptionalLegacy(Tags.Items.TOOLS); - tagWithOptionalLegacy(Tags.Items.ARMORS); - tag(Tags.Items.TOOLS_SHIELD).addOptionalTag(forgeRl("tools/shields")); - tag(Tags.Items.TOOLS_BOW).addOptionalTag(forgeRl("tools/bows")); - tag(Tags.Items.TOOLS_BRUSH).addOptionalTag(forgeRl("tools/brushes")); - tag(Tags.Items.TOOLS_CROSSBOW).addOptionalTag(forgeRl("tools/crossbows")); - tag(Tags.Items.TOOLS_FISHING_ROD).addOptionalTag(forgeRl("tools/fishing_rods")); - tag(Tags.Items.TOOLS_SHEAR).addOptionalTag(forgeRl("shears")); // yes, it's forge:shears not forge:tools/shears - tag(Tags.Items.TOOLS_SPEAR).addOptionalTag(forgeRl("tools/tridents")); - } - - /** - * Shorthand for {@code tag(tag).addOptionalTag(forgeRl(tag.location().getPath()))} - */ - private IntrinsicHolderTagsProvider.IntrinsicTagAppender tagWithOptionalLegacy(TagKey tag) { - IntrinsicHolderTagsProvider.IntrinsicTagAppender tagAppender = tag(tag); - tagAppender.addOptionalTag(forgeRl(tag.location().getPath())); - return tagAppender; - } - - private void tagColoredWithOptionalLegacy(TagKey group) { - String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; - for (DyeColor color : DyeColor.values()) { - TagKey tag = getForgeItemTag(prefix + color.getName()); - tagWithOptionalLegacy(tag); - } + copy(forgeBlockTagKey("barrels"), forgeItemTagKey("barrels")); + copy(forgeBlockTagKey("barrels/wooden"), forgeItemTagKey("barrels/wooden")); + tag(forgeItemTagKey("bones")).add(Items.BONE); + copy(forgeBlockTagKey("bookshelves"), forgeItemTagKey("bookshelves")); + copy(forgeBlockTagKey("chests"), forgeItemTagKey("chests")); + copy(forgeBlockTagKey("chests/ender"), forgeItemTagKey("chests/ender")); + copy(forgeBlockTagKey("chests/trapped"), forgeItemTagKey("chests/trapped")); + copy(forgeBlockTagKey("chests/wooden"), forgeItemTagKey("chests/wooden")); + copy(forgeBlockTagKey("cobblestone"), forgeItemTagKey("cobblestone")); + copy(forgeBlockTagKey("cobblestone/normal"), forgeItemTagKey("cobblestone/normal")); + copy(forgeBlockTagKey("cobblestone/infested"), forgeItemTagKey("cobblestone/infested")); + copy(forgeBlockTagKey("cobblestone/mossy"), forgeItemTagKey("cobblestone/mossy")); + copy(forgeBlockTagKey("cobblestone/deepslate"), forgeItemTagKey("cobblestone/deepslate")); + tag(forgeItemTagKey("crops")) + .addTags(forgeItemTagKey("crops/beetroot"), forgeItemTagKey("crops/carrot"), forgeItemTagKey("crops/nether_wart"), + forgeItemTagKey("crops/potato"), forgeItemTagKey("crops/wheat")); + tag(forgeItemTagKey("crops/beetroot")).add(Items.BEETROOT); + tag(forgeItemTagKey("crops/carrot")).add(Items.CARROT); + tag(forgeItemTagKey("crops/nether_wart")).add(Items.NETHER_WART); + tag(forgeItemTagKey("crops/potato")).add(Items.POTATO); + tag(forgeItemTagKey("crops/wheat")).add(Items.WHEAT); + tag(forgeItemTagKey("dusts")).addTags(forgeItemTagKey("dusts/glowstone"), Tags.Items.DUSTS_PRISMARINE, forgeItemTagKey("dusts/redstone")); + tag(forgeItemTagKey("dusts/glowstone")).add(Items.GLOWSTONE_DUST); + tag(forgeItemTagKey("dusts/prismarine")).add(Items.PRISMARINE_SHARD); + tag(forgeItemTagKey("dusts/redstone")).add(Items.REDSTONE); + addColored(tag(forgeItemTagKey("dyes"))::addTags, forgeItemTagKey("dyes"), "{color}_dye"); + tag(forgeItemTagKey("eggs")).add(Items.EGG); + tag(forgeItemTagKey("enchanting_fuels")).addTag(forgeItemTagKey("gems/lapis")); + copy(forgeBlockTagKey("end_stones"), forgeItemTagKey("end_stones")); + tag(forgeItemTagKey("ender_pearls")).add(Items.ENDER_PEARL); + tag(forgeItemTagKey("feathers")).add(Items.FEATHER); + copy(forgeBlockTagKey("fence_gates"), forgeItemTagKey("fence_gates")); + copy(forgeBlockTagKey("fence_gates/wooden"), forgeItemTagKey("fence_gates/wooden")); + copy(forgeBlockTagKey("fences"), forgeItemTagKey("fences")); + copy(forgeBlockTagKey("fences/nether_brick"), forgeItemTagKey("fences/nether_brick")); + copy(forgeBlockTagKey("fences/wooden"), forgeItemTagKey("fences/wooden")); + tag(forgeItemTagKey("gems")) + .addTags(forgeItemTagKey("gems/amethyst"), forgeItemTagKey("gems/diamond"), forgeItemTagKey("gems/emerald"), + forgeItemTagKey("gems/lapis"), forgeItemTagKey("gems/prismarine"), forgeItemTagKey("gems/quartz")); + tag(forgeItemTagKey("gems/amethyst")).add(Items.AMETHYST_SHARD); + tag(forgeItemTagKey("gems/diamond")).add(Items.DIAMOND); + tag(forgeItemTagKey("gems/emerald")).add(Items.EMERALD); + tag(forgeItemTagKey("gems/lapis")).add(Items.LAPIS_LAZULI); + tag(forgeItemTagKey("gems/prismarine")).add(Items.PRISMARINE_CRYSTALS); + tag(forgeItemTagKey("gems/quartz")).add(Items.QUARTZ); + copy(forgeBlockTagKey("glass"), forgeItemTagKey("glass")); + copy(forgeBlockTagKey("glass/tinted"), forgeItemTagKey("glass/tinted")); + copy(forgeBlockTagKey("glass/silica"), forgeItemTagKey("glass/silica")); + copyColored(forgeBlockTagKey("glass"), forgeItemTagKey("glass")); + copy(forgeBlockTagKey("glass_panes"), forgeItemTagKey("glass_panes")); + copyColored(forgeBlockTagKey("glass_panes"), forgeItemTagKey("glass_panes")); + copy(forgeBlockTagKey("glass_panes/colorless"), forgeItemTagKey("glass_panes/colorless")); + copy(forgeBlockTagKey("gravel"), forgeItemTagKey("gravel")); + tag(forgeItemTagKey("gunpowder")).add(Items.GUNPOWDER); + tag(forgeItemTagKey("heads")).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD); + tag(forgeItemTagKey("ingots")) + .addTags(forgeItemTagKey("ingots/brick"), forgeItemTagKey("ingots/copper"), forgeItemTagKey("ingots/gold"), + forgeItemTagKey("ingots/iron"), forgeItemTagKey("ingots/netherite"), forgeItemTagKey("ingots/nether_brick")); + tag(forgeItemTagKey("ingots/brick")).add(Items.BRICK); + tag(forgeItemTagKey("ingots/copper")).add(Items.COPPER_INGOT); + tag(forgeItemTagKey("ingots/gold")).add(Items.GOLD_INGOT); + tag(forgeItemTagKey("ingots/iron")).add(Items.IRON_INGOT); + tag(forgeItemTagKey("ingots/netherite")).add(Items.NETHERITE_INGOT); + tag(forgeItemTagKey("ingots/nether_brick")).add(Items.NETHER_BRICK); + tag(forgeItemTagKey("leather")).add(Items.LEATHER); + tag(forgeItemTagKey("mushrooms")).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM); + tag(forgeItemTagKey("nether_stars")).add(Items.NETHER_STAR); + copy(forgeBlockTagKey("netherrack"), forgeItemTagKey("netherrack")); + tag(forgeItemTagKey("nuggets")).addTags(forgeItemTagKey("nuggets/iron"), forgeItemTagKey("nuggets/gold")); + tag(forgeItemTagKey("nuggets/iron")).add(Items.IRON_NUGGET); + tag(forgeItemTagKey("nuggets/gold")).add(Items.GOLD_NUGGET); + copy(forgeBlockTagKey("obsidian"), forgeItemTagKey("obsidian")); + copy(Tags.Blocks.ORE_BEARING_GROUND_DEEPSLATE, Tags.Items.ORE_BEARING_GROUND_DEEPSLATE); + copy(Tags.Blocks.ORE_BEARING_GROUND_NETHERRACK, Tags.Items.ORE_BEARING_GROUND_NETHERRACK); + copy(Tags.Blocks.ORE_BEARING_GROUND_STONE, Tags.Items.ORE_BEARING_GROUND_STONE); + copy(Tags.Blocks.ORE_RATES_DENSE, Tags.Items.ORE_RATES_DENSE); + copy(Tags.Blocks.ORE_RATES_SINGULAR, Tags.Items.ORE_RATES_SINGULAR); + copy(Tags.Blocks.ORE_RATES_SPARSE, Tags.Items.ORE_RATES_SPARSE); + copy(forgeBlockTagKey("ores"), forgeItemTagKey("ores")); + copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL); + copy(Tags.Blocks.ORES_COPPER, Tags.Items.ORES_COPPER); + copy(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND); + copy(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD); + copy(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD); + copy(Tags.Blocks.ORES_IRON, Tags.Items.ORES_IRON); + copy(Tags.Blocks.ORES_LAPIS, Tags.Items.ORES_LAPIS); + copy(forgeBlockTagKey("ores/quartz"), forgeItemTagKey("ores/quartz")); + copy(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE); + copy(forgeBlockTagKey("ores/netherite_scrap"), forgeItemTagKey("ores/netherite_scrap")); + copy(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE); + copy(Tags.Blocks.ORES_IN_GROUND_NETHERRACK, Tags.Items.ORES_IN_GROUND_NETHERRACK); + copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE); + tag(forgeItemTagKey("raw_materials")).addTags(forgeItemTagKey("raw_materials/copper"), forgeItemTagKey("raw_materials/gold"), forgeItemTagKey("raw_materials/iron")); + tag(forgeItemTagKey("raw_materials/copper")).add(Items.RAW_COPPER); + tag(forgeItemTagKey("raw_materials/gold")).add(Items.RAW_GOLD); + tag(forgeItemTagKey("raw_materials/iron")).add(Items.RAW_IRON); + tag(forgeItemTagKey("rods")).addTags(forgeItemTagKey("rods/blaze"), forgeItemTagKey("rods/wooden")); + tag(forgeItemTagKey("rods/blaze")).add(Items.BLAZE_ROD); + tag(forgeItemTagKey("rods/wooden")).add(Items.STICK); + copy(Tags.Blocks.SAND, Tags.Items.SAND); + copy(Tags.Blocks.SAND_COLORLESS, Tags.Items.SAND_COLORLESS); + copy(Tags.Blocks.SAND_RED, Tags.Items.SAND_RED); + copy(forgeBlockTagKey("sandstone"), forgeItemTagKey("sandstone")); + tag(Tags.Items.SEEDS).addTags(Tags.Items.SEEDS_BEETROOT, Tags.Items.SEEDS_MELON, Tags.Items.SEEDS_PUMPKIN, Tags.Items.SEEDS_WHEAT); + tag(Tags.Items.SEEDS_BEETROOT).add(Items.BEETROOT_SEEDS); + tag(Tags.Items.SEEDS_MELON).add(Items.MELON_SEEDS); + tag(Tags.Items.SEEDS_PUMPKIN).add(Items.PUMPKIN_SEEDS); + tag(Tags.Items.SEEDS_WHEAT).add(Items.WHEAT_SEEDS); + tag(forgeItemTagKey("shears")).add(Items.SHEARS); // yes, it's forge:shears not forge:tools/shears + tag(forgeItemTagKey("slimeballs")).add(Items.SLIME_BALL); + copy(Tags.Blocks.STAINED_GLASS, Tags.Items.STAINED_GLASS); + copy(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES); + copy(forgeBlockTagKey("stone"), forgeItemTagKey("stone")); + copy(forgeBlockTagKey("storage_blocks"), forgeItemTagKey("storage_blocks")); + copy(Tags.Blocks.STORAGE_BLOCKS_AMETHYST, Tags.Items.STORAGE_BLOCKS_AMETHYST); + copy(forgeBlockTagKey("storage_blocks/coal"), forgeItemTagKey("storage_blocks/coal")); + copy(forgeBlockTagKey("storage_blocks/copper"), forgeItemTagKey("storage_blocks/copper")); + copy(forgeBlockTagKey("storage_blocks/diamond"), forgeItemTagKey("storage_blocks/diamond")); + copy(forgeBlockTagKey("storage_blocks/emerald"), forgeItemTagKey("storage_blocks/emerald")); + copy(forgeBlockTagKey("storage_blocks/gold"), forgeItemTagKey("storage_blocks/gold")); + copy(forgeBlockTagKey("storage_blocks/iron"), forgeItemTagKey("storage_blocks/iron")); + copy(forgeBlockTagKey("storage_blocks/lapis"), forgeItemTagKey("storage_blocks/lapis")); + copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ); + copy(forgeBlockTagKey("storage_blocks/redstone"), forgeItemTagKey("storage_blocks/redstone")); + copy(forgeBlockTagKey("storage_blocks/raw_copper"), forgeItemTagKey("storage_blocks/raw_copper")); + copy(forgeBlockTagKey("storage_blocks/raw_gold"), forgeItemTagKey("storage_blocks/raw_gold")); + copy(forgeBlockTagKey("storage_blocks/raw_iron"), forgeItemTagKey("storage_blocks/raw_iron")); + copy(forgeBlockTagKey("storage_blocks/netherite"), forgeItemTagKey("storage_blocks/netherite")); + tag(forgeItemTagKey("string")).add(Items.STRING); + tag(forgeItemTagKey("tools/shields")).add(Items.SHIELD); + tag(forgeItemTagKey("tools/bows")).add(Items.BOW); + tag(forgeItemTagKey("tools/crossbows")).add(Items.CROSSBOW); + tag(forgeItemTagKey("tools/fishing_rods")).add(Items.FISHING_ROD); + tag(forgeItemTagKey("tools/tridents")).add(Items.TRIDENT); + tag(forgeItemTagKey("tools")) + .addTags(ItemTags.SWORDS, ItemTags.AXES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.HOES) + .addTags(forgeItemTagKey("tools/shields"), forgeItemTagKey("tools/bows"), forgeItemTagKey("tools/crossbows"), forgeItemTagKey("tools/fishing_rods"), forgeItemTagKey("tools/tridents")); + tag(Tags.Items.ARMORS_HELMETS).add(Items.LEATHER_HELMET, Items.TURTLE_HELMET, Items.CHAINMAIL_HELMET, Items.IRON_HELMET, Items.GOLDEN_HELMET, Items.DIAMOND_HELMET, Items.NETHERITE_HELMET); + tag(Tags.Items.ARMORS_CHESTPLATES).add(Items.LEATHER_CHESTPLATE, Items.CHAINMAIL_CHESTPLATE, Items.IRON_CHESTPLATE, Items.GOLDEN_CHESTPLATE, Items.DIAMOND_CHESTPLATE, Items.NETHERITE_CHESTPLATE); + tag(Tags.Items.ARMORS_LEGGINGS).add(Items.LEATHER_LEGGINGS, Items.CHAINMAIL_LEGGINGS, Items.IRON_LEGGINGS, Items.GOLDEN_LEGGINGS, Items.DIAMOND_LEGGINGS, Items.NETHERITE_LEGGINGS); + tag(Tags.Items.ARMORS_BOOTS).add(Items.LEATHER_BOOTS, Items.CHAINMAIL_BOOTS, Items.IRON_BOOTS, Items.GOLDEN_BOOTS, Items.DIAMOND_BOOTS, Items.NETHERITE_BOOTS); + tag(forgeItemTagKey("armors")).addTags(Tags.Items.ARMORS_HELMETS, Tags.Items.ARMORS_CHESTPLATES, Tags.Items.ARMORS_LEGGINGS, Tags.Items.ARMORS_BOOTS); } private void addColored(TagKey group, String pattern) { @@ -412,6 +524,30 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { } } + private void addColored(Consumer> consumer, TagKey group, String pattern) { + String prefix = group.location().getPath() + '/'; + for (DyeColor color : DyeColor.values()) { + ResourceLocation key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName())); + TagKey tag = forgeItemTagKey(prefix + color.getName()); + Item item = ForgeRegistries.ITEMS.getValue(key); + if (item == null || item == Items.AIR) + throw new IllegalStateException("Unknown vanilla item: " + key.toString()); + tag(tag).add(item); + consumer.accept(tag); + } + } + + private void copyColored(TagKey blockGroup, TagKey itemGroup) { + String blockPre = blockGroup.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; + String itemPre = itemGroup.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; + for (DyeColor color : DyeColor.values()) { + TagKey from = getForgeBlockTag(blockPre + color.getName()); + TagKey to = getForgeItemTag(itemPre + color.getName()); + copy(from, to); + } + copy(getForgeBlockTag(blockPre + "colorless"), getForgeItemTag(itemPre + "colorless")); + } + private static void addColoredTags(Consumer> consumer, TagKey group) { String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; for (DyeColor color : DyeColor.values()) { @@ -444,6 +580,14 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { return ResourceLocation.fromNamespaceAndPath("forge", path); } + private static TagKey forgeBlockTagKey(String path) { + return BlockTags.create(ResourceLocation.fromNamespaceAndPath("forge", path)); + } + + private static TagKey forgeItemTagKey(String path) { + return ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", path)); + } + @Override public String getName() { return "Forge Item Tags"; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/crafting/TagsTest.java b/src/test/java/net/minecraftforge/debug/gameplay/crafting/TagsTest.java new file mode 100644 index 0000000000..7d4a089052 --- /dev/null +++ b/src/test/java/net/minecraftforge/debug/gameplay/crafting/TagsTest.java @@ -0,0 +1,31 @@ +package net.minecraftforge.debug.gameplay.crafting; + +import net.minecraft.gametest.framework.GameTest; +import net.minecraft.gametest.framework.GameTestHelper; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.gametest.GameTestHolder; +import net.minecraftforge.test.BaseTestMod; + +@Mod(TagsTest.MODID) +@GameTestHolder("forge.crafting.tags") +public class TagsTest extends BaseTestMod { + public static final String MODID = "tags_test"; + + public TagsTest(FMLJavaModLoadingContext context) { + super(context); + } + + @GameTest(template = "forge:empty3x3x3") + public static void cobble_in_legacy(GameTestHelper helper) throws ReflectiveOperationException { + var cobble = new ItemStack(Items.COBBLESTONE); + var forgeCobbleTag = ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", "cobblestone")); + boolean isCobble = cobble.is(forgeCobbleTag); + helper.assertTrue(isCobble, forgeCobbleTag + " is missing " + Items.COBBLESTONE); + helper.succeed(); + } +}