From 88904a1d0953bc91b36fa542b9de4cb6be26a525 Mon Sep 17 00:00:00 2001 From: "Joseph T. McQuigg" Date: Sun, 16 Mar 2025 20:04:24 -0400 Subject: [PATCH] Add Pumpkin Block and Item Tags (#10482) --- src/main/generated/data/c/tags/block/pumpkins.json | 7 +++++++ .../data/c/tags/block/pumpkins/carved.json | 5 +++++ .../c/tags/block/pumpkins/jack_o_lanterns.json | 5 +++++ .../data/c/tags/block/pumpkins/normal.json | 5 +++++ src/main/generated/data/c/tags/item/pumpkins.json | 7 +++++++ .../data/c/tags/item/pumpkins/carved.json | 5 +++++ .../data/c/tags/item/pumpkins/jack_o_lanterns.json | 5 +++++ .../data/c/tags/item/pumpkins/normal.json | 5 +++++ src/main/java/net/minecraftforge/common/Tags.java | 14 ++++++++++++++ .../common/data/ForgeBlockTagsProvider.java | 4 ++++ .../common/data/ForgeItemTagsProvider.java | 4 ++++ 11 files changed, 66 insertions(+) create mode 100644 src/main/generated/data/c/tags/block/pumpkins.json create mode 100644 src/main/generated/data/c/tags/block/pumpkins/carved.json create mode 100644 src/main/generated/data/c/tags/block/pumpkins/jack_o_lanterns.json create mode 100644 src/main/generated/data/c/tags/block/pumpkins/normal.json create mode 100644 src/main/generated/data/c/tags/item/pumpkins.json create mode 100644 src/main/generated/data/c/tags/item/pumpkins/carved.json create mode 100644 src/main/generated/data/c/tags/item/pumpkins/jack_o_lanterns.json create mode 100644 src/main/generated/data/c/tags/item/pumpkins/normal.json diff --git a/src/main/generated/data/c/tags/block/pumpkins.json b/src/main/generated/data/c/tags/block/pumpkins.json new file mode 100644 index 0000000000..bf2f591e10 --- /dev/null +++ b/src/main/generated/data/c/tags/block/pumpkins.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:pumpkins/normal", + "#c:pumpkins/carved", + "#c:pumpkins/jack_o_lanterns" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/pumpkins/carved.json b/src/main/generated/data/c/tags/block/pumpkins/carved.json new file mode 100644 index 0000000000..1a0f6d3990 --- /dev/null +++ b/src/main/generated/data/c/tags/block/pumpkins/carved.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:carved_pumpkin" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/pumpkins/jack_o_lanterns.json b/src/main/generated/data/c/tags/block/pumpkins/jack_o_lanterns.json new file mode 100644 index 0000000000..598454b502 --- /dev/null +++ b/src/main/generated/data/c/tags/block/pumpkins/jack_o_lanterns.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:jack_o_lantern" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/block/pumpkins/normal.json b/src/main/generated/data/c/tags/block/pumpkins/normal.json new file mode 100644 index 0000000000..fb0859532b --- /dev/null +++ b/src/main/generated/data/c/tags/block/pumpkins/normal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pumpkin" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/pumpkins.json b/src/main/generated/data/c/tags/item/pumpkins.json new file mode 100644 index 0000000000..bf2f591e10 --- /dev/null +++ b/src/main/generated/data/c/tags/item/pumpkins.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#c:pumpkins/normal", + "#c:pumpkins/carved", + "#c:pumpkins/jack_o_lanterns" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/pumpkins/carved.json b/src/main/generated/data/c/tags/item/pumpkins/carved.json new file mode 100644 index 0000000000..1a0f6d3990 --- /dev/null +++ b/src/main/generated/data/c/tags/item/pumpkins/carved.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:carved_pumpkin" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/pumpkins/jack_o_lanterns.json b/src/main/generated/data/c/tags/item/pumpkins/jack_o_lanterns.json new file mode 100644 index 0000000000..598454b502 --- /dev/null +++ b/src/main/generated/data/c/tags/item/pumpkins/jack_o_lanterns.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:jack_o_lantern" + ] +} \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/pumpkins/normal.json b/src/main/generated/data/c/tags/item/pumpkins/normal.json new file mode 100644 index 0000000000..fb0859532b --- /dev/null +++ b/src/main/generated/data/c/tags/item/pumpkins/normal.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:pumpkin" + ] +} \ 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 257a29b52d..ebb710fe9e 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -210,6 +210,13 @@ public class Tags { public static final TagKey ORES_QUARTZ = cTag("ores/quartz"); public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = cTag("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = cTag("player_workstations/furnaces"); + public static final TagKey PUMPKINS = cTag("pumpkins"); + /** For pumpkins that are not carved. */ + public static final TagKey PUMPKINS_NORMAL = cTag("pumpkins/normal"); + /** For pumpkins that are already carved but not a light source. */ + public static final TagKey PUMPKINS_CARVED = cTag("pumpkins/carved"); + /** For pumpkins that are already carved and a light source. */ + public static final TagKey PUMPKINS_JACK_O_LANTERNS = cTag("pumpkins/jack_o_lanterns"); /** * Blocks should be included in this tag if their movement/relocation can cause serious issues such * as world corruption upon being moved or for balance reason where the block should not be able to be relocated. @@ -748,6 +755,13 @@ public class Tags { public static final TagKey ORES_QUARTZ = cTag("ores/quartz"); public static final TagKey PLAYER_WORKSTATIONS_CRAFTING_TABLES = cTag("player_workstations/crafting_tables"); public static final TagKey PLAYER_WORKSTATIONS_FURNACES = cTag("player_workstations/furnaces"); + public static final TagKey PUMPKINS = cTag("pumpkins"); + /** For pumpkins that are not carved. */ + public static final TagKey PUMPKINS_NORMAL = cTag("pumpkins/normal"); + /** For pumpkins that are already carved but not a light source. */ + public static final TagKey PUMPKINS_CARVED = cTag("pumpkins/carved"); + /** For pumpkins that are already carved and a light source. */ + public static final TagKey PUMPKINS_JACK_O_LANTERNS = cTag("pumpkins/jack_o_lanterns"); public static final TagKey RAW_MATERIALS = cTag("raw_materials"); public static final TagKey RAW_MATERIALS_COPPER = cTag("raw_materials/copper"); public static final TagKey RAW_MATERIALS_GOLD = cTag("raw_materials/gold"); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java index cb35c3e1a3..4d4a8923e4 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java @@ -153,6 +153,10 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider { tag(ORES_IN_GROUND_STONE).add(Blocks.COAL_ORE, Blocks.COPPER_ORE, Blocks.DIAMOND_ORE, Blocks.EMERALD_ORE, Blocks.GOLD_ORE, Blocks.IRON_ORE, Blocks.LAPIS_ORE, Blocks.REDSTONE_ORE); tag(PLAYER_WORKSTATIONS_CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE); tag(PLAYER_WORKSTATIONS_FURNACES).add(Blocks.FURNACE); + tag(PUMPKINS).addTags(PUMPKINS_NORMAL, PUMPKINS_CARVED, PUMPKINS_JACK_O_LANTERNS); + tag(PUMPKINS_NORMAL).add(Blocks.PUMPKIN); + tag(PUMPKINS_CARVED).add(Blocks.CARVED_PUMPKIN); + tag(PUMPKINS_JACK_O_LANTERNS).add(Blocks.JACK_O_LANTERN); tag(SAND).addTags(SAND_COLORLESS, SAND_RED); // forge:sand tag(RELOCATION_NOT_SUPPORTED); tag(ROPES); diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index cb16c2310c..25ae50f1d6 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -257,6 +257,10 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider { copy(Tags.Blocks.ORES_IN_GROUND_STONE, Tags.Items.ORES_IN_GROUND_STONE); copy(Tags.Blocks.PLAYER_WORKSTATIONS_CRAFTING_TABLES, Tags.Items.PLAYER_WORKSTATIONS_CRAFTING_TABLES); copy(Tags.Blocks.PLAYER_WORKSTATIONS_FURNACES, Tags.Items.PLAYER_WORKSTATIONS_FURNACES); + copy(Tags.Blocks.PUMPKINS, Tags.Items.PUMPKINS); + copy(Tags.Blocks.PUMPKINS_NORMAL, Tags.Items.PUMPKINS_NORMAL); + copy(Tags.Blocks.PUMPKINS_CARVED, Tags.Items.PUMPKINS_CARVED); + copy(Tags.Blocks.PUMPKINS_JACK_O_LANTERNS, Tags.Items.PUMPKINS_JACK_O_LANTERNS); tag(Tags.Items.RAW_MATERIALS) .addTags(Tags.Items.RAW_MATERIALS_COPPER, Tags.Items.RAW_MATERIALS_GOLD, Tags.Items.RAW_MATERIALS_IRON) .addOptionalTag(forgeItemTagKey("raw_materials"));