From 835fb3471fd91b8dcd99578174e48a7c0a574300 Mon Sep 17 00:00:00 2001 From: Leijurv Date: Fri, 29 Jan 2021 20:17:53 -0800 Subject: [PATCH] a long overdue reformat of every file --- src/api/java/baritone/api/IBaritone.java | 2 +- .../baritone/api/cache/IWorldScanner.java | 2 +- .../java/baritone/api/command/Command.java | 3 +-- .../command/argparser/IArgParserManager.java | 4 ++-- .../api/command/argument/IArgConsumer.java | 10 +++++----- .../command/argument/ICommandArgument.java | 2 +- .../api/command/datatypes/BlockById.java | 2 +- .../command/datatypes/EntityClassById.java | 4 ++-- .../datatypes/ForBlockOptionalMeta.java | 2 +- .../api/command/datatypes/ForEnumFacing.java | 2 +- .../api/command/datatypes/ForWaypoints.java | 2 +- .../command/datatypes/IDatatypeContext.java | 3 +-- .../api/command/datatypes/IDatatypeFor.java | 3 +-- .../api/command/datatypes/NearbyPlayer.java | 2 +- .../command/datatypes/RelativeBlockPos.java | 2 +- .../api/command/datatypes/RelativeGoal.java | 5 +---- .../command/datatypes/RelativeGoalBlock.java | 2 +- .../api/command/datatypes/RelativeGoalXZ.java | 2 +- .../command/datatypes/RelativeGoalYLevel.java | 2 +- .../exception/CommandUnhandledException.java | 2 +- .../command/exception/ICommandException.java | 2 +- .../api/command/helpers/Paginator.java | 4 ++-- .../command/helpers/TabCompleteHelper.java | 5 ++--- .../api/event/events/TabCompleteEvent.java | 1 - .../api/schematic/IStaticSchematic.java | 3 +-- .../baritone/api/utils/BlockOptionalMeta.java | 5 ++--- src/api/java/baritone/api/utils/Helper.java | 10 +++++----- .../baritone/api/utils/IPlayerContext.java | 1 - src/main/java/baritone/Baritone.java | 2 +- src/main/java/baritone/BaritoneProvider.java | 2 +- src/main/java/baritone/KeepName.java | 2 +- .../java/baritone/command/CommandSystem.java | 2 +- .../command/ExampleBaritoneControl.java | 12 ++++++------ .../command/argument/ArgConsumer.java | 2 +- .../command/argument/CommandArgument.java | 2 +- .../command/argument/CommandArguments.java | 6 +++--- .../command/defaults/AxisCommand.java | 6 +++--- .../command/defaults/BlacklistCommand.java | 4 ++-- .../command/defaults/ChestsCommand.java | 4 ++-- .../command/defaults/ClickCommand.java | 2 +- .../command/defaults/ComeCommand.java | 4 ++-- .../command/defaults/ExploreCommand.java | 4 ++-- .../defaults/ExploreFilterCommand.java | 2 +- .../command/defaults/FarmCommand.java | 9 ++------- .../command/defaults/FindCommand.java | 4 ++-- .../command/defaults/FollowCommand.java | 2 +- .../command/defaults/ForceCancelCommand.java | 2 +- .../baritone/command/defaults/GcCommand.java | 2 +- .../command/defaults/GoalCommand.java | 8 ++++---- .../command/defaults/GotoCommand.java | 2 +- .../command/defaults/HelpCommand.java | 2 +- .../command/defaults/InvertCommand.java | 8 ++++---- .../command/defaults/MineCommand.java | 4 ++-- .../command/defaults/PathCommand.java | 2 +- .../command/defaults/ProcCommand.java | 8 ++++---- .../command/defaults/ReloadAllCommand.java | 2 +- .../command/defaults/RenderCommand.java | 4 ++-- .../command/defaults/RepackCommand.java | 2 +- .../command/defaults/SaveAllCommand.java | 2 +- .../command/defaults/SchematicaCommand.java | 2 +- .../baritone/command/defaults/SelCommand.java | 19 +++++++++---------- .../baritone/command/defaults/SetCommand.java | 6 +++--- .../command/defaults/ThisWayCommand.java | 4 ++-- .../command/defaults/TunnelCommand.java | 2 +- .../command/defaults/VersionCommand.java | 2 +- .../command/defaults/WaypointsCommand.java | 8 ++++---- .../command/manager/CommandManager.java | 2 +- .../pathing/calc/AbstractNodeCostSearch.java | 2 +- .../pathing/movement/MovementHelper.java | 1 + .../movement/movements/MovementDiagonal.java | 18 +++++++++--------- .../java/baritone/process/BuilderProcess.java | 8 ++++---- .../format/DefaultSchematicFormats.java | 2 -- 72 files changed, 133 insertions(+), 151 deletions(-) diff --git a/src/api/java/baritone/api/IBaritone.java b/src/api/java/baritone/api/IBaritone.java index 64c4a2918..0cc73b0d1 100644 --- a/src/api/java/baritone/api/IBaritone.java +++ b/src/api/java/baritone/api/IBaritone.java @@ -20,13 +20,13 @@ package baritone.api; import baritone.api.behavior.ILookBehavior; import baritone.api.behavior.IPathingBehavior; import baritone.api.cache.IWorldProvider; +import baritone.api.command.manager.ICommandManager; import baritone.api.event.listener.IEventBus; import baritone.api.pathing.calc.IPathingControlManager; import baritone.api.process.*; import baritone.api.selection.ISelectionManager; import baritone.api.utils.IInputOverrideHandler; import baritone.api.utils.IPlayerContext; -import baritone.api.command.manager.ICommandManager; /** * @author Brady diff --git a/src/api/java/baritone/api/cache/IWorldScanner.java b/src/api/java/baritone/api/cache/IWorldScanner.java index 224f64c76..bc3064608 100644 --- a/src/api/java/baritone/api/cache/IWorldScanner.java +++ b/src/api/java/baritone/api/cache/IWorldScanner.java @@ -88,7 +88,7 @@ public interface IWorldScanner { * Queues the chunks in a square formation around the specified player, using the specified * range, which represents 1/2 the square's dimensions, where the player is in the center. * - * @param ctx The player, describing the origin + * @param ctx The player, describing the origin * @param range The range to repack * @return The amount of chunks successfully queued for repacking */ diff --git a/src/api/java/baritone/api/command/Command.java b/src/api/java/baritone/api/command/Command.java index 4db5c0f3f..c81a3365b 100644 --- a/src/api/java/baritone/api/command/Command.java +++ b/src/api/java/baritone/api/command/Command.java @@ -34,9 +34,8 @@ import java.util.stream.Stream; * So basically, you should use it because it provides a small amount of boilerplate, * but you're not forced to use it. * - * @see ICommand - * * @author LoganDark + * @see ICommand */ public abstract class Command implements ICommand { diff --git a/src/api/java/baritone/api/command/argparser/IArgParserManager.java b/src/api/java/baritone/api/command/argparser/IArgParserManager.java index f38b4624d..d5c36adb3 100644 --- a/src/api/java/baritone/api/command/argparser/IArgParserManager.java +++ b/src/api/java/baritone/api/command/argparser/IArgParserManager.java @@ -46,8 +46,8 @@ public interface IArgParserManager { /** * Attempt to parse the specified argument with a stateless {@link IArgParser} that outputs the specified class. * - * @param type The type to try and parse the argument into. - * @param arg The argument to parse. + * @param type The type to try and parse the argument into. + * @param arg The argument to parse. * @return An instance of the specified class. * @throws CommandInvalidTypeException If the parsing failed */ diff --git a/src/api/java/baritone/api/command/argument/IArgConsumer.java b/src/api/java/baritone/api/command/argument/IArgConsumer.java index c9212fa41..883494d49 100644 --- a/src/api/java/baritone/api/command/argument/IArgConsumer.java +++ b/src/api/java/baritone/api/command/argument/IArgConsumer.java @@ -18,8 +18,6 @@ package baritone.api.command.argument; import baritone.api.command.ICommand; -import baritone.api.command.exception.CommandTooManyArgumentsException; -import baritone.api.utils.Helper; import baritone.api.command.argparser.IArgParser; import baritone.api.command.datatypes.IDatatype; import baritone.api.command.datatypes.IDatatypeFor; @@ -27,6 +25,8 @@ 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.utils.Helper; import net.minecraft.util.EnumFacing; import java.util.Deque; @@ -223,7 +223,7 @@ public interface IArgConsumer { * @param type The type to peek as * @param index The index to peek * @return An instance of the specified type - * @throws CommandInvalidTypeException If the parsing failed + * @throws CommandInvalidTypeException If the parsing failed * @see IArgParser * @see #peekAs(Class) * @see #peekAsOrDefault(Class, Object, int) @@ -240,7 +240,7 @@ public interface IArgConsumer { * * @param type The type to peek as * @return An instance of the specified type - * @throws CommandInvalidTypeException If the parsing failed + * @throws CommandInvalidTypeException If the parsing failed * @see IArgParser * @see #peekAs(Class, int) * @see #peekAsOrDefault(Class, Object) @@ -458,7 +458,7 @@ public interface IArgConsumer { * * @param type The type to peek as * @return An instance of the specified type - * @throws CommandInvalidTypeException If the parsing failed + * @throws CommandInvalidTypeException If the parsing failed * @see IArgParser * @see #get() * @see #getAsOrDefault(Class, Object) diff --git a/src/api/java/baritone/api/command/argument/ICommandArgument.java b/src/api/java/baritone/api/command/argument/ICommandArgument.java index 9f3ff613c..72169de04 100644 --- a/src/api/java/baritone/api/command/argument/ICommandArgument.java +++ b/src/api/java/baritone/api/command/argument/ICommandArgument.java @@ -87,7 +87,7 @@ public interface ICommandArgument { * * @param type The class to parse this argument into * @return An instance of the specified type - * @throws CommandInvalidTypeException If the parsing failed + * @throws CommandInvalidTypeException If the parsing failed */ T getAs(Class type, Class stateType, S state) throws CommandInvalidTypeException; diff --git a/src/api/java/baritone/api/command/datatypes/BlockById.java b/src/api/java/baritone/api/command/datatypes/BlockById.java index 36b4264c3..3702725e3 100644 --- a/src/api/java/baritone/api/command/datatypes/BlockById.java +++ b/src/api/java/baritone/api/command/datatypes/BlockById.java @@ -17,8 +17,8 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.ResourceLocation; diff --git a/src/api/java/baritone/api/command/datatypes/EntityClassById.java b/src/api/java/baritone/api/command/datatypes/EntityClassById.java index becc649c1..c7ce2128d 100644 --- a/src/api/java/baritone/api/command/datatypes/EntityClassById.java +++ b/src/api/java/baritone/api/command/datatypes/EntityClassById.java @@ -17,8 +17,8 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.util.ResourceLocation; @@ -34,7 +34,7 @@ public enum EntityClassById implements IDatatypeFor> { Class entity; try { entity = EntityList.REGISTRY.getObject(id); - } catch(NoSuchFieldError e) { + } catch (NoSuchFieldError e) { // Forge removes EntityList.REGISTRY field and provides the getClass method as a replacement // See https://github.com/MinecraftForge/MinecraftForge/blob/1.12.x/patches/minecraft/net/minecraft/entity/EntityList.java.patch try { diff --git a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java index 29dc5f0b7..978450a23 100644 --- a/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java +++ b/src/api/java/baritone/api/command/datatypes/ForBlockOptionalMeta.java @@ -17,8 +17,8 @@ package baritone.api.command.datatypes; -import baritone.api.utils.BlockOptionalMeta; import baritone.api.command.exception.CommandException; +import baritone.api.utils.BlockOptionalMeta; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java index f88b372ae..d71307b10 100644 --- a/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java +++ b/src/api/java/baritone/api/command/datatypes/ForEnumFacing.java @@ -17,8 +17,8 @@ package baritone.api.command.datatypes; -import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.util.EnumFacing; import java.util.Locale; diff --git a/src/api/java/baritone/api/command/datatypes/ForWaypoints.java b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java index 208786987..061428827 100644 --- a/src/api/java/baritone/api/command/datatypes/ForWaypoints.java +++ b/src/api/java/baritone/api/command/datatypes/ForWaypoints.java @@ -20,8 +20,8 @@ package baritone.api.command.datatypes; import baritone.api.IBaritone; import baritone.api.cache.IWaypoint; import baritone.api.cache.IWaypointCollection; -import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.TabCompleteHelper; import java.util.Comparator; 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 78358a262..f0d1b5636 100644 --- a/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypeContext.java @@ -24,9 +24,8 @@ import baritone.api.command.argument.IArgConsumer; * Provides an {@link IDatatype} with contextual information so * that it can perform the desired operation on the target level. * - * @see IDatatype - * * @author Brady + * @see IDatatype * @since 9/26/2019 */ public interface IDatatypeContext { diff --git a/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java b/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java index 2f0a9c140..854fe6869 100644 --- a/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java +++ b/src/api/java/baritone/api/command/datatypes/IDatatypeFor.java @@ -34,11 +34,10 @@ public interface IDatatypeFor extends IDatatype { * if the expected input does not conform to a parseable value. As far as a {@link CommandException} being * thrown is concerned, see the note below for specifics. * - * @see IDatatypeContext - * * @param ctx The context * @return The parsed data-type * @throws CommandException If there was an issue parsing using another type or arguments could not be polled. + * @see IDatatypeContext */ T get(IDatatypeContext ctx) throws CommandException; } diff --git a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java index a05e11813..9c394627c 100644 --- a/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java +++ b/src/api/java/baritone/api/command/datatypes/NearbyPlayer.java @@ -18,8 +18,8 @@ package baritone.api.command.datatypes; import baritone.api.IBaritone; -import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.command.exception.CommandException; +import baritone.api.command.helpers.TabCompleteHelper; import net.minecraft.entity.player.EntityPlayer; import java.util.List; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java index 082b649eb..31ae97273 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeBlockPos.java @@ -18,8 +18,8 @@ package baritone.api.command.datatypes; import baritone.api.command.argument.IArgConsumer; -import baritone.api.utils.BetterBlockPos; import baritone.api.command.exception.CommandException; +import baritone.api.utils.BetterBlockPos; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoal.java b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java index 19312907e..0b602e9e9 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoal.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoal.java @@ -18,16 +18,13 @@ package baritone.api.command.datatypes; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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.command.exception.CommandException; -import net.minecraft.util.math.MathHelper; -import java.util.ArrayList; -import java.util.List; import java.util.stream.Stream; public enum RelativeGoal implements IDatatypePost { diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java index ae05c6ade..ccc45cafa 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalBlock.java @@ -18,9 +18,9 @@ package baritone.api.command.datatypes; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; import baritone.api.pathing.goals.GoalBlock; import baritone.api.utils.BetterBlockPos; -import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java index c50aab015..747509f5e 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalXZ.java @@ -18,9 +18,9 @@ package baritone.api.command.datatypes; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; import baritone.api.pathing.goals.GoalXZ; import baritone.api.utils.BetterBlockPos; -import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java index 58d093f1b..cd1a4c5d4 100644 --- a/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java +++ b/src/api/java/baritone/api/command/datatypes/RelativeGoalYLevel.java @@ -18,9 +18,9 @@ package baritone.api.command.datatypes; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; import baritone.api.pathing.goals.GoalYLevel; import baritone.api.utils.BetterBlockPos; -import baritone.api.command.exception.CommandException; import net.minecraft.util.math.MathHelper; import java.util.stream.Stream; diff --git a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java index 02987d4ee..5dce59313 100644 --- a/src/api/java/baritone/api/command/exception/CommandUnhandledException.java +++ b/src/api/java/baritone/api/command/exception/CommandUnhandledException.java @@ -38,7 +38,7 @@ public class CommandUnhandledException extends RuntimeException implements IComm @Override public void handle(ICommand command, List args) { HELPER.logDirect("An unhandled exception occurred. " + - "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues", + "The error is in your game's log, please report this at https://github.com/cabaletta/baritone/issues", TextFormatting.RED); this.printStackTrace(); diff --git a/src/api/java/baritone/api/command/exception/ICommandException.java b/src/api/java/baritone/api/command/exception/ICommandException.java index 58d130496..b521a2e6b 100644 --- a/src/api/java/baritone/api/command/exception/ICommandException.java +++ b/src/api/java/baritone/api/command/exception/ICommandException.java @@ -38,8 +38,8 @@ import static baritone.api.utils.Helper.HELPER; public interface ICommandException { /** - * @see Exception#getMessage() * @return The exception details + * @see Exception#getMessage() */ String getMessage(); diff --git a/src/api/java/baritone/api/command/helpers/Paginator.java b/src/api/java/baritone/api/command/helpers/Paginator.java index 29ddca2f9..5aa65d7d4 100644 --- a/src/api/java/baritone/api/command/helpers/Paginator.java +++ b/src/api/java/baritone/api/command/helpers/Paginator.java @@ -17,10 +17,10 @@ package baritone.api.command.helpers; -import baritone.api.utils.Helper; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidTypeException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.utils.Helper; 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/TabCompleteHelper.java b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java index 6274c6836..54ae9e8c4 100644 --- a/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java +++ b/src/api/java/baritone/api/command/helpers/TabCompleteHelper.java @@ -19,10 +19,10 @@ package baritone.api.command.helpers; import baritone.api.BaritoneAPI; import baritone.api.Settings; -import baritone.api.event.events.TabCompleteEvent; -import baritone.api.utils.SettingsUtil; import baritone.api.command.argument.IArgConsumer; import baritone.api.command.manager.ICommandManager; +import baritone.api.event.events.TabCompleteEvent; +import baritone.api.utils.SettingsUtil; import net.minecraft.util.ResourceLocation; import java.util.Comparator; @@ -236,7 +236,6 @@ public class TabCompleteHelper { * Appends every command in the specified {@link ICommandManager} to this {@link TabCompleteHelper} * * @param manager A command manager - * * @return This {@link TabCompleteHelper} */ public TabCompleteHelper addCommands(ICommandManager manager) { diff --git a/src/api/java/baritone/api/event/events/TabCompleteEvent.java b/src/api/java/baritone/api/event/events/TabCompleteEvent.java index cf4c57a21..589fcedde 100644 --- a/src/api/java/baritone/api/event/events/TabCompleteEvent.java +++ b/src/api/java/baritone/api/event/events/TabCompleteEvent.java @@ -18,7 +18,6 @@ package baritone.api.event.events; import baritone.api.event.events.type.Cancellable; -import baritone.api.event.events.type.Overrideable; /** * @author LoganDark diff --git a/src/api/java/baritone/api/schematic/IStaticSchematic.java b/src/api/java/baritone/api/schematic/IStaticSchematic.java index 268b1b1f4..43fad7036 100644 --- a/src/api/java/baritone/api/schematic/IStaticSchematic.java +++ b/src/api/java/baritone/api/schematic/IStaticSchematic.java @@ -22,10 +22,9 @@ import net.minecraft.block.state.IBlockState; /** * A static schematic is capable of providing the desired state at a given position without * additional context. Schematics of this type are expected to have non-varying contents. - * - * @see #getDirect(int, int, int) * * @author Brady + * @see #getDirect(int, int, int) * @since 12/24/2019 */ public interface IStaticSchematic extends ISchematic { diff --git a/src/api/java/baritone/api/utils/BlockOptionalMeta.java b/src/api/java/baritone/api/utils/BlockOptionalMeta.java index 020df8146..a9a34a4aa 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMeta.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMeta.java @@ -234,11 +234,10 @@ public final class BlockOptionalMeta { /** * Evaluate the target meta value for the specified state. The target meta value is * most often that which is influenced by the variant/color property of the block state. - * - * @see #normalize(IBlockState) - * + * * @param state The state to check * @return The target meta of the state + * @see #normalize(IBlockState) */ public static int stateMeta(IBlockState state) { return state.getBlock().getMetaFromState(normalize(state)); diff --git a/src/api/java/baritone/api/utils/Helper.java b/src/api/java/baritone/api/utils/Helper.java index 324efbefe..f423c4f4c 100755 --- a/src/api/java/baritone/api/utils/Helper.java +++ b/src/api/java/baritone/api/utils/Helper.java @@ -67,7 +67,7 @@ public interface Helper { /** * Send a message to display as a toast popup * - * @param title The title to display in the popup + * @param title The title to display in the popup * @param message The message to display in the popup */ default void logToast(ITextComponent title, ITextComponent message) { @@ -77,7 +77,7 @@ public interface Helper { /** * Send a message to display as a toast popup * - * @param title The title to display in the popup + * @param title The title to display in the popup * @param message The message to display in the popup */ default void logToast(String title, String message) { @@ -144,8 +144,8 @@ public interface Helper { * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a * direct response to a chat command) * - * @param message The message to display in chat - * @param color The color to print that message in + * @param message The message to display in chat + * @param color The color to print that message in * @param logAsToast Whether to log as a toast notification */ default void logDirect(String message, TextFormatting color, boolean logAsToast) { @@ -171,7 +171,7 @@ public interface Helper { * Send a message to chat regardless of chatDebug (should only be used for critically important messages, or as a * direct response to a chat command) * - * @param message The message to display in chat + * @param message The message to display in chat * @param logAsToast Whether to log as a toast notification */ default void logDirect(String message, boolean logAsToast) { diff --git a/src/api/java/baritone/api/utils/IPlayerContext.java b/src/api/java/baritone/api/utils/IPlayerContext.java index f746110e5..fcc4c81cc 100644 --- a/src/api/java/baritone/api/utils/IPlayerContext.java +++ b/src/api/java/baritone/api/utils/IPlayerContext.java @@ -20,7 +20,6 @@ package baritone.api.utils; import baritone.api.cache.IWorldData; import net.minecraft.block.BlockSlab; import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java index 0ec5583f3..98c47b6d6 100755 --- a/src/main/java/baritone/Baritone.java +++ b/src/main/java/baritone/Baritone.java @@ -25,11 +25,11 @@ import baritone.api.utils.Helper; import baritone.api.utils.IPlayerContext; import baritone.behavior.*; import baritone.cache.WorldProvider; +import baritone.command.manager.CommandManager; import baritone.event.GameEventHandler; import baritone.process.*; import baritone.selection.SelectionManager; import baritone.utils.*; -import baritone.command.manager.CommandManager; import baritone.utils.player.PrimaryPlayerContext; import net.minecraft.client.Minecraft; diff --git a/src/main/java/baritone/BaritoneProvider.java b/src/main/java/baritone/BaritoneProvider.java index 6f64a8350..d5457cf85 100644 --- a/src/main/java/baritone/BaritoneProvider.java +++ b/src/main/java/baritone/BaritoneProvider.java @@ -22,9 +22,9 @@ import baritone.api.IBaritoneProvider; import baritone.api.cache.IWorldScanner; import baritone.api.command.ICommandSystem; import baritone.api.schematic.ISchematicSystem; -import baritone.command.ExampleBaritoneControl; import baritone.cache.WorldScanner; import baritone.command.CommandSystem; +import baritone.command.ExampleBaritoneControl; import baritone.utils.schematic.SchematicSystem; import java.util.Collections; diff --git a/src/main/java/baritone/KeepName.java b/src/main/java/baritone/KeepName.java index 20f08e7b8..7fc04cd68 100644 --- a/src/main/java/baritone/KeepName.java +++ b/src/main/java/baritone/KeepName.java @@ -18,4 +18,4 @@ package baritone; // Annotation for classes and class members that should not be renamed by proguard -public @interface KeepName { } +public @interface KeepName {} diff --git a/src/main/java/baritone/command/CommandSystem.java b/src/main/java/baritone/command/CommandSystem.java index 49d3685c1..943e0951d 100644 --- a/src/main/java/baritone/command/CommandSystem.java +++ b/src/main/java/baritone/command/CommandSystem.java @@ -18,8 +18,8 @@ package baritone.command; import baritone.api.command.ICommandSystem; -import baritone.command.argparser.ArgParserManager; import baritone.api.command.argparser.IArgParserManager; +import baritone.command.argparser.ArgParserManager; /** * @author Brady diff --git a/src/main/java/baritone/command/ExampleBaritoneControl.java b/src/main/java/baritone/command/ExampleBaritoneControl.java index 53b34df0a..8d737941a 100644 --- a/src/main/java/baritone/command/ExampleBaritoneControl.java +++ b/src/main/java/baritone/command/ExampleBaritoneControl.java @@ -20,20 +20,20 @@ package baritone.command; import baritone.api.BaritoneAPI; import baritone.api.IBaritone; import baritone.api.Settings; -import baritone.utils.accessor.IGuiScreen; +import baritone.api.command.argument.ICommandArgument; +import baritone.api.command.exception.CommandNotEnoughArgumentsException; +import baritone.api.command.exception.CommandNotFoundException; +import baritone.api.command.helpers.TabCompleteHelper; +import baritone.api.command.manager.ICommandManager; import baritone.api.event.events.ChatEvent; 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.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.TabCompleteHelper; -import baritone.api.command.manager.ICommandManager; import baritone.command.argument.CommandArguments; import baritone.command.manager.CommandManager; +import baritone.utils.accessor.IGuiScreen; import net.minecraft.util.Tuple; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; diff --git a/src/main/java/baritone/command/argument/ArgConsumer.java b/src/main/java/baritone/command/argument/ArgConsumer.java index f4e7dd524..4a80681dd 100644 --- a/src/main/java/baritone/command/argument/ArgConsumer.java +++ b/src/main/java/baritone/command/argument/ArgConsumer.java @@ -18,6 +18,7 @@ package baritone.command.argument; import baritone.api.IBaritone; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.argument.ICommandArgument; import baritone.api.command.datatypes.IDatatype; import baritone.api.command.datatypes.IDatatypeContext; @@ -27,7 +28,6 @@ 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.argument.IArgConsumer; import baritone.api.command.manager.ICommandManager; import java.util.ArrayList; diff --git a/src/main/java/baritone/command/argument/CommandArgument.java b/src/main/java/baritone/command/argument/CommandArgument.java index 3ce6cda82..a40ae1d53 100644 --- a/src/main/java/baritone/command/argument/CommandArgument.java +++ b/src/main/java/baritone/command/argument/CommandArgument.java @@ -17,9 +17,9 @@ package baritone.command.argument; -import baritone.command.argparser.ArgParserManager; import baritone.api.command.argument.ICommandArgument; import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.command.argparser.ArgParserManager; import java.util.stream.Stream; diff --git a/src/main/java/baritone/command/argument/CommandArguments.java b/src/main/java/baritone/command/argument/CommandArguments.java index 8d26acb48..22a2ef887 100644 --- a/src/main/java/baritone/command/argument/CommandArguments.java +++ b/src/main/java/baritone/command/argument/CommandArguments.java @@ -48,9 +48,9 @@ public final class CommandArguments { int lastEnd = -1; while (argMatcher.find()) { args.add(new CommandArgument( - args.size(), - argMatcher.group(), - string.substring(argMatcher.start()) + args.size(), + argMatcher.group(), + string.substring(argMatcher.start()) )); lastEnd = argMatcher.end(); } diff --git a/src/main/java/baritone/command/defaults/AxisCommand.java b/src/main/java/baritone/command/defaults/AxisCommand.java index 0a92ac6e7..2ff98ed34 100644 --- a/src/main/java/baritone/command/defaults/AxisCommand.java +++ b/src/main/java/baritone/command/defaults/AxisCommand.java @@ -18,11 +18,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; +import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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.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 a383e0a79..fe49477f4 100644 --- a/src/main/java/baritone/command/defaults/BlacklistCommand.java +++ b/src/main/java/baritone/command/defaults/BlacklistCommand.java @@ -18,11 +18,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.process.IGetToBlockProcess; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.process.IGetToBlockProcess; 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 fd084ad17..b4dcda749 100644 --- a/src/main/java/baritone/command/defaults/ChestsCommand.java +++ b/src/main/java/baritone/command/defaults/ChestsCommand.java @@ -19,11 +19,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.cache.IRememberedInventory; -import baritone.api.utils.BetterBlockPos; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.utils.BetterBlockPos; 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 b882c5879..8875a3723 100644 --- a/src/main/java/baritone/command/defaults/ClickCommand.java +++ b/src/main/java/baritone/command/defaults/ClickCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 b8033c3fb..5d3e3b829 100644 --- a/src/main/java/baritone/command/defaults/ComeCommand.java +++ b/src/main/java/baritone/command/defaults/ComeCommand.java @@ -18,11 +18,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.pathing.goals.GoalBlock; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.pathing.goals.GoalBlock; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/command/defaults/ExploreCommand.java b/src/main/java/baritone/command/defaults/ExploreCommand.java index 9d27bbbe9..0b147c354 100644 --- a/src/main/java/baritone/command/defaults/ExploreCommand.java +++ b/src/main/java/baritone/command/defaults/ExploreCommand.java @@ -18,11 +18,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.pathing.goals.GoalXZ; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.RelativeGoalXZ; import baritone.api.command.exception.CommandException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.pathing.goals.GoalXZ; 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 b4ee393a9..c2057551f 100644 --- a/src/main/java/baritone/command/defaults/ExploreFilterCommand.java +++ b/src/main/java/baritone/command/defaults/ExploreFilterCommand.java @@ -19,11 +19,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; 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.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 1903f89f3..f8bbc0c0c 100644 --- a/src/main/java/baritone/command/defaults/FarmCommand.java +++ b/src/main/java/baritone/command/defaults/FarmCommand.java @@ -20,21 +20,16 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.cache.IWaypoint; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.ForWaypoints; import baritone.api.command.exception.CommandException; -import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandInvalidStateException; -import baritone.api.command.helpers.Paginator; -import baritone.api.pathing.goals.Goal; -import baritone.api.pathing.goals.GoalBlock; import baritone.api.utils.BetterBlockPos; import java.util.Arrays; import java.util.List; import java.util.stream.Stream; -import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; - public class FarmCommand extends Command { public FarmCommand(IBaritone baritone) { @@ -51,7 +46,7 @@ public class FarmCommand extends Command { range = args.getAs(Integer.class); } //waypoint - if (args.has(1)){ + if (args.has(1)) { IWaypoint[] waypoints = args.getDatatypeFor(ForWaypoints.INSTANCE); IWaypoint waypoint = null; switch (waypoints.length) { diff --git a/src/main/java/baritone/command/defaults/FindCommand.java b/src/main/java/baritone/command/defaults/FindCommand.java index 3011d7f9e..22e6815be 100644 --- a/src/main/java/baritone/command/defaults/FindCommand.java +++ b/src/main/java/baritone/command/defaults/FindCommand.java @@ -18,11 +18,11 @@ package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.BetterBlockPos; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.BlockById; import baritone.api.command.exception.CommandException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.utils.BetterBlockPos; 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 c63470204..a3df5387f 100644 --- a/src/main/java/baritone/command/defaults/FollowCommand.java +++ b/src/main/java/baritone/command/defaults/FollowCommand.java @@ -20,11 +20,11 @@ package baritone.command.defaults; import baritone.KeepName; import baritone.api.IBaritone; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; 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.argument.IArgConsumer; import baritone.api.command.helpers.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 8344f4f9f..513d61bcb 100644 --- a/src/main/java/baritone/command/defaults/ForceCancelCommand.java +++ b/src/main/java/baritone/command/defaults/ForceCancelCommand.java @@ -20,8 +20,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.behavior.IPathingBehavior; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 143da5792..7e4d4fa96 100644 --- a/src/main/java/baritone/command/defaults/GcCommand.java +++ b/src/main/java/baritone/command/defaults/GcCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 a75af077b..40822e057 100644 --- a/src/main/java/baritone/command/defaults/GoalCommand.java +++ b/src/main/java/baritone/command/defaults/GoalCommand.java @@ -18,15 +18,15 @@ 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.command.Command; +import baritone.api.command.argument.IArgConsumer; 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.TabCompleteHelper; +import baritone.api.pathing.goals.Goal; +import baritone.api.process.ICustomGoalProcess; +import baritone.api.utils.BetterBlockPos; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/baritone/command/defaults/GotoCommand.java b/src/main/java/baritone/command/defaults/GotoCommand.java index a6fe4e22b..896e3f5f8 100644 --- a/src/main/java/baritone/command/defaults/GotoCommand.java +++ b/src/main/java/baritone/command/defaults/GotoCommand.java @@ -19,12 +19,12 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.BlockById; 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.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 4cb5f420c..e681d21b9 100644 --- a/src/main/java/baritone/command/defaults/HelpCommand.java +++ b/src/main/java/baritone/command/defaults/HelpCommand.java @@ -20,9 +20,9 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; import baritone.api.command.ICommand; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandNotFoundException; -import baritone.api.command.argument.IArgConsumer; import baritone.api.command.helpers.Paginator; import baritone.api.command.helpers.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 9e3e859eb..e8bdf50d8 100644 --- a/src/main/java/baritone/command/defaults/InvertCommand.java +++ b/src/main/java/baritone/command/defaults/InvertCommand.java @@ -18,13 +18,13 @@ package baritone.command.defaults; import baritone.api.IBaritone; +import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalInverted; 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.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 2baf982af..63712fe3e 100644 --- a/src/main/java/baritone/command/defaults/MineCommand.java +++ b/src/main/java/baritone/command/defaults/MineCommand.java @@ -18,12 +18,12 @@ package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.BlockOptionalMeta; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.BlockById; import baritone.api.command.datatypes.ForBlockOptionalMeta; import baritone.api.command.exception.CommandException; -import baritone.api.command.argument.IArgConsumer; +import baritone.api.utils.BlockOptionalMeta; 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 0add64080..182a1e5bc 100644 --- a/src/main/java/baritone/command/defaults/PathCommand.java +++ b/src/main/java/baritone/command/defaults/PathCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; import baritone.api.process.ICustomGoalProcess; import baritone.cache.WorldScanner; diff --git a/src/main/java/baritone/command/defaults/ProcCommand.java b/src/main/java/baritone/command/defaults/ProcCommand.java index cf9371bc8..1652a9917 100644 --- a/src/main/java/baritone/command/defaults/ProcCommand.java +++ b/src/main/java/baritone/command/defaults/ProcCommand.java @@ -18,13 +18,13 @@ package baritone.command.defaults; import baritone.api.IBaritone; +import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; +import baritone.api.command.exception.CommandInvalidStateException; import baritone.api.pathing.calc.IPathingControlManager; import baritone.api.process.IBaritoneProcess; 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.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 fa8d51175..39396a9c0 100644 --- a/src/main/java/baritone/command/defaults/ReloadAllCommand.java +++ b/src/main/java/baritone/command/defaults/ReloadAllCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 90471432a..cc9803d16 100644 --- a/src/main/java/baritone/command/defaults/RenderCommand.java +++ b/src/main/java/baritone/command/defaults/RenderCommand.java @@ -18,10 +18,10 @@ package baritone.command.defaults; import baritone.api.IBaritone; -import baritone.api.utils.BetterBlockPos; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; +import baritone.api.utils.BetterBlockPos; 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 6366fbc92..cafbea524 100644 --- a/src/main/java/baritone/command/defaults/RepackCommand.java +++ b/src/main/java/baritone/command/defaults/RepackCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 5f064a72f..de416c60d 100644 --- a/src/main/java/baritone/command/defaults/SaveAllCommand.java +++ b/src/main/java/baritone/command/defaults/SaveAllCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 8279b1dc5..ae5cac47f 100644 --- a/src/main/java/baritone/command/defaults/SchematicaCommand.java +++ b/src/main/java/baritone/command/defaults/SchematicaCommand.java @@ -19,8 +19,8 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; -import baritone.api.command.exception.CommandException; import baritone.api.command.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; 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 6f242f0b0..0eab8a9a9 100644 --- a/src/main/java/baritone/command/defaults/SelCommand.java +++ b/src/main/java/baritone/command/defaults/SelCommand.java @@ -19,6 +19,15 @@ package baritone.command.defaults; import baritone.Baritone; import baritone.api.IBaritone; +import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; +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.TabCompleteHelper; import baritone.api.event.events.RenderEvent; import baritone.api.event.listener.AbstractGameEventListener; import baritone.api.schematic.*; @@ -27,16 +36,6 @@ import baritone.api.selection.ISelectionManager; import baritone.api.utils.BetterBlockPos; import baritone.api.utils.BlockOptionalMeta; import baritone.api.utils.BlockOptionalMetaLookup; -import baritone.api.schematic.ISchematic; -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.argument.IArgConsumer; -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 d5b4f5bfc..19f1243b2 100644 --- a/src/main/java/baritone/command/defaults/SetCommand.java +++ b/src/main/java/baritone/command/defaults/SetCommand.java @@ -20,13 +20,13 @@ package baritone.command.defaults; import baritone.Baritone; import baritone.api.IBaritone; import baritone.api.Settings; -import baritone.api.utils.SettingsUtil; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidTypeException; -import baritone.api.command.argument.IArgConsumer; import baritone.api.command.helpers.Paginator; import baritone.api.command.helpers.TabCompleteHelper; +import baritone.api.utils.SettingsUtil; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; @@ -39,9 +39,9 @@ import java.util.Locale; import java.util.stream.Collectors; import java.util.stream.Stream; +import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; import static baritone.api.utils.SettingsUtil.settingTypeToString; import static baritone.api.utils.SettingsUtil.settingValueToString; -import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX; public class SetCommand extends Command { diff --git a/src/main/java/baritone/command/defaults/ThisWayCommand.java b/src/main/java/baritone/command/defaults/ThisWayCommand.java index 6073d82be..0c10bba30 100644 --- a/src/main/java/baritone/command/defaults/ThisWayCommand.java +++ b/src/main/java/baritone/command/defaults/ThisWayCommand.java @@ -18,10 +18,10 @@ package baritone.command.defaults; 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.argument.IArgConsumer; +import baritone.api.command.exception.CommandException; +import baritone.api.pathing.goals.GoalXZ; 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 6f7304a6a..711ba160e 100644 --- a/src/main/java/baritone/command/defaults/TunnelCommand.java +++ b/src/main/java/baritone/command/defaults/TunnelCommand.java @@ -77,7 +77,7 @@ public class TunnelCommand extends Command { default: throw new IllegalStateException("Unexpected value: " + enumFacing); } - logDirect(String.format("Creating a tunnel %s block(s) high, %s block(s) wide, and %s block(s) deep", height+1, width+1, depth)); + logDirect(String.format("Creating a tunnel %s block(s) high, %s block(s) wide, and %s block(s) deep", height + 1, width + 1, depth)); baritone.getBuilderProcess().clearArea(corner1, corner2); } } else { diff --git a/src/main/java/baritone/command/defaults/VersionCommand.java b/src/main/java/baritone/command/defaults/VersionCommand.java index b7882d7d7..c8e13558b 100644 --- a/src/main/java/baritone/command/defaults/VersionCommand.java +++ b/src/main/java/baritone/command/defaults/VersionCommand.java @@ -19,9 +19,9 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.command.Command; +import baritone.api.command.argument.IArgConsumer; import baritone.api.command.exception.CommandException; import baritone.api.command.exception.CommandInvalidStateException; -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 67aad3654..5d964da42 100644 --- a/src/main/java/baritone/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -20,18 +20,18 @@ package baritone.command.defaults; import baritone.api.IBaritone; import baritone.api.cache.IWaypoint; 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.command.Command; +import baritone.api.command.argument.IArgConsumer; 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.argument.IArgConsumer; import baritone.api.command.helpers.Paginator; import baritone.api.command.helpers.TabCompleteHelper; +import baritone.api.pathing.goals.Goal; +import baritone.api.pathing.goals.GoalBlock; +import baritone.api.utils.BetterBlockPos; 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 aba434e30..e7d24eb33 100644 --- a/src/main/java/baritone/command/manager/CommandManager.java +++ b/src/main/java/baritone/command/manager/CommandManager.java @@ -23,10 +23,10 @@ import baritone.api.command.ICommand; 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.TabCompleteHelper; import baritone.api.command.manager.ICommandManager; import baritone.api.command.registry.Registry; +import baritone.command.argument.ArgConsumer; import baritone.command.argument.CommandArguments; import baritone.command.defaults.DefaultCommands; import net.minecraft.util.Tuple; diff --git a/src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java b/src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java index eea23905e..c54216568 100644 --- a/src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java +++ b/src/main/java/baritone/pathing/calc/AbstractNodeCostSearch.java @@ -25,8 +25,8 @@ import baritone.api.utils.BetterBlockPos; import baritone.api.utils.Helper; import baritone.api.utils.PathCalculationResult; import baritone.pathing.movement.CalculationContext; -import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import baritone.utils.NotificationHelper; +import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import java.util.Optional; diff --git a/src/main/java/baritone/pathing/movement/MovementHelper.java b/src/main/java/baritone/pathing/movement/MovementHelper.java index 8caa382bc..6438ae2f4 100644 --- a/src/main/java/baritone/pathing/movement/MovementHelper.java +++ b/src/main/java/baritone/pathing/movement/MovementHelper.java @@ -562,6 +562,7 @@ public interface MovementHelper extends ActionCosts, Helper { enum PlaceResult { READY_TO_PLACE, ATTEMPTING, NO_OPTION; } + static boolean isTransparent(Block b) { return b == Blocks.AIR || diff --git a/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java index b5ea19a9c..933c86092 100644 --- a/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java +++ b/src/main/java/baritone/pathing/movement/movements/MovementDiagonal.java @@ -67,24 +67,24 @@ public class MovementDiagonal extends Movement { double y = player.posY - 1; double z = player.posZ; //standard - if (ctx.playerFeet().equals(src)){ + if (ctx.playerFeet().equals(src)) { return true; } //both corners are walkable if (MovementHelper.canWalkOn(ctx, new BlockPos(src.x, src.y - 1, dest.z)) - && MovementHelper.canWalkOn(ctx, new BlockPos(dest.x, src.y - 1, src.z))){ - return true; + && MovementHelper.canWalkOn(ctx, new BlockPos(dest.x, src.y - 1, src.z))) { + return true; } //we are in a likely unwalkable corner, check for a supporting block if (ctx.playerFeet().equals(new BetterBlockPos(src.x, src.y, dest.z)) - || ctx.playerFeet().equals(new BetterBlockPos(dest.x, src.y, src.z))){ - return (MovementHelper.canWalkOn(ctx, new BetterBlockPos(x + offset, y, z + offset)) - || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x + offset, y, z - offset)) - || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x - offset, y, z + offset)) - || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x - offset, y, z - offset))); + || ctx.playerFeet().equals(new BetterBlockPos(dest.x, src.y, src.z))) { + return (MovementHelper.canWalkOn(ctx, new BetterBlockPos(x + offset, y, z + offset)) + || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x + offset, y, z - offset)) + || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x - offset, y, z + offset)) + || MovementHelper.canWalkOn(ctx, new BetterBlockPos(x - offset, y, z - offset))); } return true; - } + } @Override public double calculateCost(CalculationContext context) { diff --git a/src/main/java/baritone/process/BuilderProcess.java b/src/main/java/baritone/process/BuilderProcess.java index deccf5041..012b290e2 100644 --- a/src/main/java/baritone/process/BuilderProcess.java +++ b/src/main/java/baritone/process/BuilderProcess.java @@ -637,14 +637,14 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil if (logMissing && !missing.isEmpty()) { logDirect("Missing materials for at least:"); logDirect(missing.entrySet().stream() - .map(e -> String.format("%sx %s", e.getValue(), e.getKey())) - .collect(Collectors.joining("\n"))); + .map(e -> String.format("%sx %s", e.getValue(), e.getKey())) + .collect(Collectors.joining("\n"))); } if (logMissing && !flowingLiquids.isEmpty()) { logDirect("Unreplaceable liquids at at least:"); logDirect(flowingLiquids.stream() - .map(p -> String.format("%s %s %s", p.x, p.y, p.z)) - .collect(Collectors.joining("\n"))); + .map(p -> String.format("%s %s %s", p.x, p.y, p.z)) + .collect(Collectors.joining("\n"))); } return null; } diff --git a/src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java b/src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java index 942bd72a3..fb20164bd 100644 --- a/src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java +++ b/src/main/java/baritone/utils/schematic/format/DefaultSchematicFormats.java @@ -41,7 +41,6 @@ public enum DefaultSchematicFormats implements ISchematicFormat { * The MCEdit schematic specification. Commonly denoted by the ".schematic" file extension. */ MCEDIT("schematic") { - @Override public IStaticSchematic parse(InputStream input) throws IOException { return new MCEditSchematic(CompressedStreamTools.readCompressed(input)); @@ -54,7 +53,6 @@ public enum DefaultSchematicFormats implements ISchematicFormat { * @see Sponge Schematic Specification */ SPONGE("schem") { - @Override public IStaticSchematic parse(InputStream input) throws IOException { NBTTagCompound nbt = CompressedStreamTools.readCompressed(input);