From b129e385cc879b34ba9f945f32b5b428f126232d Mon Sep 17 00:00:00 2001 From: Bagel <55970498+bageldotjpg@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:39:44 -0600 Subject: [PATCH] Update cobblestone tags (#8292) --- .../data/forge/tags/blocks/cobblestone.json | 8 ++++---- .../forge/tags/blocks/cobblestone/deepslate.json | 6 ++++++ .../forge/tags/blocks/cobblestone/infested.json | 6 ++++++ .../forge/tags/blocks/cobblestone/mossy.json | 6 ++++++ .../forge/tags/blocks/cobblestone/normal.json | 6 ++++++ .../data/forge/tags/items/cobblestone.json | 8 ++++---- .../forge/tags/items/cobblestone/deepslate.json | 6 ++++++ .../forge/tags/items/cobblestone/infested.json | 6 ++++++ .../data/forge/tags/items/cobblestone/mossy.json | 6 ++++++ .../forge/tags/items/cobblestone/normal.json | 6 ++++++ .../data/minecraft/recipes/andesite.json | 2 +- .../data/minecraft/recipes/diorite.json | 2 +- .../data/minecraft/recipes/dispenser.json | 2 +- .../data/minecraft/recipes/dropper.json | 2 +- .../resources/data/minecraft/recipes/lever.json | 2 +- .../mossy_cobblestone_from_moss_block.json | 2 +- .../recipes/mossy_cobblestone_from_vine.json | 2 +- .../data/minecraft/recipes/observer.json | 2 +- .../resources/data/minecraft/recipes/piston.json | 2 +- .../minecraft/recipes/polished_deepslate.json | 16 ++++++++++++++++ .../java/net/minecraftforge/common/Tags.java | 8 ++++++++ .../common/data/ForgeBlockTagsProvider.java | 6 +++++- .../common/data/ForgeItemTagsProvider.java | 4 ++++ .../common/data/ForgeRecipeProvider.java | 3 ++- 24 files changed, 100 insertions(+), 19 deletions(-) create mode 100644 src/generated/resources/data/forge/tags/blocks/cobblestone/deepslate.json create mode 100644 src/generated/resources/data/forge/tags/blocks/cobblestone/infested.json create mode 100644 src/generated/resources/data/forge/tags/blocks/cobblestone/mossy.json create mode 100644 src/generated/resources/data/forge/tags/blocks/cobblestone/normal.json create mode 100644 src/generated/resources/data/forge/tags/items/cobblestone/deepslate.json create mode 100644 src/generated/resources/data/forge/tags/items/cobblestone/infested.json create mode 100644 src/generated/resources/data/forge/tags/items/cobblestone/mossy.json create mode 100644 src/generated/resources/data/forge/tags/items/cobblestone/normal.json create mode 100644 src/generated/resources/data/minecraft/recipes/polished_deepslate.json diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone.json b/src/generated/resources/data/forge/tags/blocks/cobblestone.json index 0a1b8b85b0..f0884a6f52 100644 --- a/src/generated/resources/data/forge/tags/blocks/cobblestone.json +++ b/src/generated/resources/data/forge/tags/blocks/cobblestone.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "minecraft:cobblestone", - "minecraft:infested_cobblestone", - "minecraft:mossy_cobblestone", - "minecraft:cobbled_deepslate" + "#forge:cobblestone/normal", + "#forge:cobblestone/infested", + "#forge:cobblestone/mossy", + "#forge:cobblestone/deepslate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/deepslate.json b/src/generated/resources/data/forge/tags/blocks/cobblestone/deepslate.json new file mode 100644 index 0000000000..f4e249492e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/cobblestone/deepslate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cobbled_deepslate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/infested.json b/src/generated/resources/data/forge/tags/blocks/cobblestone/infested.json new file mode 100644 index 0000000000..7fdfc6eff3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/cobblestone/infested.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:infested_cobblestone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/mossy.json b/src/generated/resources/data/forge/tags/blocks/cobblestone/mossy.json new file mode 100644 index 0000000000..8bd3f8b93b --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/cobblestone/mossy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:mossy_cobblestone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone/normal.json b/src/generated/resources/data/forge/tags/blocks/cobblestone/normal.json new file mode 100644 index 0000000000..5f9fcb470f --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/cobblestone/normal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cobblestone" + ] +} \ 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 0a1b8b85b0..f0884a6f52 100644 --- a/src/generated/resources/data/forge/tags/items/cobblestone.json +++ b/src/generated/resources/data/forge/tags/items/cobblestone.json @@ -1,9 +1,9 @@ { "replace": false, "values": [ - "minecraft:cobblestone", - "minecraft:infested_cobblestone", - "minecraft:mossy_cobblestone", - "minecraft:cobbled_deepslate" + "#forge:cobblestone/normal", + "#forge:cobblestone/infested", + "#forge:cobblestone/mossy", + "#forge:cobblestone/deepslate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/deepslate.json b/src/generated/resources/data/forge/tags/items/cobblestone/deepslate.json new file mode 100644 index 0000000000..f4e249492e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/cobblestone/deepslate.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cobbled_deepslate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/infested.json b/src/generated/resources/data/forge/tags/items/cobblestone/infested.json new file mode 100644 index 0000000000..7fdfc6eff3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/cobblestone/infested.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:infested_cobblestone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/mossy.json b/src/generated/resources/data/forge/tags/items/cobblestone/mossy.json new file mode 100644 index 0000000000..8bd3f8b93b --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/cobblestone/mossy.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:mossy_cobblestone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/cobblestone/normal.json b/src/generated/resources/data/forge/tags/items/cobblestone/normal.json new file mode 100644 index 0000000000..5f9fcb470f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/cobblestone/normal.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:cobblestone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/andesite.json b/src/generated/resources/data/minecraft/recipes/andesite.json index 341fac8343..fe7d03f87a 100644 --- a/src/generated/resources/data/minecraft/recipes/andesite.json +++ b/src/generated/resources/data/minecraft/recipes/andesite.json @@ -5,7 +5,7 @@ "item": "minecraft:diorite" }, { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" } ], "result": { diff --git a/src/generated/resources/data/minecraft/recipes/diorite.json b/src/generated/resources/data/minecraft/recipes/diorite.json index ba388785e2..c5f2602854 100644 --- a/src/generated/resources/data/minecraft/recipes/diorite.json +++ b/src/generated/resources/data/minecraft/recipes/diorite.json @@ -9,7 +9,7 @@ "item": "minecraft:quartz" }, "C": { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/dispenser.json b/src/generated/resources/data/minecraft/recipes/dispenser.json index cad5713b3d..9087492631 100644 --- a/src/generated/resources/data/minecraft/recipes/dispenser.json +++ b/src/generated/resources/data/minecraft/recipes/dispenser.json @@ -10,7 +10,7 @@ "item": "minecraft:redstone" }, "#": { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" }, "X": { "item": "minecraft:bow" diff --git a/src/generated/resources/data/minecraft/recipes/dropper.json b/src/generated/resources/data/minecraft/recipes/dropper.json index b07cbf454f..b70b1e70bb 100644 --- a/src/generated/resources/data/minecraft/recipes/dropper.json +++ b/src/generated/resources/data/minecraft/recipes/dropper.json @@ -10,7 +10,7 @@ "item": "minecraft:redstone" }, "#": { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/lever.json b/src/generated/resources/data/minecraft/recipes/lever.json index 816e86ea17..a7d8a6286b 100644 --- a/src/generated/resources/data/minecraft/recipes/lever.json +++ b/src/generated/resources/data/minecraft/recipes/lever.json @@ -6,7 +6,7 @@ ], "key": { "#": { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" }, "X": { "tag": "forge:rods/wooden" diff --git a/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json b/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json index 220270b874..8efc93ccfd 100644 --- a/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json +++ b/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_moss_block.json @@ -3,7 +3,7 @@ "group": "mossy_cobblestone", "ingredients": [ { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" }, { "item": "minecraft:moss_block" diff --git a/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json b/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json index 454a627c30..01f166d9ff 100644 --- a/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json +++ b/src/generated/resources/data/minecraft/recipes/mossy_cobblestone_from_vine.json @@ -3,7 +3,7 @@ "group": "mossy_cobblestone", "ingredients": [ { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" }, { "item": "minecraft:vine" diff --git a/src/generated/resources/data/minecraft/recipes/observer.json b/src/generated/resources/data/minecraft/recipes/observer.json index 513e8d679c..8ddcd74282 100644 --- a/src/generated/resources/data/minecraft/recipes/observer.json +++ b/src/generated/resources/data/minecraft/recipes/observer.json @@ -13,7 +13,7 @@ "item": "minecraft:redstone" }, "#": { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" } }, "result": { diff --git a/src/generated/resources/data/minecraft/recipes/piston.json b/src/generated/resources/data/minecraft/recipes/piston.json index d0260fdcf4..0054012190 100644 --- a/src/generated/resources/data/minecraft/recipes/piston.json +++ b/src/generated/resources/data/minecraft/recipes/piston.json @@ -10,7 +10,7 @@ "item": "minecraft:redstone" }, "#": { - "tag": "forge:cobblestone" + "tag": "forge:cobblestone/normal" }, "T": { "tag": "minecraft:planks" diff --git a/src/generated/resources/data/minecraft/recipes/polished_deepslate.json b/src/generated/resources/data/minecraft/recipes/polished_deepslate.json new file mode 100644 index 0000000000..7cfd2069a2 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_deepslate.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "tag": "forge:cobblestone/deepslate" + } + }, + "result": { + "item": "minecraft:polished_deepslate", + "count": 4 + } +} \ 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 5cf6d67aca..b4e50f9323 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -53,6 +53,10 @@ 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 COBBLESTONE_NORMAL = tag("cobblestone/normal"); + public static final IOptionalNamedTag COBBLESTONE_INFESTED = tag("cobblestone/infested"); + public static final IOptionalNamedTag COBBLESTONE_MOSSY = tag("cobblestone/mossy"); + public static final IOptionalNamedTag COBBLESTONE_DEEPSLATE = tag("cobblestone/deepslate"); 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"); @@ -202,6 +206,10 @@ 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 COBBLESTONE_NORMAL = tag("cobblestone/normal"); + public static final IOptionalNamedTag COBBLESTONE_INFESTED = tag("cobblestone/infested"); + public static final IOptionalNamedTag COBBLESTONE_MOSSY = tag("cobblestone/mossy"); + public static final IOptionalNamedTag COBBLESTONE_DEEPSLATE = tag("cobblestone/deepslate"); public static final IOptionalNamedTag CROPS = tag("crops"); public static final IOptionalNamedTag CROPS_BEETROOT = tag("crops/beetroot"); public static final IOptionalNamedTag CROPS_CARROT = tag("crops/carrot"); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index 7e78d8eec4..561d459204 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -52,7 +52,11 @@ 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, Blocks.COBBLED_DEEPSLATE); + tag(COBBLESTONE).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(END_STONES).add(Blocks.END_STONE); tag(ENDERMAN_PLACE_ON_BLACKLIST); tag(FENCE_GATES).addTags(FENCE_GATES_WOODEN); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 60efcb4dbb..91fe498f63 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -54,6 +54,10 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider 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.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); tag(Tags.Items.CROPS_BEETROOT).add(Items.BEETROOT); tag(Tags.Items.CROPS_CARROT).add(Items.CARROT); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java index 053c23b04d..259d875a72 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeRecipeProvider.java @@ -76,7 +76,8 @@ public final class ForgeRecipeProvider extends RecipeProvider replace(Items.DIAMOND, Tags.Items.GEMS_DIAMOND); replace(Items.EMERALD, Tags.Items.GEMS_EMERALD); replace(Items.CHEST, Tags.Items.CHESTS_WOODEN); - replace(Blocks.COBBLESTONE, Tags.Items.COBBLESTONE); + replace(Blocks.COBBLESTONE, Tags.Items.COBBLESTONE_NORMAL); + replace(Blocks.COBBLED_DEEPSLATE, Tags.Items.COBBLESTONE_DEEPSLATE); exclude(Blocks.GOLD_BLOCK); exclude(Items.GOLD_NUGGET);