diff --git a/src/main/java/baritone/command/defaults/CancelCommand.java b/src/main/java/baritone/command/defaults/CancelCommand.java
deleted file mode 100644
index 3b4c6367..00000000
--- a/src/main/java/baritone/command/defaults/CancelCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * This file is part of Baritone.
- *
- * Baritone is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Baritone is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Baritone. If not, see .
- */
-
-package baritone.command.defaults;
-
-import baritone.api.IBaritone;
-import baritone.api.command.Command;
-import baritone.api.command.exception.CommandException;
-import baritone.api.command.argument.IArgConsumer;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class CancelCommand extends Command {
-
- public CancelCommand(IBaritone baritone) {
- super(baritone, "cancel", "stop");
- }
-
- @Override
- public void execute(String label, IArgConsumer args) throws CommandException {
- args.requireMax(0);
- baritone.getPathingBehavior().cancelEverything();
- logDirect("ok canceled");
- }
-
- @Override
- public Stream tabComplete(String label, IArgConsumer args) {
- return Stream.empty();
- }
-
- @Override
- public String getShortDesc() {
- return "Cancel what Baritone is currently doing";
- }
-
- @Override
- public List getLongDesc() {
- return Arrays.asList(
- "The cancel command tells Baritone to stop whatever it's currently doing.",
- "",
- "Usage:",
- "> cancel"
- );
- }
-}
diff --git a/src/main/java/baritone/command/defaults/PauseResumeCommands.java b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
similarity index 84%
rename from src/main/java/baritone/command/defaults/PauseResumeCommands.java
rename to src/main/java/baritone/command/defaults/ExecutionControlCommands.java
index 54718e9b..376b8f43 100644
--- a/src/main/java/baritone/command/defaults/PauseResumeCommands.java
+++ b/src/main/java/baritone/command/defaults/ExecutionControlCommands.java
@@ -42,6 +42,7 @@ public class PauseResumeCommands {
Command pauseCommand;
Command resumeCommand;
Command pausedCommand;
+ Command cancelCommand;
public PauseResumeCommands(IBaritone baritone) {
// array for mutability, non-field so reflection can't touch it
@@ -169,5 +170,36 @@ public class PauseResumeCommands {
);
}
};
+ cancelCommand = new Command(baritone, "cancel", "stop") {
+ @Override
+ public void execute(String label, IArgConsumer args) throws CommandException {
+ args.requireMax(0);
+ if (paused[0]) {
+ paused[0] = false;
+ }
+ baritone.getPathingBehavior().cancelEverything();
+ logDirect("ok canceled");
+ }
+
+ @Override
+ public Stream tabComplete(String label, IArgConsumer args) {
+ return Stream.empty();
+ }
+
+ @Override
+ public String getShortDesc() {
+ return "Cancel what Baritone is currently doing";
+ }
+
+ @Override
+ public List getLongDesc() {
+ return Arrays.asList(
+ "The cancel command tells Baritone to stop whatever it's currently doing.",
+ "",
+ "Usage:",
+ "> cancel"
+ );
+ }
+ };
}
}