From 618da273dc4f22cfc605ae9caf5d7174323f9728 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Sat, 26 Oct 2024 19:47:54 +0100 Subject: [PATCH] Add `c:stripped_logs` and `c:stripped_woods` tags (#10136) --- .../generated/data/c/tags/block/stripped_logs.json | 13 +++++++++++++ .../generated/data/c/tags/block/stripped_woods.json | 12 ++++++++++++ .../generated/data/c/tags/item/stripped_logs.json | 13 +++++++++++++ .../generated/data/c/tags/item/stripped_woods.json | 12 ++++++++++++ src/main/java/net/minecraftforge/common/Tags.java | 4 ++++ .../common/data/ForgeBlockTagsProvider.java | 8 ++++++++ .../common/data/ForgeItemTagsProvider.java | 2 ++ 7 files changed, 64 insertions(+) create mode 100644 src/main/generated/data/c/tags/block/stripped_logs.json create mode 100644 src/main/generated/data/c/tags/block/stripped_woods.json create mode 100644 src/main/generated/data/c/tags/item/stripped_logs.json create mode 100644 src/main/generated/data/c/tags/item/stripped_woods.json diff --git a/src/main/generated/data/c/tags/block/stripped_logs.json b/src/main/generated/data/c/tags/block/stripped_logs.json new file mode 100644 index 0000000000..ae69c996ad --- /dev/null +++ b/src/main/generated/data/c/tags/block/stripped_logs.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:stripped_acacia_log", + "minecraft:stripped_bamboo_block", + "minecraft:stripped_birch_log", + "minecraft:stripped_cherry_log", + "minecraft:stripped_dark_oak_log", + "minecraft:stripped_jungle_log", + "minecraft:stripped_mangrove_log", + "minecraft:stripped_oak_log", + "minecraft:stripped_spruce_log" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/stripped_woods.json b/src/main/generated/data/c/tags/block/stripped_woods.json new file mode 100644 index 0000000000..197542891d --- /dev/null +++ b/src/main/generated/data/c/tags/block/stripped_woods.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:stripped_acacia_wood", + "minecraft:stripped_birch_wood", + "minecraft:stripped_cherry_wood", + "minecraft:stripped_dark_oak_wood", + "minecraft:stripped_jungle_wood", + "minecraft:stripped_mangrove_wood", + "minecraft:stripped_oak_wood", + "minecraft:stripped_spruce_wood" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/stripped_logs.json b/src/main/generated/data/c/tags/item/stripped_logs.json new file mode 100644 index 0000000000..ae69c996ad --- /dev/null +++ b/src/main/generated/data/c/tags/item/stripped_logs.json @@ -0,0 +1,13 @@ +{ + "values": [ + "minecraft:stripped_acacia_log", + "minecraft:stripped_bamboo_block", + "minecraft:stripped_birch_log", + "minecraft:stripped_cherry_log", + "minecraft:stripped_dark_oak_log", + "minecraft:stripped_jungle_log", + "minecraft:stripped_mangrove_log", + "minecraft:stripped_oak_log", + "minecraft:stripped_spruce_log" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/stripped_woods.json b/src/main/generated/data/c/tags/item/stripped_woods.json new file mode 100644 index 0000000000..197542891d --- /dev/null +++ b/src/main/generated/data/c/tags/item/stripped_woods.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:stripped_acacia_wood", + "minecraft:stripped_birch_wood", + "minecraft:stripped_cherry_wood", + "minecraft:stripped_dark_oak_wood", + "minecraft:stripped_jungle_wood", + "minecraft:stripped_mangrove_wood", + "minecraft:stripped_oak_wood", + "minecraft:stripped_spruce_wood" + ] +} \ 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 7d6cd5e1af..d2f40eaebd 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -243,6 +243,8 @@ public class Tags { public static final TagKey STORAGE_BLOCKS_REDSTONE = cTag("storage_blocks/redstone"); public static final TagKey STORAGE_BLOCKS_SLIME = cTag("storage_blocks/slime"); public static final TagKey STORAGE_BLOCKS_WHEAT = cTag("storage_blocks/wheat"); + public static final TagKey STRIPPED_LOGS = cTag("stripped_logs"); + public static final TagKey STRIPPED_WOODS = cTag("stripped_woods"); public static final TagKey VILLAGER_JOB_SITES = cTag("villager_job_sites"); //endregion @@ -775,6 +777,8 @@ public class Tags { public static final TagKey STORAGE_BLOCKS_SLIME = cTag("storage_blocks/slime"); public static final TagKey STORAGE_BLOCKS_WHEAT = cTag("storage_blocks/wheat"); public static final TagKey STRINGS = cTag("strings"); + public static final TagKey STRIPPED_LOGS = cTag("stripped_logs"); + public static final TagKey STRIPPED_WOODS = cTag("stripped_woods"); public static final TagKey VILLAGER_JOB_SITES = cTag("villager_job_sites"); // Tools and Armors diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index b8a5196061..f3c22aaf4d 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -216,6 +216,14 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { .addOptionalTag(forgeTagKey("storage_blocks/redstone")); tag(STORAGE_BLOCKS_SLIME).add(Blocks.SLIME_BLOCK); tag(STORAGE_BLOCKS_WHEAT).add(Blocks.HAY_BLOCK); + tag(Tags.Blocks.STRIPPED_LOGS).add( + Blocks.STRIPPED_ACACIA_LOG, Blocks.STRIPPED_BAMBOO_BLOCK, Blocks.STRIPPED_BIRCH_LOG, + Blocks.STRIPPED_CHERRY_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_JUNGLE_LOG, + Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_OAK_LOG, Blocks.STRIPPED_SPRUCE_LOG); + tag(Tags.Blocks.STRIPPED_WOODS).add( + Blocks.STRIPPED_ACACIA_WOOD, Blocks.STRIPPED_BIRCH_WOOD, Blocks.STRIPPED_CHERRY_WOOD, + Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD, + Blocks.STRIPPED_OAK_WOOD, Blocks.STRIPPED_SPRUCE_WOOD); tag(VILLAGER_JOB_SITES).add( Blocks.BARREL, Blocks.BLAST_FURNACE, Blocks.BREWING_STAND, Blocks.CARTOGRAPHY_TABLE, Blocks.CAULDRON, Blocks.WATER_CAULDRON, Blocks.LAVA_CAULDRON, Blocks.POWDER_SNOW_CAULDRON, diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 5dadbd70c8..c3b61980fa 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -326,6 +326,8 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { tag(Tags.Items.STRINGS) .add(Items.STRING) .addOptionalTag(forgeItemTagKey("strings")); + copy(Tags.Blocks.STRIPPED_LOGS, Tags.Items.STRIPPED_LOGS); + copy(Tags.Blocks.STRIPPED_WOODS, Tags.Items.STRIPPED_WOODS); tag(Tags.Items.VILLAGER_JOB_SITES).add( Items.BARREL, Items.BLAST_FURNACE, Items.BREWING_STAND, Items.CARTOGRAPHY_TABLE, Items.CAULDRON, Items.COMPOSTER, Items.FLETCHING_TABLE, Items.GRINDSTONE,