move default commands to main module

src/api/java/baritone/api/schematic/ReplaceSchematic.java

@@ -29,7 +29,7 @@ public class ReplaceSchematic extends MaskSchematic {
     public ReplaceSchematic(IBaritone baritone, ISchematic schematic, BlockOptionalMetaLookup filter) {
         super(baritone, schematic);
         this.filter = filter;
-        this.cache = new boolean[lengthZ()][heightY()][widthX()];
+        this.cache = new boolean[widthX()][heightY()][lengthZ()];
     }
 
     protected boolean partOfMask(int x, int y, int z, IBlockState currentState) {

src/api/java/baritone/api/utils/command/defaults/ExcCommand.java

@@ -1,49 +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 <https://www.gnu.org/licenses/>.
- */
-
-package baritone.api.utils.command.defaults;
-
-import baritone.api.Settings;
-import baritone.api.utils.command.Command;
-import baritone.api.utils.command.helpers.arguments.ArgConsumer;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Stream;
-
-public class ExcCommand extends Command {
-    public ExcCommand() {
-        super("exc", "Throw an unhandled exception");
-    }
-
-    @Override
-    protected void executed(String label, ArgConsumer args, Settings settings) {
-        args.requireMax(0);
-
-        throw new RuntimeException("HI THERE");
-    }
-
-    @Override
-    protected Stream<String> tabCompleted(String label, ArgConsumer args, Settings settings) {
-        return Stream.empty();
-    }
-
-    @Override
-    public List<String> getLongDesc() {
-        return Collections.emptyList();
-    }
-}

src/api/java/baritone/api/utils/command/manager/CommandManager.java

@@ -19,7 +19,6 @@ package baritone.api.utils.command.manager;
 
 import baritone.api.utils.command.Command;
 import baritone.api.utils.command.argument.CommandArgument;
-import baritone.api.utils.command.defaults.DefaultCommands;
 import baritone.api.utils.command.execution.CommandExecution;
 import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper;
 import baritone.api.utils.command.registry.Registry;
@@ -35,10 +34,6 @@ import static java.util.Objects.nonNull;
 public class CommandManager {
     public static final Registry<Command> REGISTRY = new Registry<>();
 
-    static {
-        DefaultCommands.commands.forEach(REGISTRY::register);
-    }
-
     /**
      * @param name The command name to search for.
      * @return The command, if found.

src/main/java/baritone/Baritone.java

@@ -24,12 +24,14 @@ import baritone.api.event.listener.IEventBus;
 import baritone.api.utils.command.BaritoneChatControl;
 import baritone.api.utils.Helper;
 import baritone.api.utils.IPlayerContext;
+import baritone.api.utils.command.manager.CommandManager;
 import baritone.behavior.*;
 import baritone.cache.WorldProvider;
 import baritone.event.GameEventHandler;
 import baritone.process.*;
 import baritone.selection.SelectionManager;
 import baritone.utils.*;
+import baritone.utils.command.defaults.DefaultCommands;
 import baritone.utils.player.PrimaryPlayerContext;
 import net.minecraft.client.Minecraft;
 
@@ -111,6 +113,8 @@ public class Baritone implements IBaritone {
             memoryBehavior = new MemoryBehavior(this);
             inventoryBehavior = new InventoryBehavior(this);
             inputOverrideHandler = new InputOverrideHandler(this);
+
+            DefaultCommands.commands.forEach(CommandManager.REGISTRY::register);
             new BaritoneChatControl(this);
         }
 

src/main/java/baritone/utils/command/defaults/AxisCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;

src/main/java/baritone/utils/command/defaults/BlacklistCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.process.IGetToBlockProcess;

src/main/java/baritone/utils/command/defaults/BuildCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BetterBlockPos;

src/main/java/baritone/utils/command/defaults/CancelCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/ChestsCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.cache.IRememberedInventory;

src/main/java/baritone/utils/command/defaults/ClearareaCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;

src/main/java/baritone/utils/command/defaults/ClickCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/ComeCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.GoalBlock;

src/main/java/baritone/utils/command/defaults/CommandAlias.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/DefaultCommands.java

@@ -15,9 +15,10 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.utils.command.Command;
+import baritone.api.utils.command.manager.CommandManager;
 
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +31,6 @@ public class DefaultCommands {
         new SetCommand(),
         new CommandAlias(asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"),
         new CommandAlias("reset", "Reset all settings or just one", "set reset"),
-        new ExcCommand(), // TODO: remove this debug command... eventually
         new GoalCommand(),
         new PathCommand(),
         new ProcCommand(),

src/main/java/baritone/utils/command/defaults/EmptyCommand.java

@@ -15,10 +15,9 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
-import baritone.api.utils.Helper;
 import baritone.api.utils.command.Command;
 import baritone.api.utils.command.helpers.arguments.ArgConsumer;
 

src/main/java/baritone/utils/command/defaults/ExploreCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.GoalXZ;

src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/FarmCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/FindCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BetterBlockPos;

src/main/java/baritone/utils/command/defaults/FollowCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.behavior.IPathingBehavior;

src/main/java/baritone/utils/command/defaults/GcCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/GoalCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;

src/main/java/baritone/utils/command/defaults/HelpCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/InvertCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;

src/main/java/baritone/utils/command/defaults/MineCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BlockOptionalMeta;

src/main/java/baritone/utils/command/defaults/PathCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;

src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.BaritoneAPI;
 import baritone.api.Settings;

src/main/java/baritone/utils/command/defaults/ProcCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.calc.IPathingControlManager;

src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/RenderCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.BetterBlockPos;

src/main/java/baritone/utils/command/defaults/RepackCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.cache.ICachedWorld;

src/main/java/baritone/utils/command/defaults/SaveAllCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/SchematicaCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/SelCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.event.events.RenderEvent;

src/main/java/baritone/utils/command/defaults/SetCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.SettingsUtil;

src/main/java/baritone/utils/command/defaults/ThisWayCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.GoalXZ;

src/main/java/baritone/utils/command/defaults/TunnelCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.pathing.goals.Goal;

src/main/java/baritone/utils/command/defaults/VersionCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.utils.command.Command;

src/main/java/baritone/utils/command/defaults/WaypointsCommand.java

@@ -15,7 +15,7 @@
  * along with Baritone.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package baritone.api.utils.command.defaults;
+package baritone.utils.command.defaults;
 
 import baritone.api.Settings;
 import baritone.api.cache.IWaypoint;