upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 08:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate duplicate tool tags that vanilla added in 1.19.4

Browse Source 
We will maintain a seperate 'tools' tag until Mojang adds all relevent tool tags.
Closes #9393
This commit is contained in:
LexManos committed 2023-03-29 17:59:50 -07:00
1 parent 71b115c8fe
commit df3db236e5
8 files changed
+35 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/common/Tags.java
+10
View File
@@ -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<Item> 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<Item> 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<Item> 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<Item> 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<Item> TOOLS_HOES = tag("tools/hoes");
/**
* A tag containing all existing shields.
src/main/java/net/minecraftforge/common/data/ForgeItemTagsProvider.java
+10 -6
View File
@@ -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);