diff --git a/patches/minecraft/net/minecraft/world/item/DyeColor.java.patch b/patches/minecraft/net/minecraft/world/item/DyeColor.java.patch index 99d1a2f6ad..84b5e842d2 100644 --- a/patches/minecraft/net/minecraft/world/item/DyeColor.java.patch +++ b/patches/minecraft/net/minecraft/world/item/DyeColor.java.patch @@ -1,29 +1,43 @@ --- a/net/minecraft/world/item/DyeColor.java +++ b/net/minecraft/world/item/DyeColor.java -@@ -44,6 +_,7 @@ +@@ -44,6 +_,8 @@ private final int textureDiffuseColor; private final int fireworkColor; private final int textColor; -+ private final net.minecraft.tags.TagKey tag; ++ private final net.minecraft.tags.TagKey dyesTag; ++ private final net.minecraft.tags.TagKey dyedTag; private DyeColor(final int p_41046_, final String p_41047_, final int p_41048_, final MapColor p_285297_, final int p_41050_, final int p_41051_) { this.id = p_41046_; -@@ -52,6 +_,7 @@ +@@ -52,6 +_,8 @@ this.textColor = p_41051_; this.textureDiffuseColor = FastColor.ARGB32.opaque(p_41048_); this.fireworkColor = p_41050_; -+ this.tag = net.minecraft.tags.ItemTags.create("forge", "dyes/" + p_41047_); ++ this.dyesTag = net.minecraft.tags.ItemTags.create("c", "dyes/" + p_41047_); ++ this.dyedTag = net.minecraft.tags.ItemTags.create("c", "dyed/" + p_41047_); } public int getId() { -@@ -102,5 +_,14 @@ +@@ -102,5 +_,26 @@ @Override public String getSerializedName() { return this.name; + } + ++ /** ++ * Gets the tag key representing the set of items which provide this dye colour. ++ * @return A {@link net.minecraft.tags.TagKey} representing the set of items which provide this dye colour. ++ */ + public net.minecraft.tags.TagKey getTag() { -+ return tag; ++ return dyesTag; ++ } ++ ++ /** ++ * Gets the tag key representing the set of items which are dyed with this colour. ++ * @return A {@link net.minecraft.tags.TagKey} representing the set of items which are dyed with this colour. ++ */ ++ public net.minecraft.tags.TagKey getDyedTag() { ++ return dyedTag; + } + + @Nullable diff --git a/patches/minecraft/net/minecraft/world/level/levelgen/feature/Feature.java.patch b/patches/minecraft/net/minecraft/world/level/levelgen/feature/Feature.java.patch index 28c119d7b0..01df076a82 100644 --- a/patches/minecraft/net/minecraft/world/level/levelgen/feature/Feature.java.patch +++ b/patches/minecraft/net/minecraft/world/level/levelgen/feature/Feature.java.patch @@ -1,11 +1,13 @@ --- a/net/minecraft/world/level/levelgen/feature/Feature.java +++ b/net/minecraft/world/level/levelgen/feature/Feature.java -@@ -187,7 +_,7 @@ +@@ -187,7 +_,9 @@ } protected static boolean isStone(BlockState p_159748_) { - return p_159748_.is(BlockTags.BASE_STONE_OVERWORLD); -+ return p_159748_.is(net.minecraftforge.common.Tags.Blocks.STONE); ++ // Forge deprecation notice: this patch is deprecated for removal since 1.21. ++ // After that version, Vanilla behaviour will be used (checking against BlockTags.BASE_STONE_OVERWORLD) to better align with other loaders ++ return p_159748_.is(net.minecraftforge.common.Tags.Blocks.STONES); } public static boolean isDirt(BlockState p_159760_) { diff --git a/src/main/generated/data/c/tags/block/barrels.json b/src/main/generated/data/c/tags/block/barrels.json new file mode 100644 index 0000000000..94bded15d8 --- /dev/null +++ b/src/main/generated/data/c/tags/block/barrels.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#c:barrels/wooden", + { + "id": "#forge:barrels", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/barrels/wooden.json b/src/main/generated/data/c/tags/block/barrels/wooden.json new file mode 100644 index 0000000000..fedbc8ac53 --- /dev/null +++ b/src/main/generated/data/c/tags/block/barrels/wooden.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:barrel", + { + "id": "#forge:barrels/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/bookshelves.json b/src/main/generated/data/c/tags/block/bookshelves.json new file mode 100644 index 0000000000..68f756dba9 --- /dev/null +++ b/src/main/generated/data/c/tags/block/bookshelves.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:bookshelf", + { + "id": "#forge:bookshelves", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/budding_blocks.json b/src/main/generated/data/c/tags/block/budding_blocks.json new file mode 100644 index 0000000000..86257651e5 --- /dev/null +++ b/src/main/generated/data/c/tags/block/budding_blocks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:budding_amethyst" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/buds.json b/src/main/generated/data/c/tags/block/buds.json new file mode 100644 index 0000000000..708568317e --- /dev/null +++ b/src/main/generated/data/c/tags/block/buds.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:small_amethyst_bud", + "minecraft:medium_amethyst_bud", + "minecraft:large_amethyst_bud" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/chains.json b/src/main/generated/data/c/tags/block/chains.json new file mode 100644 index 0000000000..63bbe5b427 --- /dev/null +++ b/src/main/generated/data/c/tags/block/chains.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:chain" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/chests.json b/src/main/generated/data/c/tags/block/chests.json new file mode 100644 index 0000000000..b5adbfcc12 --- /dev/null +++ b/src/main/generated/data/c/tags/block/chests.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#forge:chests/ender", + "#forge:chests/trapped", + "#c:chests/wooden", + { + "id": "#forge:chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/chests/wooden.json b/src/main/generated/data/c/tags/block/chests/wooden.json new file mode 100644 index 0000000000..0659e860e6 --- /dev/null +++ b/src/main/generated/data/c/tags/block/chests/wooden.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#forge:chests/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/clusters.json b/src/main/generated/data/c/tags/block/clusters.json new file mode 100644 index 0000000000..bf57e5f90d --- /dev/null +++ b/src/main/generated/data/c/tags/block/clusters.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:amethyst_cluster" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/cobblestone.json b/src/main/generated/data/c/tags/block/cobblestones.json similarity index 53% rename from src/main/generated/data/forge/tags/block/cobblestone.json rename to src/main/generated/data/c/tags/block/cobblestones.json index f0ae95b5fc..3e7ff322a0 100644 --- a/src/main/generated/data/forge/tags/block/cobblestone.json +++ b/src/main/generated/data/c/tags/block/cobblestones.json @@ -3,6 +3,10 @@ "#forge:cobblestone/normal", "#forge:cobblestone/infested", "#forge:cobblestone/mossy", - "#forge:cobblestone/deepslate" + "#forge:cobblestone/deepslate", + { + "id": "#forge:cobblestone", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/concretes.json b/src/main/generated/data/c/tags/block/concretes.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/main/generated/data/c/tags/block/concretes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed.json b/src/main/generated/data/c/tags/block/dyed.json new file mode 100644 index 0000000000..ad4584578d --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:dyed/white", + "#c:dyed/orange", + "#c:dyed/magenta", + "#c:dyed/light_blue", + "#c:dyed/yellow", + "#c:dyed/lime", + "#c:dyed/pink", + "#c:dyed/gray", + "#c:dyed/light_gray", + "#c:dyed/cyan", + "#c:dyed/purple", + "#c:dyed/blue", + "#c:dyed/brown", + "#c:dyed/green", + "#c:dyed/red", + "#c:dyed/black" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/dyed/black.json b/src/main/generated/data/c/tags/block/dyed/black.json new file mode 100644 index 0000000000..52e29dcd46 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/black.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:black_banner", + "minecraft:black_bed", + "minecraft:black_candle", + "minecraft:black_carpet", + "minecraft:black_concrete", + "minecraft:black_concrete_powder", + "minecraft:black_glazed_terracotta", + "minecraft:black_shulker_box", + "minecraft:black_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..aa6f32d07c --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/blue.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:blue_banner", + "minecraft:blue_bed", + "minecraft:blue_candle", + "minecraft:blue_carpet", + "minecraft:blue_concrete", + "minecraft:blue_concrete_powder", + "minecraft:blue_glazed_terracotta", + "minecraft:blue_shulker_box", + "minecraft:blue_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..94d1d0a7c7 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/brown.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:brown_banner", + "minecraft:brown_bed", + "minecraft:brown_candle", + "minecraft:brown_carpet", + "minecraft:brown_concrete", + "minecraft:brown_concrete_powder", + "minecraft:brown_glazed_terracotta", + "minecraft:brown_shulker_box", + "minecraft:brown_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..b67187d66d --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/cyan.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:cyan_banner", + "minecraft:cyan_bed", + "minecraft:cyan_candle", + "minecraft:cyan_carpet", + "minecraft:cyan_concrete", + "minecraft:cyan_concrete_powder", + "minecraft:cyan_glazed_terracotta", + "minecraft:cyan_shulker_box", + "minecraft:cyan_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..172655a1a5 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/gray.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:gray_banner", + "minecraft:gray_bed", + "minecraft:gray_candle", + "minecraft:gray_carpet", + "minecraft:gray_concrete", + "minecraft:gray_concrete_powder", + "minecraft:gray_glazed_terracotta", + "minecraft:gray_shulker_box", + "minecraft:gray_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..12dd3904fc --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/green.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:green_banner", + "minecraft:green_bed", + "minecraft:green_candle", + "minecraft:green_carpet", + "minecraft:green_concrete", + "minecraft:green_concrete_powder", + "minecraft:green_glazed_terracotta", + "minecraft:green_shulker_box", + "minecraft:green_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..ce884b573d --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/light_blue.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:light_blue_banner", + "minecraft:light_blue_bed", + "minecraft:light_blue_candle", + "minecraft:light_blue_carpet", + "minecraft:light_blue_concrete", + "minecraft:light_blue_concrete_powder", + "minecraft:light_blue_glazed_terracotta", + "minecraft:light_blue_shulker_box", + "minecraft:light_blue_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..439c12aec8 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/light_gray.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:light_gray_banner", + "minecraft:light_gray_bed", + "minecraft:light_gray_candle", + "minecraft:light_gray_carpet", + "minecraft:light_gray_concrete", + "minecraft:light_gray_concrete_powder", + "minecraft:light_gray_glazed_terracotta", + "minecraft:light_gray_shulker_box", + "minecraft:light_gray_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..17e5b7ddf5 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/lime.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:lime_banner", + "minecraft:lime_bed", + "minecraft:lime_candle", + "minecraft:lime_carpet", + "minecraft:lime_concrete", + "minecraft:lime_concrete_powder", + "minecraft:lime_glazed_terracotta", + "minecraft:lime_shulker_box", + "minecraft:lime_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..f833d1210a --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/magenta.json @@ -0,0 +1,33 @@ +{ + "values": [ + "minecraft:magenta_banner", + "minecraft:magenta_bed", + "minecraft:magenta_candle", + "minecraft:magenta_carpet", + "minecraft:magenta_concrete", + "minecraft:magenta_concrete_powder", + "minecraft:magenta_glazed_terracotta", + "minecraft:magenta_shulker_box", + "minecraft:magenta_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..20076162d7 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/orange.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:orange_banner", + "minecraft:orange_bed", + "minecraft:orange_candle", + "minecraft:orange_carpet", + "minecraft:orange_concrete", + "minecraft:orange_concrete_powder", + "minecraft:orange_glazed_terracotta", + "minecraft:orange_shulker_box", + "minecraft:orange_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..f9bdfe6c02 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/pink.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:pink_banner", + "minecraft:pink_bed", + "minecraft:pink_candle", + "minecraft:pink_carpet", + "minecraft:pink_concrete", + "minecraft:pink_concrete_powder", + "minecraft:pink_glazed_terracotta", + "minecraft:pink_shulker_box", + "minecraft:pink_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..8d443e3a8b --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/purple.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:purple_banner", + "minecraft:purple_bed", + "minecraft:purple_candle", + "minecraft:purple_carpet", + "minecraft:purple_concrete", + "minecraft:purple_concrete_powder", + "minecraft:purple_glazed_terracotta", + "minecraft:purple_shulker_box", + "minecraft:purple_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..88ae73f677 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/red.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:red_banner", + "minecraft:red_bed", + "minecraft:red_candle", + "minecraft:red_carpet", + "minecraft:red_concrete", + "minecraft:red_concrete_powder", + "minecraft:red_glazed_terracotta", + "minecraft:red_shulker_box", + "minecraft:red_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..86c2a01789 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/white.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:white_banner", + "minecraft:white_bed", + "minecraft:white_candle", + "minecraft:white_carpet", + "minecraft:white_concrete", + "minecraft:white_concrete_powder", + "minecraft:white_glazed_terracotta", + "minecraft:white_shulker_box", + "minecraft:white_stained_glass", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..31711d5459 --- /dev/null +++ b/src/main/generated/data/c/tags/block/dyed/yellow.json @@ -0,0 +1,25 @@ +{ + "values": [ + "minecraft:yellow_banner", + "minecraft:yellow_bed", + "minecraft:yellow_candle", + "minecraft:yellow_carpet", + "minecraft:yellow_concrete", + "minecraft:yellow_concrete_powder", + "minecraft:yellow_glazed_terracotta", + "minecraft:yellow_shulker_box", + "minecraft:yellow_stained_glass", + "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 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/glass_blocks.json b/src/main/generated/data/c/tags/block/glass_blocks.json new file mode 100644 index 0000000000..55b243f654 --- /dev/null +++ b/src/main/generated/data/c/tags/block/glass_blocks.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#c:glass_blocks/colorless", + "#c:glass_blocks/cheap", + "#c:glass_blocks/tinted", + { + "id": "#forge:glass", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/glass/silica.json b/src/main/generated/data/c/tags/block/glass_blocks/cheap.json similarity index 84% rename from src/main/generated/data/forge/tags/block/glass/silica.json rename to src/main/generated/data/c/tags/block/glass_blocks/cheap.json index 74544c770d..ccd28136a6 100644 --- a/src/main/generated/data/forge/tags/block/glass/silica.json +++ b/src/main/generated/data/c/tags/block/glass_blocks/cheap.json @@ -1,21 +1,25 @@ { "values": [ "minecraft:glass", - "minecraft:black_stained_glass", + "minecraft:white_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", "minecraft:blue_stained_glass", "minecraft:brown_stained_glass", - "minecraft: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" + "minecraft:black_stained_glass", + { + "id": "#forge:glass_silica", + "required": false + } ] } \ No newline at end of file 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 new file mode 100644 index 0000000000..7d2e81b6c4 --- /dev/null +++ b/src/main/generated/data/c/tags/block/glass_blocks/colorless.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:glass", + { + "id": "#forge:glass_colorless", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..0a7d0f3f00 --- /dev/null +++ b/src/main/generated/data/c/tags/block/glass_blocks/tinted.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:tinted_glass", + { + "id": "#forge:glass_tinted", + "required": false + } + ] +} \ 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/c/tags/block/glass_panes.json similarity index 95% rename from src/main/generated/data/forge/tags/item/stained_glass_panes.json rename to src/main/generated/data/c/tags/block/glass_panes.json index 65f2adb8f9..c4bdf8ea3f 100644 --- a/src/main/generated/data/forge/tags/item/stained_glass_panes.json +++ b/src/main/generated/data/c/tags/block/glass_panes.json @@ -1,5 +1,6 @@ { "values": [ + "#c:glass_panes/colorless", "minecraft:white_stained_glass_pane", "minecraft:orange_stained_glass_pane", "minecraft:magenta_stained_glass_pane", 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 new file mode 100644 index 0000000000..b7d7245a6a --- /dev/null +++ b/src/main/generated/data/c/tags/block/glass_panes/colorless.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:glass_pane", + { + "id": "#forge:glass_panes_colorless", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/glazed_terracottas.json b/src/main/generated/data/c/tags/block/glazed_terracottas.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/main/generated/data/c/tags/block/glazed_terracottas.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:black_glazed_terracotta" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/hidden_from_recipe_viewers.json b/src/main/generated/data/c/tags/block/hidden_from_recipe_viewers.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/block/hidden_from_recipe_viewers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/obsidians.json b/src/main/generated/data/c/tags/block/obsidians.json new file mode 100644 index 0000000000..3986b73df1 --- /dev/null +++ b/src/main/generated/data/c/tags/block/obsidians.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:obsidians/normal", + "#c:obsidians/crying", + { + "id": "#forge:obsidian", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/obsidians/crying.json b/src/main/generated/data/c/tags/block/obsidians/crying.json new file mode 100644 index 0000000000..2e8b37a1bc --- /dev/null +++ b/src/main/generated/data/c/tags/block/obsidians/crying.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crying_obsidian" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/obsidian.json b/src/main/generated/data/c/tags/block/obsidians/normal.json similarity index 100% rename from src/main/generated/data/forge/tags/block/obsidian.json rename to src/main/generated/data/c/tags/block/obsidians/normal.json diff --git a/src/main/generated/data/forge/tags/item/ores.json b/src/main/generated/data/c/tags/block/ores.json similarity index 66% rename from src/main/generated/data/forge/tags/item/ores.json rename to src/main/generated/data/c/tags/block/ores.json index 2c4beabc55..7397864c1a 100644 --- a/src/main/generated/data/forge/tags/item/ores.json +++ b/src/main/generated/data/c/tags/block/ores.json @@ -7,8 +7,12 @@ "#forge:ores/gold", "#forge:ores/iron", "#forge:ores/lapis", + "#c:ores/netherite_scrap", "#forge:ores/redstone", - "#forge:ores/quartz", - "#forge:ores/netherite_scrap" + "#c:ores/quartz", + { + "id": "#forge:ores", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/ores/netherite_scrap.json b/src/main/generated/data/c/tags/block/ores/netherite_scrap.json new file mode 100644 index 0000000000..6cc208db8e --- /dev/null +++ b/src/main/generated/data/c/tags/block/ores/netherite_scrap.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:ancient_debris", + { + "id": "#forge:ores/netherite_scrap", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/ores/quartz.json b/src/main/generated/data/c/tags/block/ores/quartz.json new file mode 100644 index 0000000000..5433b2ed6f --- /dev/null +++ b/src/main/generated/data/c/tags/block/ores/quartz.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_quartz_ore", + { + "id": "#forge:ores/quartz", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/player_workstations/crafting_tables.json b/src/main/generated/data/c/tags/block/player_workstations/crafting_tables.json new file mode 100644 index 0000000000..3be1c8e22e --- /dev/null +++ b/src/main/generated/data/c/tags/block/player_workstations/crafting_tables.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crafting_table" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/player_workstations/furnaces.json b/src/main/generated/data/c/tags/block/player_workstations/furnaces.json new file mode 100644 index 0000000000..25edfef1ca --- /dev/null +++ b/src/main/generated/data/c/tags/block/player_workstations/furnaces.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:furnace" + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..0c0cf3a08f --- /dev/null +++ b/src/main/generated/data/c/tags/block/relocation_not_supported.json @@ -0,0 +1,12 @@ +{ + "values": [ + { + "id": "#forge:relocation_not_supported", + "required": false + }, + { + "id": "#forge:immovable", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/ropes.json b/src/main/generated/data/c/tags/block/ropes.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/block/ropes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/blocks.json b/src/main/generated/data/c/tags/block/sandstone/blocks.json new file mode 100644 index 0000000000..5684db6caf --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/blocks.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:sandstone/red_blocks", + "#c:sandstone/uncolored_blocks", + { + "id": "#forge:sandstone", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/block/sandstone.json b/src/main/generated/data/c/tags/block/sandstone/red_blocks.json similarity index 56% rename from src/main/generated/data/forge/tags/block/sandstone.json rename to src/main/generated/data/c/tags/block/sandstone/red_blocks.json index bb7fb03ee3..4e72ad44cd 100644 --- a/src/main/generated/data/forge/tags/block/sandstone.json +++ b/src/main/generated/data/c/tags/block/sandstone/red_blocks.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:sandstone", - "minecraft:cut_sandstone", - "minecraft:chiseled_sandstone", - "minecraft:smooth_sandstone", "minecraft:red_sandstone", "minecraft:cut_red_sandstone", "minecraft:chiseled_red_sandstone", diff --git a/src/main/generated/data/c/tags/block/sandstone/red_slabs.json b/src/main/generated/data/c/tags/block/sandstone/red_slabs.json new file mode 100644 index 0000000000..a586c49087 --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/red_slabs.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:red_sandstone_slab", + "minecraft:cut_red_sandstone_slab", + "minecraft:smooth_red_sandstone_slab" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/red_stairs.json b/src/main/generated/data/c/tags/block/sandstone/red_stairs.json new file mode 100644 index 0000000000..8778d5dbbd --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/red_stairs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:red_sandstone_stairs", + "minecraft:smooth_red_sandstone_stairs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/slabs.json b/src/main/generated/data/c/tags/block/sandstone/slabs.json new file mode 100644 index 0000000000..92bc3f3ed9 --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/slabs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:sandstone/red_slabs", + "#c:sandstone/uncolored_slabs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/stairs.json b/src/main/generated/data/c/tags/block/sandstone/stairs.json new file mode 100644 index 0000000000..673f168ddf --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/stairs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:sandstone/red_stairs", + "#c:sandstone/uncolored_stairs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/uncolored_blocks.json b/src/main/generated/data/c/tags/block/sandstone/uncolored_blocks.json new file mode 100644 index 0000000000..4e32539b4e --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/uncolored_blocks.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:sandstone", + "minecraft:cut_sandstone", + "minecraft:chiseled_sandstone", + "minecraft:smooth_sandstone" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/uncolored_slabs.json b/src/main/generated/data/c/tags/block/sandstone/uncolored_slabs.json new file mode 100644 index 0000000000..d830f1dc1e --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/uncolored_slabs.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:sandstone_slab", + "minecraft:cut_sandstone_slab", + "minecraft:smooth_sandstone_slab" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/sandstone/uncolored_stairs.json b/src/main/generated/data/c/tags/block/sandstone/uncolored_stairs.json new file mode 100644 index 0000000000..ddb4a27f87 --- /dev/null +++ b/src/main/generated/data/c/tags/block/sandstone/uncolored_stairs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:sandstone_stairs", + "minecraft:smooth_sandstone_stairs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/skulls.json b/src/main/generated/data/c/tags/block/skulls.json new file mode 100644 index 0000000000..a9820b074f --- /dev/null +++ b/src/main/generated/data/c/tags/block/skulls.json @@ -0,0 +1,18 @@ +{ + "values": [ + "minecraft:skeleton_skull", + "minecraft:skeleton_wall_skull", + "minecraft:wither_skeleton_skull", + "minecraft:wither_skeleton_wall_skull", + "minecraft:player_head", + "minecraft:player_wall_head", + "minecraft:zombie_head", + "minecraft:zombie_wall_head", + "minecraft:creeper_head", + "minecraft:creeper_wall_head", + "minecraft:piglin_head", + "minecraft:piglin_wall_head", + "minecraft:dragon_head", + "minecraft:dragon_wall_head" + ] +} \ 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 new file mode 100644 index 0000000000..2848998459 --- /dev/null +++ b/src/main/generated/data/c/tags/block/stones.json @@ -0,0 +1,14 @@ +{ + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:stone", + "minecraft:deepslate", + "minecraft:tuff", + { + "id": "#forge:stone", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..7bf4a38117 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks.json @@ -0,0 +1,24 @@ +{ + "values": [ + "#c:storage_blocks/bone_meal", + "#c:storage_blocks/coal", + "#c:storage_blocks/copper", + "#c:storage_blocks/diamond", + "#c:storage_blocks/dried_kelp", + "#c:storage_blocks/emerald", + "#c:storage_blocks/gold", + "#c:storage_blocks/iron", + "#c:storage_blocks/lapis", + "#c:storage_blocks/netherite", + "#c:storage_blocks/raw_copper", + "#c:storage_blocks/raw_gold", + "#c:storage_blocks/raw_iron", + "#c:storage_blocks/redstone", + "#c:storage_blocks/slime", + "#c:storage_blocks/wheat", + { + "id": "#forge:storage_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/bone_meal.json b/src/main/generated/data/c/tags/block/storage_blocks/bone_meal.json new file mode 100644 index 0000000000..98ab24a213 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/bone_meal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bone_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/coal.json b/src/main/generated/data/c/tags/block/storage_blocks/coal.json new file mode 100644 index 0000000000..b8479ced38 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/coal.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:coal_block", + { + "id": "#forge:storage_blocks/coal", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/copper.json b/src/main/generated/data/c/tags/block/storage_blocks/copper.json new file mode 100644 index 0000000000..acd2a6a7a4 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:copper_block", + { + "id": "#forge:storage_blocks/copper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/diamond.json b/src/main/generated/data/c/tags/block/storage_blocks/diamond.json new file mode 100644 index 0000000000..76426ba425 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/diamond.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:diamond_block", + { + "id": "#forge:storage_blocks/diamond", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/dried_kelp.json b/src/main/generated/data/c/tags/block/storage_blocks/dried_kelp.json new file mode 100644 index 0000000000..2609656429 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/dried_kelp.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:dried_kelp_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/emerald.json b/src/main/generated/data/c/tags/block/storage_blocks/emerald.json new file mode 100644 index 0000000000..7a41454d94 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/emerald.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:emerald_block", + { + "id": "#forge:storage_blocks/emerald", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/gold.json b/src/main/generated/data/c/tags/block/storage_blocks/gold.json new file mode 100644 index 0000000000..a4116fc77f --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:gold_block", + { + "id": "#forge:storage_blocks/gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/iron.json b/src/main/generated/data/c/tags/block/storage_blocks/iron.json new file mode 100644 index 0000000000..f0e9fcca1f --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:iron_block", + { + "id": "#forge:storage_blocks/iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/lapis.json b/src/main/generated/data/c/tags/block/storage_blocks/lapis.json new file mode 100644 index 0000000000..b5f41d8d4e --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/lapis.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lapis_block", + { + "id": "#forge:storage_blocks/lapis", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/netherite.json b/src/main/generated/data/c/tags/block/storage_blocks/netherite.json new file mode 100644 index 0000000000..a3dfe0d53c --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/netherite.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:netherite_block", + { + "id": "#forge:storage_blocks/netherite", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/raw_copper.json b/src/main/generated/data/c/tags/block/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..8f12fb63a7 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/raw_copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_copper_block", + { + "id": "#forge:storage_blocks/raw_copper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/raw_gold.json b/src/main/generated/data/c/tags/block/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..dcee1e225b --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/raw_gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_gold_block", + { + "id": "#forge:storage_blocks/raw_gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/raw_iron.json b/src/main/generated/data/c/tags/block/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..3f0ecf27ad --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/raw_iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_iron_block", + { + "id": "#forge:storage_blocks/raw_iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/redstone.json b/src/main/generated/data/c/tags/block/storage_blocks/redstone.json new file mode 100644 index 0000000000..49fa7a5a26 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/redstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:redstone_block", + { + "id": "#forge:storage_blocks/redstone", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/slime.json b/src/main/generated/data/c/tags/block/storage_blocks/slime.json new file mode 100644 index 0000000000..523bdc2835 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/slime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:slime_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/storage_blocks/wheat.json b/src/main/generated/data/c/tags/block/storage_blocks/wheat.json new file mode 100644 index 0000000000..ea92d03cb4 --- /dev/null +++ b/src/main/generated/data/c/tags/block/storage_blocks/wheat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:hay_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/villager_job_sites.json b/src/main/generated/data/c/tags/block/villager_job_sites.json new file mode 100644 index 0000000000..859c128fce --- /dev/null +++ b/src/main/generated/data/c/tags/block/villager_job_sites.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:barrel", + "minecraft:blast_furnace", + "minecraft:brewing_stand", + "minecraft:cartography_table", + "minecraft:cauldron", + "minecraft:water_cauldron", + "minecraft:lava_cauldron", + "minecraft:powder_snow_cauldron", + "minecraft:composter", + "minecraft:fletching_table", + "minecraft:grindstone", + "minecraft:lectern", + "minecraft:loom", + "minecraft:smithing_table", + "minecraft:smoker", + "minecraft:stonecutter" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json b/src/main/generated/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json new file mode 100644 index 0000000000..18527f1e0f --- /dev/null +++ b/src/main/generated/data/c/tags/enchantment/entity_auxiliary_movement_enhancements.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:feather_falling", + "minecraft:frost_walker" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/enchantment/entity_defense_enhancements.json b/src/main/generated/data/c/tags/enchantment/entity_defense_enhancements.json new file mode 100644 index 0000000000..2af6d192e6 --- /dev/null +++ b/src/main/generated/data/c/tags/enchantment/entity_defense_enhancements.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:protection", + "minecraft:blast_protection", + "minecraft:projectile_protection", + "minecraft:fire_protection", + "minecraft:respiration", + "minecraft:feather_falling" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/enchantment/entity_speed_enhancements.json b/src/main/generated/data/c/tags/enchantment/entity_speed_enhancements.json new file mode 100644 index 0000000000..fee12e5ec3 --- /dev/null +++ b/src/main/generated/data/c/tags/enchantment/entity_speed_enhancements.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:soul_speed", + "minecraft:swift_sneak", + "minecraft:depth_strider" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/enchantment/increase_block_drops.json b/src/main/generated/data/c/tags/enchantment/increase_block_drops.json new file mode 100644 index 0000000000..05cde351be --- /dev/null +++ b/src/main/generated/data/c/tags/enchantment/increase_block_drops.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:fortune" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/enchantment/increase_entity_drops.json b/src/main/generated/data/c/tags/enchantment/increase_entity_drops.json new file mode 100644 index 0000000000..4e9fde0588 --- /dev/null +++ b/src/main/generated/data/c/tags/enchantment/increase_entity_drops.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:looting" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/enchantment/weapon_damage_enhancements.json b/src/main/generated/data/c/tags/enchantment/weapon_damage_enhancements.json new file mode 100644 index 0000000000..c60666e389 --- /dev/null +++ b/src/main/generated/data/c/tags/enchantment/weapon_damage_enhancements.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:sharpness", + "minecraft:smite", + "minecraft:bane_of_arthropods", + "minecraft:power", + "minecraft:impaling" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/entity_type/boats.json b/src/main/generated/data/c/tags/entity_type/boats.json new file mode 100644 index 0000000000..58e89216d1 --- /dev/null +++ b/src/main/generated/data/c/tags/entity_type/boats.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:boat", + "minecraft:chest_boat", + { + "id": "#forge:boats", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/entity_type/bosses.json b/src/main/generated/data/c/tags/entity_type/bosses.json new file mode 100644 index 0000000000..5b52cfe527 --- /dev/null +++ b/src/main/generated/data/c/tags/entity_type/bosses.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:ender_dragon", + "minecraft:wither", + { + "id": "#forge:bosses", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/entity_type/capturing_not_supported.json b/src/main/generated/data/c/tags/entity_type/capturing_not_supported.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/entity_type/capturing_not_supported.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 new file mode 100644 index 0000000000..6b7fe052ea --- /dev/null +++ b/src/main/generated/data/c/tags/entity_type/minecarts.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:minecart", + "minecraft:chest_minecart", + "minecraft:furnace_minecart", + "minecraft:hopper_minecart", + "minecraft:spawner_minecart", + "minecraft:tnt_minecart", + "minecraft:command_block_minecart", + { + "id": "#forge:minecarts", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/entity_type/teleporting_not_supported.json b/src/main/generated/data/c/tags/entity_type/teleporting_not_supported.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/entity_type/teleporting_not_supported.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/hidden_from_recipe_viewers.json b/src/main/generated/data/c/tags/fluid/hidden_from_recipe_viewers.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/hidden_from_recipe_viewers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 new file mode 100644 index 0000000000..5b2fe217e2 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/honey.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:honey", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/fluid/lava.json b/src/main/generated/data/c/tags/fluid/lava.json new file mode 100644 index 0000000000..c4953e87f1 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/lava.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:lava", + "minecraft:flowing_lava" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/milk.json b/src/main/generated/data/c/tags/fluid/milk.json similarity index 71% rename from src/main/generated/data/forge/tags/fluid/milk.json rename to src/main/generated/data/c/tags/fluid/milk.json index 3bab1951b3..5e27201a7e 100644 --- a/src/main/generated/data/forge/tags/fluid/milk.json +++ b/src/main/generated/data/c/tags/fluid/milk.json @@ -7,6 +7,10 @@ { "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/fluid/water.json b/src/main/generated/data/c/tags/fluid/water.json new file mode 100644 index 0000000000..dbfbaa8091 --- /dev/null +++ b/src/main/generated/data/c/tags/fluid/water.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:water", + "minecraft:flowing_water" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/animal_foods.json b/src/main/generated/data/c/tags/item/animal_foods.json new file mode 100644 index 0000000000..f302cacb92 --- /dev/null +++ b/src/main/generated/data/c/tags/item/animal_foods.json @@ -0,0 +1,28 @@ +{ + "values": [ + "#minecraft:armadillo_food", + "#minecraft:axolotl_food", + "#minecraft:bee_food", + "#minecraft:camel_food", + "#minecraft:cat_food", + "#minecraft:chicken_food", + "#minecraft:cow_food", + "#minecraft:fox_food", + "#minecraft:frog_food", + "#minecraft:goat_food", + "#minecraft:hoglin_food", + "#minecraft:horse_food", + "#minecraft:llama_food", + "#minecraft:ocelot_food", + "#minecraft:panda_food", + "#minecraft:parrot_food", + "#minecraft:pig_food", + "#minecraft:piglin_food", + "#minecraft:rabbit_food", + "#minecraft:sheep_food", + "#minecraft:sniffer_food", + "#minecraft:strider_food", + "#minecraft:turtle_food", + "#minecraft:wolf_food" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/armors.json b/src/main/generated/data/c/tags/item/armors.json new file mode 100644 index 0000000000..a1f3ac1ce1 --- /dev/null +++ b/src/main/generated/data/c/tags/item/armors.json @@ -0,0 +1,12 @@ +{ + "values": [ + "#minecraft:head_armor", + "#minecraft:chest_armor", + "#minecraft:leg_armor", + "#minecraft:foot_armor", + { + "id": "#forge:armors", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/barrels.json b/src/main/generated/data/c/tags/item/barrels.json new file mode 100644 index 0000000000..94bded15d8 --- /dev/null +++ b/src/main/generated/data/c/tags/item/barrels.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#c:barrels/wooden", + { + "id": "#forge:barrels", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/barrels/wooden.json b/src/main/generated/data/c/tags/item/barrels/wooden.json new file mode 100644 index 0000000000..fedbc8ac53 --- /dev/null +++ b/src/main/generated/data/c/tags/item/barrels/wooden.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:barrel", + { + "id": "#forge:barrels/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bookshelves.json b/src/main/generated/data/c/tags/item/bookshelves.json new file mode 100644 index 0000000000..68f756dba9 --- /dev/null +++ b/src/main/generated/data/c/tags/item/bookshelves.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:bookshelf", + { + "id": "#forge:bookshelves", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bricks.json b/src/main/generated/data/c/tags/item/bricks.json new file mode 100644 index 0000000000..ba6a10fc02 --- /dev/null +++ b/src/main/generated/data/c/tags/item/bricks.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:bricks/normal", + "#c:bricks/nether" + ] +} \ 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 new file mode 100644 index 0000000000..3f63a414f0 --- /dev/null +++ b/src/main/generated/data/c/tags/item/bricks/nether.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_brick", + { + "id": "#forge:ingots/nether_brick", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..a40223a69b --- /dev/null +++ b/src/main/generated/data/c/tags/item/bricks/normal.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:brick", + { + "id": "#forge:ingots/brick", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets.json b/src/main/generated/data/c/tags/item/buckets.json new file mode 100644 index 0000000000..4733f3b1e3 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:buckets/empty", + "#c:buckets/water", + "#c:buckets/lava", + "#c:buckets/milk", + "#c:buckets/powder_snow", + "#c:buckets/entity_water" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets/empty.json b/src/main/generated/data/c/tags/item/buckets/empty.json new file mode 100644 index 0000000000..67b2045bb7 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets/empty.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bucket" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets/entity_water.json b/src/main/generated/data/c/tags/item/buckets/entity_water.json new file mode 100644 index 0000000000..4803076188 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets/entity_water.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:axolotl_bucket", + "minecraft:cod_bucket", + "minecraft:pufferfish_bucket", + "minecraft:tadpole_bucket", + "minecraft:tropical_fish_bucket", + "minecraft:salmon_bucket" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets/lava.json b/src/main/generated/data/c/tags/item/buckets/lava.json new file mode 100644 index 0000000000..fec09c7714 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets/lava.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:lava_bucket" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets/milk.json b/src/main/generated/data/c/tags/item/buckets/milk.json new file mode 100644 index 0000000000..899451cb24 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets/milk.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:milk_bucket" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets/powder_snow.json b/src/main/generated/data/c/tags/item/buckets/powder_snow.json new file mode 100644 index 0000000000..399a04e712 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets/powder_snow.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:powder_snow_bucket" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buckets/water.json b/src/main/generated/data/c/tags/item/buckets/water.json new file mode 100644 index 0000000000..6486764e59 --- /dev/null +++ b/src/main/generated/data/c/tags/item/buckets/water.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:water_bucket" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/budding_blocks.json b/src/main/generated/data/c/tags/item/budding_blocks.json new file mode 100644 index 0000000000..86257651e5 --- /dev/null +++ b/src/main/generated/data/c/tags/item/budding_blocks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:budding_amethyst" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/buds.json b/src/main/generated/data/c/tags/item/buds.json new file mode 100644 index 0000000000..708568317e --- /dev/null +++ b/src/main/generated/data/c/tags/item/buds.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:small_amethyst_bud", + "minecraft:medium_amethyst_bud", + "minecraft:large_amethyst_bud" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/chains.json b/src/main/generated/data/c/tags/item/chains.json new file mode 100644 index 0000000000..63bbe5b427 --- /dev/null +++ b/src/main/generated/data/c/tags/item/chains.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:chain" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/chests.json b/src/main/generated/data/c/tags/item/chests.json new file mode 100644 index 0000000000..b5adbfcc12 --- /dev/null +++ b/src/main/generated/data/c/tags/item/chests.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#forge:chests/ender", + "#forge:chests/trapped", + "#c:chests/wooden", + { + "id": "#forge:chests", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/chests/wooden.json b/src/main/generated/data/c/tags/item/chests/wooden.json new file mode 100644 index 0000000000..0659e860e6 --- /dev/null +++ b/src/main/generated/data/c/tags/item/chests/wooden.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:chest", + "minecraft:trapped_chest", + { + "id": "#forge:chests/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/clusters.json b/src/main/generated/data/c/tags/item/clusters.json new file mode 100644 index 0000000000..bf57e5f90d --- /dev/null +++ b/src/main/generated/data/c/tags/item/clusters.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:amethyst_cluster" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/cobblestone.json b/src/main/generated/data/c/tags/item/cobblestones.json similarity index 53% rename from src/main/generated/data/forge/tags/item/cobblestone.json rename to src/main/generated/data/c/tags/item/cobblestones.json index f0ae95b5fc..3e7ff322a0 100644 --- a/src/main/generated/data/forge/tags/item/cobblestone.json +++ b/src/main/generated/data/c/tags/item/cobblestones.json @@ -3,6 +3,10 @@ "#forge:cobblestone/normal", "#forge:cobblestone/infested", "#forge:cobblestone/mossy", - "#forge:cobblestone/deepslate" + "#forge:cobblestone/deepslate", + { + "id": "#forge:cobblestone", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/concrete_powders.json b/src/main/generated/data/c/tags/item/concrete_powders.json new file mode 100644 index 0000000000..57a09c9b25 --- /dev/null +++ b/src/main/generated/data/c/tags/item/concrete_powders.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete_powder", + "minecraft:orange_concrete_powder", + "minecraft:magenta_concrete_powder", + "minecraft:light_blue_concrete_powder", + "minecraft:yellow_concrete_powder", + "minecraft:lime_concrete_powder", + "minecraft:pink_concrete_powder", + "minecraft:gray_concrete_powder", + "minecraft:light_gray_concrete_powder", + "minecraft:cyan_concrete_powder", + "minecraft:purple_concrete_powder", + "minecraft:blue_concrete_powder", + "minecraft:brown_concrete_powder", + "minecraft:green_concrete_powder", + "minecraft:red_concrete_powder", + "minecraft:black_concrete_powder" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/concretes.json b/src/main/generated/data/c/tags/item/concretes.json new file mode 100644 index 0000000000..99c8ab401a --- /dev/null +++ b/src/main/generated/data/c/tags/item/concretes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_concrete", + "minecraft:orange_concrete", + "minecraft:magenta_concrete", + "minecraft:light_blue_concrete", + "minecraft:yellow_concrete", + "minecraft:lime_concrete", + "minecraft:pink_concrete", + "minecraft:gray_concrete", + "minecraft:light_gray_concrete", + "minecraft:cyan_concrete", + "minecraft:purple_concrete", + "minecraft:blue_concrete", + "minecraft:brown_concrete", + "minecraft:green_concrete", + "minecraft:red_concrete", + "minecraft:black_concrete" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops.json b/src/main/generated/data/c/tags/item/crops.json new file mode 100644 index 0000000000..7a0bad9cab --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops.json @@ -0,0 +1,18 @@ +{ + "values": [ + "#c:crops/beetroot", + "#c:crops/cactus", + "#c:crops/carrot", + "#c:crops/cocoa_bean", + "#c:crops/melon", + "#c:crops/nether_wart", + "#c:crops/potato", + "#c:crops/pumpkin", + "#c:crops/sugar_cane", + "#c:crops/wheat", + { + "id": "#forge:crops", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/beetroot.json b/src/main/generated/data/c/tags/item/crops/beetroot.json new file mode 100644 index 0000000000..cc56242351 --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/beetroot.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:beetroot", + { + "id": "#forge:crops/beetroot", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/cactus.json b/src/main/generated/data/c/tags/item/crops/cactus.json new file mode 100644 index 0000000000..2624ccf244 --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/cactus.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cactus" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/carrot.json b/src/main/generated/data/c/tags/item/crops/carrot.json new file mode 100644 index 0000000000..9a637ed3cc --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/carrot.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:carrot", + { + "id": "#forge:crops/carrot", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/cocoa_bean.json b/src/main/generated/data/c/tags/item/crops/cocoa_bean.json new file mode 100644 index 0000000000..a4efea9bb2 --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/cocoa_bean.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cocoa_beans" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/melon.json b/src/main/generated/data/c/tags/item/crops/melon.json new file mode 100644 index 0000000000..187ed669df --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/melon.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:melon" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/nether_wart.json b/src/main/generated/data/c/tags/item/crops/nether_wart.json new file mode 100644 index 0000000000..9e8eb9e036 --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/nether_wart.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_wart", + { + "id": "#forge:crops/nether_wart", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/potato.json b/src/main/generated/data/c/tags/item/crops/potato.json new file mode 100644 index 0000000000..fca8ec880c --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/potato.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:potato", + { + "id": "#forge:crops/potato", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/pumpkin.json b/src/main/generated/data/c/tags/item/crops/pumpkin.json new file mode 100644 index 0000000000..fb0859532b --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/pumpkin.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pumpkin" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/sugar_cane.json b/src/main/generated/data/c/tags/item/crops/sugar_cane.json new file mode 100644 index 0000000000..6e3dc8c982 --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/sugar_cane.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:sugar_cane" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/crops/wheat.json b/src/main/generated/data/c/tags/item/crops/wheat.json new file mode 100644 index 0000000000..05dac35cc1 --- /dev/null +++ b/src/main/generated/data/c/tags/item/crops/wheat.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:wheat", + { + "id": "#forge:crops/wheat", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..45f697f1b0 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dusts.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:dusts/glowstone", + "#c:dusts/redstone", + { + "id": "#forge:dusts", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dusts/glowstone.json b/src/main/generated/data/c/tags/item/dusts/glowstone.json new file mode 100644 index 0000000000..b7bd60b026 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dusts/glowstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:glowstone_dust", + { + "id": "#forge:dusts/glowstone", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dusts/redstone.json b/src/main/generated/data/c/tags/item/dusts/redstone.json new file mode 100644 index 0000000000..ec7a3ceb0a --- /dev/null +++ b/src/main/generated/data/c/tags/item/dusts/redstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:redstone", + { + "id": "#forge:dusts/redstone", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyed.json b/src/main/generated/data/c/tags/item/dyed.json new file mode 100644 index 0000000000..ad4584578d --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:dyed/white", + "#c:dyed/orange", + "#c:dyed/magenta", + "#c:dyed/light_blue", + "#c:dyed/yellow", + "#c:dyed/lime", + "#c:dyed/pink", + "#c:dyed/gray", + "#c:dyed/light_gray", + "#c:dyed/cyan", + "#c:dyed/purple", + "#c:dyed/blue", + "#c:dyed/brown", + "#c:dyed/green", + "#c:dyed/red", + "#c:dyed/black" + ] +} \ 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 new file mode 100644 index 0000000000..493e96b6c0 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/black.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:black_banner", + "minecraft:black_bed", + "minecraft:black_candle", + "minecraft:black_carpet", + "minecraft:black_concrete", + "minecraft:black_concrete_powder", + "minecraft:black_glazed_terracotta", + "minecraft:black_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..0704821f98 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/blue.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:blue_banner", + "minecraft:blue_bed", + "minecraft:blue_candle", + "minecraft:blue_carpet", + "minecraft:blue_concrete", + "minecraft:blue_concrete_powder", + "minecraft:blue_glazed_terracotta", + "minecraft:blue_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..41b1bc3f6f --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/brown.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:brown_banner", + "minecraft:brown_bed", + "minecraft:brown_candle", + "minecraft:brown_carpet", + "minecraft:brown_concrete", + "minecraft:brown_concrete_powder", + "minecraft:brown_glazed_terracotta", + "minecraft:brown_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..a09984e063 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/cyan.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:cyan_banner", + "minecraft:cyan_bed", + "minecraft:cyan_candle", + "minecraft:cyan_carpet", + "minecraft:cyan_concrete", + "minecraft:cyan_concrete_powder", + "minecraft:cyan_glazed_terracotta", + "minecraft:cyan_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..191db19733 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/gray.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:gray_banner", + "minecraft:gray_bed", + "minecraft:gray_candle", + "minecraft:gray_carpet", + "minecraft:gray_concrete", + "minecraft:gray_concrete_powder", + "minecraft:gray_glazed_terracotta", + "minecraft:gray_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..80e3b0bcd1 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/green.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:green_banner", + "minecraft:green_bed", + "minecraft:green_candle", + "minecraft:green_carpet", + "minecraft:green_concrete", + "minecraft:green_concrete_powder", + "minecraft:green_glazed_terracotta", + "minecraft:green_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..73525eab12 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/light_blue.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:light_blue_banner", + "minecraft:light_blue_bed", + "minecraft:light_blue_candle", + "minecraft:light_blue_carpet", + "minecraft:light_blue_concrete", + "minecraft:light_blue_concrete_powder", + "minecraft:light_blue_glazed_terracotta", + "minecraft:light_blue_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..ddfb3e54ad --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/light_gray.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:light_gray_banner", + "minecraft:light_gray_bed", + "minecraft:light_gray_candle", + "minecraft:light_gray_carpet", + "minecraft:light_gray_concrete", + "minecraft:light_gray_concrete_powder", + "minecraft:light_gray_glazed_terracotta", + "minecraft:light_gray_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..aa46340608 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/lime.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:lime_banner", + "minecraft:lime_bed", + "minecraft:lime_candle", + "minecraft:lime_carpet", + "minecraft:lime_concrete", + "minecraft:lime_concrete_powder", + "minecraft:lime_glazed_terracotta", + "minecraft:lime_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..fe71a097ba --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/magenta.json @@ -0,0 +1,32 @@ +{ + "values": [ + "minecraft:magenta_banner", + "minecraft:magenta_bed", + "minecraft:magenta_candle", + "minecraft:magenta_carpet", + "minecraft:magenta_concrete", + "minecraft:magenta_concrete_powder", + "minecraft:magenta_glazed_terracotta", + "minecraft:magenta_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..6641433e65 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/orange.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:orange_banner", + "minecraft:orange_bed", + "minecraft:orange_candle", + "minecraft:orange_carpet", + "minecraft:orange_concrete", + "minecraft:orange_concrete_powder", + "minecraft:orange_glazed_terracotta", + "minecraft:orange_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..edca352827 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/pink.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:pink_banner", + "minecraft:pink_bed", + "minecraft:pink_candle", + "minecraft:pink_carpet", + "minecraft:pink_concrete", + "minecraft:pink_concrete_powder", + "minecraft:pink_glazed_terracotta", + "minecraft:pink_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..3be40b64c6 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/purple.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:purple_banner", + "minecraft:purple_bed", + "minecraft:purple_candle", + "minecraft:purple_carpet", + "minecraft:purple_concrete", + "minecraft:purple_concrete_powder", + "minecraft:purple_glazed_terracotta", + "minecraft:purple_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..7dea013276 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/red.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:red_banner", + "minecraft:red_bed", + "minecraft:red_candle", + "minecraft:red_carpet", + "minecraft:red_concrete", + "minecraft:red_concrete_powder", + "minecraft:red_glazed_terracotta", + "minecraft:red_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..9edbf324cc --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/white.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:white_banner", + "minecraft:white_bed", + "minecraft:white_candle", + "minecraft:white_carpet", + "minecraft:white_concrete", + "minecraft:white_concrete_powder", + "minecraft:white_glazed_terracotta", + "minecraft:white_shulker_box", + "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 + } + ] +} \ 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 new file mode 100644 index 0000000000..57aeacb16f --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyed/yellow.json @@ -0,0 +1,24 @@ +{ + "values": [ + "minecraft:yellow_banner", + "minecraft:yellow_bed", + "minecraft:yellow_candle", + "minecraft:yellow_carpet", + "minecraft:yellow_concrete", + "minecraft:yellow_concrete_powder", + "minecraft:yellow_glazed_terracotta", + "minecraft:yellow_shulker_box", + "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 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/dyes.json b/src/main/generated/data/c/tags/item/dyes.json new file mode 100644 index 0000000000..24f7498948 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes.json @@ -0,0 +1,20 @@ +{ + "values": [ + "#c:dyes/white", + "#c:dyes/orange", + "#c:dyes/magenta", + "#c:dyes/light_blue", + "#c:dyes/yellow", + "#c:dyes/lime", + "#c:dyes/pink", + "#c:dyes/gray", + "#c:dyes/light_gray", + "#c:dyes/cyan", + "#c:dyes/purple", + "#c:dyes/blue", + "#c:dyes/brown", + "#c:dyes/green", + "#c:dyes/red", + "#c:dyes/black" + ] +} \ 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 new file mode 100644 index 0000000000..516aeff755 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/black.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:black_dye", + { + "id": "#forge:dyes/black", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..d64a97e464 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/blue.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:blue_dye", + { + "id": "#forge:dyes/blue", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..220ece0dfe --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/brown.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:brown_dye", + { + "id": "#forge:dyes/brown", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..275830210e --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/cyan.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:cyan_dye", + { + "id": "#forge:dyes/cyan", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..56f595ede5 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/gray.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:gray_dye", + { + "id": "#forge:dyes/gray", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..9f9a8311cf --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/green.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:green_dye", + { + "id": "#forge:dyes/green", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..e5a48d1fed --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/light_blue.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:light_blue_dye", + { + "id": "#forge:dyes/light_blue", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..6627597c69 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/light_gray.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:light_gray_dye", + { + "id": "#forge:dyes/light_gray", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..fc0af1757b --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/lime.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lime_dye", + { + "id": "#forge:dyes/lime", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..d2032d3de2 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/magenta.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:magenta_dye", + { + "id": "#forge:dyes/magenta", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..3534947be3 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/orange.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:orange_dye", + { + "id": "#forge:dyes/orange", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..f7ffc037f0 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/pink.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:pink_dye", + { + "id": "#forge:dyes/pink", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..38a9a29868 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/purple.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:purple_dye", + { + "id": "#forge:dyes/purple", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..f36b684e01 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/red.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:red_dye", + { + "id": "#forge:dyes/red", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..217dfda5c3 --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/white.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:white_dye", + { + "id": "#forge:dyes/white", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..8f469111bf --- /dev/null +++ b/src/main/generated/data/c/tags/item/dyes/yellow.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:yellow_dye", + { + "id": "#forge:dyes/yellow", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/enchantables.json b/src/main/generated/data/c/tags/item/enchantables.json new file mode 100644 index 0000000000..f33d6e0c2d --- /dev/null +++ b/src/main/generated/data/c/tags/item/enchantables.json @@ -0,0 +1,18 @@ +{ + "values": [ + "#minecraft:enchantable/armor", + "#minecraft:enchantable/equippable", + "#minecraft:enchantable/weapon", + "#minecraft:enchantable/sword", + "#minecraft:enchantable/mining", + "#minecraft:enchantable/mining_loot", + "#minecraft:enchantable/fishing", + "#minecraft:enchantable/trident", + "#minecraft:enchantable/bow", + "#minecraft:enchantable/crossbow", + "#minecraft:enchantable/mace", + "#minecraft:enchantable/fire_aspect", + "#minecraft:enchantable/durability", + "#minecraft:enchantable/vanishing" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ender_pearls.json b/src/main/generated/data/c/tags/item/ender_pearls.json new file mode 100644 index 0000000000..bd8b93cf85 --- /dev/null +++ b/src/main/generated/data/c/tags/item/ender_pearls.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:ender_pearl", + { + "id": "#forge:ender_pearls", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/fertilizers.json b/src/main/generated/data/c/tags/item/fertilizers.json new file mode 100644 index 0000000000..b2fdb99159 --- /dev/null +++ b/src/main/generated/data/c/tags/item/fertilizers.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bone_meal" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods.json b/src/main/generated/data/c/tags/item/foods.json new file mode 100644 index 0000000000..f3b9418c8b --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods.json @@ -0,0 +1,23 @@ +{ + "values": [ + "minecraft:baked_potato", + "minecraft:honey_bottle", + "minecraft:ominous_bottle", + "minecraft:dried_kelp", + "#c:foods/fruit", + "#c:foods/vegetable", + "#c:foods/berry", + "#c:foods/bread", + "#c:foods/cookie", + "#c:foods/raw_meat", + "#c:foods/raw_fish", + "#c:foods/cooked_meat", + "#c:foods/cooked_fish", + "#c:foods/soup", + "#c:foods/candy", + "#forge:foods/pie", + "#c:foods/golden", + "#c:foods/edible_when_placed", + "#c:foods/food_poisoning" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/berry.json b/src/main/generated/data/c/tags/item/foods/berry.json new file mode 100644 index 0000000000..500bd9432c --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/berry.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:sweet_berries", + "minecraft:glow_berries" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/bread.json b/src/main/generated/data/c/tags/item/foods/bread.json new file mode 100644 index 0000000000..7873bb3c3f --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/bread.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bread" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/candy.json b/src/main/generated/data/c/tags/item/foods/candy.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/candy.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/cooked_fish.json b/src/main/generated/data/c/tags/item/foods/cooked_fish.json new file mode 100644 index 0000000000..4e459bea9e --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/cooked_fish.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:cooked_cod", + "minecraft:cooked_salmon" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/cooked_meat.json b/src/main/generated/data/c/tags/item/foods/cooked_meat.json new file mode 100644 index 0000000000..ffd78dc19a --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/cooked_meat.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:cooked_beef", + "minecraft:cooked_porkchop", + "minecraft:cooked_chicken", + "minecraft:cooked_rabbit", + "minecraft:cooked_mutton" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/cookie.json b/src/main/generated/data/c/tags/item/foods/cookie.json new file mode 100644 index 0000000000..a7c0dc91d8 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/cookie.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cookie" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/edible_when_placed.json b/src/main/generated/data/c/tags/item/foods/edible_when_placed.json new file mode 100644 index 0000000000..d1a45a9222 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/edible_when_placed.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:cake" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/food_poisoning.json b/src/main/generated/data/c/tags/item/foods/food_poisoning.json new file mode 100644 index 0000000000..6b59df70e4 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/food_poisoning.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:poisonous_potato", + "minecraft:pufferfish", + "minecraft:spider_eye", + "minecraft:chicken", + "minecraft:rotten_flesh" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/fruit.json b/src/main/generated/data/c/tags/item/foods/fruit.json new file mode 100644 index 0000000000..d28fee4f3a --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/fruit.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:apple", + "minecraft:golden_apple", + "minecraft:enchanted_golden_apple", + "minecraft:chorus_fruit", + "minecraft:melon_slice" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/golden.json b/src/main/generated/data/c/tags/item/foods/golden.json new file mode 100644 index 0000000000..da323315a3 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/golden.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:golden_apple", + "minecraft:enchanted_golden_apple", + "minecraft:golden_carrot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/raw_fish.json b/src/main/generated/data/c/tags/item/foods/raw_fish.json new file mode 100644 index 0000000000..83d056aa44 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/raw_fish.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:cod", + "minecraft:salmon", + "minecraft:tropical_fish", + "minecraft:pufferfish" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/raw_meat.json b/src/main/generated/data/c/tags/item/foods/raw_meat.json new file mode 100644 index 0000000000..c548b57f3a --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/raw_meat.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:beef", + "minecraft:porkchop", + "minecraft:chicken", + "minecraft:rabbit", + "minecraft:mutton" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/soup.json b/src/main/generated/data/c/tags/item/foods/soup.json new file mode 100644 index 0000000000..5a1a339249 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/soup.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:beetroot_soup", + "minecraft:mushroom_stew", + "minecraft:rabbit_stew", + "minecraft:suspicious_stew" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/foods/vegetable.json b/src/main/generated/data/c/tags/item/foods/vegetable.json new file mode 100644 index 0000000000..17ecdb1ca6 --- /dev/null +++ b/src/main/generated/data/c/tags/item/foods/vegetable.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:carrot", + "minecraft:golden_carrot", + "minecraft:potato", + "minecraft:beetroot" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems.json b/src/main/generated/data/c/tags/item/gems.json new file mode 100644 index 0000000000..6f340c553c --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#c:gems/amethyst", + "#c:gems/diamond", + "#c:gems/emerald", + "#c:gems/lapis", + "#c:gems/prismarine", + "#c:gems/quartz", + { + "id": "#forge:gems", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems/amethyst.json b/src/main/generated/data/c/tags/item/gems/amethyst.json new file mode 100644 index 0000000000..d222353687 --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems/amethyst.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:amethyst_shard", + { + "id": "#forge:gems/amethyst", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems/diamond.json b/src/main/generated/data/c/tags/item/gems/diamond.json new file mode 100644 index 0000000000..1ca2673f21 --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems/diamond.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:diamond", + { + "id": "#forge:gems/diamond", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems/emerald.json b/src/main/generated/data/c/tags/item/gems/emerald.json new file mode 100644 index 0000000000..de1e12af1b --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems/emerald.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:emerald", + { + "id": "#forge:gems/emerald", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems/lapis.json b/src/main/generated/data/c/tags/item/gems/lapis.json new file mode 100644 index 0000000000..0e92612548 --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems/lapis.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lapis_lazuli", + { + "id": "#forge:gems/lapis", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems/prismarine.json b/src/main/generated/data/c/tags/item/gems/prismarine.json new file mode 100644 index 0000000000..df7aa66312 --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems/prismarine.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:prismarine_crystals", + { + "id": "#forge:gems/prismarine", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/gems/quartz.json b/src/main/generated/data/c/tags/item/gems/quartz.json new file mode 100644 index 0000000000..d0604485bd --- /dev/null +++ b/src/main/generated/data/c/tags/item/gems/quartz.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:quartz", + { + "id": "#forge:gems/quartz", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/glass_blocks.json b/src/main/generated/data/c/tags/item/glass_blocks.json new file mode 100644 index 0000000000..55b243f654 --- /dev/null +++ b/src/main/generated/data/c/tags/item/glass_blocks.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#c:glass_blocks/colorless", + "#c:glass_blocks/cheap", + "#c:glass_blocks/tinted", + { + "id": "#forge:glass", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/glass/silica.json b/src/main/generated/data/c/tags/item/glass_blocks/cheap.json similarity index 84% rename from src/main/generated/data/forge/tags/item/glass/silica.json rename to src/main/generated/data/c/tags/item/glass_blocks/cheap.json index 74544c770d..ccd28136a6 100644 --- a/src/main/generated/data/forge/tags/item/glass/silica.json +++ b/src/main/generated/data/c/tags/item/glass_blocks/cheap.json @@ -1,21 +1,25 @@ { "values": [ "minecraft:glass", - "minecraft:black_stained_glass", + "minecraft:white_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:yellow_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:purple_stained_glass", "minecraft:blue_stained_glass", "minecraft:brown_stained_glass", - "minecraft: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" + "minecraft:black_stained_glass", + { + "id": "#forge:glass_silica", + "required": false + } ] } \ No newline at end of file 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 new file mode 100644 index 0000000000..7d2e81b6c4 --- /dev/null +++ b/src/main/generated/data/c/tags/item/glass_blocks/colorless.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:glass", + { + "id": "#forge:glass_colorless", + "required": false + } + ] +} \ No newline at end of file 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 new file mode 100644 index 0000000000..0a7d0f3f00 --- /dev/null +++ b/src/main/generated/data/c/tags/item/glass_blocks/tinted.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:tinted_glass", + { + "id": "#forge:glass_tinted", + "required": false + } + ] +} \ 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/c/tags/item/glass_panes.json similarity index 95% rename from src/main/generated/data/forge/tags/block/stained_glass_panes.json rename to src/main/generated/data/c/tags/item/glass_panes.json index 65f2adb8f9..c4bdf8ea3f 100644 --- a/src/main/generated/data/forge/tags/block/stained_glass_panes.json +++ b/src/main/generated/data/c/tags/item/glass_panes.json @@ -1,5 +1,6 @@ { "values": [ + "#c:glass_panes/colorless", "minecraft:white_stained_glass_pane", "minecraft:orange_stained_glass_pane", "minecraft:magenta_stained_glass_pane", 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 new file mode 100644 index 0000000000..b7d7245a6a --- /dev/null +++ b/src/main/generated/data/c/tags/item/glass_panes/colorless.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:glass_pane", + { + "id": "#forge:glass_panes_colorless", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/glazed_terracottas.json b/src/main/generated/data/c/tags/item/glazed_terracottas.json new file mode 100644 index 0000000000..26cb2df258 --- /dev/null +++ b/src/main/generated/data/c/tags/item/glazed_terracottas.json @@ -0,0 +1,20 @@ +{ + "values": [ + "minecraft:white_glazed_terracotta", + "minecraft:orange_glazed_terracotta", + "minecraft:magenta_glazed_terracotta", + "minecraft:light_blue_glazed_terracotta", + "minecraft:yellow_glazed_terracotta", + "minecraft:lime_glazed_terracotta", + "minecraft:pink_glazed_terracotta", + "minecraft:gray_glazed_terracotta", + "minecraft:light_gray_glazed_terracotta", + "minecraft:cyan_glazed_terracotta", + "minecraft:purple_glazed_terracotta", + "minecraft:blue_glazed_terracotta", + "minecraft:brown_glazed_terracotta", + "minecraft:green_glazed_terracotta", + "minecraft:red_glazed_terracotta", + "minecraft:black_glazed_terracotta" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/hidden_from_recipe_viewers.json b/src/main/generated/data/c/tags/item/hidden_from_recipe_viewers.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/item/hidden_from_recipe_viewers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ingots.json b/src/main/generated/data/c/tags/item/ingots.json new file mode 100644 index 0000000000..4584668355 --- /dev/null +++ b/src/main/generated/data/c/tags/item/ingots.json @@ -0,0 +1,12 @@ +{ + "values": [ + "#c:ingots/copper", + "#c:ingots/gold", + "#c:ingots/iron", + "#c:ingots/netherite", + { + "id": "#forge:ingots", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ingots/copper.json b/src/main/generated/data/c/tags/item/ingots/copper.json new file mode 100644 index 0000000000..2043a331d0 --- /dev/null +++ b/src/main/generated/data/c/tags/item/ingots/copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:copper_ingot", + { + "id": "#forge:ingots/copper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ingots/gold.json b/src/main/generated/data/c/tags/item/ingots/gold.json new file mode 100644 index 0000000000..70299fe304 --- /dev/null +++ b/src/main/generated/data/c/tags/item/ingots/gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:gold_ingot", + { + "id": "#forge:ingots/gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ingots/iron.json b/src/main/generated/data/c/tags/item/ingots/iron.json new file mode 100644 index 0000000000..7fa35c33e3 --- /dev/null +++ b/src/main/generated/data/c/tags/item/ingots/iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:iron_ingot", + { + "id": "#forge:ingots/iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ingots/netherite.json b/src/main/generated/data/c/tags/item/ingots/netherite.json new file mode 100644 index 0000000000..61b250abae --- /dev/null +++ b/src/main/generated/data/c/tags/item/ingots/netherite.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:netherite_ingot", + { + "id": "#forge:ingots/netherite", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/leathers.json b/src/main/generated/data/c/tags/item/leathers.json new file mode 100644 index 0000000000..71f8c03e09 --- /dev/null +++ b/src/main/generated/data/c/tags/item/leathers.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:leather", + { + "id": "#forge:leather", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/music_discs.json b/src/main/generated/data/c/tags/item/music_discs.json new file mode 100644 index 0000000000..4cfc035e4f --- /dev/null +++ b/src/main/generated/data/c/tags/item/music_discs.json @@ -0,0 +1,23 @@ +{ + "values": [ + "minecraft:music_disc_13", + "minecraft:music_disc_cat", + "minecraft:music_disc_blocks", + "minecraft:music_disc_chirp", + "minecraft:music_disc_far", + "minecraft:music_disc_mall", + "minecraft:music_disc_mellohi", + "minecraft:music_disc_stal", + "minecraft:music_disc_strad", + "minecraft:music_disc_ward", + "minecraft:music_disc_11", + "minecraft:music_disc_wait", + "minecraft:music_disc_otherside", + "minecraft:music_disc_5", + "minecraft:music_disc_pigstep", + "minecraft:music_disc_relic", + "minecraft:music_disc_creator", + "minecraft:music_disc_creator_music_box", + "minecraft:music_disc_precipice" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/nuggets.json b/src/main/generated/data/c/tags/item/nuggets.json new file mode 100644 index 0000000000..f7a672879a --- /dev/null +++ b/src/main/generated/data/c/tags/item/nuggets.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:nuggets/gold", + "#c:nuggets/iron", + { + "id": "#forge:nuggets", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/nuggets/gold.json b/src/main/generated/data/c/tags/item/nuggets/gold.json new file mode 100644 index 0000000000..77eb151909 --- /dev/null +++ b/src/main/generated/data/c/tags/item/nuggets/gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:gold_nugget", + { + "id": "#forge:nuggets/gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/nuggets/iron.json b/src/main/generated/data/c/tags/item/nuggets/iron.json new file mode 100644 index 0000000000..0f529f154f --- /dev/null +++ b/src/main/generated/data/c/tags/item/nuggets/iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:iron_nugget", + { + "id": "#forge:nuggets/iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/obsidians.json b/src/main/generated/data/c/tags/item/obsidians.json new file mode 100644 index 0000000000..3986b73df1 --- /dev/null +++ b/src/main/generated/data/c/tags/item/obsidians.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:obsidians/normal", + "#c:obsidians/crying", + { + "id": "#forge:obsidian", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/obsidians/crying.json b/src/main/generated/data/c/tags/item/obsidians/crying.json new file mode 100644 index 0000000000..2e8b37a1bc --- /dev/null +++ b/src/main/generated/data/c/tags/item/obsidians/crying.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crying_obsidian" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/obsidian.json b/src/main/generated/data/c/tags/item/obsidians/normal.json similarity index 100% rename from src/main/generated/data/forge/tags/item/obsidian.json rename to src/main/generated/data/c/tags/item/obsidians/normal.json diff --git a/src/main/generated/data/forge/tags/block/ores.json b/src/main/generated/data/c/tags/item/ores.json similarity index 66% rename from src/main/generated/data/forge/tags/block/ores.json rename to src/main/generated/data/c/tags/item/ores.json index 2c4beabc55..7397864c1a 100644 --- a/src/main/generated/data/forge/tags/block/ores.json +++ b/src/main/generated/data/c/tags/item/ores.json @@ -7,8 +7,12 @@ "#forge:ores/gold", "#forge:ores/iron", "#forge:ores/lapis", + "#c:ores/netherite_scrap", "#forge:ores/redstone", - "#forge:ores/quartz", - "#forge:ores/netherite_scrap" + "#c:ores/quartz", + { + "id": "#forge:ores", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ores/netherite_scrap.json b/src/main/generated/data/c/tags/item/ores/netherite_scrap.json new file mode 100644 index 0000000000..6cc208db8e --- /dev/null +++ b/src/main/generated/data/c/tags/item/ores/netherite_scrap.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:ancient_debris", + { + "id": "#forge:ores/netherite_scrap", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ores/quartz.json b/src/main/generated/data/c/tags/item/ores/quartz.json new file mode 100644 index 0000000000..5433b2ed6f --- /dev/null +++ b/src/main/generated/data/c/tags/item/ores/quartz.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:nether_quartz_ore", + { + "id": "#forge:ores/quartz", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/player_workstations/crafting_tables.json b/src/main/generated/data/c/tags/item/player_workstations/crafting_tables.json new file mode 100644 index 0000000000..3be1c8e22e --- /dev/null +++ b/src/main/generated/data/c/tags/item/player_workstations/crafting_tables.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:crafting_table" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/player_workstations/furnaces.json b/src/main/generated/data/c/tags/item/player_workstations/furnaces.json new file mode 100644 index 0000000000..25edfef1ca --- /dev/null +++ b/src/main/generated/data/c/tags/item/player_workstations/furnaces.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:furnace" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/raw_materials.json b/src/main/generated/data/c/tags/item/raw_materials.json new file mode 100644 index 0000000000..de258a264b --- /dev/null +++ b/src/main/generated/data/c/tags/item/raw_materials.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#c:raw_materials/copper", + "#c:raw_materials/gold", + "#c:raw_materials/iron", + { + "id": "#forge:raw_materials", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/raw_materials/copper.json b/src/main/generated/data/c/tags/item/raw_materials/copper.json new file mode 100644 index 0000000000..ce2a8c25b9 --- /dev/null +++ b/src/main/generated/data/c/tags/item/raw_materials/copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_copper", + { + "id": "#forge:raw_materials/copper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/raw_materials/gold.json b/src/main/generated/data/c/tags/item/raw_materials/gold.json new file mode 100644 index 0000000000..555e287358 --- /dev/null +++ b/src/main/generated/data/c/tags/item/raw_materials/gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_gold", + { + "id": "#forge:raw_materials/gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/raw_materials/iron.json b/src/main/generated/data/c/tags/item/raw_materials/iron.json new file mode 100644 index 0000000000..def08c1dac --- /dev/null +++ b/src/main/generated/data/c/tags/item/raw_materials/iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_iron", + { + "id": "#forge:raw_materials/iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/rods.json b/src/main/generated/data/c/tags/item/rods.json new file mode 100644 index 0000000000..4bf89f59ff --- /dev/null +++ b/src/main/generated/data/c/tags/item/rods.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#c:rods/wooden", + "#c:rods/blaze", + "#c:rods/breeze", + { + "id": "#forge:rods", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/rods/blaze.json b/src/main/generated/data/c/tags/item/rods/blaze.json new file mode 100644 index 0000000000..cda6278df8 --- /dev/null +++ b/src/main/generated/data/c/tags/item/rods/blaze.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:blaze_rod", + { + "id": "#forge:rods/blaze", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/rods/breeze.json b/src/main/generated/data/c/tags/item/rods/breeze.json new file mode 100644 index 0000000000..8290ef56cf --- /dev/null +++ b/src/main/generated/data/c/tags/item/rods/breeze.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:breeze_rod" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/rods/wooden.json b/src/main/generated/data/c/tags/item/rods/wooden.json new file mode 100644 index 0000000000..348d18d33d --- /dev/null +++ b/src/main/generated/data/c/tags/item/rods/wooden.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:stick", + { + "id": "#forge:rods/wooden", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/ropes.json b/src/main/generated/data/c/tags/item/ropes.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/item/ropes.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/blocks.json b/src/main/generated/data/c/tags/item/sandstone/blocks.json new file mode 100644 index 0000000000..5684db6caf --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/blocks.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:sandstone/red_blocks", + "#c:sandstone/uncolored_blocks", + { + "id": "#forge:sandstone", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/sandstone.json b/src/main/generated/data/c/tags/item/sandstone/red_blocks.json similarity index 56% rename from src/main/generated/data/forge/tags/item/sandstone.json rename to src/main/generated/data/c/tags/item/sandstone/red_blocks.json index bb7fb03ee3..4e72ad44cd 100644 --- a/src/main/generated/data/forge/tags/item/sandstone.json +++ b/src/main/generated/data/c/tags/item/sandstone/red_blocks.json @@ -1,9 +1,5 @@ { "values": [ - "minecraft:sandstone", - "minecraft:cut_sandstone", - "minecraft:chiseled_sandstone", - "minecraft:smooth_sandstone", "minecraft:red_sandstone", "minecraft:cut_red_sandstone", "minecraft:chiseled_red_sandstone", diff --git a/src/main/generated/data/c/tags/item/sandstone/red_slabs.json b/src/main/generated/data/c/tags/item/sandstone/red_slabs.json new file mode 100644 index 0000000000..a586c49087 --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/red_slabs.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:red_sandstone_slab", + "minecraft:cut_red_sandstone_slab", + "minecraft:smooth_red_sandstone_slab" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/red_stairs.json b/src/main/generated/data/c/tags/item/sandstone/red_stairs.json new file mode 100644 index 0000000000..8778d5dbbd --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/red_stairs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:red_sandstone_stairs", + "minecraft:smooth_red_sandstone_stairs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/slabs.json b/src/main/generated/data/c/tags/item/sandstone/slabs.json new file mode 100644 index 0000000000..92bc3f3ed9 --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/slabs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:sandstone/red_slabs", + "#c:sandstone/uncolored_slabs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/stairs.json b/src/main/generated/data/c/tags/item/sandstone/stairs.json new file mode 100644 index 0000000000..673f168ddf --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/stairs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#c:sandstone/red_stairs", + "#c:sandstone/uncolored_stairs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/uncolored_blocks.json b/src/main/generated/data/c/tags/item/sandstone/uncolored_blocks.json new file mode 100644 index 0000000000..4e32539b4e --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/uncolored_blocks.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:sandstone", + "minecraft:cut_sandstone", + "minecraft:chiseled_sandstone", + "minecraft:smooth_sandstone" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/uncolored_slabs.json b/src/main/generated/data/c/tags/item/sandstone/uncolored_slabs.json new file mode 100644 index 0000000000..d830f1dc1e --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/uncolored_slabs.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:sandstone_slab", + "minecraft:cut_sandstone_slab", + "minecraft:smooth_sandstone_slab" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/sandstone/uncolored_stairs.json b/src/main/generated/data/c/tags/item/sandstone/uncolored_stairs.json new file mode 100644 index 0000000000..ddb4a27f87 --- /dev/null +++ b/src/main/generated/data/c/tags/item/sandstone/uncolored_stairs.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:sandstone_stairs", + "minecraft:smooth_sandstone_stairs" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/shulker_boxes.json b/src/main/generated/data/c/tags/item/shulker_boxes.json new file mode 100644 index 0000000000..8ffa83c158 --- /dev/null +++ b/src/main/generated/data/c/tags/item/shulker_boxes.json @@ -0,0 +1,21 @@ +{ + "values": [ + "minecraft:shulker_box", + "minecraft:white_shulker_box", + "minecraft:orange_shulker_box", + "minecraft:magenta_shulker_box", + "minecraft:light_blue_shulker_box", + "minecraft:yellow_shulker_box", + "minecraft:lime_shulker_box", + "minecraft:pink_shulker_box", + "minecraft:gray_shulker_box", + "minecraft:light_gray_shulker_box", + "minecraft:cyan_shulker_box", + "minecraft:purple_shulker_box", + "minecraft:blue_shulker_box", + "minecraft:brown_shulker_box", + "minecraft:green_shulker_box", + "minecraft:red_shulker_box", + "minecraft:black_shulker_box" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/slime_balls.json b/src/main/generated/data/c/tags/item/slime_balls.json new file mode 100644 index 0000000000..e81d459385 --- /dev/null +++ b/src/main/generated/data/c/tags/item/slime_balls.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:slime_ball", + { + "id": "#forge:slimeballs", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..2848998459 --- /dev/null +++ b/src/main/generated/data/c/tags/item/stones.json @@ -0,0 +1,14 @@ +{ + "values": [ + "minecraft:andesite", + "minecraft:diorite", + "minecraft:granite", + "minecraft:stone", + "minecraft:deepslate", + "minecraft:tuff", + { + "id": "#forge:stone", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..7bf4a38117 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks.json @@ -0,0 +1,24 @@ +{ + "values": [ + "#c:storage_blocks/bone_meal", + "#c:storage_blocks/coal", + "#c:storage_blocks/copper", + "#c:storage_blocks/diamond", + "#c:storage_blocks/dried_kelp", + "#c:storage_blocks/emerald", + "#c:storage_blocks/gold", + "#c:storage_blocks/iron", + "#c:storage_blocks/lapis", + "#c:storage_blocks/netherite", + "#c:storage_blocks/raw_copper", + "#c:storage_blocks/raw_gold", + "#c:storage_blocks/raw_iron", + "#c:storage_blocks/redstone", + "#c:storage_blocks/slime", + "#c:storage_blocks/wheat", + { + "id": "#forge:storage_blocks", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/bone_meal.json b/src/main/generated/data/c/tags/item/storage_blocks/bone_meal.json new file mode 100644 index 0000000000..98ab24a213 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/bone_meal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:bone_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/coal.json b/src/main/generated/data/c/tags/item/storage_blocks/coal.json new file mode 100644 index 0000000000..b8479ced38 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/coal.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:coal_block", + { + "id": "#forge:storage_blocks/coal", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/copper.json b/src/main/generated/data/c/tags/item/storage_blocks/copper.json new file mode 100644 index 0000000000..acd2a6a7a4 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:copper_block", + { + "id": "#forge:storage_blocks/copper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/diamond.json b/src/main/generated/data/c/tags/item/storage_blocks/diamond.json new file mode 100644 index 0000000000..76426ba425 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/diamond.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:diamond_block", + { + "id": "#forge:storage_blocks/diamond", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/dried_kelp.json b/src/main/generated/data/c/tags/item/storage_blocks/dried_kelp.json new file mode 100644 index 0000000000..2609656429 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/dried_kelp.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:dried_kelp_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/emerald.json b/src/main/generated/data/c/tags/item/storage_blocks/emerald.json new file mode 100644 index 0000000000..7a41454d94 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/emerald.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:emerald_block", + { + "id": "#forge:storage_blocks/emerald", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/gold.json b/src/main/generated/data/c/tags/item/storage_blocks/gold.json new file mode 100644 index 0000000000..a4116fc77f --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:gold_block", + { + "id": "#forge:storage_blocks/gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/iron.json b/src/main/generated/data/c/tags/item/storage_blocks/iron.json new file mode 100644 index 0000000000..f0e9fcca1f --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:iron_block", + { + "id": "#forge:storage_blocks/iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/lapis.json b/src/main/generated/data/c/tags/item/storage_blocks/lapis.json new file mode 100644 index 0000000000..b5f41d8d4e --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/lapis.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:lapis_block", + { + "id": "#forge:storage_blocks/lapis", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/netherite.json b/src/main/generated/data/c/tags/item/storage_blocks/netherite.json new file mode 100644 index 0000000000..a3dfe0d53c --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/netherite.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:netherite_block", + { + "id": "#forge:storage_blocks/netherite", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/raw_copper.json b/src/main/generated/data/c/tags/item/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..8f12fb63a7 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/raw_copper.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_copper_block", + { + "id": "#forge:storage_blocks/raw_copper", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/raw_gold.json b/src/main/generated/data/c/tags/item/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..dcee1e225b --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/raw_gold.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_gold_block", + { + "id": "#forge:storage_blocks/raw_gold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/raw_iron.json b/src/main/generated/data/c/tags/item/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..3f0ecf27ad --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/raw_iron.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:raw_iron_block", + { + "id": "#forge:storage_blocks/raw_iron", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/redstone.json b/src/main/generated/data/c/tags/item/storage_blocks/redstone.json new file mode 100644 index 0000000000..49fa7a5a26 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/redstone.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:redstone_block", + { + "id": "#forge:storage_blocks/redstone", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/slime.json b/src/main/generated/data/c/tags/item/storage_blocks/slime.json new file mode 100644 index 0000000000..523bdc2835 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/slime.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:slime_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/storage_blocks/wheat.json b/src/main/generated/data/c/tags/item/storage_blocks/wheat.json new file mode 100644 index 0000000000..ea92d03cb4 --- /dev/null +++ b/src/main/generated/data/c/tags/item/storage_blocks/wheat.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:hay_block" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/strings.json b/src/main/generated/data/c/tags/item/strings.json new file mode 100644 index 0000000000..89b40c31c5 --- /dev/null +++ b/src/main/generated/data/c/tags/item/strings.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:string", + { + "id": "#forge:strings", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools.json b/src/main/generated/data/c/tags/item/tools.json new file mode 100644 index 0000000000..14b99aa54e --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools.json @@ -0,0 +1,25 @@ +{ + "values": [ + "#minecraft:axes", + "#minecraft:hoes", + "#minecraft:pickaxes", + "#minecraft:shovels", + "#minecraft:swords", + "#c:tools/bow", + "#c:tools/brush", + "#c:tools/crossbow", + "#c:tools/fishing_rod", + "#c:tools/shear", + "#c:tools/igniter", + "#c:tools/shield", + "#c:tools/spear", + "#c:tools/mace", + "#c:tools/mining_tool", + "#c:tools/melee_weapon", + "#c:tools/ranged_weapon", + { + "id": "#forge:tools", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/bow.json b/src/main/generated/data/c/tags/item/tools/bow.json new file mode 100644 index 0000000000..e46556b3d2 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/bow.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:bow", + { + "id": "#forge:tools/bows", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..30f5564ba5 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/brush.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:brush", + { + "id": "#forge:tools/brushes", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/crossbow.json b/src/main/generated/data/c/tags/item/tools/crossbow.json new file mode 100644 index 0000000000..d1e63bc584 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/crossbow.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:crossbow", + { + "id": "#forge:tools/crossbows", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/fishing_rod.json b/src/main/generated/data/c/tags/item/tools/fishing_rod.json new file mode 100644 index 0000000000..efafba4845 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/fishing_rod.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:fishing_rod", + { + "id": "#forge:tools/fishing_rods", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/igniter.json b/src/main/generated/data/c/tags/item/tools/igniter.json new file mode 100644 index 0000000000..808aaa93d9 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/igniter.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:flint_and_steel" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/mace.json b/src/main/generated/data/c/tags/item/tools/mace.json new file mode 100644 index 0000000000..c149f0e506 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/mace.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:mace" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/melee_weapon.json b/src/main/generated/data/c/tags/item/tools/melee_weapon.json new file mode 100644 index 0000000000..1b166a3b4a --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/melee_weapon.json @@ -0,0 +1,18 @@ +{ + "values": [ + "minecraft:mace", + "minecraft:trident", + "minecraft:wooden_sword", + "minecraft:stone_sword", + "minecraft:golden_sword", + "minecraft:iron_sword", + "minecraft:diamond_sword", + "minecraft:netherite_sword", + "minecraft:wooden_axe", + "minecraft:stone_axe", + "minecraft:golden_axe", + "minecraft:iron_axe", + "minecraft:diamond_axe", + "minecraft:netherite_axe" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/mining_tool.json b/src/main/generated/data/c/tags/item/tools/mining_tool.json new file mode 100644 index 0000000000..c10d395032 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/mining_tool.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:wooden_pickaxe", + "minecraft:stone_pickaxe", + "minecraft:iron_pickaxe", + "minecraft:golden_pickaxe", + "minecraft:diamond_pickaxe", + "minecraft:netherite_pickaxe" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/ranged_weapon.json b/src/main/generated/data/c/tags/item/tools/ranged_weapon.json new file mode 100644 index 0000000000..9403216f8c --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/ranged_weapon.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:bow", + "minecraft:crossbow", + "minecraft:trident" + ] +} \ 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 new file mode 100644 index 0000000000..1c2ad36f72 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/shear.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:shears", + { + "id": "#forge:shears", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/shield.json b/src/main/generated/data/c/tags/item/tools/shield.json new file mode 100644 index 0000000000..f0b441428b --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/shield.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:shield", + { + "id": "#forge:tools/shields", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/spear.json b/src/main/generated/data/c/tags/item/tools/spear.json new file mode 100644 index 0000000000..c5b8b99af6 --- /dev/null +++ b/src/main/generated/data/c/tags/item/tools/spear.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:trident", + { + "id": "#forge:tools/tridents", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/villager_job_sites.json b/src/main/generated/data/c/tags/item/villager_job_sites.json new file mode 100644 index 0000000000..6f11b1676a --- /dev/null +++ b/src/main/generated/data/c/tags/item/villager_job_sites.json @@ -0,0 +1,17 @@ +{ + "values": [ + "minecraft:barrel", + "minecraft:blast_furnace", + "minecraft:brewing_stand", + "minecraft:cartography_table", + "minecraft:cauldron", + "minecraft:composter", + "minecraft:fletching_table", + "minecraft:grindstone", + "minecraft:lectern", + "minecraft:loom", + "minecraft:smithing_table", + "minecraft:smoker", + "minecraft:stonecutter" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/hidden_from_locator_selection.json b/src/main/generated/data/c/tags/worldgen/biome/hidden_from_locator_selection.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/hidden_from_locator_selection.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 new file mode 100644 index 0000000000..77bf3cac1a --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_aquatic.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:is_ocean", + "#c:is_river", + { + "id": "#forge:is_water", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_aquatic_icy.json b/src/main/generated/data/c/tags/worldgen/biome/is_aquatic_icy.json new file mode 100644 index 0000000000..d7feec409a --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_aquatic_icy.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:frozen_river", + "minecraft:deep_frozen_ocean", + "minecraft:frozen_ocean" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_badlands.json b/src/main/generated/data/c/tags/worldgen/biome/is_badlands.json new file mode 100644 index 0000000000..161fcc2892 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_badlands.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_badlands" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_beach.json b/src/main/generated/data/c/tags/worldgen/biome/is_beach.json new file mode 100644 index 0000000000..b15673e3d6 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_beach.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_beach" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_birch_forest.json b/src/main/generated/data/c/tags/worldgen/biome/is_birch_forest.json new file mode 100644 index 0000000000..1d080779b6 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_birch_forest.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:birch_forest", + "minecraft:old_growth_birch_forest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_cave.json b/src/main/generated/data/c/tags/worldgen/biome/is_cave.json new file mode 100644 index 0000000000..14acf097ed --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_cave.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:lush_caves", + "minecraft:dripstone_caves", + "minecraft:deep_dark", + { + "id": "#forge:is_cave", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..cf12ef88d5 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_cold.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#c:is_cold/overworld", + { + "id": "#forge:is_cold/nether", + "required": false + }, + "#c:is_cold/end", + { + "id": "#forge:is_cold", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_cold/end.json b/src/main/generated/data/c/tags/worldgen/biome/is_cold/end.json new file mode 100644 index 0000000000..5598c65b7f --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_cold/end.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:the_end", + "minecraft:small_end_islands", + "minecraft:end_midlands", + "minecraft:end_highlands", + "minecraft:end_barrens", + { + "id": "#forge:is_cold/end", + "required": false + } + ] +} \ 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/c/tags/worldgen/biome/is_cold/overworld.json similarity index 60% rename from src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json rename to src/main/generated/data/c/tags/worldgen/biome/is_cold/overworld.json index 4d7cf8a957..67e6574044 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_cold/overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_cold/overworld.json @@ -1,19 +1,28 @@ { "values": [ "minecraft:taiga", - "minecraft:frozen_ocean", - "minecraft:frozen_river", - "minecraft:snowy_plains", - "minecraft:snowy_beach", - "minecraft:snowy_taiga", "minecraft:old_growth_pine_taiga", + "minecraft:old_growth_spruce_taiga", + "minecraft:windswept_hills", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_forest", + "minecraft:snowy_plains", + "minecraft:ice_spikes", "minecraft:grove", "minecraft:snowy_slopes", "minecraft:jagged_peaks", "minecraft:frozen_peaks", + "minecraft:stony_shore", + "minecraft:snowy_beach", + "minecraft:snowy_taiga", + "minecraft:frozen_river", "minecraft:cold_ocean", + "minecraft:frozen_ocean", "minecraft:deep_cold_ocean", "minecraft:deep_frozen_ocean", - "minecraft:ice_spikes" + { + "id": "#forge:is_cold/overworld", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_dead.json b/src/main/generated/data/c/tags/worldgen/biome/is_dead.json new file mode 100644 index 0000000000..019f7a17c7 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dead.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:is_dead", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_deep_ocean.json b/src/main/generated/data/c/tags/worldgen/biome/is_deep_ocean.json new file mode 100644 index 0000000000..0fef9dd36a --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_deep_ocean.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_deep_ocean" + ] +} \ 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/c/tags/worldgen/biome/is_dense_vegetation.json similarity index 60% rename from src/main/generated/data/forge/tags/worldgen/biome/is_dense.json rename to src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation.json index fa16b4cc6b..4eb83501aa 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_dense.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation.json @@ -1,6 +1,6 @@ { "values": [ - "#forge:is_dense/overworld", + "#c:is_dense_vegetation/overworld", { "id": "#forge:is_dense/nether", "required": false @@ -8,6 +8,10 @@ { "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_dense_vegetation/overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json new file mode 100644 index 0000000000..3af2bdd5e4 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dense_vegetation/overworld.json @@ -0,0 +1,14 @@ +{ + "values": [ + "minecraft:dark_forest", + "minecraft:old_growth_birch_forest", + "minecraft:old_growth_spruce_taiga", + "minecraft:jungle", + "minecraft:bamboo_jungle", + "minecraft:mangrove_swamp", + { + "id": "#forge:is_dense/overworld", + "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 new file mode 100644 index 0000000000..7f6b11f3b4 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_desert.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:desert", + { + "id": "#forge:is_desert", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_dry.json b/src/main/generated/data/c/tags/worldgen/biome/is_dry.json new file mode 100644 index 0000000000..d1e491ae50 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dry.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#c:is_dry/overworld", + "#c:is_dry/nether", + "#c:is_dry/end", + { + "id": "#forge:is_dry", + "required": false + } + ] +} \ 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/c/tags/worldgen/biome/is_dry/end.json similarity index 59% rename from src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json rename to src/main/generated/data/c/tags/worldgen/biome/is_dry/end.json index 73d3eff3b0..ce1b28ee59 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_dry/end.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dry/end.json @@ -4,6 +4,10 @@ "minecraft:small_end_islands", "minecraft:end_midlands", "minecraft:end_highlands", - "minecraft:end_barrens" + "minecraft:end_barrens", + { + "id": "#forge:is_dry/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/c/tags/worldgen/biome/is_dry/nether.json similarity index 59% rename from src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json rename to src/main/generated/data/c/tags/worldgen/biome/is_dry/nether.json index 340c9d161b..c490dcb1af 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_hot/nether.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dry/nether.json @@ -1,9 +1,13 @@ { "values": [ "minecraft:nether_wastes", - "minecraft:soul_sand_valley", "minecraft:crimson_forest", "minecraft:warped_forest", - "minecraft:basalt_deltas" + "minecraft:soul_sand_valley", + "minecraft:basalt_deltas", + { + "id": "#forge:is_dry/nether", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_dry/overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_dry/overworld.json new file mode 100644 index 0000000000..66049f8928 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_dry/overworld.json @@ -0,0 +1,15 @@ +{ + "values": [ + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", + "minecraft:savanna", + "minecraft:savanna_plateau", + "minecraft:windswept_savanna", + { + "id": "#forge:is_dry/overworld", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..2e43e7a97b --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_end.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#minecraft:is_end", + { + "id": "#forge:is_end", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..32cfdbacc2 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_floral.json @@ -0,0 +1,12 @@ +{ + "values": [ + "#c:is_flower_forest", + "minecraft:sunflower_plains", + "minecraft:cherry_grove", + "minecraft:meadow", + { + "id": "#forge:is_floral", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_flower_forest.json b/src/main/generated/data/c/tags/worldgen/biome/is_flower_forest.json new file mode 100644 index 0000000000..8edd5b8da3 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_flower_forest.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:flower_forest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_forest.json b/src/main/generated/data/c/tags/worldgen/biome/is_forest.json new file mode 100644 index 0000000000..68e29235c8 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_forest.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_forest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_hill.json b/src/main/generated/data/c/tags/worldgen/biome/is_hill.json new file mode 100644 index 0000000000..b788d9c569 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_hill.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_hill" + ] +} \ 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 new file mode 100644 index 0000000000..6ec024d660 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_hot.json @@ -0,0 +1,14 @@ +{ + "values": [ + "#c:is_hot/overworld", + "#c:is_hot/nether", + { + "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/forge/tags/worldgen/biome/is_dry/nether.json b/src/main/generated/data/c/tags/worldgen/biome/is_hot/nether.json similarity index 59% rename from src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json rename to src/main/generated/data/c/tags/worldgen/biome/is_hot/nether.json index 340c9d161b..48cf5e7bec 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_dry/nether.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_hot/nether.json @@ -1,9 +1,13 @@ { "values": [ "minecraft:nether_wastes", - "minecraft:soul_sand_valley", "minecraft:crimson_forest", "minecraft:warped_forest", - "minecraft:basalt_deltas" + "minecraft:soul_sand_valley", + "minecraft:basalt_deltas", + { + "id": "#forge:is_hot/nether", + "required": false + } ] } \ 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/c/tags/worldgen/biome/is_hot/overworld.json similarity index 62% rename from src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json rename to src/main/generated/data/c/tags/worldgen/biome/is_hot/overworld.json index f283627eb9..58a85ef951 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_hot/overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_hot/overworld.json @@ -1,15 +1,22 @@ { "values": [ - "minecraft:desert", + "minecraft:swamp", + "minecraft:mangrove_swamp", "minecraft:jungle", + "minecraft:bamboo_jungle", "minecraft:sparse_jungle", + "minecraft:desert", + "minecraft:badlands", + "minecraft:wooded_badlands", + "minecraft:eroded_badlands", "minecraft:savanna", "minecraft:savanna_plateau", + "minecraft:windswept_savanna", "minecraft:stony_peaks", "minecraft:warm_ocean", - "minecraft:windswept_savanna", - "minecraft:eroded_badlands", - "minecraft:bamboo_jungle", - "minecraft:mangrove_swamp" + { + "id": "#forge:is_hot/overworld", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_icy.json b/src/main/generated/data/c/tags/worldgen/biome/is_icy.json new file mode 100644 index 0000000000..46ba2aa139 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_icy.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:ice_spikes", + "minecraft:frozen_peaks" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_jungle.json b/src/main/generated/data/c/tags/worldgen/biome/is_jungle.json new file mode 100644 index 0000000000..c1d3c371fe --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_jungle.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_jungle" + ] +} \ 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 new file mode 100644 index 0000000000..0ad5197c18 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mountain.json @@ -0,0 +1,11 @@ +{ + "values": [ + "#minecraft:is_mountain", + "#c:is_mountain/peak", + "#c:is_mountain/slope", + { + "id": "#forge:is_mountain", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_mountain/peak.json b/src/main/generated/data/c/tags/worldgen/biome/is_mountain/peak.json new file mode 100644 index 0000000000..60454a4666 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mountain/peak.json @@ -0,0 +1,11 @@ +{ + "values": [ + "minecraft:jagged_peaks", + "minecraft:frozen_peaks", + "minecraft:stony_peaks", + { + "id": "#forge:is_peak", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..b534783957 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mountain/slope.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:snowy_slopes", + "minecraft:meadow", + "minecraft:grove", + "minecraft:cherry_grove", + { + "id": "#forge:is_slope", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..e83f4e0c45 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_mushroom.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:mushroom_fields", + { + "id": "#forge:is_mushroom", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..8775f39f6f --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_nether.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#minecraft:is_nether", + { + "id": "#forge:is_nether", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_nether_forest.json b/src/main/generated/data/c/tags/worldgen/biome/is_nether_forest.json new file mode 100644 index 0000000000..d79f240db4 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_nether_forest.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:crimson_forest", + "minecraft:warped_forest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_ocean.json b/src/main/generated/data/c/tags/worldgen/biome/is_ocean.json new file mode 100644 index 0000000000..f608497e79 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_ocean.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#minecraft:is_ocean", + "#c:is_shallow_ocean", + "#c:is_deep_ocean" + ] +} \ 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/c/tags/worldgen/biome/is_old_growth.json similarity index 65% rename from src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json rename to src/main/generated/data/c/tags/worldgen/biome/is_old_growth.json index 9491a24bc8..412f42f3e5 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_dense/overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_old_growth.json @@ -1,8 +1,7 @@ { "values": [ - "minecraft:jungle", - "minecraft:dark_forest", "minecraft:old_growth_birch_forest", + "minecraft:old_growth_pine_taiga", "minecraft:old_growth_spruce_taiga" ] } \ 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/c/tags/worldgen/biome/is_outer_end_island.json similarity index 64% rename from src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json rename to src/main/generated/data/c/tags/worldgen/biome/is_outer_end_island.json index 73d3eff3b0..66a8dff71a 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_cold/end.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_outer_end_island.json @@ -1,9 +1,7 @@ { "values": [ - "minecraft:the_end", - "minecraft:small_end_islands", - "minecraft:end_midlands", "minecraft:end_highlands", + "minecraft:end_midlands", "minecraft:end_barrens" ] } \ 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 new file mode 100644 index 0000000000..e1bd80c754 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_overworld.json @@ -0,0 +1,9 @@ +{ + "values": [ + "#minecraft:is_overworld", + { + "id": "#forge:is_overworld", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..4e23e1e56f --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_plains.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:plains", + "minecraft:sunflower_plains", + { + "id": "#forge:is_plains", + "required": false + } + ] +} \ 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/c/tags/worldgen/biome/is_river.json similarity index 63% rename from src/main/generated/data/forge/tags/worldgen/biome/is_water.json rename to src/main/generated/data/c/tags/worldgen/biome/is_river.json index 800c17196b..c5435e253c 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_water.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_river.json @@ -1,6 +1,5 @@ { "values": [ - "#minecraft:is_ocean", "#minecraft:is_river" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_savanna.json b/src/main/generated/data/c/tags/worldgen/biome/is_savanna.json new file mode 100644 index 0000000000..966de075ce --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_savanna.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_savanna" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_shallow_ocean.json b/src/main/generated/data/c/tags/worldgen/biome/is_shallow_ocean.json new file mode 100644 index 0000000000..858efda8f1 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_shallow_ocean.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:ocean", + "minecraft:lukewarm_ocean", + "minecraft:warm_ocean", + "minecraft:cold_ocean", + "minecraft:frozen_ocean" + ] +} \ 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/c/tags/worldgen/biome/is_snowy.json similarity index 70% rename from src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json rename to src/main/generated/data/c/tags/worldgen/biome/is_snowy.json index e1310e08ee..8d5168ef6c 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_snowy.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_snowy.json @@ -1,14 +1,16 @@ { "values": [ - "minecraft:frozen_ocean", - "minecraft:frozen_river", - "minecraft:snowy_plains", "minecraft:snowy_beach", + "minecraft:snowy_plains", + "minecraft:ice_spikes", "minecraft:snowy_taiga", "minecraft:grove", "minecraft:snowy_slopes", "minecraft:jagged_peaks", "minecraft:frozen_peaks", - "minecraft:ice_spikes" + { + "id": "#forge:is_snowy", + "required": false + } ] } \ 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/c/tags/worldgen/biome/is_snowy_plains.json similarity index 100% rename from src/main/generated/data/forge/tags/worldgen/biome/is_wasteland.json rename to src/main/generated/data/c/tags/worldgen/biome/is_snowy_plains.json 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 new file mode 100644 index 0000000000..c8d60b7cbd --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation.json @@ -0,0 +1,21 @@ +{ + "values": [ + "#c:is_sparse_vegetation/overworld", + { + "id": "#forge:is_sparse/nether", + "required": false + }, + { + "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/forge/tags/worldgen/biome/is_sparse/overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json similarity index 57% rename from src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json rename to src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json index e9652824e6..905b2bfe66 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_sparse_vegetation/overworld.json @@ -1,15 +1,23 @@ { "values": [ - "minecraft:windswept_forest", + "minecraft:wooded_badlands", "minecraft:savanna", "minecraft:savanna_plateau", - "minecraft:wooded_badlands", + "minecraft:sparse_jungle", + "minecraft:windswept_savanna", + "minecraft:windswept_forest", + "minecraft:windswept_hills", + "minecraft:windswept_gravelly_hills", "minecraft:snowy_slopes", "minecraft:jagged_peaks", "minecraft:frozen_peaks", - "minecraft:windswept_gravelly_hills", - "minecraft:windswept_savanna", - "minecraft:eroded_badlands", - "minecraft:dripstone_caves" + { + "id": "#forge:is_sparse_vegetation/overworld", + "required": false + }, + { + "id": "#forge:is_sparse/overworld", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_stony_shores.json b/src/main/generated/data/c/tags/worldgen/biome/is_stony_shores.json new file mode 100644 index 0000000000..a6db46faf4 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_stony_shores.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:stony_shore" + ] +} \ 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 new file mode 100644 index 0000000000..7f7d1c742b --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_swamp.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:swamp", + "minecraft:mangrove_swamp", + { + "id": "#forge:is_swamp", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_taiga.json b/src/main/generated/data/c/tags/worldgen/biome/is_taiga.json new file mode 100644 index 0000000000..1c6ed95718 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_taiga.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:is_taiga" + ] +} \ 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 new file mode 100644 index 0000000000..62d147cff9 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_tree/coniferous.json @@ -0,0 +1,10 @@ +{ + "values": [ + "#c:is_taiga", + "minecraft:grove", + { + "id": "#forge:is_tree/coniferous", + "required": false + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_tree/deciduous.json b/src/main/generated/data/c/tags/worldgen/biome/is_tree/deciduous.json new file mode 100644 index 0000000000..0db7a3e9b6 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_tree/deciduous.json @@ -0,0 +1,10 @@ +{ + "values": [ + "minecraft:forest", + "minecraft:flower_forest", + "minecraft:birch_forest", + "minecraft:dark_forest", + "minecraft:old_growth_birch_forest", + "minecraft:windswept_forest" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/tools/bows.json b/src/main/generated/data/c/tags/worldgen/biome/is_tree/jungle.json similarity index 51% rename from src/main/generated/data/forge/tags/item/tools/bows.json rename to src/main/generated/data/c/tags/worldgen/biome/is_tree/jungle.json index a1c8a443dc..e9d457c5e7 100644 --- a/src/main/generated/data/forge/tags/item/tools/bows.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_tree/jungle.json @@ -1,5 +1,5 @@ { "values": [ - "minecraft:bow" + "#c:is_jungle" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_tree/savanna.json b/src/main/generated/data/c/tags/worldgen/biome/is_tree/savanna.json new file mode 100644 index 0000000000..3338b8b1dd --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_tree/savanna.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#c:is_savanna" + ] +} \ 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/c/tags/worldgen/biome/is_underground.json similarity index 50% rename from src/main/generated/data/forge/tags/worldgen/biome/is_underground.json rename to src/main/generated/data/c/tags/worldgen/biome/is_underground.json index c55f2d526e..4d7c1ff442 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_underground.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_underground.json @@ -1,5 +1,5 @@ { "values": [ - "#forge:is_cave" + "#c:is_cave" ] } \ No newline at end of file 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 new file mode 100644 index 0000000000..f6048857ff --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_void.json @@ -0,0 +1,9 @@ +{ + "values": [ + "minecraft:the_void", + { + "id": "#forge:is_void", + "required": false + } + ] +} \ 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 new file mode 100644 index 0000000000..6d11db61bc --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_wasteland.json @@ -0,0 +1,8 @@ +{ + "values": [ + { + "id": "#forge:is_wasteland", + "required": false + } + ] +} \ 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/c/tags/worldgen/biome/is_wet.json similarity index 63% rename from src/main/generated/data/forge/tags/worldgen/biome/is_wet.json rename to src/main/generated/data/c/tags/worldgen/biome/is_wet.json index b355261275..24379033c4 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_wet.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_wet.json @@ -1,6 +1,6 @@ { "values": [ - "#forge:is_wet/overworld", + "#c:is_wet/overworld", { "id": "#forge:is_wet/nether", "required": false @@ -8,6 +8,10 @@ { "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/worldgen/biome/is_wet/overworld.json b/src/main/generated/data/c/tags/worldgen/biome/is_wet/overworld.json similarity index 56% rename from src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json rename to src/main/generated/data/c/tags/worldgen/biome/is_wet/overworld.json index e5e5a885c5..6bb610406d 100644 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_wet/overworld.json +++ b/src/main/generated/data/c/tags/worldgen/biome/is_wet/overworld.json @@ -1,11 +1,16 @@ { "values": [ "minecraft:swamp", + "minecraft:mangrove_swamp", "minecraft:jungle", + "minecraft:bamboo_jungle", "minecraft:sparse_jungle", "minecraft:beach", - "minecraft:bamboo_jungle", "minecraft:lush_caves", - "minecraft:mangrove_swamp" + "minecraft:dripstone_caves", + { + "id": "#forge:is_wet/overworld", + "required": false + } ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/is_windswept.json b/src/main/generated/data/c/tags/worldgen/biome/is_windswept.json new file mode 100644 index 0000000000..8ee28b8409 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/is_windswept.json @@ -0,0 +1,8 @@ +{ + "values": [ + "minecraft:windswept_hills", + "minecraft:windswept_gravelly_hills", + "minecraft:windswept_forest", + "minecraft:windswept_savanna" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/biome/no_default_monsters.json b/src/main/generated/data/c/tags/worldgen/biome/no_default_monsters.json new file mode 100644 index 0000000000..2496ccf1e9 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/biome/no_default_monsters.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:mushroom_fields", + "minecraft:deep_dark" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/structure/hidden_from_displayers.json b/src/main/generated/data/c/tags/worldgen/structure/hidden_from_displayers.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/structure/hidden_from_displayers.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/worldgen/structure/hidden_from_locator_selection.json b/src/main/generated/data/c/tags/worldgen/structure/hidden_from_locator_selection.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/c/tags/worldgen/structure/hidden_from_locator_selection.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 deleted file mode 100644 index 1cfb5782c5..0000000000 --- a/src/main/generated/data/forge/tags/block/barrels.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b07daae1c0..0000000000 --- a/src/main/generated/data/forge/tags/block/barrels/wooden.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index c09b2185bd..0000000000 --- a/src/main/generated/data/forge/tags/block/bookshelves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9afff2b15a..0000000000 --- a/src/main/generated/data/forge/tags/block/chests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 86533f935b..0000000000 --- a/src/main/generated/data/forge/tags/block/chests/wooden.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:chest", - "minecraft:trapped_chest" - ] -} \ 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 deleted file mode 100644 index fec31169ee..0000000000 --- a/src/main/generated/data/forge/tags/block/glass.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 9965b5e8b4..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/black.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f59e58c6bf..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 490015cbb5..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/brown.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index ac8b5e5086..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/colorless.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 24d84747fa..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 2f309170ca..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index d7946c1aca..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/green.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index dc8e6b7148..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/light_blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f165a46c90..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/light_gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b6bb1d9415..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index aa6a4825e8..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/magenta.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9322f51fe4..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/orange.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 58b65891fc..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/pink.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index d75a9e7308..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/purple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 72af78c029..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/red.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:red_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 deleted file mode 100644 index 4075a1556b..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/tinted.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index fb180e703e..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/white.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 0831bea4cc..0000000000 --- a/src/main/generated/data/forge/tags/block/glass/yellow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 4b95330d4f..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ebda555dcd..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/black.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 2762890aa9..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 0b5b727491..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/brown.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index eb5756f964..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/colorless.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9913e90a96..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9fe30b26a8..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index ab91321028..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/green.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index cd6d399022..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/light_blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 7be6a4ce81..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/light_gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 46dec64b22..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 7504bc3fa3..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/magenta.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 1c47e34616..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/orange.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 28e36b973f..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/pink.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index a3cff33a14..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/purple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 5edd855d71..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/red.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b514a2839f..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/white.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index a293eb9dc8..0000000000 --- a/src/main/generated/data/forge/tags/block/glass_panes/yellow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:yellow_stained_glass_pane" - ] -} \ 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 deleted file mode 100644 index 910d1fb8e6..0000000000 --- a/src/main/generated/data/forge/tags/block/ores/netherite_scrap.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f0bc7a4657..0000000000 --- a/src/main/generated/data/forge/tags/block/ores/quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:nether_quartz_ore" - ] -} \ 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 deleted file mode 100644 index 2db7aef9df..0000000000 --- a/src/main/generated/data/forge/tags/block/stained_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/stone.json b/src/main/generated/data/forge/tags/block/stone.json deleted file mode 100644 index 958f6e25c7..0000000000 --- a/src/main/generated/data/forge/tags/block/stone.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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 deleted file mode 100644 index 5f2a7d417e..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index 7f66725ab4..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/amethyst.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 4b7921705b..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/coal.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 015bec70c3..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index acd7f52de5..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/diamond.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 152063ec6c..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/emerald.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 546dde03c9..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 01fb2965f2..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f4ca82bbd4..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/lapis.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 83433d44eb..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/netherite.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9d2533c64a..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 1a21e230ef..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/raw_copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 80781ce667..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/raw_gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 13ed9fc651..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/raw_iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f5fd89c541..0000000000 --- a/src/main/generated/data/forge/tags/block/storage_blocks/redstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 4be4cce831..0000000000 --- a/src/main/generated/data/forge/tags/entity_type/bosses.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:ender_dragon", - "minecraft:wither" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/beetroot_soup.json b/src/main/generated/data/forge/tags/fluid/beetroot_soup.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/beetroot_soup.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/gaseous.json b/src/main/generated/data/forge/tags/fluid/gaseous.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/gaseous.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/mushroom_stew.json b/src/main/generated/data/forge/tags/fluid/mushroom_stew.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/mushroom_stew.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/potion.json b/src/main/generated/data/forge/tags/fluid/potion.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/potion.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/rabbit_stew.json b/src/main/generated/data/forge/tags/fluid/rabbit_stew.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/rabbit_stew.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/fluid/suspicious_stew.json b/src/main/generated/data/forge/tags/fluid/suspicious_stew.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/fluid/suspicious_stew.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 deleted file mode 100644 index 1f895dcedf..0000000000 --- a/src/main/generated/data/forge/tags/item/armors.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 deleted file mode 100644 index b68cf3908d..0000000000 --- a/src/main/generated/data/forge/tags/item/armors/boots.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 3f17463c56..0000000000 --- a/src/main/generated/data/forge/tags/item/armors/chestplates.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 9c9b657c45..0000000000 --- a/src/main/generated/data/forge/tags/item/armors/helmets.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "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 deleted file mode 100644 index 8969323c7c..0000000000 --- a/src/main/generated/data/forge/tags/item/armors/leggings.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 1cfb5782c5..0000000000 --- a/src/main/generated/data/forge/tags/item/barrels.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b07daae1c0..0000000000 --- a/src/main/generated/data/forge/tags/item/barrels/wooden.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:barrel" - ] -} \ 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 deleted file mode 100644 index c09b2185bd..0000000000 --- a/src/main/generated/data/forge/tags/item/bookshelves.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9afff2b15a..0000000000 --- a/src/main/generated/data/forge/tags/item/chests.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 86533f935b..0000000000 --- a/src/main/generated/data/forge/tags/item/chests/wooden.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:chest", - "minecraft:trapped_chest" - ] -} \ 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 deleted file mode 100644 index ae5f647fbe..0000000000 --- a/src/main/generated/data/forge/tags/item/crops.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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 deleted file mode 100644 index b28b723c4b..0000000000 --- a/src/main/generated/data/forge/tags/item/crops/beetroot.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f9630d1347..0000000000 --- a/src/main/generated/data/forge/tags/item/crops/carrot.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 5960d80cb9..0000000000 --- a/src/main/generated/data/forge/tags/item/crops/nether_wart.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 47fc151cd1..0000000000 --- a/src/main/generated/data/forge/tags/item/crops/potato.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 498cb445f6..0000000000 --- a/src/main/generated/data/forge/tags/item/crops/wheat.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 87f0fee447..0000000000 --- a/src/main/generated/data/forge/tags/item/dusts.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 668258c523..0000000000 --- a/src/main/generated/data/forge/tags/item/dusts/glowstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 3773c1f116..0000000000 --- a/src/main/generated/data/forge/tags/item/dusts/prismarine.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index a096239ec1..0000000000 --- a/src/main/generated/data/forge/tags/item/dusts/redstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index c8f72c5b6f..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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 deleted file mode 100644 index a2ecf55c46..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/black.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index e7b78e12a3..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 8c7249234e..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/brown.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f0c5a44002..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 6cdbb27a49..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 89fe8ccaf3..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/green.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 76f1a7786c..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/light_blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 596b2efb37..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/light_gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b0ac91f97e..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f6898d4c9b..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/magenta.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index df54849c59..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/orange.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index d9f2898629..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/pink.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b3ebfe3c26..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/purple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9c6fe34671..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/red.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 3a30d72b10..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/white.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 4349959836..0000000000 --- a/src/main/generated/data/forge/tags/item/dyes/yellow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:yellow_dye" - ] -} \ 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 deleted file mode 100644 index 135cd1d776..0000000000 --- a/src/main/generated/data/forge/tags/item/ender_pearls.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:ender_pearl" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/item/foods/pie.json b/src/main/generated/data/forge/tags/item/foods/pie.json new file mode 100644 index 0000000000..7589c5f241 --- /dev/null +++ b/src/main/generated/data/forge/tags/item/foods/pie.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pumpkin_pie" + ] +} \ 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 deleted file mode 100644 index 60af4bab68..0000000000 --- a/src/main/generated/data/forge/tags/item/gems.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 742ef896d5..0000000000 --- a/src/main/generated/data/forge/tags/item/gems/amethyst.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f44f30dd55..0000000000 --- a/src/main/generated/data/forge/tags/item/gems/diamond.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 07a0982118..0000000000 --- a/src/main/generated/data/forge/tags/item/gems/emerald.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 614441df46..0000000000 --- a/src/main/generated/data/forge/tags/item/gems/lapis.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 150e7ff711..0000000000 --- a/src/main/generated/data/forge/tags/item/gems/prismarine.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index aad2eef95b..0000000000 --- a/src/main/generated/data/forge/tags/item/gems/quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index fec31169ee..0000000000 --- a/src/main/generated/data/forge/tags/item/glass.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 9965b5e8b4..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/black.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f59e58c6bf..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 490015cbb5..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/brown.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index ac8b5e5086..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/colorless.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 24d84747fa..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 2f309170ca..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index d7946c1aca..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/green.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index dc8e6b7148..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/light_blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f165a46c90..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/light_gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b6bb1d9415..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index aa6a4825e8..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/magenta.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9322f51fe4..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/orange.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 58b65891fc..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/pink.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index d75a9e7308..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/purple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 72af78c029..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/red.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:red_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 deleted file mode 100644 index 4075a1556b..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/tinted.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index fb180e703e..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/white.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 0831bea4cc..0000000000 --- a/src/main/generated/data/forge/tags/item/glass/yellow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 4b95330d4f..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index ebda555dcd..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/black.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 2762890aa9..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 0b5b727491..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/brown.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index eb5756f964..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/colorless.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9913e90a96..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/cyan.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9fe30b26a8..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index ab91321028..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/green.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index cd6d399022..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/light_blue.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 7be6a4ce81..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/light_gray.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 46dec64b22..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/lime.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 7504bc3fa3..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/magenta.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 1c47e34616..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/orange.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 28e36b973f..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/pink.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index a3cff33a14..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/purple.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 5edd855d71..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/red.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index b514a2839f..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/white.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index a293eb9dc8..0000000000 --- a/src/main/generated/data/forge/tags/item/glass_panes/yellow.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:yellow_stained_glass_pane" - ] -} \ 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 deleted file mode 100644 index 430af37ee5..0000000000 --- a/src/main/generated/data/forge/tags/item/heads.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index e9756bb39c..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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 deleted file mode 100644 index 8f632e499a..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots/brick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 1cc1f065c5..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots/copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 07e9f66a30..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots/gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index c656021bdb..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index ec7ed3ee9a..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots/nether_brick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index bd6929df75..0000000000 --- a/src/main/generated/data/forge/tags/item/ingots/netherite.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 71b797d35b..0000000000 --- a/src/main/generated/data/forge/tags/item/leather.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:leather" - ] -} \ 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 deleted file mode 100644 index fb0dc26ecd..0000000000 --- a/src/main/generated/data/forge/tags/item/nuggets.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 4d94345957..0000000000 --- a/src/main/generated/data/forge/tags/item/nuggets/gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index cbd20ac6e4..0000000000 --- a/src/main/generated/data/forge/tags/item/nuggets/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:iron_nugget" - ] -} \ 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 deleted file mode 100644 index 910d1fb8e6..0000000000 --- a/src/main/generated/data/forge/tags/item/ores/netherite_scrap.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f0bc7a4657..0000000000 --- a/src/main/generated/data/forge/tags/item/ores/quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 35208231e0..0000000000 --- a/src/main/generated/data/forge/tags/item/raw_materials.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 3e03ab9ca8..0000000000 --- a/src/main/generated/data/forge/tags/item/raw_materials/copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 3d1252e5f9..0000000000 --- a/src/main/generated/data/forge/tags/item/raw_materials/gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 8f9af48d8e..0000000000 --- a/src/main/generated/data/forge/tags/item/raw_materials/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 11b8cb3844..0000000000 --- a/src/main/generated/data/forge/tags/item/rods.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 5d2eff8311..0000000000 --- a/src/main/generated/data/forge/tags/item/rods/blaze.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 019b63dd31..0000000000 --- a/src/main/generated/data/forge/tags/item/rods/wooden.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:stick" - ] -} \ 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 deleted file mode 100644 index 2400078166..0000000000 --- a/src/main/generated/data/forge/tags/item/shears.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 533c25d916..0000000000 --- a/src/main/generated/data/forge/tags/item/slimeballs.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 2db7aef9df..0000000000 --- a/src/main/generated/data/forge/tags/item/stained_glass.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "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/stone.json b/src/main/generated/data/forge/tags/item/stone.json deleted file mode 100644 index 958f6e25c7..0000000000 --- a/src/main/generated/data/forge/tags/item/stone.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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 deleted file mode 100644 index 5f2a7d417e..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "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 deleted file mode 100644 index 7f66725ab4..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/amethyst.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 4b7921705b..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/coal.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 015bec70c3..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index acd7f52de5..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/diamond.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 152063ec6c..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/emerald.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 546dde03c9..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 01fb2965f2..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f4ca82bbd4..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/lapis.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 83433d44eb..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/netherite.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 9d2533c64a..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/quartz.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 1a21e230ef..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/raw_copper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 80781ce667..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/raw_gold.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 13ed9fc651..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/raw_iron.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index f5fd89c541..0000000000 --- a/src/main/generated/data/forge/tags/item/storage_blocks/redstone.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index d018256cf8..0000000000 --- a/src/main/generated/data/forge/tags/item/string.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index acbfe2ae9d..0000000000 --- a/src/main/generated/data/forge/tags/item/tools.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "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/crossbows.json b/src/main/generated/data/forge/tags/item/tools/crossbows.json deleted file mode 100644 index 848f97bc22..0000000000 --- a/src/main/generated/data/forge/tags/item/tools/crossbows.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index e97941e9dc..0000000000 --- a/src/main/generated/data/forge/tags/item/tools/fishing_rods.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 0f2454ce04..0000000000 --- a/src/main/generated/data/forge/tags/item/tools/shields.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 7a2c450bc7..0000000000 --- a/src/main/generated/data/forge/tags/item/tools/tridents.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 21a70cfeec..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_cave.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 75f9c80b3d..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_cold.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_cold/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 deleted file mode 100644 index 6c114dbc65..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_coniferous.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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_dense/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/end.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/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_dense/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 deleted file mode 100644 index f1a8ccb642..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_desert.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index 28d35de201..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_dry.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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/overworld.json b/src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json deleted file mode 100644 index 5f0fa0bfee..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_dry/overworld.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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 deleted file mode 100644 index 6559f017e6..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_hot.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "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/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_hot/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_magical.json b/src/main/generated/data/forge/tags/worldgen/biome/is_magical.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_magical.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_modified.json b/src/main/generated/data/forge/tags/worldgen/biome/is_modified.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_modified.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ 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 deleted file mode 100644 index 859b350079..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_mountain.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 05d85d951d..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_mushroom.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "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 deleted file mode 100644 index c9597b86d0..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_peak.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "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 deleted file mode 100644 index 9028b691af..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_plains.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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_slope.json b/src/main/generated/data/forge/tags/worldgen/biome/is_slope.json deleted file mode 100644 index 453f828613..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_slope.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "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_sparse.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json deleted file mode 100644 index 7680132431..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_sparse.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_sparse/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file 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 deleted file mode 100644 index 0f5eb22e0c..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_swamp.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:swamp", - "minecraft:mangrove_swamp" - ] -} \ 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 deleted file mode 100644 index f55aea6671..0000000000 --- a/src/main/generated/data/forge/tags/worldgen/biome/is_void.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "minecraft:the_void" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_wet/end.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/end.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/end.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/data/forge/tags/worldgen/biome/is_wet/nether.json b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/nether.json new file mode 100644 index 0000000000..f72d209df7 --- /dev/null +++ b/src/main/generated/data/forge/tags/worldgen/biome/is_wet/nether.json @@ -0,0 +1,3 @@ +{ + "values": [] +} \ No newline at end of file diff --git a/src/main/generated/pack.mcmeta b/src/main/generated/pack.mcmeta index c6656d82e3..afba6dd03c 100644 --- a/src/main/generated/pack.mcmeta +++ b/src/main/generated/pack.mcmeta @@ -3,6 +3,6 @@ "description": { "translate": "pack.forge.description" }, - "pack_format": 34 + "pack_format": 48 } } \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/ForgeConfig.java b/src/main/java/net/minecraftforge/common/ForgeConfig.java index 11bece2132..cdd13b60f1 100644 --- a/src/main/java/net/minecraftforge/common/ForgeConfig.java +++ b/src/main/java/net/minecraftforge/common/ForgeConfig.java @@ -13,8 +13,11 @@ import org.apache.logging.log4j.LogManager; import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; +import org.apache.logging.log4j.Logger; public class ForgeConfig { + private static final Logger LOGGER = LogManager.getLogger(); + public static class Server { public final BooleanValue removeErroringBlockEntities; @@ -66,11 +69,23 @@ public class ForgeConfig { * General configuration that doesn't need to be synchronized but needs to be available before server startup */ public static class Common { + public enum MigrationHelperMode { + OFF, + ONLY_IN_DEV_ENV, + ALWAYS + } + + public final ForgeConfigSpec.EnumValue migrationHelperMode; Common(ForgeConfigSpec.Builder builder) { - builder.comment("[DEPRECATED / NO EFFECT]: General configuration settings") + builder.comment("General configuration settings") .push("general"); + migrationHelperMode = builder + .comment("A config option to help developers find known legacy modded tags that have common convention equivalents when running on integrated server. Defaults to OFF.") + .translation("forge.configgui.migrationHelperMode") + .defineEnum("logLegacyTagWarnings", MigrationHelperMode.OFF); + builder.pop(); } } @@ -174,12 +189,12 @@ public class ForgeConfig { @SubscribeEvent public static void onLoad(final ModConfigEvent.Loading configEvent) { - LogManager.getLogger().debug(Logging.FORGEMOD, "Loaded forge config file {}", configEvent.getConfig().getFileName()); + LOGGER.debug(Logging.FORGEMOD, "Loaded forge config file {}", configEvent.getConfig().getFileName()); } @SubscribeEvent public static void onFileChange(final ModConfigEvent.Reloading configEvent) { - LogManager.getLogger().debug(Logging.FORGEMOD, "Forge config just got changed on the file system!"); + LOGGER.debug(Logging.FORGEMOD, "Forge config just got changed on the file system!"); } //General diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java index 8ff119de52..8ba917d5fb 100644 --- a/src/main/java/net/minecraftforge/common/ForgeMod.java +++ b/src/main/java/net/minecraftforge/common/ForgeMod.java @@ -42,9 +42,15 @@ import net.minecraft.world.phys.Vec3; import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.ForgeBiomeTagsProvider; +import net.minecraftforge.common.data.ForgeBlockTagsProvider; +import net.minecraftforge.common.data.ForgeEnchantmentTagsProvider; +import net.minecraftforge.common.data.ForgeEntityTypeTagsProvider; import net.minecraftforge.common.data.ForgeFluidTagsProvider; +import net.minecraftforge.common.data.ForgeItemTagsProvider; import net.minecraftforge.common.data.ForgeLootTableProvider; +import net.minecraftforge.common.data.ForgeRecipeProvider; import net.minecraftforge.common.data.ForgeSpriteSourceProvider; +import net.minecraftforge.common.data.ForgeStructureTagsProvider; import net.minecraftforge.common.data.VanillaSoundDefinitionsProvider; import net.minecraftforge.common.loot.CanToolPerformAction; import net.minecraftforge.common.loot.LootTableIdCondition; @@ -105,10 +111,6 @@ import net.minecraftforge.common.crafting.ingredients.IIngredientSerializer; import net.minecraftforge.common.crafting.ingredients.IntersectionIngredient; import net.minecraftforge.common.crafting.ingredients.PartialNBTIngredient; import net.minecraftforge.common.crafting.ingredients.StrictNBTIngredient; -import net.minecraftforge.common.data.ForgeBlockTagsProvider; -import net.minecraftforge.common.data.ForgeEntityTypeTagsProvider; -import net.minecraftforge.common.data.ForgeItemTagsProvider; -import net.minecraftforge.common.data.ForgeRecipeProvider; import net.minecraftforge.fml.common.Mod; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; @@ -389,10 +391,8 @@ public class ForgeMod { }); modEventBus.addListener(this::preInit); modEventBus.addListener(this::gatherData); - modEventBus.addListener(this::loadComplete); modEventBus.addListener(this::registerFluids); modEventBus.addListener(this::registerVanillaDisplayContexts); - modEventBus.register(this); for (DeferredRegister r : registries) { r.register(modEventBus); } @@ -426,9 +426,6 @@ public class ForgeMod { //VanillaPacketSplitter.register(); } - public void loadComplete(FMLLoadCompleteEvent event) { - } - public void serverStopping(ServerStoppingEvent evt) { WorldWorkerManager.clear(); } @@ -450,7 +447,7 @@ public class ForgeMod { gen.addProvider(true, new PackMetadataGenerator(packOutput) .add(PackMetadataSection.TYPE, new PackMetadataSection( Component.translatable("pack.forge.description"), - DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES), + DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA), Optional.empty() //Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion)) )) ); @@ -459,9 +456,11 @@ public class ForgeMod { gen.addProvider(event.includeServer(), new ForgeItemTagsProvider(packOutput, lookupProvider, blockTags.contentsGetter(), existingFileHelper)); gen.addProvider(event.includeServer(), new ForgeEntityTypeTagsProvider(packOutput, lookupProvider, existingFileHelper)); gen.addProvider(event.includeServer(), new ForgeFluidTagsProvider(packOutput, lookupProvider, existingFileHelper)); + gen.addProvider(event.includeServer(), new ForgeEnchantmentTagsProvider(packOutput, lookupProvider, existingFileHelper)); gen.addProvider(event.includeServer(), new ForgeRecipeProvider(packOutput, lookupProvider)); gen.addProvider(event.includeServer(), new ForgeLootTableProvider(packOutput, lookupProvider)); gen.addProvider(event.includeServer(), new ForgeBiomeTagsProvider(packOutput, lookupProvider, existingFileHelper)); + gen.addProvider(event.includeServer(), new ForgeStructureTagsProvider(packOutput, lookupProvider, existingFileHelper)); gen.addProvider(event.includeClient(), new ForgeSpriteSourceProvider(packOutput, existingFileHelper)); gen.addProvider(event.includeClient(), new VanillaSoundDefinitionsProvider(packOutput, existingFileHelper)); @@ -543,7 +542,7 @@ public class ForgeMod { // net.minecraft.client.multiplayer.resolver.ServerRedirectHandler.createDnsSrvRedirectHandler uses DNSContextFactory // to resolve DNS records, and that is initialized reflectively by NamingManager. Which in module land isn't allowed. // So hack it so it is. this is equivalent to doing --add-exports jdk.naming.dns/com.sun.jndi.dns=java.naming - private void hackDNSResolver() { + private static void hackDNSResolver() { try { var target = Class.forName("com.sun.jndi.dns.DnsContextFactory"); var reader = Class.forName("javax.naming.spi.NamingManager"); diff --git a/src/main/java/net/minecraftforge/common/MinecraftForge.java b/src/main/java/net/minecraftforge/common/MinecraftForge.java index 6b866ac32d..7b3a4cf155 100644 --- a/src/main/java/net/minecraftforge/common/MinecraftForge.java +++ b/src/main/java/net/minecraftforge/common/MinecraftForge.java @@ -53,6 +53,7 @@ public class MinecraftForge UsernameCache.load(); if (FMLEnvironment.dist == Dist.CLIENT) ClientCommandHandler.init(); DualStackUtils.initialise(); + TagConventionMigrationHelper.init(); } /** diff --git a/src/main/java/net/minecraftforge/common/TagConventionMappings.java b/src/main/java/net/minecraftforge/common/TagConventionMappings.java new file mode 100644 index 0000000000..58a942a784 --- /dev/null +++ b/src/main/java/net/minecraftforge/common/TagConventionMappings.java @@ -0,0 +1,392 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common; + +import net.minecraft.core.Registry; +import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public final class TagConventionMappings { + private TagConventionMappings() {} + + /** + * A map of known legacy tags to their common convention equivalents. + */ + public static final Map, String> MAPPINGS = Map., String>ofEntries( + //region Blocks + legacyToCommon(Registries.BLOCK, forgeRl("barrels"), Tags.Blocks.BARRELS), // forge:barrels -> c:barrels + legacyToCommon(Registries.BLOCK, forgeRl("barrels/wooden"), Tags.Blocks.BARRELS_WOODEN), + legacyToCommon(Registries.BLOCK, forgeRl("bookshelves"), Tags.Blocks.BOOKSHELVES), + + legacyToCommon(Registries.BLOCK, forgeRl("chests"), Tags.Blocks.CHESTS), + legacyToCommon(Registries.BLOCK, forgeRl("chests/wooden"), Tags.Blocks.CHESTS_WOODEN), + + legacyToCommon(Registries.BLOCK, forgeRl("cobblestone"), Tags.Blocks.COBBLESTONES), + + legacyToCommon(Registries.BLOCK, forgeRl("glass"), Tags.Blocks.GLASS_BLOCKS), + legacyToCommon(Registries.BLOCK, forgeRl("glass/black"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_BLACK)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/blue"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_BLUE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/brown"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_BROWN)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/colorless"), Tags.Blocks.GLASS_BLOCKS_COLORLESS), + legacyToCommon(Registries.BLOCK, forgeRl("glass/cyan"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_CYAN)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/gray"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_GRAY)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/green"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_GREEN)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/light_blue"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_BLUE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/light_gray"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_GRAY)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/lime"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_LIME)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/magenta"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_MAGENTA)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/orange"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_ORANGE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/pink"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_PINK)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/purple"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_PURPLE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/red"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_RED)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/silica"), Tags.Blocks.GLASS_BLOCKS_CHEAP), + legacyToCommon(Registries.BLOCK, forgeRl("glass/tinted"), Tags.Blocks.GLASS_BLOCKS_TINTED), + legacyToCommon(Registries.BLOCK, forgeRl("glass/white"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_WHITE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass/yellow"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Items.DYED_YELLOW)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes"), Tags.Blocks.GLASS_PANES), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/colorless"), Tags.Blocks.GLASS_PANES_COLORLESS), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/black"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_BLACK)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/blue"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_BLUE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/brown"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_BROWN)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/cyan"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_CYAN)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/gray"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_GRAY)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/green"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_GREEN)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/light_blue"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_LIGHT_BLUE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/light_gray"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_LIGHT_GRAY)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/lime"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_LIME)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/magenta"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_MAGENTA)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/orange"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_ORANGE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/pink"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_PINK)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/purple"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_PURPLE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/red"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_RED)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/white"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_WHITE)), + legacyToCommon(Registries.BLOCK, forgeRl("glass_panes/yellow"), List.of(Tags.Blocks.GLASS_PANES, Tags.Items.DYED_YELLOW)), + + legacyToCommon(Registries.BLOCK, forgeRl("obsidian"), Tags.Blocks.OBSIDIANS), + legacyToCommon(Registries.BLOCK, forgeRl("ores"), Tags.Blocks.ORES), + legacyToCommon(Registries.BLOCK, forgeRl("ores/netherite_scrap"), Tags.Blocks.ORES_NETHERITE_SCRAP), + legacyToCommon(Registries.BLOCK, forgeRl("ores/quartz"), Tags.Blocks.ORES_QUARTZ), + + legacyToCommon(Registries.BLOCK, forgeRl("sandstone"), Tags.Blocks.SANDSTONE_BLOCKS), + legacyToCommon(Registries.BLOCK, forgeRl("stained_glass"), List.of(Tags.Blocks.GLASS_BLOCKS, Tags.Blocks.DYED)), + legacyToCommon(Registries.BLOCK, forgeRl("stained_glass_panes"), List.of(Tags.Blocks.GLASS_PANES, Tags.Blocks.DYED)), + legacyToCommon(Registries.BLOCK, forgeRl("stone"), Tags.Blocks.STONES), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks"), Tags.Blocks.STORAGE_BLOCKS), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/coal"), Tags.Blocks.STORAGE_BLOCKS_COAL), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/copper"), Tags.Blocks.STORAGE_BLOCKS_COPPER), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/diamond"), Tags.Blocks.STORAGE_BLOCKS_DIAMOND), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/emerald"), Tags.Blocks.STORAGE_BLOCKS_EMERALD), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/gold"), Tags.Blocks.STORAGE_BLOCKS_GOLD), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/iron"), Tags.Blocks.STORAGE_BLOCKS_IRON), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/lapis"), Tags.Blocks.STORAGE_BLOCKS_LAPIS), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/netherite"), Tags.Blocks.STORAGE_BLOCKS_NETHERITE), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/quartz"), Tags.Blocks.STORAGE_BLOCKS_QUARTZ), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/raw_copper"), Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/raw_gold"), Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/raw_iron"), Tags.Blocks.STORAGE_BLOCKS_RAW_IRON), + legacyToCommon(Registries.BLOCK, forgeRl("storage_blocks/redstone"), Tags.Blocks.STORAGE_BLOCKS_REDSTONE), + //endregion + + //region Entity Types + legacyToCommon(Registries.ENTITY_TYPE, forgeRl("bosses"), Tags.EntityTypes.BOSSES), + //endregion + + //region Items + legacyToCommon(Registries.ITEM, forgeRl("barrels"), Tags.Items.BARRELS), + legacyToCommon(Registries.ITEM, forgeRl("barrels/wooden"), Tags.Items.BARRELS_WOODEN), + legacyToCommon(Registries.ITEM, forgeRl("bookshelves"), Tags.Items.BOOKSHELVES), + + legacyToCommon(Registries.ITEM, forgeRl("chests"), Tags.Items.CHESTS), + legacyToCommon(Registries.ITEM, forgeRl("chests/wooden"), Tags.Items.CHESTS_WOODEN), + legacyToCommon(Registries.ITEM, forgeRl("cobblestone"), Tags.Items.COBBLESTONES), + legacyToCommon(Registries.ITEM, forgeRl("crops"), Tags.Items.CROPS), + legacyToCommon(Registries.ITEM, forgeRl("crops/beetroot"), Tags.Items.CROPS_BEETROOT), + legacyToCommon(Registries.ITEM, forgeRl("crops/carrot"), Tags.Items.CROPS_CARROT), + legacyToCommon(Registries.ITEM, forgeRl("crops/potato"), Tags.Items.CROPS_POTATO), + legacyToCommon(Registries.ITEM, forgeRl("crops/wheat"), Tags.Items.CROPS_WHEAT), + + legacyToCommon(Registries.ITEM, forgeRl("dusts"), Tags.Items.DUSTS), + legacyToCommon(Registries.ITEM, forgeRl("dusts/redstone"), Tags.Items.DUSTS_REDSTONE), + legacyToCommon(Registries.ITEM, forgeRl("dusts/glowstone"), Tags.Items.DUSTS_GLOWSTONE), + legacyToCommon(Registries.ITEM, forgeRl("dyes"), Tags.Items.DYES), + legacyToCommon(Registries.ITEM, forgeRl("dyes/black"), Tags.Items.DYES_BLACK), + legacyToCommon(Registries.ITEM, forgeRl("dyes/red"), Tags.Items.DYES_RED), + legacyToCommon(Registries.ITEM, forgeRl("dyes/green"), Tags.Items.DYES_GREEN), + legacyToCommon(Registries.ITEM, forgeRl("dyes/brown"), Tags.Items.DYES_BROWN), + legacyToCommon(Registries.ITEM, forgeRl("dyes/blue"), Tags.Items.DYES_BLUE), + legacyToCommon(Registries.ITEM, forgeRl("dyes/purple"), Tags.Items.DYES_PURPLE), + legacyToCommon(Registries.ITEM, forgeRl("dyes/cyan"), Tags.Items.DYES_CYAN), + legacyToCommon(Registries.ITEM, forgeRl("dyes/light_gray"), Tags.Items.DYES_LIGHT_GRAY), + legacyToCommon(Registries.ITEM, forgeRl("dyes/gray"), Tags.Items.DYES_GRAY), + legacyToCommon(Registries.ITEM, forgeRl("dyes/pink"), Tags.Items.DYES_PINK), + legacyToCommon(Registries.ITEM, forgeRl("dyes/lime"), Tags.Items.DYES_LIME), + legacyToCommon(Registries.ITEM, forgeRl("dyes/yellow"), Tags.Items.DYES_YELLOW), + legacyToCommon(Registries.ITEM, forgeRl("dyes/light_blue"), Tags.Items.DYES_LIGHT_BLUE), + legacyToCommon(Registries.ITEM, forgeRl("dyes/magenta"), Tags.Items.DYES_MAGENTA), + legacyToCommon(Registries.ITEM, forgeRl("dyes/orange"), Tags.Items.DYES_ORANGE), + legacyToCommon(Registries.ITEM, forgeRl("dyes/white"), Tags.Items.DYES_WHITE), + + legacyToCommon(Registries.ITEM, forgeRl("ender_pearls"), Tags.Items.ENDER_PEARLS), + + legacyToCommon(Registries.ITEM, forgeRl("gems"), Tags.Items.GEMS), + legacyToCommon(Registries.ITEM, forgeRl("gems/diamond"), Tags.Items.GEMS_DIAMOND), + legacyToCommon(Registries.ITEM, forgeRl("gems/emerald"), Tags.Items.GEMS_EMERALD), + legacyToCommon(Registries.ITEM, forgeRl("gems/amethyst"), Tags.Items.GEMS_AMETHYST), + legacyToCommon(Registries.ITEM, forgeRl("gems/lapis"), Tags.Items.GEMS_LAPIS), + legacyToCommon(Registries.ITEM, forgeRl("gems/quartz"), Tags.Items.GEMS_QUARTZ), + legacyToCommon(Registries.ITEM, forgeRl("glass"), Tags.Items.GLASS_BLOCKS), + legacyToCommon(Registries.ITEM, forgeRl("glass/black"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_BLACK)), + legacyToCommon(Registries.ITEM, forgeRl("glass/blue"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_BLUE)), + legacyToCommon(Registries.ITEM, forgeRl("glass/brown"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_BROWN)), + legacyToCommon(Registries.ITEM, forgeRl("glass/colorless"), Tags.Items.GLASS_BLOCKS_COLORLESS), + legacyToCommon(Registries.ITEM, forgeRl("glass/cyan"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_CYAN)), + legacyToCommon(Registries.ITEM, forgeRl("glass/gray"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_GRAY)), + legacyToCommon(Registries.ITEM, forgeRl("glass/green"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_GREEN)), + legacyToCommon(Registries.ITEM, forgeRl("glass/light_blue"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_BLUE)), + legacyToCommon(Registries.ITEM, forgeRl("glass/light_gray"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_LIGHT_GRAY)), + legacyToCommon(Registries.ITEM, forgeRl("glass/lime"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_LIME)), + legacyToCommon(Registries.ITEM, forgeRl("glass/magenta"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_MAGENTA)), + legacyToCommon(Registries.ITEM, forgeRl("glass/orange"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_ORANGE)), + legacyToCommon(Registries.ITEM, forgeRl("glass/pink"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_PINK)), + legacyToCommon(Registries.ITEM, forgeRl("glass/purple"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_PURPLE)), + legacyToCommon(Registries.ITEM, forgeRl("glass/red"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_RED)), + legacyToCommon(Registries.ITEM, forgeRl("glass/silica"), Tags.Items.GLASS_BLOCKS_CHEAP), + legacyToCommon(Registries.ITEM, forgeRl("glass/tinted"), Tags.Items.GLASS_BLOCKS_TINTED), + legacyToCommon(Registries.ITEM, forgeRl("glass/white"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_WHITE)), + legacyToCommon(Registries.ITEM, forgeRl("glass/yellow"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Items.DYED_YELLOW)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes"), Tags.Items.GLASS_PANES), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/black"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_BLACK)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/blue"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_BLUE)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/brown"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_BROWN)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/colorless"), Tags.Items.GLASS_PANES_COLORLESS), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/cyan"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_CYAN)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/gray"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_GRAY)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/green"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_GREEN)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/light_blue"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_LIGHT_BLUE)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/light_gray"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_LIGHT_GRAY)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/lime"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_LIME)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/magenta"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_MAGENTA)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/orange"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_ORANGE)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/pink"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_PINK)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/purple"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_PURPLE)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/red"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_RED)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/white"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_WHITE)), + legacyToCommon(Registries.ITEM, forgeRl("glass_panes/yellow"), List.of(Tags.Items.GLASS_PANES, Tags.Items.DYED_YELLOW)), + + legacyToCommon(Registries.ITEM, forgeRl("obsidian"), Tags.Items.OBSIDIANS), + legacyToCommon(Registries.ITEM, forgeRl("ingots"), Tags.Items.INGOTS), + legacyToCommon(Registries.ITEM, forgeRl("ingots/brick"), Tags.Items.BRICKS_NORMAL), + legacyToCommon(Registries.ITEM, forgeRl("ingots/copper"), Tags.Items.INGOTS_COPPER), + legacyToCommon(Registries.ITEM, forgeRl("ingots/gold"), Tags.Items.INGOTS_GOLD), + legacyToCommon(Registries.ITEM, forgeRl("ingots/iron"), Tags.Items.INGOTS_IRON), + legacyToCommon(Registries.ITEM, forgeRl("ingots/netherite"), Tags.Items.INGOTS_NETHERITE), + legacyToCommon(Registries.ITEM, forgeRl("ingots/nether_brick"), Tags.Items.BRICKS_NETHER), + + legacyToCommon(Registries.ITEM, forgeRl("leather"), Tags.Items.LEATHERS), + + legacyToCommon(Registries.ITEM, forgeRl("nuggets"), Tags.Items.NUGGETS), + legacyToCommon(Registries.ITEM, forgeRl("nuggets/gold"), Tags.Items.NUGGETS_GOLD), + legacyToCommon(Registries.ITEM, forgeRl("nuggets/iron"), Tags.Items.NUGGETS_IRON), + + legacyToCommon(Registries.ITEM, forgeRl("ores"), Tags.Items.ORES), + legacyToCommon(Registries.ITEM, forgeRl("ores/netherite_scrap"), Tags.Items.ORES_NETHERITE_SCRAP), + legacyToCommon(Registries.ITEM, forgeRl("ores/quartz"), Tags.Items.ORES_QUARTZ), + + legacyToCommon(Registries.ITEM, forgeRl("raw_materials"), Tags.Items.RAW_MATERIALS), + legacyToCommon(Registries.ITEM, forgeRl("raw_materials/copper"), Tags.Items.RAW_MATERIALS_COPPER), + legacyToCommon(Registries.ITEM, forgeRl("raw_materials/gold"), Tags.Items.RAW_MATERIALS_GOLD), + legacyToCommon(Registries.ITEM, forgeRl("raw_materials/iron"), Tags.Items.RAW_MATERIALS_IRON), + legacyToCommon(Registries.ITEM, forgeRl("rods"), Tags.Items.RODS), + legacyToCommon(Registries.ITEM, forgeRl("rods/blaze"), Tags.Items.RODS_BLAZE), + legacyToCommon(Registries.ITEM, forgeRl("rods/wooden"), Tags.Items.RODS_WOODEN), + + legacyToCommon(Registries.ITEM, forgeRl("sandstone"), Tags.Items.SANDSTONE_BLOCKS), + + legacyToCommon(Registries.ITEM, forgeRl("slimeballs"), Tags.Items.SLIME_BALLS), + legacyToCommon(Registries.ITEM, forgeRl("stained_glass"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Blocks.DYED)), + legacyToCommon(Registries.ITEM, forgeRl("stained_glass_panes"), List.of(Tags.Items.GLASS_BLOCKS, Tags.Blocks.DYED)), + legacyToCommon(Registries.ITEM, forgeRl("stone"), Tags.Items.STONES), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks"), Tags.Items.STORAGE_BLOCKS), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/coal"), Tags.Items.STORAGE_BLOCKS_COAL), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/copper"), Tags.Items.STORAGE_BLOCKS_COPPER), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/diamond"), Tags.Items.STORAGE_BLOCKS_DIAMOND), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/emerald"), Tags.Items.STORAGE_BLOCKS_EMERALD), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/gold"), Tags.Items.STORAGE_BLOCKS_GOLD), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/iron"), Tags.Items.STORAGE_BLOCKS_IRON), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/lapis"), Tags.Items.STORAGE_BLOCKS_LAPIS), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/netherite"), Tags.Items.STORAGE_BLOCKS_NETHERITE), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/quartz"), Tags.Items.STORAGE_BLOCKS_QUARTZ), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/raw_copper"), Tags.Items.STORAGE_BLOCKS_RAW_COPPER), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/raw_gold"), Tags.Items.STORAGE_BLOCKS_RAW_GOLD), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/raw_iron"), Tags.Items.STORAGE_BLOCKS_RAW_IRON), + legacyToCommon(Registries.ITEM, forgeRl("storage_blocks/redstone"), Tags.Items.STORAGE_BLOCKS_REDSTONE), + legacyToCommon(Registries.ITEM, forgeRl("string"), Tags.Items.STRINGS), + + legacyToCommon(Registries.ITEM, forgeRl("tools"), Tags.Items.TOOLS), + legacyToCommon(Registries.ITEM, forgeRl("tools/shields"), Tags.Items.TOOLS_SHIELD), + legacyToCommon(Registries.ITEM, forgeRl("tools/bows"), Tags.Items.TOOLS_BOW), + legacyToCommon(Registries.ITEM, forgeRl("tools/crossbows"), Tags.Items.TOOLS_CROSSBOW), + legacyToCommon(Registries.ITEM, forgeRl("tools/fishing_rods"), Tags.Items.TOOLS_FISHING_ROD), + legacyToCommon(Registries.ITEM, forgeRl("tools/tridents"), Tags.Items.TOOLS_SPEAR), + legacyToCommon(Registries.ITEM, forgeRl("tools/shears"), Tags.Items.TOOLS_SHEAR), + + legacyToCommon(Registries.ITEM, forgeRl("armors"), Tags.Items.ARMORS), + //endregion + + //region Fluids + legacyToCommon(Registries.FLUID, forgeRl("milk"), Tags.Fluids.MILK), + //endregion + + //region Biomes + legacyToCommon(Registries.BIOME, forgeRl("is_void"), Tags.Biomes.IS_VOID), + + legacyToCommon(Registries.BIOME, forgeRl("is_hot"), Tags.Biomes.IS_HOT), + legacyToCommon(Registries.BIOME, forgeRl("is_hot/overworld"), Tags.Biomes.IS_HOT_OVERWORLD), + legacyToCommon(Registries.BIOME, forgeRl("is_hot/nether"), Tags.Biomes.IS_HOT_NETHER), + + legacyToCommon(Registries.BIOME, forgeRl("is_cold"), Tags.Biomes.IS_COLD), + legacyToCommon(Registries.BIOME, forgeRl("is_cold/overworld"), Tags.Biomes.IS_COLD_OVERWORLD), + legacyToCommon(Registries.BIOME, forgeRl("is_cold/end"), Tags.Biomes.IS_COLD_END), + + legacyToCommon(Registries.BIOME, forgeRl("is_sparse"), Tags.Biomes.IS_SPARSE_VEGETATION), + legacyToCommon(Registries.BIOME, forgeRl("is_sparse/overworld"), Tags.Biomes.IS_SPARSE_VEGETATION_OVERWORLD), + legacyToCommon(Registries.BIOME, forgeRl("is_dense"), Tags.Biomes.IS_DENSE_VEGETATION), + legacyToCommon(Registries.BIOME, forgeRl("is_dense/overworld"), Tags.Biomes.IS_DENSE_VEGETATION_OVERWORLD), + + legacyToCommon(Registries.BIOME, forgeRl("is_wet"), Tags.Biomes.IS_WET), + legacyToCommon(Registries.BIOME, forgeRl("is_wet/overworld"), Tags.Biomes.IS_WET_OVERWORLD), + legacyToCommon(Registries.BIOME, forgeRl("is_dry"), Tags.Biomes.IS_DRY), + legacyToCommon(Registries.BIOME, forgeRl("is_dry/overworld"), Tags.Biomes.IS_DRY_OVERWORLD), + legacyToCommon(Registries.BIOME, forgeRl("is_dry/nether"), Tags.Biomes.IS_DRY_NETHER), + legacyToCommon(Registries.BIOME, forgeRl("is_dry/end"), Tags.Biomes.IS_DRY_END), + + legacyToCommon(Registries.BIOME, forgeRl("is_coniferous"), Tags.Biomes.IS_CONIFEROUS_TREE), + + legacyToCommon(Registries.BIOME, forgeRl("is_mountain"), Tags.Biomes.IS_MOUNTAIN), + legacyToCommon(Registries.BIOME, forgeRl("is_peak"), Tags.Biomes.IS_MOUNTAIN_PEAK), + legacyToCommon(Registries.BIOME, forgeRl("is_slope"), Tags.Biomes.IS_MOUNTAIN_SLOPE), + + legacyToCommon(Registries.BIOME, forgeRl("is_plains"), Tags.Biomes.IS_PLAINS), + legacyToCommon(Registries.BIOME, forgeRl("is_swamp"), Tags.Biomes.IS_SWAMP), + legacyToCommon(Registries.BIOME, forgeRl("is_desert"), Tags.Biomes.IS_DESERT), + legacyToCommon(Registries.BIOME, forgeRl("is_mushroom"), Tags.Biomes.IS_MUSHROOM), + + legacyToCommon(Registries.BIOME, forgeRl("is_underground"), Tags.Biomes.IS_UNDERGROUND), + legacyToCommon(Registries.BIOME, forgeRl("is_cave"), Tags.Biomes.IS_CAVE), + + legacyToCommon(Registries.BIOME, forgeRl("is_wasteland"), Tags.Biomes.IS_WASTELAND), + legacyToCommon(Registries.BIOME, forgeRl("is_dead"), Tags.Biomes.IS_DEAD), + legacyToCommon(Registries.BIOME, forgeRl("is_water"), Tags.Biomes.IS_AQUATIC), + //endregion + + //region Unofficial + // These tags have technically never been included with Forge in the past, but now that common convention + // equivalents exist that Forge does include, these mappings have been added for convenience, just in case + // some mods have been using them as a de-facto standard. + + // Workstations + legacyToCommon(Registries.BLOCK, forgeRl("crafting_table"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + legacyToCommon(Registries.BLOCK, forgeRl("crafting_tables"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + legacyToCommon(Registries.BLOCK, forgeRl("furnace"), Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES), + legacyToCommon(Registries.BLOCK, forgeRl("furnaces"), Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES), + legacyToCommon(Registries.BLOCK, forgeRl("workbench"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + legacyToCommon(Registries.BLOCK, forgeRl("workbenches"), Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + + legacyToCommon(Registries.ITEM, forgeRl("crafting_table"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + legacyToCommon(Registries.ITEM, forgeRl("crafting_tables"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + legacyToCommon(Registries.ITEM, forgeRl("furnace"), Tags.Items.PLAYER_WORKSTATIONS_FURNACES), + legacyToCommon(Registries.ITEM, forgeRl("furnaces"), Tags.Items.PLAYER_WORKSTATIONS_FURNACES), + legacyToCommon(Registries.ITEM, forgeRl("workbench"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + legacyToCommon(Registries.ITEM, forgeRl("workbenches"), Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES), + + // Foods + legacyToCommon(Registries.ITEM, forgeRl("food"), Tags.Items.FOODS), + legacyToCommon(Registries.ITEM, forgeRl("foods"), Tags.Items.FOODS), + legacyToCommon(Registries.ITEM, forgeRl("fruit"), Tags.Items.FOODS_FRUIT), + legacyToCommon(Registries.ITEM, forgeRl("fruits"), Tags.Items.FOODS_FRUIT), + legacyToCommon(Registries.ITEM, forgeRl("vegetable"), Tags.Items.FOODS_VEGETABLE), + legacyToCommon(Registries.ITEM, forgeRl("vegetables"), Tags.Items.FOODS_VEGETABLE), + legacyToCommon(Registries.ITEM, forgeRl("berry"), Tags.Items.FOODS_BERRY), + legacyToCommon(Registries.ITEM, forgeRl("berries"), Tags.Items.FOODS_BERRY), + legacyToCommon(Registries.ITEM, forgeRl("bread"), Tags.Items.FOODS_BREAD), + legacyToCommon(Registries.ITEM, forgeRl("breads"), Tags.Items.FOODS_BREAD), + legacyToCommon(Registries.ITEM, forgeRl("cookie"), Tags.Items.FOODS_COOKIE), + legacyToCommon(Registries.ITEM, forgeRl("cookies"), Tags.Items.FOODS_COOKIE), + legacyToCommon(Registries.ITEM, forgeRl("raw_meat"), Tags.Items.FOODS_RAW_MEAT), + legacyToCommon(Registries.ITEM, forgeRl("raw_meats"), Tags.Items.FOODS_RAW_MEAT), + legacyToCommon(Registries.ITEM, forgeRl("raw_fish"), Tags.Items.FOODS_RAW_FISH), + legacyToCommon(Registries.ITEM, forgeRl("raw_fishes"), Tags.Items.FOODS_RAW_FISH), + legacyToCommon(Registries.ITEM, forgeRl("cooked_meat"), Tags.Items.FOODS_COOKED_MEAT), + legacyToCommon(Registries.ITEM, forgeRl("cooked_meats"), Tags.Items.FOODS_COOKED_MEAT), + legacyToCommon(Registries.ITEM, forgeRl("cooked_fish"), Tags.Items.FOODS_COOKED_FISH), + legacyToCommon(Registries.ITEM, forgeRl("cooked_fishes"), Tags.Items.FOODS_COOKED_FISH), + legacyToCommon(Registries.ITEM, forgeRl("soup"), Tags.Items.FOODS_SOUP), + legacyToCommon(Registries.ITEM, forgeRl("soups"), Tags.Items.FOODS_SOUP), + legacyToCommon(Registries.ITEM, forgeRl("stew"), Tags.Items.FOODS_SOUP), + legacyToCommon(Registries.ITEM, forgeRl("stews"), Tags.Items.FOODS_SOUP), + legacyToCommon(Registries.ITEM, forgeRl("candy"), Tags.Items.FOODS_CANDY), + legacyToCommon(Registries.ITEM, forgeRl("candies"), Tags.Items.FOODS_CANDY), + + // Fluids + legacyToCommon(Registries.FLUID, forgeRl("water"), Tags.Fluids.WATER), + legacyToCommon(Registries.FLUID, forgeRl("lava"), Tags.Fluids.LAVA), + legacyToCommon(Registries.FLUID, forgeRl("honey"), Tags.Fluids.HONEY), + + // Biomes + legacyToCommon(Registries.BIOME, forgeRl("is_overworld"), Tags.Biomes.IS_OVERWORLD), + legacyToCommon(Registries.BIOME, forgeRl("is_nether"), Tags.Biomes.IS_NETHER), + legacyToCommon(Registries.BIOME, forgeRl("is_nether_forest"), Tags.Biomes.IS_NETHER_FOREST), + legacyToCommon(Registries.BIOME, forgeRl("is_end"), Tags.Biomes.IS_END), + + legacyToCommon(Registries.BIOME, forgeRl("is_forest"), Tags.Biomes.IS_FOREST), + legacyToCommon(Registries.BIOME, forgeRl("is_jungle"), Tags.Biomes.IS_JUNGLE), + legacyToCommon(Registries.BIOME, forgeRl("is_savanna"), Tags.Biomes.IS_SAVANNA), + legacyToCommon(Registries.BIOME, forgeRl("is_floral"), Tags.Biomes.IS_FLORAL), + legacyToCommon(Registries.BIOME, forgeRl("is_snowy"), Tags.Biomes.IS_SNOWY), + legacyToCommon(Registries.BIOME, forgeRl("is_icy"), Tags.Biomes.IS_ICY), + legacyToCommon(Registries.BIOME, forgeRl("is_ocean"), Tags.Biomes.IS_OCEAN) + //endregion + ); + + /** + * Creates a mapping from a legacy tag to a common convention equivalent. + *

+ * Example: {@code legacyToCommon(Registries.BLOCK, forgeRl("cobblestone"), Tags.Blocks.COBBLESTONES)} for {@code forge:cobblestone} -> {@code c:cobblestones} + *

+ * @param registryKey Example: {@link net.minecraft.core.registries.Registries.BLOCK} + * @param legacyTagResourceLocation Example: {@code forgeRl("cobblestone")} + * @param replacementTag Example: {@link Tags.Blocks#COBBLESTONES} + * @return A map entry with the legacy tag's TagKey and the suggested replacement tag ID. + */ + private static Map.Entry, String> legacyToCommon(ResourceKey> registryKey, + ResourceLocation legacyTagResourceLocation, + TagKey replacementTag) { + return Map.entry(TagKey.create(registryKey, legacyTagResourceLocation), replacementTag.toString()); + } + + /** + * Same as {@link #legacyToCommon(ResourceKey, ResourceLocation, TagKey)} but for multiple replacement tags. + * This is useful when a single legacy tag is intended to be replaced by combining multiple common convention tags. + */ + private static Map.Entry, String> legacyToCommon(ResourceKey> registryKey, + ResourceLocation legacyTagRessourceLocation, + List> replacementTags) { + return Map.entry( + TagKey.create(registryKey, legacyTagRessourceLocation), + replacementTags.stream().map(TagKey::toString).collect(Collectors.joining(" and ")) + ); + } + + private static ResourceLocation forgeRl(String path) { + return ResourceLocation.fromNamespaceAndPath("forge", path); + } +} diff --git a/src/main/java/net/minecraftforge/common/TagConventionMigrationHelper.java b/src/main/java/net/minecraftforge/common/TagConventionMigrationHelper.java new file mode 100644 index 0000000000..ae1facd48d --- /dev/null +++ b/src/main/java/net/minecraftforge/common/TagConventionMigrationHelper.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common; + +import net.minecraft.core.RegistryAccess; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraftforge.event.server.ServerStartingEvent; +import net.minecraftforge.fml.loading.FMLLoader; +import org.apache.logging.log4j.LogManager; +import org.jetbrains.annotations.ApiStatus; + +import java.util.ArrayList; + +/** + * Internal implementation for optionally logging warnings about legacy tags along with suggestions for direct + * replacements, in order to help modders migrate to the new tags. + * @see ForgeConfig.Common#migrationHelperMode + */ +@ApiStatus.Internal +public final class TagConventionMigrationHelper { + private TagConventionMigrationHelper() {} + + private static final ArrayList> FOUND_LEGACY_TAGS = new ArrayList<>(); + + static void init() { + MinecraftForge.EVENT_BUS.addListener(TagConventionMigrationHelper::onServerStarting); + } + + public static void onServerStarting(ServerStartingEvent event) { + // note: this check has to be done here because the config is not loaded until the server is starting + var mode = ForgeConfig.COMMON.migrationHelperMode.get(); + boolean shouldRun = switch (mode) { + case OFF -> false; + case ONLY_IN_DEV_ENV -> !FMLLoader.isProduction(); + case ALWAYS -> true; + }; + + if (shouldRun) + run(event.getServer().registryAccess()); + } + + private static void run(RegistryAccess.Frozen registryAccess) { + registryAccess.registries().forEach(registryEntry -> { + if (registryEntry.key().location().getNamespace().equals(ResourceLocation.DEFAULT_NAMESPACE)) { + FOUND_LEGACY_TAGS.addAll( + registryEntry.value().getTagNames().filter(TagConventionMappings.MAPPINGS::containsKey).toList() + ); + } + }); + + if (FOUND_LEGACY_TAGS.isEmpty()) + return; + + var stringBuilder = new StringBuilder(""" + ~~~~~~~~ Tag migration helper ~~~~~~~~ + Warning for mod devs: Found known legacy tags that have direct common convention equivalents - consider migrating these to improve compatibility with other mods. + Note: This feature isn't fully comprehensive - see Forge's net.minecraftforge.common.Tags class for a full list of tags. + You can disable this message by setting "migrationHelperMode" to "OFF" in Forge's common config. + + Here are some suggestions for replacements:""".stripIndent()); + + for (var legacyTag : FOUND_LEGACY_TAGS) { + var replacement = TagConventionMappings.MAPPINGS.get(legacyTag); + stringBuilder.append("\n- ").append(legacyTag).append(" -> ").append(replacement); + } + stringBuilder.append("\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"); + + LogManager.getLogger().warn(stringBuilder); + FOUND_LEGACY_TAGS.clear(); + FOUND_LEGACY_TAGS.trimToSize(); + } + +} diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 725960ce2b..51b07819cf 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -5,6 +5,7 @@ package net.minecraftforge.common; +import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; @@ -12,216 +13,588 @@ import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.entity.EntityType; +import net.minecraft.world.entity.monster.EnderMan; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; +import net.minecraft.world.item.enchantment.Enchantment; +import net.minecraft.world.level.Level; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.levelgen.structure.Structure; import net.minecraft.world.level.material.Fluid; +import net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper; -public class Tags -{ - public static void init () - { +public class Tags { + public static void init() { Blocks.init(); EntityTypes.init(); Items.init(); Fluids.init(); + Enchantments.init(); Biomes.init(); + Structures.init(); } - public static class Blocks - { - private static void init(){} + public static class Blocks { + private static void init() {} - public static final TagKey BARRELS = tag("barrels"); - public static final TagKey BARRELS_WOODEN = tag("barrels/wooden"); - public static final TagKey BOOKSHELVES = tag("bookshelves"); - public static final TagKey CHESTS = tag("chests"); - public static final TagKey CHESTS_ENDER = tag("chests/ender"); - public static final TagKey CHESTS_TRAPPED = tag("chests/trapped"); - public static final TagKey CHESTS_WOODEN = tag("chests/wooden"); - public static final TagKey COBBLESTONE = tag("cobblestone"); - public static final TagKey COBBLESTONE_NORMAL = tag("cobblestone/normal"); - public static final TagKey COBBLESTONE_INFESTED = tag("cobblestone/infested"); - public static final TagKey COBBLESTONE_MOSSY = tag("cobblestone/mossy"); - public static final TagKey COBBLESTONE_DEEPSLATE = tag("cobblestone/deepslate"); - public static final TagKey END_STONES = tag("end_stones"); - public static final TagKey ENDERMAN_PLACE_ON_BLACKLIST = tag("enderman_place_on_blacklist"); - public static final TagKey FENCE_GATES = tag("fence_gates"); - public static final TagKey FENCE_GATES_WOODEN = tag("fence_gates/wooden"); - public static final TagKey FENCES = tag("fences"); - public static final TagKey FENCES_NETHER_BRICK = tag("fences/nether_brick"); - public static final TagKey FENCES_WOODEN = tag("fences/wooden"); - - public static final TagKey GLASS = tag("glass"); - public static final TagKey GLASS_BLACK = tag("glass/black"); - public static final TagKey GLASS_BLUE = tag("glass/blue"); - public static final TagKey GLASS_BROWN = tag("glass/brown"); - public static final TagKey GLASS_COLORLESS = tag("glass/colorless"); - public static final TagKey GLASS_CYAN = tag("glass/cyan"); - public static final TagKey GLASS_GRAY = tag("glass/gray"); - public static final TagKey GLASS_GREEN = tag("glass/green"); - public static final TagKey GLASS_LIGHT_BLUE = tag("glass/light_blue"); - public static final TagKey GLASS_LIGHT_GRAY = tag("glass/light_gray"); - public static final TagKey GLASS_LIME = tag("glass/lime"); - public static final TagKey GLASS_MAGENTA = tag("glass/magenta"); - public static final TagKey GLASS_ORANGE = tag("glass/orange"); - public static final TagKey GLASS_PINK = tag("glass/pink"); - public static final TagKey GLASS_PURPLE = tag("glass/purple"); - public static final TagKey GLASS_RED = tag("glass/red"); + //region `forge` tags for Forge-specific tags /** - * Glass which is made from sand and only minor additional ingredients like dyes + * Controls what blocks Endermen cannot place blocks onto. + *

+ * This is patched into the following method: {@link EnderMan.EndermanLeaveBlockGoal#canPlaceBlock(Level, BlockPos, BlockState, BlockState, BlockState, BlockPos)} */ - public static final TagKey GLASS_SILICA = tag("glass/silica"); - public static final TagKey GLASS_TINTED = tag("glass/tinted"); - public static final TagKey GLASS_WHITE = tag("glass/white"); - public static final TagKey GLASS_YELLOW = tag("glass/yellow"); + public static final TagKey ENDERMAN_PLACE_ON_BLACKLIST = forgeTag("enderman_place_on_blacklist"); + public static final TagKey NEEDS_WOOD_TOOL = forgeTag("needs_wood_tool"); + public static final TagKey NEEDS_GOLD_TOOL = forgeTag("needs_gold_tool"); + public static final TagKey NEEDS_NETHERITE_TOOL = forgeTag("needs_netherite_tool"); + public static final TagKey STORAGE_BLOCKS_AMETHYST = forgeTag("storage_blocks/amethyst"); + public static final TagKey STORAGE_BLOCKS_QUARTZ = forgeTag("storage_blocks/quartz"); - public static final TagKey GLASS_PANES = tag("glass_panes"); - public static final TagKey GLASS_PANES_BLACK = tag("glass_panes/black"); - public static final TagKey GLASS_PANES_BLUE = tag("glass_panes/blue"); - public static final TagKey GLASS_PANES_BROWN = tag("glass_panes/brown"); - public static final TagKey GLASS_PANES_COLORLESS = tag("glass_panes/colorless"); - public static final TagKey GLASS_PANES_CYAN = tag("glass_panes/cyan"); - public static final TagKey GLASS_PANES_GRAY = tag("glass_panes/gray"); - public static final TagKey GLASS_PANES_GREEN = tag("glass_panes/green"); - public static final TagKey GLASS_PANES_LIGHT_BLUE = tag("glass_panes/light_blue"); - public static final TagKey GLASS_PANES_LIGHT_GRAY = tag("glass_panes/light_gray"); - public static final TagKey GLASS_PANES_LIME = tag("glass_panes/lime"); - public static final TagKey GLASS_PANES_MAGENTA = tag("glass_panes/magenta"); - public static final TagKey GLASS_PANES_ORANGE = tag("glass_panes/orange"); - public static final TagKey GLASS_PANES_PINK = tag("glass_panes/pink"); - public static final TagKey GLASS_PANES_PURPLE = tag("glass_panes/purple"); - public static final TagKey GLASS_PANES_RED = tag("glass_panes/red"); - public static final TagKey GLASS_PANES_WHITE = tag("glass_panes/white"); - public static final TagKey GLASS_PANES_YELLOW = tag("glass_panes/yellow"); + public static final TagKey CHESTS_ENDER = forgeTag("chests/ender"); + public static final TagKey CHESTS_TRAPPED = forgeTag("chests/trapped"); + public static final TagKey COBBLESTONE_NORMAL = forgeTag("cobblestone/normal"); + public static final TagKey COBBLESTONE_INFESTED = forgeTag("cobblestone/infested"); + public static final TagKey COBBLESTONE_MOSSY = forgeTag("cobblestone/mossy"); + public static final TagKey COBBLESTONE_DEEPSLATE = forgeTag("cobblestone/deepslate"); + public static final TagKey END_STONES = forgeTag("end_stones"); + public static final TagKey FENCE_GATES = forgeTag("fence_gates"); + public static final TagKey FENCE_GATES_WOODEN = forgeTag("fence_gates/wooden"); + public static final TagKey FENCES = forgeTag("fences"); + public static final TagKey FENCES_NETHER_BRICK = forgeTag("fences/nether_brick"); + public static final TagKey FENCES_WOODEN = forgeTag("fences/wooden"); - public static final TagKey GRAVEL = tag("gravel"); - public static final TagKey NETHERRACK = tag("netherrack"); - public static final TagKey OBSIDIAN = tag("obsidian"); + public static final TagKey GRAVEL = forgeTag("gravel"); + public static final TagKey NETHERRACK = forgeTag("netherrack"); /** * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation */ - public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = tag("ore_bearing_ground/deepslate"); + public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = forgeTag("ore_bearing_ground/deepslate"); /** * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation */ - public static final TagKey ORE_BEARING_GROUND_NETHERRACK = tag("ore_bearing_ground/netherrack"); + public static final TagKey ORE_BEARING_GROUND_NETHERRACK = forgeTag("ore_bearing_ground/netherrack"); /** * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation */ - public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); + public static final TagKey ORE_BEARING_GROUND_STONE = forgeTag("ore_bearing_ground/stone"); /** * Ores which on average result in more than one resource worth of materials */ - public static final TagKey ORE_RATES_DENSE = tag("ore_rates/dense"); + public static final TagKey ORE_RATES_DENSE = forgeTag("ore_rates/dense"); /** * Ores which on average result in one resource worth of materials */ - public static final TagKey ORE_RATES_SINGULAR = tag("ore_rates/singular"); + public static final TagKey ORE_RATES_SINGULAR = forgeTag("ore_rates/singular"); /** * Ores which on average result in less than one resource worth of materials */ - public static final TagKey ORE_RATES_SPARSE = tag("ore_rates/sparse"); - public static final TagKey ORES = tag("ores"); - public static final TagKey ORES_COAL = tag("ores/coal"); - public static final TagKey ORES_COPPER = tag("ores/copper"); - public static final TagKey ORES_DIAMOND = tag("ores/diamond"); - public static final TagKey ORES_EMERALD = tag("ores/emerald"); - public static final TagKey ORES_GOLD = tag("ores/gold"); - public static final TagKey ORES_IRON = tag("ores/iron"); - public static final TagKey ORES_LAPIS = tag("ores/lapis"); - public static final TagKey ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap"); - public static final TagKey ORES_QUARTZ = tag("ores/quartz"); - public static final TagKey ORES_REDSTONE = tag("ores/redstone"); + public static final TagKey ORE_RATES_SPARSE = forgeTag("ore_rates/sparse"); + + public static final TagKey ORES_COAL = forgeTag("ores/coal"); + public static final TagKey ORES_COPPER = forgeTag("ores/copper"); + public static final TagKey ORES_DIAMOND = forgeTag("ores/diamond"); + public static final TagKey ORES_EMERALD = forgeTag("ores/emerald"); + public static final TagKey ORES_GOLD = forgeTag("ores/gold"); + public static final TagKey ORES_IRON = forgeTag("ores/iron"); + public static final TagKey ORES_LAPIS = forgeTag("ores/lapis"); + public static final TagKey ORES_REDSTONE = forgeTag("ores/redstone"); /** * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output */ - public static final TagKey ORES_IN_GROUND_DEEPSLATE = tag("ores_in_ground/deepslate"); + public static final TagKey ORES_IN_GROUND_DEEPSLATE = forgeTag("ores_in_ground/deepslate"); /** * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output */ - public static final TagKey ORES_IN_GROUND_NETHERRACK = tag("ores_in_ground/netherrack"); + public static final TagKey ORES_IN_GROUND_NETHERRACK = forgeTag("ores_in_ground/netherrack"); /** * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output */ - public static final TagKey ORES_IN_GROUND_STONE = tag("ores_in_ground/stone"); + public static final TagKey ORES_IN_GROUND_STONE = forgeTag("ores_in_ground/stone"); + public static final TagKey SAND = forgeTag("sand"); + public static final TagKey SAND_COLORLESS = forgeTag("sand/colorless"); + public static final TagKey SAND_RED = forgeTag("sand/red"); + //endregion - public static final TagKey SAND = tag("sand"); - public static final TagKey SAND_COLORLESS = tag("sand/colorless"); - public static final TagKey SAND_RED = tag("sand/red"); + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + public static final TagKey BARRELS = cTag("barrels"); + public static final TagKey BARRELS_WOODEN = cTag("barrels/wooden"); + public static final TagKey BOOKSHELVES = cTag("bookshelves"); + /** + * For blocks that are similar to amethyst where their budding block produces buds and cluster blocks + */ + public static final TagKey BUDDING_BLOCKS = cTag("budding_blocks"); + /** + * For blocks that are similar to amethyst where they have buddings forming from budding blocks + */ + public static final TagKey BUDS = cTag("buds"); + public static final TagKey CHAINS = cTag("chains"); + public static final TagKey CHESTS = cTag("chests"); + public static final TagKey CHESTS_WOODEN = cTag("chests/wooden"); + /** + * For blocks that are similar to amethyst where they have clusters forming from budding blocks + */ + public static final TagKey CLUSTERS = cTag("clusters"); + public static final TagKey COBBLESTONES = cTag("cobblestones"); + public static final TagKey CONCRETES = cTag("concretes"); - public static final TagKey SANDSTONE = tag("sandstone"); - public static final TagKey STAINED_GLASS = tag("stained_glass"); - public static final TagKey STAINED_GLASS_PANES = tag("stained_glass_panes"); - public static final TagKey STONE = tag("stone"); - public static final TagKey STORAGE_BLOCKS = tag("storage_blocks"); - public static final TagKey STORAGE_BLOCKS_AMETHYST = tag("storage_blocks/amethyst"); - public static final TagKey STORAGE_BLOCKS_COAL = tag("storage_blocks/coal"); - public static final TagKey STORAGE_BLOCKS_COPPER = tag("storage_blocks/copper"); - public static final TagKey STORAGE_BLOCKS_DIAMOND = tag("storage_blocks/diamond"); - public static final TagKey STORAGE_BLOCKS_EMERALD = tag("storage_blocks/emerald"); - public static final TagKey STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold"); - public static final TagKey STORAGE_BLOCKS_IRON = tag("storage_blocks/iron"); - public static final TagKey STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis"); - public static final TagKey STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite"); - public static final TagKey STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz"); - public static final TagKey STORAGE_BLOCKS_RAW_COPPER = tag("storage_blocks/raw_copper"); - public static final TagKey STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold"); - public static final TagKey STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron"); - public static final TagKey STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); + /** + * Tag that holds all blocks that can be dyed a specific color. + * (Does not include color blending blocks that would behave similar to leather armor item) + */ + public static final TagKey DYED = cTag("dyed"); + public static final TagKey DYED_BLACK = cTag("dyed/black"); + public static final TagKey DYED_BLUE = cTag("dyed/blue"); + public static final TagKey DYED_BROWN = cTag("dyed/brown"); + public static final TagKey DYED_CYAN = cTag("dyed/cyan"); + public static final TagKey DYED_GRAY = cTag("dyed/gray"); + public static final TagKey DYED_GREEN = cTag("dyed/green"); + public static final TagKey DYED_LIGHT_BLUE = cTag("dyed/light_blue"); + public static final TagKey DYED_LIGHT_GRAY = cTag("dyed/light_gray"); + public static final TagKey DYED_LIME = cTag("dyed/lime"); + public static final TagKey DYED_MAGENTA = cTag("dyed/magenta"); + public static final TagKey DYED_ORANGE = cTag("dyed/orange"); + public static final TagKey DYED_PINK = cTag("dyed/pink"); + public static final TagKey DYED_PURPLE = cTag("dyed/purple"); + public static final TagKey DYED_RED = cTag("dyed/red"); + public static final TagKey DYED_WHITE = cTag("dyed/white"); + public static final TagKey DYED_YELLOW = cTag("dyed/yellow"); - public static final TagKey NEEDS_WOOD_TOOL = tag("needs_wood_tool"); - public static final TagKey NEEDS_GOLD_TOOL = tag("needs_gold_tool"); - public static final TagKey NEEDS_NETHERITE_TOOL = tag("needs_netherite_tool"); + public static final TagKey GLASS_BLOCKS = cTag("glass_blocks"); + public static final TagKey GLASS_BLOCKS_COLORLESS = cTag("glass_blocks/colorless"); + /** + * Glass which is made from cheap resources like sand and only minor additional ingredients like dyes + */ + public static final TagKey GLASS_BLOCKS_CHEAP = cTag("glass_blocks/cheap"); + public static final TagKey GLASS_BLOCKS_TINTED = cTag("glass_blocks/tinted"); - private static TagKey tag(String name) - { + public static final TagKey GLASS_PANES = cTag("glass_panes"); + public static final TagKey GLASS_PANES_COLORLESS = cTag("glass_panes/colorless"); + public static final TagKey GLAZED_TERRACOTTAS = cTag("glazed_terracottas"); + + /** + * Tag that holds all blocks that recipe viewers should not show to users. + * Recipe viewers may use this to automatically find the corresponding BlockItem to hide. + */ + public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = cTag("hidden_from_recipe_viewers"); + public static final TagKey OBSIDIANS = cTag("obsidians"); + /** + * For common obsidian that has no special quirks or behaviours - ideal for recipe use. + * Crying Obsidian, for example, is a light block and harder to obtain. So it gets its own tag instead of being under normal tag. + */ + public static final TagKey OBSIDIANS_NORMAL = cTag("obsidians/normal"); + public static final TagKey OBSIDIANS_CRYING = cTag("obsidians/crying"); + public static final TagKey ORES = cTag("ores"); + public static final TagKey ORES_NETHERITE_SCRAP = cTag("ores/netherite_scrap"); + public static final TagKey ORES_QUARTZ = cTag("ores/quartz"); + public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = cTag("player_workstations/crafting_tables"); + public static final TagKey PLAYER_WORKSTATIONS_FURNACES = cTag("player_workstations/furnaces"); + /** + * Blocks should be included in this tag if their movement/relocation can cause serious issues such + * as world corruption upon being moved or for balance reason where the block should not be able to be relocated. + * Example: Chunk loaders or pipes where other mods that move blocks do not respect + * {@link BlockBehaviour.BlockStateBase#getPistonPushReaction}. + */ + public static final TagKey RELOCATION_NOT_SUPPORTED = cTag("relocation_not_supported"); + public static final TagKey ROPES = cTag("ropes"); + + public static final TagKey SANDSTONE_BLOCKS = cTag("sandstone/blocks"); + public static final TagKey SANDSTONE_SLABS = cTag("sandstone/slabs"); + public static final TagKey SANDSTONE_STAIRS = cTag("sandstone/stairs"); + public static final TagKey SANDSTONE_RED_BLOCKS = cTag("sandstone/red_blocks"); + public static final TagKey SANDSTONE_RED_SLABS = cTag("sandstone/red_slabs"); + public static final TagKey SANDSTONE_RED_STAIRS = cTag("sandstone/red_stairs"); + public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = cTag("sandstone/uncolored_blocks"); + public static final TagKey SANDSTONE_UNCOLORED_SLABS = cTag("sandstone/uncolored_slabs"); + public static final TagKey SANDSTONE_UNCOLORED_STAIRS = cTag("sandstone/uncolored_stairs"); + /** + * Tag that holds all head based blocks such as Skeleton Skull or Player Head. (Named skulls to match minecraft:skulls item tag) + */ + public static final TagKey SKULLS = cTag("skulls"); + /** + * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone. + */ + public static final TagKey STONES = cTag("stones"); + /** + * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block + * and has a mirror recipe to reverse the crafting with no loss in resources. + *

+ * Honey Block is special in that the reversing recipe is not a perfect mirror of the crafting recipe + * and so, it is considered a special case and not given a storage block tag. + */ + public static final TagKey STORAGE_BLOCKS = cTag("storage_blocks"); + public static final TagKey STORAGE_BLOCKS_BONE_MEAL = cTag("storage_blocks/bone_meal"); + public static final TagKey STORAGE_BLOCKS_COAL = cTag("storage_blocks/coal"); + public static final TagKey STORAGE_BLOCKS_COPPER = cTag("storage_blocks/copper"); + public static final TagKey STORAGE_BLOCKS_DIAMOND = cTag("storage_blocks/diamond"); + public static final TagKey STORAGE_BLOCKS_DRIED_KELP = cTag("storage_blocks/dried_kelp"); + public static final TagKey STORAGE_BLOCKS_EMERALD = cTag("storage_blocks/emerald"); + public static final TagKey STORAGE_BLOCKS_GOLD = cTag("storage_blocks/gold"); + public static final TagKey STORAGE_BLOCKS_IRON = cTag("storage_blocks/iron"); + public static final TagKey STORAGE_BLOCKS_LAPIS = cTag("storage_blocks/lapis"); + public static final TagKey STORAGE_BLOCKS_NETHERITE = cTag("storage_blocks/netherite"); + public static final TagKey STORAGE_BLOCKS_RAW_COPPER = cTag("storage_blocks/raw_copper"); + public static final TagKey STORAGE_BLOCKS_RAW_GOLD = cTag("storage_blocks/raw_gold"); + public static final TagKey STORAGE_BLOCKS_RAW_IRON = cTag("storage_blocks/raw_iron"); + public static final TagKey STORAGE_BLOCKS_REDSTONE = cTag("storage_blocks/redstone"); + public static final TagKey STORAGE_BLOCKS_SLIME = cTag("storage_blocks/slime"); + public static final TagKey STORAGE_BLOCKS_WHEAT = cTag("storage_blocks/wheat"); + public static final TagKey VILLAGER_JOB_SITES = cTag("villager_job_sites"); + //endregion + + //region Redirect fields for improved backward-compatibility + // TODO: Remove backwards compat redirect fields in 1.22 + /** @deprecated Use {@link #COBBLESTONES} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey COBBLESTONE = COBBLESTONES; + + /** @deprecated Use {@link #GLASS_BLOCKS_CHEAP} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_SILICA = GLASS_BLOCKS_CHEAP; + //endregion + + //region Forge tags that now map to combining multiple `c` tags + // Kept for binary compatibility + // TODO: Remove these in 1.22 + /** @deprecated Use {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS = forgeTag("glass"); + /** @deprecated Use {@link #DYED_BLACK} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_BLACK = forgeTag("glass/black"); + /** @deprecated Use {@link #DYED_BLUE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_BLUE = forgeTag("glass/blue"); + /** @deprecated Use {@link #DYED_BROWN} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_BROWN = forgeTag("glass/brown"); + /** @deprecated Use {@link #GLASS_BLOCKS_COLORLESS} and/or {@link #GLASS_PANES_COLORLESS} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_COLORLESS = forgeTag("glass/colorless"); + /** @deprecated Use {@link #DYED_CYAN} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_CYAN = forgeTag("glass/cyan"); + /** @deprecated Use {@link #DYED_GRAY} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_GRAY = forgeTag("glass/gray"); + /** @deprecated Use {@link #DYED_GREEN} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_GREEN = forgeTag("glass/green"); + /** @deprecated Use {@link #DYED_LIGHT_BLUE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_LIGHT_BLUE = forgeTag("glass/light_blue"); + /** @deprecated Use {@link #DYED_LIGHT_GRAY} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_LIGHT_GRAY = forgeTag("glass/light_gray"); + /** @deprecated Use {@link #DYED_LIME} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_LIME = forgeTag("glass/lime"); + /** @deprecated Use {@link #DYED_MAGENTA} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_MAGENTA = forgeTag("glass/magenta"); + /** @deprecated Use {@link #DYED_ORANGE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_ORANGE = forgeTag("glass/orange"); + /** @deprecated Use {@link #DYED_PINK} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PINK = forgeTag("glass/pink"); + /** @deprecated Use {@link #DYED_PURPLE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PURPLE = forgeTag("glass/purple"); + /** @deprecated Use {@link #DYED_RED} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_RED = forgeTag("glass/red"); + /** @deprecated Use {@link #DYED_WHITE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_WHITE = forgeTag("glass/white"); + /** @deprecated Use {@link #DYED_YELLOW} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_YELLOW = forgeTag("glass/yellow"); + /** @deprecated Use {@link #DYED} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey STAINED_GLASS = forgeTag("stained_glass"); + + /** @deprecated Use {@link #DYED_BLACK} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_BLACK = forgeTag("glass_panes/black"); + /** @deprecated Use {@link #DYED_BLUE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_BLUE = forgeTag("glass_panes/blue"); + /** @deprecated Use {@link #DYED_BROWN} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_BROWN = forgeTag("glass_panes/brown"); + /** @deprecated Use {@link #DYED_CYAN} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_CYAN = forgeTag("glass_panes/cyan"); + /** @deprecated Use {@link #DYED_GRAY} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_GRAY = forgeTag("glass_panes/gray"); + /** @deprecated Use {@link #DYED_GREEN} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_GREEN = forgeTag("glass_panes/green"); + /** @deprecated Use {@link #DYED_LIGHT_BLUE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_LIGHT_BLUE = forgeTag("glass_panes/light_blue"); + /** @deprecated Use {@link #DYED_LIGHT_GRAY} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_LIGHT_GRAY = forgeTag("glass_panes/light_gray"); + /** @deprecated Use {@link #DYED_LIME} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_LIME = forgeTag("glass_panes/lime"); + /** @deprecated Use {@link #DYED_MAGENTA} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_MAGENTA = forgeTag("glass_panes/magenta"); + /** @deprecated Use {@link #DYED_ORANGE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_ORANGE = forgeTag("glass_panes/orange"); + /** @deprecated Use {@link #DYED_PINK} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_PINK = forgeTag("glass_panes/pink"); + /** @deprecated Use {@link #DYED_PURPLE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_PURPLE = forgeTag("glass_panes/purple"); + /** @deprecated Use {@link #DYED_RED} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_RED = forgeTag("glass_panes/red"); + /** @deprecated Use {@link #DYED_WHITE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_WHITE = forgeTag("glass_panes/white"); + /** @deprecated Use {@link #DYED_YELLOW} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_YELLOW = forgeTag("glass_panes/yellow"); + /** @deprecated Use {@link #DYED} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey STAINED_GLASS_PANES = forgeTag("stained_glass_panes"); + //endregion + + private static TagKey cTag(String name) { + return BlockTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); + } + + private static TagKey forgeTag(String name) { return BlockTags.create(ResourceLocation.fromNamespaceAndPath("forge", name)); } } - public static class EntityTypes - { + public static class EntityTypes { private static void init() {} - public static final TagKey> BOSSES = tag("bosses"); + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + public static final TagKey> BOSSES = cTag("bosses"); + public static final TagKey> MINECARTS = cTag("minecarts"); + public static final TagKey> BOATS = cTag("boats"); - private static TagKey> tag(String name) - { - return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath("forge", name)); + /** + * Entities should be included in this tag if they are not allowed to be picked up by items or grabbed in a way + * that a player can easily move the entity to anywhere they want. Ideal for special entities that should not + * be able to be put into a mob jar for example. + */ + public static final TagKey> CAPTURING_NOT_SUPPORTED = cTag("capturing_not_supported"); + + /** + * Entities should be included in this tag if they are not allowed to be teleported in any way. + * This is more for mods that allow teleporting entities within the same dimension. Any mod that is + * teleporting entities to new dimensions should be checking canChangeDimensions method on the entity itself. + */ + public static final TagKey> TELEPORTING_NOT_SUPPORTED = cTag("teleporting_not_supported"); + //endregion + + private static TagKey> cTag(String name) { + return TagKey.create(Registries.ENTITY_TYPE, ResourceLocation.fromNamespaceAndPath("c", name)); } } - public static class Items - { - private static void init(){} + public static class Items { + private static void init() {} - public static final TagKey BARRELS = tag("barrels"); - public static final TagKey BARRELS_WOODEN = tag("barrels/wooden"); - public static final TagKey BONES = tag("bones"); - public static final TagKey BOOKSHELVES = tag("bookshelves"); - public static final TagKey CHESTS = tag("chests"); - public static final TagKey CHESTS_ENDER = tag("chests/ender"); - public static final TagKey CHESTS_TRAPPED = tag("chests/trapped"); - public static final TagKey CHESTS_WOODEN = tag("chests/wooden"); - public static final TagKey COBBLESTONE = tag("cobblestone"); - public static final TagKey COBBLESTONE_NORMAL = tag("cobblestone/normal"); - public static final TagKey COBBLESTONE_INFESTED = tag("cobblestone/infested"); - public static final TagKey COBBLESTONE_MOSSY = tag("cobblestone/mossy"); - public static final TagKey COBBLESTONE_DEEPSLATE = tag("cobblestone/deepslate"); - public static final TagKey CROPS = tag("crops"); - public static final TagKey CROPS_BEETROOT = tag("crops/beetroot"); - public static final TagKey CROPS_CARROT = tag("crops/carrot"); - public static final TagKey CROPS_NETHER_WART = tag("crops/nether_wart"); - public static final TagKey CROPS_POTATO = tag("crops/potato"); - public static final TagKey CROPS_WHEAT = tag("crops/wheat"); - public static final TagKey DUSTS = tag("dusts"); - public static final TagKey DUSTS_PRISMARINE = tag("dusts/prismarine"); - public static final TagKey DUSTS_REDSTONE = tag("dusts/redstone"); - public static final TagKey DUSTS_GLOWSTONE = tag("dusts/glowstone"); + //region `forge` tags for Forge-specific tags + public static final TagKey BONES = forgeTag("bones"); + public static final TagKey CHESTS_ENDER = forgeTag("chests/ender"); + public static final TagKey CHESTS_TRAPPED = forgeTag("chests/trapped"); + public static final TagKey COBBLESTONE_NORMAL = forgeTag("cobblestone/normal"); + public static final TagKey COBBLESTONE_INFESTED = forgeTag("cobblestone/infested"); + public static final TagKey COBBLESTONE_MOSSY = forgeTag("cobblestone/mossy"); + public static final TagKey COBBLESTONE_DEEPSLATE = forgeTag("cobblestone/deepslate"); + public static final TagKey EGGS = forgeTag("eggs"); + public static final TagKey END_STONES = forgeTag("end_stones"); + public static final TagKey FEATHERS = forgeTag("feathers"); + public static final TagKey FENCE_GATES = forgeTag("fence_gates"); + public static final TagKey FENCE_GATES_WOODEN = forgeTag("fence_gates/wooden"); + public static final TagKey FENCES = forgeTag("fences"); + public static final TagKey FENCES_NETHER_BRICK = forgeTag("fences/nether_brick"); + public static final TagKey FENCES_WOODEN = forgeTag("fences/wooden"); + public static final TagKey GRAVEL = forgeTag("gravel"); + public static final TagKey GUNPOWDER = forgeTag("gunpowder"); + public static final TagKey MUSHROOMS = forgeTag("mushrooms"); + public static final TagKey NETHER_STARS = forgeTag("nether_stars"); + public static final TagKey NETHERRACK = forgeTag("netherrack"); + /** + * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = forgeTag("ore_bearing_ground/deepslate"); + /** + * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_NETHERRACK = forgeTag("ore_bearing_ground/netherrack"); + /** + * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation + */ + public static final TagKey ORE_BEARING_GROUND_STONE = forgeTag("ore_bearing_ground/stone"); + /** + * Ores which on average result in more than one resource worth of materials + */ + public static final TagKey ORE_RATES_DENSE = forgeTag("ore_rates/dense"); + /** + * Ores which on average result in one resource worth of materials + */ + public static final TagKey ORE_RATES_SINGULAR = forgeTag("ore_rates/singular"); + /** + * Ores which on average result in less than one resource worth of materials + */ + public static final TagKey ORE_RATES_SPARSE = forgeTag("ore_rates/sparse"); + public static final TagKey ORES_COAL = forgeTag("ores/coal"); + public static final TagKey ORES_COPPER = forgeTag("ores/copper"); + public static final TagKey ORES_DIAMOND = forgeTag("ores/diamond"); + public static final TagKey ORES_EMERALD = forgeTag("ores/emerald"); + public static final TagKey ORES_GOLD = forgeTag("ores/gold"); + public static final TagKey ORES_IRON = forgeTag("ores/iron"); + public static final TagKey ORES_LAPIS = forgeTag("ores/lapis"); + public static final TagKey ORES_REDSTONE = forgeTag("ores/redstone"); + /** + * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output + */ + public static final TagKey ORES_IN_GROUND_DEEPSLATE = forgeTag("ores_in_ground/deepslate"); + /** + * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output + */ + public static final TagKey ORES_IN_GROUND_NETHERRACK = forgeTag("ores_in_ground/netherrack"); + /** + * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output + */ + public static final TagKey ORES_IN_GROUND_STONE = forgeTag("ores_in_ground/stone"); - public static final TagKey DYES = tag("dyes"); + public static final TagKey SAND = forgeTag("sand"); + public static final TagKey SAND_COLORLESS = forgeTag("sand/colorless"); + public static final TagKey SAND_RED = forgeTag("sand/red"); + + public static final TagKey SEEDS = forgeTag("seeds"); + public static final TagKey SEEDS_BEETROOT = forgeTag("seeds/beetroot"); + public static final TagKey SEEDS_MELON = forgeTag("seeds/melon"); + public static final TagKey SEEDS_PUMPKIN = forgeTag("seeds/pumpkin"); + public static final TagKey SEEDS_WHEAT = forgeTag("seeds/wheat"); + + /** + * Controls what items can be consumed for enchanting such as Enchanting Tables. + * This tag defaults to {@link net.minecraft.world.item.Items#LAPIS_LAZULI} when not present in any datapacks, including forge client on vanilla server + */ + public static final TagKey ENCHANTING_FUELS = forgeTag("enchanting_fuels"); + + public static final TagKey STORAGE_BLOCKS_AMETHYST = forgeTag("storage_blocks/amethyst"); + public static final TagKey STORAGE_BLOCKS_QUARTZ = forgeTag("storage_blocks/quartz"); + + /** Deprecated for removal as misleading, because it also contained prismarine shards */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey DUSTS_PRISMARINE = forgeTag("dusts/prismarine"); + + /** + * Pies and other pie-like foods belong in this tag. + */ + public static final TagKey FOODS_PIE = forgeTag("foods/pie"); + //endregion + + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + public static final TagKey BARRELS = cTag("barrels"); + public static final TagKey BARRELS_WOODEN = cTag("barrels/wooden"); + public static final TagKey BOOKSHELVES = cTag("bookshelves"); + public static final TagKey BRICKS = cTag("bricks"); + public static final TagKey BRICKS_NORMAL = cTag("bricks/normal"); + public static final TagKey BRICKS_NETHER = cTag("bricks/nether"); + public static final TagKey BUCKETS = cTag("buckets"); + public static final TagKey BUCKETS_EMPTY = cTag("buckets/empty"); + /** + * Does not include entity water buckets. + * If checking for the fluid this bucket holds in code, please use {@link FluidBucketWrapper#getFluid} instead. + */ + public static final TagKey BUCKETS_WATER = cTag("buckets/water"); + /** + * If checking for the fluid this bucket holds in code, please use {@link FluidBucketWrapper#getFluid} instead. + */ + public static final TagKey BUCKETS_LAVA = cTag("buckets/lava"); + public static final TagKey BUCKETS_MILK = cTag("buckets/milk"); + public static final TagKey BUCKETS_POWDER_SNOW = cTag("buckets/powder_snow"); + public static final TagKey BUCKETS_ENTITY_WATER = cTag("buckets/entity_water"); + /** + * For blocks that are similar to amethyst where their budding block produces buds and cluster blocks + */ + public static final TagKey BUDDING_BLOCKS = cTag("budding_blocks"); + /** + * For blocks that are similar to amethyst where they have buddings forming from budding blocks + */ + public static final TagKey BUDS = cTag("buds"); + public static final TagKey CHAINS = cTag("chains"); + public static final TagKey CHESTS = cTag("chests"); + public static final TagKey CHESTS_WOODEN = cTag("chests/wooden"); + public static final TagKey COBBLESTONES = cTag("cobblestones"); + public static final TagKey CONCRETES = cTag("concretes"); + /** + * Block tag equivalent is {@link BlockTags#CONCRETE_POWDER} + */ + public static final TagKey CONCRETE_POWDERS = cTag("concrete_powders"); + /** + * For blocks that are similar to amethyst where they have clusters forming from budding blocks + */ + public static final TagKey CLUSTERS = cTag("clusters"); + /** + * For raw materials harvested from growable plants. Crop items can be edible like carrots or + * non-edible like wheat and cocoa beans. + */ + public static final TagKey CROPS = cTag("crops"); + public static final TagKey CROPS_BEETROOT = cTag("crops/beetroot"); + public static final TagKey CROPS_CACTUS = cTag("crops/cactus"); + public static final TagKey CROPS_CARROT = cTag("crops/carrot"); + public static final TagKey CROPS_COCOA_BEAN = cTag("crops/cocoa_bean"); + public static final TagKey CROPS_MELON = cTag("crops/melon"); + public static final TagKey CROPS_NETHER_WART = cTag("crops/nether_wart"); + public static final TagKey CROPS_POTATO = cTag("crops/potato"); + public static final TagKey CROPS_PUMPKIN = cTag("crops/pumpkin"); + public static final TagKey CROPS_SUGAR_CANE = cTag("crops/sugar_cane"); + public static final TagKey CROPS_WHEAT = cTag("crops/wheat"); + public static final TagKey DUSTS = cTag("dusts"); + public static final TagKey DUSTS_REDSTONE = cTag("dusts/redstone"); + public static final TagKey DUSTS_GLOWSTONE = cTag("dusts/glowstone"); + + /** + * Tag that holds all blocks and items that can be dyed a specific color. + * (Does not include color blending items like leather armor + * Use {@link net.minecraft.tags.ItemTags#DYEABLE} tag instead for color blending items) + */ + public static final TagKey DYED = cTag("dyed"); + public static final TagKey DYED_BLACK = cTag("dyed/black"); + public static final TagKey DYED_BLUE = cTag("dyed/blue"); + public static final TagKey DYED_BROWN = cTag("dyed/brown"); + public static final TagKey DYED_CYAN = cTag("dyed/cyan"); + public static final TagKey DYED_GRAY = cTag("dyed/gray"); + public static final TagKey DYED_GREEN = cTag("dyed/green"); + public static final TagKey DYED_LIGHT_BLUE = cTag("dyed/light_blue"); + public static final TagKey DYED_LIGHT_GRAY = cTag("dyed/light_gray"); + public static final TagKey DYED_LIME = cTag("dyed/lime"); + public static final TagKey DYED_MAGENTA = cTag("dyed/magenta"); + public static final TagKey DYED_ORANGE = cTag("dyed/orange"); + public static final TagKey DYED_PINK = cTag("dyed/pink"); + public static final TagKey DYED_PURPLE = cTag("dyed/purple"); + public static final TagKey DYED_RED = cTag("dyed/red"); + public static final TagKey DYED_WHITE = cTag("dyed/white"); + public static final TagKey DYED_YELLOW = cTag("dyed/yellow"); + + public static final TagKey DYES = cTag("dyes"); public static final TagKey DYES_BLACK = DyeColor.BLACK.getTag(); public static final TagKey DYES_RED = DyeColor.RED.getTag(); public static final TagKey DYES_GREEN = DyeColor.GREEN.getTag(); @@ -239,335 +612,869 @@ public class Tags public static final TagKey DYES_ORANGE = DyeColor.ORANGE.getTag(); public static final TagKey DYES_WHITE = DyeColor.WHITE.getTag(); - public static final TagKey EGGS = tag("eggs"); + public static final TagKey ENDER_PEARLS = cTag("ender_pearls"); /** - * This tag defaults to {@link net.minecraft.world.item.Items#LAPIS_LAZULI} when not present in any datapacks, including forge client on vanilla server + * For bonemeal-like items that can grow plants. */ - public static final TagKey ENCHANTING_FUELS = tag("enchanting_fuels"); - public static final TagKey END_STONES = tag("end_stones"); - public static final TagKey ENDER_PEARLS = tag("ender_pearls"); - public static final TagKey FEATHERS = tag("feathers"); - public static final TagKey FENCE_GATES = tag("fence_gates"); - public static final TagKey FENCE_GATES_WOODEN = tag("fence_gates/wooden"); - public static final TagKey FENCES = tag("fences"); - public static final TagKey FENCES_NETHER_BRICK = tag("fences/nether_brick"); - public static final TagKey FENCES_WOODEN = tag("fences/wooden"); - public static final TagKey GEMS = tag("gems"); - public static final TagKey GEMS_DIAMOND = tag("gems/diamond"); - public static final TagKey GEMS_EMERALD = tag("gems/emerald"); - public static final TagKey GEMS_AMETHYST = tag("gems/amethyst"); - public static final TagKey GEMS_LAPIS = tag("gems/lapis"); - public static final TagKey GEMS_PRISMARINE = tag("gems/prismarine"); - public static final TagKey GEMS_QUARTZ = tag("gems/quartz"); + public static final TagKey FERTILIZERS = cTag("fertilizers"); + public static final TagKey FOODS = cTag("foods"); + /** + * Apples and other foods that are considered fruits in the culinary field belong in this tag. + * Cherries would go here as they are considered a "stone fruit" within culinary fields. + */ + public static final TagKey FOODS_FRUIT = cTag("foods/fruit"); + /** + * Tomatoes and other foods that are considered vegetables in the culinary field belong in this tag. + */ + public static final TagKey FOODS_VEGETABLE = cTag("foods/vegetable"); + /** + * Strawberries, raspberries, and other berry foods belong in this tag. + * Cherries would NOT go here as they are considered a "stone fruit" within culinary fields. + */ + public static final TagKey FOODS_BERRY = cTag("foods/berry"); + public static final TagKey FOODS_BREAD = cTag("foods/bread"); + public static final TagKey FOODS_COOKIE = cTag("foods/cookie"); + public static final TagKey FOODS_RAW_MEAT = cTag("foods/raw_meat"); + public static final TagKey FOODS_COOKED_MEAT = cTag("foods/cooked_meat"); + public static final TagKey FOODS_RAW_FISH = cTag("foods/raw_fish"); + public static final TagKey FOODS_COOKED_FISH = cTag("foods/cooked_fish"); + /** + * Soups, stews, and other liquid food in bowls belongs in this tag. + */ + public static final TagKey FOODS_SOUP = cTag("foods/soup"); + /** + * Sweets and candies like lollipops or chocolate belong in this tag. + */ + public static final TagKey FOODS_CANDY = cTag("foods/candy"); + /** + * Any gold-based foods would go in this tag. Such as Golden Apples or Glistering Melon Slice. + */ + public static final TagKey FOODS_GOLDEN = cTag("foods/golden"); + /** + * Foods like cake that can be eaten when placed in the world belong in this tag. + */ + public static final TagKey FOODS_EDIBLE_WHEN_PLACED = cTag("foods/edible_when_placed"); + /** + * For foods that inflict food poisoning-like effects. + * Examples are Rotten Flesh's Hunger or Pufferfish's Nausea, or Poisonous Potato's Poison. + */ + public static final TagKey FOODS_FOOD_POISONING = cTag("foods/food_poisoning"); + /** + * All foods edible by animals excluding poisonous foods. + * (Does not include {@link ItemTags#PARROT_POISONOUS_FOOD}) + */ + public static final TagKey ANIMAL_FOODS = cTag("animal_foods"); + public static final TagKey GEMS = cTag("gems"); + public static final TagKey GEMS_DIAMOND = cTag("gems/diamond"); + public static final TagKey GEMS_EMERALD = cTag("gems/emerald"); + public static final TagKey GEMS_AMETHYST = cTag("gems/amethyst"); + public static final TagKey GEMS_LAPIS = cTag("gems/lapis"); + public static final TagKey GEMS_PRISMARINE = cTag("gems/prismarine"); + public static final TagKey GEMS_QUARTZ = cTag("gems/quartz"); - public static final TagKey GLASS = tag("glass"); - public static final TagKey GLASS_BLACK = tag("glass/black"); - public static final TagKey GLASS_BLUE = tag("glass/blue"); - public static final TagKey GLASS_BROWN = tag("glass/brown"); - public static final TagKey GLASS_COLORLESS = tag("glass/colorless"); - public static final TagKey GLASS_CYAN = tag("glass/cyan"); - public static final TagKey GLASS_GRAY = tag("glass/gray"); - public static final TagKey GLASS_GREEN = tag("glass/green"); - public static final TagKey GLASS_LIGHT_BLUE = tag("glass/light_blue"); - public static final TagKey GLASS_LIGHT_GRAY = tag("glass/light_gray"); - public static final TagKey GLASS_LIME = tag("glass/lime"); - public static final TagKey GLASS_MAGENTA = tag("glass/magenta"); - public static final TagKey GLASS_ORANGE = tag("glass/orange"); - public static final TagKey GLASS_PINK = tag("glass/pink"); - public static final TagKey GLASS_PURPLE = tag("glass/purple"); - public static final TagKey GLASS_RED = tag("glass/red"); + public static final TagKey GLASS_BLOCKS = cTag("glass_blocks"); + public static final TagKey GLASS_BLOCKS_COLORLESS = cTag("glass_blocks/colorless"); /** - * Glass which is made from sand and only minor additional ingredients like dyes + * Glass which is made from cheap resources like sand and only minor additional ingredients like dyes */ - public static final TagKey GLASS_SILICA = tag("glass/silica"); - public static final TagKey GLASS_TINTED = tag("glass/tinted"); - public static final TagKey GLASS_WHITE = tag("glass/white"); - public static final TagKey GLASS_YELLOW = tag("glass/yellow"); + public static final TagKey GLASS_BLOCKS_CHEAP = cTag("glass_blocks/cheap"); + public static final TagKey GLASS_BLOCKS_TINTED = cTag("glass_blocks/tinted"); - public static final TagKey GLASS_PANES = tag("glass_panes"); - public static final TagKey GLASS_PANES_BLACK = tag("glass_panes/black"); - public static final TagKey GLASS_PANES_BLUE = tag("glass_panes/blue"); - public static final TagKey GLASS_PANES_BROWN = tag("glass_panes/brown"); - public static final TagKey GLASS_PANES_COLORLESS = tag("glass_panes/colorless"); - public static final TagKey GLASS_PANES_CYAN = tag("glass_panes/cyan"); - public static final TagKey GLASS_PANES_GRAY = tag("glass_panes/gray"); - public static final TagKey GLASS_PANES_GREEN = tag("glass_panes/green"); - public static final TagKey GLASS_PANES_LIGHT_BLUE = tag("glass_panes/light_blue"); - public static final TagKey GLASS_PANES_LIGHT_GRAY = tag("glass_panes/light_gray"); - public static final TagKey GLASS_PANES_LIME = tag("glass_panes/lime"); - public static final TagKey GLASS_PANES_MAGENTA = tag("glass_panes/magenta"); - public static final TagKey GLASS_PANES_ORANGE = tag("glass_panes/orange"); - public static final TagKey GLASS_PANES_PINK = tag("glass_panes/pink"); - public static final TagKey GLASS_PANES_PURPLE = tag("glass_panes/purple"); - public static final TagKey GLASS_PANES_RED = tag("glass_panes/red"); - public static final TagKey GLASS_PANES_WHITE = tag("glass_panes/white"); - public static final TagKey GLASS_PANES_YELLOW = tag("glass_panes/yellow"); + public static final TagKey GLASS_PANES = cTag("glass_panes"); + public static final TagKey GLASS_PANES_COLORLESS = cTag("glass_panes/colorless"); + public static final TagKey GLAZED_TERRACOTTAS = cTag("glazed_terracottas"); - public static final TagKey GRAVEL = tag("gravel"); - public static final TagKey GUNPOWDER = tag("gunpowder"); - public static final TagKey HEADS = tag("heads"); - public static final TagKey INGOTS = tag("ingots"); - public static final TagKey INGOTS_BRICK = tag("ingots/brick"); - public static final TagKey INGOTS_COPPER = tag("ingots/copper"); - public static final TagKey INGOTS_GOLD = tag("ingots/gold"); - public static final TagKey INGOTS_IRON = tag("ingots/iron"); - public static final TagKey INGOTS_NETHERITE = tag("ingots/netherite"); - public static final TagKey INGOTS_NETHER_BRICK = tag("ingots/nether_brick"); - public static final TagKey LEATHER = tag("leather"); - public static final TagKey MUSHROOMS = tag("mushrooms"); - public static final TagKey NETHER_STARS = tag("nether_stars"); - public static final TagKey NETHERRACK = tag("netherrack"); - public static final TagKey NUGGETS = tag("nuggets"); - public static final TagKey NUGGETS_GOLD = tag("nuggets/gold"); - public static final TagKey NUGGETS_IRON = tag("nuggets/iron"); - public static final TagKey OBSIDIAN = tag("obsidian"); /** - * Blocks which are often replaced by deepslate ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_DEEPSLATE}, during world generation + * Tag that holds all items that recipe viewers should not show to users. */ - public static final TagKey ORE_BEARING_GROUND_DEEPSLATE = tag("ore_bearing_ground/deepslate"); + public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = cTag("hidden_from_recipe_viewers"); + public static final TagKey OBSIDIANS = cTag("obsidians"); /** - * Blocks which are often replaced by netherrack ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_NETHERRACK}, during world generation + * For common obsidian that has no special quirks or behaviours - ideal for recipe use. + * Crying Obsidian, for example, is a light block and harder to obtain. So it gets its own tag instead of being under normal tag. */ - public static final TagKey ORE_BEARING_GROUND_NETHERRACK = tag("ore_bearing_ground/netherrack"); + public static final TagKey OBSIDIANS_NORMAL = cTag("obsidians/normal"); + public static final TagKey OBSIDIANS_CRYING = cTag("obsidians/crying"); + public static final TagKey INGOTS = cTag("ingots"); + public static final TagKey INGOTS_COPPER = cTag("ingots/copper"); + public static final TagKey INGOTS_GOLD = cTag("ingots/gold"); + public static final TagKey INGOTS_IRON = cTag("ingots/iron"); + public static final TagKey INGOTS_NETHERITE = cTag("ingots/netherite"); + public static final TagKey LEATHERS = cTag("leathers"); /** - * Blocks which are often replaced by stone ores, i.e. the ores in the tag {@link #ORES_IN_GROUND_STONE}, during world generation + * For music disc-like materials to be used in recipes. + * A pancake with a JUKEBOX_PLAYABLE component attached to play in Jukeboxes as an Easter Egg is not a music disc and would not go in this tag. */ - public static final TagKey ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); + public static final TagKey MUSIC_DISCS = cTag("music_discs"); + public static final TagKey NUGGETS = cTag("nuggets"); + public static final TagKey NUGGETS_GOLD = cTag("nuggets/gold"); + public static final TagKey NUGGETS_IRON = cTag("nuggets/iron"); + public static final TagKey ORES = cTag("ores"); + public static final TagKey ORES_NETHERITE_SCRAP = cTag("ores/netherite_scrap"); + public static final TagKey ORES_QUARTZ = cTag("ores/quartz"); + public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = cTag("player_workstations/crafting_tables"); + public static final TagKey PLAYER_WORKSTATIONS_FURNACES = cTag("player_workstations/furnaces"); + public static final TagKey RAW_MATERIALS = cTag("raw_materials"); + public static final TagKey RAW_MATERIALS_COPPER = cTag("raw_materials/copper"); + public static final TagKey RAW_MATERIALS_GOLD = cTag("raw_materials/gold"); + public static final TagKey RAW_MATERIALS_IRON = cTag("raw_materials/iron"); /** - * Ores which on average result in more than one resource worth of materials + * For rod-like materials to be used in recipes. */ - public static final TagKey ORE_RATES_DENSE = tag("ore_rates/dense"); + public static final TagKey RODS = cTag("rods"); + public static final TagKey RODS_BLAZE = cTag("rods/blaze"); + public static final TagKey RODS_BREEZE = cTag("rods/breeze"); /** - * Ores which on average result in one resource worth of materials + * For stick-like materials to be used in recipes. + * One example is a mod adds stick variants such as Spruce Sticks but would like stick recipes to be able to use it. */ - public static final TagKey ORE_RATES_SINGULAR = tag("ore_rates/singular"); - /** - * Ores which on average result in less than one resource worth of materials - */ - public static final TagKey ORE_RATES_SPARSE = tag("ore_rates/sparse"); - public static final TagKey ORES = tag("ores"); - public static final TagKey ORES_COAL = tag("ores/coal"); - public static final TagKey ORES_COPPER = tag("ores/copper"); - public static final TagKey ORES_DIAMOND = tag("ores/diamond"); - public static final TagKey ORES_EMERALD = tag("ores/emerald"); - public static final TagKey ORES_GOLD = tag("ores/gold"); - public static final TagKey ORES_IRON = tag("ores/iron"); - public static final TagKey ORES_LAPIS = tag("ores/lapis"); - public static final TagKey ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap"); - public static final TagKey ORES_QUARTZ = tag("ores/quartz"); - public static final TagKey ORES_REDSTONE = tag("ores/redstone"); - /** - * Ores in deepslate (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_DEEPSLATE}) which could logically use deepslate as recipe input or output - */ - public static final TagKey ORES_IN_GROUND_DEEPSLATE = tag("ores_in_ground/deepslate"); - /** - * Ores in netherrack (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_NETHERRACK}) which could logically use netherrack as recipe input or output - */ - public static final TagKey ORES_IN_GROUND_NETHERRACK = tag("ores_in_ground/netherrack"); - /** - * Ores in stone (or in equivalent blocks in the tag {@link #ORE_BEARING_GROUND_STONE}) which could logically use stone as recipe input or output - */ - public static final TagKey ORES_IN_GROUND_STONE = tag("ores_in_ground/stone"); - public static final TagKey RAW_MATERIALS = tag("raw_materials"); - public static final TagKey RAW_MATERIALS_COPPER = tag("raw_materials/copper"); - public static final TagKey RAW_MATERIALS_GOLD = tag("raw_materials/gold"); - public static final TagKey RAW_MATERIALS_IRON = tag("raw_materials/iron"); - public static final TagKey RODS = tag("rods"); - public static final TagKey RODS_BLAZE = tag("rods/blaze"); - public static final TagKey RODS_WOODEN = tag("rods/wooden"); + public static final TagKey RODS_WOODEN = cTag("rods/wooden"); + public static final TagKey ROPES = cTag("ropes"); - public static final TagKey SAND = tag("sand"); - public static final TagKey SAND_COLORLESS = tag("sand/colorless"); - public static final TagKey SAND_RED = tag("sand/red"); + public static final TagKey SANDSTONE_BLOCKS = cTag("sandstone/blocks"); + public static final TagKey SANDSTONE_SLABS = cTag("sandstone/slabs"); + public static final TagKey SANDSTONE_STAIRS = cTag("sandstone/stairs"); + public static final TagKey SANDSTONE_RED_BLOCKS = cTag("sandstone/red_blocks"); + public static final TagKey SANDSTONE_RED_SLABS = cTag("sandstone/red_slabs"); + public static final TagKey SANDSTONE_RED_STAIRS = cTag("sandstone/red_stairs"); + public static final TagKey SANDSTONE_UNCOLORED_BLOCKS = cTag("sandstone/uncolored_blocks"); + public static final TagKey SANDSTONE_UNCOLORED_SLABS = cTag("sandstone/uncolored_slabs"); + public static final TagKey SANDSTONE_UNCOLORED_STAIRS = cTag("sandstone/uncolored_stairs"); - public static final TagKey SANDSTONE = tag("sandstone"); - public static final TagKey SEEDS = tag("seeds"); - public static final TagKey SEEDS_BEETROOT = tag("seeds/beetroot"); - public static final TagKey SEEDS_MELON = tag("seeds/melon"); - public static final TagKey SEEDS_PUMPKIN = tag("seeds/pumpkin"); - public static final TagKey SEEDS_WHEAT = tag("seeds/wheat"); - public static final TagKey SHEARS = tag("shears"); - public static final TagKey SLIMEBALLS = tag("slimeballs"); - public static final TagKey STAINED_GLASS = tag("stained_glass"); - public static final TagKey STAINED_GLASS_PANES = tag("stained_glass_panes"); - public static final TagKey STONE = tag("stone"); - public static final TagKey STORAGE_BLOCKS = tag("storage_blocks"); - public static final TagKey STORAGE_BLOCKS_AMETHYST = tag("storage_blocks/amethyst"); - public static final TagKey STORAGE_BLOCKS_COAL = tag("storage_blocks/coal"); - public static final TagKey STORAGE_BLOCKS_COPPER = tag("storage_blocks/copper"); - public static final TagKey STORAGE_BLOCKS_DIAMOND = tag("storage_blocks/diamond"); - public static final TagKey STORAGE_BLOCKS_EMERALD = tag("storage_blocks/emerald"); - public static final TagKey STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold"); - public static final TagKey STORAGE_BLOCKS_IRON = tag("storage_blocks/iron"); - public static final TagKey STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis"); - public static final TagKey STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite"); - public static final TagKey STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz"); - public static final TagKey STORAGE_BLOCKS_RAW_COPPER = tag("storage_blocks/raw_copper"); - public static final TagKey STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold"); - public static final TagKey STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron"); - public static final TagKey STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); - public static final TagKey STRING = tag("string"); /** - * A tag containing all existing tools. - * - * Note: This tag is not an alternative or a substitute to {@link net.minecraftforge.common.ToolActions}. - * - * @see net.minecraftforge.common.ToolAction - * @see net.minecraftforge.common.ToolActions + * Block tag equivalent is {@link BlockTags#SHULKER_BOXES} */ - public static final TagKey TOOLS = tag("tools"); + public static final TagKey SHULKER_BOXES = cTag("shulker_boxes"); + public static final TagKey SLIME_BALLS = cTag("slime_balls"); /** - * A tag containing all existing shields. - * - * Note: This tag is not an alternative or a substitute to {@link net.minecraftforge.common.ToolActions}. - * - * @see net.minecraftforge.common.ToolAction - * @see net.minecraftforge.common.ToolActions + * Natural stone-like blocks that can be used as a base ingredient in recipes that takes stone. */ - public static final TagKey TOOLS_SHIELDS = tag("tools/shields"); + public static final TagKey STONES = cTag("stones"); /** - * A tag containing all existing bows. - * - * Note: This tag is not an alternative or a substitute to {@link net.minecraftforge.common.ToolActions}. - * - * @see net.minecraftforge.common.ToolAction - * @see net.minecraftforge.common.ToolActions + * A storage block is generally a block that has a recipe to craft a bulk of 1 kind of resource to a block + * and has a mirror recipe to reverse the crafting with no loss in resources. + *

+ * Honey Block is special in that the reversing recipe is not a perfect mirror of the crafting recipe + * and so, it is considered a special case and not given a storage block tag. */ - public static final TagKey TOOLS_BOWS = tag("tools/bows"); - /** - * A tag containing all existing crossbows. - * - * Note: This tag is not an alternative or a substitute to {@link net.minecraftforge.common.ToolActions}. - * - * @see net.minecraftforge.common.ToolAction - * @see net.minecraftforge.common.ToolActions - */ - public static final TagKey TOOLS_CROSSBOWS = tag("tools/crossbows"); - /** - * A tag containing all existing fishing rods. - * - * Note: This tag is not an alternative or a substitute to {@link net.minecraftforge.common.ToolActions}. - * - * @see net.minecraftforge.common.ToolAction - * @see net.minecraftforge.common.ToolActions - */ - public static final TagKey TOOLS_FISHING_RODS = tag("tools/fishing_rods"); - /** - * A tag containing all existing tridents. - * - * Note: This tag is not an alternative or a substitute to {@link net.minecraftforge.common.ToolActions}. - * - * @see net.minecraftforge.common.ToolAction - * @see net.minecraftforge.common.ToolActions - */ - public static final TagKey TOOLS_TRIDENTS = tag("tools/tridents"); - /** - * A tag containing all existing armors. - */ - public static final TagKey ARMORS = tag("armors"); - /** - * A tag containing all existing helmets. - */ - public static final TagKey ARMORS_HELMETS = tag("armors/helmets"); - /** - * A tag containing all chestplates. - */ - public static final TagKey ARMORS_CHESTPLATES = tag("armors/chestplates"); - /** - * A tag containing all existing leggings. - */ - public static final TagKey ARMORS_LEGGINGS = tag("armors/leggings"); - /** - * A tag containing all existing boots. - */ - public static final TagKey ARMORS_BOOTS = tag("armors/boots"); + public static final TagKey STORAGE_BLOCKS = cTag("storage_blocks"); + public static final TagKey STORAGE_BLOCKS_BONE_MEAL = cTag("storage_blocks/bone_meal"); + public static final TagKey STORAGE_BLOCKS_COAL = cTag("storage_blocks/coal"); + public static final TagKey STORAGE_BLOCKS_COPPER = cTag("storage_blocks/copper"); + public static final TagKey STORAGE_BLOCKS_DIAMOND = cTag("storage_blocks/diamond"); + public static final TagKey STORAGE_BLOCKS_DRIED_KELP = cTag("storage_blocks/dried_kelp"); + public static final TagKey STORAGE_BLOCKS_EMERALD = cTag("storage_blocks/emerald"); + public static final TagKey STORAGE_BLOCKS_GOLD = cTag("storage_blocks/gold"); + public static final TagKey STORAGE_BLOCKS_IRON = cTag("storage_blocks/iron"); + public static final TagKey STORAGE_BLOCKS_LAPIS = cTag("storage_blocks/lapis"); + public static final TagKey STORAGE_BLOCKS_NETHERITE = cTag("storage_blocks/netherite"); + public static final TagKey STORAGE_BLOCKS_RAW_COPPER = cTag("storage_blocks/raw_copper"); + public static final TagKey STORAGE_BLOCKS_RAW_GOLD = cTag("storage_blocks/raw_gold"); + public static final TagKey STORAGE_BLOCKS_RAW_IRON = cTag("storage_blocks/raw_iron"); + public static final TagKey STORAGE_BLOCKS_REDSTONE = cTag("storage_blocks/redstone"); + public static final TagKey STORAGE_BLOCKS_SLIME = cTag("storage_blocks/slime"); + public static final TagKey STORAGE_BLOCKS_WHEAT = cTag("storage_blocks/wheat"); + public static final TagKey STRINGS = cTag("strings"); + public static final TagKey VILLAGER_JOB_SITES = cTag("villager_job_sites"); - private static TagKey tag(String name) - { + // Tools and Armors + /** + * A tag containing all existing tools. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS = cTag("tools"); + /** + * A tag containing all existing shields. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_SHIELD = cTag("tools/shield"); + /** + * A tag containing all existing bows. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_BOW = cTag("tools/bow"); + /** + * A tag containing all existing crossbows. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_CROSSBOW = cTag("tools/crossbow"); + /** + * A tag containing all existing fishing rods. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_FISHING_ROD = cTag("tools/fishing_rod"); + /** + * A tag containing all existing spears. Other tools such as throwing knives or boomerangs + * should not be put into this tag and should be put into their own tool tags. + * Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_SPEAR = cTag("tools/spear"); + /** + * A tag containing all existing shears. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_SHEAR = cTag("tools/shear"); + /** + * A tag containing all existing brushes. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_BRUSH = cTag("tools/brush"); + /** + * A tag containing all existing fire starting tools such as Flint and Steel. + * Fire Charge is not a tool (no durability) and thus, does not go in this tag. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_IGNITER = cTag("tools/igniter"); + /** + * A tag containing all existing maces. Do not use this tag for determining a tool's behavior. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey TOOLS_MACE = cTag("tools/mace"); + /** + * A tag containing melee-based weapons for recipes and loot tables. + * Tools are considered melee if they are intentionally intended to be used for melee attack as a primary purpose. + * (In other words, Pickaxes are not melee weapons as they are not intended to be a weapon as a primary purpose) + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey MELEE_WEAPON_TOOLS = cTag("tools/melee_weapon"); + /** + * A tag containing ranged-based weapons for recipes and loot tables. + * Tools are considered ranged if they can damage entities beyond the weapon's and player's melee attack range. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey RANGED_WEAPON_TOOLS = cTag("tools/ranged_weapon"); + /** + * A tag containing mining-based tools for recipes and loot tables. + * Do not use this tag for determining a tool's behavior in-code. + * Please use {@link ToolActions} instead for what action a tool can do. + * + * @see ToolAction + * @see ToolActions + */ + public static final TagKey MINING_TOOL_TOOLS = cTag("tools/mining_tool"); + /** + * Collects the 4 vanilla armor tags into one parent collection for ease. + */ + public static final TagKey ARMORS = cTag("armors"); + /** + * Collects the many enchantable tags into one parent collection for ease. + */ + public static final TagKey ENCHANTABLES = cTag("enchantables"); + //endregion + + //region Redirect fields for improved backward-compatibility + // TODO: Remove backwards compat redirect fields in 1.22 + /** @deprecated Use {@link #COBBLESTONES} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey COBBLESTONE = COBBLESTONES; + /** @deprecated Use {@link #LEATHERS} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey LEATHER = LEATHERS; + /** @deprecated Use {@link #SANDSTONE_BLOCKS} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey SANDSTONE = SANDSTONE_BLOCKS; + /** @deprecated Use {@link #STONES} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey STONE = STONES; + /** @deprecated Use {@link #TOOLS_SHEAR} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey SHEARS = TOOLS_SHEAR; + /** @deprecated Use {@link #TOOLS_SPEAR} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey TOOLS_TRIDENTS = TOOLS_SPEAR; + /** @deprecated Use {@link #STRINGS} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey STRING = STRINGS; + //endregion + + //region Forge tags that now map to combining multiple `c` tags + // Kept for binary compatibility + // TODO: Remove these in 1.22 + /** @deprecated Use {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS = forgeTag("glass"); + /** @deprecated Use {@link #DYED_BLACK} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_BLACK = forgeTag("glass/black"); + /** @deprecated Use {@link #DYED_BLUE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_BLUE = forgeTag("glass/blue"); + /** @deprecated Use {@link #DYED_BROWN} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_BROWN = forgeTag("glass/brown"); + /** @deprecated Use {@link #GLASS_BLOCKS_COLORLESS} and/or {@link #GLASS_PANES_COLORLESS} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_COLORLESS = forgeTag("glass/colorless"); + /** @deprecated Use {@link #DYED_CYAN} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_CYAN = forgeTag("glass/cyan"); + /** @deprecated Use {@link #DYED_GRAY} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_GRAY = forgeTag("glass/gray"); + /** @deprecated Use {@link #DYED_GREEN} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_GREEN = forgeTag("glass/green"); + /** @deprecated Use {@link #DYED_LIGHT_BLUE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_LIGHT_BLUE = forgeTag("glass/light_blue"); + /** @deprecated Use {@link #DYED_LIGHT_GRAY} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_LIGHT_GRAY = forgeTag("glass/light_gray"); + /** @deprecated Use {@link #DYED_LIME} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_LIME = forgeTag("glass/lime"); + /** @deprecated Use {@link #DYED_MAGENTA} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_MAGENTA = forgeTag("glass/magenta"); + /** @deprecated Use {@link #DYED_ORANGE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_ORANGE = forgeTag("glass/orange"); + /** @deprecated Use {@link #DYED_PINK} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PINK = forgeTag("glass/pink"); + /** @deprecated Use {@link #DYED_PURPLE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PURPLE = forgeTag("glass/purple"); + /** @deprecated Use {@link #DYED_RED} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_RED = forgeTag("glass/red"); + /** @deprecated Use {@link #DYED_WHITE} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_WHITE = forgeTag("glass/white"); + /** @deprecated Use {@link #DYED_YELLOW} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_YELLOW = forgeTag("glass/yellow"); + /** @deprecated Use {@link #DYED} combined with {@link #GLASS_BLOCKS} and/or {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey STAINED_GLASS = forgeTag("stained_glass"); + + /** @deprecated Use {@link #DYED_BLACK} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_BLACK = forgeTag("glass_panes/black"); + /** @deprecated Use {@link #DYED_BLUE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_BLUE = forgeTag("glass_panes/blue"); + /** @deprecated Use {@link #DYED_BROWN} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_BROWN = forgeTag("glass_panes/brown"); + /** @deprecated Use {@link #DYED_CYAN} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_CYAN = forgeTag("glass_panes/cyan"); + /** @deprecated Use {@link #DYED_GRAY} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_GRAY = forgeTag("glass_panes/gray"); + /** @deprecated Use {@link #DYED_GREEN} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_GREEN = forgeTag("glass_panes/green"); + /** @deprecated Use {@link #DYED_LIGHT_BLUE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_LIGHT_BLUE = forgeTag("glass_panes/light_blue"); + /** @deprecated Use {@link #DYED_LIGHT_GRAY} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_LIGHT_GRAY = forgeTag("glass_panes/light_gray"); + /** @deprecated Use {@link #DYED_LIME} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_LIME = forgeTag("glass_panes/lime"); + /** @deprecated Use {@link #DYED_MAGENTA} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_MAGENTA = forgeTag("glass_panes/magenta"); + /** @deprecated Use {@link #DYED_ORANGE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_ORANGE = forgeTag("glass_panes/orange"); + /** @deprecated Use {@link #DYED_PINK} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_PINK = forgeTag("glass_panes/pink"); + /** @deprecated Use {@link #DYED_PURPLE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_PURPLE = forgeTag("glass_panes/purple"); + /** @deprecated Use {@link #DYED_RED} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_RED = forgeTag("glass_panes/red"); + /** @deprecated Use {@link #DYED_WHITE} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_WHITE = forgeTag("glass_panes/white"); + /** @deprecated Use {@link #DYED_YELLOW} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey GLASS_PANES_YELLOW = forgeTag("glass_panes/yellow"); + /** @deprecated Use {@link #DYED} combined with {@link #GLASS_PANES} */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey STAINED_GLASS_PANES = forgeTag("stained_glass_panes"); + + /** @deprecated Use the Vanilla tag {@link ItemTags#HEAD_ARMOR} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey ARMORS_HELMETS = forgeTag("armors/helmets"); + /** @deprecated Use the Vanilla tag {@link ItemTags#CHEST_ARMOR} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey ARMORS_CHESTPLATES = forgeTag("armors/chestplates"); + /** @deprecated Use the Vanilla tag {@link ItemTags#LEG_ARMOR} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey ARMORS_LEGGINGS = forgeTag("armors/leggings"); + /** @deprecated Use the Vanilla tag {@link ItemTags#FOOT_ARMOR} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey ARMORS_BOOTS = forgeTag("armors/boots"); + //endregion + + private static TagKey cTag(String name) { + return ItemTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); + } + + private static TagKey forgeTag(String name) { return ItemTags.create(ResourceLocation.fromNamespaceAndPath("forge", name)); } } - public static class Fluids - { + public static class Fluids { private static void init() {} - /** - * Holds all fluids related to milk. - */ - public static final TagKey MILK = tag("milk"); + //region `forge` tags for Forge-specific tags /** * Holds all fluids that are gaseous at room temperature. */ - public static final TagKey GASEOUS = tag("gaseous"); + public static final TagKey GASEOUS = forgeTag("gaseous"); + /** + * Holds all fluids related to potions. The effects of the potion fluid should be read from NBT. + * The effects and color of the potion fluid should be read from {@link net.minecraft.core.component.DataComponents#POTION_CONTENTS} + * component that people should be attaching to the fluidstack of this fluid.

+ * (Standard unit for potions is 250mb per bottle) + */ + public static final TagKey POTION = forgeTag("potion"); + /** + * Holds all fluids related to Suspicious Stew. + * The effects of the suspicious stew fluid should be read from {@link net.minecraft.core.component.DataComponents#SUSPICIOUS_STEW_EFFECTS} + * component that people should be attaching to the fluidstack of this fluid.

+ * (Standard unit for suspicious stew is 250mb per bowl) + */ + public static final TagKey SUSPICIOUS_STEW = forgeTag("suspicious_stew"); + /** + * Holds all fluids related to Mushroom Stew.

+ * (Standard unit for mushroom stew is 250mb per bowl) + */ + public static final TagKey MUSHROOM_STEW = forgeTag("mushroom_stew"); + /** + * Holds all fluids related to Rabbit Stew.

+ * (Standard unit for rabbit stew is 250mb per bowl) + */ + public static final TagKey RABBIT_STEW = forgeTag("rabbit_stew"); + /** + * Holds all fluids related to Beetroot Soup.

+ * (Standard unit for beetroot soup is 250mb per bowl) + */ + public static final TagKey BEETROOT_SOUP = forgeTag("beetroot_soup"); + //endregion - private static TagKey tag(String name) - { + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + /** + * Holds all fluids related to water. + * This tag is done to help out multi-loader mods/datapacks where the vanilla water tag has attached behaviors outside Forge. + */ + public static final TagKey WATER = cTag("water"); + /** + * Holds all fluids related to lava. + * This tag is done to help out multi-loader mods/datapacks where the vanilla lava tag has attached behaviors outside Forge. + */ + public static final TagKey LAVA = cTag("lava"); + /** + * Holds all fluids related to milk. + */ + public static final TagKey MILK = cTag("milk"); + /** + * Holds all fluids related to honey.

+ * (Standard unit for honey bottle is 250mb per bottle) + */ + public static final TagKey HONEY = cTag("honey"); + /** + * Tag that holds all fluids that recipe viewers should not show to users. + */ + public static final TagKey HIDDEN_FROM_RECIPE_VIEWERS = cTag("hidden_from_recipe_viewers"); + //endregion + + private static TagKey cTag(String name) { + return FluidTags.create(ResourceLocation.fromNamespaceAndPath("c", name)); + } + + private static TagKey forgeTag(String name) { return FluidTags.create(ResourceLocation.fromNamespaceAndPath("forge", name)); } } - public static class Biomes - { + public static class Enchantments { private static void init() {} - public static final TagKey IS_HOT = tag("is_hot"); - public static final TagKey IS_HOT_OVERWORLD = tag("is_hot/overworld"); - public static final TagKey IS_HOT_NETHER = tag("is_hot/nether"); - public static final TagKey IS_HOT_END = tag("is_hot/end"); + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + /** + * A tag containing enchantments that increase the amount or + * quality of drops from blocks, such as {@link net.minecraft.world.item.enchantment.Enchantments#FORTUNE}. + */ + public static final TagKey INCREASE_BLOCK_DROPS = cTag("increase_block_drops"); + /** + * A tag containing enchantments that increase the amount or + * quality of drops from entities, such as {@link net.minecraft.world.item.enchantment.Enchantments#LOOTING}. + */ + public static final TagKey INCREASE_ENTITY_DROPS = cTag("increase_entity_drops"); + /** + * For enchantments that increase the damage dealt by an item. + */ + public static final TagKey WEAPON_DAMAGE_ENHANCEMENTS = cTag("weapon_damage_enhancements"); + /** + * For enchantments that increase movement speed for entity wearing armor enchanted with it. + */ + public static final TagKey ENTITY_SPEED_ENHANCEMENTS = cTag("entity_speed_enhancements"); + /** + * For enchantments that applies movement-based benefits unrelated to speed for the entity wearing armor enchanted with it. + * Example: Reducing falling speeds ({@link net.minecraft.world.item.enchantment.Enchantments#FEATHER_FALLING}) or allowing walking on water ({@link net.minecraft.world.item.enchantment.Enchantments#FROST_WALKER}) + */ + public static final TagKey ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS = cTag("entity_auxiliary_movement_enhancements"); + /** + * For enchantments that decrease damage taken or otherwise benefit, in regard to damage, the entity wearing armor enchanted with it. + */ + public static final TagKey ENTITY_DEFENSE_ENHANCEMENTS = cTag("entity_defense_enhancements"); + //endregion - public static final TagKey IS_COLD = tag("is_cold"); - public static final TagKey IS_COLD_OVERWORLD = tag("is_cold/overworld"); - public static final TagKey IS_COLD_NETHER = tag("is_cold/nether"); - public static final TagKey IS_COLD_END = tag("is_cold/end"); + private static TagKey cTag(String name) { + return TagKey.create(Registries.ENCHANTMENT, ResourceLocation.fromNamespaceAndPath("c", name)); + } + } - public static final TagKey IS_SPARSE = tag("is_sparse"); - public static final TagKey IS_SPARSE_OVERWORLD = tag("is_sparse/overworld"); - public static final TagKey IS_SPARSE_NETHER = tag("is_sparse/nether"); - public static final TagKey IS_SPARSE_END = tag("is_sparse/end"); - public static final TagKey IS_DENSE = tag("is_dense"); - public static final TagKey IS_DENSE_OVERWORLD = tag("is_dense/overworld"); - public static final TagKey IS_DENSE_NETHER = tag("is_dense/nether"); - public static final TagKey IS_DENSE_END = tag("is_dense/end"); + public static class Biomes { + private static void init() {} - public static final TagKey IS_WET = tag("is_wet"); - public static final TagKey IS_WET_OVERWORLD = tag("is_wet/overworld"); - public static final TagKey IS_WET_NETHER = tag("is_wet/nether"); - public static final TagKey IS_WET_END = tag("is_wet/end"); - public static final TagKey IS_DRY = tag("is_dry"); - public static final TagKey IS_DRY_OVERWORLD = tag("is_dry/overworld"); - public static final TagKey IS_DRY_NETHER = tag("is_dry/nether"); - public static final TagKey IS_DRY_END = tag("is_dry/end"); + //region `forge` tags for Forge-specific tags + public static final TagKey IS_COLD_NETHER = forgeTag("is_cold/nether"); - public static final TagKey IS_CONIFEROUS = tag("is_coniferous"); + /** + * Biomes in the Nether that have sparse vegetation. + */ + public static final TagKey IS_SPARSE_NETHER = forgeTag("is_sparse/nether"); + /** + * Biomes in the End that have sparse vegetation. + */ + public static final TagKey IS_SPARSE_END = forgeTag("is_sparse/end"); + /** + * Biomes in the Nether that have dense vegetation. + */ + public static final TagKey IS_DENSE_NETHER = forgeTag("is_dense/nether"); + /** + * Biomes in the End that have dense vegetation. + */ + public static final TagKey IS_DENSE_END = forgeTag("is_dense/end"); - public static final TagKey IS_SPOOKY = tag("is_spooky"); - public static final TagKey IS_DEAD = tag("is_dead"); - public static final TagKey IS_LUSH = tag("is_lush"); - public static final TagKey IS_MUSHROOM = tag("is_mushroom"); - public static final TagKey IS_MAGICAL = tag("is_magical"); - public static final TagKey IS_RARE = tag("is_rare"); - public static final TagKey IS_PLATEAU = tag("is_plateau"); - public static final TagKey IS_MODIFIED = tag("is_modified"); + public static final TagKey IS_HOT_END = forgeTag("is_hot/end"); - public static final TagKey IS_WATER = tag("is_water"); - public static final TagKey IS_DESERT = tag("is_desert"); - public static final TagKey IS_PLAINS = tag("is_plains"); - public static final TagKey IS_SWAMP = tag("is_swamp"); - public static final TagKey IS_SANDY = tag("is_sandy"); - public static final TagKey IS_SNOWY = tag("is_snowy"); - public static final TagKey IS_WASTELAND = tag("is_wasteland"); - public static final TagKey IS_VOID = tag("is_void"); - public static final TagKey IS_UNDERGROUND = tag("is_underground"); + public static final TagKey IS_LUSH = forgeTag("is_lush"); + public static final TagKey IS_MAGICAL = forgeTag("is_magical"); + public static final TagKey IS_MODIFIED = forgeTag("is_modified"); - public static final TagKey IS_CAVE = tag("is_cave"); - public static final TagKey IS_PEAK = tag("is_peak"); - public static final TagKey IS_SLOPE = tag("is_slope"); - public static final TagKey IS_MOUNTAIN = tag("is_mountain"); + public static final TagKey IS_RARE = forgeTag("is_rare"); + public static final TagKey IS_PLATEAU = forgeTag("is_plateau"); - private static TagKey tag(String name) - { + /** + * Biomes that are able to spawn sand-based blocks on the surface. + */ + public static final TagKey IS_SANDY = forgeTag("is_sandy"); + + public static final TagKey IS_WET_NETHER = forgeTag("is_wet/nether"); + public static final TagKey IS_WET_END = forgeTag("is_wet/end"); + + public static final TagKey IS_SPOOKY = forgeTag("is_spooky"); + //endregion + + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + /** + * For biomes that should not spawn monsters over time the normal way. + * In other words, their Spawners and Spawn Cost entries have the monster category empty. + * Example: Mushroom Biomes not having Zombies, Creepers, Skeleton, nor any other normal monsters. + */ + public static final TagKey NO_DEFAULT_MONSTERS = cTag("no_default_monsters"); + /** + * Biomes that should not be locatable/selectable by modded biome-locating items or abilities. + */ + public static final TagKey HIDDEN_FROM_LOCATOR_SELECTION = cTag("hidden_from_locator_selection"); + + public static final TagKey IS_VOID = cTag("is_void"); + + public static final TagKey IS_HOT = cTag("is_hot"); + public static final TagKey IS_HOT_OVERWORLD = cTag("is_hot/overworld"); + public static final TagKey IS_HOT_NETHER = cTag("is_hot/nether"); + + public static final TagKey IS_COLD = cTag("is_cold"); + public static final TagKey IS_COLD_OVERWORLD = cTag("is_cold/overworld"); + public static final TagKey IS_COLD_END = cTag("is_cold/end"); + + public static final TagKey IS_SPARSE_VEGETATION = cTag("is_sparse_vegetation"); + public static final TagKey IS_SPARSE_VEGETATION_OVERWORLD = cTag("is_sparse_vegetation/overworld"); + public static final TagKey IS_DENSE_VEGETATION = cTag("is_dense_vegetation"); + public static final TagKey IS_DENSE_VEGETATION_OVERWORLD = cTag("is_dense_vegetation/overworld"); + + public static final TagKey IS_WET = cTag("is_wet"); + public static final TagKey IS_WET_OVERWORLD = cTag("is_wet/overworld"); + public static final TagKey IS_DRY = cTag("is_dry"); + public static final TagKey IS_DRY_OVERWORLD = cTag("is_dry/overworld"); + public static final TagKey IS_DRY_NETHER = cTag("is_dry/nether"); + public static final TagKey IS_DRY_END = cTag("is_dry/end"); + + /** + * Biomes that spawn in the Overworld. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_OVERWORLD} + *

+ * NOTE: If you do not add to the vanilla Overworld tag, be sure to add to + * {@link net.minecraft.tags.BiomeTags#HAS_STRONGHOLD} so some Strongholds do not go missing.) + */ + public static final TagKey IS_OVERWORLD = cTag("is_overworld"); + + public static final TagKey IS_CONIFEROUS_TREE = cTag("is_tree/coniferous"); + public static final TagKey IS_SAVANNA_TREE = cTag("is_tree/savanna"); + public static final TagKey IS_JUNGLE_TREE = cTag("is_tree/jungle"); + public static final TagKey IS_DECIDUOUS_TREE = cTag("is_tree/deciduous"); + + /** + * Biomes that spawn as part of giant mountains. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_MOUNTAIN}) + */ + public static final TagKey IS_MOUNTAIN = cTag("is_mountain"); + public static final TagKey IS_MOUNTAIN_PEAK = cTag("is_mountain/peak"); + public static final TagKey IS_MOUNTAIN_SLOPE = cTag("is_mountain/slope"); + + /** + * For temperate or warmer plains-like biomes. + * For snowy plains-like biomes, see {@link #IS_SNOWY_PLAINS}. + */ + public static final TagKey IS_PLAINS = cTag("is_plains"); + /** + * For snowy plains-like biomes. + * For warmer plains-like biomes, see {@link #IS_PLAINS}. + */ + public static final TagKey IS_SNOWY_PLAINS = cTag("is_snowy_plains"); + /** + * Biomes densely populated with deciduous trees. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_FOREST}) + */ + public static final TagKey IS_FOREST = cTag("is_forest"); + public static final TagKey IS_BIRCH_FOREST = cTag("is_birch_forest"); + public static final TagKey IS_FLOWER_FOREST = cTag("is_flower_forest"); + /** + * Biomes that spawn as a taiga. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_TAIGA}) + */ + public static final TagKey IS_TAIGA = cTag("is_taiga"); + public static final TagKey IS_OLD_GROWTH = cTag("is_old_growth"); + /** + * Biomes that spawn as a hills biome. (Previously was called Extreme Hills biome in past) + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_HILL}) + */ + public static final TagKey IS_HILL = cTag("is_hill"); + public static final TagKey IS_WINDSWEPT = cTag("is_windswept"); + /** + * Biomes that spawn as a jungle. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_JUNGLE}) + */ + public static final TagKey IS_JUNGLE = cTag("is_jungle"); + /** + * Biomes that spawn as a savanna. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_SAVANNA}) + */ + public static final TagKey IS_SAVANNA = cTag("is_savanna"); + public static final TagKey IS_SWAMP = cTag("is_swamp"); + public static final TagKey IS_DESERT = cTag("is_desert"); + /** + * Biomes that spawn as a badlands. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_BADLANDS}) + */ + public static final TagKey IS_BADLANDS = cTag("is_badlands"); + /** + * Biomes that are dedicated to spawning on the shoreline of a body of water. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_BEACH}) + */ + public static final TagKey IS_BEACH = cTag("is_beach"); + public static final TagKey IS_STONY_SHORES = cTag("is_stony_shores"); + public static final TagKey IS_MUSHROOM = cTag("is_mushroom"); + + /** + * Biomes that spawn as a river. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_RIVER}) + */ + public static final TagKey IS_RIVER = cTag("is_river"); + /** + * Biomes that spawn as part of the world's oceans. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_OCEAN}) + */ + public static final TagKey IS_OCEAN = cTag("is_ocean"); + /** + * Biomes that spawn as part of the world's oceans that have low depth. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_DEEP_OCEAN}) + */ + public static final TagKey IS_DEEP_OCEAN = cTag("is_deep_ocean"); + public static final TagKey IS_SHALLOW_OCEAN = cTag("is_shallow_ocean"); + + public static final TagKey IS_UNDERGROUND = cTag("is_underground"); + public static final TagKey IS_CAVE = cTag("is_cave"); + + /** + * Biomes that lack any natural life or vegetation. + * (Example, land destroyed and sterilized by nuclear weapons) + */ + public static final TagKey IS_WASTELAND = cTag("is_wasteland"); + /** + * Biomes whose flora primarily consists of dead or decaying vegetation. + */ + public static final TagKey IS_DEAD = cTag("is_dead"); + /** + * Biomes with a large amount of flowers. + */ + public static final TagKey IS_FLORAL = cTag("is_floral"); + /** + * For biomes that contains lots of naturally spawned snow. + * For biomes where lot of ice is present, see {@link #IS_ICY}. + * Biome with lots of both snow and ice may be in both tags. + */ + public static final TagKey IS_SNOWY = cTag("is_snowy"); + /** + * For land biomes where ice naturally spawns. + * For biomes where snow alone spawns, see {@link #IS_SNOWY}. + */ + public static final TagKey IS_ICY = cTag("is_icy"); + /** + * Biomes consisting primarily of water. + */ + public static final TagKey IS_AQUATIC = cTag("is_aquatic"); + /** + * For water biomes where ice naturally spawns. + * For biomes where snow alone spawns, see {@link #IS_SNOWY}. + */ + public static final TagKey IS_AQUATIC_ICY = cTag("is_aquatic_icy"); + + /** + * Biomes that spawn in the Nether. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_NETHER}) + */ + public static final TagKey IS_NETHER = cTag("is_nether"); + public static final TagKey IS_NETHER_FOREST = cTag("is_nether_forest"); + + /** + * Biomes that spawn in the End. + * (This is for people who want to tag their biomes without getting + * side effects from {@link net.minecraft.tags.BiomeTags#IS_END}) + */ + public static final TagKey IS_END = cTag("is_end"); + /** + * Biomes that spawn as part of the large islands outside the center island in The End dimension. + */ + public static final TagKey IS_OUTER_END_ISLAND = cTag("is_outer_end_island"); + //endregion + + //region Redirect fields for improved backward-compatibility + // TODO: Remove backwards compat redirect fields in 1.22 + /** @deprecated Use {@link #IS_SPARSE_VEGETATION} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_SPARSE = IS_SPARSE_VEGETATION; + /** @deprecated Use {@link #IS_SPARSE_VEGETATION_OVERWORLD} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_SPARSE_OVERWORLD = IS_SPARSE_VEGETATION_OVERWORLD; + + /** @deprecated Use {@link #IS_DENSE_VEGETATION} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_DENSE = IS_DENSE_VEGETATION; + /** @deprecated Use {@link #IS_DENSE_VEGETATION_OVERWORLD} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_DENSE_OVERWORLD = IS_DENSE_VEGETATION_OVERWORLD; + + /** @deprecated Use {@link #IS_AQUATIC} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_WATER = IS_AQUATIC; + + /** @deprecated Use {@link #IS_MOUNTAIN_SLOPE} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_SLOPE = IS_MOUNTAIN_SLOPE; + /** @deprecated Use {@link #IS_MOUNTAIN_PEAK} instead */ + @Deprecated(forRemoval = true, since = "1.21") + public static final TagKey IS_PEAK = IS_MOUNTAIN_PEAK; + //endregion + + private static TagKey cTag(String name) { + return TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath("c", name)); + } + + private static TagKey forgeTag(String name) { return TagKey.create(Registries.BIOME, ResourceLocation.fromNamespaceAndPath("forge", name)); } } + + public static class Structures { + private static void init() {} + + //region `c` tags for common conventions + // Note: Other loaders have additional `c` tags that are exclusive to their loader. + // Forge only adopts `c` tags that are common across all loaders. + /** + * Structures that should not show up on minimaps or world map views from mods/sites. + * No effect on vanilla map items. + */ + public static final TagKey HIDDEN_FROM_DISPLAYERS = cTag("hidden_from_displayers"); + + /** + * Structures that should not be locatable/selectable by modded structure-locating items or abilities. + * No effect on vanilla map items. + */ + public static final TagKey HIDDEN_FROM_LOCATOR_SELECTION = cTag("hidden_from_locator_selection"); + //endregion + + private static TagKey cTag(String name) { + return TagKey.create(Registries.STRUCTURE, ResourceLocation.fromNamespaceAndPath("c", name)); + } + } } diff --git a/src/main/java/net/minecraftforge/common/data/EnchantmentTagsProvider.java b/src/main/java/net/minecraftforge/common/data/EnchantmentTagsProvider.java new file mode 100644 index 0000000000..5889b61c9c --- /dev/null +++ b/src/main/java/net/minecraftforge/common/data/EnchantmentTagsProvider.java @@ -0,0 +1,21 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common.data; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.world.item.enchantment.Enchantment; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +public abstract class EnchantmentTagsProvider extends TagsProvider { + public EnchantmentTagsProvider(PackOutput output, CompletableFuture lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) { + super(output, Registries.ENCHANTMENT, lookupProvider, modId, existingFileHelper); + } +} diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java index d69fdd28cb..0661cb0fe2 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBiomeTagsProvider.java @@ -9,104 +9,259 @@ import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.BiomeTagsProvider; import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; 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; -public final class ForgeBiomeTagsProvider extends BiomeTagsProvider -{ +import static net.minecraftforge.common.Tags.Biomes.*; - public ForgeBiomeTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) - { +@ApiStatus.Internal +public final class ForgeBiomeTagsProvider extends BiomeTagsProvider { + public ForgeBiomeTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { super(output, lookupProvider, "forge", existingFileHelper); } @Override - protected void addTags(HolderLookup.Provider lookupProvider) - { - tag(Biomes.PLAINS, Tags.Biomes.IS_PLAINS); - tag(Biomes.DESERT, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DESERT); - tag(Biomes.TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS); - tag(Biomes.SWAMP, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_SWAMP); - tag(Biomes.NETHER_WASTES, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); - tag(Biomes.THE_END, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END); - tag(Biomes.FROZEN_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY); - tag(Biomes.FROZEN_RIVER, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY); - tag(Biomes.SNOWY_PLAINS, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_WASTELAND, Tags.Biomes.IS_PLAINS); - tag(Biomes.MUSHROOM_FIELDS, Tags.Biomes.IS_MUSHROOM, Tags.Biomes.IS_RARE); - tag(Biomes.JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_DENSE_OVERWORLD); - tag(Biomes.SPARSE_JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.BEACH, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_SANDY); - tag(Biomes.SNOWY_BEACH, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY); - tag(Biomes.DARK_FOREST, Tags.Biomes.IS_SPOOKY, Tags.Biomes.IS_DENSE_OVERWORLD); - tag(Biomes.SNOWY_TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS, Tags.Biomes.IS_SNOWY); - tag(Biomes.OLD_GROWTH_PINE_TAIGA, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS); - tag(Biomes.WINDSWEPT_FOREST, Tags.Biomes.IS_SPARSE_OVERWORLD); - tag(Biomes.SAVANNA, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD); - tag(Biomes.SAVANNA_PLATEAU, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SLOPE, Tags.Biomes.IS_PLATEAU); - tag(Biomes.BADLANDS, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DRY_OVERWORLD); - tag(Biomes.WOODED_BADLANDS, Tags.Biomes.IS_SANDY, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SLOPE, Tags.Biomes.IS_PLATEAU); - tag(Biomes.MEADOW, Tags.Biomes.IS_PLAINS, Tags.Biomes.IS_PLATEAU, Tags.Biomes.IS_SLOPE); - tag(Biomes.GROVE, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_CONIFEROUS, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_SLOPE); - tag(Biomes.SNOWY_SLOPES, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_SLOPE); - tag(Biomes.JAGGED_PEAKS, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_PEAK); - tag(Biomes.FROZEN_PEAKS, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_PEAK); - tag(Biomes.STONY_PEAKS, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_PEAK); - tag(Biomes.SMALL_END_ISLANDS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END); - tag(Biomes.END_MIDLANDS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END); - tag(Biomes.END_HIGHLANDS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END); - tag(Biomes.END_BARRENS, Tags.Biomes.IS_COLD_END, Tags.Biomes.IS_DRY_END); - tag(Biomes.WARM_OCEAN, Tags.Biomes.IS_HOT_OVERWORLD); - tag(Biomes.COLD_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD); - tag(Biomes.DEEP_COLD_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD); - tag(Biomes.DEEP_FROZEN_OCEAN, Tags.Biomes.IS_COLD_OVERWORLD); - tag(Biomes.THE_VOID, Tags.Biomes.IS_VOID); - tag(Biomes.SUNFLOWER_PLAINS, Tags.Biomes.IS_PLAINS, Tags.Biomes.IS_RARE); - tag(Biomes.WINDSWEPT_GRAVELLY_HILLS, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.FLOWER_FOREST, Tags.Biomes.IS_RARE); - tag(Biomes.ICE_SPIKES, Tags.Biomes.IS_COLD_OVERWORLD, Tags.Biomes.IS_SNOWY, Tags.Biomes.IS_RARE); - tag(Biomes.OLD_GROWTH_BIRCH_FOREST, Tags.Biomes.IS_DENSE_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.OLD_GROWTH_SPRUCE_TAIGA, Tags.Biomes.IS_DENSE_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.WINDSWEPT_SAVANNA, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.ERODED_BADLANDS, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_DRY_OVERWORLD, Tags.Biomes.IS_SPARSE_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.BAMBOO_JUNGLE, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_RARE); - tag(Biomes.LUSH_CAVES, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_LUSH, Tags.Biomes.IS_WET_OVERWORLD); - tag(Biomes.DRIPSTONE_CAVES, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_SPARSE_OVERWORLD); - tag(Biomes.SOUL_SAND_VALLEY, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); - tag(Biomes.CRIMSON_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); - tag(Biomes.WARPED_FOREST, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); - tag(Biomes.BASALT_DELTAS, Tags.Biomes.IS_HOT_NETHER, Tags.Biomes.IS_DRY_NETHER); - tag(Biomes.MANGROVE_SWAMP, Tags.Biomes.IS_WET_OVERWORLD, Tags.Biomes.IS_HOT_OVERWORLD, Tags.Biomes.IS_SWAMP); - tag(Biomes.DEEP_DARK, Tags.Biomes.IS_CAVE, Tags.Biomes.IS_RARE, Tags.Biomes.IS_SPOOKY); + protected void addTags(HolderLookup.Provider lookupProvider) { + tag(NO_DEFAULT_MONSTERS).add(Biomes.MUSHROOM_FIELDS).add(Biomes.DEEP_DARK); + tag(HIDDEN_FROM_LOCATOR_SELECTION); // Create tag file for visibility - tag(Tags.Biomes.IS_HOT).addTag(Tags.Biomes.IS_HOT_OVERWORLD).addTag(Tags.Biomes.IS_HOT_NETHER).addOptionalTag(Tags.Biomes.IS_HOT_END.location()); - tag(Tags.Biomes.IS_COLD).addTag(Tags.Biomes.IS_COLD_OVERWORLD).addOptionalTag(Tags.Biomes.IS_COLD_NETHER.location()).addTag(Tags.Biomes.IS_COLD_END); - tag(Tags.Biomes.IS_SPARSE).addTag(Tags.Biomes.IS_SPARSE_OVERWORLD).addOptionalTag(Tags.Biomes.IS_SPARSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_SPARSE_END.location()); - tag(Tags.Biomes.IS_DENSE).addTag(Tags.Biomes.IS_DENSE_OVERWORLD).addOptionalTag(Tags.Biomes.IS_DENSE_NETHER.location()).addOptionalTag(Tags.Biomes.IS_DENSE_END.location()); - tag(Tags.Biomes.IS_WET).addTag(Tags.Biomes.IS_WET_OVERWORLD).addOptionalTag(Tags.Biomes.IS_WET_NETHER.location()).addOptionalTag(Tags.Biomes.IS_WET_END.location()); - tag(Tags.Biomes.IS_DRY).addTag(Tags.Biomes.IS_DRY_OVERWORLD).addTag(Tags.Biomes.IS_DRY_NETHER).addTag(Tags.Biomes.IS_DRY_END); + tag(IS_VOID).add(Biomes.THE_VOID); - tag(Tags.Biomes.IS_WATER).addTag(BiomeTags.IS_OCEAN).addTag(BiomeTags.IS_RIVER); - tag(Tags.Biomes.IS_MOUNTAIN).addTag(Tags.Biomes.IS_PEAK).addTag(Tags.Biomes.IS_SLOPE); - tag(Tags.Biomes.IS_UNDERGROUND).addTag(Tags.Biomes.IS_CAVE); + tag(IS_END).addTags(BiomeTags.IS_END); + tag(IS_NETHER).addTags(BiomeTags.IS_NETHER); + tag(IS_OVERWORLD).addTags(BiomeTags.IS_OVERWORLD); + + tag(IS_HOT_OVERWORLD) + .add(Biomes.SWAMP) + .add(Biomes.MANGROVE_SWAMP) + .add(Biomes.JUNGLE) + .add(Biomes.BAMBOO_JUNGLE) + .add(Biomes.SPARSE_JUNGLE) + .add(Biomes.DESERT) + .add(Biomes.BADLANDS) + .add(Biomes.WOODED_BADLANDS) + .add(Biomes.ERODED_BADLANDS) + .add(Biomes.SAVANNA) + .add(Biomes.SAVANNA_PLATEAU) + .add(Biomes.WINDSWEPT_SAVANNA) + .add(Biomes.STONY_PEAKS) + .add(Biomes.WARM_OCEAN); + 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); + tag(IS_HOT).addTag(IS_HOT_OVERWORLD).addTag(IS_HOT_NETHER).addOptionalTag(IS_HOT_END.location()); + + tag(IS_COLD_OVERWORLD) + .add(Biomes.TAIGA) + .add(Biomes.OLD_GROWTH_PINE_TAIGA) + .add(Biomes.OLD_GROWTH_SPRUCE_TAIGA) + .add(Biomes.WINDSWEPT_HILLS) + .add(Biomes.WINDSWEPT_GRAVELLY_HILLS) + .add(Biomes.WINDSWEPT_FOREST) + .add(Biomes.SNOWY_PLAINS) + .add(Biomes.ICE_SPIKES) + .add(Biomes.GROVE) + .add(Biomes.SNOWY_SLOPES) + .add(Biomes.JAGGED_PEAKS) + .add(Biomes.FROZEN_PEAKS) + .add(Biomes.STONY_SHORE) + .add(Biomes.SNOWY_BEACH) + .add(Biomes.SNOWY_TAIGA) + .add(Biomes.FROZEN_RIVER) + .add(Biomes.COLD_OCEAN) + .add(Biomes.FROZEN_OCEAN) + .add(Biomes.DEEP_COLD_OCEAN) + .add(Biomes.DEEP_FROZEN_OCEAN); + tag(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); + tag(IS_COLD).addTag(IS_COLD_OVERWORLD).addOptionalTag(IS_COLD_NETHER.location()).addTag(IS_COLD_END); + + tag(IS_SPARSE_VEGETATION_OVERWORLD) + .add(Biomes.WOODED_BADLANDS) + .add(Biomes.SAVANNA) + .add(Biomes.SAVANNA_PLATEAU) + .add(Biomes.SPARSE_JUNGLE) + .add(Biomes.WINDSWEPT_SAVANNA) + .add(Biomes.WINDSWEPT_FOREST) + .add(Biomes.WINDSWEPT_HILLS) + .add(Biomes.WINDSWEPT_GRAVELLY_HILLS) + .add(Biomes.SNOWY_SLOPES) + .add(Biomes.JAGGED_PEAKS) + .add(Biomes.FROZEN_PEAKS); + tag(IS_SPARSE_NETHER); + tag(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) + .add(Biomes.DARK_FOREST) + .add(Biomes.OLD_GROWTH_BIRCH_FOREST) + .add(Biomes.OLD_GROWTH_SPRUCE_TAIGA) + .add(Biomes.JUNGLE) + .add(Biomes.BAMBOO_JUNGLE) + .add(Biomes.MANGROVE_SWAMP); + 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()); + + tag(IS_WET_OVERWORLD) + .add(Biomes.SWAMP) + .add(Biomes.MANGROVE_SWAMP) + .add(Biomes.JUNGLE) + .add(Biomes.BAMBOO_JUNGLE) + .add(Biomes.SPARSE_JUNGLE) + .add(Biomes.BEACH) + .add(Biomes.LUSH_CAVES) + .add(Biomes.DRIPSTONE_CAVES); + 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()); + + tag(IS_DRY_OVERWORLD) + .add(Biomes.DESERT) + .add(Biomes.BADLANDS) + .add(Biomes.WOODED_BADLANDS) + .add(Biomes.ERODED_BADLANDS) + .add(Biomes.SAVANNA) + .add(Biomes.SAVANNA_PLATEAU) + .add(Biomes.WINDSWEPT_SAVANNA); + 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); + 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); + + 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_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_FOREST).addTags(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_STONY_SHORES).add(Biomes.STONY_SHORE); + tag(IS_DESERT).add(Biomes.DESERT); + tag(IS_BADLANDS).addTags(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_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_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); + tag(IS_LUSH).add(Biomes.LUSH_CAVES); + tag(IS_MAGICAL); + tag(IS_MODIFIED); + tag(IS_SANDY).add(Biomes.DESERT).add(Biomes.BADLANDS).add(Biomes.WOODED_BADLANDS).add(Biomes.ERODED_BADLANDS).add(Biomes.BEACH); + tag(IS_MUSHROOM).add(Biomes.MUSHROOM_FIELDS); + tag(IS_PLATEAU).add(Biomes.WOODED_BADLANDS).add(Biomes.SAVANNA_PLATEAU).add(Biomes.CHERRY_GROVE).add(Biomes.MEADOW); + tag(IS_SPOOKY).add(Biomes.DARK_FOREST).add(Biomes.DEEP_DARK); + 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_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_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_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. + // 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); } @SafeVarargs - private void tag(ResourceKey biome, TagKey... tags) - { - for(TagKey key : tags) - { + private void tag(ResourceKey biome, TagKey... tags) { + for (TagKey key : tags) { tag(key).add(biome); } } + private TagAppender tagWithOptionalLegacy(TagKey tag) { + return tag(tag).addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", tag.location().getPath())); + } + + private static ResourceLocation forgeRl(String path) { + return ResourceLocation.fromNamespaceAndPath("forge", path); + } + @Override - public String getName() - { + 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 7956d9e983..a36fd21018 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -7,6 +7,7 @@ package net.minecraftforge.common.data; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.IntrinsicHolderTagsProvider; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; @@ -15,6 +16,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.Locale; @@ -24,29 +26,46 @@ import java.util.function.Consumer; // We typically don't do static imports as S2S can't remap them {as they are not qualified}, however this conflicts with vanilla and our tag class names, and our tags don't get obfed so its one line of warning. import static net.minecraftforge.common.Tags.Blocks.*; -public final class ForgeBlockTagsProvider extends BlockTagsProvider -{ - public ForgeBlockTagsProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) - { +@ApiStatus.Internal +public final class ForgeBlockTagsProvider extends BlockTagsProvider { + public ForgeBlockTagsProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { super(output, lookupProvider, "forge", existingFileHelper); } @SuppressWarnings("unchecked") @Override - public void addTags(HolderLookup.Provider p_256380_) - { + public void addTags(HolderLookup.Provider p_256380_) { tag(BARRELS).addTag(BARRELS_WOODEN); tag(BARRELS_WOODEN).add(Blocks.BARREL); tag(BOOKSHELVES).add(Blocks.BOOKSHELF); + 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(COBBLESTONE).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE); + 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(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"); + addColored(DYED, "{color}_candle"); + addColored(DYED, "{color}_carpet"); + addColored(DYED, "{color}_concrete"); + addColored(DYED, "{color}_concrete_powder"); + addColored(DYED, "{color}_glazed_terracotta"); + addColored(DYED, "{color}_shulker_box"); + addColored(DYED, "{color}_stained_glass"); + addColored(DYED, "{color}_stained_glass_pane"); + addColored(DYED, "{color}_terracotta"); + 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); @@ -54,24 +73,27 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider 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).addTags(GLASS_COLORLESS, STAINED_GLASS, GLASS_TINTED); - tag(GLASS_COLORLESS).add(Blocks.GLASS); - tag(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(GLASS_TINTED).add(Blocks.TINTED_GLASS); - addColored(tag(STAINED_GLASS)::add, GLASS, "{color}_stained_glass"); - tag(GLASS_PANES).addTags(GLASS_PANES_COLORLESS, STAINED_GLASS_PANES); + 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); - addColored(tag(STAINED_GLASS_PANES)::add, GLASS_PANES, "{color}_stained_glass_pane"); + 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(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(OBSIDIAN).add(Blocks.OBSIDIAN); + 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(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_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP); + 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); @@ -85,60 +107,189 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider 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(RELOCATION_NOT_SUPPORTED); + tag(ROPES); tag(SAND_COLORLESS).add(Blocks.SAND); tag(SAND_RED).add(Blocks.RED_SAND); - tag(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(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(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_AMETHYST, STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_COPPER, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_RAW_COPPER, STORAGE_BLOCKS_RAW_GOLD, STORAGE_BLOCKS_RAW_IRON, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE); - tag(STORAGE_BLOCKS_AMETHYST).add(Blocks.AMETHYST_BLOCK); + + 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_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); + tag(SANDSTONE_RED_STAIRS).add(Blocks.RED_SANDSTONE_STAIRS, Blocks.SMOOTH_RED_SANDSTONE_STAIRS); + 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, + 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); + 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_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_QUARTZ).add(Blocks.QUARTZ_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_NETHERITE).add(Blocks.NETHERITE_BLOCK); + tag(STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK); + tag(STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK); + tag(VILLAGER_JOB_SITES).add( + Blocks.BARREL, Blocks.BLAST_FURNACE, Blocks.BREWING_STAND, Blocks.CARTOGRAPHY_TABLE, + Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, + 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. + // 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")); } - private void addColored(Consumer consumer, TagKey group, String pattern) - { + /** + * 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 addColored(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())); + for (var color : DyeColor.values()) { + var 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()); + var block = ForgeRegistries.BLOCKS.getValue(key); + if (block == null || block == Blocks.AIR) + throw new IllegalStateException("Unknown vanilla block: " + key); 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()) { + TagKey tag = getForgeTag(prefix + color.getName()); + consumer.accept(tag); } } @SuppressWarnings("unchecked") - private TagKey getForgeTag(String name) - { - try - { + private static TagKey getForgeTag(String name) { + try { name = name.toUpperCase(Locale.ENGLISH); return (TagKey) Tags.Blocks.class.getDeclaredField(name).get(null); - } - catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) - { + } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name); } } + private static ResourceLocation forgeRl(String path) { + return ResourceLocation.fromNamespaceAndPath("forge", path); + } + @Override - public String getName() - { + public String getName() { return "Forge Block Tags"; } } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeEnchantmentTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeEnchantmentTagsProvider.java new file mode 100644 index 0000000000..3ab4d70621 --- /dev/null +++ b/src/main/java/net/minecraftforge/common/data/ForgeEnchantmentTagsProvider.java @@ -0,0 +1,55 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common.data; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.world.item.enchantment.Enchantments; +import org.jetbrains.annotations.ApiStatus; + +import java.util.concurrent.CompletableFuture; + +import static net.minecraftforge.common.Tags.Enchantments.*; + +@ApiStatus.Internal +public final class ForgeEnchantmentTagsProvider extends EnchantmentTagsProvider { + public ForgeEnchantmentTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, "forge", existingFileHelper); + } + + @Override + public void addTags(HolderLookup.Provider lookupProvider) { + tag(INCREASE_BLOCK_DROPS) + .add(Enchantments.FORTUNE); + tag(INCREASE_ENTITY_DROPS) + .add(Enchantments.LOOTING); + tag(WEAPON_DAMAGE_ENHANCEMENTS) + .add(Enchantments.SHARPNESS) + .add(Enchantments.SMITE) + .add(Enchantments.BANE_OF_ARTHROPODS) + .add(Enchantments.POWER) + .add(Enchantments.IMPALING); + tag(ENTITY_SPEED_ENHANCEMENTS) + .add(Enchantments.SOUL_SPEED) + .add(Enchantments.SWIFT_SNEAK) + .add(Enchantments.DEPTH_STRIDER); + tag(ENTITY_AUXILIARY_MOVEMENT_ENHANCEMENTS) + .add(Enchantments.FEATHER_FALLING) + .add(Enchantments.FROST_WALKER); + tag(ENTITY_DEFENSE_ENHANCEMENTS) + .add(Enchantments.PROTECTION) + .add(Enchantments.BLAST_PROTECTION) + .add(Enchantments.PROJECTILE_PROTECTION) + .add(Enchantments.FIRE_PROTECTION) + .add(Enchantments.RESPIRATION) + .add(Enchantments.FEATHER_FALLING); + } + + @Override + public String getName() { + return "Forge Enchantment Tags"; + } +} diff --git a/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java index fa86c00421..c72d6f5b4a 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeEntityTypeTagsProvider.java @@ -8,28 +8,41 @@ package net.minecraftforge.common.data; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.EntityTypeTagsProvider; +import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.EntityType; -import net.minecraftforge.common.Tags; +import org.jetbrains.annotations.ApiStatus; import java.util.concurrent.CompletableFuture; -public class ForgeEntityTypeTagsProvider extends EntityTypeTagsProvider -{ +import static net.minecraftforge.common.Tags.EntityTypes.*; - public ForgeEntityTypeTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) - { +@ApiStatus.Internal +public final class ForgeEntityTypeTagsProvider extends EntityTypeTagsProvider { + public ForgeEntityTypeTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { super(output, lookupProvider, "forge", existingFileHelper); } @Override - public void addTags(HolderLookup.Provider lookupProvider) - { - tag(Tags.EntityTypes.BOSSES).add(EntityType.ENDER_DRAGON, EntityType.WITHER); + public void addTags(HolderLookup.Provider lookupProvider) { + tag(BOSSES).add(EntityType.ENDER_DRAGON, EntityType.WITHER); + 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. + // TODO: Remove backwards compat tag entries in 1.22 + tag(BOSSES).addOptionalTag(forgeRl("bosses")); + tag(MINECARTS).addOptionalTag(forgeRl("minecarts")); + tag(BOATS).addOptionalTag(forgeRl("boats")); + } + + private static ResourceLocation forgeRl(String path) { + return ResourceLocation.fromNamespaceAndPath("forge", path); } @Override - public String getName() - { + public String getName() { return "Forge EntityType Tags"; } } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java index 00cac5b083..4f1820b59c 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeFluidTagsProvider.java @@ -8,27 +8,51 @@ package net.minecraftforge.common.data; import net.minecraft.core.HolderLookup; 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.TagKey; +import net.minecraft.world.level.material.Fluid; import net.minecraftforge.common.ForgeMod; -import net.minecraftforge.common.Tags.Fluids; +import org.jetbrains.annotations.ApiStatus; import java.util.concurrent.CompletableFuture; -public final class ForgeFluidTagsProvider extends FluidTagsProvider -{ - public ForgeFluidTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) - { +import static net.minecraftforge.common.Tags.Fluids.*; + +@ApiStatus.Internal +public final class ForgeFluidTagsProvider extends FluidTagsProvider { + public ForgeFluidTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { super(output, lookupProvider, "forge", existingFileHelper); } @Override - public void addTags(HolderLookup.Provider lookupProvider) - { - tag(Fluids.MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId()); + public void addTags(HolderLookup.Provider lookupProvider) { + tag(WATER).add(net.minecraft.world.level.material.Fluids.WATER).add(net.minecraft.world.level.material.Fluids.FLOWING_WATER); + tag(LAVA).add(net.minecraft.world.level.material.Fluids.LAVA).add(net.minecraft.world.level.material.Fluids.FLOWING_LAVA); + tag(MILK).addOptional(ForgeMod.MILK.getId()).addOptional(ForgeMod.FLOWING_MILK.getId()); + tag(GASEOUS); + tag(HONEY); + tag(POTION); + tag(SUSPICIOUS_STEW); + tag(MUSHROOM_STEW); + tag(RABBIT_STEW); + 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. + // TODO: Remove backwards compat tag entries in 1.22 + tagWithOptionalLegacy(MILK); + tagWithOptionalLegacy(HONEY); + } + + private IntrinsicHolderTagsProvider.IntrinsicTagAppender tagWithOptionalLegacy(TagKey tag) { + IntrinsicHolderTagsProvider.IntrinsicTagAppender tagAppender = tag(tag); + tagAppender.addOptionalTag(ResourceLocation.fromNamespaceAndPath("forge", tag.location().getPath())); + return tagAppender; } @Override - public String getName() - { + public String getName() { return "Forge Fluid Tags"; } } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 8c4a1a3d1e..af1a555d2d 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -6,7 +6,9 @@ package net.minecraftforge.common.data; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.BuiltInRegistries; 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.ItemTags; @@ -16,47 +18,90 @@ 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; import java.util.concurrent.CompletableFuture; import java.util.function.Consumer; -public final class ForgeItemTagsProvider extends ItemTagsProvider -{ - public ForgeItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTagProvider, ExistingFileHelper existingFileHelper) - { +@ApiStatus.Internal +public final class ForgeItemTagsProvider extends ItemTagsProvider { + public ForgeItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTagProvider, ExistingFileHelper existingFileHelper) { super(output, lookupProvider, blockTagProvider, "forge", existingFileHelper); } @SuppressWarnings("unchecked") @Override - public void addTags(HolderLookup.Provider lookupProvider) - { + public void addTags(HolderLookup.Provider lookupProvider) { copy(Tags.Blocks.BARRELS, Tags.Items.BARRELS); copy(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN); tag(Tags.Items.BONES).add(Items.BONE); copy(Tags.Blocks.BOOKSHELVES, Tags.Items.BOOKSHELVES); + tag(Tags.Items.BRICKS).addTags(Tags.Items.BRICKS_NORMAL, Tags.Items.BRICKS_NETHER); + tag(Tags.Items.BRICKS_NORMAL).add(Items.BRICK); + tag(Tags.Items.BRICKS_NETHER).add(Items.NETHER_BRICK); + tag(Tags.Items.BUCKETS_EMPTY).add(Items.BUCKET); + tag(Tags.Items.BUCKETS_WATER).add(Items.WATER_BUCKET); + tag(Tags.Items.BUCKETS_LAVA).add(Items.LAVA_BUCKET); + tag(Tags.Items.BUCKETS_MILK).add(Items.MILK_BUCKET); + tag(Tags.Items.BUCKETS_POWDER_SNOW).add(Items.POWDER_SNOW_BUCKET); + tag(Tags.Items.BUCKETS_ENTITY_WATER).add(Items.AXOLOTL_BUCKET, Items.COD_BUCKET, Items.PUFFERFISH_BUCKET, Items.TADPOLE_BUCKET, Items.TROPICAL_FISH_BUCKET, Items.SALMON_BUCKET); + tag(Tags.Items.BUCKETS).addTags(Tags.Items.BUCKETS_EMPTY, Tags.Items.BUCKETS_WATER, Tags.Items.BUCKETS_LAVA, Tags.Items.BUCKETS_MILK, Tags.Items.BUCKETS_POWDER_SNOW, Tags.Items.BUCKETS_ENTITY_WATER); + copy(Tags.Blocks.BUDDING_BLOCKS, Tags.Items.BUDDING_BLOCKS); + copy(Tags.Blocks.BUDS, Tags.Items.BUDS); + copy(Tags.Blocks.CHAINS, Tags.Items.CHAINS); copy(Tags.Blocks.CHESTS, Tags.Items.CHESTS); copy(Tags.Blocks.CHESTS_ENDER, Tags.Items.CHESTS_ENDER); copy(Tags.Blocks.CHESTS_TRAPPED, Tags.Items.CHESTS_TRAPPED); copy(Tags.Blocks.CHESTS_WOODEN, Tags.Items.CHESTS_WOODEN); - copy(Tags.Blocks.COBBLESTONE, Tags.Items.COBBLESTONE); + copy(Tags.Blocks.CLUSTERS, Tags.Items.CLUSTERS); + copy(Tags.Blocks.COBBLESTONES, Tags.Items.COBBLESTONES); copy(Tags.Blocks.COBBLESTONE_NORMAL, Tags.Items.COBBLESTONE_NORMAL); copy(Tags.Blocks.COBBLESTONE_INFESTED, Tags.Items.COBBLESTONE_INFESTED); copy(Tags.Blocks.COBBLESTONE_MOSSY, Tags.Items.COBBLESTONE_MOSSY); copy(Tags.Blocks.COBBLESTONE_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE); - tag(Tags.Items.CROPS).addTags(Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CARROT, Tags.Items.CROPS_NETHER_WART, Tags.Items.CROPS_POTATO, Tags.Items.CROPS_WHEAT); + copy(Tags.Blocks.CONCRETES, Tags.Items.CONCRETES); + tag(Tags.Items.CONCRETE_POWDERS) + .add(Items.WHITE_CONCRETE_POWDER, Items.ORANGE_CONCRETE_POWDER, Items.MAGENTA_CONCRETE_POWDER, + Items.LIGHT_BLUE_CONCRETE_POWDER, Items.YELLOW_CONCRETE_POWDER, Items.LIME_CONCRETE_POWDER, + Items.PINK_CONCRETE_POWDER, Items.GRAY_CONCRETE_POWDER, Items.LIGHT_GRAY_CONCRETE_POWDER, + Items.CYAN_CONCRETE_POWDER, Items.PURPLE_CONCRETE_POWDER, Items.BLUE_CONCRETE_POWDER, + Items.BROWN_CONCRETE_POWDER, Items.GREEN_CONCRETE_POWDER, Items.RED_CONCRETE_POWDER, + Items.BLACK_CONCRETE_POWDER); + tag(Tags.Items.CROPS).addTags( + Tags.Items.CROPS_BEETROOT, Tags.Items.CROPS_CACTUS, Tags.Items.CROPS_CARROT, + 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); + tag(Tags.Items.CROPS_CACTUS).add(Items.CACTUS); tag(Tags.Items.CROPS_CARROT).add(Items.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_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.DUSTS).addTags(Tags.Items.DUSTS_GLOWSTONE, Tags.Items.DUSTS_PRISMARINE, Tags.Items.DUSTS_REDSTONE); + addColored(Tags.Items.DYED, "{color}_banner"); + addColored(Tags.Items.DYED, "{color}_bed"); + addColored(Tags.Items.DYED, "{color}_candle"); + addColored(Tags.Items.DYED, "{color}_carpet"); + addColored(Tags.Items.DYED, "{color}_concrete"); + addColored(Tags.Items.DYED, "{color}_concrete_powder"); + addColored(Tags.Items.DYED, "{color}_glazed_terracotta"); + addColored(Tags.Items.DYED, "{color}_shulker_box"); + addColored(Tags.Items.DYED, "{color}_stained_glass"); + addColored(Tags.Items.DYED, "{color}_stained_glass_pane"); + addColored(Tags.Items.DYED, "{color}_terracotta"); + 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_PRISMARINE).add(Items.PRISMARINE_SHARD); tag(Tags.Items.DUSTS_REDSTONE).add(Items.REDSTONE); - addColored(tag(Tags.Items.DYES)::addTags, Tags.Items.DYES, "{color}_dye"); + 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); copy(Tags.Blocks.END_STONES, Tags.Items.END_STONES); @@ -67,6 +112,34 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.FENCES, Tags.Items.FENCES); copy(Tags.Blocks.FENCES_NETHER_BRICK, Tags.Items.FENCES_NETHER_BRICK); copy(Tags.Blocks.FENCES_WOODEN, Tags.Items.FENCES_WOODEN); + tag(Tags.Items.FERTILIZERS).add(Items.BONE_MEAL); + tag(Tags.Items.FOODS_FRUIT).add(Items.APPLE, Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.CHORUS_FRUIT, Items.MELON_SLICE); + tag(Tags.Items.FOODS_VEGETABLE).add(Items.CARROT, Items.GOLDEN_CARROT, Items.POTATO, Items.BEETROOT); + tag(Tags.Items.FOODS_BERRY).add(Items.SWEET_BERRIES, Items.GLOW_BERRIES); + tag(Tags.Items.FOODS_BREAD).add(Items.BREAD); + tag(Tags.Items.FOODS_COOKIE).add(Items.COOKIE); + tag(Tags.Items.FOODS_RAW_MEAT).add(Items.BEEF, Items.PORKCHOP, Items.CHICKEN, Items.RABBIT, Items.MUTTON); + tag(Tags.Items.FOODS_RAW_FISH).add(Items.COD, Items.SALMON, Items.TROPICAL_FISH, Items.PUFFERFISH); + tag(Tags.Items.FOODS_COOKED_MEAT).add(Items.COOKED_BEEF, Items.COOKED_PORKCHOP, Items.COOKED_CHICKEN, Items.COOKED_RABBIT, Items.COOKED_MUTTON); + tag(Tags.Items.FOODS_COOKED_FISH).add(Items.COOKED_COD, Items.COOKED_SALMON); + tag(Tags.Items.FOODS_SOUP).add(Items.BEETROOT_SOUP, Items.MUSHROOM_STEW, Items.RABBIT_STEW, Items.SUSPICIOUS_STEW); + tag(Tags.Items.FOODS_CANDY); + tag(Tags.Items.FOODS_PIE).add(Items.PUMPKIN_PIE); // Todo: Move tag to `c:foods/pie` when Fabric#4144 is merged + tag(Tags.Items.FOODS_EDIBLE_WHEN_PLACED).add(Items.CAKE); + tag(Tags.Items.FOODS_FOOD_POISONING).add(Items.POISONOUS_POTATO, Items.PUFFERFISH, Items.SPIDER_EYE, Items.CHICKEN, Items.ROTTEN_FLESH); + tag(Tags.Items.FOODS_GOLDEN).add(Items.GOLDEN_APPLE, Items.ENCHANTED_GOLDEN_APPLE, Items.GOLDEN_CARROT); + tag(Tags.Items.FOODS) + .add(Items.BAKED_POTATO, Items.HONEY_BOTTLE, Items.OMINOUS_BOTTLE, Items.DRIED_KELP) + .addTags(Tags.Items.FOODS_FRUIT, Tags.Items.FOODS_VEGETABLE, Tags.Items.FOODS_BERRY, Tags.Items.FOODS_BREAD, Tags.Items.FOODS_COOKIE, + Tags.Items.FOODS_RAW_MEAT, Tags.Items.FOODS_RAW_FISH, Tags.Items.FOODS_COOKED_MEAT, Tags.Items.FOODS_COOKED_FISH, + Tags.Items.FOODS_SOUP, Tags.Items.FOODS_CANDY, Tags.Items.FOODS_PIE, Tags.Items.FOODS_GOLDEN, + Tags.Items.FOODS_EDIBLE_WHEN_PLACED, Tags.Items.FOODS_FOOD_POISONING); + tag(Tags.Items.ANIMAL_FOODS) + .addTags(ItemTags.ARMADILLO_FOOD, ItemTags.AXOLOTL_FOOD, ItemTags.BEE_FOOD, ItemTags.CAMEL_FOOD, + ItemTags.CAT_FOOD, ItemTags.CHICKEN_FOOD, ItemTags.COW_FOOD, ItemTags.FOX_FOOD, ItemTags.FROG_FOOD, + 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); @@ -74,30 +147,36 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider 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); - copy(Tags.Blocks.GLASS, Tags.Items.GLASS); - copy(Tags.Blocks.GLASS_TINTED, Tags.Items.GLASS_TINTED); - copy(Tags.Blocks.GLASS_SILICA, Tags.Items.GLASS_SILICA); - copyColored(Tags.Blocks.GLASS, Tags.Items.GLASS); + 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); + copy(Tags.Blocks.GLASS_BLOCKS_CHEAP, Tags.Items.GLASS_BLOCKS_CHEAP); copy(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES); - copyColored(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES); + 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.HEADS).add(Items.CREEPER_HEAD, Items.DRAGON_HEAD, Items.PLAYER_HEAD, Items.SKELETON_SKULL, Items.WITHER_SKELETON_SKULL, Items.ZOMBIE_HEAD); - tag(Tags.Items.INGOTS).addTags(Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_COPPER, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_IRON, Tags.Items.INGOTS_NETHERITE, Tags.Items.INGOTS_NETHER_BRICK); - tag(Tags.Items.INGOTS_BRICK).add(Items.BRICK); + 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.INGOTS_NETHER_BRICK).add(Items.NETHER_BRICK); - tag(Tags.Items.LEATHER).add(Items.LEATHER); + tag(Tags.Items.LEATHERS).add(Items.LEATHER); tag(Tags.Items.MUSHROOMS).add(Items.BROWN_MUSHROOM, Items.RED_MUSHROOM); + 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); copy(Tags.Blocks.NETHERRACK, Tags.Items.NETHERRACK); - tag(Tags.Items.NUGGETS).addTags(Tags.Items.NUGGETS_IRON, Tags.Items.NUGGETS_GOLD); + 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); - copy(Tags.Blocks.OBSIDIAN, Tags.Items.OBSIDIAN); + 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); 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); @@ -118,117 +197,255 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider 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); + 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_BLAZE, Tags.Items.RODS_WOODEN); + 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.RODS_BREEZE).add(Items.BREEZE_ROD); tag(Tags.Items.RODS_WOODEN).add(Items.STICK); + 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.SANDSTONE, Tags.Items.SANDSTONE); + 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); + copy(Tags.Blocks.SANDSTONE_RED_BLOCKS, Tags.Items.SANDSTONE_RED_BLOCKS); + copy(Tags.Blocks.SANDSTONE_RED_SLABS, Tags.Items.SANDSTONE_RED_SLABS); + copy(Tags.Blocks.SANDSTONE_RED_STAIRS, Tags.Items.SANDSTONE_RED_STAIRS); + copy(Tags.Blocks.SANDSTONE_UNCOLORED_BLOCKS, Tags.Items.SANDSTONE_UNCOLORED_BLOCKS); + copy(Tags.Blocks.SANDSTONE_UNCOLORED_SLABS, Tags.Items.SANDSTONE_UNCOLORED_SLABS); + copy(Tags.Blocks.SANDSTONE_UNCOLORED_STAIRS, Tags.Items.SANDSTONE_UNCOLORED_STAIRS); 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(Tags.Items.SHEARS).add(Items.SHEARS); - tag(Tags.Items.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(Tags.Blocks.STONE, Tags.Items.STONE); + tag(Tags.Items.SLIME_BALLS).add(Items.SLIME_BALL); + 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, + Items.LIME_SHULKER_BOX, Items.PINK_SHULKER_BOX, Items.GRAY_SHULKER_BOX, + Items.LIGHT_GRAY_SHULKER_BOX, Items.CYAN_SHULKER_BOX, Items.PURPLE_SHULKER_BOX, + Items.BLUE_SHULKER_BOX, Items.BROWN_SHULKER_BOX, Items.GREEN_SHULKER_BOX, + Items.RED_SHULKER_BOX, Items.BLACK_SHULKER_BOX); + copy(Tags.Blocks.STONES, Tags.Items.STONES); copy(Tags.Blocks.STORAGE_BLOCKS, Tags.Items.STORAGE_BLOCKS); - copy(Tags.Blocks.STORAGE_BLOCKS_AMETHYST, Tags.Items.STORAGE_BLOCKS_AMETHYST); + copy(Tags.Blocks.STORAGE_BLOCKS_BONE_MEAL, Tags.Items.STORAGE_BLOCKS_BONE_MEAL); copy(Tags.Blocks.STORAGE_BLOCKS_COAL, Tags.Items.STORAGE_BLOCKS_COAL); copy(Tags.Blocks.STORAGE_BLOCKS_COPPER, Tags.Items.STORAGE_BLOCKS_COPPER); copy(Tags.Blocks.STORAGE_BLOCKS_DIAMOND, Tags.Items.STORAGE_BLOCKS_DIAMOND); + copy(Tags.Blocks.STORAGE_BLOCKS_DRIED_KELP, Tags.Items.STORAGE_BLOCKS_DRIED_KELP); copy(Tags.Blocks.STORAGE_BLOCKS_EMERALD, Tags.Items.STORAGE_BLOCKS_EMERALD); copy(Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Items.STORAGE_BLOCKS_GOLD); copy(Tags.Blocks.STORAGE_BLOCKS_IRON, Tags.Items.STORAGE_BLOCKS_IRON); copy(Tags.Blocks.STORAGE_BLOCKS_LAPIS, Tags.Items.STORAGE_BLOCKS_LAPIS); - copy(Tags.Blocks.STORAGE_BLOCKS_QUARTZ, Tags.Items.STORAGE_BLOCKS_QUARTZ); - copy(Tags.Blocks.STORAGE_BLOCKS_REDSTONE, Tags.Items.STORAGE_BLOCKS_REDSTONE); + copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE); copy(Tags.Blocks.STORAGE_BLOCKS_RAW_COPPER, Tags.Items.STORAGE_BLOCKS_RAW_COPPER); copy(Tags.Blocks.STORAGE_BLOCKS_RAW_GOLD, Tags.Items.STORAGE_BLOCKS_RAW_GOLD); copy(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Items.STORAGE_BLOCKS_RAW_IRON); - copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE); - tag(Tags.Items.STRING).add(Items.STRING); - tag(Tags.Items.TOOLS_SHIELDS).add(Items.SHIELD); - tag(Tags.Items.TOOLS_BOWS).add(Items.BOW); - tag(Tags.Items.TOOLS_CROSSBOWS).add(Items.CROSSBOW); - tag(Tags.Items.TOOLS_FISHING_RODS).add(Items.FISHING_ROD); - tag(Tags.Items.TOOLS_TRIDENTS).add(Items.TRIDENT); + 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.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_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_SPEAR).add(Items.TRIDENT); + tag(Tags.Items.TOOLS_MACE).add(Items.MACE); + tag(Tags.Items.TOOLS_IGNITER).add(Items.FLINT_AND_STEEL); + tag(Tags.Items.MINING_TOOL_TOOLS).add(Items.WOODEN_PICKAXE, Items.STONE_PICKAXE, Items.IRON_PICKAXE, Items.GOLDEN_PICKAXE, Items.DIAMOND_PICKAXE, Items.NETHERITE_PICKAXE); + tag(Tags.Items.MELEE_WEAPON_TOOLS).add( + Items.MACE, Items.TRIDENT, + Items.WOODEN_SWORD, Items.STONE_SWORD, Items.GOLDEN_SWORD, Items.IRON_SWORD, Items.DIAMOND_SWORD, Items.NETHERITE_SWORD, + Items.WOODEN_AXE, Items.STONE_AXE, Items.GOLDEN_AXE, Items.IRON_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE + ); + tag(Tags.Items.RANGED_WEAPON_TOOLS).add(Items.BOW, Items.CROSSBOW, Items.TRIDENT); tag(Tags.Items.TOOLS) - .addTags(ItemTags.SWORDS, ItemTags.AXES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.HOES) - .addTags(Tags.Items.TOOLS_SHIELDS, Tags.Items.TOOLS_BOWS, Tags.Items.TOOLS_CROSSBOWS, Tags.Items.TOOLS_FISHING_RODS, Tags.Items.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(Tags.Items.ARMORS).addTags(Tags.Items.ARMORS_HELMETS, Tags.Items.ARMORS_CHESTPLATES, Tags.Items.ARMORS_LEGGINGS, Tags.Items.ARMORS_BOOTS); + .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.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. + // 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")); } - private void addColored(Consumer> consumer, TagKey group, String pattern) - { + /** + * 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()) - { - ResourceLocation key = ResourceLocation.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName())); + for (DyeColor color : DyeColor.values()) { TagKey tag = getForgeItemTag(prefix + color.getName()); - Item item = ForgeRegistries.ITEMS.getValue(key); - if (item == null || item == Items.AIR) - throw new IllegalStateException("Unknown vanilla item: " + key.toString()); + tagWithOptionalLegacy(tag); + } + } + + private void addColored(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 = getForgeItemTag(prefix + color.getName()); + Item item = BuiltInRegistries.ITEM.get(key); + if (item == null || item == Items.AIR) + throw new IllegalStateException("Unknown vanilla item: " + key); tag(tag).add(item); + } + } + + private static void addColoredTags(Consumer> consumer, TagKey group) { + String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; + for (DyeColor color : DyeColor.values()) { + TagKey tag = getForgeItemTag(prefix + color.getName()); 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")); - } - @SuppressWarnings("unchecked") - private TagKey getForgeBlockTag(String name) - { - try - { + private static TagKey getForgeBlockTag(String name) { + try { name = name.toUpperCase(Locale.ENGLISH); - return (TagKey)Tags.Blocks.class.getDeclaredField(name).get(null); - } - catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) - { + return (TagKey) Tags.Blocks.class.getDeclaredField(name).get(null); + } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { throw new IllegalStateException(Tags.Blocks.class.getName() + " is missing tag name: " + name); } } @SuppressWarnings("unchecked") - private TagKey getForgeItemTag(String name) - { - try - { + private static TagKey getForgeItemTag(String name) { + try { name = name.toUpperCase(Locale.ENGLISH); - return (TagKey)Tags.Items.class.getDeclaredField(name).get(null); - } - catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) - { + return (TagKey) Tags.Items.class.getDeclaredField(name).get(null); + } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) { throw new IllegalStateException(Tags.Items.class.getName() + " is missing tag name: " + name); } } + private static ResourceLocation forgeRl(String path) { + return ResourceLocation.fromNamespaceAndPath("forge", path); + } + @Override - public String getName() - { + public String getName() { return "Forge Item Tags"; } } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java index eba98712bb..5b5c29c5c7 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java @@ -43,8 +43,8 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; public final class ForgeRecipeProvider extends VanillaRecipeProvider { - private final Map> replacements = new HashMap<>(); - private final Set excludes = new HashSet<>(); + private final Map> replacements = HashMap.newHashMap(12); + private final Set excludes = HashSet.newHashSet(16); public ForgeRecipeProvider(PackOutput packOutput, CompletableFuture lookup) { super(packOutput, lookup); @@ -76,7 +76,7 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider { replace(Blocks.COBBLESTONE, Tags.Items.COBBLESTONE_NORMAL); replace(Blocks.COBBLED_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE); - replace(Items.STRING, Tags.Items.STRING); + replace(Items.STRING, Tags.Items.STRINGS); exclude(getConversionRecipeName(Blocks.WHITE_WOOL, Items.STRING)); exclude(Blocks.GOLD_BLOCK); @@ -196,7 +196,7 @@ public final class ForgeRecipeProvider extends VanillaRecipeProvider { } @SuppressWarnings("unchecked") - private R getField(Class clz, T inst, int index) { + private static R getField(Class clz, T inst, int index) { Field fld = clz.getDeclaredFields()[index]; fld.setAccessible(true); try { diff --git a/src/main/java/net/minecraftforge/common/data/ForgeStructureTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeStructureTagsProvider.java new file mode 100644 index 0000000000..95b816e812 --- /dev/null +++ b/src/main/java/net/minecraftforge/common/data/ForgeStructureTagsProvider.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + +package net.minecraftforge.common.data; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.StructureTagsProvider; +import net.minecraftforge.common.Tags; +import org.jetbrains.annotations.ApiStatus; + +import java.util.concurrent.CompletableFuture; + +@ApiStatus.Internal +public final class ForgeStructureTagsProvider extends StructureTagsProvider { + public ForgeStructureTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, "forge", existingFileHelper); + } + + @Override + public void addTags(HolderLookup.Provider lookupProvider) { + tag(Tags.Structures.HIDDEN_FROM_DISPLAYERS); + tag(Tags.Structures.HIDDEN_FROM_LOCATOR_SELECTION); + } + + @Override + public String getName() { + return "Forge Structure Tags"; + } +} diff --git a/src/test/java/net/minecraftforge/debug/client/ObjModelTest.java b/src/test/java/net/minecraftforge/debug/client/ObjModelTest.java index 3e73b81ddb..615bf0fde3 100644 --- a/src/test/java/net/minecraftforge/debug/client/ObjModelTest.java +++ b/src/test/java/net/minecraftforge/debug/client/ObjModelTest.java @@ -1,3 +1,8 @@ +/* + * Copyright (c) Forge Development LLC and contributors + * SPDX-License-Identifier: LGPL-2.1-only + */ + package net.minecraftforge.debug.client; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java b/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java index ce73b36f41..2d9b1bc18e 100644 --- a/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java +++ b/src/test/java/net/minecraftforge/debug/gameplay/criterion/CriterionTest.java @@ -37,7 +37,6 @@ import net.minecraftforge.data.event.GatherDataEvent; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLConstructModEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.gametest.GameTestHolder; import net.minecraftforge.registries.DeferredRegister; @@ -145,7 +144,7 @@ public final class CriterionTest extends BaseTestMod { .parent(STORY_ROOT) .requirements(AdvancementRequirements.Strategy.AND) .addCriterion(TEST_CRITERION_ID, CRITERION.get().instance( - BlockPredicate.Builder.block().of(Tags.Blocks.GLASS).build(), + BlockPredicate.Builder.block().of(Tags.Blocks.GLASS_BLOCKS).build(), ItemPredicate.Builder.item().of(tag).build(), true ))