fixed tools not properly checking isCorrectToolForDrops

GregTech-Intergalactical · Dec 12, 2023 · ade52a8 · ade52a8
1 parent 4e6c358
commit ade52a8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/common/src/main/java/muramasa/antimatter/tool/IAntimatterTool.java b/common/src/main/java/muramasa/antimatter/tool/IAntimatterTool.java
@@ -42,7 +42,6 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.HitResult;
 import org.jetbrains.annotations.Nullable;
@@ -155,7 +154,7 @@ default Tier getTier(ItemStack stack) {
         return tier.orElseGet(() -> resolveTierTag(dataTag));
     }
 
-    default boolean isCorrectToolForDrops(ItemStack stack, BlockState state) {
+    default boolean genericIsCorrectToolForDrops(ItemStack stack, BlockState state) {
         AntimatterToolType type = this.getAntimatterToolType();
         if (type.getEffectiveMaterials().contains(state.getMaterial())) {
             return true;

diff --git a/common/src/main/java/muramasa/antimatter/tool/MaterialSword.java b/common/src/main/java/muramasa/antimatter/tool/MaterialSword.java
@@ -10,7 +10,6 @@
 import muramasa.antimatter.capability.energy.ItemEnergyHandler;
 import muramasa.antimatter.item.IContainerItem;
 import muramasa.antimatter.material.Material;
-import muramasa.antimatter.util.Utils;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.NonNullList;
@@ -31,7 +30,6 @@
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -157,7 +155,7 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta
 
     @Override
     public float getDestroySpeed(ItemStack stack, BlockState state) {
-        float destroySpeed = isCorrectToolForDrops(stack, state) ? getDefaultMiningSpeed(stack) : 1.0F;
+        float destroySpeed = genericIsCorrectToolForDrops(stack, state) ? getDefaultMiningSpeed(stack) : 1.0F;
         if (type.isPowered() && getCurrentEnergy(stack)  == 0){
             destroySpeed = 0.0f;
         }
@@ -173,7 +171,13 @@ public float getDestroySpeed(ItemStack stack, BlockState state) {
         return destroySpeed;
     }
 
+    public boolean isSuitableFor(ItemStack stack, BlockState state) {
+        return this.genericIsCorrectToolForDrops(stack, state);
+    }
 
+    public boolean isCorrectToolForDrops(ItemStack stack, BlockState state){
+        return genericIsCorrectToolForDrops(stack, state);
+    }
 
     @Override
     public boolean mineBlock(ItemStack stack, Level world, BlockState state, BlockPos pos, LivingEntity entity) {

diff --git a/common/src/main/java/muramasa/antimatter/tool/MaterialTool.java b/common/src/main/java/muramasa/antimatter/tool/MaterialTool.java
@@ -7,7 +7,6 @@
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.behaviour.IBehaviour;
-import muramasa.antimatter.behaviour.IBlockDestroyed;
 import muramasa.antimatter.behaviour.IDestroySpeed;
 import muramasa.antimatter.capability.energy.ItemEnergyHandler;
 import muramasa.antimatter.data.AntimatterDefaultTools;
@@ -22,7 +21,6 @@
 import net.minecraft.core.NonNullList;
 import net.minecraft.network.chat.Component;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;
@@ -39,8 +37,6 @@
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.HitResult;
 import org.jetbrains.annotations.NotNull;
@@ -138,7 +134,11 @@ public boolean doesSneakBypassUse(ItemStack stack, LevelReader world, BlockPos p
 
     //fabric method
     public boolean isSuitableFor(ItemStack stack, BlockState state) {
-        return this.isCorrectToolForDrops(stack, state);
+        return this.genericIsCorrectToolForDrops(stack, state);
+    }
+
+    public boolean isCorrectToolForDrops(ItemStack stack, BlockState state){
+        return genericIsCorrectToolForDrops(stack, state);
     }
 
     @Override
@@ -201,7 +201,7 @@ public boolean hurtEnemy(ItemStack stack, LivingEntity target, LivingEntity atta
 
     @Override
     public float getDestroySpeed(ItemStack stack, BlockState state) {
-        float destroySpeed = isCorrectToolForDrops(stack, state) ? getDefaultMiningSpeed(stack) : 1.0F;
+        float destroySpeed = genericIsCorrectToolForDrops(stack, state) ? getDefaultMiningSpeed(stack) : 1.0F;
         if (type.isPowered() && getCurrentEnergy(stack)  == 0){
             destroySpeed = 0.0f;
         }