From f1bbdc177f9b9079e56eb1eafb8a916c56946ec3 Mon Sep 17 00:00:00 2001 From: Brady Date: Mon, 7 Oct 2019 10:06:05 -0500 Subject: [PATCH] Collapse the sub-packages under helpers --- src/api/java/baritone/api/command/datatypes/BlockById.java | 2 +- .../java/baritone/api/command/datatypes/EntityClassById.java | 2 +- .../java/baritone/api/command/datatypes/ForEnumFacing.java | 2 +- src/api/java/baritone/api/command/datatypes/ForWaypoints.java | 2 +- src/api/java/baritone/api/command/datatypes/NearbyPlayer.java | 2 +- .../api/command/helpers/{pagination => }/Paginator.java | 2 +- .../command/helpers/{tabcomplete => }/TabCompleteHelper.java | 2 +- src/main/java/baritone/command/BaritoneChatControl.java | 2 +- src/main/java/baritone/command/defaults/FollowCommand.java | 2 +- src/main/java/baritone/command/defaults/GoalCommand.java | 2 +- src/main/java/baritone/command/defaults/HelpCommand.java | 4 ++-- src/main/java/baritone/command/defaults/SelCommand.java | 2 +- src/main/java/baritone/command/defaults/SetCommand.java | 4 ++-- src/main/java/baritone/command/defaults/WaypointsCommand.java | 4 ++-- src/main/java/baritone/command/manager/CommandManager.java | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) rename src/api/java/baritone/api/command/helpers/{pagination => }/Paginator.java (99%) rename src/api/java/baritone/api/command/helpers/{tabcomplete => }/TabCompleteHelper.java (99%) diff --git a/src/api/java/baritone/api/command/datatypes/BlockById.java b/src/api/java/baritone/api/command/datatypes/BlockById.java index 98858d13..36b4264c 100644 --- a/src/api/java/baritone/api/command/datatypes/BlockById.java +++ b/src/api/java/baritone/api/command/datatypes/BlockById.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/api/java/baritone/api/command/datatypes/EntityClassById.java b/src/api/java/baritone/api/command/datatypes/EntityClassById.java index 40d6ad10..aed7cdf4 100644 --- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java +++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; diff --git a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java index 23f8617c..f88b372a 100644 --- a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java +++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java @@ -17,7 +17,7 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; import net.minecraft.util.EnumFacing; diff --git a/src/api/java/baritone/api/command/datatypes/ForWaypoints.java b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java index db506839..20878698 100644 --- a/src/api/java/baritone/api/command/datatypes/ForWaypoints.java +++ b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java @@ -20,7 +20,7 @@ package baritone.api.command.datatypes; import baritone.api.IBaritone; import baritone.api.cache.IWaypoint; import baritone.api.cache.IWaypointCollection; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; import java.util.Comparator; diff --git a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java index aa32fc76..a05e1181 100644 --- a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java +++ b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java @@ -18,7 +18,7 @@ package baritone.api.command.datatypes; import baritone.api.IBaritone; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/api/java/baritone/api/command/helpers/pagination/Paginator.java b/src/api/java/baritone/api/command/helpers/Paginator.java similarity index 99% rename from src/api/java/baritone/api/command/helpers/pagination/Paginator.java rename to src/api/java/baritone/api/command/helpers/Paginator.java index 90a7ba2a..29ddca2f 100644 --- a/src/api/java/baritone/api/command/helpers/pagination/Paginator.java +++ b/src/api/java/baritone/api/command/helpers/Paginator.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.command.helpers.pagination; +package baritone.api.command.helpers; import baritone.api.utils.Helper; import baritone.api.command.exception.CommandException; diff --git a/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java similarity index 99% rename from src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java rename to src/api/java/baritone/api/command/helpers/TabCompleteHelper.java index feb7549e..6274c683 100644 --- a/src/api/java/baritone/api/command/helpers/tabcomplete/TabCompleteHelper.java +++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java @@ -15,7 +15,7 @@ * along with Baritone. If not, see . */ -package baritone.api.command.helpers.tabcomplete; +package baritone.api.command.helpers; import baritone.api.BaritoneAPI; import baritone.api.Settings; diff --git a/src/main/java/baritone/command/BaritoneChatControl.java b/src/main/java/baritone/command/BaritoneChatControl.java index c9a0589c..ad7e18e4 100644 --- a/src/main/java/baritone/command/BaritoneChatControl.java +++ b/src/main/java/baritone/command/BaritoneChatControl.java @@ -30,7 +30,7 @@ import baritone.api.command.argument.ICommandArgument; import baritone.api.command.exception.CommandNotEnoughArgumentsException; import baritone.api.command.exception.CommandNotFoundException; import baritone.command.argument.ArgConsumer; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.manager.ICommandManager; import baritone.command.argument.CommandArguments; import baritone.command.manager.CommandManager; diff --git a/src/main/java/baritone/command/defaults/FollowCommand.java b/src/main/java/baritone/command/defaults/FollowCommand.java index dd9ae6c8..755fc535 100644 --- a/src/main/java/baritone/command/defaults/FollowCommand.java +++ b/src/main/java/baritone/command/defaults/FollowCommand.java @@ -24,7 +24,7 @@ import baritone.api.command.datatypes.IDatatypeFor; import baritone.api.command.datatypes.NearbyPlayer; import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/baritone/command/defaults/GoalCommand.java b/src/main/java/baritone/command/defaults/GoalCommand.java index de0a53da..a75af077 100644 --- a/src/main/java/baritone/command/defaults/GoalCommand.java +++ b/src/main/java/baritone/command/defaults/GoalCommand.java @@ -26,7 +26,7 @@ import baritone.api.command.datatypes.RelativeCoordinate; import baritone.api.command.datatypes.RelativeGoal; import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/HelpCommand.java b/src/main/java/baritone/command/defaults/HelpCommand.java index 5cd4ff44..c7e40e9f 100644 --- a/src/main/java/baritone/command/defaults/HelpCommand.java +++ b/src/main/java/baritone/command/defaults/HelpCommand.java @@ -22,8 +22,8 @@ import baritone.api.command.Command; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandNotFoundException; import baritone.api.command.argument.IArgConsumer; -import baritone.api.command.helpers.pagination.Paginator; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.Paginator; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/baritone/command/defaults/SelCommand.java b/src/main/java/baritone/command/defaults/SelCommand.java index 9b84969b..97cae9a6 100644 --- a/src/main/java/baritone/command/defaults/SelCommand.java +++ b/src/main/java/baritone/command/defaults/SelCommand.java @@ -36,7 +36,7 @@ import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; import baritone.api.command.exception.CommandInvalidTypeException; import baritone.api.command.argument.IArgConsumer; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.utils.IRenderer; import net.minecraft.init.Blocks; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/baritone/command/defaults/SetCommand.java b/src/main/java/baritone/command/defaults/SetCommand.java index 73e2c8fb..d5b4f5bf 100644 --- a/src/main/java/baritone/command/defaults/SetCommand.java +++ b/src/main/java/baritone/command/defaults/SetCommand.java @@ -25,8 +25,8 @@ import baritone.api.command.Command; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidTypeException; import baritone.api.command.argument.IArgConsumer; -import baritone.api.command.helpers.pagination.Paginator; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.Paginator; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/baritone/command/defaults/WaypointsCommand.java b/src/main/java/baritone/command/defaults/WaypointsCommand.java index 88fd210e..62c74212 100644 --- a/src/main/java/baritone/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -30,8 +30,8 @@ import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; import baritone.api.command.exception.CommandInvalidTypeException; import baritone.api.command.argument.IArgConsumer; -import baritone.api.command.helpers.pagination.Paginator; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.Paginator; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/baritone/command/manager/CommandManager.java b/src/main/java/baritone/command/manager/CommandManager.java index b527649b..7b488871 100644 --- a/src/main/java/baritone/command/manager/CommandManager.java +++ b/src/main/java/baritone/command/manager/CommandManager.java @@ -24,7 +24,7 @@ import baritone.api.command.argument.ICommandArgument; import baritone.api.command.exception.CommandUnhandledException; import baritone.api.command.exception.ICommandException; import baritone.command.argument.ArgConsumer; -import baritone.api.command.helpers.tabcomplete.TabCompleteHelper; +import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.manager.ICommandManager; import baritone.api.command.registry.Registry; import baritone.command.argument.CommandArguments;