diff --git a/src/api/java/baritone/api/IBaritone.java b/src/api/java/baritone/api/IBaritone.java index 8c5de47a..64c4a291 100644 --- a/src/api/java/baritone/api/IBaritone.java +++ b/src/api/java/baritone/api/IBaritone.java @@ -26,7 +26,7 @@ import baritone.api.process.*; import baritone.api.selection.ISelectionManager; import baritone.api.utils.IInputOverrideHandler; import baritone.api.utils.IPlayerContext; -import baritone.api.utils.command.manager.ICommandManager; +import baritone.api.command.manager.ICommandManager; /** * @author Brady diff --git a/src/api/java/baritone/api/IBaritoneProvider.java b/src/api/java/baritone/api/IBaritoneProvider.java index bdd396d4..e31ef0f8 100644 --- a/src/api/java/baritone/api/IBaritoneProvider.java +++ b/src/api/java/baritone/api/IBaritoneProvider.java @@ -18,8 +18,8 @@ package baritone.api; import baritone.api.cache.IWorldScanner; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.ICommandSystem; +import baritone.api.command.Command; +import baritone.api.command.ICommandSystem; import net.minecraft.client.entity.EntityPlayerSP; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/Command.java b/src/api/java/baritone/api/command/Command.java similarity index 94% rename from src/api/java/baritone/api/utils/command/Command.java rename to src/api/java/baritone/api/command/Command.java index 6293fd58..cd8fa5de 100644 --- a/src/api/java/baritone/api/utils/command/Command.java +++ b/src/api/java/baritone/api/command/Command.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command; +package baritone.api.command; import baritone.api.IBaritone; import baritone.api.utils.Helper; import baritone.api.utils.IPlayerContext; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Collections; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/IBaritoneChatControl.java b/src/api/java/baritone/api/command/IBaritoneChatControl.java similarity index 98% rename from src/api/java/baritone/api/utils/command/IBaritoneChatControl.java rename to src/api/java/baritone/api/command/IBaritoneChatControl.java index 63b6a445..5009f3f0 100644 --- a/src/api/java/baritone/api/utils/command/IBaritoneChatControl.java +++ b/src/api/java/baritone/api/command/IBaritoneChatControl.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command; +package baritone.api.command; import baritone.api.Settings; diff --git a/src/api/java/baritone/api/utils/command/ICommandSystem.java b/src/api/java/baritone/api/command/ICommandSystem.java similarity index 89% rename from src/api/java/baritone/api/utils/command/ICommandSystem.java rename to src/api/java/baritone/api/command/ICommandSystem.java index 22055b57..98e8ed9c 100644 --- a/src/api/java/baritone/api/utils/command/ICommandSystem.java +++ b/src/api/java/baritone/api/command/ICommandSystem.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command; +package baritone.api.command; -import baritone.api.utils.command.argparser.IArgParserManager; +import baritone.api.command.argparser.IArgParserManager; /** * @author Brady diff --git a/src/api/java/baritone/api/utils/command/argparser/IArgParser.java b/src/api/java/baritone/api/command/argparser/IArgParser.java similarity index 95% rename from src/api/java/baritone/api/utils/command/argparser/IArgParser.java rename to src/api/java/baritone/api/command/argparser/IArgParser.java index cf87258b..868ad696 100644 --- a/src/api/java/baritone/api/utils/command/argparser/IArgParser.java +++ b/src/api/java/baritone/api/command/argparser/IArgParser.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.argparser; +package baritone.api.command.argparser; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.argument.ICommandArgument; public interface IArgParser { diff --git a/src/api/java/baritone/api/utils/command/argparser/IArgParserManager.java b/src/api/java/baritone/api/command/argparser/IArgParserManager.java similarity index 90% rename from src/api/java/baritone/api/utils/command/argparser/IArgParserManager.java rename to src/api/java/baritone/api/command/argparser/IArgParserManager.java index e714d30e..fe819150 100644 --- a/src/api/java/baritone/api/utils/command/argparser/IArgParserManager.java +++ b/src/api/java/baritone/api/command/argparser/IArgParserManager.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.argparser; +package baritone.api.command.argparser; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.registry.Registry; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.registry.Registry; /** * @author Brady diff --git a/src/api/java/baritone/api/utils/command/argument/ICommandArgument.java b/src/api/java/baritone/api/command/argument/ICommandArgument.java similarity index 93% rename from src/api/java/baritone/api/utils/command/argument/ICommandArgument.java rename to src/api/java/baritone/api/command/argument/ICommandArgument.java index 7cbe2540..ab912d00 100644 --- a/src/api/java/baritone/api/utils/command/argument/ICommandArgument.java +++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.argument; +package baritone.api.command.argument; -import baritone.api.utils.command.argparser.IArgParser; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argparser.IArgParser; +import baritone.api.command.exception.CommandInvalidTypeException; import net.minecraft.util.EnumFacing; /** diff --git a/src/api/java/baritone/api/utils/command/datatypes/BlockById.java b/src/api/java/baritone/api/command/datatypes/BlockById.java similarity index 90% rename from src/api/java/baritone/api/utils/command/datatypes/BlockById.java rename to src/api/java/baritone/api/command/datatypes/BlockById.java index ae659adc..98858d13 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/BlockById.java +++ b/src/api/java/baritone/api/command/datatypes/BlockById.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.exception.CommandException; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; diff --git a/src/api/java/baritone/api/utils/command/datatypes/EntityClassById.java b/src/api/java/baritone/api/command/datatypes/EntityClassById.java similarity index 90% rename from src/api/java/baritone/api/utils/command/datatypes/EntityClassById.java rename to src/api/java/baritone/api/command/datatypes/EntityClassById.java index 3597141f..40d6ad10 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/EntityClassById.java +++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.exception.CommandException; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.util.ResourceLocation; diff --git a/src/api/java/baritone/api/utils/command/datatypes/ForBlockOptionalMeta.java b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java similarity index 91% rename from src/api/java/baritone/api/utils/command/datatypes/ForBlockOptionalMeta.java rename to src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java index f36826c6..29dc5f0b 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/ForBlockOptionalMeta.java +++ b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; import baritone.api.utils.BlockOptionalMeta; -import baritone.api.utils.command.exception.CommandException; +import baritone.api.command.exception.CommandException; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/datatypes/ForEnumFacing.java b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java similarity index 88% rename from src/api/java/baritone/api/utils/command/datatypes/ForEnumFacing.java rename to src/api/java/baritone/api/command/datatypes/ForEnumFacing.java index ed6dce31..23f8617c 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/ForEnumFacing.java +++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.exception.CommandException; import net.minecraft.util.EnumFacing; import java.util.Locale; diff --git a/src/api/java/baritone/api/utils/command/datatypes/ForWaypoints.java b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java similarity index 94% rename from src/api/java/baritone/api/utils/command/datatypes/ForWaypoints.java rename to src/api/java/baritone/api/command/datatypes/ForWaypoints.java index e60ff0c6..db506839 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/ForWaypoints.java +++ b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; import baritone.api.IBaritone; import baritone.api.cache.IWaypoint; import baritone.api.cache.IWaypointCollection; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.exception.CommandException; import java.util.Comparator; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/datatypes/IDatatype.java b/src/api/java/baritone/api/command/datatypes/IDatatype.java similarity index 91% rename from src/api/java/baritone/api/utils/command/datatypes/IDatatype.java rename to src/api/java/baritone/api/command/datatypes/IDatatype.java index 36a37fec..385154bc 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/IDatatype.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatype.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.argparser.IArgParser; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argparser.IArgParser; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/datatypes/IDatatypeContext.java b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java similarity index 92% rename from src/api/java/baritone/api/utils/command/datatypes/IDatatypeContext.java rename to src/api/java/baritone/api/command/datatypes/IDatatypeContext.java index 33f3ad23..4b8269c3 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/IDatatypeContext.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; import baritone.api.IBaritone; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.arguments.IArgConsumer; /** * Provides an {@link IDatatype} with contextual information so diff --git a/src/api/java/baritone/api/utils/command/datatypes/IDatatypeFor.java b/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java similarity index 94% rename from src/api/java/baritone/api/utils/command/datatypes/IDatatypeFor.java rename to src/api/java/baritone/api/command/datatypes/IDatatypeFor.java index 4f0f4200..2f0a9c14 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/IDatatypeFor.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; +import baritone.api.command.exception.CommandException; import java.util.function.Supplier; diff --git a/src/api/java/baritone/api/utils/command/datatypes/IDatatypePost.java b/src/api/java/baritone/api/command/datatypes/IDatatypePost.java similarity index 93% rename from src/api/java/baritone/api/utils/command/datatypes/IDatatypePost.java rename to src/api/java/baritone/api/command/datatypes/IDatatypePost.java index 2e4cc47a..aa5b261d 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/IDatatypePost.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypePost.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; +import baritone.api.command.exception.CommandException; import java.util.function.Function; diff --git a/src/api/java/baritone/api/utils/command/datatypes/IDatatypePostFunction.java b/src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.java similarity index 88% rename from src/api/java/baritone/api/utils/command/datatypes/IDatatypePostFunction.java rename to src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.java index a3de089e..fe79d6a6 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/IDatatypePostFunction.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; +import baritone.api.command.exception.CommandException; /** * @author Brady diff --git a/src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java similarity index 91% rename from src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java rename to src/api/java/baritone/api/command/datatypes/NearbyPlayer.java index 78450e1a..aa32fc76 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java +++ b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; import baritone.api.IBaritone; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.exception.CommandException; import net.minecraft.entity.player.EntityPlayer; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeBlockPos.java b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java similarity index 92% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeBlockPos.java rename to src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java index 4a876220..513ef41f 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeBlockPos.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeCoordinate.java b/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java similarity index 92% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeCoordinate.java rename to src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java index c8ae3519..dc4d5630 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeCoordinate.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeFile.java b/src/api/java/baritone/api/command/datatypes/RelativeFile.java similarity index 95% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeFile.java rename to src/api/java/baritone/api/command/datatypes/RelativeFile.java index 0ad4b88b..f886a1c6 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeFile.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import java.io.File; import java.io.IOException; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoal.java b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java similarity index 94% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeGoal.java rename to src/api/java/baritone/api/command/datatypes/RelativeGoal.java index 0c98073f..73bc6e0d 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoal.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalBlock; import baritone.api.pathing.goals.GoalXZ; import baritone.api.pathing.goals.GoalYLevel; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.ArrayList; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoalBlock.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java similarity index 91% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeGoalBlock.java rename to src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java index b3c0e284..19621b95 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoalBlock.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.api.pathing.goals.GoalBlock; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoalXZ.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java similarity index 91% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeGoalXZ.java rename to src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java index 22d50ebf..83d52de8 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoalXZ.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.api.pathing.goals.GoalXZ; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoalYLevel.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java similarity index 90% rename from src/api/java/baritone/api/utils/command/datatypes/RelativeGoalYLevel.java rename to src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java index 7a443b27..4dd195a4 100644 --- a/src/api/java/baritone/api/utils/command/datatypes/RelativeGoalYLevel.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.datatypes; +package baritone.api.command.datatypes; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.api.pathing.goals.GoalYLevel; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/utils/command/exception/CommandErrorMessageException.java b/src/api/java/baritone/api/command/exception/CommandErrorMessageException.java similarity index 94% rename from src/api/java/baritone/api/utils/command/exception/CommandErrorMessageException.java rename to src/api/java/baritone/api/command/exception/CommandErrorMessageException.java index 002d328e..4a21bede 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandErrorMessageException.java +++ b/src/api/java/baritone/api/command/exception/CommandErrorMessageException.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; public abstract class CommandErrorMessageException extends CommandException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandException.java b/src/api/java/baritone/api/command/exception/CommandException.java similarity index 94% rename from src/api/java/baritone/api/utils/command/exception/CommandException.java rename to src/api/java/baritone/api/command/exception/CommandException.java index 9fdc3f73..b8962c15 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandException.java +++ b/src/api/java/baritone/api/command/exception/CommandException.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; public abstract class CommandException extends Exception implements ICommandException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandInvalidArgumentException.java b/src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java similarity index 91% rename from src/api/java/baritone/api/utils/command/exception/CommandInvalidArgumentException.java rename to src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java index bc9236e4..1902d735 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandInvalidArgumentException.java +++ b/src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.argument.ICommandArgument; public abstract class CommandInvalidArgumentException extends CommandErrorMessageException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandInvalidStateException.java b/src/api/java/baritone/api/command/exception/CommandInvalidStateException.java similarity index 94% rename from src/api/java/baritone/api/utils/command/exception/CommandInvalidStateException.java rename to src/api/java/baritone/api/command/exception/CommandInvalidStateException.java index 4e00c1f7..0fa22fcb 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandInvalidStateException.java +++ b/src/api/java/baritone/api/command/exception/CommandInvalidStateException.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; public class CommandInvalidStateException extends CommandErrorMessageException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandInvalidTypeException.java b/src/api/java/baritone/api/command/exception/CommandInvalidTypeException.java similarity index 93% rename from src/api/java/baritone/api/utils/command/exception/CommandInvalidTypeException.java rename to src/api/java/baritone/api/command/exception/CommandInvalidTypeException.java index 8dffe1d0..516fd308 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandInvalidTypeException.java +++ b/src/api/java/baritone/api/command/exception/CommandInvalidTypeException.java @@ -15,9 +15,9 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.argument.ICommandArgument; public class CommandInvalidTypeException extends CommandInvalidArgumentException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandNoParserForTypeException.java b/src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java similarity index 95% rename from src/api/java/baritone/api/utils/command/exception/CommandNoParserForTypeException.java rename to src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java index f4f2d818..4bf7a1ac 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandNoParserForTypeException.java +++ b/src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; public class CommandNoParserForTypeException extends CommandUnhandledException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandNotEnoughArgumentsException.java b/src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java similarity index 95% rename from src/api/java/baritone/api/utils/command/exception/CommandNotEnoughArgumentsException.java rename to src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java index 655652d6..e2e05cfb 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandNotEnoughArgumentsException.java +++ b/src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; public class CommandNotEnoughArgumentsException extends CommandErrorMessageException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandNotFoundException.java b/src/api/java/baritone/api/command/exception/CommandNotFoundException.java similarity index 88% rename from src/api/java/baritone/api/utils/command/exception/CommandNotFoundException.java rename to src/api/java/baritone/api/command/exception/CommandNotFoundException.java index bca8d543..123661c8 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandNotFoundException.java +++ b/src/api/java/baritone/api/command/exception/CommandNotFoundException.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.Command; +import baritone.api.command.argument.ICommandArgument; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/exception/CommandTooManyArgumentsException.java b/src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java similarity index 95% rename from src/api/java/baritone/api/utils/command/exception/CommandTooManyArgumentsException.java rename to src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java index 24fc799f..9aec48ea 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandTooManyArgumentsException.java +++ b/src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; public class CommandTooManyArgumentsException extends CommandErrorMessageException { diff --git a/src/api/java/baritone/api/utils/command/exception/CommandUnhandledException.java b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java similarity index 90% rename from src/api/java/baritone/api/utils/command/exception/CommandUnhandledException.java rename to src/api/java/baritone/api/command/exception/CommandUnhandledException.java index 55b359cc..394dd65e 100644 --- a/src/api/java/baritone/api/utils/command/exception/CommandUnhandledException.java +++ b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.Command; +import baritone.api.command.argument.ICommandArgument; import net.minecraft.util.text.TextFormatting; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/exception/ICommandException.java b/src/api/java/baritone/api/command/exception/ICommandException.java similarity index 91% rename from src/api/java/baritone/api/utils/command/exception/ICommandException.java rename to src/api/java/baritone/api/command/exception/ICommandException.java index 229c08c0..3c96cb52 100644 --- a/src/api/java/baritone/api/utils/command/exception/ICommandException.java +++ b/src/api/java/baritone/api/command/exception/ICommandException.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.exception; +package baritone.api.command.exception; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.Command; +import baritone.api.command.argument.ICommandArgument; import net.minecraft.util.text.TextFormatting; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/helpers/arguments/IArgConsumer.java b/src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java similarity index 97% rename from src/api/java/baritone/api/utils/command/helpers/arguments/IArgConsumer.java rename to src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java index 1e50a530..c185c1f7 100644 --- a/src/api/java/baritone/api/utils/command/helpers/arguments/IArgConsumer.java +++ b/src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java @@ -15,19 +15,19 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.helpers.arguments; +package baritone.api.command.helpers.arguments; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandTooManyArgumentsException; import baritone.api.utils.Helper; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.argparser.IArgParser; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.datatypes.IDatatype; -import baritone.api.utils.command.datatypes.IDatatypeFor; -import baritone.api.utils.command.datatypes.IDatatypePost; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.exception.CommandNotEnoughArgumentsException; -import baritone.api.utils.command.exception.CommandTooManyArgumentsException; +import baritone.api.command.argparser.IArgParser; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.datatypes.IDatatype; +import baritone.api.command.datatypes.IDatatypeFor; +import baritone.api.command.datatypes.IDatatypePost; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.exception.CommandNotEnoughArgumentsException; import net.minecraft.util.EnumFacing; import java.util.Deque; diff --git a/src/api/java/baritone/api/utils/command/helpers/pagination/Paginator.java b/src/api/java/baritone/api/command/helpers/pagination/Paginator.java similarity index 96% rename from src/api/java/baritone/api/utils/command/helpers/pagination/Paginator.java rename to src/api/java/baritone/api/command/helpers/pagination/Paginator.java index cf5d5d7c..e5bf9d55 100644 --- a/src/api/java/baritone/api/utils/command/helpers/pagination/Paginator.java +++ b/src/api/java/baritone/api/command/helpers/pagination/Paginator.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.helpers.pagination; +package baritone.api.command.helpers.pagination; import baritone.api.utils.Helper; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.helpers.arguments.IArgConsumer; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; diff --git a/src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java b/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java similarity index 98% rename from src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java rename to src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java index dd14e2bc..57192f0c 100644 --- a/src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java +++ b/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.helpers.tabcomplete; +package baritone.api.command.helpers.tabcomplete; import baritone.api.BaritoneAPI; import baritone.api.Settings; import baritone.api.event.events.TabCompleteEvent; import baritone.api.utils.SettingsUtil; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.manager.ICommandManager; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.manager.ICommandManager; import net.minecraft.util.ResourceLocation; import java.util.Comparator; diff --git a/src/api/java/baritone/api/utils/command/manager/ICommandManager.java b/src/api/java/baritone/api/command/manager/ICommandManager.java similarity index 87% rename from src/api/java/baritone/api/utils/command/manager/ICommandManager.java rename to src/api/java/baritone/api/command/manager/ICommandManager.java index d3fac415..f74a3c26 100644 --- a/src/api/java/baritone/api/utils/command/manager/ICommandManager.java +++ b/src/api/java/baritone/api/command/manager/ICommandManager.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.manager; +package baritone.api.command.manager; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.registry.Registry; +import baritone.api.command.Command; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.registry.Registry; import net.minecraft.util.Tuple; import java.util.List; diff --git a/src/api/java/baritone/api/utils/command/registry/Registry.java b/src/api/java/baritone/api/command/registry/Registry.java similarity index 99% rename from src/api/java/baritone/api/utils/command/registry/Registry.java rename to src/api/java/baritone/api/command/registry/Registry.java index bac50dcf..06779169 100644 --- a/src/api/java/baritone/api/utils/command/registry/Registry.java +++ b/src/api/java/baritone/api/command/registry/Registry.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.utils.command.registry; +package baritone.api.command.registry; import java.util.*; import java.util.function.Consumer; diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java index cfd658b1..360a17fd 100755 --- a/src/main/java/baritone/Baritone.java +++ b/src/main/java/baritone/Baritone.java @@ -29,7 +29,7 @@ import baritone.event.GameEventHandler; import baritone.process.*; import baritone.selection.SelectionManager; import baritone.utils.*; -import baritone.utils.command.manager.CommandManager; +import baritone.command.manager.CommandManager; import baritone.utils.player.PrimaryPlayerContext; import net.minecraft.client.Minecraft; diff --git a/src/main/java/baritone/BaritoneProvider.java b/src/main/java/baritone/BaritoneProvider.java index 3f6f8283..cb24dfe2 100644 --- a/src/main/java/baritone/BaritoneProvider.java +++ b/src/main/java/baritone/BaritoneProvider.java @@ -20,10 +20,10 @@ package baritone; import baritone.api.IBaritone; import baritone.api.IBaritoneProvider; import baritone.api.cache.IWorldScanner; -import baritone.api.utils.command.ICommandSystem; -import baritone.utils.command.BaritoneChatControl; +import baritone.api.command.ICommandSystem; +import baritone.command.BaritoneChatControl; import baritone.cache.WorldScanner; -import baritone.utils.command.CommandSystem; +import baritone.command.CommandSystem; import java.util.Collections; import java.util.List; diff --git a/src/main/java/baritone/utils/command/BaritoneChatControl.java b/src/main/java/baritone/command/BaritoneChatControl.java similarity index 92% rename from src/main/java/baritone/utils/command/BaritoneChatControl.java rename to src/main/java/baritone/command/BaritoneChatControl.java index 70e2370e..2b81f284 100644 --- a/src/main/java/baritone/utils/command/BaritoneChatControl.java +++ b/src/main/java/baritone/command/BaritoneChatControl.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.utils.command; +package baritone.command; import baritone.api.BaritoneAPI; import baritone.api.IBaritone; @@ -26,14 +26,14 @@ import baritone.api.event.events.TabCompleteEvent; import baritone.api.event.listener.AbstractGameEventListener; import baritone.api.utils.Helper; import baritone.api.utils.SettingsUtil; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.exception.CommandNotEnoughArgumentsException; -import baritone.api.utils.command.exception.CommandNotFoundException; -import baritone.utils.command.helpers.arguments.ArgConsumer; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; -import baritone.api.utils.command.manager.ICommandManager; -import baritone.utils.command.argument.CommandArguments; -import baritone.utils.command.manager.CommandManager; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandNotEnoughArgumentsException; +import baritone.api.command.exception.CommandNotFoundException; +import baritone.command.helpers.arguments.ArgConsumer; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.manager.ICommandManager; +import baritone.command.argument.CommandArguments; +import baritone.command.manager.CommandManager; import net.minecraft.util.Tuple; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; @@ -47,7 +47,7 @@ import java.util.List; import java.util.Locale; import java.util.stream.Stream; -import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; +import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; public class BaritoneChatControl implements Helper, AbstractGameEventListener { diff --git a/src/main/java/baritone/utils/command/CommandSystem.java b/src/main/java/baritone/command/CommandSystem.java similarity index 82% rename from src/main/java/baritone/utils/command/CommandSystem.java rename to src/main/java/baritone/command/CommandSystem.java index 56d977a2..49d3685c 100644 --- a/src/main/java/baritone/utils/command/CommandSystem.java +++ b/src/main/java/baritone/command/CommandSystem.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.utils.command; +package baritone.command; -import baritone.api.utils.command.ICommandSystem; -import baritone.utils.command.argparser.ArgParserManager; -import baritone.api.utils.command.argparser.IArgParserManager; +import baritone.api.command.ICommandSystem; +import baritone.command.argparser.ArgParserManager; +import baritone.api.command.argparser.IArgParserManager; /** * @author Brady diff --git a/src/main/java/baritone/utils/command/argparser/ArgParserManager.java b/src/main/java/baritone/command/argparser/ArgParserManager.java similarity index 87% rename from src/main/java/baritone/utils/command/argparser/ArgParserManager.java rename to src/main/java/baritone/command/argparser/ArgParserManager.java index 75c16cd7..a6acdcbc 100644 --- a/src/main/java/baritone/utils/command/argparser/ArgParserManager.java +++ b/src/main/java/baritone/command/argparser/ArgParserManager.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.argparser; +package baritone.command.argparser; -import baritone.api.utils.command.argparser.IArgParser; -import baritone.api.utils.command.argparser.IArgParserManager; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.exception.CommandNoParserForTypeException; -import baritone.api.utils.command.registry.Registry; +import baritone.api.command.argparser.IArgParser; +import baritone.api.command.argparser.IArgParserManager; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.exception.CommandNoParserForTypeException; +import baritone.api.command.registry.Registry; public enum ArgParserManager implements IArgParserManager { INSTANCE; diff --git a/src/main/java/baritone/utils/command/argparser/DefaultArgParsers.java b/src/main/java/baritone/command/argparser/DefaultArgParsers.java similarity index 96% rename from src/main/java/baritone/utils/command/argparser/DefaultArgParsers.java rename to src/main/java/baritone/command/argparser/DefaultArgParsers.java index 41c95af7..77a14bf9 100644 --- a/src/main/java/baritone/utils/command/argparser/DefaultArgParsers.java +++ b/src/main/java/baritone/command/argparser/DefaultArgParsers.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.argparser; +package baritone.command.argparser; -import baritone.api.utils.command.argparser.IArgParser; -import baritone.api.utils.command.argument.ICommandArgument; +import baritone.api.command.argparser.IArgParser; +import baritone.api.command.argument.ICommandArgument; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/argument/CommandArgument.java b/src/main/java/baritone/command/argument/CommandArgument.java similarity index 91% rename from src/main/java/baritone/utils/command/argument/CommandArgument.java rename to src/main/java/baritone/command/argument/CommandArgument.java index d1b7a157..3ce6cda8 100644 --- a/src/main/java/baritone/utils/command/argument/CommandArgument.java +++ b/src/main/java/baritone/command/argument/CommandArgument.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.argument; +package baritone.command.argument; -import baritone.utils.command.argparser.ArgParserManager; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.exception.CommandInvalidTypeException; +import baritone.command.argparser.ArgParserManager; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandInvalidTypeException; import java.util.stream.Stream; diff --git a/src/main/java/baritone/utils/command/argument/CommandArguments.java b/src/main/java/baritone/command/argument/CommandArguments.java similarity index 93% rename from src/main/java/baritone/utils/command/argument/CommandArguments.java rename to src/main/java/baritone/command/argument/CommandArguments.java index 22f89559..8d26acb4 100644 --- a/src/main/java/baritone/utils/command/argument/CommandArguments.java +++ b/src/main/java/baritone/command/argument/CommandArguments.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.argument; +package baritone.command.argument; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.exception.CommandInvalidArgumentException; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandInvalidArgumentException; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/AxisCommand.java b/src/main/java/baritone/command/defaults/AxisCommand.java similarity index 89% rename from src/main/java/baritone/utils/command/defaults/AxisCommand.java rename to src/main/java/baritone/command/defaults/AxisCommand.java index e454cfc7..09d00ae7 100644 --- a/src/main/java/baritone/utils/command/defaults/AxisCommand.java +++ b/src/main/java/baritone/command/defaults/AxisCommand.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalAxis; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java b/src/main/java/baritone/command/defaults/BlacklistCommand.java similarity index 87% rename from src/main/java/baritone/utils/command/defaults/BlacklistCommand.java rename to src/main/java/baritone/command/defaults/BlacklistCommand.java index accda72b..5069f434 100644 --- a/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java +++ b/src/main/java/baritone/command/defaults/BlacklistCommand.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.process.IGetToBlockProcess; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/BuildCommand.java b/src/main/java/baritone/command/defaults/BuildCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/BuildCommand.java rename to src/main/java/baritone/command/defaults/BuildCommand.java index b852d0be..b2edbb24 100644 --- a/src/main/java/baritone/utils/command/defaults/BuildCommand.java +++ b/src/main/java/baritone/command/defaults/BuildCommand.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.RelativeBlockPos; -import baritone.api.utils.command.datatypes.RelativeFile; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.datatypes.RelativeBlockPos; +import baritone.api.command.datatypes.RelativeFile; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import net.minecraft.client.Minecraft; import java.io.File; diff --git a/src/main/java/baritone/utils/command/defaults/CancelCommand.java b/src/main/java/baritone/command/defaults/CancelCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/CancelCommand.java rename to src/main/java/baritone/command/defaults/CancelCommand.java index f3783537..aff839ae 100644 --- a/src/main/java/baritone/utils/command/defaults/CancelCommand.java +++ b/src/main/java/baritone/command/defaults/CancelCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/ChestsCommand.java b/src/main/java/baritone/command/defaults/ChestsCommand.java similarity index 90% rename from src/main/java/baritone/utils/command/defaults/ChestsCommand.java rename to src/main/java/baritone/command/defaults/ChestsCommand.java index 130d5909..c3755b5a 100644 --- a/src/main/java/baritone/utils/command/defaults/ChestsCommand.java +++ b/src/main/java/baritone/command/defaults/ChestsCommand.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.cache.IRememberedInventory; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/baritone/utils/command/defaults/ClickCommand.java b/src/main/java/baritone/command/defaults/ClickCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/ClickCommand.java rename to src/main/java/baritone/command/defaults/ClickCommand.java index ba8e917c..95b04f52 100644 --- a/src/main/java/baritone/utils/command/defaults/ClickCommand.java +++ b/src/main/java/baritone/command/defaults/ClickCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/ComeCommand.java b/src/main/java/baritone/command/defaults/ComeCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/ComeCommand.java rename to src/main/java/baritone/command/defaults/ComeCommand.java index cc4f4071..9b336a25 100644 --- a/src/main/java/baritone/utils/command/defaults/ComeCommand.java +++ b/src/main/java/baritone/command/defaults/ComeCommand.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.GoalBlock; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/utils/command/defaults/CommandAlias.java b/src/main/java/baritone/command/defaults/CommandAlias.java similarity index 92% rename from src/main/java/baritone/utils/command/defaults/CommandAlias.java rename to src/main/java/baritone/command/defaults/CommandAlias.java index 69d4e0be..08b1ca05 100644 --- a/src/main/java/baritone/utils/command/defaults/CommandAlias.java +++ b/src/main/java/baritone/command/defaults/CommandAlias.java @@ -15,11 +15,11 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Collections; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/DefaultCommands.java b/src/main/java/baritone/command/defaults/DefaultCommands.java similarity index 97% rename from src/main/java/baritone/utils/command/defaults/DefaultCommands.java rename to src/main/java/baritone/command/defaults/DefaultCommands.java index 3f8e3908..f1e098a2 100644 --- a/src/main/java/baritone/utils/command/defaults/DefaultCommands.java +++ b/src/main/java/baritone/command/defaults/DefaultCommands.java @@ -15,10 +15,10 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; +import baritone.api.command.Command; import java.util.*; diff --git a/src/main/java/baritone/utils/command/defaults/ExploreCommand.java b/src/main/java/baritone/command/defaults/ExploreCommand.java similarity index 89% rename from src/main/java/baritone/utils/command/defaults/ExploreCommand.java rename to src/main/java/baritone/command/defaults/ExploreCommand.java index 15a8e241..a2054cc7 100644 --- a/src/main/java/baritone/utils/command/defaults/ExploreCommand.java +++ b/src/main/java/baritone/command/defaults/ExploreCommand.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.GoalXZ; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.RelativeGoalXZ; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.datatypes.RelativeGoalXZ; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java b/src/main/java/baritone/command/defaults/ExploreFilterCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java rename to src/main/java/baritone/command/defaults/ExploreFilterCommand.java index 6f60a55d..a1c5074a 100644 --- a/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java +++ b/src/main/java/baritone/command/defaults/ExploreFilterCommand.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.RelativeFile; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.datatypes.RelativeFile; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.helpers.arguments.IArgConsumer; import com.google.gson.JsonSyntaxException; import java.io.File; diff --git a/src/main/java/baritone/utils/command/defaults/FarmCommand.java b/src/main/java/baritone/command/defaults/FarmCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/FarmCommand.java rename to src/main/java/baritone/command/defaults/FarmCommand.java index 0ece390d..9151852c 100644 --- a/src/main/java/baritone/utils/command/defaults/FarmCommand.java +++ b/src/main/java/baritone/command/defaults/FarmCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/FindCommand.java b/src/main/java/baritone/command/defaults/FindCommand.java similarity index 89% rename from src/main/java/baritone/utils/command/defaults/FindCommand.java rename to src/main/java/baritone/command/defaults/FindCommand.java index 62a49e02..22a8fd87 100644 --- a/src/main/java/baritone/utils/command/defaults/FindCommand.java +++ b/src/main/java/baritone/command/defaults/FindCommand.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.BlockById; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.datatypes.BlockById; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import net.minecraft.block.Block; import java.util.ArrayList; diff --git a/src/main/java/baritone/utils/command/defaults/FollowCommand.java b/src/main/java/baritone/command/defaults/FollowCommand.java similarity index 91% rename from src/main/java/baritone/utils/command/defaults/FollowCommand.java rename to src/main/java/baritone/command/defaults/FollowCommand.java index b1cb5a80..e9c80ab9 100644 --- a/src/main/java/baritone/utils/command/defaults/FollowCommand.java +++ b/src/main/java/baritone/command/defaults/FollowCommand.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.EntityClassById; -import baritone.api.utils.command.datatypes.IDatatypeFor; -import baritone.api.utils.command.datatypes.NearbyPlayer; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.datatypes.EntityClassById; +import baritone.api.command.datatypes.IDatatypeFor; +import baritone.api.command.datatypes.NearbyPlayer; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/command/defaults/ForceCancelCommand.java similarity index 89% rename from src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java rename to src/main/java/baritone/command/defaults/ForceCancelCommand.java index 7a020b14..f9213482 100644 --- a/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java +++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.behavior.IPathingBehavior; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/GcCommand.java b/src/main/java/baritone/command/defaults/GcCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/GcCommand.java rename to src/main/java/baritone/command/defaults/GcCommand.java index 20b2e334..c64703e9 100644 --- a/src/main/java/baritone/utils/command/defaults/GcCommand.java +++ b/src/main/java/baritone/command/defaults/GcCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/GoalCommand.java b/src/main/java/baritone/command/defaults/GoalCommand.java similarity index 89% rename from src/main/java/baritone/utils/command/defaults/GoalCommand.java rename to src/main/java/baritone/command/defaults/GoalCommand.java index f2692fb2..46b50695 100644 --- a/src/main/java/baritone/utils/command/defaults/GoalCommand.java +++ b/src/main/java/baritone/command/defaults/GoalCommand.java @@ -15,18 +15,18 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.Goal; import baritone.api.process.ICustomGoalProcess; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.RelativeCoordinate; -import baritone.api.utils.command.datatypes.RelativeGoal; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.datatypes.RelativeCoordinate; +import baritone.api.command.datatypes.RelativeGoal; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/HelpCommand.java b/src/main/java/baritone/command/defaults/HelpCommand.java similarity index 91% rename from src/main/java/baritone/utils/command/defaults/HelpCommand.java rename to src/main/java/baritone/command/defaults/HelpCommand.java index 039506c1..fe3c4808 100644 --- a/src/main/java/baritone/utils/command/defaults/HelpCommand.java +++ b/src/main/java/baritone/command/defaults/HelpCommand.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandNotFoundException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.pagination.Paginator; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandNotFoundException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.pagination.Paginator; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; @@ -35,7 +35,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; +import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; public class HelpCommand extends Command { diff --git a/src/main/java/baritone/utils/command/defaults/InvertCommand.java b/src/main/java/baritone/command/defaults/InvertCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/InvertCommand.java rename to src/main/java/baritone/command/defaults/InvertCommand.java index 9b5d0a16..ba79a4a9 100644 --- a/src/main/java/baritone/utils/command/defaults/InvertCommand.java +++ b/src/main/java/baritone/command/defaults/InvertCommand.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalInverted; import baritone.api.process.ICustomGoalProcess; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/MineCommand.java b/src/main/java/baritone/command/defaults/MineCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/MineCommand.java rename to src/main/java/baritone/command/defaults/MineCommand.java index 2a91c6e6..d2846e0a 100644 --- a/src/main/java/baritone/utils/command/defaults/MineCommand.java +++ b/src/main/java/baritone/command/defaults/MineCommand.java @@ -15,15 +15,15 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.utils.BlockOptionalMeta; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.BlockById; -import baritone.api.utils.command.datatypes.ForBlockOptionalMeta; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.datatypes.BlockById; +import baritone.api.command.datatypes.ForBlockOptionalMeta; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.cache.WorldScanner; import java.util.ArrayList; diff --git a/src/main/java/baritone/utils/command/defaults/PathCommand.java b/src/main/java/baritone/command/defaults/PathCommand.java similarity index 85% rename from src/main/java/baritone/utils/command/defaults/PathCommand.java rename to src/main/java/baritone/command/defaults/PathCommand.java index 257556b0..ce1599e3 100644 --- a/src/main/java/baritone/utils/command/defaults/PathCommand.java +++ b/src/main/java/baritone/command/defaults/PathCommand.java @@ -15,18 +15,18 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.Goal; import baritone.api.process.ICustomGoalProcess; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.RelativeCoordinate; -import baritone.api.utils.command.datatypes.RelativeGoal; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.datatypes.RelativeCoordinate; +import baritone.api.command.datatypes.RelativeGoal; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import baritone.cache.WorldScanner; import java.util.Arrays; diff --git a/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java b/src/main/java/baritone/command/defaults/PauseResumeCommands.java similarity index 95% rename from src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java rename to src/main/java/baritone/command/defaults/PauseResumeCommands.java index 08a0ae66..af3d0717 100644 --- a/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java +++ b/src/main/java/baritone/command/defaults/PauseResumeCommands.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.process.IBaritoneProcess; import baritone.api.process.PathingCommand; import baritone.api.process.PathingCommandType; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/ProcCommand.java b/src/main/java/baritone/command/defaults/ProcCommand.java similarity index 90% rename from src/main/java/baritone/utils/command/defaults/ProcCommand.java rename to src/main/java/baritone/command/defaults/ProcCommand.java index 233c18a3..794a4480 100644 --- a/src/main/java/baritone/utils/command/defaults/ProcCommand.java +++ b/src/main/java/baritone/command/defaults/ProcCommand.java @@ -15,16 +15,16 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.calc.IPathingControlManager; import baritone.api.process.IBaritoneProcess; import baritone.api.process.PathingCommand; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java b/src/main/java/baritone/command/defaults/ReloadAllCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java rename to src/main/java/baritone/command/defaults/ReloadAllCommand.java index 6128094c..9f4ddd83 100644 --- a/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java +++ b/src/main/java/baritone/command/defaults/ReloadAllCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/RenderCommand.java b/src/main/java/baritone/command/defaults/RenderCommand.java similarity index 90% rename from src/main/java/baritone/utils/command/defaults/RenderCommand.java rename to src/main/java/baritone/command/defaults/RenderCommand.java index 15473afa..ea51edc8 100644 --- a/src/main/java/baritone/utils/command/defaults/RenderCommand.java +++ b/src/main/java/baritone/command/defaults/RenderCommand.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/RepackCommand.java b/src/main/java/baritone/command/defaults/RepackCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/RepackCommand.java rename to src/main/java/baritone/command/defaults/RepackCommand.java index dcbe4b39..d42bd95a 100644 --- a/src/main/java/baritone/utils/command/defaults/RepackCommand.java +++ b/src/main/java/baritone/command/defaults/RepackCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import baritone.cache.WorldScanner; import java.util.Arrays; diff --git a/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java b/src/main/java/baritone/command/defaults/SaveAllCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/SaveAllCommand.java rename to src/main/java/baritone/command/defaults/SaveAllCommand.java index 9c507f69..7df2e320 100644 --- a/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java +++ b/src/main/java/baritone/command/defaults/SaveAllCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java b/src/main/java/baritone/command/defaults/SchematicaCommand.java similarity index 88% rename from src/main/java/baritone/utils/command/defaults/SchematicaCommand.java rename to src/main/java/baritone/command/defaults/SchematicaCommand.java index c531a48b..5f659d1f 100644 --- a/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java +++ b/src/main/java/baritone/command/defaults/SchematicaCommand.java @@ -15,12 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/SelCommand.java b/src/main/java/baritone/command/defaults/SelCommand.java similarity index 95% rename from src/main/java/baritone/utils/command/defaults/SelCommand.java rename to src/main/java/baritone/command/defaults/SelCommand.java index b6c38ec0..342d0a31 100644 --- a/src/main/java/baritone/utils/command/defaults/SelCommand.java +++ b/src/main/java/baritone/command/defaults/SelCommand.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.Baritone; import baritone.api.IBaritone; @@ -28,15 +28,15 @@ import baritone.api.utils.BetterBlockPos; import baritone.api.utils.BlockOptionalMeta; import baritone.api.utils.BlockOptionalMetaLookup; import baritone.api.utils.ISchematic; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.ForBlockOptionalMeta; -import baritone.api.utils.command.datatypes.ForEnumFacing; -import baritone.api.utils.command.datatypes.RelativeBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.datatypes.ForBlockOptionalMeta; +import baritone.api.command.datatypes.ForEnumFacing; +import baritone.api.command.datatypes.RelativeBlockPos; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import baritone.utils.IRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/baritone/utils/command/defaults/SetCommand.java b/src/main/java/baritone/command/defaults/SetCommand.java similarity index 96% rename from src/main/java/baritone/utils/command/defaults/SetCommand.java rename to src/main/java/baritone/command/defaults/SetCommand.java index f6aed80a..280f56ea 100644 --- a/src/main/java/baritone/utils/command/defaults/SetCommand.java +++ b/src/main/java/baritone/command/defaults/SetCommand.java @@ -15,18 +15,18 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.Settings; import baritone.api.utils.SettingsUtil; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.pagination.Paginator; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.pagination.Paginator; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; @@ -41,7 +41,7 @@ import java.util.stream.Stream; import static baritone.api.utils.SettingsUtil.settingTypeToString; import static baritone.api.utils.SettingsUtil.settingValueToString; -import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; +import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; public class SetCommand extends Command { diff --git a/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java b/src/main/java/baritone/command/defaults/ThisWayCommand.java similarity index 90% rename from src/main/java/baritone/utils/command/defaults/ThisWayCommand.java rename to src/main/java/baritone/command/defaults/ThisWayCommand.java index 4c2f4003..9ff42f42 100644 --- a/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java +++ b/src/main/java/baritone/command/defaults/ThisWayCommand.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.GoalXZ; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/TunnelCommand.java b/src/main/java/baritone/command/defaults/TunnelCommand.java similarity index 90% rename from src/main/java/baritone/utils/command/defaults/TunnelCommand.java rename to src/main/java/baritone/command/defaults/TunnelCommand.java index 1b9066f9..e7830c05 100644 --- a/src/main/java/baritone/utils/command/defaults/TunnelCommand.java +++ b/src/main/java/baritone/command/defaults/TunnelCommand.java @@ -15,14 +15,14 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalStrictDirection; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/VersionCommand.java b/src/main/java/baritone/command/defaults/VersionCommand.java similarity index 87% rename from src/main/java/baritone/utils/command/defaults/VersionCommand.java rename to src/main/java/baritone/command/defaults/VersionCommand.java index 4c9aa850..6e063b0f 100644 --- a/src/main/java/baritone/utils/command/defaults/VersionCommand.java +++ b/src/main/java/baritone/command/defaults/VersionCommand.java @@ -15,13 +15,13 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; +import baritone.api.command.Command; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.helpers.arguments.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java b/src/main/java/baritone/command/defaults/WaypointsCommand.java similarity index 95% rename from src/main/java/baritone/utils/command/defaults/WaypointsCommand.java rename to src/main/java/baritone/command/defaults/WaypointsCommand.java index 7cf41863..c61f6557 100644 --- a/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.defaults; +package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.cache.IWaypoint; @@ -23,15 +23,15 @@ import baritone.api.cache.Waypoint; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalBlock; import baritone.api.utils.BetterBlockPos; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.datatypes.ForWaypoints; -import baritone.api.utils.command.datatypes.RelativeBlockPos; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidStateException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.helpers.pagination.Paginator; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.Command; +import baritone.api.command.datatypes.ForWaypoints; +import baritone.api.command.datatypes.RelativeBlockPos; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.helpers.pagination.Paginator; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; @@ -43,7 +43,7 @@ import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Stream; -import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; +import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; public class WaypointsCommand extends Command { diff --git a/src/main/java/baritone/utils/command/helpers/arguments/ArgConsumer.java b/src/main/java/baritone/command/helpers/arguments/ArgConsumer.java similarity index 94% rename from src/main/java/baritone/utils/command/helpers/arguments/ArgConsumer.java rename to src/main/java/baritone/command/helpers/arguments/ArgConsumer.java index 06aaa6eb..c6a4fb0c 100644 --- a/src/main/java/baritone/utils/command/helpers/arguments/ArgConsumer.java +++ b/src/main/java/baritone/command/helpers/arguments/ArgConsumer.java @@ -15,21 +15,21 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.helpers.arguments; +package baritone.command.helpers.arguments; import baritone.api.IBaritone; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.datatypes.IDatatype; -import baritone.api.utils.command.datatypes.IDatatypeContext; -import baritone.api.utils.command.datatypes.IDatatypeFor; -import baritone.api.utils.command.datatypes.IDatatypePost; -import baritone.api.utils.command.exception.CommandException; -import baritone.api.utils.command.exception.CommandInvalidTypeException; -import baritone.api.utils.command.exception.CommandNotEnoughArgumentsException; -import baritone.api.utils.command.exception.CommandTooManyArgumentsException; -import baritone.api.utils.command.helpers.arguments.IArgConsumer; -import baritone.api.utils.command.manager.ICommandManager; -import baritone.utils.command.argument.CommandArguments; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.datatypes.IDatatype; +import baritone.api.command.datatypes.IDatatypeContext; +import baritone.api.command.datatypes.IDatatypeFor; +import baritone.api.command.datatypes.IDatatypePost; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.exception.CommandNotEnoughArgumentsException; +import baritone.api.command.exception.CommandTooManyArgumentsException; +import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.manager.ICommandManager; +import baritone.command.argument.CommandArguments; import java.util.ArrayList; import java.util.Deque; diff --git a/src/main/java/baritone/utils/command/manager/CommandManager.java b/src/main/java/baritone/command/manager/CommandManager.java similarity index 88% rename from src/main/java/baritone/utils/command/manager/CommandManager.java rename to src/main/java/baritone/command/manager/CommandManager.java index 2e37a7f7..20f293b1 100644 --- a/src/main/java/baritone/utils/command/manager/CommandManager.java +++ b/src/main/java/baritone/command/manager/CommandManager.java @@ -15,20 +15,20 @@ * along with Baritone. If not, see . */ -package baritone.utils.command.manager; +package baritone.command.manager; import baritone.Baritone; import baritone.api.IBaritone; -import baritone.api.utils.command.Command; -import baritone.api.utils.command.argument.ICommandArgument; -import baritone.api.utils.command.exception.CommandUnhandledException; -import baritone.api.utils.command.exception.ICommandException; -import baritone.utils.command.helpers.arguments.ArgConsumer; -import baritone.api.utils.command.helpers.tabcomplete.TabCompleteHelper; -import baritone.api.utils.command.manager.ICommandManager; -import baritone.api.utils.command.registry.Registry; -import baritone.utils.command.argument.CommandArguments; -import baritone.utils.command.defaults.DefaultCommands; +import baritone.api.command.Command; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandUnhandledException; +import baritone.api.command.exception.ICommandException; +import baritone.command.helpers.arguments.ArgConsumer; +import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.manager.ICommandManager; +import baritone.api.command.registry.Registry; +import baritone.command.argument.CommandArguments; +import baritone.command.defaults.DefaultCommands; import net.minecraft.util.Tuple; import java.util.List; diff --git a/src/main/java/baritone/utils/GuiClick.java b/src/main/java/baritone/utils/GuiClick.java index fc97605f..4f89100d 100644 --- a/src/main/java/baritone/utils/GuiClick.java +++ b/src/main/java/baritone/utils/GuiClick.java @@ -44,7 +44,7 @@ import java.nio.IntBuffer; import java.util.Collections; import static org.lwjgl.opengl.GL11.*; -import static baritone.api.utils.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; +import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; public class GuiClick extends GuiScreen {