From 63a42bad984f9a9fe2fa8ce92e95b0e0c9064d04 Mon Sep 17 00:00:00 2001 From: SuperMartijn642 Date: Tue, 11 Jan 2022 01:15:50 +0100 Subject: [PATCH] Update tags for new 1.17 and 1.18 content (#7891) --- .../world/level/block/Block.java.patch | 4 +- .../level/levelgen/feature/Feature.java.patch | 7 +- .../data/forge/tags/blocks/cobblestone.json | 3 +- .../data/forge/tags/blocks/dirt.json | 10 -- .../data/forge/tags/blocks/fences/wooden.json | 9 +- .../data/forge/tags/blocks/glass.json | 3 +- .../data/forge/tags/blocks/glass/silica.json | 22 ++++ .../data/forge/tags/blocks/glass/tinted.json | 6 + .../blocks/ore_bearing_ground/deepslate.json | 6 + .../blocks/ore_bearing_ground/netherrack.json | 6 + .../tags/blocks/ore_bearing_ground/stone.json | 6 + .../forge/tags/blocks/ore_rates/dense.json | 11 ++ .../forge/tags/blocks/ore_rates/singular.json | 17 +++ .../forge/tags/blocks/ore_rates/sparse.json | 6 + .../data/forge/tags/blocks/ores.json | 1 + .../data/forge/tags/blocks/ores/coal.json | 2 +- .../data/forge/tags/blocks/ores/copper.json | 6 + .../data/forge/tags/blocks/ores/diamond.json | 2 +- .../data/forge/tags/blocks/ores/emerald.json | 2 +- .../data/forge/tags/blocks/ores/iron.json | 2 +- .../data/forge/tags/blocks/ores/lapis.json | 2 +- .../data/forge/tags/blocks/ores/redstone.json | 2 +- .../tags/blocks/ores_in_ground/deepslate.json | 13 ++ .../blocks/ores_in_ground/netherrack.json | 7 + .../tags/blocks/ores_in_ground/stone.json | 13 ++ .../data/forge/tags/blocks/stone.json | 6 +- .../forge/tags/blocks/storage_blocks.json | 5 + .../tags/blocks/storage_blocks/amethyst.json | 6 + .../tags/blocks/storage_blocks/copper.json | 7 + .../blocks/storage_blocks/raw_copper.json | 6 + .../tags/blocks/storage_blocks/raw_gold.json | 6 + .../tags/blocks/storage_blocks/raw_iron.json | 6 + .../data/forge/tags/items/cobblestone.json | 3 +- .../data/forge/tags/items/fences/wooden.json | 9 +- .../resources/data/forge/tags/items/gems.json | 1 + .../data/forge/tags/items/gems/amethyst.json | 6 + .../data/forge/tags/items/glass.json | 3 +- .../data/forge/tags/items/glass/silica.json | 22 ++++ .../data/forge/tags/items/glass/tinted.json | 6 + .../data/forge/tags/items/ingots.json | 9 +- .../data/forge/tags/items/ingots/copper.json | 6 + .../items/ore_bearing_ground/deepslate.json | 6 + .../items/ore_bearing_ground/netherrack.json | 6 + .../tags/items/ore_bearing_ground/stone.json | 6 + .../forge/tags/items/ore_rates/dense.json | 11 ++ .../forge/tags/items/ore_rates/singular.json | 17 +++ .../forge/tags/items/ore_rates/sparse.json | 6 + .../resources/data/forge/tags/items/ores.json | 1 + .../data/forge/tags/items/ores/coal.json | 2 +- .../data/forge/tags/items/ores/copper.json | 6 + .../data/forge/tags/items/ores/diamond.json | 2 +- .../data/forge/tags/items/ores/emerald.json | 2 +- .../data/forge/tags/items/ores/iron.json | 2 +- .../data/forge/tags/items/ores/lapis.json | 2 +- .../data/forge/tags/items/ores/redstone.json | 2 +- .../tags/items/ores_in_ground/deepslate.json | 13 ++ .../tags/items/ores_in_ground/netherrack.json | 7 + .../tags/items/ores_in_ground/stone.json | 13 ++ .../data/forge/tags/items/raw_materials.json | 8 ++ .../tags/items/raw_materials/copper.json | 6 + .../forge/tags/items/raw_materials/gold.json | 6 + .../forge/tags/items/raw_materials/iron.json | 6 + .../data/forge/tags/items/stone.json | 6 +- .../data/forge/tags/items/storage_blocks.json | 5 + .../tags/items/storage_blocks/amethyst.json | 6 + .../tags/items/storage_blocks/copper.json | 7 + .../tags/items/storage_blocks/raw_copper.json | 6 + .../tags/items/storage_blocks/raw_gold.json | 6 + .../tags/items/storage_blocks/raw_iron.json | 6 + .../data/minecraft/recipes/lightning_rod.json | 16 +++ .../data/minecraft/recipes/spyglass.json | 19 +++ .../data/minecraft/recipes/tinted_glass.json | 20 +++ .../java/net/minecraftforge/common/Tags.java | 120 ++++++++++++++++-- .../common/data/ForgeBlockTagsProvider.java | 56 +++++--- .../common/data/ForgeItemTagsProvider.java | 41 ++++-- .../common/data/ForgeRecipeProvider.java | 33 ++--- 76 files changed, 640 insertions(+), 112 deletions(-) delete mode 100644 src/generated/resources/data/forge/tags/blocks/dirt.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/silica.json create mode 100644 src/generated/resources/data/forge/tags/blocks/glass/tinted.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/deepslate.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/netherrack.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/stone.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ore_rates/dense.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ore_rates/sparse.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ores/copper.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json create mode 100644 src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/amethyst.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_copper.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_gold.json create mode 100644 src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iron.json create mode 100644 src/generated/resources/data/forge/tags/items/gems/amethyst.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/silica.json create mode 100644 src/generated/resources/data/forge/tags/items/glass/tinted.json create mode 100644 src/generated/resources/data/forge/tags/items/ingots/copper.json create mode 100644 src/generated/resources/data/forge/tags/items/ore_bearing_ground/deepslate.json create mode 100644 src/generated/resources/data/forge/tags/items/ore_bearing_ground/netherrack.json create mode 100644 src/generated/resources/data/forge/tags/items/ore_bearing_ground/stone.json create mode 100644 src/generated/resources/data/forge/tags/items/ore_rates/dense.json create mode 100644 src/generated/resources/data/forge/tags/items/ore_rates/singular.json create mode 100644 src/generated/resources/data/forge/tags/items/ore_rates/sparse.json create mode 100644 src/generated/resources/data/forge/tags/items/ores/copper.json create mode 100644 src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json create mode 100644 src/generated/resources/data/forge/tags/items/ores_in_ground/netherrack.json create mode 100644 src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json create mode 100644 src/generated/resources/data/forge/tags/items/raw_materials.json create mode 100644 src/generated/resources/data/forge/tags/items/raw_materials/copper.json create mode 100644 src/generated/resources/data/forge/tags/items/raw_materials/gold.json create mode 100644 src/generated/resources/data/forge/tags/items/raw_materials/iron.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/amethyst.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/copper.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/raw_copper.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/raw_gold.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/raw_iron.json create mode 100644 src/generated/resources/data/minecraft/recipes/lightning_rod.json create mode 100644 src/generated/resources/data/minecraft/recipes/spyglass.json create mode 100644 src/generated/resources/data/minecraft/recipes/tinted_glass.json diff --git a/patches/minecraft/net/minecraft/world/level/block/Block.java.patch b/patches/minecraft/net/minecraft/world/level/block/Block.java.patch index c4d906656c..eea6b73e53 100644 --- a/patches/minecraft/net/minecraft/world/level/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/Block.java.patch @@ -146,11 +146,11 @@ + } else if (net.minecraftforge.common.PlantType.CAVE.equals(type)) { + return state.m_60783_(world, pos, Direction.UP); + } else if (net.minecraftforge.common.PlantType.PLAINS.equals(type)) { -+ return this == Blocks.f_50440_ || net.minecraftforge.common.Tags.Blocks.DIRT.m_8110_(this) || this == Blocks.f_50093_; ++ return this == Blocks.f_50440_ || BlockTags.f_144274_.m_8110_(this) || this == Blocks.f_50093_; + } else if (net.minecraftforge.common.PlantType.WATER.equals(type)) { + return state.m_60767_() == net.minecraft.world.level.material.Material.f_76305_; //&& state.getValue(BlockLiquidWrapper) + } else if (net.minecraftforge.common.PlantType.BEACH.equals(type)) { -+ boolean isBeach = state.m_60713_(Blocks.f_50440_) || net.minecraftforge.common.Tags.Blocks.DIRT.m_8110_(this) || state.m_60713_(Blocks.f_49992_) || state.m_60713_(Blocks.f_49993_); ++ boolean isBeach = state.m_60713_(Blocks.f_50440_) || BlockTags.f_144274_.m_8110_(this) || state.m_60713_(Blocks.f_49992_) || state.m_60713_(Blocks.f_49993_); + boolean hasWater = false; + for (Direction face : Direction.Plane.HORIZONTAL) { + BlockState blockState = world.m_8055_(pos.m_142300_(face)); 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 dbbf855518..0db8cfe0de 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 @@ -9,7 +9,7 @@ public static final Feature f_65759_ = m_65807_("no_op", new NoOpFeature(NoneFeatureConfiguration.f_67815_)); public static final Feature f_65760_ = m_65807_("tree", new TreeFeature(TreeConfiguration.f_68184_)); public static final Feature f_65761_ = m_65807_("flower", new RandomPatchFeature(RandomPatchConfiguration.f_67902_)); -@@ -157,11 +_,11 @@ +@@ -157,7 +_,7 @@ public abstract boolean m_142674_(FeaturePlaceContext p_159749_); protected static boolean m_159747_(BlockState p_159748_) { @@ -18,8 +18,3 @@ } public static boolean m_159759_(BlockState p_159760_) { -- return p_159760_.m_60620_(BlockTags.f_144274_); -+ return p_159760_.m_60620_(net.minecraftforge.common.Tags.Blocks.DIRT); - } - - public static boolean m_65788_(LevelSimulatedReader p_65789_, BlockPos p_65790_) { diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone.json b/src/generated/resources/data/forge/tags/blocks/cobblestone.json index ae95e81b79..0a1b8b85b0 100644 --- a/src/generated/resources/data/forge/tags/blocks/cobblestone.json +++ b/src/generated/resources/data/forge/tags/blocks/cobblestone.json @@ -3,6 +3,7 @@ "values": [ "minecraft:cobblestone", "minecraft:infested_cobblestone", - "minecraft:mossy_cobblestone" + "minecraft:mossy_cobblestone", + "minecraft:cobbled_deepslate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/dirt.json b/src/generated/resources/data/forge/tags/blocks/dirt.json deleted file mode 100644 index 61918d998e..0000000000 --- a/src/generated/resources/data/forge/tags/blocks/dirt.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:dirt", - "minecraft:grass_block", - "minecraft:coarse_dirt", - "minecraft:podzol", - "minecraft:mycelium" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/fences/wooden.json b/src/generated/resources/data/forge/tags/blocks/fences/wooden.json index c9b084c48c..80808ad5c9 100644 --- a/src/generated/resources/data/forge/tags/blocks/fences/wooden.json +++ b/src/generated/resources/data/forge/tags/blocks/fences/wooden.json @@ -1,13 +1,6 @@ { "replace": false, "values": [ - "minecraft:oak_fence", - "minecraft:spruce_fence", - "minecraft:birch_fence", - "minecraft:jungle_fence", - "minecraft:acacia_fence", - "minecraft:dark_oak_fence", - "minecraft:crimson_fence", - "minecraft:warped_fence" + "#minecraft:wooden_fences" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass.json b/src/generated/resources/data/forge/tags/blocks/glass.json index a7ee75a4f5..943aa90b5d 100644 --- a/src/generated/resources/data/forge/tags/blocks/glass.json +++ b/src/generated/resources/data/forge/tags/blocks/glass.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#forge:glass/colorless", - "#forge:stained_glass" + "#forge:stained_glass", + "#forge:glass/tinted" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/silica.json b/src/generated/resources/data/forge/tags/blocks/glass/silica.json new file mode 100644 index 0000000000..7ae1f6ddba --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/silica.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "minecraft:glass", + "minecraft:black_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:green_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:red_stained_glass", + "minecraft:white_stained_glass", + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/glass/tinted.json b/src/generated/resources/data/forge/tags/blocks/glass/tinted.json new file mode 100644 index 0000000000..1567b7fd94 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/glass/tinted.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:tinted_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/deepslate.json b/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/deepslate.json new file mode 100644 index 0000000000..9036a21131 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/deepslate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:deepslate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/netherrack.json b/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/netherrack.json new file mode 100644 index 0000000000..d54c65bbb4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/netherrack.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/stone.json b/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/stone.json new file mode 100644 index 0000000000..52fd055337 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ore_bearing_ground/stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ore_rates/dense.json b/src/generated/resources/data/forge/tags/blocks/ore_rates/dense.json new file mode 100644 index 0000000000..4bd4cb5433 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ore_rates/dense.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json b/src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json new file mode 100644 index 0000000000..43ba2ab490 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ore_rates/singular.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:ancient_debris", + "minecraft:coal_ore", + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ore_rates/sparse.json b/src/generated/resources/data/forge/tags/blocks/ore_rates/sparse.json new file mode 100644 index 0000000000..31be071fed --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ore_rates/sparse.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_gold_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores.json b/src/generated/resources/data/forge/tags/blocks/ores.json index df8a3faa1c..a2224abfd2 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores.json +++ b/src/generated/resources/data/forge/tags/blocks/ores.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#forge:ores/coal", + "#forge:ores/copper", "#forge:ores/diamond", "#forge:ores/emerald", "#forge:ores/gold", diff --git a/src/generated/resources/data/forge/tags/blocks/ores/coal.json b/src/generated/resources/data/forge/tags/blocks/ores/coal.json index 337900da53..3ed033d157 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/coal.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/coal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:coal_ore" + "#minecraft:coal_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/copper.json b/src/generated/resources/data/forge/tags/blocks/ores/copper.json new file mode 100644 index 0000000000..ed67d21b30 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:copper_ores" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/diamond.json b/src/generated/resources/data/forge/tags/blocks/ores/diamond.json index 927a2c7f93..504de74040 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/diamond.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:diamond_ore" + "#minecraft:diamond_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/emerald.json b/src/generated/resources/data/forge/tags/blocks/ores/emerald.json index 4ad12c4775..ae49017ce3 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/emerald.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:emerald_ore" + "#minecraft:emerald_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/iron.json b/src/generated/resources/data/forge/tags/blocks/ores/iron.json index 95a0b2a476..f8fab468aa 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/iron.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:iron_ore" + "#minecraft:iron_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/lapis.json b/src/generated/resources/data/forge/tags/blocks/ores/lapis.json index 798187c7eb..5d36e036f6 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/lapis.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/lapis.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:lapis_ore" + "#minecraft:lapis_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores/redstone.json b/src/generated/resources/data/forge/tags/blocks/ores/redstone.json index 6ca00d17a2..e6f16c3382 100644 --- a/src/generated/resources/data/forge/tags/blocks/ores/redstone.json +++ b/src/generated/resources/data/forge/tags/blocks/ores/redstone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:redstone_ore" + "#minecraft:redstone_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json new file mode 100644 index 0000000000..7fdb39a762 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json new file mode 100644 index 0000000000..67ce55b509 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_gold_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json new file mode 100644 index 0000000000..788f1d0981 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:coal_ore", + "minecraft:copper_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/stone.json b/src/generated/resources/data/forge/tags/blocks/stone.json index 18296da083..f336e9826d 100644 --- a/src/generated/resources/data/forge/tags/blocks/stone.json +++ b/src/generated/resources/data/forge/tags/blocks/stone.json @@ -8,6 +8,10 @@ "minecraft:stone", "minecraft:polished_andesite", "minecraft:polished_diorite", - "minecraft:polished_granite" + "minecraft:polished_granite", + "minecraft:deepslate", + "minecraft:polished_deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json index ed0e3927d9..8d87858870 100644 --- a/src/generated/resources/data/forge/tags/blocks/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks.json @@ -1,13 +1,18 @@ { "replace": false, "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" ] diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/amethyst.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/amethyst.json new file mode 100644 index 0000000000..e0656d8d83 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/amethyst.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:amethyst_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json new file mode 100644 index 0000000000..38715cbb3d --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_block", + "minecraft:cut_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_copper.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..3a578a0277 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_gold.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..4ce9cc47d1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iron.json b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..14f551c592 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/storage_blocks/raw_iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/cobblestone.json b/src/generated/resources/data/forge/tags/items/cobblestone.json index ae95e81b79..0a1b8b85b0 100644 --- a/src/generated/resources/data/forge/tags/items/cobblestone.json +++ b/src/generated/resources/data/forge/tags/items/cobblestone.json @@ -3,6 +3,7 @@ "values": [ "minecraft:cobblestone", "minecraft:infested_cobblestone", - "minecraft:mossy_cobblestone" + "minecraft:mossy_cobblestone", + "minecraft:cobbled_deepslate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/fences/wooden.json b/src/generated/resources/data/forge/tags/items/fences/wooden.json index c9b084c48c..80808ad5c9 100644 --- a/src/generated/resources/data/forge/tags/items/fences/wooden.json +++ b/src/generated/resources/data/forge/tags/items/fences/wooden.json @@ -1,13 +1,6 @@ { "replace": false, "values": [ - "minecraft:oak_fence", - "minecraft:spruce_fence", - "minecraft:birch_fence", - "minecraft:jungle_fence", - "minecraft:acacia_fence", - "minecraft:dark_oak_fence", - "minecraft:crimson_fence", - "minecraft:warped_fence" + "#minecraft:wooden_fences" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/gems.json b/src/generated/resources/data/forge/tags/items/gems.json index d9b2a55e92..dfa2226a27 100644 --- a/src/generated/resources/data/forge/tags/items/gems.json +++ b/src/generated/resources/data/forge/tags/items/gems.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ + "#forge:gems/amethyst", "#forge:gems/diamond", "#forge:gems/emerald", "#forge:gems/lapis", diff --git a/src/generated/resources/data/forge/tags/items/gems/amethyst.json b/src/generated/resources/data/forge/tags/items/gems/amethyst.json new file mode 100644 index 0000000000..10553e567e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/gems/amethyst.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:amethyst_shard" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass.json b/src/generated/resources/data/forge/tags/items/glass.json index a7ee75a4f5..943aa90b5d 100644 --- a/src/generated/resources/data/forge/tags/items/glass.json +++ b/src/generated/resources/data/forge/tags/items/glass.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#forge:glass/colorless", - "#forge:stained_glass" + "#forge:stained_glass", + "#forge:glass/tinted" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/silica.json b/src/generated/resources/data/forge/tags/items/glass/silica.json new file mode 100644 index 0000000000..7ae1f6ddba --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/silica.json @@ -0,0 +1,22 @@ +{ + "replace": false, + "values": [ + "minecraft:glass", + "minecraft:black_stained_glass", + "minecraft:blue_stained_glass", + "minecraft:brown_stained_glass", + "minecraft:cyan_stained_glass", + "minecraft:gray_stained_glass", + "minecraft:green_stained_glass", + "minecraft:light_blue_stained_glass", + "minecraft:light_gray_stained_glass", + "minecraft:lime_stained_glass", + "minecraft:magenta_stained_glass", + "minecraft:orange_stained_glass", + "minecraft:pink_stained_glass", + "minecraft:purple_stained_glass", + "minecraft:red_stained_glass", + "minecraft:white_stained_glass", + "minecraft:yellow_stained_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/glass/tinted.json b/src/generated/resources/data/forge/tags/items/glass/tinted.json new file mode 100644 index 0000000000..1567b7fd94 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/glass/tinted.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:tinted_glass" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json index 97f841478e..1e1a261763 100644 --- a/src/generated/resources/data/forge/tags/items/ingots.json +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -1,10 +1,11 @@ { "replace": false, "values": [ - "#forge:ingots/iron", - "#forge:ingots/gold", "#forge:ingots/brick", - "#forge:ingots/nether_brick", - "#forge:ingots/netherite" + "#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/generated/resources/data/forge/tags/items/ingots/copper.json b/src/generated/resources/data/forge/tags/items/ingots/copper.json new file mode 100644 index 0000000000..4b0daa0db9 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_bearing_ground/deepslate.json b/src/generated/resources/data/forge/tags/items/ore_bearing_ground/deepslate.json new file mode 100644 index 0000000000..9036a21131 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_bearing_ground/deepslate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:deepslate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_bearing_ground/netherrack.json b/src/generated/resources/data/forge/tags/items/ore_bearing_ground/netherrack.json new file mode 100644 index 0000000000..d54c65bbb4 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_bearing_ground/netherrack.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:netherrack" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_bearing_ground/stone.json b/src/generated/resources/data/forge/tags/items/ore_bearing_ground/stone.json new file mode 100644 index 0000000000..52fd055337 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_bearing_ground/stone.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/dense.json b/src/generated/resources/data/forge/tags/items/ore_rates/dense.json new file mode 100644 index 0000000000..4bd4cb5433 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_rates/dense.json @@ -0,0 +1,11 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json new file mode 100644 index 0000000000..43ba2ab490 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json @@ -0,0 +1,17 @@ +{ + "replace": false, + "values": [ + "minecraft:ancient_debris", + "minecraft:coal_ore", + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/sparse.json b/src/generated/resources/data/forge/tags/items/ore_rates/sparse.json new file mode 100644 index 0000000000..31be071fed --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_rates/sparse.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_gold_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json index df8a3faa1c..a2224abfd2 100644 --- a/src/generated/resources/data/forge/tags/items/ores.json +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#forge:ores/coal", + "#forge:ores/copper", "#forge:ores/diamond", "#forge:ores/emerald", "#forge:ores/gold", diff --git a/src/generated/resources/data/forge/tags/items/ores/coal.json b/src/generated/resources/data/forge/tags/items/ores/coal.json index 337900da53..3ed033d157 100644 --- a/src/generated/resources/data/forge/tags/items/ores/coal.json +++ b/src/generated/resources/data/forge/tags/items/ores/coal.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:coal_ore" + "#minecraft:coal_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/copper.json b/src/generated/resources/data/forge/tags/items/ores/copper.json new file mode 100644 index 0000000000..ed67d21b30 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "#minecraft:copper_ores" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/diamond.json b/src/generated/resources/data/forge/tags/items/ores/diamond.json index 927a2c7f93..504de74040 100644 --- a/src/generated/resources/data/forge/tags/items/ores/diamond.json +++ b/src/generated/resources/data/forge/tags/items/ores/diamond.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:diamond_ore" + "#minecraft:diamond_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/emerald.json b/src/generated/resources/data/forge/tags/items/ores/emerald.json index 4ad12c4775..ae49017ce3 100644 --- a/src/generated/resources/data/forge/tags/items/ores/emerald.json +++ b/src/generated/resources/data/forge/tags/items/ores/emerald.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:emerald_ore" + "#minecraft:emerald_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/iron.json b/src/generated/resources/data/forge/tags/items/ores/iron.json index 95a0b2a476..f8fab468aa 100644 --- a/src/generated/resources/data/forge/tags/items/ores/iron.json +++ b/src/generated/resources/data/forge/tags/items/ores/iron.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:iron_ore" + "#minecraft:iron_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/lapis.json b/src/generated/resources/data/forge/tags/items/ores/lapis.json index 798187c7eb..5d36e036f6 100644 --- a/src/generated/resources/data/forge/tags/items/ores/lapis.json +++ b/src/generated/resources/data/forge/tags/items/ores/lapis.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:lapis_ore" + "#minecraft:lapis_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/redstone.json b/src/generated/resources/data/forge/tags/items/ores/redstone.json index 6ca00d17a2..e6f16c3382 100644 --- a/src/generated/resources/data/forge/tags/items/ores/redstone.json +++ b/src/generated/resources/data/forge/tags/items/ores/redstone.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "minecraft:redstone_ore" + "#minecraft:redstone_ores" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json new file mode 100644 index 0000000000..7fdb39a762 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:deepslate_coal_ore", + "minecraft:deepslate_copper_ore", + "minecraft:deepslate_diamond_ore", + "minecraft:deepslate_emerald_ore", + "minecraft:deepslate_gold_ore", + "minecraft:deepslate_iron_ore", + "minecraft:deepslate_lapis_ore", + "minecraft:deepslate_redstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/netherrack.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/netherrack.json new file mode 100644 index 0000000000..67ce55b509 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/netherrack.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:nether_gold_ore", + "minecraft:nether_quartz_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json new file mode 100644 index 0000000000..788f1d0981 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:coal_ore", + "minecraft:copper_ore", + "minecraft:diamond_ore", + "minecraft:emerald_ore", + "minecraft:gold_ore", + "minecraft:iron_ore", + "minecraft:lapis_ore", + "minecraft:redstone_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/items/raw_materials.json new file mode 100644 index 0000000000..15956f4887 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#forge:raw_materials/copper", + "#forge:raw_materials/gold", + "#forge:raw_materials/iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/copper.json b/src/generated/resources/data/forge/tags/items/raw_materials/copper.json new file mode 100644 index 0000000000..cb1b852f38 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials/copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/gold.json b/src/generated/resources/data/forge/tags/items/raw_materials/gold.json new file mode 100644 index 0000000000..3ac7724642 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials/gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/iron.json b/src/generated/resources/data/forge/tags/items/raw_materials/iron.json new file mode 100644 index 0000000000..9c072749ce --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials/iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/stone.json b/src/generated/resources/data/forge/tags/items/stone.json index 18296da083..f336e9826d 100644 --- a/src/generated/resources/data/forge/tags/items/stone.json +++ b/src/generated/resources/data/forge/tags/items/stone.json @@ -8,6 +8,10 @@ "minecraft:stone", "minecraft:polished_andesite", "minecraft:polished_diorite", - "minecraft:polished_granite" + "minecraft:polished_granite", + "minecraft:deepslate", + "minecraft:polished_deepslate", + "minecraft:infested_deepslate", + "minecraft:tuff" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json index ed0e3927d9..8d87858870 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -1,13 +1,18 @@ { "replace": false, "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" ] diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/amethyst.json b/src/generated/resources/data/forge/tags/items/storage_blocks/amethyst.json new file mode 100644 index 0000000000..e0656d8d83 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/amethyst.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:amethyst_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json b/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json new file mode 100644 index 0000000000..38715cbb3d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/copper.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "minecraft:copper_block", + "minecraft:cut_copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/raw_copper.json b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_copper.json new file mode 100644 index 0000000000..3a578a0277 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_copper.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_copper_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/raw_gold.json b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_gold.json new file mode 100644 index 0000000000..4ce9cc47d1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_gold.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_gold_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/raw_iron.json b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_iron.json new file mode 100644 index 0000000000..14f551c592 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/raw_iron.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:raw_iron_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/lightning_rod.json b/src/generated/resources/data/minecraft/recipes/lightning_rod.json new file mode 100644 index 0000000000..8f3a9f7980 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/lightning_rod.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "#", + "#", + "#" + ], + "key": { + "#": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "minecraft:lightning_rod" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/spyglass.json b/src/generated/resources/data/minecraft/recipes/spyglass.json new file mode 100644 index 0000000000..c9d4861d1a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/spyglass.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + " X ", + " X " + ], + "key": { + "#": { + "tag": "forge:gems/amethyst" + }, + "X": { + "tag": "forge:ingots/copper" + } + }, + "result": { + "item": "minecraft:spyglass" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/tinted_glass.json b/src/generated/resources/data/minecraft/recipes/tinted_glass.json new file mode 100644 index 0000000000..6e3c8d8aec --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/tinted_glass.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " S ", + "SGS", + " S " + ], + "key": { + "G": { + "item": "minecraft:glass" + }, + "S": { + "tag": "forge:gems/amethyst" + } + }, + "result": { + "item": "minecraft:tinted_glass", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index fa57029fae..5cf6d67aca 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -19,20 +19,19 @@ package net.minecraftforge.common; -import java.util.Set; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.item.DyeColor; -import net.minecraft.world.item.Item; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.FluidTags; import net.minecraft.tags.ItemTags; -import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.Tag.Named; +import net.minecraft.world.item.DyeColor; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.material.Fluid; + +import javax.annotation.Nullable; +import java.util.Set; +import java.util.function.Supplier; public class Tags { @@ -54,7 +53,6 @@ public class Tags public static final IOptionalNamedTag CHESTS_TRAPPED = tag("chests/trapped"); public static final IOptionalNamedTag CHESTS_WOODEN = tag("chests/wooden"); public static final IOptionalNamedTag COBBLESTONE = tag("cobblestone"); - public static final IOptionalNamedTag DIRT = tag("dirt"); public static final IOptionalNamedTag END_STONES = tag("end_stones"); public static final IOptionalNamedTag ENDERMAN_PLACE_ON_BLACKLIST = tag("enderman_place_on_blacklist"); public static final IOptionalNamedTag FENCE_GATES = tag("fence_gates"); @@ -79,6 +77,11 @@ public class Tags public static final IOptionalNamedTag GLASS_PINK = tag("glass/pink"); public static final IOptionalNamedTag GLASS_PURPLE = tag("glass/purple"); public static final IOptionalNamedTag GLASS_RED = tag("glass/red"); + /** + * Glass which is made from sand and only minor additional ingredients like dyes + */ + public static final IOptionalNamedTag GLASS_SILICA = tag("glass/silica"); + public static final IOptionalNamedTag GLASS_TINTED = tag("glass/tinted"); public static final IOptionalNamedTag GLASS_WHITE = tag("glass/white"); public static final IOptionalNamedTag GLASS_YELLOW = tag("glass/yellow"); @@ -104,8 +107,33 @@ public class Tags public static final IOptionalNamedTag GRAVEL = tag("gravel"); public static final IOptionalNamedTag NETHERRACK = tag("netherrack"); public static final IOptionalNamedTag 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 + */ + public static final IOptionalNamedTag ORE_BEARING_GROUND_DEEPSLATE = tag("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 IOptionalNamedTag ORE_BEARING_GROUND_NETHERRACK = tag("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 IOptionalNamedTag ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); + /** + * Ores which on average result in more than one resource worth of materials + */ + public static final IOptionalNamedTag ORE_RATES_DENSE = tag("ore_rates/dense"); + /** + * Ores which on average result in one resource worth of materials + */ + public static final IOptionalNamedTag ORE_RATES_SINGULAR = tag("ore_rates/singular"); + /** + * Ores which on average result in less than one resource worth of materials + */ + public static final IOptionalNamedTag ORE_RATES_SPARSE = tag("ore_rates/sparse"); public static final IOptionalNamedTag ORES = tag("ores"); public static final IOptionalNamedTag ORES_COAL = tag("ores/coal"); + public static final IOptionalNamedTag ORES_COPPER = tag("ores/copper"); public static final IOptionalNamedTag ORES_DIAMOND = tag("ores/diamond"); public static final IOptionalNamedTag ORES_EMERALD = tag("ores/emerald"); public static final IOptionalNamedTag ORES_GOLD = tag("ores/gold"); @@ -114,6 +142,18 @@ public class Tags public static final IOptionalNamedTag ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap"); public static final IOptionalNamedTag ORES_QUARTZ = tag("ores/quartz"); public static final IOptionalNamedTag 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 IOptionalNamedTag 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 IOptionalNamedTag 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 IOptionalNamedTag ORES_IN_GROUND_STONE = tag("ores_in_ground/stone"); public static final IOptionalNamedTag SAND = tag("sand"); public static final IOptionalNamedTag SAND_COLORLESS = tag("sand/colorless"); @@ -124,7 +164,9 @@ public class Tags public static final IOptionalNamedTag STAINED_GLASS_PANES = tag("stained_glass_panes"); public static final IOptionalNamedTag STONE = tag("stone"); public static final IOptionalNamedTag STORAGE_BLOCKS = tag("storage_blocks"); + public static final IOptionalNamedTag STORAGE_BLOCKS_AMETHYST = tag("storage_blocks/amethyst"); public static final IOptionalNamedTag STORAGE_BLOCKS_COAL = tag("storage_blocks/coal"); + public static final IOptionalNamedTag STORAGE_BLOCKS_COPPER = tag("storage_blocks/copper"); public static final IOptionalNamedTag STORAGE_BLOCKS_DIAMOND = tag("storage_blocks/diamond"); public static final IOptionalNamedTag STORAGE_BLOCKS_EMERALD = tag("storage_blocks/emerald"); public static final IOptionalNamedTag STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold"); @@ -132,6 +174,9 @@ public class Tags public static final IOptionalNamedTag STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis"); public static final IOptionalNamedTag STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite"); public static final IOptionalNamedTag STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz"); + public static final IOptionalNamedTag STORAGE_BLOCKS_RAW_COPPER = tag("storage_blocks/raw_copper"); + public static final IOptionalNamedTag STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold"); + public static final IOptionalNamedTag STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron"); public static final IOptionalNamedTag STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); public static final IOptionalNamedTag NEEDS_WOOD_TOOL = tag("needs_wood_tool"); @@ -199,6 +244,7 @@ public class Tags public static final IOptionalNamedTag GEMS = tag("gems"); public static final IOptionalNamedTag GEMS_DIAMOND = tag("gems/diamond"); public static final IOptionalNamedTag GEMS_EMERALD = tag("gems/emerald"); + public static final IOptionalNamedTag GEMS_AMETHYST = tag("gems/amethyst"); public static final IOptionalNamedTag GEMS_LAPIS = tag("gems/lapis"); public static final IOptionalNamedTag GEMS_PRISMARINE = tag("gems/prismarine"); public static final IOptionalNamedTag GEMS_QUARTZ = tag("gems/quartz"); @@ -219,6 +265,11 @@ public class Tags public static final IOptionalNamedTag GLASS_PINK = tag("glass/pink"); public static final IOptionalNamedTag GLASS_PURPLE = tag("glass/purple"); public static final IOptionalNamedTag GLASS_RED = tag("glass/red"); + /** + * Glass which is made from sand and only minor additional ingredients like dyes + */ + public static final IOptionalNamedTag GLASS_SILICA = tag("glass/silica"); + public static final IOptionalNamedTag GLASS_TINTED = tag("glass/tinted"); public static final IOptionalNamedTag GLASS_WHITE = tag("glass/white"); public static final IOptionalNamedTag GLASS_YELLOW = tag("glass/yellow"); @@ -246,6 +297,7 @@ public class Tags public static final IOptionalNamedTag HEADS = tag("heads"); public static final IOptionalNamedTag INGOTS = tag("ingots"); public static final IOptionalNamedTag INGOTS_BRICK = tag("ingots/brick"); + public static final IOptionalNamedTag INGOTS_COPPER = tag("ingots/copper"); public static final IOptionalNamedTag INGOTS_GOLD = tag("ingots/gold"); public static final IOptionalNamedTag INGOTS_IRON = tag("ingots/iron"); public static final IOptionalNamedTag INGOTS_NETHERITE = tag("ingots/netherite"); @@ -258,8 +310,33 @@ public class Tags public static final IOptionalNamedTag NUGGETS_GOLD = tag("nuggets/gold"); public static final IOptionalNamedTag NUGGETS_IRON = tag("nuggets/iron"); public static final IOptionalNamedTag 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 + */ + public static final IOptionalNamedTag ORE_BEARING_GROUND_DEEPSLATE = tag("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 IOptionalNamedTag ORE_BEARING_GROUND_NETHERRACK = tag("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 IOptionalNamedTag ORE_BEARING_GROUND_STONE = tag("ore_bearing_ground/stone"); + /** + * Ores which on average result in more than one resource worth of materials + */ + public static final IOptionalNamedTag ORE_RATES_DENSE = tag("ore_rates/dense"); + /** + * Ores which on average result in one resource worth of materials + */ + public static final IOptionalNamedTag ORE_RATES_SINGULAR = tag("ore_rates/singular"); + /** + * Ores which on average result in less than one resource worth of materials + */ + public static final IOptionalNamedTag ORE_RATES_SPARSE = tag("ore_rates/sparse"); public static final IOptionalNamedTag ORES = tag("ores"); public static final IOptionalNamedTag ORES_COAL = tag("ores/coal"); + public static final IOptionalNamedTag ORES_COPPER = tag("ores/copper"); public static final IOptionalNamedTag ORES_DIAMOND = tag("ores/diamond"); public static final IOptionalNamedTag ORES_EMERALD = tag("ores/emerald"); public static final IOptionalNamedTag ORES_GOLD = tag("ores/gold"); @@ -268,6 +345,22 @@ public class Tags public static final IOptionalNamedTag ORES_NETHERITE_SCRAP = tag("ores/netherite_scrap"); public static final IOptionalNamedTag ORES_QUARTZ = tag("ores/quartz"); public static final IOptionalNamedTag 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 IOptionalNamedTag 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 IOptionalNamedTag 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 IOptionalNamedTag ORES_IN_GROUND_STONE = tag("ores_in_ground/stone"); + public static final IOptionalNamedTag RAW_MATERIALS = tag("raw_materials"); + public static final IOptionalNamedTag RAW_MATERIALS_COPPER = tag("raw_materials/copper"); + public static final IOptionalNamedTag RAW_MATERIALS_GOLD = tag("raw_materials/gold"); + public static final IOptionalNamedTag RAW_MATERIALS_IRON = tag("raw_materials/iron"); public static final IOptionalNamedTag RODS = tag("rods"); public static final IOptionalNamedTag RODS_BLAZE = tag("rods/blaze"); public static final IOptionalNamedTag RODS_WOODEN = tag("rods/wooden"); @@ -288,7 +381,9 @@ public class Tags public static final IOptionalNamedTag STAINED_GLASS_PANES = tag("stained_glass_panes"); public static final IOptionalNamedTag STONE = tag("stone"); public static final IOptionalNamedTag STORAGE_BLOCKS = tag("storage_blocks"); + public static final IOptionalNamedTag STORAGE_BLOCKS_AMETHYST = tag("storage_blocks/amethyst"); public static final IOptionalNamedTag STORAGE_BLOCKS_COAL = tag("storage_blocks/coal"); + public static final IOptionalNamedTag STORAGE_BLOCKS_COPPER = tag("storage_blocks/copper"); public static final IOptionalNamedTag STORAGE_BLOCKS_DIAMOND = tag("storage_blocks/diamond"); public static final IOptionalNamedTag STORAGE_BLOCKS_EMERALD = tag("storage_blocks/emerald"); public static final IOptionalNamedTag STORAGE_BLOCKS_GOLD = tag("storage_blocks/gold"); @@ -296,6 +391,9 @@ public class Tags public static final IOptionalNamedTag STORAGE_BLOCKS_LAPIS = tag("storage_blocks/lapis"); public static final IOptionalNamedTag STORAGE_BLOCKS_NETHERITE = tag("storage_blocks/netherite"); public static final IOptionalNamedTag STORAGE_BLOCKS_QUARTZ = tag("storage_blocks/quartz"); + public static final IOptionalNamedTag STORAGE_BLOCKS_RAW_COPPER = tag("storage_blocks/raw_copper"); + public static final IOptionalNamedTag STORAGE_BLOCKS_RAW_GOLD = tag("storage_blocks/raw_gold"); + public static final IOptionalNamedTag STORAGE_BLOCKS_RAW_IRON = tag("storage_blocks/raw_iron"); public static final IOptionalNamedTag STORAGE_BLOCKS_REDSTONE = tag("storage_blocks/redstone"); public static final IOptionalNamedTag STRING = tag("string"); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index 19e82a2d7f..7e78d8eec4 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -20,21 +20,21 @@ package net.minecraftforge.common.data; import net.minecraft.data.DataGenerator; -import net.minecraft.world.item.DyeColor; +import net.minecraft.data.tags.BlockTagsProvider; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.Tag; -import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.common.Tags; -import net.minecraftforge.registries.ForgeRegistries; +import net.minecraft.world.item.DyeColor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.data.tags.BlockTagsProvider; - -import static net.minecraftforge.common.Tags.Blocks.*; +import net.minecraftforge.common.Tags; +import net.minecraftforge.registries.ForgeRegistries; import java.util.Locale; import java.util.function.Consumer; +import static net.minecraftforge.common.Tags.Blocks.*; + public final class ForgeBlockTagsProvider extends BlockTagsProvider { public ForgeBlockTagsProvider(DataGenerator gen, ExistingFileHelper existingFileHelper) @@ -52,17 +52,18 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider 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).add(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE); - tag(DIRT).add(Blocks.DIRT, Blocks.GRASS_BLOCK, Blocks.COARSE_DIRT, Blocks.PODZOL, Blocks.MYCELIUM); + tag(COBBLESTONE).add(Blocks.COBBLESTONE, Blocks.INFESTED_COBBLESTONE, Blocks.MOSSY_COBBLESTONE, Blocks.COBBLED_DEEPSLATE); tag(END_STONES).add(Blocks.END_STONE); tag(ENDERMAN_PLACE_ON_BLACKLIST); tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN); tag(FENCE_GATES_WOODEN).add(Blocks.OAK_FENCE_GATE, Blocks.SPRUCE_FENCE_GATE, Blocks.BIRCH_FENCE_GATE, Blocks.JUNGLE_FENCE_GATE, Blocks.ACACIA_FENCE_GATE, Blocks.DARK_OAK_FENCE_GATE, Blocks.CRIMSON_FENCE_GATE, Blocks.WARPED_FENCE_GATE); tag(FENCES).addTags(FENCES_NETHER_BRICK, FENCES_WOODEN); tag(FENCES_NETHER_BRICK).add(Blocks.NETHER_BRICK_FENCE); - tag(FENCES_WOODEN).add(Blocks.OAK_FENCE, Blocks.SPRUCE_FENCE, Blocks.BIRCH_FENCE, Blocks.JUNGLE_FENCE, Blocks.ACACIA_FENCE, Blocks.DARK_OAK_FENCE, Blocks.CRIMSON_FENCE, Blocks.WARPED_FENCE); - tag(GLASS).addTags(GLASS_COLORLESS, STAINED_GLASS); + 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_PANES_COLORLESS).add(Blocks.GLASS_PANE); @@ -70,29 +71,44 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider tag(GRAVEL).add(Blocks.GRAVEL); tag(NETHERRACK).add(Blocks.NETHERRACK); tag(OBSIDIAN).add(Blocks.OBSIDIAN); - tag(ORES).addTags(ORES_COAL, ORES_DIAMOND, ORES_EMERALD, ORES_GOLD, ORES_IRON, ORES_LAPIS, ORES_REDSTONE, ORES_QUARTZ, ORES_NETHERITE_SCRAP); - tag(ORES_COAL).add(Blocks.COAL_ORE); - tag(ORES_DIAMOND).add(Blocks.DIAMOND_ORE); - tag(ORES_EMERALD).add(Blocks.EMERALD_ORE); + 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_COAL).addTag(BlockTags.COAL_ORES); + tag(ORES_COPPER).addTag(BlockTags.COPPER_ORES); + tag(ORES_DIAMOND).addTag(BlockTags.DIAMOND_ORES); + tag(ORES_EMERALD).addTag(BlockTags.EMERALD_ORES); tag(ORES_GOLD).addTag(BlockTags.GOLD_ORES); - tag(ORES_IRON).add(Blocks.IRON_ORE); - tag(ORES_LAPIS).add(Blocks.LAPIS_ORE); + tag(ORES_IRON).addTag(BlockTags.IRON_ORES); + tag(ORES_LAPIS).addTag(BlockTags.LAPIS_ORES); tag(ORES_QUARTZ).add(Blocks.NETHER_QUARTZ_ORE); - tag(ORES_REDSTONE).add(Blocks.REDSTONE_ORE); + tag(ORES_REDSTONE).addTag(BlockTags.REDSTONE_ORES); tag(ORES_NETHERITE_SCRAP).add(Blocks.ANCIENT_DEBRIS); + 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(SAND).addTags(SAND_COLORLESS, SAND_RED); 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); - tag(STORAGE_BLOCKS).addTags(STORAGE_BLOCKS_COAL, STORAGE_BLOCKS_DIAMOND, STORAGE_BLOCKS_EMERALD, STORAGE_BLOCKS_GOLD, STORAGE_BLOCKS_IRON, STORAGE_BLOCKS_LAPIS, STORAGE_BLOCKS_QUARTZ, STORAGE_BLOCKS_REDSTONE, STORAGE_BLOCKS_NETHERITE); + 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(STORAGE_BLOCKS_COAL).add(Blocks.COAL_BLOCK); + tag(STORAGE_BLOCKS_COPPER).add(Blocks.COPPER_BLOCK, Blocks.CUT_COPPER); tag(STORAGE_BLOCKS_DIAMOND).add(Blocks.DIAMOND_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_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); } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 9cfd7ac33f..60efcb4dbb 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -19,21 +19,21 @@ package net.minecraftforge.common.data; -import java.util.Locale; -import java.util.function.Consumer; - -import net.minecraft.world.level.block.Block; -import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.DataGenerator; +import net.minecraft.data.tags.BlockTagsProvider; import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.Tag; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; -import net.minecraft.tags.Tag; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; import net.minecraftforge.common.Tags; import net.minecraftforge.registries.ForgeRegistries; +import java.util.Locale; +import java.util.function.Consumer; + public final class ForgeItemTagsProvider extends ItemTagsProvider { public ForgeItemTagsProvider(DataGenerator gen, BlockTagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) @@ -75,21 +75,25 @@ 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.GEMS).addTags(Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ); + tag(Tags.Items.GEMS).addTags(Tags.Items.GEMS_AMETHYST, Tags.Items.GEMS_DIAMOND, Tags.Items.GEMS_EMERALD, Tags.Items.GEMS_LAPIS, Tags.Items.GEMS_PRISMARINE, Tags.Items.GEMS_QUARTZ); + tag(Tags.Items.GEMS_AMETHYST).add(Items.AMETHYST_SHARD); tag(Tags.Items.GEMS_DIAMOND).add(Items.DIAMOND); tag(Tags.Items.GEMS_EMERALD).add(Items.EMERALD); tag(Tags.Items.GEMS_LAPIS).add(Items.LAPIS_LAZULI); tag(Tags.Items.GEMS_PRISMARINE).add(Items.PRISMARINE_CRYSTALS); tag(Tags.Items.GEMS_QUARTZ).add(Items.QUARTZ); 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_PANES, Tags.Items.GLASS_PANES); copyColored(Tags.Blocks.GLASS_PANES, Tags.Items.GLASS_PANES); 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_IRON, Tags.Items.INGOTS_GOLD, Tags.Items.INGOTS_BRICK, Tags.Items.INGOTS_NETHER_BRICK, Tags.Items.INGOTS_NETHERITE); + 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.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); @@ -102,8 +106,15 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider 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.ORE_BEARING_GROUND_DEEPSLATE, Tags.Items.ORE_BEARING_GROUND_DEEPSLATE); + copy(Tags.Blocks.ORE_BEARING_GROUND_NETHERRACK, Tags.Items.ORE_BEARING_GROUND_NETHERRACK); + copy(Tags.Blocks.ORE_BEARING_GROUND_STONE, Tags.Items.ORE_BEARING_GROUND_STONE); + copy(Tags.Blocks.ORE_RATES_DENSE, Tags.Items.ORE_RATES_DENSE); + copy(Tags.Blocks.ORE_RATES_SINGULAR, Tags.Items.ORE_RATES_SINGULAR); + copy(Tags.Blocks.ORE_RATES_SPARSE, Tags.Items.ORE_RATES_SPARSE); copy(Tags.Blocks.ORES, Tags.Items.ORES); copy(Tags.Blocks.ORES_COAL, Tags.Items.ORES_COAL); + copy(Tags.Blocks.ORES_COPPER, Tags.Items.ORES_COPPER); copy(Tags.Blocks.ORES_DIAMOND, Tags.Items.ORES_DIAMOND); copy(Tags.Blocks.ORES_EMERALD, Tags.Items.ORES_EMERALD); copy(Tags.Blocks.ORES_GOLD, Tags.Items.ORES_GOLD); @@ -112,6 +123,13 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.ORES_QUARTZ, Tags.Items.ORES_QUARTZ); copy(Tags.Blocks.ORES_REDSTONE, Tags.Items.ORES_REDSTONE); copy(Tags.Blocks.ORES_NETHERITE_SCRAP, Tags.Items.ORES_NETHERITE_SCRAP); + copy(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE, Tags.Items.ORES_IN_GROUND_DEEPSLATE); + copy(Tags.Blocks.ORES_IN_GROUND_NETHERRACK, Tags.Items.ORES_IN_GROUND_NETHERRACK); + copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE); + tag(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_BLAZE).add(Items.BLAZE_ROD); tag(Tags.Items.RODS_WOODEN).add(Items.STICK); @@ -130,7 +148,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.STAINED_GLASS_PANES, Tags.Items.STAINED_GLASS_PANES); copy(Tags.Blocks.STONE, Tags.Items.STONE); 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_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_EMERALD, Tags.Items.STORAGE_BLOCKS_EMERALD); copy(Tags.Blocks.STORAGE_BLOCKS_GOLD, Tags.Items.STORAGE_BLOCKS_GOLD); @@ -138,6 +158,9 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider 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_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); } diff --git a/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java index aedc0ba12c..053c23b04d 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java @@ -19,37 +19,31 @@ package net.minecraftforge.common.data; -import java.lang.reflect.Field; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Consumer; - import com.google.gson.JsonObject; - -import net.minecraft.world.level.block.Blocks; import net.minecraft.data.DataGenerator; import net.minecraft.data.HashCache; import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; -import net.minecraft.world.item.crafting.Ingredient.Value; -import net.minecraft.world.item.crafting.Ingredient.TagValue; import net.minecraft.world.item.crafting.Ingredient.ItemValue; -import net.minecraft.tags.Tag; +import net.minecraft.world.item.crafting.Ingredient.TagValue; +import net.minecraft.world.item.crafting.Ingredient.Value; import net.minecraft.world.level.ItemLike; -import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Blocks; import net.minecraftforge.common.Tags; +import java.lang.reflect.Field; +import java.nio.file.Path; +import java.util.*; +import java.util.function.Consumer; + public final class ForgeRecipeProvider extends RecipeProvider { private Map> replacements = new HashMap<>(); @@ -77,6 +71,8 @@ public final class ForgeRecipeProvider extends RecipeProvider replace(Items.GOLD_INGOT, Tags.Items.INGOTS_GOLD); replace(Items.IRON_INGOT, Tags.Items.INGOTS_IRON); replace(Items.NETHERITE_INGOT, Tags.Items.INGOTS_NETHERITE); + replace(Items.COPPER_INGOT, Tags.Items.INGOTS_COPPER); + replace(Items.AMETHYST_SHARD, Tags.Items.GEMS_AMETHYST); replace(Items.DIAMOND, Tags.Items.GEMS_DIAMOND); replace(Items.EMERALD, Tags.Items.GEMS_EMERALD); replace(Items.CHEST, Tags.Items.CHESTS_WOODEN); @@ -89,10 +85,15 @@ public final class ForgeRecipeProvider extends RecipeProvider exclude(Blocks.DIAMOND_BLOCK); exclude(Blocks.EMERALD_BLOCK); exclude(Blocks.NETHERITE_BLOCK); + exclude(Blocks.COPPER_BLOCK); + exclude(Blocks.AMETHYST_BLOCK); exclude(Blocks.COBBLESTONE_STAIRS); exclude(Blocks.COBBLESTONE_SLAB); exclude(Blocks.COBBLESTONE_WALL); + exclude(Blocks.COBBLED_DEEPSLATE_STAIRS); + exclude(Blocks.COBBLED_DEEPSLATE_SLAB); + exclude(Blocks.COBBLED_DEEPSLATE_WALL); super.buildCraftingRecipes(vanilla -> { FinishedRecipe modified = enhance(vanilla);