From 9591b6fdefa2091f208dc2faed2f779269b2ec35 Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 7 Oct 2019 10:00:04 -0500 Subject: [PATCH] Move IArgConsumer from *.helpers.arguments to *.argument --- src/api/java/baritone/api/command/Command.java | 2 +- .../{helpers/arguments => argument}/IArgConsumer.java | 3 +-- .../java/baritone/api/command/argument/ICommandArgument.java | 1 - src/api/java/baritone/api/command/datatypes/IDatatype.java | 2 +- .../baritone/api/command/datatypes/IDatatypeContext.java | 2 +- .../baritone/api/command/datatypes/RelativeBlockPos.java | 2 +- .../baritone/api/command/datatypes/RelativeCoordinate.java | 2 +- .../java/baritone/api/command/datatypes/RelativeFile.java | 2 +- .../java/baritone/api/command/datatypes/RelativeGoal.java | 2 +- .../baritone/api/command/datatypes/RelativeGoalBlock.java | 2 +- .../java/baritone/api/command/datatypes/RelativeGoalXZ.java | 2 +- .../baritone/api/command/datatypes/RelativeGoalYLevel.java | 2 +- .../baritone/api/command/helpers/pagination/Paginator.java | 2 +- .../api/command/helpers/tabcomplete/TabCompleteHelper.java | 2 +- src/main/java/baritone/command/BaritoneChatControl.java | 2 +- .../command/{helpers/arguments => argument}/ArgConsumer.java | 5 ++--- src/main/java/baritone/command/defaults/AxisCommand.java | 2 +- .../java/baritone/command/defaults/BlacklistCommand.java | 2 +- src/main/java/baritone/command/defaults/BuildCommand.java | 2 +- src/main/java/baritone/command/defaults/CancelCommand.java | 2 +- src/main/java/baritone/command/defaults/ChestsCommand.java | 2 +- src/main/java/baritone/command/defaults/ClickCommand.java | 2 +- src/main/java/baritone/command/defaults/ComeCommand.java | 2 +- src/main/java/baritone/command/defaults/CommandAlias.java | 2 +- src/main/java/baritone/command/defaults/ExploreCommand.java | 2 +- .../java/baritone/command/defaults/ExploreFilterCommand.java | 2 +- src/main/java/baritone/command/defaults/FarmCommand.java | 2 +- src/main/java/baritone/command/defaults/FindCommand.java | 2 +- src/main/java/baritone/command/defaults/FollowCommand.java | 2 +- .../java/baritone/command/defaults/ForceCancelCommand.java | 2 +- src/main/java/baritone/command/defaults/GcCommand.java | 2 +- src/main/java/baritone/command/defaults/GoalCommand.java | 2 +- src/main/java/baritone/command/defaults/GotoCommand.java | 2 +- src/main/java/baritone/command/defaults/HelpCommand.java | 2 +- src/main/java/baritone/command/defaults/InvertCommand.java | 2 +- src/main/java/baritone/command/defaults/MineCommand.java | 2 +- src/main/java/baritone/command/defaults/PathCommand.java | 2 +- .../java/baritone/command/defaults/PauseResumeCommands.java | 2 +- src/main/java/baritone/command/defaults/ProcCommand.java | 2 +- .../java/baritone/command/defaults/ReloadAllCommand.java | 2 +- src/main/java/baritone/command/defaults/RenderCommand.java | 2 +- src/main/java/baritone/command/defaults/RepackCommand.java | 2 +- src/main/java/baritone/command/defaults/SaveAllCommand.java | 2 +- .../java/baritone/command/defaults/SchematicaCommand.java | 2 +- src/main/java/baritone/command/defaults/SelCommand.java | 2 +- src/main/java/baritone/command/defaults/SetCommand.java | 2 +- src/main/java/baritone/command/defaults/ThisWayCommand.java | 2 +- src/main/java/baritone/command/defaults/TunnelCommand.java | 2 +- src/main/java/baritone/command/defaults/VersionCommand.java | 2 +- .../java/baritone/command/defaults/WaypointsCommand.java | 2 +- src/main/java/baritone/command/manager/CommandManager.java | 2 +- 51 files changed, 51 insertions(+), 54 deletions(-) rename src/api/java/baritone/api/command/{helpers/arguments => argument}/IArgConsumer.java (99%) rename src/main/java/baritone/command/{helpers/arguments => argument}/ArgConsumer.java (98%) diff --git a/src/api/java/baritone/api/command/Command.java b/src/api/java/baritone/api/command/Command.java index cd8fa5de3..3379b67c3 100644 --- a/src/api/java/baritone/api/command/Command.java +++ b/src/api/java/baritone/api/command/Command.java @@ -21,7 +21,7 @@ import baritone.api.IBaritone; import baritone.api.utils.Helper; import baritone.api.utils.IPlayerContext; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Collections; import java.util.List; diff --git a/src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java b/src/api/java/baritone/api/command/argument/IArgConsumer.java similarity index 99% rename from src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java rename to src/api/java/baritone/api/command/argument/IArgConsumer.java index c185c1f7f..749673110 100644 --- a/src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java +++ b/src/api/java/baritone/api/command/argument/IArgConsumer.java @@ -15,13 +15,12 @@ * along with Baritone. If not, see . */ -package baritone.api.command.helpers.arguments; +package baritone.api.command.argument; import baritone.api.command.Command; import baritone.api.command.exception.CommandTooManyArgumentsException; import baritone.api.utils.Helper; 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; diff --git a/src/api/java/baritone/api/command/argument/ICommandArgument.java b/src/api/java/baritone/api/command/argument/ICommandArgument.java index ab912d00c..9f3ff613c 100644 --- a/src/api/java/baritone/api/command/argument/ICommandArgument.java +++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java @@ -17,7 +17,6 @@ package baritone.api.command.argument; -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/command/datatypes/IDatatype.java b/src/api/java/baritone/api/command/datatypes/IDatatype.java index 385154bc4..60bf0c383 100644 --- a/src/api/java/baritone/api/command/datatypes/IDatatype.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatype.java @@ -18,7 +18,7 @@ package baritone.api.command.datatypes; import baritone.api.command.argparser.IArgParser; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java index 4b8269c3c..78358a262 100644 --- a/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java @@ -18,7 +18,7 @@ package baritone.api.command.datatypes; import baritone.api.IBaritone; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; /** * Provides an {@link IDatatype} with contextual information so diff --git a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java index 513ef41f3..082b649eb 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.utils.BetterBlockPos; import baritone.api.command.exception.CommandException; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java b/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java index dc4d56304..7d77a96c7 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import java.util.regex.Matcher; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeFile.java b/src/api/java/baritone/api/command/datatypes/RelativeFile.java index f886a1c65..2c7adf98f 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeFile.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeFile.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import java.io.File; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoal.java b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java index 73bc6e0d3..cda0ad665 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoal.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalBlock; import baritone.api.pathing.goals.GoalXZ; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java index 19621b952..ae05c6ade 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.pathing.goals.GoalBlock; import baritone.api.utils.BetterBlockPos; import baritone.api.command.exception.CommandException; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java index 83d52de86..cd3977b6f 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.pathing.goals.GoalXZ; import baritone.api.utils.BetterBlockPos; import baritone.api.command.exception.CommandException; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java index 4dd195a4d..58d093f1b 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.pathing.goals.GoalYLevel; import baritone.api.utils.BetterBlockPos; import baritone.api.command.exception.CommandException; diff --git a/src/api/java/baritone/api/command/helpers/pagination/Paginator.java b/src/api/java/baritone/api/command/helpers/pagination/Paginator.java index e5bf9d55f..90a7ba2a8 100644 --- a/src/api/java/baritone/api/command/helpers/pagination/Paginator.java +++ b/src/api/java/baritone/api/command/helpers/pagination/Paginator.java @@ -20,7 +20,7 @@ package baritone.api.command.helpers.pagination; import baritone.api.utils.Helper; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidTypeException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.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/command/helpers/tabcomplete/TabCompleteHelper.java b/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java index 57192f0c2..feb7549e5 100644 --- a/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java +++ b/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java @@ -21,7 +21,7 @@ import baritone.api.BaritoneAPI; import baritone.api.Settings; import baritone.api.event.events.TabCompleteEvent; import baritone.api.utils.SettingsUtil; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.manager.ICommandManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/baritone/command/BaritoneChatControl.java b/src/main/java/baritone/command/BaritoneChatControl.java index 2b81f2840..c9a0589c7 100644 --- a/src/main/java/baritone/command/BaritoneChatControl.java +++ b/src/main/java/baritone/command/BaritoneChatControl.java @@ -29,7 +29,7 @@ import baritone.api.utils.SettingsUtil; 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.command.argument.ArgConsumer; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import baritone.api.command.manager.ICommandManager; import baritone.command.argument.CommandArguments; diff --git a/src/main/java/baritone/command/helpers/arguments/ArgConsumer.java b/src/main/java/baritone/command/argument/ArgConsumer.java similarity index 98% rename from src/main/java/baritone/command/helpers/arguments/ArgConsumer.java rename to src/main/java/baritone/command/argument/ArgConsumer.java index c6a4fb0c7..651ca50bc 100644 --- a/src/main/java/baritone/command/helpers/arguments/ArgConsumer.java +++ b/src/main/java/baritone/command/argument/ArgConsumer.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.command.helpers.arguments; +package baritone.command.argument; import baritone.api.IBaritone; import baritone.api.command.argument.ICommandArgument; @@ -27,9 +27,8 @@ 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.argument.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/command/defaults/AxisCommand.java b/src/main/java/baritone/command/defaults/AxisCommand.java index 09d00ae79..0a92ac6e7 100644 --- a/src/main/java/baritone/command/defaults/AxisCommand.java +++ b/src/main/java/baritone/command/defaults/AxisCommand.java @@ -22,7 +22,7 @@ import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalAxis; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/BlacklistCommand.java b/src/main/java/baritone/command/defaults/BlacklistCommand.java index 5069f4348..a383e0a79 100644 --- a/src/main/java/baritone/command/defaults/BlacklistCommand.java +++ b/src/main/java/baritone/command/defaults/BlacklistCommand.java @@ -22,7 +22,7 @@ import baritone.api.process.IGetToBlockProcess; 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 baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/BuildCommand.java b/src/main/java/baritone/command/defaults/BuildCommand.java index b2edbb245..39bf0d3fd 100644 --- a/src/main/java/baritone/command/defaults/BuildCommand.java +++ b/src/main/java/baritone/command/defaults/BuildCommand.java @@ -24,7 +24,7 @@ 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 baritone.api.command.argument.IArgConsumer; import net.minecraft.client.Minecraft; import java.io.File; diff --git a/src/main/java/baritone/command/defaults/CancelCommand.java b/src/main/java/baritone/command/defaults/CancelCommand.java index aff839ae8..3b4c63670 100644 --- a/src/main/java/baritone/command/defaults/CancelCommand.java +++ b/src/main/java/baritone/command/defaults/CancelCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/ChestsCommand.java b/src/main/java/baritone/command/defaults/ChestsCommand.java index c3755b5a2..fd084ad17 100644 --- a/src/main/java/baritone/command/defaults/ChestsCommand.java +++ b/src/main/java/baritone/command/defaults/ChestsCommand.java @@ -23,7 +23,7 @@ import baritone.api.utils.BetterBlockPos; 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 baritone.api.command.argument.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/command/defaults/ClickCommand.java b/src/main/java/baritone/command/defaults/ClickCommand.java index 95b04f52c..b882c5879 100644 --- a/src/main/java/baritone/command/defaults/ClickCommand.java +++ b/src/main/java/baritone/command/defaults/ClickCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/ComeCommand.java b/src/main/java/baritone/command/defaults/ComeCommand.java index 9b336a252..b8033c3fb 100644 --- a/src/main/java/baritone/command/defaults/ComeCommand.java +++ b/src/main/java/baritone/command/defaults/ComeCommand.java @@ -22,7 +22,7 @@ import baritone.api.pathing.goals.GoalBlock; 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 baritone.api.command.argument.IArgConsumer; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/command/defaults/CommandAlias.java b/src/main/java/baritone/command/defaults/CommandAlias.java index 08b1ca05d..71c322fe3 100644 --- a/src/main/java/baritone/command/defaults/CommandAlias.java +++ b/src/main/java/baritone/command/defaults/CommandAlias.java @@ -19,7 +19,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Collections; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/ExploreCommand.java b/src/main/java/baritone/command/defaults/ExploreCommand.java index a2054cc78..9d27bbbe9 100644 --- a/src/main/java/baritone/command/defaults/ExploreCommand.java +++ b/src/main/java/baritone/command/defaults/ExploreCommand.java @@ -22,7 +22,7 @@ import baritone.api.pathing.goals.GoalXZ; 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 baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/ExploreFilterCommand.java b/src/main/java/baritone/command/defaults/ExploreFilterCommand.java index a1c5074a3..b4ee393a9 100644 --- a/src/main/java/baritone/command/defaults/ExploreFilterCommand.java +++ b/src/main/java/baritone/command/defaults/ExploreFilterCommand.java @@ -23,7 +23,7 @@ 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 baritone.api.command.argument.IArgConsumer; import com.google.gson.JsonSyntaxException; import java.io.File; diff --git a/src/main/java/baritone/command/defaults/FarmCommand.java b/src/main/java/baritone/command/defaults/FarmCommand.java index 9151852c1..786d01249 100644 --- a/src/main/java/baritone/command/defaults/FarmCommand.java +++ b/src/main/java/baritone/command/defaults/FarmCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/FindCommand.java b/src/main/java/baritone/command/defaults/FindCommand.java index 22a8fd87a..3011d7f9e 100644 --- a/src/main/java/baritone/command/defaults/FindCommand.java +++ b/src/main/java/baritone/command/defaults/FindCommand.java @@ -22,7 +22,7 @@ import baritone.api.utils.BetterBlockPos; 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 baritone.api.command.argument.IArgConsumer; import net.minecraft.block.Block; import java.util.ArrayList; diff --git a/src/main/java/baritone/command/defaults/FollowCommand.java b/src/main/java/baritone/command/defaults/FollowCommand.java index e9c80ab91..dd9ae6c85 100644 --- a/src/main/java/baritone/command/defaults/FollowCommand.java +++ b/src/main/java/baritone/command/defaults/FollowCommand.java @@ -23,7 +23,7 @@ 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.argument.IArgConsumer; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; diff --git a/src/main/java/baritone/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/command/defaults/ForceCancelCommand.java index f92134822..8344f4f9f 100644 --- a/src/main/java/baritone/command/defaults/ForceCancelCommand.java +++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java @@ -21,7 +21,7 @@ import baritone.api.IBaritone; import baritone.api.behavior.IPathingBehavior; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/GcCommand.java b/src/main/java/baritone/command/defaults/GcCommand.java index c64703e91..143da5792 100644 --- a/src/main/java/baritone/command/defaults/GcCommand.java +++ b/src/main/java/baritone/command/defaults/GcCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/GoalCommand.java b/src/main/java/baritone/command/defaults/GoalCommand.java index 46b506959..de0a53da0 100644 --- a/src/main/java/baritone/command/defaults/GoalCommand.java +++ b/src/main/java/baritone/command/defaults/GoalCommand.java @@ -25,7 +25,7 @@ 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.argument.IArgConsumer; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import java.util.Arrays; diff --git a/src/main/java/baritone/command/defaults/GotoCommand.java b/src/main/java/baritone/command/defaults/GotoCommand.java index 9659fff87..427e67b2a 100644 --- a/src/main/java/baritone/command/defaults/GotoCommand.java +++ b/src/main/java/baritone/command/defaults/GotoCommand.java @@ -24,7 +24,7 @@ import baritone.api.command.datatypes.ForBlockOptionalMeta; 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.argument.IArgConsumer; import baritone.api.pathing.goals.Goal; import baritone.api.utils.BetterBlockPos; import baritone.api.utils.BlockOptionalMeta; diff --git a/src/main/java/baritone/command/defaults/HelpCommand.java b/src/main/java/baritone/command/defaults/HelpCommand.java index fe3c48082..5cd4ff442 100644 --- a/src/main/java/baritone/command/defaults/HelpCommand.java +++ b/src/main/java/baritone/command/defaults/HelpCommand.java @@ -21,7 +21,7 @@ import baritone.api.IBaritone; 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.argument.IArgConsumer; import baritone.api.command.helpers.pagination.Paginator; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/baritone/command/defaults/InvertCommand.java b/src/main/java/baritone/command/defaults/InvertCommand.java index ba79a4a94..9e3e859eb 100644 --- a/src/main/java/baritone/command/defaults/InvertCommand.java +++ b/src/main/java/baritone/command/defaults/InvertCommand.java @@ -24,7 +24,7 @@ import baritone.api.process.ICustomGoalProcess; 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 baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/MineCommand.java b/src/main/java/baritone/command/defaults/MineCommand.java index d2846e0ae..2baf982af 100644 --- a/src/main/java/baritone/command/defaults/MineCommand.java +++ b/src/main/java/baritone/command/defaults/MineCommand.java @@ -23,7 +23,7 @@ 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.api.command.argument.IArgConsumer; import baritone.cache.WorldScanner; import java.util.ArrayList; diff --git a/src/main/java/baritone/command/defaults/PathCommand.java b/src/main/java/baritone/command/defaults/PathCommand.java index fff61a70a..0add64080 100644 --- a/src/main/java/baritone/command/defaults/PathCommand.java +++ b/src/main/java/baritone/command/defaults/PathCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.api.process.ICustomGoalProcess; import baritone.cache.WorldScanner; diff --git a/src/main/java/baritone/command/defaults/PauseResumeCommands.java b/src/main/java/baritone/command/defaults/PauseResumeCommands.java index 11e678820..54718e9b7 100644 --- a/src/main/java/baritone/command/defaults/PauseResumeCommands.java +++ b/src/main/java/baritone/command/defaults/PauseResumeCommands.java @@ -24,7 +24,7 @@ import baritone.api.process.PathingCommandType; 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 baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/ProcCommand.java b/src/main/java/baritone/command/defaults/ProcCommand.java index 794a44802..cf9371bc8 100644 --- a/src/main/java/baritone/command/defaults/ProcCommand.java +++ b/src/main/java/baritone/command/defaults/ProcCommand.java @@ -24,7 +24,7 @@ import baritone.api.process.PathingCommand; 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 baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/ReloadAllCommand.java b/src/main/java/baritone/command/defaults/ReloadAllCommand.java index 9f4ddd83d..fa8d51175 100644 --- a/src/main/java/baritone/command/defaults/ReloadAllCommand.java +++ b/src/main/java/baritone/command/defaults/ReloadAllCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/RenderCommand.java b/src/main/java/baritone/command/defaults/RenderCommand.java index ea51edc8f..90471432a 100644 --- a/src/main/java/baritone/command/defaults/RenderCommand.java +++ b/src/main/java/baritone/command/defaults/RenderCommand.java @@ -21,7 +21,7 @@ import baritone.api.IBaritone; import baritone.api.utils.BetterBlockPos; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/RepackCommand.java b/src/main/java/baritone/command/defaults/RepackCommand.java index d42bd95ae..6366fbc92 100644 --- a/src/main/java/baritone/command/defaults/RepackCommand.java +++ b/src/main/java/baritone/command/defaults/RepackCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import baritone.cache.WorldScanner; import java.util.Arrays; diff --git a/src/main/java/baritone/command/defaults/SaveAllCommand.java b/src/main/java/baritone/command/defaults/SaveAllCommand.java index 7df2e320c..5f064a72f 100644 --- a/src/main/java/baritone/command/defaults/SaveAllCommand.java +++ b/src/main/java/baritone/command/defaults/SaveAllCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/SchematicaCommand.java b/src/main/java/baritone/command/defaults/SchematicaCommand.java index 5f659d1fd..8279b1dc5 100644 --- a/src/main/java/baritone/command/defaults/SchematicaCommand.java +++ b/src/main/java/baritone/command/defaults/SchematicaCommand.java @@ -20,7 +20,7 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/SelCommand.java b/src/main/java/baritone/command/defaults/SelCommand.java index 342d0a314..9b84969b2 100644 --- a/src/main/java/baritone/command/defaults/SelCommand.java +++ b/src/main/java/baritone/command/defaults/SelCommand.java @@ -35,7 +35,7 @@ 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.argument.IArgConsumer; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import baritone.utils.IRenderer; import net.minecraft.init.Blocks; diff --git a/src/main/java/baritone/command/defaults/SetCommand.java b/src/main/java/baritone/command/defaults/SetCommand.java index 280f56eac..73e2c8fbd 100644 --- a/src/main/java/baritone/command/defaults/SetCommand.java +++ b/src/main/java/baritone/command/defaults/SetCommand.java @@ -24,7 +24,7 @@ import baritone.api.utils.SettingsUtil; 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.argument.IArgConsumer; import baritone.api.command.helpers.pagination.Paginator; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/baritone/command/defaults/ThisWayCommand.java b/src/main/java/baritone/command/defaults/ThisWayCommand.java index 9ff42f42e..6073d82be 100644 --- a/src/main/java/baritone/command/defaults/ThisWayCommand.java +++ b/src/main/java/baritone/command/defaults/ThisWayCommand.java @@ -21,7 +21,7 @@ import baritone.api.IBaritone; import baritone.api.pathing.goals.GoalXZ; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/TunnelCommand.java b/src/main/java/baritone/command/defaults/TunnelCommand.java index e7830c05d..991a7ff81 100644 --- a/src/main/java/baritone/command/defaults/TunnelCommand.java +++ b/src/main/java/baritone/command/defaults/TunnelCommand.java @@ -22,7 +22,7 @@ import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalStrictDirection; import baritone.api.command.Command; import baritone.api.command.exception.CommandException; -import baritone.api.command.helpers.arguments.IArgConsumer; +import baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/VersionCommand.java b/src/main/java/baritone/command/defaults/VersionCommand.java index 6e063b0f2..b7882d7d7 100644 --- a/src/main/java/baritone/command/defaults/VersionCommand.java +++ b/src/main/java/baritone/command/defaults/VersionCommand.java @@ -21,7 +21,7 @@ import baritone.api.IBaritone; 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 baritone.api.command.argument.IArgConsumer; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/WaypointsCommand.java b/src/main/java/baritone/command/defaults/WaypointsCommand.java index c61f6557e..88fd210e4 100644 --- a/src/main/java/baritone/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -29,7 +29,7 @@ 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.argument.IArgConsumer; import baritone.api.command.helpers.pagination.Paginator; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/baritone/command/manager/CommandManager.java b/src/main/java/baritone/command/manager/CommandManager.java index 20f293b1c..b527649bd 100644 --- a/src/main/java/baritone/command/manager/CommandManager.java +++ b/src/main/java/baritone/command/manager/CommandManager.java @@ -23,7 +23,7 @@ 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.command.argument.ArgConsumer; import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; import baritone.api.command.manager.ICommandManager; import baritone.api.command.registry.Registry;