RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

forgot to add these files lol

This commit is contained in:
Leijurv 2018-11-13 22:28:12 -08:00
parent e93fd596ff
commit b53f3925a4
No known key found for this signature in database
GPG Key ID: 44A3EA646EADAC6A
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/baritone/behavior/PathingBehavior.java
View File

@ -36,7 +36,6 @@ import baritone.pathing.movement.CalculationContext;
import baritone.pathing.movement.MovementHelper; import baritone.pathing.movement.MovementHelper;
import baritone.pathing.path.CutoffPath; import baritone.pathing.path.CutoffPath;
import baritone.pathing.path.PathExecutor; import baritone.pathing.path.PathExecutor;
import baritone.utils.BlockBreakHelper;
import baritone.utils.Helper; import baritone.utils.Helper;
import baritone.utils.PathRenderer; import baritone.utils.PathRenderer;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
@ -101,7 +100,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
if (pauseRequestedLastTick && safeToCancel) { if (pauseRequestedLastTick && safeToCancel) {
pauseRequestedLastTick = false; pauseRequestedLastTick = false;
baritone.getInputOverrideHandler().clearAllKeys(); baritone.getInputOverrideHandler().clearAllKeys();
BlockBreakHelper.stopBreakingBlock(); baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock();
return; return;
} }
if (cancelRequested) { if (cancelRequested) {
@ -296,7 +295,7 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior,
next = null; next = null;
baritone.getInputOverrideHandler().clearAllKeys(); baritone.getInputOverrideHandler().clearAllKeys();
AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(AbstractNodeCostSearch::cancel); AbstractNodeCostSearch.getCurrentlyRunning().ifPresent(AbstractNodeCostSearch::cancel);
BlockBreakHelper.stopBreakingBlock(); baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock();
} }
public void forceCancel() { // NOT exposed on public api public void forceCancel() { // NOT exposed on public api

2
src/main/java/baritone/pathing/path/PathExecutor.java
View File

@ -452,7 +452,7 @@ public class PathExecutor implements IPathExecutor, Helper {
private void cancel() { private void cancel() {
clearKeys(); clearKeys();
BlockBreakHelper.stopBreakingBlock(); behavior.baritone.getInputOverrideHandler().getBlockBreakHelper().stopBreakingBlock();
pathPosition = path.length() + 3; pathPosition = path.length() + 3;
failed = true; failed = true;
} }

4
src/main/java/baritone/utils/InputOverrideHandler.java
View File

@ -115,4 +115,8 @@ public final class InputOverrideHandler extends Behavior implements IInputOverri
boolean stillClick = blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT.getKeyBinding())); boolean stillClick = blockBreakHelper.tick(isInputForcedDown(Input.CLICK_LEFT.getKeyBinding()));
setInputForceState(Input.CLICK_LEFT, stillClick); setInputForceState(Input.CLICK_LEFT, stillClick);
} }
public BlockBreakHelper getBlockBreakHelper() {
return blockBreakHelper;
}
} }