Add various items to the new tool tags

Author: pupnewfster

src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93

@@ -251,7 +251,9 @@ private void addBoxBlacklist() {
     private void addTools() {
         addWrenches();
         addToTag(ItemTags.BREAKS_DECORATED_POTS, MekanismItems.ATOMIC_DISASSEMBLER, MekanismItems.MEKA_TOOL);
+        addToTag(Tags.Items.MINING_TOOL_TOOLS , MekanismItems.ATOMIC_DISASSEMBLER, MekanismItems.MEKA_TOOL);
         addToTag(Tags.Items.TOOLS_BOW, MekanismItems.ELECTRIC_BOW);
+        addToTag(Tags.Items.RANGED_WEAPON_TOOLS, MekanismItems.ELECTRIC_BOW);
         addToTag(ItemTags.BOW_ENCHANTABLE, MekanismItems.ELECTRIC_BOW);
         addToTag(ItemTags.DURABILITY_ENCHANTABLE, MekanismItems.HDPE_REINFORCED_ELYTRA);
         addToTag(ItemTags.EQUIPPABLE_ENCHANTABLE, MekanismItems.HDPE_REINFORCED_ELYTRA);

src/datagen/generated/mekanism/data/c/tags/item/tools/mining_tool.json

@@ -4,8 +4,10 @@
 import java.util.function.Predicate;
 import mekanism.common.tag.BaseTagProvider;
 import mekanism.common.tag.IntrinsicMekanismTagBuilder;
+import mekanism.tools.common.item.ItemMekanismAxe;
 import mekanism.tools.common.item.ItemMekanismPaxel;
 import mekanism.tools.common.item.ItemMekanismPickaxe;
+import mekanism.tools.common.item.ItemMekanismSword;
 import mekanism.tools.common.registries.ToolsItems;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderLookup;
@@ -60,6 +62,8 @@ protected void registerTags(HolderLookup.Provider registries) {
         getBlockBuilder(ToolsTags.Blocks.INCORRECT_FOR_REFINED_OBSIDIAN_TOOL).add(BlockTags.INCORRECT_FOR_NETHERITE_TOOL);
         getBlockBuilder(ToolsTags.Blocks.INCORRECT_FOR_STEEL_TOOL).add(BlockTags.INCORRECT_FOR_DIAMOND_TOOL);
         createTag(getItemBuilder(ItemTags.CLUSTER_MAX_HARVESTABLES), item -> item instanceof ItemMekanismPickaxe || item instanceof ItemMekanismPaxel);
+        createTag(getItemBuilder(Tags.Items.MINING_TOOL_TOOLS), item -> item instanceof ItemMekanismPickaxe || item instanceof ItemMekanismPaxel);
+        createTag(getItemBuilder(Tags.Items.MELEE_WEAPON_TOOLS), item -> item instanceof ItemMekanismSword || item instanceof ItemMekanismAxe || item instanceof ItemMekanismPaxel);
     }
 
     private void addToolTags() {

src/datagen/generated/mekanism/data/c/tags/item/tools/ranged_weapon.json

@@ -5,13 +5,12 @@
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.crafting.CraftingBookCategory;
 import net.minecraft.world.item.crafting.CraftingInput;
-import net.minecraft.world.item.crafting.CraftingRecipe;
 import net.minecraft.world.item.crafting.ShapedRecipe;
 import net.minecraft.world.item.crafting.ShapedRecipePattern;
 import net.minecraft.world.level.Level;
 
 @NothingNullByDefault
-public abstract class WrappedShapedRecipe extends ShapedRecipe implements CraftingRecipe {
+public abstract class WrappedShapedRecipe extends ShapedRecipe {
 
     protected WrappedShapedRecipe(String group, CraftingBookCategory category, ShapedRecipePattern pattern, ItemStack result, boolean showNotification) {
         super(group, category, pattern, result, showNotification);
@@ -26,8 +25,4 @@ public boolean matches(CraftingInput input, Level world) {
         // to ensure that we return the proper value for if there is a match that gives a proper output
         return super.matches(input, world) && !assemble(input, world.registryAccess()).isEmpty();
     }
-
-    public ShapedRecipePattern getPattern() {
-        return this.pattern;
-    }
 }

src/datagen/generated/mekanismtools/.cache/74946afffd5717edd09cca189d3cabba428fcf6f

@@ -113,6 +113,4 @@ public net.minecraft.world.level.storage.loot.functions.CopyNbtFunction$Path
 
 public net.minecraft.world.phys.AABB getDirection(Lnet/minecraft/world/phys/AABB;Lnet/minecraft/world/phys/Vec3;[DLnet/minecraft/core/Direction;DDD)Lnet/minecraft/core/Direction;
 
-# todo remove if https://github.com/neoforged/NeoForge/pull/1270 gets merged
-public net.minecraft.world.item.crafting.ShapedRecipe pattern
 public net.minecraft.world.item.crafting.ShapedRecipe result