Make it possible to blacklist blocks from being mined by the disassembler or meka tool

Author: pupnewfster

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

@@ -85,14 +85,6 @@ public class ItemAtomicDisassembler extends ItemEnergized implements IItemHUDPro
           ToolActions.SWORD_DIG);
     private static final Lazy<RadialData<DisassemblerMode>> LAZY_RADIAL_DATA = Lazy.of(() ->
           IRadialDataHelper.INSTANCE.dataForEnum(Mekanism.rl("disassembler_mode"), DisassemblerMode.NORMAL));
-    //Allow harvesting everything, things that are unbreakable are caught elsewhere
-    public static final Tool MINE_ANY_TOOL = new Tool(
-          //TODO - 1.20.5: Can speed be empty like it is here?
-          // Maybe we want it to be denies drop and an empty tag?
-          List.of(new Tool.Rule(new AnyHolderSet<>(BuiltInRegistries.BLOCK.asLookup()), Optional.empty(), Optional.of(true))),
-          //TODO - 1.20.5: Figure out what these values are meant to be
-          1, 0
-    );
 
     /**
      * @apiNote For use in calculating drops of given blocks. Given mods may do checks relating to tool actions we need to make sure that this stack is full energy.
@@ -106,7 +98,10 @@ public static ItemStack fullyChargedStack() {
     public ItemAtomicDisassembler(Properties properties) {
         super(properties.rarity(Rarity.RARE).setNoRepair().stacksTo(1)
               .component(MekanismDataComponents.DISASSEMBLER_MODE, DisassemblerMode.NORMAL)
-              .component(DataComponents.TOOL, MINE_ANY_TOOL)
+              .component(DataComponents.TOOL, new Tool(List.of(
+                    Tool.Rule.deniesDrops(MekanismTags.Blocks.INCORRECT_FOR_DISASSEMBLER),
+                    new Tool.Rule(new AnyHolderSet<>(BuiltInRegistries.BLOCK.asLookup()), Optional.empty(), Optional.of(true))
+              ), 1, 0))
         );
         this.attributeCache = new AttributeCache(this, MekanismConfig.gear.disassemblerMaxDamage, MekanismConfig.gear.disassemblerAttackSpeed);
     }

src/datagen/generated/mekanism/data/mekanism/tags/blocks/incorrect_for_disassembler.json

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.stream.Collectors;
 import mekanism.api.Action;
 import mekanism.api.AutomationType;
@@ -46,6 +47,7 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
@@ -67,6 +69,7 @@
 import net.minecraft.world.item.Rarity;
 import net.minecraft.world.item.TooltipFlag;
 import net.minecraft.world.item.component.ItemAttributeModifiers;
+import net.minecraft.world.item.component.Tool;
 import net.minecraft.world.item.context.UseOnContext;
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
@@ -78,6 +81,7 @@
 import net.minecraft.world.phys.HitResult;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.common.ToolAction;
+import net.neoforged.neoforge.registries.holdersets.AnyHolderSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -88,8 +92,11 @@ public class ItemMekaTool extends ItemEnergized implements IRadialModuleContaine
     private final Int2ObjectMap<AttributeCache> attributeCaches = new Int2ObjectArrayMap<>(ModuleAttackAmplificationUnit.AttackDamage.values().length);
 
     public ItemMekaTool(Properties properties) {
-        super(IModuleHelper.INSTANCE.applyModuleContainerProperties(
-              properties.rarity(Rarity.EPIC).setNoRepair().stacksTo(1).component(DataComponents.TOOL, ItemAtomicDisassembler.MINE_ANY_TOOL)
+        super(IModuleHelper.INSTANCE.applyModuleContainerProperties(properties.rarity(Rarity.EPIC).setNoRepair()
+                    .component(DataComponents.TOOL, new Tool(List.of(
+                          Tool.Rule.deniesDrops(MekanismTags.Blocks.INCORRECT_FOR_MEKA_TOOL),
+                          new Tool.Rule(new AnyHolderSet<>(BuiltInRegistries.BLOCK.asLookup()), Optional.empty(), Optional.of(true))
+                    ), 1, 0))
         ));
     }
 

src/datagen/generated/mekanism/data/mekanism/tags/blocks/incorrect_for_meka_tool.json

@@ -197,6 +197,8 @@ private Blocks() {
         public static final TagKey<Block> CARDBOARD_BLACKLIST = tag("cardboard_blacklist");
         public static final TagKey<Block> MINER_BLACKLIST = tag("miner_blacklist");
         public static final TagKey<Block> ATOMIC_DISASSEMBLER_ORE = tag("atomic_disassembler_ore");
+        public static final TagKey<Block> INCORRECT_FOR_DISASSEMBLER = tag("incorrect_for_disassembler");
+        public static final TagKey<Block> INCORRECT_FOR_MEKA_TOOL = tag("incorrect_for_meka_tool");
         /**
          * For use in the farming module to target blocks that should be effectively ignored when checking if the block below should be targeted.
          */

src/main/java/mekanism/common/item/gear/ItemAtomicDisassembler.java

@@ -18,13 +18,6 @@ private Blocks() {
         }
 
         public static final TagKey<Block> MINEABLE_WITH_PAXEL = commonTag("mineable/paxel");
-        public static final TagKey<Block> NEEDS_BRONZE_TOOL = tag("needs_bronze_tool");
-        public static final TagKey<Block> NEEDS_LAPIS_LAZULI_TOOL = tag("needs_lapis_lazuli_tool");
-        public static final TagKey<Block> NEEDS_OSMIUM_TOOL = tag("needs_osmium_tool");
-        public static final TagKey<Block> NEEDS_REFINED_GLOWSTONE_TOOL = tag("needs_refined_glowstone_tool");
-        public static final TagKey<Block> NEEDS_REFINED_OBSIDIAN_TOOL = tag("needs_refined_obsidian_tool");
-        public static final TagKey<Block> NEEDS_STEEL_TOOL = tag("needs_steel_tool");
-
         public static final TagKey<Block> INCORRECT_FOR_BRONZE_TOOL = tag("incorrect_for_bronze_tool");
         public static final TagKey<Block> INCORRECT_FOR_LAPIS_LAZULI_TOOL = tag("incorrect_for_lapis_lazuli_tool");
         public static final TagKey<Block> INCORRECT_FOR_OSMIUM_TOOL = tag("incorrect_for_osmium_tool");