upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Pumpkin Block and Item Tags (#10482)

Browse Source
This commit is contained in:
Joseph T. McQuigg authored and GitHub committed 2025-03-17 00:04:24 +00:00
1 parent b864faf0ef
commit 88904a1d09
11 files changed
+66
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/common/Tags.java
+14
View File
@@ -210,6 +210,13 @@ public class Tags {
public static final TagKey<Block> ORES_QUARTZ = cTag("ores/quartz");
public static final TagKey<Block> PLAYER_WORKSTATIONS_CRAFTING_TABLES = cTag("player_workstations/crafting_tables");
public static final TagKey<Block> PLAYER_WORKSTATIONS_FURNACES = cTag("player_workstations/furnaces");
public static final TagKey<Block> PUMPKINS = cTag("pumpkins");
/** For pumpkins that are not carved. */
public static final TagKey<Block> PUMPKINS_NORMAL = cTag("pumpkins/normal");
/** For pumpkins that are already carved but not a light source. */
public static final TagKey<Block> PUMPKINS_CARVED = cTag("pumpkins/carved");
/** For pumpkins that are already carved and a light source. */
public static final TagKey<Block> 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<Item> ORES_QUARTZ = cTag("ores/quartz");
public static final TagKey<Item> PLAYER_WORKSTATIONS_CRAFTING_TABLES = cTag("player_workstations/crafting_tables");
public static final TagKey<Item> PLAYER_WORKSTATIONS_FURNACES = cTag("player_workstations/furnaces");
public static final TagKey<Item> PUMPKINS = cTag("pumpkins");
/** For pumpkins that are not carved. */
public static final TagKey<Item> PUMPKINS_NORMAL = cTag("pumpkins/normal");
/** For pumpkins that are already carved but not a light source. */
public static final TagKey<Item> PUMPKINS_CARVED = cTag("pumpkins/carved");
/** For pumpkins that are already carved and a light source. */
public static final TagKey<Item> PUMPKINS_JACK_O_LANTERNS = cTag("pumpkins/jack_o_lanterns");
public static final TagKey<Item> RAW_MATERIALS = cTag("raw_materials");
public static final TagKey<Item> RAW_MATERIALS_COPPER = cTag("raw_materials/copper");
public static final TagKey<Item> RAW_MATERIALS_GOLD = cTag("raw_materials/gold");
src/main/java/net/minecraftforge/common/data/ForgeBlockTagsProvider.java
+4
View File
@@ -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);
src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
+4
View File
@@ -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"));