From b1fee2e7418231871e06227a1845d9f3f56243b0 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Wed, 16 Sep 2020 00:43:28 +0300 Subject: [PATCH] JackHammers should respect ores when AoE mining. --- .../items/tool/advanced/AdvancedJackhammerItem.java | 8 +++++++- .../items/tool/industrial/IndustrialJackhammerItem.java | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java b/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java index d93ab3e66..1b367471e 100644 --- a/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java +++ b/src/main/java/techreborn/items/tool/advanced/AdvancedJackhammerItem.java @@ -38,6 +38,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import org.jetbrains.annotations.Nullable; import reborncore.common.misc.MultiBlockBreakingTool; import reborncore.common.util.ItemUtils; import team.reborn.energy.EnergyTier; @@ -47,7 +48,6 @@ import techreborn.items.tool.MiningLevel; import techreborn.utils.MessageIDs; import techreborn.utils.ToolsUtil; -import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.List; import java.util.Set; @@ -63,7 +63,13 @@ public class AdvancedJackhammerItem extends JackhammerItem implements MultiBlock if (originalPos.equals(pos)) { return false; } + BlockState blockState = worldIn.getBlockState(pos); + + if (ToolsUtil.JackHammerSkippedBlocks(blockState)){ + return false; + } + return (stack.getItem().isEffectiveOn(blockState)); } diff --git a/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java b/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java index 61155ac57..a2102e6c6 100644 --- a/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java +++ b/src/main/java/techreborn/items/tool/industrial/IndustrialJackhammerItem.java @@ -92,6 +92,11 @@ public class IndustrialJackhammerItem extends JackhammerItem implements MultiBlo return false; } BlockState blockState = worldIn.getBlockState(pos); + + if (ToolsUtil.JackHammerSkippedBlocks(blockState)){ + return false; + } + return (stack.getItem().isEffectiveOn(blockState)); }