Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Pumpkin Block and Item Tags #4476

Open
wants to merge 2 commits into
base: 1.21.4
Choose a base branch
from
Open

Add Pumpkin Block and Item Tags #4476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61828a7
Pumpkin Block and Item Tags
JT122406 Mar 2, 2025
3f81625
add _pumpkins to Jack O Lantern Tag
JT122406 Mar 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...en/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,16 @@ private void generateFenceAndFenceGateTags() {
.add(Blocks.PALE_OAK_FENCE_GATE);
getOrCreateTagBuilder(ConventionalBlockTags.FENCE_GATES)
.addOptionalTag(ConventionalBlockTags.WOODEN_FENCE_GATES);
getOrCreateTagBuilder(ConventionalBlockTags.PUMPKINS)
.addTag(ConventionalBlockTags.NORMAL_PUMPKINS)
.addTag(ConventionalBlockTags.CARVED_PUMPKINS)
.addTag(ConventionalBlockTags.JACK_O_LANTERNS_PUMPKINS);
getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_PUMPKINS)
.add(Blocks.PUMPKIN);
getOrCreateTagBuilder(ConventionalBlockTags.CARVED_PUMPKINS)
.add(Blocks.CARVED_PUMPKIN);
getOrCreateTagBuilder(ConventionalBlockTags.JACK_O_LANTERNS_PUMPKINS)
.add(Blocks.JACK_O_LANTERN);
}

private void generateSandstoneTags() {
Expand Down
8 changes: 8 additions & 0 deletions ...a/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalBlockTags.NETHER_BRICK_FENCES, "Nether Brick Fences");
translationBuilder.add(ConventionalBlockTags.FENCE_GATES, "Fence Gates");
translationBuilder.add(ConventionalBlockTags.WOODEN_FENCE_GATES, "Wooden Fence Gates");
translationBuilder.add(ConventionalBlockTags.PUMPKINS, "Pumpkins");
translationBuilder.add(ConventionalBlockTags.NORMAL_PUMPKINS, "Normal Pumpkins");
translationBuilder.add(ConventionalBlockTags.CARVED_PUMPKINS, "Carved Pumpkins");
translationBuilder.add(ConventionalBlockTags.JACK_O_LANTERNS_PUMPKINS, "Jack O' Lanterns");
translationBuilder.add(ConventionalBlockTags.DYED, "Dyed Blocks");
translationBuilder.add(ConventionalBlockTags.BLACK_DYED, "Black Dyed Blocks");
translationBuilder.add(ConventionalBlockTags.BLUE_DYED, "Blue Dyed Blocks");
Expand Down Expand Up @@ -340,6 +344,10 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
translationBuilder.add(ConventionalItemTags.NETHER_BRICK_FENCES, "Nether Brick Fences");
translationBuilder.add(ConventionalItemTags.FENCE_GATES, "Fence Gates");
translationBuilder.add(ConventionalItemTags.WOODEN_FENCE_GATES, "Wooden Fence Gates");
translationBuilder.add(ConventionalItemTags.PUMPKINS, "Pumpkins");
translationBuilder.add(ConventionalItemTags.NORMAL_PUMPKINS, "Normal Pumpkins");
translationBuilder.add(ConventionalItemTags.CARVED_PUMPKINS, "Carved Pumpkins");
translationBuilder.add(ConventionalItemTags.JACK_O_LANTERNS_PUMPKINS, "Jack O' Lanterns");
translationBuilder.add(ConventionalItemTags.DYES, "Dyes");
translationBuilder.add(ConventionalItemTags.BLACK_DYES, "Black Dyes");
translationBuilder.add(ConventionalItemTags.BLUE_DYES, "Blue Dyes");
Expand Down
5 changes: 5 additions & 0 deletions ...gen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,11 @@ private void copyItemTags() {
copy(ConventionalBlockTags.NETHER_BRICK_FENCES, ConventionalItemTags.NETHER_BRICK_FENCES);
copy(ConventionalBlockTags.FENCE_GATES, ConventionalItemTags.FENCE_GATES);
copy(ConventionalBlockTags.WOODEN_FENCE_GATES, ConventionalItemTags.WOODEN_FENCE_GATES);

copy(ConventionalBlockTags.PUMPKINS, ConventionalItemTags.PUMPKINS);
copy(ConventionalBlockTags.NORMAL_PUMPKINS, ConventionalItemTags.NORMAL_PUMPKINS);
copy(ConventionalBlockTags.CARVED_PUMPKINS, ConventionalItemTags.CARVED_PUMPKINS);
copy(ConventionalBlockTags.JACK_O_LANTERNS_PUMPKINS, ConventionalItemTags.JACK_O_LANTERNS_PUMPKINS);
}

private void generateDyeTags() {
Expand Down
8 changes: 8 additions & 0 deletions ...nvention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@
"tag.block.c.ores_in_ground.stone": "Stone Ores In Ground",
"tag.block.c.player_workstations.crafting_tables": "Crafting Tables",
"tag.block.c.player_workstations.furnaces": "Furnaces",
"tag.block.c.pumpkins": "Pumpkins",
"tag.block.c.pumpkins.carved": "Carved Pumpkins",
"tag.block.c.pumpkins.jack_o_lanterns": "Jack O' Lanterns",
"tag.block.c.pumpkins.normal": "Normal Pumpkins",
"tag.block.c.relocation_not_supported": "Relocation Not Supported",
"tag.block.c.ropes": "Ropes",
"tag.block.c.sands": "Sands",
Expand Down Expand Up @@ -334,6 +338,10 @@
"tag.item.c.player_workstations.furnaces": "Furnaces",
"tag.item.c.potions": "Potions",
"tag.item.c.potions.bottle": "Bottled Potions",
"tag.item.c.pumpkins": "Pumpkins",
"tag.item.c.pumpkins.carved": "Carved Pumpkins",
"tag.item.c.pumpkins.jack_o_lanterns": "Jack O' Lanterns",
"tag.item.c.pumpkins.normal": "Normal Pumpkins",
"tag.item.c.raw_blocks": "Raw Blocks",
"tag.item.c.raw_blocks.copper": "Raw Copper Blocks",
"tag.item.c.raw_blocks.gold": "Raw Gold Blocks",
Expand Down
7 changes: 7 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"#c:pumpkins/normal",
"#c:pumpkins/carved",
"#c:pumpkins/jack_o_lanterns"
]
}
5 changes: 5 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins/carved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:carved_pumpkin"
]
}
5 changes: 5 additions & 0 deletions ...onvention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins/jack_o_lanterns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:jack_o_lantern"
]
}
5 changes: 5 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins/normal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:pumpkin"
]
}
7 changes: 7 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"values": [
"#c:pumpkins/normal",
"#c:pumpkins/carved",
"#c:pumpkins/jack_o_lanterns"
]
}
5 changes: 5 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins/carved.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:carved_pumpkin"
]
}
5 changes: 5 additions & 0 deletions ...convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins/jack_o_lanterns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:jack_o_lantern"
]
}
5 changes: 5 additions & 0 deletions fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins/normal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"values": [
"minecraft:pumpkin"
]
}
16 changes: 16 additions & 0 deletions ...ags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,22 @@ private ConventionalBlockTags() {
public static final TagKey<Block> FENCE_GATES = register("fence_gates");
public static final TagKey<Block> WOODEN_FENCE_GATES = register("fence_gates/wooden");

// Pumpkins
public static final TagKey<Block> PUMPKINS = register("pumpkins");
/**
* For pumpkins that are not carved.
*/
public static final TagKey<Block> NORMAL_PUMPKINS = register("pumpkins/normal");
/**
* For pumpkins that are already carved but not a light source.
*/
public static final TagKey<Block> CARVED_PUMPKINS = register("pumpkins/carved");

/**
* For pumpkins that are already carved and a light source.
*/
public static final TagKey<Block> JACK_O_LANTERNS_PUMPKINS = register("pumpkins/jack_o_lanterns");

// Blocks created with dyes
/**
* Tag that holds all blocks that can be dyed a specific color.
Expand Down
16 changes: 16 additions & 0 deletions ...tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,22 @@ private ConventionalItemTags() {
public static final TagKey<Item> FENCE_GATES = register("fence_gates");
public static final TagKey<Item> WOODEN_FENCE_GATES = register("fence_gates/wooden");

// Pumpkins
public static final TagKey<Item> PUMPKINS = register("pumpkins");
/**
* For pumpkins that are not carved.
*/
public static final TagKey<Item> NORMAL_PUMPKINS = register("pumpkins/normal");
/**
* For pumpkins that are already carved but not a light source.
*/
public static final TagKey<Item> CARVED_PUMPKINS = register("pumpkins/carved");

/**
* For pumpkins that are already carved and a light source.
*/
public static final TagKey<Item> JACK_O_LANTERNS_PUMPKINS = register("pumpkins/jack_o_lanterns");

// Dyes
public static final TagKey<Item> DYES = register("dyes");
public static final TagKey<Item> BLACK_DYES = register("dyes/black");
Expand Down