FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-03-24 22:11:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Stripped Logs and Stripped Woods Tags ()

Browse source 
* Add Stripped Logs and Stripped Woods Tags

* run spotless

* Address review

(cherry picked from commit 83a9d3130d)
This commit is contained in:
IThundxr 2024-10-15 08:23:42 -04:00 • committed by modmuss50
parent 1e12ea3cc3
commit 448d83ec11
10 changed files with 94 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
stripped_logs.jsonstripped_woods.json
item
stripped_logs.jsonstripped_woods.json
main/java/net/fabricmc/fabric/api/tag/convention/v2
ConventionalBlockTags.javaConventionalItemTags.java

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

@ -116,6 +116,8 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
generateStorageTags();
generateLogTags();
generateHeadTags();
generateMiscTags();
@ -497,6 +499,29 @@ public final class BlockTagGenerator extends FabricTagProvider.BlockTagProvider
.add(Blocks.HAY_BLOCK);
}
private void generateLogTags() {
getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_LOGS)
.add(Blocks.STRIPPED_ACACIA_LOG)
.add(Blocks.STRIPPED_BAMBOO_BLOCK)
.add(Blocks.STRIPPED_BIRCH_LOG)
.add(Blocks.STRIPPED_CHERRY_LOG)
.add(Blocks.STRIPPED_DARK_OAK_LOG)
.add(Blocks.STRIPPED_JUNGLE_LOG)
.add(Blocks.STRIPPED_MANGROVE_LOG)
.add(Blocks.STRIPPED_OAK_LOG)
.add(Blocks.STRIPPED_SPRUCE_LOG);
getOrCreateTagBuilder(ConventionalBlockTags.STRIPPED_WOODS)
.add(Blocks.STRIPPED_ACACIA_WOOD)
.add(Blocks.STRIPPED_BIRCH_WOOD)
.add(Blocks.STRIPPED_CHERRY_WOOD)
.add(Blocks.STRIPPED_DARK_OAK_WOOD)
.add(Blocks.STRIPPED_JUNGLE_WOOD)
.add(Blocks.STRIPPED_MANGROVE_WOOD)
.add(Blocks.STRIPPED_OAK_WOOD)
.add(Blocks.STRIPPED_SPRUCE_WOOD);
}
private void generateHeadTags() {
getOrCreateTagBuilder(ConventionalBlockTags.SKULLS)
.add(Blocks.SKELETON_SKULL)

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

@ -109,6 +109,8 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks");
translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks");
translationBuilder.add(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks");
translationBuilder.add(ConventionalBlockTags.STRIPPED_LOGS, "Stripped Logs");
translationBuilder.add(ConventionalBlockTags.STRIPPED_WOODS, "Stripped Woods");
translationBuilder.add(ConventionalBlockTags.PLAYER_WORKSTATIONS_CRAFTING_TABLES, "Crafting Tables");
translationBuilder.add(ConventionalBlockTags.PLAYER_WORKSTATIONS_FURNACES, "Furnaces");
translationBuilder.add(ConventionalBlockTags.RELOCATION_NOT_SUPPORTED, "Relocation Not Supported");
@ -299,6 +301,8 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_REDSTONE, "Redstone Storage Blocks");
translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_SLIME, "Slime Storage Blocks");
translationBuilder.add(ConventionalItemTags.STORAGE_BLOCKS_WHEAT, "Wheat Storage Blocks");
translationBuilder.add(ConventionalItemTags.STRIPPED_LOGS, "Stripped Log Blocks");
translationBuilder.add(ConventionalItemTags.STRIPPED_WOODS, "Stripped Wood Blocks");
translationBuilder.add(ConventionalItemTags.CROPS, "Crops");
translationBuilder.add(ConventionalItemTags.BEETROOT_CROPS, "Beetroot Crops");
translationBuilder.add(ConventionalItemTags.CACTUS_CROPS, "Cactus Crops");

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

@ -156,6 +156,9 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
copy(ConventionalBlockTags.STORAGE_BLOCKS_REDSTONE, ConventionalItemTags.STORAGE_BLOCKS_REDSTONE);
copy(ConventionalBlockTags.STORAGE_BLOCKS_SLIME, ConventionalItemTags.STORAGE_BLOCKS_SLIME);
copy(ConventionalBlockTags.STORAGE_BLOCKS_WHEAT, ConventionalItemTags.STORAGE_BLOCKS_WHEAT);
copy(ConventionalBlockTags.STRIPPED_LOGS, ConventionalItemTags.STRIPPED_LOGS);
copy(ConventionalBlockTags.STRIPPED_WOODS, ConventionalItemTags.STRIPPED_WOODS);
}
private void generateDyeTags() {

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

@ -76,6 +76,8 @@
"tag.block.c.storage_blocks.redstone": "Redstone Storage Blocks",
"tag.block.c.storage_blocks.slime": "Slime Storage Blocks",
"tag.block.c.storage_blocks.wheat": "Wheat Storage Blocks",
"tag.block.c.stripped_logs": "Stripped Logs",
"tag.block.c.stripped_woods": "Stripped Woods",
"tag.block.c.villager_job_sites": "Villager Job Sites",
"tag.enchantment.c.entity_auxiliary_movement_enhancements": "Entity Auxiliary Movement Enhancements",
"tag.enchantment.c.entity_defense_enhancements": "Entity Defense Enhancements",
@ -283,6 +285,8 @@
"tag.item.c.storage_blocks.slime": "Slime Storage Blocks",
"tag.item.c.storage_blocks.wheat": "Wheat Storage Blocks",
"tag.item.c.strings": "Strings",
"tag.item.c.stripped_logs": "Stripped Log Blocks",
"tag.item.c.stripped_woods": "Stripped Wood Blocks",
"tag.item.c.tools": "Tools",
"tag.item.c.tools.bow": "Bows",
"tag.item.c.tools.bows": "Bows",

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

@ -0,0 +1,13 @@
{
"values": [
"minecraft:stripped_acacia_log",
"minecraft:stripped_bamboo_block",
"minecraft:stripped_birch_log",
"minecraft:stripped_cherry_log",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_jungle_log",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_oak_log",
"minecraft:stripped_spruce_log"
]
}

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

@ -0,0 +1,12 @@
{
"values": [
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_wood",
"minecraft:stripped_spruce_wood"
]
}

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

@ -0,0 +1,13 @@
{
"values": [
"minecraft:stripped_acacia_log",
"minecraft:stripped_bamboo_block",
"minecraft:stripped_birch_log",
"minecraft:stripped_cherry_log",
"minecraft:stripped_dark_oak_log",
"minecraft:stripped_jungle_log",
"minecraft:stripped_mangrove_log",
"minecraft:stripped_oak_log",
"minecraft:stripped_spruce_log"
]
}

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

@ -0,0 +1,12 @@
{
"values": [
"minecraft:stripped_acacia_wood",
"minecraft:stripped_birch_wood",
"minecraft:stripped_cherry_wood",
"minecraft:stripped_dark_oak_wood",
"minecraft:stripped_jungle_wood",
"minecraft:stripped_mangrove_wood",
"minecraft:stripped_oak_wood",
"minecraft:stripped_spruce_wood"
]
}

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

@ -143,6 +143,10 @@ public final class ConventionalBlockTags {
public static final TagKey<Block> STORAGE_BLOCKS_SLIME = register("storage_blocks/slime");
public static final TagKey<Block> STORAGE_BLOCKS_WHEAT = register("storage_blocks/wheat");
// Logs
public static final TagKey<Block> STRIPPED_LOGS = register("stripped_logs");
public static final TagKey<Block> STRIPPED_WOODS = register("stripped_woods");
// Misc
public static final TagKey<Block> PLAYER_WORKSTATIONS_CRAFTING_TABLES = register("player_workstations/crafting_tables");
public static final TagKey<Block> PLAYER_WORKSTATIONS_FURNACES = register("player_workstations/furnaces");

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

@ -321,6 +321,10 @@ public final class ConventionalItemTags {
public static final TagKey<Item> STORAGE_BLOCKS_SLIME = register("storage_blocks/slime");
public static final TagKey<Item> STORAGE_BLOCKS_WHEAT = register("storage_blocks/wheat");
// Logs
public static final TagKey<Item> STRIPPED_LOGS = register("stripped_logs");
public static final TagKey<Item> STRIPPED_WOODS = register("stripped_woods");
// Crops
/**
* For raw materials harvested from growable plants. Crop items can be edible like carrots or non-edible like