FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-27 18:15:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Create c:obsidians block and item tag (#4088)

Browse source 
* Create `c:obsidians`

* Add obsidians subtags
This commit is contained in:
TelepathicGrunt 2024-09-23 13:46:54 -04:00 committed by GitHub
parent 9d3173d557
commit 9d22c5fde0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 80 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -68,6 +68,13 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
.add(Blocks.MOSSY_COBBLESTONE) .add(Blocks.MOSSY_COBBLESTONE)
.add(Blocks.COBBLED_DEEPSLATE) .add(Blocks.COBBLED_DEEPSLATE)
.add(Blocks.INFESTED_COBBLESTONE); .add(Blocks.INFESTED_COBBLESTONE);
getOrCreateTagBuilder(ConventionalBlockTags.NORMAL_OBSIDIANS)
.add(Blocks.OBSIDIAN);
getOrCreateTagBuilder(ConventionalBlockTags.CRYING_OBSIDIANS)
.add(Blocks.CRYING_OBSIDIAN);
getOrCreateTagBuilder(ConventionalBlockTags.OBSIDIANS)
.addOptionalTag(ConventionalBlockTags.NORMAL_OBSIDIANS)
.addOptionalTag(ConventionalBlockTags.CRYING_OBSIDIANS);
getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES) getOrCreateTagBuilder(ConventionalBlockTags.QUARTZ_ORES)
.add(Blocks.NETHER_QUARTZ_ORE); .add(Blocks.NETHER_QUARTZ_ORE);

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

@ -40,6 +40,9 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
// Blocks // Blocks
translationBuilder.add(ConventionalBlockTags.STONES, "Stones"); translationBuilder.add(ConventionalBlockTags.STONES, "Stones");
translationBuilder.add(ConventionalBlockTags.COBBLESTONES, "Cobblestones"); translationBuilder.add(ConventionalBlockTags.COBBLESTONES, "Cobblestones");
translationBuilder.add(ConventionalBlockTags.OBSIDIANS, "Obsidians");
translationBuilder.add(ConventionalBlockTags.NORMAL_OBSIDIANS, "Normal Obsidians");
translationBuilder.add(ConventionalBlockTags.CRYING_OBSIDIANS, "Crying Obsidians");
translationBuilder.add(ConventionalBlockTags.ORES, "Ores"); translationBuilder.add(ConventionalBlockTags.ORES, "Ores");
translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores"); translationBuilder.add(ConventionalBlockTags.QUARTZ_ORES, "Quartz Ores");
translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores"); translationBuilder.add(ConventionalBlockTags.NETHERITE_SCRAP_ORES, "Netherite Scrap Ores");
@ -117,6 +120,9 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
// Items // Items
translationBuilder.add(ConventionalItemTags.STONES, "Stones"); translationBuilder.add(ConventionalItemTags.STONES, "Stones");
translationBuilder.add(ConventionalItemTags.COBBLESTONES, "Cobblestones"); translationBuilder.add(ConventionalItemTags.COBBLESTONES, "Cobblestones");
translationBuilder.add(ConventionalItemTags.OBSIDIANS, "Obsidians");
translationBuilder.add(ConventionalItemTags.NORMAL_OBSIDIANS, "Normal Obsidians");
translationBuilder.add(ConventionalItemTags.CRYING_OBSIDIANS, "Crying Obsidians");
translationBuilder.add(ConventionalItemTags.TOOLS, "Tools"); translationBuilder.add(ConventionalItemTags.TOOLS, "Tools");
translationBuilder.add(ConventionalItemTags.SHEAR_TOOLS, "Shears"); translationBuilder.add(ConventionalItemTags.SHEAR_TOOLS, "Shears");
translationBuilder.add(ConventionalItemTags.SPEAR_TOOLS, "Spears"); translationBuilder.add(ConventionalItemTags.SPEAR_TOOLS, "Spears");

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

@ -54,6 +54,9 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
private void copyItemTags() { private void copyItemTags() {
copy(ConventionalBlockTags.STONES, ConventionalItemTags.STONES); copy(ConventionalBlockTags.STONES, ConventionalItemTags.STONES);
copy(ConventionalBlockTags.COBBLESTONES, ConventionalItemTags.COBBLESTONES); copy(ConventionalBlockTags.COBBLESTONES, ConventionalItemTags.COBBLESTONES);
copy(ConventionalBlockTags.OBSIDIANS, ConventionalItemTags.OBSIDIANS);
copy(ConventionalBlockTags.NORMAL_OBSIDIANS, ConventionalItemTags.NORMAL_OBSIDIANS);
copy(ConventionalBlockTags.CRYING_OBSIDIANS, ConventionalItemTags.CRYING_OBSIDIANS);
copy(ConventionalBlockTags.BARRELS, ConventionalItemTags.BARRELS); copy(ConventionalBlockTags.BARRELS, ConventionalItemTags.BARRELS);
copy(ConventionalBlockTags.WOODEN_BARRELS, ConventionalItemTags.WOODEN_BARRELS); copy(ConventionalBlockTags.WOODEN_BARRELS, ConventionalItemTags.WOODEN_BARRELS);
copy(ConventionalBlockTags.BOOKSHELVES, ConventionalItemTags.BOOKSHELVES); copy(ConventionalBlockTags.BOOKSHELVES, ConventionalItemTags.BOOKSHELVES);

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

@ -37,6 +37,9 @@
"tag.block.c.glazed_terracotta": "Glazed Terracotta", "tag.block.c.glazed_terracotta": "Glazed Terracotta",
"tag.block.c.glazed_terracottas": "Glazed Terracottas", "tag.block.c.glazed_terracottas": "Glazed Terracottas",
"tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers", "tag.block.c.hidden_from_recipe_viewers": "Hidden From Recipe Viewers",
"tag.block.c.obsidians": "Obsidians",
"tag.block.c.obsidians.crying": "Crying Obsidians",
"tag.block.c.obsidians.normal": "Normal Obsidians",
"tag.block.c.ores": "Ores", "tag.block.c.ores": "Ores",
"tag.block.c.ores.netherite_scrap": "Netherite Scrap Ores", "tag.block.c.ores.netherite_scrap": "Netherite Scrap Ores",
"tag.block.c.ores.quartz": "Quartz Ores", "tag.block.c.ores.quartz": "Quartz Ores",
@ -220,6 +223,9 @@
"tag.item.c.nuggets": "Nuggets", "tag.item.c.nuggets": "Nuggets",
"tag.item.c.nuggets.gold": "Gold Nuggets", "tag.item.c.nuggets.gold": "Gold Nuggets",
"tag.item.c.nuggets.iron": "Iron Nuggets", "tag.item.c.nuggets.iron": "Iron Nuggets",
"tag.item.c.obsidians": "Obsidians",
"tag.item.c.obsidians.crying": "Crying Obsidians",
"tag.item.c.obsidians.normal": "Normal Obsidians",
"tag.item.c.ores": "Ores", "tag.item.c.ores": "Ores",
"tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores", "tag.item.c.ores.netherite_scrap": "Netherite Scrap Ores",
"tag.item.c.ores.quartz": "Quartz Ores", "tag.item.c.ores.quartz": "Quartz Ores",

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

@ -0,0 +1,12 @@
{
"values": [
{
"id": "#c:obsidians/normal",
"required": false
},
{
"id": "#c:obsidians/crying",
"required": false
}
]
}

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

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

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

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

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

@ -0,0 +1,12 @@
{
"values": [
{
"id": "#c:obsidians/normal",
"required": false
},
{
"id": "#c:obsidians/crying",
"required": false
}
]
}

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

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

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

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

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

@ -35,6 +35,13 @@ public final class ConventionalBlockTags {
*/ */
public static final TagKey<Block> STONES = register("stones"); public static final TagKey<Block> STONES = register("stones");
public static final TagKey<Block> COBBLESTONES = register("cobblestones"); public static final TagKey<Block> COBBLESTONES = register("cobblestones");
public static final TagKey<Block> OBSIDIANS = register("obsidians");
/**
* For common obsidian that has no special quirks or behaviors. Ideal for recipe use.
* Crying Obsidian, for example, is a light block and harder to obtain. So it gets its own tag instead of being under normal tag.
*/
public static final TagKey<Block> NORMAL_OBSIDIANS = register("obsidians/normal");
public static final TagKey<Block> CRYING_OBSIDIANS = register("obsidians/crying");
// Ores - broad categories // Ores - broad categories
public static final TagKey<Block> ORES = register("ores"); public static final TagKey<Block> ORES = register("ores");

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

@ -36,6 +36,13 @@ public final class ConventionalItemTags {
*/ */
public static final TagKey<Item> STONES = register("stones"); public static final TagKey<Item> STONES = register("stones");
public static final TagKey<Item> COBBLESTONES = register("cobblestones"); public static final TagKey<Item> COBBLESTONES = register("cobblestones");
public static final TagKey<Item> OBSIDIANS = register("obsidians");
/**
* For common obsidian that has no special quirks or behaviors. Ideal for recipe use.
* Crying Obsidian, for example, is a light block and harder to obtain. So it gets its own tag instead of being under normal tag.
*/
public static final TagKey<Item> NORMAL_OBSIDIANS = register("obsidians/normal");
public static final TagKey<Item> CRYING_OBSIDIANS = register("obsidians/crying");
// Tool tags // Tool tags
public static final TagKey<Item> TOOLS = register("tools"); public static final TagKey<Item> TOOLS = register("tools");