From b53f3925a402e9ff26d867932a6fd891dc1c7c43 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Tue, 13 Nov 2018 22:28:12 -0800 Subject: [PATCH] forgot to add these files lol --- src/main/java/baritone/behavior/PathingBehavior.java | 5 ++--- src/main/java/baritone/pathing/path/PathExecutor.java | 2 +- src/main/java/baritone/utils/InputOverrideHandler.java | 4 ++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/baritone/behavior/PathingBehavior.java b/src/main/java/baritone/behavior/PathingBehavior.java index 7cba8d58..7be1d405 100644 --- a/src/main/java/baritone/behavior/PathingBehavior.java +++ b/src/main/java/baritone/behavior/PathingBehavior.java @@ -36,7 +36,6 @@ import baritone.pathing.movement.CalculationContext; import baritone.pathing.movement.MovementHelper; import baritone.pathing.path.CutoffPath; import baritone.pathing.path.PathExecutor; -import baritone.utils.BlockBreakHelper; import baritone.utils.Helper; import baritone.utils.PathRenderer; import net.minecraft.util.math.BlockPos; @@ -101,7 +100,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior, if (pauseRequestedLastTick && safeToCancel) { pauseRequestedLastTick = false; baritone.getInputOverrideHandler().clearAllKeys(); - BlockBreakHelper.stopBreakingBlock(); + baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock(); return; } if (cancelRequested) { @@ -296,7 +295,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior, next = null; baritone.getInputOverrideHandler().clearAllKeys(); AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(AbstractNodeCostSearch::cancel); - BlockBreakHelper.stopBreakingBlock(); + baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock(); } public void forceCancel() { // NOT exposed on public api diff --git a/src/main/java/baritone/pathing/path/PathExecutor.java b/src/main/java/baritone/pathing/path/PathExecutor.java index fadc2f21..270bb0ca 100644 --- a/src/main/java/baritone/pathing/path/PathExecutor.java +++ b/src/main/java/baritone/pathing/path/PathExecutor.java @@ -452,7 +452,7 @@ public class PathExecutor implements IPathExecutor, Helper { private void cancel() { clearKeys(); - BlockBreakHelper.stopBreakingBlock(); + behavior.baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock(); pathPosition = path.length() + 3; failed = true; } diff --git a/src/main/java/baritone/utils/InputOverrideHandler.java b/src/main/java/baritone/utils/InputOverrideHandler.java index 3670a044..191d145a 100755 --- a/src/main/java/baritone/utils/InputOverrideHandler.java +++ b/src/main/java/baritone/utils/InputOverrideHandler.java @@ -115,4 +115,8 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri boolean stillClick = blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT.getKeyBinding())); setInputForceState(Input.CLICK_LEFT, stillClick); } + + public BlockBreakHelper getBlockBreakHelper() { + return blockBreakHelper; + } }