FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-24 00:28:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add common Mace tag (#3909)

Browse source
This commit is contained in:
TelepathicGrunt 2024-07-07 08:52:41 -04:00 committed by GitHub
parent 3f89f5a5c6
commit 8d16166232
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -121,6 +121,7 @@ public class EnglishTagLangGenerator extends FabricLanguageProvider {
translationBuilder.add(ConventionalItemTags.SHIELD_TOOLS, "Shields");
translationBuilder.add(ConventionalItemTags.FISHING_ROD_TOOLS, "Fishing Rods");
translationBuilder.add(ConventionalItemTags.BRUSH_TOOLS, "Brushes");
translationBuilder.add(ConventionalItemTags.MACE_TOOLS, "Maces");
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

@ -456,6 +456,8 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
getOrCreateTagBuilder(ConventionalItemTags.BRUSH_TOOLS)
.add(Items.BRUSH)
.addOptionalTag(ConventionalItemTags.BRUSHES_TOOLS);
getOrCreateTagBuilder(ConventionalItemTags.MACE_TOOLS)
.add(Items.MACE);
getOrCreateTagBuilder(ConventionalItemTags.MINING_TOOL_TOOLS)
.add(Items.WOODEN_PICKAXE)
@ -479,6 +481,7 @@ public final class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.add(Items.IRON_AXE)
.add(Items.DIAMOND_AXE)
.add(Items.NETHERITE_AXE)
.add(Items.MACE)
.addOptionalTag(ConventionalItemTags.MELEE_WEAPONS_TOOLS);
getOrCreateTagBuilder(ConventionalItemTags.RANGED_WEAPON_TOOLS)

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

@ -241,6 +241,7 @@
"tag.item.c.tools.crossbows": "Crossbows",
"tag.item.c.tools.fishing_rod": "Fishing Rods",
"tag.item.c.tools.fishing_rods": "Fishing Rods",
"tag.item.c.tools.mace": "Maces",
"tag.item.c.tools.melee_weapon": "Melee Weapons",
"tag.item.c.tools.melee_weapons": "Melee Weapons",
"tag.item.c.tools.mining_tool": "Mining Tools",

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

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

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

@ -12,6 +12,7 @@
"minecraft:iron_axe",
"minecraft:diamond_axe",
"minecraft:netherite_axe",
"minecraft:mace",
{
"id": "#c:tools/melee_weapons",
"required": false

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

@ -49,6 +49,7 @@ public final class ConventionalItemTags {
public static final TagKey<Item> SHIELD_TOOLS = register("tools/shield");
public static final TagKey<Item> FISHING_ROD_TOOLS = register("tools/fishing_rod");
public static final TagKey<Item> BRUSH_TOOLS = register("tools/brush");
public static final TagKey<Item> MACE_TOOLS = register("tools/mace");
// Action-based tool tags
public static final TagKey<Item> MELEE_WEAPON_TOOLS = register("tools/melee_weapon");