From 5e421e8b8b081ae17cd7efc6b700ec85fd920196 Mon Sep 17 00:00:00 2001 From: Paint_Ninja Date: Wed, 8 Apr 2026 20:26:14 +0100 Subject: [PATCH] Add `c:tools/trident` item tag, update contents of `c:tools/melee_weapon`, remove `c:tools/spear` (#10808) - Breaking change: `c:tools/spear` has been renamed to `c:tools/trident` to match other loaders - The contents of the `c:tools/melee_weapon` tag now includes spears --- src/main/generated/data/c/tags/block/flowers/tall.json | 6 +----- src/main/generated/data/c/tags/item/tools.json | 2 +- .../generated/data/c/tags/item/tools/melee_weapon.json | 9 ++++++++- .../data/c/tags/item/tools/{spear.json => trident.json} | 0 .../net/minecraftforge/common/TagConventionMappings.java | 2 +- src/main/java/net/minecraftforge/common/Tags.java | 7 ++++--- .../common/data/ForgeItemTagsProvider.java | 7 ++++--- 7 files changed, 19 insertions(+), 14 deletions(-) rename src/main/generated/data/c/tags/item/tools/{spear.json => trident.json} (100%) diff --git a/src/main/generated/data/c/tags/block/flowers/tall.json b/src/main/generated/data/c/tags/block/flowers/tall.json index 1944a475be..144eb89e0a 100644 --- a/src/main/generated/data/c/tags/block/flowers/tall.json +++ b/src/main/generated/data/c/tags/block/flowers/tall.json @@ -4,10 +4,6 @@ "minecraft:lilac", "minecraft:peony", "minecraft:rose_bush", - "minecraft:pitcher_plant", - { - "id": "minecraft:tall_flowers", - "required": false - } + "minecraft:pitcher_plant" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools.json b/src/main/generated/data/c/tags/item/tools.json index 093ece2873..8099500241 100644 --- a/src/main/generated/data/c/tags/item/tools.json +++ b/src/main/generated/data/c/tags/item/tools.json @@ -12,7 +12,7 @@ "#c:tools/shear", "#c:tools/igniter", "#c:tools/shield", - "#c:tools/spear", + "#c:tools/trident", "#c:tools/mace", "#c:tools/mining_tool", "#c:tools/melee_weapon", diff --git a/src/main/generated/data/c/tags/item/tools/melee_weapon.json b/src/main/generated/data/c/tags/item/tools/melee_weapon.json index 2bb3c599d0..0f91924b7d 100644 --- a/src/main/generated/data/c/tags/item/tools/melee_weapon.json +++ b/src/main/generated/data/c/tags/item/tools/melee_weapon.json @@ -15,6 +15,13 @@ "minecraft:golden_axe", "minecraft:iron_axe", "minecraft:diamond_axe", - "minecraft:netherite_axe" + "minecraft:netherite_axe", + "minecraft:wooden_spear", + "minecraft:stone_spear", + "minecraft:copper_spear", + "minecraft:iron_spear", + "minecraft:golden_spear", + "minecraft:diamond_spear", + "minecraft:netherite_spear" ] } \ No newline at end of file diff --git a/src/main/generated/data/c/tags/item/tools/spear.json b/src/main/generated/data/c/tags/item/tools/trident.json similarity index 100% rename from src/main/generated/data/c/tags/item/tools/spear.json rename to src/main/generated/data/c/tags/item/tools/trident.json diff --git a/src/main/java/net/minecraftforge/common/TagConventionMappings.java b/src/main/java/net/minecraftforge/common/TagConventionMappings.java index 9266376fac..1e65dec2bf 100644 --- a/src/main/java/net/minecraftforge/common/TagConventionMappings.java +++ b/src/main/java/net/minecraftforge/common/TagConventionMappings.java @@ -238,7 +238,7 @@ public final class TagConventionMappings { legacyToCommon(Registries.ITEM, forgeRl("tools/bows"), Tags.Items.TOOLS_BOW), legacyToCommon(Registries.ITEM, forgeRl("tools/crossbows"), Tags.Items.TOOLS_CROSSBOW), legacyToCommon(Registries.ITEM, forgeRl("tools/fishing_rods"), Tags.Items.TOOLS_FISHING_ROD), - legacyToCommon(Registries.ITEM, forgeRl("tools/tridents"), Tags.Items.TOOLS_SPEAR), + legacyToCommon(Registries.ITEM, forgeRl("tools/tridents"), Tags.Items.TOOLS_TRIDENT), legacyToCommon(Registries.ITEM, forgeRl("tools/shears"), Tags.Items.TOOLS_SHEAR), legacyToCommon(Registries.ITEM, forgeRl("armors"), Tags.Items.ARMORS), diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 028f811a06..352cd3d740 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -780,15 +780,16 @@ public class Tags { */ public static final TagKey TOOLS_FISHING_ROD = cTag("tools/fishing_rod"); /** - * A tag containing all existing spears. Other tools such as throwing knives or boomerangs - * should not be put into this tag and should be put into their own tool tags. + * A tag containing all existing throwable stick-like weapons like tridents. + * Other tools such as throwing knives or boomerangs should not be put into + * this tag and should be put into their own tool tags. * Do not use this tag for determining a tool's behavior. * Please use {@link ToolActions} instead for what action a tool can do. * * @see ToolAction * @see ToolActions */ - public static final TagKey TOOLS_SPEAR = cTag("tools/spear"); + public static final TagKey TOOLS_TRIDENT = cTag("tools/trident"); /** * A tag containing all existing shears. Do not use this tag for determining a tool's behavior. * Please use {@link ToolActions} instead for what action a tool can do. diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index 05b5cb375b..7f4e95eb0c 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -248,20 +248,21 @@ public final class ForgeItemTagsProvider extends VanillaItemTagsProvider { .add(Items.FISHING_ROD); tag(Tags.Items.TOOLS_SHEAR) .add(Items.SHEARS); - tag(Tags.Items.TOOLS_SPEAR).add(Items.TRIDENT); + tag(Tags.Items.TOOLS_TRIDENT).add(Items.TRIDENT); tag(Tags.Items.TOOLS_MACE).add(Items.MACE); tag(Tags.Items.TOOLS_IGNITER).add(Items.FLINT_AND_STEEL); tag(Tags.Items.MINING_TOOL_TOOLS).add(Items.WOODEN_PICKAXE, Items.STONE_PICKAXE, Items.COPPER_PICKAXE, Items.IRON_PICKAXE, Items.GOLDEN_PICKAXE, Items.DIAMOND_PICKAXE, Items.NETHERITE_PICKAXE); tag(Tags.Items.MELEE_WEAPON_TOOLS).add( Items.MACE, Items.TRIDENT, Items.WOODEN_SWORD, Items.STONE_SWORD, Items.COPPER_SWORD, Items.GOLDEN_SWORD, Items.IRON_SWORD, Items.DIAMOND_SWORD, Items.NETHERITE_SWORD, - Items.WOODEN_AXE, Items.STONE_AXE, Items.COPPER_AXE, Items.GOLDEN_AXE, Items.IRON_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE + Items.WOODEN_AXE, Items.STONE_AXE, Items.COPPER_AXE, Items.GOLDEN_AXE, Items.IRON_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE, + Items.WOODEN_SPEAR, Items.STONE_SPEAR, Items.COPPER_SPEAR, Items.IRON_SPEAR, Items.GOLDEN_SPEAR, Items.DIAMOND_SPEAR, Items.NETHERITE_SPEAR ); tag(Tags.Items.RANGED_WEAPON_TOOLS).add(Items.BOW, Items.CROSSBOW, Items.TRIDENT); tag(Tags.Items.TOOLS_WRENCH); tag(Tags.Items.TOOLS) .addTags(ItemTags.AXES, ItemTags.HOES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.SWORDS) - .addTags(Tags.Items.TOOLS_BOW, Tags.Items.TOOLS_BRUSH, Tags.Items.TOOLS_CROSSBOW, Tags.Items.TOOLS_FISHING_ROD, Tags.Items.TOOLS_SHEAR, Tags.Items.TOOLS_IGNITER, Tags.Items.TOOLS_SHIELD, Tags.Items.TOOLS_SPEAR, Tags.Items.TOOLS_MACE, Tags.Items.MINING_TOOL_TOOLS, Tags.Items.MELEE_WEAPON_TOOLS, Tags.Items.RANGED_WEAPON_TOOLS, Tags.Items.TOOLS_WRENCH); + .addTags(Tags.Items.TOOLS_BOW, Tags.Items.TOOLS_BRUSH, Tags.Items.TOOLS_CROSSBOW, Tags.Items.TOOLS_FISHING_ROD, Tags.Items.TOOLS_SHEAR, Tags.Items.TOOLS_IGNITER, Tags.Items.TOOLS_SHIELD, Tags.Items.TOOLS_TRIDENT, Tags.Items.TOOLS_MACE, Tags.Items.MINING_TOOL_TOOLS, Tags.Items.MELEE_WEAPON_TOOLS, Tags.Items.RANGED_WEAPON_TOOLS, Tags.Items.TOOLS_WRENCH); tag(Tags.Items.ARMORS_HORSE) .add( Items.COPPER_HORSE_ARMOR,