FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-12 06:54:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tagkey for c:tools/wrench ()

Browse source 
Addresses https://github.com/FabricMC/fabric/issues/4376

(cherry picked from commit 53ee34a43b)
This commit is contained in:
TelepathicGrunt 2025-01-21 13:33:57 -05:00 • committed by modmuss50
parent 3cfb61e50b
commit 64d717a0a1
7 changed files with 19 additions and 1 deletions
deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention
ConventionLogWarnings.java
fabric-convention-tags-v2/src
datagen/java/net/fabricmc/fabric/impl/tag/convention/datagen/generators
EnglishTagLangGenerator.javaItemTagGenerator.java
generated/resources
assets/fabric-convention-tags-v2/lang
en_us.json
data/c/tags/item
tools.json
tools
wrench.json
main/java/net/fabricmc/fabric/api/tag/convention/v2
ConventionalItemTags.java

3
deprecated/fabric-convention-tags-v1/src/main/java/net/fabricmc/fabric/impl/tag/convention/ConventionLogWarnings.java
View file

@ -174,12 +174,13 @@ public class ConventionLogWarnings implements ModInitializer {
createMapEntry(RegistryKeys.ITEM, "hoes", ItemTags.HOES),
createMapEntry(RegistryKeys.ITEM, "shovels", ItemTags.SHOVELS),
createMapEntry(RegistryKeys.ITEM, "swords", ItemTags.SWORDS),
createMapEntry(RegistryKeys.ITEM, "wrenches", "tools/wrenches"),
createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "axes"), ItemTags.AXES),
createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "pickaxes"), ItemTags.PICKAXES),
createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "hoes"), ItemTags.HOES),
createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "shovels"), ItemTags.SHOVELS),
createMapEntry(createTagKeyUnderFabric(RegistryKeys.ITEM, "swords"), ItemTags.SWORDS),
createMapEntry(RegistryKeys.ITEM, "wrenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WRENCH_TOOLS),
createMapEntry(RegistryKeys.ITEM, "tools/wrenches", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.WRENCH_TOOLS),
createMapEntry(RegistryKeys.ITEM, "barrel", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.BARRELS),
createMapEntry(RegistryKeys.ITEM, "chest", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.CHESTS),
createMapEntry(RegistryKeys.ITEM, "glass", net.fabricmc.fabric.api.tag.convention.v2.ConventionalItemTags.GLASS_BLOCKS),

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

@ -180,6 +180,7 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
translationBuilder.add(ConventionalItemTags.BRUSH_TOOLS, "Brushes");
translationBuilder.add(ConventionalItemTags.IGNITER_TOOLS, "Igniters");
translationBuilder.add(ConventionalItemTags.MACE_TOOLS, "Maces");
translationBuilder.add(ConventionalItemTags.WRENCH_TOOLS, "Wrenches");
translationBuilder.add(ConventionalItemTags.MELEE_WEAPON_TOOLS, "Melee Weapons");
translationBuilder.add(ConventionalItemTags.RANGED_WEAPON_TOOLS, "Ranged Weapons");
translationBuilder.add(ConventionalItemTags.MINING_TOOL_TOOLS, "Mining Tools");

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

@ -592,6 +592,8 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.addOptionalTag(ConventionalItemTags.SHEAR_TOOLS)
.addOptionalTag(ConventionalItemTags.SHIELD_TOOLS)
.addOptionalTag(ConventionalItemTags.SPEAR_TOOLS)
.addOptionalTag(ConventionalItemTags.MACE_TOOLS)
.addOptionalTag(ConventionalItemTags.WRENCH_TOOLS)
.addOptionalTag(ConventionalItemTags.MINING_TOOL_TOOLS)
.addOptionalTag(ConventionalItemTags.MELEE_WEAPON_TOOLS)
.addOptionalTag(ConventionalItemTags.RANGED_WEAPON_TOOLS);
@ -621,6 +623,7 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.add(Items.FLINT_AND_STEEL);
getOrCreateTagBuilder(ConventionalItemTags.MACE_TOOLS)
.add(Items.MACE);
getOrCreateTagBuilder(ConventionalItemTags.WRENCH_TOOLS);
getOrCreateTagBuilder(ConventionalItemTags.MINING_TOOL_TOOLS)
.add(Items.WOODEN_PICKAXE)

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

@ -403,6 +403,7 @@
"tag.item.c.tools.shields": "Shields",
"tag.item.c.tools.spear": "Spears",
"tag.item.c.tools.spears": "Spears",
"tag.item.c.tools.wrench": "Wrenches",
"tag.item.c.villager_job_sites": "Villager Job Sites",
"tag.worldgen.biome.c.hidden_from_locator_selection": "Hidden From Locator Selection",
"tag.worldgen.biome.c.is_aquatic": "Aquatic",

8
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools.json
View file

@ -52,6 +52,14 @@
"id": "#c:tools/spear",
"required": false
},
{
"id": "#c:tools/mace",
"required": false
},
{
"id": "#c:tools/wrench",
"required": false
},
{
"id": "#c:tools/mining_tool",
"required": false

3
fabric-convention-tags-v2/src/generated/resources/data/c/tags/item/tools/wrench.json Normal file
View file

@ -0,0 +1,3 @@
{
"values": []
}

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

@ -70,6 +70,7 @@ public final class ConventionalItemTags {
*/
public static final TagKey<Item> IGNITER_TOOLS = register("tools/igniter");
public static final TagKey<Item> MACE_TOOLS = register("tools/mace");
public static final TagKey<Item> WRENCH_TOOLS = register("tools/wrench");
// Action-based tool tags
/**