From 478d8b3f181220c9be6911311ed2177d07febc08 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Wed, 15 Apr 2026 22:20:21 +0100 Subject: [PATCH] Add `c:bars/copper` and `c:bars/iron` tags (#10810) --- src/main/generated/data/c/tags/block/bars.json | 7 +++++++ .../generated/data/c/tags/block/bars/copper.json | 12 ++++++++++++ src/main/generated/data/c/tags/block/bars/iron.json | 5 +++++ src/main/generated/data/c/tags/item/bars.json | 7 +++++++ src/main/generated/data/c/tags/item/bars/copper.json | 12 ++++++++++++ src/main/generated/data/c/tags/item/bars/iron.json | 5 +++++ src/main/java/net/minecraftforge/common/Tags.java | 12 ++++++++++++ .../common/data/ForgeBlockItemTagsProvider.java | 6 ++++++ .../common/data/ForgeBlockTagsProvider.java | 2 +- 9 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 src/main/generated/data/c/tags/block/bars.json create mode 100644 src/main/generated/data/c/tags/block/bars/copper.json create mode 100644 src/main/generated/data/c/tags/block/bars/iron.json create mode 100644 src/main/generated/data/c/tags/item/bars.json create mode 100644 src/main/generated/data/c/tags/item/bars/copper.json create mode 100644 src/main/generated/data/c/tags/item/bars/iron.json diff --git a/src/main/generated/data/c/tags/block/bars.json b/src/main/generated/data/c/tags/block/bars.json new file mode 100644 index 0000000000..4f62bc5ffc --- /dev/null +++ b/src/main/generated/data/c/tags/block/bars.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:bars/copper", + "#c:bars/iron", + "#minecraft:bars" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/bars/copper.json b/src/main/generated/data/c/tags/block/bars/copper.json new file mode 100644 index 0000000000..9364b27774 --- /dev/null +++ b/src/main/generated/data/c/tags/block/bars/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:copper_bars", + "minecraft:waxed_copper_bars", + "minecraft:exposed_copper_bars", + "minecraft:waxed_exposed_copper_bars", + "minecraft:weathered_copper_bars", + "minecraft:waxed_weathered_copper_bars", + "minecraft:oxidized_copper_bars", + "minecraft:waxed_oxidized_copper_bars" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/bars/iron.json b/src/main/generated/data/c/tags/block/bars/iron.json new file mode 100644 index 0000000000..ba12ec6f5a --- /dev/null +++ b/src/main/generated/data/c/tags/block/bars/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_bars" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bars.json b/src/main/generated/data/c/tags/item/bars.json new file mode 100644 index 0000000000..4f62bc5ffc --- /dev/null +++ b/src/main/generated/data/c/tags/item/bars.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:bars/copper", + "#c:bars/iron", + "#minecraft:bars" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bars/copper.json b/src/main/generated/data/c/tags/item/bars/copper.json new file mode 100644 index 0000000000..9364b27774 --- /dev/null +++ b/src/main/generated/data/c/tags/item/bars/copper.json @@ -0,0 +1,12 @@ +{ + "values": [ + "minecraft:copper_bars", + "minecraft:waxed_copper_bars", + "minecraft:exposed_copper_bars", + "minecraft:waxed_exposed_copper_bars", + "minecraft:weathered_copper_bars", + "minecraft:waxed_weathered_copper_bars", + "minecraft:oxidized_copper_bars", + "minecraft:waxed_oxidized_copper_bars" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/bars/iron.json b/src/main/generated/data/c/tags/item/bars/iron.json new file mode 100644 index 0000000000..ba12ec6f5a --- /dev/null +++ b/src/main/generated/data/c/tags/item/bars/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:iron_bars" + ] +} \ 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 6d3d3eea02..8e77c1397b 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -62,6 +62,12 @@ public class Tags { // Forge only adopts `c` tags that are common across all loaders. public static final TagKey BARRELS = cTag("barrels"); public static final TagKey BARRELS_WOODEN = cTag("barrels/wooden"); + /** + * Equivalent to the "minecraft:bars" block tag. + */ + public static final TagKey BARS = cTag("bars"); + public static final TagKey BARS_COPPER = cTag("bars/copper"); + public static final TagKey BARS_IRON = cTag("bars/iron"); public static final TagKey BOOKSHELVES = cTag("bookshelves"); /** * For blocks that are similar to amethyst where their budding block produces buds and cluster blocks @@ -349,6 +355,12 @@ public class Tags { // Forge only adopts `c` tags that are common across all loaders. public static final TagKey BARRELS = cTag("barrels"); public static final TagKey BARRELS_WOODEN = cTag("barrels/wooden"); + /** + * Equivalent to the "minecraft:bars" item tag. + */ + public static final TagKey BARS = cTag("bars"); + public static final TagKey BARS_COPPER = cTag("bars/copper"); + public static final TagKey BARS_IRON = cTag("bars/iron"); public static final TagKey BONES = cTag("bones"); public static final TagKey BOOKSHELVES = cTag("bookshelves"); public static final TagKey BRICKS = cTag("bricks"); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockItemTagsProvider.java index d64ccb56d7..e7e52085f0 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockItemTagsProvider.java @@ -28,6 +28,12 @@ public abstract class ForgeBlockItemTagsProvider extends BlockItemTagsProvider { .addTag(Tags.Blocks.BARRELS_WOODEN); tag(Tags.Blocks.BARRELS_WOODEN, Tags.Items.BARRELS_WOODEN) .add(Blocks.BARREL); + tag(Tags.Blocks.BARS_COPPER, Tags.Items.BARS_COPPER) + .addAll(Blocks.COPPER_BARS.asList()); + tag(Tags.Blocks.BARS_IRON, Tags.Items.BARS_IRON) + .add(Blocks.IRON_BARS); + tag(Tags.Blocks.BARS, Tags.Items.BARS) + .addTags(Tags.Blocks.BARS_COPPER, Tags.Blocks.BARS_IRON, BlockTags.BARS); tag(Tags.Blocks.BOOKSHELVES, Tags.Items.BOOKSHELVES) .add(Blocks.BOOKSHELF); tag(Tags.Blocks.BUDDING_BLOCKS, Tags.Items.BUDDING_BLOCKS) diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index 6f52809ecc..43c50a105b 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -70,7 +70,7 @@ public final class ForgeBlockTagsProvider extends VanillaBlockTagsProvider { private void addColored(TagKey group, String pattern) { String prefix = group.location().getPath().toUpperCase(Locale.ENGLISH) + '_'; for (var color : DyeColor.values()) { - var key = Identifier.fromNamespaceAndPath("minecraft", pattern.replace("{color}", color.getName())); + var key = Identifier.withDefaultNamespace(pattern.replace("{color}", color.getName())); TagKey tag = getTag(prefix + color.getName()); var block = ForgeRegistries.BLOCKS.getValue(key); if (block == null || block == Blocks.AIR)