From df3db236e55241539d2a199ed951bb225c88619a Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 29 Mar 2023 17:40:50 -0700 Subject: [PATCH] Deprecate duplicate tool tags that vanilla added in 1.19.4 We will maintain a seperate 'tools' tag until Mojang adds all relevent tool tags. Closes #9393 --- .../resources/data/forge/tags/items/tools.json | 5 +++++ .../data/forge/tags/items/tools/axes.json | 3 ++- .../data/forge/tags/items/tools/hoes.json | 3 ++- .../data/forge/tags/items/tools/pickaxes.json | 3 ++- .../data/forge/tags/items/tools/shovels.json | 3 ++- .../data/forge/tags/items/tools/swords.json | 3 ++- .../java/net/minecraftforge/common/Tags.java | 10 ++++++++++ .../common/data/ForgeItemTagsProvider.java | 16 ++++++++++------ 8 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/generated/resources/data/forge/tags/items/tools.json b/src/generated/resources/data/forge/tags/items/tools.json index cb5497b8e7..b023d4204a 100644 --- a/src/generated/resources/data/forge/tags/items/tools.json +++ b/src/generated/resources/data/forge/tags/items/tools.json @@ -5,6 +5,11 @@ "#forge:tools/pickaxes", "#forge:tools/shovels", "#forge:tools/hoes", + "#minecraft:swords", + "#minecraft:axes", + "#minecraft:pickaxes", + "#minecraft:shovels", + "#minecraft:hoes", "#forge:tools/shields", "#forge:tools/bows", "#forge:tools/crossbows", diff --git a/src/generated/resources/data/forge/tags/items/tools/axes.json b/src/generated/resources/data/forge/tags/items/tools/axes.json index 64f0e2f319..e9ed775d2d 100644 --- a/src/generated/resources/data/forge/tags/items/tools/axes.json +++ b/src/generated/resources/data/forge/tags/items/tools/axes.json @@ -5,6 +5,7 @@ "minecraft:iron_axe", "minecraft:golden_axe", "minecraft:diamond_axe", - "minecraft:netherite_axe" + "minecraft:netherite_axe", + "#minecraft:axes" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/hoes.json b/src/generated/resources/data/forge/tags/items/tools/hoes.json index 0dc92bb339..90468b44a9 100644 --- a/src/generated/resources/data/forge/tags/items/tools/hoes.json +++ b/src/generated/resources/data/forge/tags/items/tools/hoes.json @@ -5,6 +5,7 @@ "minecraft:iron_hoe", "minecraft:golden_hoe", "minecraft:diamond_hoe", - "minecraft:netherite_hoe" + "minecraft:netherite_hoe", + "#minecraft:hoes" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/pickaxes.json b/src/generated/resources/data/forge/tags/items/tools/pickaxes.json index c10d395032..64d7352040 100644 --- a/src/generated/resources/data/forge/tags/items/tools/pickaxes.json +++ b/src/generated/resources/data/forge/tags/items/tools/pickaxes.json @@ -5,6 +5,7 @@ "minecraft:iron_pickaxe", "minecraft:golden_pickaxe", "minecraft:diamond_pickaxe", - "minecraft:netherite_pickaxe" + "minecraft:netherite_pickaxe", + "#minecraft:pickaxes" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/shovels.json b/src/generated/resources/data/forge/tags/items/tools/shovels.json index 0176bb06cf..61c063ee06 100644 --- a/src/generated/resources/data/forge/tags/items/tools/shovels.json +++ b/src/generated/resources/data/forge/tags/items/tools/shovels.json @@ -5,6 +5,7 @@ "minecraft:iron_shovel", "minecraft:golden_shovel", "minecraft:diamond_shovel", - "minecraft:netherite_shovel" + "minecraft:netherite_shovel", + "#minecraft:shovels" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/tools/swords.json b/src/generated/resources/data/forge/tags/items/tools/swords.json index 418ccea479..7eee2daf6b 100644 --- a/src/generated/resources/data/forge/tags/items/tools/swords.json +++ b/src/generated/resources/data/forge/tags/items/tools/swords.json @@ -5,6 +5,7 @@ "minecraft:iron_sword", "minecraft:golden_sword", "minecraft:diamond_sword", - "minecraft:netherite_sword" + "minecraft:netherite_sword", + "#minecraft:swords" ] } \ No newline at end of file diff --git a/src/main/java/net/minecraftforge/common/Tags.java b/src/main/java/net/minecraftforge/common/Tags.java index 0b1ceb6880..b54e1f087f 100644 --- a/src/main/java/net/minecraftforge/common/Tags.java +++ b/src/main/java/net/minecraftforge/common/Tags.java @@ -426,7 +426,9 @@ public class Tags * * @see net.minecraftforge.common.ToolAction * @see net.minecraftforge.common.ToolActions + * @deprecated Replaced by net.minecraft.tags.ItemTags#SWORDS */ + @Deprecated(since = "1.19.4", forRemoval = true) public static final TagKey TOOLS_SWORDS = tag("tools/swords"); /** * A tag containing all existing axes. @@ -435,7 +437,9 @@ public class Tags * * @see net.minecraftforge.common.ToolAction * @see net.minecraftforge.common.ToolActions + * @deprecated Replaced by net.minecraft.tags.ItemTags#AXES */ + @Deprecated(since = "1.19.4", forRemoval = true) public static final TagKey TOOLS_AXES = tag("tools/axes"); /** * A tag containing all existing pickaxes. @@ -444,7 +448,9 @@ public class Tags * * @see net.minecraftforge.common.ToolAction * @see net.minecraftforge.common.ToolActions + * @deprecated Replaced by net.minecraft.tags.ItemTags#PICKAXES */ + @Deprecated(since = "1.19.4", forRemoval = true) public static final TagKey TOOLS_PICKAXES = tag("tools/pickaxes"); /** * A tag containing all existing shovels. @@ -453,7 +459,9 @@ public class Tags * * @see net.minecraftforge.common.ToolAction * @see net.minecraftforge.common.ToolActions + * @deprecated Replaced by net.minecraft.tags.ItemTags#SHOVELS */ + @Deprecated(since = "1.19.4", forRemoval = true) public static final TagKey TOOLS_SHOVELS = tag("tools/shovels"); /** * A tag containing all existing hoes. @@ -462,7 +470,9 @@ public class Tags * * @see net.minecraftforge.common.ToolAction * @see net.minecraftforge.common.ToolActions + * @deprecated Replaced by net.minecraft.tags.ItemTags#HOES */ + @Deprecated(since = "1.19.4", forRemoval = true) public static final TagKey TOOLS_HOES = tag("tools/hoes"); /** * A tag containing all existing shields. diff --git a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java index d1a5cb2c11..c2f1b99b85 100644 --- a/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java +++ b/src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java @@ -10,6 +10,7 @@ import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; import net.minecraft.data.tags.TagsProvider; import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.Item; @@ -155,17 +156,20 @@ public final class ForgeItemTagsProvider extends ItemTagsProvider copy(Tags.Blocks.STORAGE_BLOCKS_RAW_IRON, Tags.Items.STORAGE_BLOCKS_RAW_IRON); copy(Tags.Blocks.STORAGE_BLOCKS_NETHERITE, Tags.Items.STORAGE_BLOCKS_NETHERITE); tag(Tags.Items.STRING).add(Items.STRING); - tag(Tags.Items.TOOLS_SWORDS).add(Items.WOODEN_SWORD, Items.STONE_SWORD, Items.IRON_SWORD, Items.GOLDEN_SWORD, Items.DIAMOND_SWORD, Items.NETHERITE_SWORD); - tag(Tags.Items.TOOLS_AXES).add(Items.WOODEN_AXE, Items.STONE_AXE, Items.IRON_AXE, Items.GOLDEN_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE); - tag(Tags.Items.TOOLS_PICKAXES).add(Items.WOODEN_PICKAXE, Items.STONE_PICKAXE, Items.IRON_PICKAXE, Items.GOLDEN_PICKAXE, Items.DIAMOND_PICKAXE, Items.NETHERITE_PICKAXE); - tag(Tags.Items.TOOLS_SHOVELS).add(Items.WOODEN_SHOVEL, Items.STONE_SHOVEL, Items.IRON_SHOVEL, Items.GOLDEN_SHOVEL, Items.DIAMOND_SHOVEL, Items.NETHERITE_SHOVEL); - tag(Tags.Items.TOOLS_HOES).add(Items.WOODEN_HOE, Items.STONE_HOE, Items.IRON_HOE, Items.GOLDEN_HOE, Items.DIAMOND_HOE, Items.NETHERITE_HOE); + tag(Tags.Items.TOOLS_SWORDS).add(Items.WOODEN_SWORD, Items.STONE_SWORD, Items.IRON_SWORD, Items.GOLDEN_SWORD, Items.DIAMOND_SWORD, Items.NETHERITE_SWORD).addTags(ItemTags.SWORDS); + tag(Tags.Items.TOOLS_AXES).add(Items.WOODEN_AXE, Items.STONE_AXE, Items.IRON_AXE, Items.GOLDEN_AXE, Items.DIAMOND_AXE, Items.NETHERITE_AXE).addTags(ItemTags.AXES); + tag(Tags.Items.TOOLS_PICKAXES).add(Items.WOODEN_PICKAXE, Items.STONE_PICKAXE, Items.IRON_PICKAXE, Items.GOLDEN_PICKAXE, Items.DIAMOND_PICKAXE, Items.NETHERITE_PICKAXE).addTags(ItemTags.PICKAXES); + tag(Tags.Items.TOOLS_SHOVELS).add(Items.WOODEN_SHOVEL, Items.STONE_SHOVEL, Items.IRON_SHOVEL, Items.GOLDEN_SHOVEL, Items.DIAMOND_SHOVEL, Items.NETHERITE_SHOVEL).addTags(ItemTags.SHOVELS); + tag(Tags.Items.TOOLS_HOES).add(Items.WOODEN_HOE, Items.STONE_HOE, Items.IRON_HOE, Items.GOLDEN_HOE, Items.DIAMOND_HOE, Items.NETHERITE_HOE).addTags(ItemTags.HOES); tag(Tags.Items.TOOLS_SHIELDS).add(Items.SHIELD); tag(Tags.Items.TOOLS_BOWS).add(Items.BOW); tag(Tags.Items.TOOLS_CROSSBOWS).add(Items.CROSSBOW); tag(Tags.Items.TOOLS_FISHING_RODS).add(Items.FISHING_ROD); tag(Tags.Items.TOOLS_TRIDENTS).add(Items.TRIDENT); - tag(Tags.Items.TOOLS).addTags(Tags.Items.TOOLS_SWORDS, Tags.Items.TOOLS_AXES, Tags.Items.TOOLS_PICKAXES, Tags.Items.TOOLS_SHOVELS, Tags.Items.TOOLS_HOES, Tags.Items.TOOLS_SHIELDS, Tags.Items.TOOLS_BOWS, Tags.Items.TOOLS_CROSSBOWS, Tags.Items.TOOLS_FISHING_RODS, Tags.Items.TOOLS_TRIDENTS); + tag(Tags.Items.TOOLS) + .addTags(Tags.Items.TOOLS_SWORDS, Tags.Items.TOOLS_AXES, Tags.Items.TOOLS_PICKAXES, Tags.Items.TOOLS_SHOVELS, Tags.Items.TOOLS_HOES) // TODO: Since: 1.20, remove this line vanilla added these tags in 1.19.4 + .addTags(ItemTags.SWORDS, ItemTags.AXES, ItemTags.PICKAXES, ItemTags.SHOVELS, ItemTags.HOES) + .addTags(Tags.Items.TOOLS_SHIELDS, Tags.Items.TOOLS_BOWS, Tags.Items.TOOLS_CROSSBOWS, Tags.Items.TOOLS_FISHING_RODS, Tags.Items.TOOLS_TRIDENTS); tag(Tags.Items.ARMORS_HELMETS).add(Items.LEATHER_HELMET, Items.TURTLE_HELMET, Items.CHAINMAIL_HELMET, Items.IRON_HELMET, Items.GOLDEN_HELMET, Items.DIAMOND_HELMET, Items.NETHERITE_HELMET); tag(Tags.Items.ARMORS_CHESTPLATES).add(Items.LEATHER_CHESTPLATE, Items.CHAINMAIL_CHESTPLATE, Items.IRON_CHESTPLATE, Items.GOLDEN_CHESTPLATE, Items.DIAMOND_CHESTPLATE, Items.NETHERITE_CHESTPLATE); tag(Tags.Items.ARMORS_LEGGINGS).add(Items.LEATHER_LEGGINGS, Items.CHAINMAIL_LEGGINGS, Items.IRON_LEGGINGS, Items.GOLDEN_LEGGINGS, Items.DIAMOND_LEGGINGS, Items.NETHERITE_LEGGINGS);