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

Refactor *.util.command to *.command

This commit is contained in:
Brady 2019-10-06 15:20:42 -05:00
parent 06805057d4
commit 889e288524
No known key found for this signature in database
GPG Key ID: 73A788379A197567
87 changed files with 353 additions and 353 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/java/baritone/api/IBaritone.java
View File

@ -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

4
src/api/java/baritone/api/IBaritoneProvider.java
View File

@ -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;

6
src/api/java/baritone/api/utils/command/Command.java → src/api/java/baritone/api/command/Command.java
View File

@ -15,13 +15,13 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

2
src/api/java/baritone/api/utils/command/IBaritoneChatControl.java → src/api/java/baritone/api/command/IBaritoneChatControl.java
View File

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

4
src/api/java/baritone/api/utils/command/ICommandSystem.java → src/api/java/baritone/api/command/ICommandSystem.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command;
package baritone.api.command;
import baritone.api.utils.command.argparser.IArgParserManager;
import baritone.api.command.argparser.IArgParserManager;
/**
* @author Brady

4
src/api/java/baritone/api/utils/command/argparser/IArgParser.java → src/api/java/baritone/api/command/argparser/IArgParser.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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<T> {

8
src/api/java/baritone/api/utils/command/argparser/IArgParserManager.java → src/api/java/baritone/api/command/argparser/IArgParserManager.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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

8
src/api/java/baritone/api/utils/command/argument/ICommandArgument.java → src/api/java/baritone/api/command/argument/ICommandArgument.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;
/**

6
src/api/java/baritone/api/utils/command/datatypes/BlockById.java → src/api/java/baritone/api/command/datatypes/BlockById.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/EntityClassById.java → src/api/java/baritone/api/command/datatypes/EntityClassById.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

4
src/api/java/baritone/api/utils/command/datatypes/ForBlockOptionalMeta.java → src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/ForEnumFacing.java → src/api/java/baritone/api/command/datatypes/ForEnumFacing.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/ForWaypoints.java → src/api/java/baritone/api/command/datatypes/ForWaypoints.java
View File

@ -15,13 +15,13 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/api/java/baritone/api/utils/command/datatypes/IDatatype.java → src/api/java/baritone/api/command/datatypes/IDatatype.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

4
src/api/java/baritone/api/utils/command/datatypes/IDatatypeContext.java → src/api/java/baritone/api/command/datatypes/IDatatypeContext.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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

4
src/api/java/baritone/api/utils/command/datatypes/IDatatypeFor.java → src/api/java/baritone/api/command/datatypes/IDatatypeFor.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

4
src/api/java/baritone/api/utils/command/datatypes/IDatatypePost.java → src/api/java/baritone/api/command/datatypes/IDatatypePost.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

4
src/api/java/baritone/api/utils/command/datatypes/IDatatypePostFunction.java → src/api/java/baritone/api/command/datatypes/IDatatypePostFunction.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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

6
src/api/java/baritone/api/utils/command/datatypes/NearbyPlayer.java → src/api/java/baritone/api/command/datatypes/NearbyPlayer.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeBlockPos.java → src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeCoordinate.java → src/api/java/baritone/api/command/datatypes/RelativeCoordinate.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeFile.java → src/api/java/baritone/api/command/datatypes/RelativeFile.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeGoal.java → src/api/java/baritone/api/command/datatypes/RelativeGoal.java
View File

@ -15,15 +15,15 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeGoalBlock.java → src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeGoalXZ.java → src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/datatypes/RelativeGoalYLevel.java → src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

2
src/api/java/baritone/api/utils/command/exception/CommandErrorMessageException.java → src/api/java/baritone/api/command/exception/CommandErrorMessageException.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.exception;
package baritone.api.command.exception;
public abstract class CommandErrorMessageException extends CommandException {

2
src/api/java/baritone/api/utils/command/exception/CommandException.java → src/api/java/baritone/api/command/exception/CommandException.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.exception;
package baritone.api.command.exception;
public abstract class CommandException extends Exception implements ICommandException {

4
src/api/java/baritone/api/utils/command/exception/CommandInvalidArgumentException.java → src/api/java/baritone/api/command/exception/CommandInvalidArgumentException.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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 {

2
src/api/java/baritone/api/utils/command/exception/CommandInvalidStateException.java → src/api/java/baritone/api/command/exception/CommandInvalidStateException.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.exception;
package baritone.api.command.exception;
public class CommandInvalidStateException extends CommandErrorMessageException {

4
src/api/java/baritone/api/utils/command/exception/CommandInvalidTypeException.java → src/api/java/baritone/api/command/exception/CommandInvalidTypeException.java
View File

@ -15,9 +15,9 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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 {

2
src/api/java/baritone/api/utils/command/exception/CommandNoParserForTypeException.java → src/api/java/baritone/api/command/exception/CommandNoParserForTypeException.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.exception;
package baritone.api.command.exception;
public class CommandNoParserForTypeException extends CommandUnhandledException {

2
src/api/java/baritone/api/utils/command/exception/CommandNotEnoughArgumentsException.java → src/api/java/baritone/api/command/exception/CommandNotEnoughArgumentsException.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.exception;
package baritone.api.command.exception;
public class CommandNotEnoughArgumentsException extends CommandErrorMessageException {

6
src/api/java/baritone/api/utils/command/exception/CommandNotFoundException.java → src/api/java/baritone/api/command/exception/CommandNotFoundException.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

2
src/api/java/baritone/api/utils/command/exception/CommandTooManyArgumentsException.java → src/api/java/baritone/api/command/exception/CommandTooManyArgumentsException.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.exception;
package baritone.api.command.exception;
public class CommandTooManyArgumentsException extends CommandErrorMessageException {

6
src/api/java/baritone/api/utils/command/exception/CommandUnhandledException.java → src/api/java/baritone/api/command/exception/CommandUnhandledException.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/exception/ICommandException.java → src/api/java/baritone/api/command/exception/ICommandException.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

22
src/api/java/baritone/api/utils/command/helpers/arguments/IArgConsumer.java → src/api/java/baritone/api/command/helpers/arguments/IArgConsumer.java
View File

@ -15,19 +15,19 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/api/java/baritone/api/utils/command/helpers/pagination/Paginator.java → src/api/java/baritone/api/command/helpers/pagination/Paginator.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java → src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/api/java/baritone/api/utils/command/manager/ICommandManager.java → src/api/java/baritone/api/command/manager/ICommandManager.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

2
src/api/java/baritone/api/utils/command/registry/Registry.java → src/api/java/baritone/api/command/registry/Registry.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
package baritone.api.utils.command.registry;
package baritone.api.command.registry;
import java.util.*;
import java.util.function.Consumer;

2
src/main/java/baritone/Baritone.java
View File

@ -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;

6
src/main/java/baritone/BaritoneProvider.java
View File

@ -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;

20
src/main/java/baritone/utils/command/BaritoneChatControl.java → src/main/java/baritone/command/BaritoneChatControl.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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 {

8
src/main/java/baritone/utils/command/CommandSystem.java → src/main/java/baritone/command/CommandSystem.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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

14
src/main/java/baritone/utils/command/argparser/ArgParserManager.java → src/main/java/baritone/command/argparser/ArgParserManager.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/main/java/baritone/utils/command/argparser/DefaultArgParsers.java → src/main/java/baritone/command/argparser/DefaultArgParsers.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/argument/CommandArgument.java → src/main/java/baritone/command/argument/CommandArgument.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/main/java/baritone/utils/command/argument/CommandArguments.java → src/main/java/baritone/command/argument/CommandArguments.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/AxisCommand.java → src/main/java/baritone/command/defaults/AxisCommand.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/BlacklistCommand.java → src/main/java/baritone/command/defaults/BlacklistCommand.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

14
src/main/java/baritone/utils/command/defaults/BuildCommand.java → src/main/java/baritone/command/defaults/BuildCommand.java
View File

@ -15,16 +15,16 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/CancelCommand.java → src/main/java/baritone/command/defaults/CancelCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/ChestsCommand.java → src/main/java/baritone/command/defaults/ChestsCommand.java
View File

@ -15,15 +15,15 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/ClickCommand.java → src/main/java/baritone/command/defaults/ClickCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/ComeCommand.java → src/main/java/baritone/command/defaults/ComeCommand.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

6
src/main/java/baritone/utils/command/defaults/CommandAlias.java → src/main/java/baritone/command/defaults/CommandAlias.java
View File

@ -15,11 +15,11 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

4
src/main/java/baritone/utils/command/defaults/DefaultCommands.java → src/main/java/baritone/command/defaults/DefaultCommands.java
View File

@ -15,10 +15,10 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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.*;

10
src/main/java/baritone/utils/command/defaults/ExploreCommand.java → src/main/java/baritone/command/defaults/ExploreCommand.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

14
src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java → src/main/java/baritone/command/defaults/ExploreFilterCommand.java
View File

@ -15,15 +15,15 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/FarmCommand.java → src/main/java/baritone/command/defaults/FarmCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/FindCommand.java → src/main/java/baritone/command/defaults/FindCommand.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

16
src/main/java/baritone/utils/command/defaults/FollowCommand.java → src/main/java/baritone/command/defaults/FollowCommand.java
View File

@ -15,16 +15,16 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java → src/main/java/baritone/command/defaults/ForceCancelCommand.java
View File

@ -15,13 +15,13 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/GcCommand.java → src/main/java/baritone/command/defaults/GcCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

14
src/main/java/baritone/utils/command/defaults/GoalCommand.java → src/main/java/baritone/command/defaults/GoalCommand.java
View File

@ -15,18 +15,18 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

16
src/main/java/baritone/utils/command/defaults/HelpCommand.java → src/main/java/baritone/command/defaults/HelpCommand.java
View File

@ -15,15 +15,15 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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 {

10
src/main/java/baritone/utils/command/defaults/InvertCommand.java → src/main/java/baritone/command/defaults/InvertCommand.java
View File

@ -15,16 +15,16 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

12
src/main/java/baritone/utils/command/defaults/MineCommand.java → src/main/java/baritone/command/defaults/MineCommand.java
View File

@ -15,15 +15,15 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

16
src/main/java/baritone/utils/command/defaults/PathCommand.java → src/main/java/baritone/command/defaults/PathCommand.java
View File

@ -15,18 +15,18 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java → src/main/java/baritone/command/defaults/PauseResumeCommands.java
View File

@ -15,16 +15,16 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/ProcCommand.java → src/main/java/baritone/command/defaults/ProcCommand.java
View File

@ -15,16 +15,16 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java → src/main/java/baritone/command/defaults/ReloadAllCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/RenderCommand.java → src/main/java/baritone/command/defaults/RenderCommand.java
View File

@ -15,13 +15,13 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/RepackCommand.java → src/main/java/baritone/command/defaults/RepackCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/SaveAllCommand.java → src/main/java/baritone/command/defaults/SaveAllCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/SchematicaCommand.java → src/main/java/baritone/command/defaults/SchematicaCommand.java
View File

@ -15,12 +15,12 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

20
src/main/java/baritone/utils/command/defaults/SelCommand.java → src/main/java/baritone/command/defaults/SelCommand.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

16
src/main/java/baritone/utils/command/defaults/SetCommand.java → src/main/java/baritone/command/defaults/SetCommand.java
View File

@ -15,18 +15,18 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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 {

8
src/main/java/baritone/utils/command/defaults/ThisWayCommand.java → src/main/java/baritone/command/defaults/ThisWayCommand.java
View File

@ -15,13 +15,13 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

8
src/main/java/baritone/utils/command/defaults/TunnelCommand.java → src/main/java/baritone/command/defaults/TunnelCommand.java
View File

@ -15,14 +15,14 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

10
src/main/java/baritone/utils/command/defaults/VersionCommand.java → src/main/java/baritone/command/defaults/VersionCommand.java
View File

@ -15,13 +15,13 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

22
src/main/java/baritone/utils/command/defaults/WaypointsCommand.java → src/main/java/baritone/command/defaults/WaypointsCommand.java
View File

@ -15,7 +15,7 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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 {

26
src/main/java/baritone/utils/command/helpers/arguments/ArgConsumer.java → src/main/java/baritone/command/helpers/arguments/ArgConsumer.java
View File

@ -15,21 +15,21 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

22
src/main/java/baritone/utils/command/manager/CommandManager.java → src/main/java/baritone/command/manager/CommandManager.java
View File

@ -15,20 +15,20 @@
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/
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;

2
src/main/java/baritone/utils/GuiClick.java
View File

@ -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 {