FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-08 21:14:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions5

Add Pumpkin Block and Item Tags ()

Browse source 
* Pumpkin Block and Item Tags

* add _pumpkins to Jack O Lantern Tag

(cherry picked from commit a5c5487b68)
This commit is contained in:
Joseph T. McQuigg 2025-03-16 09:35:04 -04:00 • committed by modmuss50
parent d94614b81c
commit c6f556478d
14 changed files with 107 additions and 0 deletions
fabric-convention-tags-v2/src
datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators
BlockTagGenerator.javaEnglishTagLangGenerator.javaItemTagGenerator.java
generated/resources
assets/fabric-convention-tags-v2/lang
en_us.json
data/c/tags
block
pumpkins.json
pumpkins
carved.jsonjack_o_lanterns.jsonnormal.json
item
pumpkins.json
pumpkins
carved.jsonjack_o_lanterns.jsonnormal.json
main/java/net/fabricmc/fabric/api/tag/convention/v2
ConventionalBlockTags.javaConventionalItemTags.java

10
fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/BlockTagGenerator.java
View file

@ -290,6 +290,16 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
.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() {

8
fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/EnglishTagLangGenerator.java
View file

@ -112,6 +112,10 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
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");
@ -340,6 +344,10 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
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");

5
fabric-convention-tags-v2/src/datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators/ItemTagGenerator.java
View file

@ -180,6 +180,11 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
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() {

8
fabric-convention-tags-v2/src/generated/resources/assets/fabric-convention-tags-v2/lang/en_us.json
View file

@ -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",
@ -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",

7
fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins.json Normal file
View file

@ -0,0 +1,7 @@
{
"values": [
"#c:pumpkins/normal",
"#c:pumpkins/carved",
"#c:pumpkins/jack_o_lanterns"
]
}

5
fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins/carved.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:carved_pumpkin"
]
}

5
fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins/jack_o_lanterns.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:jack_o_lantern"
]
}

5
fabric-convention-tags-v2/src/generated/resources/data/c/tags/block/pumpkins/normal.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:pumpkin"
]
}

7
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins.json Normal file
View file

@ -0,0 +1,7 @@
{
"values": [
"#c:pumpkins/normal",
"#c:pumpkins/carved",
"#c:pumpkins/jack_o_lanterns"
]
}

5
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins/carved.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:carved_pumpkin"
]
}

5
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins/jack_o_lanterns.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:jack_o_lantern"
]
}

5
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/pumpkins/normal.json Normal file
View file

@ -0,0 +1,5 @@
{
"values": [
"minecraft:pumpkin"
]
}

16
fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalBlockTags.java
View file

@ -176,6 +176,22 @@ public final class 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.

16
fabric-convention-tags-v2/src/main/java/net/fabricmc/fabric/api/tag/convention/v2/ConventionalItemTags.java
View file

@ -392,6 +392,22 @@ public final class 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");