From 396a96d604159381f46b1872cf3efb604fdda04f Mon Sep 17 00:00:00 2001 From: Leijurv Date: Thu, 19 Sep 2019 12:53:15 -0700 Subject: [PATCH] reformat --- .../java/baritone/api/cache/IWaypoint.java | 6 +- src/api/java/baritone/api/cache/Waypoint.java | 9 +- .../api/event/events/type/Overrideable.java | 6 +- .../listener/AbstractGameEventListener.java | 4 +- .../baritone/api/pathing/goals/GoalBlock.java | 8 +- .../api/pathing/goals/GoalGetToBlock.java | 8 +- .../api/pathing/goals/GoalInverted.java | 2 +- .../baritone/api/pathing/goals/GoalNear.java | 10 +- .../api/pathing/goals/GoalRunAway.java | 6 +- .../pathing/goals/GoalStrictDirection.java | 12 +- .../api/pathing/goals/GoalTwoBlocks.java | 8 +- .../baritone/api/pathing/goals/GoalXZ.java | 6 +- .../api/pathing/goals/GoalYLevel.java | 4 +- .../baritone/api/process/IMineProcess.java | 6 +- .../api/schematic/CompositeSchematic.java | 2 +- .../baritone/api/selection/ISelection.java | 2 +- .../api/selection/ISelectionManager.java | 2 +- .../baritone/api/utils/BetterBlockPos.java | 8 +- .../api/utils/BlockOptionalMetaLookup.java | 16 +- .../java/baritone/api/utils/SettingsUtil.java | 4 +- .../helpers/arguments/ArgConsumer.java | 36 ++-- .../tabcomplete/TabCompleteHelper.java | 14 +- .../launch/mixins/MixinChatTabCompleter.java | 10 +- .../baritone/launch/mixins/MixinGuiChat.java | 6 +- .../launch/mixins/MixinItemStack.java | 8 +- .../mixins/MixinStateImplementation.java | 10 +- .../launch/mixins/MixinTabCompleter.java | 7 +- src/main/java/baritone/Baritone.java | 3 - .../baritone/behavior/InventoryBehavior.java | 1 - .../baritone/behavior/PathingBehavior.java | 10 +- src/main/java/baritone/cache/ChunkPacker.java | 3 +- .../baritone/cache/WaypointCollection.java | 1 - .../java/baritone/cache/WorldScanner.java | 10 +- .../java/baritone/process/FollowProcess.java | 11 +- .../baritone/process/GetToBlockProcess.java | 5 +- .../java/baritone/selection/Selection.java | 20 +- src/main/java/baritone/utils/IRenderer.java | 2 +- .../java/baritone/utils/PathRenderer.java | 2 +- src/main/java/baritone/utils/ToolSet.java | 2 +- .../utils/command/defaults/AxisCommand.java | 8 +- .../command/defaults/BlacklistCommand.java | 8 +- .../utils/command/defaults/BuildCommand.java | 10 +- .../utils/command/defaults/CancelCommand.java | 8 +- .../utils/command/defaults/ChestsCommand.java | 10 +- .../command/defaults/ClearareaCommand.java | 10 +- .../utils/command/defaults/ClickCommand.java | 8 +- .../utils/command/defaults/ComeCommand.java | 12 +- .../command/defaults/DefaultCommands.java | 78 ++++---- .../utils/command/defaults/EmptyCommand.java | 8 +- .../command/defaults/ExploreCommand.java | 14 +- .../defaults/ExploreFilterCommand.java | 16 +- .../utils/command/defaults/FarmCommand.java | 8 +- .../utils/command/defaults/FindCommand.java | 32 +-- .../utils/command/defaults/FollowCommand.java | 40 ++-- .../command/defaults/ForceCancelCommand.java | 8 +- .../utils/command/defaults/GcCommand.java | 8 +- .../utils/command/defaults/GoalCommand.java | 20 +- .../utils/command/defaults/HelpCommand.java | 70 +++---- .../utils/command/defaults/InvertCommand.java | 8 +- .../utils/command/defaults/MineCommand.java | 20 +- .../utils/command/defaults/PathCommand.java | 20 +- .../command/defaults/PauseResumeCommands.java | 76 ++++---- .../utils/command/defaults/ProcCommand.java | 38 ++-- .../command/defaults/ReloadAllCommand.java | 8 +- .../utils/command/defaults/RenderCommand.java | 20 +- .../utils/command/defaults/RepackCommand.java | 8 +- .../command/defaults/SaveAllCommand.java | 8 +- .../command/defaults/SchematicaCommand.java | 8 +- .../utils/command/defaults/SelCommand.java | 84 ++++---- .../utils/command/defaults/SetCommand.java | 154 +++++++-------- .../command/defaults/ThisWayCommand.java | 14 +- .../utils/command/defaults/TunnelCommand.java | 12 +- .../command/defaults/VersionCommand.java | 8 +- .../command/defaults/WaypointsCommand.java | 184 +++++++++--------- .../schematica/SchematicAdapter.java | 1 - .../schematica/SchematicaHelper.java | 2 +- .../client/world/SchematicWorld.java | 2 +- 77 files changed, 658 insertions(+), 683 deletions(-) diff --git a/src/api/java/baritone/api/cache/IWaypoint.java b/src/api/java/baritone/api/cache/IWaypoint.java index 238b4d88..4c086ba2 100644 --- a/src/api/java/baritone/api/cache/IWaypoint.java +++ b/src/api/java/baritone/api/cache/IWaypoint.java @@ -19,11 +19,7 @@ package baritone.api.cache; import baritone.api.utils.BetterBlockPos; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import java.util.*; import static java.util.Arrays.asList; diff --git a/src/api/java/baritone/api/cache/Waypoint.java b/src/api/java/baritone/api/cache/Waypoint.java index f126de38..9c4fbfbf 100644 --- a/src/api/java/baritone/api/cache/Waypoint.java +++ b/src/api/java/baritone/api/cache/Waypoint.java @@ -18,7 +18,6 @@ package baritone.api.cache; import baritone.api.utils.BetterBlockPos; -import net.minecraft.util.math.BlockPos; import java.util.Date; @@ -82,10 +81,10 @@ public class Waypoint implements IWaypoint { @Override public String toString() { return String.format( - "%s %s %s", - name, - BetterBlockPos.from(location).toString(), - new Date(creationTimestamp).toString() + "%s %s %s", + name, + BetterBlockPos.from(location).toString(), + new Date(creationTimestamp).toString() ); } diff --git a/src/api/java/baritone/api/event/events/type/Overrideable.java b/src/api/java/baritone/api/event/events/type/Overrideable.java index 7690ee8f..1ce7934e 100644 --- a/src/api/java/baritone/api/event/events/type/Overrideable.java +++ b/src/api/java/baritone/api/event/events/type/Overrideable.java @@ -44,9 +44,9 @@ public class Overrideable { @Override public String toString() { return String.format( - "Overrideable{modified=%b,value=%s}", - modified, - value.toString() + "Overrideable{modified=%b,value=%s}", + modified, + value.toString() ); } } diff --git a/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java b/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java index 9e5b6dbb..e7d4dc29 100644 --- a/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java +++ b/src/api/java/baritone/api/event/listener/AbstractGameEventListener.java @@ -40,10 +40,10 @@ public interface AbstractGameEventListener extends IGameEventListener { default void onSendChatMessage(ChatEvent event) {} @Override - default void onPreTabComplete(TabCompleteEvent.Pre event) {}; + default void onPreTabComplete(TabCompleteEvent.Pre event) {} @Override - default void onPostTabComplete(TabCompleteEvent.Post event) {}; + default void onPostTabComplete(TabCompleteEvent.Post event) {} @Override default void onChunkEvent(ChunkEvent event) {} diff --git a/src/api/java/baritone/api/pathing/goals/GoalBlock.java b/src/api/java/baritone/api/pathing/goals/GoalBlock.java index 836b47df..c85e5cad 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalBlock.java +++ b/src/api/java/baritone/api/pathing/goals/GoalBlock.java @@ -69,10 +69,10 @@ public class GoalBlock implements Goal, IGoalRenderPos { @Override public String toString() { return String.format( - "GoalBlock{x=%s,y=%s,z=%s}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(y), - SettingsUtil.maybeCensor(z) + "GoalBlock{x=%s,y=%s,z=%s}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } diff --git a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java index 7fe64a4f..8d6fdcb3 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java +++ b/src/api/java/baritone/api/pathing/goals/GoalGetToBlock.java @@ -63,10 +63,10 @@ public class GoalGetToBlock implements Goal, IGoalRenderPos { @Override public String toString() { return String.format( - "GoalGetToBlock{x=%s,y=%s,z=%s}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(y), - SettingsUtil.maybeCensor(z) + "GoalGetToBlock{x=%s,y=%s,z=%s}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalInverted.java b/src/api/java/baritone/api/pathing/goals/GoalInverted.java index 7f072c4d..9f793a41 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalInverted.java +++ b/src/api/java/baritone/api/pathing/goals/GoalInverted.java @@ -19,7 +19,7 @@ package baritone.api.pathing.goals; /** * Invert any goal. - * + *

* In the old chat control system, #invert just tried to pick a {@link GoalRunAway} that effectively inverted the * current goal. This goal just reverses the heuristic to act as a TRUE invert. Inverting a Y level? Baritone tries to * get away from that Y level. Inverting a GoalBlock? Baritone will try to make distance whether it's in the X, Y or Z diff --git a/src/api/java/baritone/api/pathing/goals/GoalNear.java b/src/api/java/baritone/api/pathing/goals/GoalNear.java index 1482b904..78f3b5f6 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalNear.java +++ b/src/api/java/baritone/api/pathing/goals/GoalNear.java @@ -58,11 +58,11 @@ public class GoalNear implements Goal, IGoalRenderPos { @Override public String toString() { return String.format( - "GoalNear{x=%s, y=%s, z=%s, rangeSq=%d}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(y), - SettingsUtil.maybeCensor(z), - rangeSq + "GoalNear{x=%s, y=%s, z=%s, rangeSq=%d}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z), + rangeSq ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java index fa9c29fc..a1a15378 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalRunAway.java +++ b/src/api/java/baritone/api/pathing/goals/GoalRunAway.java @@ -84,9 +84,9 @@ public class GoalRunAway implements Goal { public String toString() { if (maintainY != null) { return String.format( - "GoalRunAwayFromMaintainY y=%s, %s", - SettingsUtil.maybeCensor(maintainY), - Arrays.asList(from) + "GoalRunAwayFromMaintainY y=%s, %s", + SettingsUtil.maybeCensor(maintainY), + Arrays.asList(from) ); } else { return "GoalRunAwayFrom" + Arrays.asList(from); diff --git a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java index 3f14bf24..1f2efd05 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java +++ b/src/api/java/baritone/api/pathing/goals/GoalStrictDirection.java @@ -66,12 +66,12 @@ public class GoalStrictDirection implements Goal { @Override public String toString() { return String.format( - "GoalStrictDirection{x=%s, y=%s, z=%s, dx=%s, dz=%s}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(y), - SettingsUtil.maybeCensor(z), - SettingsUtil.maybeCensor(dx), - SettingsUtil.maybeCensor(dz) + "GoalStrictDirection{x=%s, y=%s, z=%s, dx=%s, dz=%s}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z), + SettingsUtil.maybeCensor(dx), + SettingsUtil.maybeCensor(dz) ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java index 52286dd0..27be981e 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java +++ b/src/api/java/baritone/api/pathing/goals/GoalTwoBlocks.java @@ -75,10 +75,10 @@ public class GoalTwoBlocks implements Goal, IGoalRenderPos { @Override public String toString() { return String.format( - "GoalTwoBlocks{x=%s,y=%s,z=%s}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(y), - SettingsUtil.maybeCensor(z) + "GoalTwoBlocks{x=%s,y=%s,z=%s}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } } diff --git a/src/api/java/baritone/api/pathing/goals/GoalXZ.java b/src/api/java/baritone/api/pathing/goals/GoalXZ.java index 53ef3ccf..63d39cd7 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalXZ.java +++ b/src/api/java/baritone/api/pathing/goals/GoalXZ.java @@ -67,9 +67,9 @@ public class GoalXZ implements Goal { @Override public String toString() { return String.format( - "GoalXZ{x=%s,z=%s}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(z) + "GoalXZ{x=%s,z=%s}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(z) ); } diff --git a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java index 84b4cefe..603ef9bd 100644 --- a/src/api/java/baritone/api/pathing/goals/GoalYLevel.java +++ b/src/api/java/baritone/api/pathing/goals/GoalYLevel.java @@ -61,8 +61,8 @@ public class GoalYLevel implements Goal, ActionCosts { @Override public String toString() { return String.format( - "GoalYLevel{y=%s}", - SettingsUtil.maybeCensor(level) + "GoalYLevel{y=%s}", + SettingsUtil.maybeCensor(level) ); } } diff --git a/src/api/java/baritone/api/process/IMineProcess.java b/src/api/java/baritone/api/process/IMineProcess.java index aa01aa5a..455e93ca 100644 --- a/src/api/java/baritone/api/process/IMineProcess.java +++ b/src/api/java/baritone/api/process/IMineProcess.java @@ -92,9 +92,9 @@ public interface IMineProcess extends IBaritoneProcess { */ default void mine(int quantity, Block... blocks) { mine(quantity, new BlockOptionalMetaLookup( - Arrays.stream(blocks) - .map(BlockOptionalMeta::new) - .toArray(BlockOptionalMeta[]::new) + Arrays.stream(blocks) + .map(BlockOptionalMeta::new) + .toArray(BlockOptionalMeta[]::new) )); } diff --git a/src/api/java/baritone/api/schematic/CompositeSchematic.java b/src/api/java/baritone/api/schematic/CompositeSchematic.java index ecb0dd70..9d65d9d3 100644 --- a/src/api/java/baritone/api/schematic/CompositeSchematic.java +++ b/src/api/java/baritone/api/schematic/CompositeSchematic.java @@ -51,7 +51,7 @@ public class CompositeSchematic extends AbstractSchematic { private CompositeSchematicEntry getSchematic(int x, int y, int z, IBlockState currentState) { for (CompositeSchematicEntry entry : schematicArr) { if (x >= entry.x && y >= entry.y && z >= entry.z && - entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) { + entry.schematic.inSchematic(x - entry.x, y - entry.y, z - entry.z, currentState)) { return entry; } } diff --git a/src/api/java/baritone/api/selection/ISelection.java b/src/api/java/baritone/api/selection/ISelection.java index 4771c2e9..5a5690d9 100644 --- a/src/api/java/baritone/api/selection/ISelection.java +++ b/src/api/java/baritone/api/selection/ISelection.java @@ -68,7 +68,7 @@ public interface ISelection { /** * Returns a new {@link ISelection} contracted in the specified direction by the specified number of blocks. - * + *

* Note that, for example, if the direction specified is UP, the bottom of the selection will be shifted up. If it * is DOWN, the top of the selection will be shifted down. * diff --git a/src/api/java/baritone/api/selection/ISelectionManager.java b/src/api/java/baritone/api/selection/ISelectionManager.java index e69549f9..a078e6d1 100644 --- a/src/api/java/baritone/api/selection/ISelectionManager.java +++ b/src/api/java/baritone/api/selection/ISelectionManager.java @@ -91,7 +91,7 @@ public interface ISelectionManager { /** * Replaces the specified {@link ISelection} with one contracted in the specified direction by the specified number * of blocks. - * + *

* Note that, for example, if the direction specified is UP, the bottom of the selection will be shifted up. If it * is DOWN, the top of the selection will be shifted down. * diff --git a/src/api/java/baritone/api/utils/BetterBlockPos.java b/src/api/java/baritone/api/utils/BetterBlockPos.java index 6a462d0c..40122a86 100644 --- a/src/api/java/baritone/api/utils/BetterBlockPos.java +++ b/src/api/java/baritone/api/utils/BetterBlockPos.java @@ -203,10 +203,10 @@ public final class BetterBlockPos extends BlockPos { @Nonnull public String toString() { return String.format( - "BetterBlockPos{x=%s,y=%s,z=%s}", - SettingsUtil.maybeCensor(x), - SettingsUtil.maybeCensor(y), - SettingsUtil.maybeCensor(z) + "BetterBlockPos{x=%s,y=%s,z=%s}", + SettingsUtil.maybeCensor(x), + SettingsUtil.maybeCensor(y), + SettingsUtil.maybeCensor(z) ); } } diff --git a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java index 963d147c..fe1c5e6a 100644 --- a/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java +++ b/src/api/java/baritone/api/utils/BlockOptionalMetaLookup.java @@ -35,20 +35,20 @@ public class BlockOptionalMetaLookup { public BlockOptionalMetaLookup(Block... blocks) { this.boms = Arrays.stream(blocks) - .map(BlockOptionalMeta::new) - .toArray(BlockOptionalMeta[]::new); + .map(BlockOptionalMeta::new) + .toArray(BlockOptionalMeta[]::new); } public BlockOptionalMetaLookup(List blocks) { this.boms = blocks.stream() - .map(BlockOptionalMeta::new) - .toArray(BlockOptionalMeta[]::new); + .map(BlockOptionalMeta::new) + .toArray(BlockOptionalMeta[]::new); } public BlockOptionalMetaLookup(String... blocks) { this.boms = Arrays.stream(blocks) - .map(BlockOptionalMeta::new) - .toArray(BlockOptionalMeta[]::new); + .map(BlockOptionalMeta::new) + .toArray(BlockOptionalMeta[]::new); } public boolean has(Block block) { @@ -88,8 +88,8 @@ public class BlockOptionalMetaLookup { @Override public String toString() { return String.format( - "BlockOptionalMetaLookup{%s}", - Arrays.toString(boms) + "BlockOptionalMetaLookup{%s}", + Arrays.toString(boms) ); } } diff --git a/src/api/java/baritone/api/utils/SettingsUtil.java b/src/api/java/baritone/api/utils/SettingsUtil.java index 5c8ab83f..0035f2ea 100644 --- a/src/api/java/baritone/api/utils/SettingsUtil.java +++ b/src/api/java/baritone/api/utils/SettingsUtil.java @@ -123,7 +123,7 @@ public class SettingsUtil { /** * Gets the type of a setting and returns it as a string, with package names stripped. - * + *

* For example, if the setting type is {@code java.util.List}, this function returns * {@code List}. * @@ -132,7 +132,7 @@ public class SettingsUtil { */ public static String settingTypeToString(Settings.Setting setting) { return setting.getType().getTypeName() - .replaceAll("(?:\\w+\\.)+(\\w+)", "$1"); + .replaceAll("(?:\\w+\\.)+(\\w+)", "$1"); } public static String settingValueToString(Settings.Setting setting, T value) throws IllegalArgumentException { diff --git a/src/api/java/baritone/api/utils/command/helpers/arguments/ArgConsumer.java b/src/api/java/baritone/api/utils/command/helpers/arguments/ArgConsumer.java index a0c1f793..201076c7 100644 --- a/src/api/java/baritone/api/utils/command/helpers/arguments/ArgConsumer.java +++ b/src/api/java/baritone/api/utils/command/helpers/arguments/ArgConsumer.java @@ -39,19 +39,19 @@ import java.util.stream.Stream; * The {@link ArgConsumer} is how {@link Command}s read the arguments passed to them. This class has many benefits: * *

*/ public class ArgConsumer implements Cloneable { @@ -913,11 +913,11 @@ public class ArgConsumer implements Cloneable { * into three {@link CommandArgument}s {@code "arg1"}, {@code "arg2"}, and {@code "arg3"}: * * * * @return The "raw rest" of the string. diff --git a/src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java b/src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java index 2878b8df..1c60c085 100644 --- a/src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java +++ b/src/api/java/baritone/api/utils/command/helpers/tabcomplete/TabCompleteHelper.java @@ -40,13 +40,13 @@ import java.util.stream.Stream; *

* The recommended way to use this class is: *

*

* For advanced users: if you're intercepting {@link TabCompleteEvent}s directly, use {@link #build()} instead for an diff --git a/src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java b/src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java index 1cbf32e7..3d56446c 100644 --- a/src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java +++ b/src/launch/java/baritone/launch/mixins/MixinChatTabCompleter.java @@ -26,17 +26,17 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(GuiChat.ChatTabCompleter.class) public abstract class MixinChatTabCompleter extends MixinTabCompleter { @Inject( - method = "*", - at = @At("RETURN") + method = "*", + at = @At("RETURN") ) private void onConstruction(CallbackInfo ci) { isChatCompleter = true; } @Inject( - method = "complete", - at = @At("HEAD"), - cancellable = true + method = "complete", + at = @At("HEAD"), + cancellable = true ) private void onComplete(CallbackInfo ci) { if (dontComplete) { diff --git a/src/launch/java/baritone/launch/mixins/MixinGuiChat.java b/src/launch/java/baritone/launch/mixins/MixinGuiChat.java index 86f2b1b0..8c0a7d63 100644 --- a/src/launch/java/baritone/launch/mixins/MixinGuiChat.java +++ b/src/launch/java/baritone/launch/mixins/MixinGuiChat.java @@ -32,9 +32,9 @@ public abstract class MixinGuiChat implements net.minecraft.util.ITabCompleter { private TabCompleter tabCompleter; @Inject( - method = "setCompletions", - at = @At("HEAD"), - cancellable = true + method = "setCompletions", + at = @At("HEAD"), + cancellable = true ) private void onSetCompletions(String[] newCompl, CallbackInfo ci) { if (((ITabCompleter) tabCompleter).onGuiChatSetCompletions(newCompl)) { diff --git a/src/launch/java/baritone/launch/mixins/MixinItemStack.java b/src/launch/java/baritone/launch/mixins/MixinItemStack.java index 03f5e25f..2a690632 100644 --- a/src/launch/java/baritone/launch/mixins/MixinItemStack.java +++ b/src/launch/java/baritone/launch/mixins/MixinItemStack.java @@ -45,16 +45,16 @@ public abstract class MixinItemStack implements IItemStack { } @Inject( - method = "*", - at = @At("RETURN") + method = "*", + at = @At("RETURN") ) private void onInit(CallbackInfo ci) { recalculateHash(); } @Inject( - method = "setItemDamage", - at = @At("TAIL") + method = "setItemDamage", + at = @At("TAIL") ) private void onItemDamageSet(CallbackInfo ci) { recalculateHash(); diff --git a/src/launch/java/baritone/launch/mixins/MixinStateImplementation.java b/src/launch/java/baritone/launch/mixins/MixinStateImplementation.java index de74a4db..ea437084 100644 --- a/src/launch/java/baritone/launch/mixins/MixinStateImplementation.java +++ b/src/launch/java/baritone/launch/mixins/MixinStateImplementation.java @@ -19,11 +19,7 @@ package baritone.launch.mixins; import com.google.common.collect.ImmutableMap; import net.minecraft.block.properties.IProperty; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.*; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -41,8 +37,8 @@ public abstract class MixinStateImplementation { private int hashCode; @Inject( - method = "*", - at = @At("RETURN") + method = "*", + at = @At("RETURN") ) private void onInit(CallbackInfo ci) { hashCode = properties.hashCode(); diff --git a/src/launch/java/baritone/launch/mixins/MixinTabCompleter.java b/src/launch/java/baritone/launch/mixins/MixinTabCompleter.java index b07dd9d0..4432505b 100644 --- a/src/launch/java/baritone/launch/mixins/MixinTabCompleter.java +++ b/src/launch/java/baritone/launch/mixins/MixinTabCompleter.java @@ -21,7 +21,6 @@ import baritone.api.BaritoneAPI; import baritone.api.IBaritone; import baritone.api.event.events.TabCompleteEvent; import baritone.utils.accessor.ITabCompleter; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiTextField; import net.minecraft.util.TabCompleter; import org.spongepowered.asm.mixin.Final; @@ -64,9 +63,9 @@ public abstract class MixinTabCompleter implements ITabCompleter { } @Inject( - method = "requestCompletions", - at = @At("HEAD"), - cancellable = true + method = "requestCompletions", + at = @At("HEAD"), + cancellable = true ) private void onRequestCompletions(String prefix, CallbackInfo ci) { if (!isChatCompleter) { diff --git a/src/main/java/baritone/Baritone.java b/src/main/java/baritone/Baritone.java index 7f70bbea..aa787e10 100755 --- a/src/main/java/baritone/Baritone.java +++ b/src/main/java/baritone/Baritone.java @@ -21,17 +21,14 @@ import baritone.api.BaritoneAPI; import baritone.api.IBaritone; import baritone.api.Settings; import baritone.api.event.listener.IEventBus; -import baritone.api.utils.command.BaritoneChatControl; import baritone.api.utils.Helper; import baritone.api.utils.IPlayerContext; -import baritone.api.utils.command.manager.CommandManager; import baritone.behavior.*; import baritone.cache.WorldProvider; import baritone.event.GameEventHandler; import baritone.process.*; import baritone.selection.SelectionManager; import baritone.utils.*; -import baritone.utils.command.defaults.DefaultCommands; import baritone.utils.player.PrimaryPlayerContext; import net.minecraft.client.Minecraft; diff --git a/src/main/java/baritone/behavior/InventoryBehavior.java b/src/main/java/baritone/behavior/InventoryBehavior.java index c278738a..484efa19 100644 --- a/src/main/java/baritone/behavior/InventoryBehavior.java +++ b/src/main/java/baritone/behavior/InventoryBehavior.java @@ -28,7 +28,6 @@ import net.minecraft.inventory.ClickType; import net.minecraft.item.*; import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; import java.util.ArrayList; import java.util.OptionalInt; diff --git a/src/main/java/baritone/behavior/PathingBehavior.java b/src/main/java/baritone/behavior/PathingBehavior.java index c3aa2ad9..86fd9505 100644 --- a/src/main/java/baritone/behavior/PathingBehavior.java +++ b/src/main/java/baritone/behavior/PathingBehavior.java @@ -19,11 +19,7 @@ package baritone.behavior; import baritone.Baritone; import baritone.api.behavior.IPathingBehavior; -import baritone.api.event.events.PathEvent; -import baritone.api.event.events.PlayerUpdateEvent; -import baritone.api.event.events.RenderEvent; -import baritone.api.event.events.SprintStateEvent; -import baritone.api.event.events.TickEvent; +import baritone.api.event.events.*; import baritone.api.pathing.calc.IPath; import baritone.api.pathing.goals.Goal; import baritone.api.pathing.goals.GoalXZ; @@ -137,8 +133,8 @@ public final class PathingBehavior extends Behavior implements IPathingBehavior, BetterBlockPos calcFrom = inProgress.getStart(); Optional currentBest = inProgress.bestPathSoFar(); if ((current == null || !current.getPath().getDest().equals(calcFrom)) // if current ends in inProgress's start, then we're ok - && !calcFrom.equals(ctx.playerFeet()) && !calcFrom.equals(expectedSegmentStart) // if current starts in our playerFeet or pathStart, then we're ok - && (!currentBest.isPresent() || (!currentBest.get().positions().contains(ctx.playerFeet()) && !currentBest.get().positions().contains(expectedSegmentStart))) // if + && !calcFrom.equals(ctx.playerFeet()) && !calcFrom.equals(expectedSegmentStart) // if current starts in our playerFeet or pathStart, then we're ok + && (!currentBest.isPresent() || (!currentBest.get().positions().contains(ctx.playerFeet()) && !currentBest.get().positions().contains(expectedSegmentStart))) // if ) { // when it was *just* started, currentBest will be empty so we need to also check calcFrom since that's always present inProgress.cancel(); // cancellation doesn't dispatch any events diff --git a/src/main/java/baritone/cache/ChunkPacker.java b/src/main/java/baritone/cache/ChunkPacker.java index 864f23d6..9b754869 100644 --- a/src/main/java/baritone/cache/ChunkPacker.java +++ b/src/main/java/baritone/cache/ChunkPacker.java @@ -88,7 +88,8 @@ public final class ChunkPacker { IBlockState[] blocks = new IBlockState[256]; for (int z = 0; z < 16; z++) { - https://www.ibm.com/developerworks/library/j-perry-writing-good-java-code/index.html + https: +//www.ibm.com/developerworks/library/j-perry-writing-good-java-code/index.html for (int x = 0; x < 16; x++) { for (int y = 255; y >= 0; y--) { int index = CachedChunk.getPositionIndex(x, y, z); diff --git a/src/main/java/baritone/cache/WaypointCollection.java b/src/main/java/baritone/cache/WaypointCollection.java index 448dddd3..222adfdf 100644 --- a/src/main/java/baritone/cache/WaypointCollection.java +++ b/src/main/java/baritone/cache/WaypointCollection.java @@ -21,7 +21,6 @@ import baritone.api.cache.IWaypoint; import baritone.api.cache.IWaypointCollection; import baritone.api.cache.Waypoint; import baritone.api.utils.BetterBlockPos; -import net.minecraft.util.math.BlockPos; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/baritone/cache/WorldScanner.java b/src/main/java/baritone/cache/WorldScanner.java index 458e7afe..de9e6fe9 100644 --- a/src/main/java/baritone/cache/WorldScanner.java +++ b/src/main/java/baritone/cache/WorldScanner.java @@ -31,11 +31,7 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.chunk.storage.ExtendedBlockStorage; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; +import java.util.*; import java.util.stream.IntStream; import static java.util.Objects.nonNull; @@ -89,8 +85,8 @@ public enum WorldScanner implements IWorldScanner { } } if ((allUnloaded && foundChunks) - || (res.size() >= max - && (searchRadiusSq > maxSearchRadiusSq || (searchRadiusSq > 1 && foundWithinY))) + || (res.size() >= max + && (searchRadiusSq > maxSearchRadiusSq || (searchRadiusSq > 1 && foundWithinY))) ) { return res; } diff --git a/src/main/java/baritone/process/FollowProcess.java b/src/main/java/baritone/process/FollowProcess.java index 3c0ef0a2..af30b25d 100644 --- a/src/main/java/baritone/process/FollowProcess.java +++ b/src/main/java/baritone/process/FollowProcess.java @@ -29,7 +29,6 @@ import baritone.utils.BaritoneProcessHelper; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; -import java.util.ArrayList; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -83,11 +82,11 @@ public final class FollowProcess extends BaritoneProcessHelper implements IFollo private void scanWorld() { cache = Stream.of(ctx.world().loadedEntityList, ctx.world().playerEntities) - .flatMap(List::stream) - .filter(this::followable) - .filter(this.filter) - .distinct() - .collect(Collectors.toList()); + .flatMap(List::stream) + .filter(this::followable) + .filter(this.filter) + .distinct() + .collect(Collectors.toList()); } @Override diff --git a/src/main/java/baritone/process/GetToBlockProcess.java b/src/main/java/baritone/process/GetToBlockProcess.java index c891f109..5c1d7783 100644 --- a/src/main/java/baritone/process/GetToBlockProcess.java +++ b/src/main/java/baritone/process/GetToBlockProcess.java @@ -33,7 +33,10 @@ import net.minecraft.init.Blocks; import net.minecraft.inventory.ContainerPlayer; import net.minecraft.util.math.BlockPos; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Optional; public final class GetToBlockProcess extends BaritoneProcessHelper implements IGetToBlockProcess { diff --git a/src/main/java/baritone/selection/Selection.java b/src/main/java/baritone/selection/Selection.java index 3b385503..594c037f 100644 --- a/src/main/java/baritone/selection/Selection.java +++ b/src/main/java/baritone/selection/Selection.java @@ -19,21 +19,21 @@ public class Selection implements ISelection { this.pos2 = pos2; this.min = new BetterBlockPos( - Math.min(pos1.x, pos2.x), - Math.min(pos1.y, pos2.y), - Math.min(pos1.z, pos2.z) + Math.min(pos1.x, pos2.x), + Math.min(pos1.y, pos2.y), + Math.min(pos1.z, pos2.z) ); this.max = new BetterBlockPos( - Math.max(pos1.x, pos2.x), - Math.max(pos1.y, pos2.y), - Math.max(pos1.z, pos2.z) + Math.max(pos1.x, pos2.x), + Math.max(pos1.y, pos2.y), + Math.max(pos1.z, pos2.z) ); this.size = new Vec3i( - max.x - min.x + 1, - max.y - min.y + 1, - max.z - min.z + 1 + max.x - min.x + 1, + max.y - min.y + 1, + max.z - min.z + 1 ); this.aabb = new AxisAlignedBB(this.min, this.max.add(1, 1, 1)); @@ -81,7 +81,7 @@ public class Selection implements ISelection { /** * Since it might not be immediately obvious what this does, let me explain. - * + *

* Let's say you specify EnumFacing.UP, this functions returns if pos2 is the highest BlockPos. * If you specify EnumFacing.DOWN, it returns if pos2 is the lowest BlockPos. * diff --git a/src/main/java/baritone/utils/IRenderer.java b/src/main/java/baritone/utils/IRenderer.java index 2de47ed7..f08d0c39 100644 --- a/src/main/java/baritone/utils/IRenderer.java +++ b/src/main/java/baritone/utils/IRenderer.java @@ -28,7 +28,7 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.math.AxisAlignedBB; -import java.awt.Color; +import java.awt.*; import static org.lwjgl.opengl.GL11.*; diff --git a/src/main/java/baritone/utils/PathRenderer.java b/src/main/java/baritone/utils/PathRenderer.java index 58917436..6e262213 100644 --- a/src/main/java/baritone/utils/PathRenderer.java +++ b/src/main/java/baritone/utils/PathRenderer.java @@ -36,7 +36,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import java.awt.Color; +import java.awt.*; import java.util.Collection; import java.util.Collections; import java.util.List; diff --git a/src/main/java/baritone/utils/ToolSet.java b/src/main/java/baritone/utils/ToolSet.java index 860f0577..2df2261a 100644 --- a/src/main/java/baritone/utils/ToolSet.java +++ b/src/main/java/baritone/utils/ToolSet.java @@ -118,7 +118,7 @@ public class ToolSet { } else if (speed == highestSpeed) { int cost = getMaterialCost(itemStack); if ((cost < lowestCost && (silkTouch || !bestSilkTouch)) || - (preferSilkTouch && !bestSilkTouch && silkTouch)) { + (preferSilkTouch && !bestSilkTouch && silkTouch)) { highestSpeed = speed; best = i; lowestCost = cost; diff --git a/src/main/java/baritone/utils/command/defaults/AxisCommand.java b/src/main/java/baritone/utils/command/defaults/AxisCommand.java index 794af0c5..32c36d15 100644 --- a/src/main/java/baritone/utils/command/defaults/AxisCommand.java +++ b/src/main/java/baritone/utils/command/defaults/AxisCommand.java @@ -54,10 +54,10 @@ public class AxisCommand extends Command { @Override public List getLongDesc() { return asList( - "The axis command sets a goal that tells Baritone to head towards the nearest axis. That is, X=0 or Z=0.", - "", - "Usage:", - "> axis" + "The axis command sets a goal that tells Baritone to head towards the nearest axis. That is, X=0 or Z=0.", + "", + "Usage:", + "> axis" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java b/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java index 1152ee08..926847f9 100644 --- a/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java +++ b/src/main/java/baritone/utils/command/defaults/BlacklistCommand.java @@ -62,10 +62,10 @@ public class BlacklistCommand extends Command { @Override public List getLongDesc() { return asList( - "While, for example, mining, this command blacklists the closest block so that Baritone won't attempt to get to it.", - "", - "Usage:", - "> blacklist" + "While, for example, mining, this command blacklists the closest block so that Baritone won't attempt to get to it.", + "", + "Usage:", + "> blacklist" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/BuildCommand.java b/src/main/java/baritone/utils/command/defaults/BuildCommand.java index dd789ccb..ac99b341 100644 --- a/src/main/java/baritone/utils/command/defaults/BuildCommand.java +++ b/src/main/java/baritone/utils/command/defaults/BuildCommand.java @@ -89,11 +89,11 @@ public class BuildCommand extends Command { @Override public List getLongDesc() { return asList( - "Build a schematic from a file.", - "", - "Usage:", - "> build - Loads and builds '.schematic'", - "> build - Custom position" + "Build a schematic from a file.", + "", + "Usage:", + "> build - Loads and builds '.schematic'", + "> build - Custom position" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/CancelCommand.java b/src/main/java/baritone/utils/command/defaults/CancelCommand.java index 49fdc537..3b45b5ab 100644 --- a/src/main/java/baritone/utils/command/defaults/CancelCommand.java +++ b/src/main/java/baritone/utils/command/defaults/CancelCommand.java @@ -51,10 +51,10 @@ public class CancelCommand extends Command { @Override public List getLongDesc() { return asList( - "The cancel command tells Baritons to stop whatever it's currently doing.", - "", - "Usage:", - "> cancel" + "The cancel command tells Baritons to stop whatever it's currently doing.", + "", + "Usage:", + "> cancel" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ChestsCommand.java b/src/main/java/baritone/utils/command/defaults/ChestsCommand.java index 72e07da1..6d436cc7 100644 --- a/src/main/java/baritone/utils/command/defaults/ChestsCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ChestsCommand.java @@ -43,7 +43,7 @@ public class ChestsCommand extends Command { protected void executed(String label, ArgConsumer args, Settings settings) { args.requireMax(0); Set> entries = - ctx.worldData().getContainerMemory().getRememberedInventories().entrySet(); + ctx.worldData().getContainerMemory().getRememberedInventories().entrySet(); if (entries.isEmpty()) { throw new CommandInvalidStateException("No remembered inventories"); @@ -77,10 +77,10 @@ public class ChestsCommand extends Command { @Override public List getLongDesc() { return asList( - "The chests command lists remembered inventories, I guess?", - "", - "Usage:", - "> chests" + "The chests command lists remembered inventories, I guess?", + "", + "Usage:", + "> chests" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ClearareaCommand.java b/src/main/java/baritone/utils/command/defaults/ClearareaCommand.java index 68fc547e..0f210234 100644 --- a/src/main/java/baritone/utils/command/defaults/ClearareaCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ClearareaCommand.java @@ -73,11 +73,11 @@ public class ClearareaCommand extends Command { @Override public List getLongDesc() { return asList( - "Clear an area of all blocks.", - "", - "Usage:", - "> cleararea - Clears the area marked by your current position and the current GoalBlock", - "> cleararea - Custom second corner rather than your goal" + "Clear an area of all blocks.", + "", + "Usage:", + "> cleararea - Clears the area marked by your current position and the current GoalBlock", + "> cleararea - Custom second corner rather than your goal" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ClickCommand.java b/src/main/java/baritone/utils/command/defaults/ClickCommand.java index 494ae8f7..8f2a3c8f 100644 --- a/src/main/java/baritone/utils/command/defaults/ClickCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ClickCommand.java @@ -51,10 +51,10 @@ public class ClickCommand extends Command { @Override public List getLongDesc() { return asList( - "Opens click dude", - "", - "Usage:", - "> click" + "Opens click dude", + "", + "Usage:", + "> click" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ComeCommand.java b/src/main/java/baritone/utils/command/defaults/ComeCommand.java index cfbf1f46..ad823300 100644 --- a/src/main/java/baritone/utils/command/defaults/ComeCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ComeCommand.java @@ -62,12 +62,12 @@ public class ComeCommand extends Command { @Override public List getLongDesc() { return asList( - "The come command tells Baritone to head towards your camera.", - "", - "This can be useful in hacked clients where freecam doesn't move your player position.", - "", - "Usage:", - "> come" + "The come command tells Baritone to head towards your camera.", + "", + "This can be useful in hacked clients where freecam doesn't move your player position.", + "", + "Usage:", + "> come" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/DefaultCommands.java b/src/main/java/baritone/utils/command/defaults/DefaultCommands.java index 213bd393..9e65e10c 100644 --- a/src/main/java/baritone/utils/command/defaults/DefaultCommands.java +++ b/src/main/java/baritone/utils/command/defaults/DefaultCommands.java @@ -26,44 +26,44 @@ import static java.util.Arrays.asList; public class DefaultCommands { public static final List COMMANDS = Collections.unmodifiableList(asList( - new HelpCommand(), - new SetCommand(), - new CommandAlias(asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"), - new CommandAlias("reset", "Reset all settings or just one", "set reset"), - new GoalCommand(), - new PathCommand(), - new ProcCommand(), - new VersionCommand(), - new RepackCommand(), - new BuildCommand(), - new SchematicaCommand(), - new ComeCommand(), - new AxisCommand(), - new CancelCommand(), - new ForceCancelCommand(), - new GcCommand(), - new InvertCommand(), - new ClearareaCommand(), - PauseResumeCommands.pauseCommand, - PauseResumeCommands.resumeCommand, - PauseResumeCommands.pausedCommand, - new TunnelCommand(), - new RenderCommand(), - new FarmCommand(), - new ChestsCommand(), - new FollowCommand(), - new ExploreFilterCommand(), - new ReloadAllCommand(), - new SaveAllCommand(), - new ExploreCommand(), - new BlacklistCommand(), - new FindCommand(), - new MineCommand(), - new ClickCommand(), - new ThisWayCommand(), - new WaypointsCommand(), - new CommandAlias("sethome", "Sets your home waypoint", "waypoints save home"), - new CommandAlias("home", "Set goal to your home waypoint", "waypoints goal home"), - new SelCommand() + new HelpCommand(), + new SetCommand(), + new CommandAlias(asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"), + new CommandAlias("reset", "Reset all settings or just one", "set reset"), + new GoalCommand(), + new PathCommand(), + new ProcCommand(), + new VersionCommand(), + new RepackCommand(), + new BuildCommand(), + new SchematicaCommand(), + new ComeCommand(), + new AxisCommand(), + new CancelCommand(), + new ForceCancelCommand(), + new GcCommand(), + new InvertCommand(), + new ClearareaCommand(), + PauseResumeCommands.pauseCommand, + PauseResumeCommands.resumeCommand, + PauseResumeCommands.pausedCommand, + new TunnelCommand(), + new RenderCommand(), + new FarmCommand(), + new ChestsCommand(), + new FollowCommand(), + new ExploreFilterCommand(), + new ReloadAllCommand(), + new SaveAllCommand(), + new ExploreCommand(), + new BlacklistCommand(), + new FindCommand(), + new MineCommand(), + new ClickCommand(), + new ThisWayCommand(), + new WaypointsCommand(), + new CommandAlias("sethome", "Sets your home waypoint", "waypoints save home"), + new CommandAlias("home", "Set goal to your home waypoint", "waypoints goal home"), + new SelCommand() )); } diff --git a/src/main/java/baritone/utils/command/defaults/EmptyCommand.java b/src/main/java/baritone/utils/command/defaults/EmptyCommand.java index 9298f32a..3a6f46e4 100644 --- a/src/main/java/baritone/utils/command/defaults/EmptyCommand.java +++ b/src/main/java/baritone/utils/command/defaults/EmptyCommand.java @@ -49,10 +49,10 @@ public class EmptyCommand extends Command { @Override public List getLongDesc() { return asList( - "", - "", - "Usage:", - "> " + "", + "", + "Usage:", + "> " ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ExploreCommand.java b/src/main/java/baritone/utils/command/defaults/ExploreCommand.java index c0925342..2cc328d7 100644 --- a/src/main/java/baritone/utils/command/defaults/ExploreCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ExploreCommand.java @@ -42,8 +42,8 @@ public class ExploreCommand extends Command { } GoalXZ goal = args.has() - ? args.getDatatypePost(RelativeGoalXZ.class, ctx.playerFeet()) - : new GoalXZ(ctx.playerFeet()); + ? args.getDatatypePost(RelativeGoalXZ.class, ctx.playerFeet()) + : new GoalXZ(ctx.playerFeet()); baritone.getExploreProcess().explore(goal.getX(), goal.getZ()); logDirect(String.format("Exploring from %s", goal.toString())); @@ -66,11 +66,11 @@ public class ExploreCommand extends Command { @Override public List getLongDesc() { return asList( - "Tell Baritone to explore randomly. If you used explorefilter before this, it will be applied.", - "", - "Usage:", - "> explore - Explore from your current position.", - "> explore - Explore from the specified X and Z position." + "Tell Baritone to explore randomly. If you used explorefilter before this, it will be applied.", + "", + "Usage:", + "> explore - Explore from your current position.", + "> explore - Explore from the specified X and Z position." ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java b/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java index 9f637257..ab0e1307 100644 --- a/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ExploreFilterCommand.java @@ -81,14 +81,14 @@ public class ExploreFilterCommand extends Command { @Override public List getLongDesc() { return asList( - "Apply an explore filter before using explore, which tells the explore process which chunks have been explored/not explored.", - "", - "The JSON file will follow this format: [{\"x\":0,\"z\":0},...]", - "", - "If 'invert' is specified, the chunks listed will be considered NOT explored, rather than explored.", - "", - "Usage:", - "> explorefilter [invert] - Load the JSON file referenced by the specified path. If invert is specified, it must be the literal word 'invert'." + "Apply an explore filter before using explore, which tells the explore process which chunks have been explored/not explored.", + "", + "The JSON file will follow this format: [{\"x\":0,\"z\":0},...]", + "", + "If 'invert' is specified, the chunks listed will be considered NOT explored, rather than explored.", + "", + "Usage:", + "> explorefilter [invert] - Load the JSON file referenced by the specified path. If invert is specified, it must be the literal word 'invert'." ); } } diff --git a/src/main/java/baritone/utils/command/defaults/FarmCommand.java b/src/main/java/baritone/utils/command/defaults/FarmCommand.java index 4390585c..f125bfae 100644 --- a/src/main/java/baritone/utils/command/defaults/FarmCommand.java +++ b/src/main/java/baritone/utils/command/defaults/FarmCommand.java @@ -51,10 +51,10 @@ public class FarmCommand extends Command { @Override public List getLongDesc() { return asList( - "The farm command starts farming nearby plants. It harvests mature crops and plants new ones.", - "", - "Usage:", - "> farm" + "The farm command starts farming nearby plants. It harvests mature crops and plants new ones.", + "", + "Usage:", + "> farm" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/FindCommand.java b/src/main/java/baritone/utils/command/defaults/FindCommand.java index 4f71366a..499a45c9 100644 --- a/src/main/java/baritone/utils/command/defaults/FindCommand.java +++ b/src/main/java/baritone/utils/command/defaults/FindCommand.java @@ -46,18 +46,18 @@ public class FindCommand extends Command { BetterBlockPos origin = ctx.playerFeet(); toFind.stream() - .flatMap(block -> - ctx.worldData().getCachedWorld().getLocationsOf( - Block.REGISTRY.getNameForObject(block).getPath(), - Integer.MAX_VALUE, - origin.x, - origin.y, - 4 - ).stream() - ) - .map(BetterBlockPos::new) - .map(BetterBlockPos::toString) - .forEach(this::logDirect); + .flatMap(block -> + ctx.worldData().getCachedWorld().getLocationsOf( + Block.REGISTRY.getNameForObject(block).getPath(), + Integer.MAX_VALUE, + origin.x, + origin.y, + 4 + ).stream() + ) + .map(BetterBlockPos::new) + .map(BetterBlockPos::toString) + .forEach(this::logDirect); } @Override @@ -73,10 +73,10 @@ public class FindCommand extends Command { @Override public List getLongDesc() { return asList( - "", - "", - "Usage:", - "> " + "", + "", + "Usage:", + "> " ); } } diff --git a/src/main/java/baritone/utils/command/defaults/FollowCommand.java b/src/main/java/baritone/utils/command/defaults/FollowCommand.java index 7588edd2..7b5362cc 100644 --- a/src/main/java/baritone/utils/command/defaults/FollowCommand.java +++ b/src/main/java/baritone/utils/command/defaults/FollowCommand.java @@ -77,9 +77,9 @@ public class FollowCommand extends Command { } baritone.getFollowProcess().follow( - classes.isEmpty() - ? entities::contains - : e -> classes.stream().anyMatch(c -> c.isInstance(e)) + classes.isEmpty() + ? entities::contains + : e -> classes.stream().anyMatch(c -> c.isInstance(e)) ); } @@ -90,14 +90,14 @@ public class FollowCommand extends Command { if (classes.isEmpty()) { entities.stream() - .map(Entity::toString) - .forEach(this::logDirect); + .map(Entity::toString) + .forEach(this::logDirect); } else { classes.stream() - .map(EntityList::getKey) - .map(Objects::requireNonNull) - .map(ResourceLocation::toString) - .forEach(this::logDirect); + .map(EntityList::getKey) + .map(Objects::requireNonNull) + .map(ResourceLocation::toString) + .forEach(this::logDirect); } } } @@ -106,10 +106,10 @@ public class FollowCommand extends Command { protected Stream tabCompleted(String label, ArgConsumer args, Settings settings) { if (args.hasExactlyOne()) { return new TabCompleteHelper() - .append(FollowGroup.class) - .append(FollowList.class) - .filterPrefix(args.getString()) - .stream(); + .append(FollowGroup.class) + .append(FollowList.class) + .filterPrefix(args.getString()) + .stream(); } else { Class followType; @@ -139,13 +139,13 @@ public class FollowCommand extends Command { @Override public List getLongDesc() { return asList( - "The follow command tells Baritone to follow certain kinds of entities.", - "", - "Usage:", - "> follow entities - Follows all entities.", - "> follow entity <...> - Follow certain entities (for example 'skeleton', 'horse' etc.)", - "> follow players - Follow players", - "> follow player <...> - Follow certain players" + "The follow command tells Baritone to follow certain kinds of entities.", + "", + "Usage:", + "> follow entities - Follows all entities.", + "> follow entity <...> - Follow certain entities (for example 'skeleton', 'horse' etc.)", + "> follow players - Follow players", + "> follow player <...> - Follow certain players" ); } diff --git a/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java b/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java index 5bd7d58a..4facba0a 100644 --- a/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ForceCancelCommand.java @@ -54,10 +54,10 @@ public class ForceCancelCommand extends Command { @Override public List getLongDesc() { return asList( - "Like cancel, but more forceful.", - "", - "Usage:", - "> forcecancel" + "Like cancel, but more forceful.", + "", + "Usage:", + "> forcecancel" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/GcCommand.java b/src/main/java/baritone/utils/command/defaults/GcCommand.java index 7e838c6f..edf7c236 100644 --- a/src/main/java/baritone/utils/command/defaults/GcCommand.java +++ b/src/main/java/baritone/utils/command/defaults/GcCommand.java @@ -53,10 +53,10 @@ public class GcCommand extends Command { @Override public List getLongDesc() { return asList( - "Calls System.gc().", - "", - "Usage:", - "> gc" + "Calls System.gc().", + "", + "Usage:", + "> gc" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/GoalCommand.java b/src/main/java/baritone/utils/command/defaults/GoalCommand.java index 55f09928..3af86a4c 100644 --- a/src/main/java/baritone/utils/command/defaults/GoalCommand.java +++ b/src/main/java/baritone/utils/command/defaults/GoalCommand.java @@ -94,16 +94,16 @@ public class GoalCommand extends Command { @Override public List getLongDesc() { return asList( - "The goal command allows you to set or clear Baritone's goal.", - "", - "Wherever a coordinate is expected, you can use ~ just like in regular Minecraft commands. Or, you can just use regular numbers.", - "", - "Usage:", - "> goal - Set the goal to your current position", - "> goal - Erase the goal", - "> goal - Set the goal to a Y level", - "> goal - Set the goal to an X,Z position", - "> goal - Set the goal to an X,Y,Z position" + "The goal command allows you to set or clear Baritone's goal.", + "", + "Wherever a coordinate is expected, you can use ~ just like in regular Minecraft commands. Or, you can just use regular numbers.", + "", + "Usage:", + "> goal - Set the goal to your current position", + "> goal - Erase the goal", + "> goal - Set the goal to a Y level", + "> goal - Set the goal to an X,Z position", + "> goal - Set the goal to an X,Y,Z position" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/HelpCommand.java b/src/main/java/baritone/utils/command/defaults/HelpCommand.java index ccd7d640..5a7a022d 100644 --- a/src/main/java/baritone/utils/command/defaults/HelpCommand.java +++ b/src/main/java/baritone/utils/command/defaults/HelpCommand.java @@ -50,38 +50,38 @@ public class HelpCommand extends Command { if (!args.has() || args.is(Integer.class)) { Paginator.paginate( - args, new Paginator<>( - CommandManager.REGISTRY.descendingStream() - .filter(command -> !command.hiddenFromHelp()) - .collect(Collectors.toList()) - ), - () -> logDirect("All Baritone commands (clickable):"), - command -> { - String names = String.join("/", command.names); - String name = command.names.get(0); + args, new Paginator<>( + CommandManager.REGISTRY.descendingStream() + .filter(command -> !command.hiddenFromHelp()) + .collect(Collectors.toList()) + ), + () -> logDirect("All Baritone commands (clickable):"), + command -> { + String names = String.join("/", command.names); + String name = command.names.get(0); - ITextComponent shortDescComponent = new TextComponentString(" - " + command.getShortDesc()); - shortDescComponent.getStyle().setColor(TextFormatting.DARK_GRAY); + ITextComponent shortDescComponent = new TextComponentString(" - " + command.getShortDesc()); + shortDescComponent.getStyle().setColor(TextFormatting.DARK_GRAY); - ITextComponent namesComponent = new TextComponentString(names); - namesComponent.getStyle().setColor(TextFormatting.WHITE); + ITextComponent namesComponent = new TextComponentString(names); + namesComponent.getStyle().setColor(TextFormatting.WHITE); - ITextComponent hoverComponent = new TextComponentString(""); - hoverComponent.getStyle().setColor(TextFormatting.GRAY); - hoverComponent.appendSibling(namesComponent); - hoverComponent.appendText("\n" + command.getShortDesc()); - hoverComponent.appendText("\n\nClick to view full help"); - String clickCommand = FORCE_COMMAND_PREFIX + String.format("%s %s", label, command.names.get(0)); + ITextComponent hoverComponent = new TextComponentString(""); + hoverComponent.getStyle().setColor(TextFormatting.GRAY); + hoverComponent.appendSibling(namesComponent); + hoverComponent.appendText("\n" + command.getShortDesc()); + hoverComponent.appendText("\n\nClick to view full help"); + String clickCommand = FORCE_COMMAND_PREFIX + String.format("%s %s", label, command.names.get(0)); - ITextComponent component = new TextComponentString(name); - component.getStyle().setColor(TextFormatting.GRAY); - component.appendSibling(shortDescComponent); - component.getStyle() - .setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent)) - .setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, clickCommand)); - return component; - }, - FORCE_COMMAND_PREFIX + label + ITextComponent component = new TextComponentString(name); + component.getStyle().setColor(TextFormatting.GRAY); + component.appendSibling(shortDescComponent); + component.getStyle() + .setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent)) + .setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, clickCommand)); + return component; + }, + FORCE_COMMAND_PREFIX + label ); } else { String commandName = args.getString().toLowerCase(); @@ -98,8 +98,8 @@ public class HelpCommand extends Command { ITextComponent returnComponent = new TextComponentString("Click to return to the help menu"); returnComponent.getStyle().setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - FORCE_COMMAND_PREFIX + label + ClickEvent.Action.RUN_COMMAND, + FORCE_COMMAND_PREFIX + label )); logDirect(returnComponent); @@ -123,11 +123,11 @@ public class HelpCommand extends Command { @Override public List getLongDesc() { return asList( - "Using this command, you can view detailed help information on how to use certain commands of Baritone.", - "", - "Usage:", - "> help - Lists all commands and their short descriptions.", - "> help - Displays help information on a specific command." + "Using this command, you can view detailed help information on how to use certain commands of Baritone.", + "", + "Usage:", + "> help - Lists all commands and their short descriptions.", + "> help - Displays help information on a specific command." ); } } diff --git a/src/main/java/baritone/utils/command/defaults/InvertCommand.java b/src/main/java/baritone/utils/command/defaults/InvertCommand.java index 1a46bdc7..8000d584 100644 --- a/src/main/java/baritone/utils/command/defaults/InvertCommand.java +++ b/src/main/java/baritone/utils/command/defaults/InvertCommand.java @@ -70,10 +70,10 @@ public class InvertCommand extends Command { @Override public List getLongDesc() { return asList( - "The invert command tells Baritone to head away from the current goal rather than towards it.", - "", - "Usage:", - "> invert - Invert the current goal." + "The invert command tells Baritone to head away from the current goal rather than towards it.", + "", + "Usage:", + "> invert - Invert the current goal." ); } } diff --git a/src/main/java/baritone/utils/command/defaults/MineCommand.java b/src/main/java/baritone/utils/command/defaults/MineCommand.java index 0f155e74..5cc12ff8 100644 --- a/src/main/java/baritone/utils/command/defaults/MineCommand.java +++ b/src/main/java/baritone/utils/command/defaults/MineCommand.java @@ -64,16 +64,16 @@ public class MineCommand extends Command { @Override public List getLongDesc() { return asList( - "The mine command allows you to tell Baritone to search for and mine individual blocks.", - "", - "The specified blocks can be ores (which are commonly cached), or any other block.", - "", - "Also see the legitMine settings (see #set l legitMine).", - "", - "Usage:", - "> mine diamond_ore - Mines all diamonds it can find.", - "> mine redstone_ore lit_redstone_ore - Mines redstone ore.", - "> mine log:0 - Mines only oak logs." + "The mine command allows you to tell Baritone to search for and mine individual blocks.", + "", + "The specified blocks can be ores (which are commonly cached), or any other block.", + "", + "Also see the legitMine settings (see #set l legitMine).", + "", + "Usage:", + "> mine diamond_ore - Mines all diamonds it can find.", + "> mine redstone_ore lit_redstone_ore - Mines redstone ore.", + "> mine log:0 - Mines only oak logs." ); } } diff --git a/src/main/java/baritone/utils/command/defaults/PathCommand.java b/src/main/java/baritone/utils/command/defaults/PathCommand.java index b2c7e69f..3dcc79bd 100644 --- a/src/main/java/baritone/utils/command/defaults/PathCommand.java +++ b/src/main/java/baritone/utils/command/defaults/PathCommand.java @@ -69,9 +69,9 @@ public class PathCommand extends Command { if (!args.has(2)) { return new TabCompleteHelper() - .append("~") - .filterPrefix(args.getString()) - .stream(); + .append("~") + .filterPrefix(args.getString()) + .stream(); } } } @@ -87,13 +87,13 @@ public class PathCommand extends Command { @Override public List getLongDesc() { return asList( - "The path command tells Baritone to head towards the current goal.", - "", - "Usage:", - "> path - Start the pathing.", - "> path ", - "> path ", - "> path - Define the goal here" + "The path command tells Baritone to head towards the current goal.", + "", + "Usage:", + "> path - Start the pathing.", + "> path ", + "> path ", + "> path - Define the goal here" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java b/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java index b8b3f91f..1242d153 100644 --- a/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java +++ b/src/main/java/baritone/utils/command/defaults/PauseResumeCommands.java @@ -33,7 +33,7 @@ import static java.util.Arrays.asList; /** * Contains the pause, resume, and paused commands. - * + *

* This thing is scoped to hell, private so far you can't even access it using reflection, because you AREN'T SUPPOSED * TO USE THIS to pause and resume Baritone. Make your own process that returns {@link PathingCommandType#REQUEST_PAUSE * REQUEST_PAUSE} as needed. @@ -48,35 +48,35 @@ public class PauseResumeCommands { final boolean[] paused = {false}; BaritoneAPI.getProvider().getPrimaryBaritone().getPathingControlManager().registerProcess( - new IBaritoneProcess() { - @Override - public boolean isActive() { - return paused[0]; - } + new IBaritoneProcess() { + @Override + public boolean isActive() { + return paused[0]; + } - @Override - public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) { - return new PathingCommand(null, PathingCommandType.REQUEST_PAUSE); - } + @Override + public PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) { + return new PathingCommand(null, PathingCommandType.REQUEST_PAUSE); + } - @Override - public boolean isTemporary() { - return true; - } + @Override + public boolean isTemporary() { + return true; + } - @Override - public void onLostControl() {} + @Override + public void onLostControl() {} - @Override - public double priority() { - return DEFAULT_PRIORITY + 1; - } + @Override + public double priority() { + return DEFAULT_PRIORITY + 1; + } - @Override - public String displayName0() { - return "Pause/Resume Commands"; + @Override + public String displayName0() { + return "Pause/Resume Commands"; + } } - } ); pauseCommand = new Command("pause") { @@ -105,12 +105,12 @@ public class PauseResumeCommands { @Override public List getLongDesc() { return asList( - "The pause command tells Baritone to temporarily stop whatever it's doing.", - "", - "This can be used to pause pathing, building, following, whatever. A single use of the resume command will start it right back up again!", - "", - "Usage:", - "> pause" + "The pause command tells Baritone to temporarily stop whatever it's doing.", + "", + "This can be used to pause pathing, building, following, whatever. A single use of the resume command will start it right back up again!", + "", + "Usage:", + "> pause" ); } }; @@ -141,10 +141,10 @@ public class PauseResumeCommands { @Override public List getLongDesc() { return asList( - "The resume command tells Baritone to resume whatever it was doing when you last used pause.", - "", - "Usage:", - "> resume" + "The resume command tells Baritone to resume whatever it was doing when you last used pause.", + "", + "Usage:", + "> resume" ); } }; @@ -170,10 +170,10 @@ public class PauseResumeCommands { @Override public List getLongDesc() { return asList( - "The paused command tells you if Baritone is currently paused by use of the pause command.", - "", - "Usage:", - "> paused" + "The paused command tells you if Baritone is currently paused by use of the pause command.", + "", + "Usage:", + "> paused" ); } }; diff --git a/src/main/java/baritone/utils/command/defaults/ProcCommand.java b/src/main/java/baritone/utils/command/defaults/ProcCommand.java index a0ada87f..816c1770 100644 --- a/src/main/java/baritone/utils/command/defaults/ProcCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ProcCommand.java @@ -48,19 +48,19 @@ public class ProcCommand extends Command { } logDirect(String.format( - "Class: %s\n" + - "Priority: %f\n" + - "Temporary: %b\n" + - "Display name: %s\n" + - "Last command: %s", - process.getClass().getTypeName(), - process.priority(), - process.isTemporary(), - process.displayName(), - pathingControlManager - .mostRecentCommand() - .map(PathingCommand::toString) - .orElse("None") + "Class: %s\n" + + "Priority: %f\n" + + "Temporary: %b\n" + + "Display name: %s\n" + + "Last command: %s", + process.getClass().getTypeName(), + process.priority(), + process.isTemporary(), + process.displayName(), + pathingControlManager + .mostRecentCommand() + .map(PathingCommand::toString) + .orElse("None") )); } @@ -77,12 +77,12 @@ public class ProcCommand extends Command { @Override public List getLongDesc() { return asList( - "The proc command provides miscellaneous information about the process currently controlling Baritone.", - "", - "You are not expected to understand this if you aren't familiar with how Baritone works.", - "", - "Usage:", - "> proc - View process information, if present" + "The proc command provides miscellaneous information about the process currently controlling Baritone.", + "", + "You are not expected to understand this if you aren't familiar with how Baritone works.", + "", + "Usage:", + "> proc - View process information, if present" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java b/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java index a7904bda..1ac5c6d7 100644 --- a/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ReloadAllCommand.java @@ -51,10 +51,10 @@ public class ReloadAllCommand extends Command { @Override public List getLongDesc() { return asList( - "The reloadall command reloads Baritone's world cache.", - "", - "Usage:", - "> reloadall" + "The reloadall command reloads Baritone's world cache.", + "", + "Usage:", + "> reloadall" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/RenderCommand.java b/src/main/java/baritone/utils/command/defaults/RenderCommand.java index 90a260a5..e59664f9 100644 --- a/src/main/java/baritone/utils/command/defaults/RenderCommand.java +++ b/src/main/java/baritone/utils/command/defaults/RenderCommand.java @@ -39,12 +39,12 @@ public class RenderCommand extends Command { BetterBlockPos origin = ctx.playerFeet(); int renderDistance = (MC.gameSettings.renderDistanceChunks + 1) * 16; MC.renderGlobal.markBlockRangeForRenderUpdate( - origin.x - renderDistance, - 0, - origin.z - renderDistance, - origin.x + renderDistance, - 255, - origin.z + renderDistance + origin.x - renderDistance, + 0, + origin.z - renderDistance, + origin.x + renderDistance, + 255, + origin.z + renderDistance ); logDirect("Done"); @@ -63,10 +63,10 @@ public class RenderCommand extends Command { @Override public List getLongDesc() { return asList( - "The render command fixes glitched chunk rendering without having to reload all of them.", - "", - "Usage:", - "> render" + "The render command fixes glitched chunk rendering without having to reload all of them.", + "", + "Usage:", + "> render" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/RepackCommand.java b/src/main/java/baritone/utils/command/defaults/RepackCommand.java index 357197ee..b64d4b8e 100644 --- a/src/main/java/baritone/utils/command/defaults/RepackCommand.java +++ b/src/main/java/baritone/utils/command/defaults/RepackCommand.java @@ -51,10 +51,10 @@ public class RepackCommand extends Command { @Override public List getLongDesc() { return asList( - "Repack chunks around you. This basically re-caches them.", - "", - "Usage:", - "> repack - Repack chunks." + "Repack chunks around you. This basically re-caches them.", + "", + "Usage:", + "> repack - Repack chunks." ); } } diff --git a/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java b/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java index 953e7527..ae8d603d 100644 --- a/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java +++ b/src/main/java/baritone/utils/command/defaults/SaveAllCommand.java @@ -51,10 +51,10 @@ public class SaveAllCommand extends Command { @Override public List getLongDesc() { return asList( - "The saveall command saves Baritone's world cache.", - "", - "Usage:", - "> saveall" + "The saveall command saves Baritone's world cache.", + "", + "Usage:", + "> saveall" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java b/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java index be455bc2..1b83ded8 100644 --- a/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java +++ b/src/main/java/baritone/utils/command/defaults/SchematicaCommand.java @@ -50,10 +50,10 @@ public class SchematicaCommand extends Command { @Override public List getLongDesc() { return asList( - "Builds the schematica currently open in Schematica.", - "", - "Usage:", - "> schematica" + "Builds the schematica currently open in Schematica.", + "", + "Usage:", + "> schematica" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/SelCommand.java b/src/main/java/baritone/utils/command/defaults/SelCommand.java index fcaae5ed..9952b8a1 100644 --- a/src/main/java/baritone/utils/command/defaults/SelCommand.java +++ b/src/main/java/baritone/utils/command/defaults/SelCommand.java @@ -19,11 +19,7 @@ package baritone.utils.command.defaults; import baritone.api.Settings; import baritone.api.event.events.RenderEvent; -import baritone.api.schematic.CompositeSchematic; -import baritone.api.schematic.FillSchematic; -import baritone.api.schematic.ReplaceSchematic; -import baritone.api.schematic.ShellSchematic; -import baritone.api.schematic.WallsSchematic; +import baritone.api.schematic.*; import baritone.api.selection.ISelection; import baritone.api.selection.ISelectionManager; import baritone.api.utils.BetterBlockPos; @@ -44,7 +40,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3i; -import java.awt.Color; +import java.awt.*; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -109,8 +105,8 @@ public class SelCommand extends Command { } } else if (action == Action.SET || action == Action.WALLS || action == Action.SHELL || action == Action.CLEARAREA || action == Action.REPLACE) { BlockOptionalMeta type = action == Action.CLEARAREA - ? new BlockOptionalMeta(Blocks.AIR) - : args.getDatatypeFor(ForBlockOptionalMeta.class); + ? new BlockOptionalMeta(Blocks.AIR) + : args.getDatatypeFor(ForBlockOptionalMeta.class); BlockOptionalMetaLookup replaces = null; if (action == Action.REPLACE) { @@ -142,9 +138,9 @@ public class SelCommand extends Command { for (ISelection selection : selections) { BetterBlockPos min = selection.min(); origin = new BetterBlockPos( - Math.min(origin.x, min.x), - Math.min(origin.y, min.y), - Math.min(origin.z, min.z) + Math.min(origin.x, min.x), + Math.min(origin.y, min.y), + Math.min(origin.z, min.z) ); } @@ -204,10 +200,10 @@ public class SelCommand extends Command { protected Stream tabCompleted(String label, ArgConsumer args, Settings settings) { if (args.hasExactlyOne()) { return new TabCompleteHelper() - .append(Action.getAllNames()) - .filterPrefix(args.getString()) - .sortAlphabetically() - .stream(); + .append(Action.getAllNames()) + .filterPrefix(args.getString()) + .sortAlphabetically() + .stream(); } else { Action action = Action.getByName(args.getString()); @@ -227,10 +223,10 @@ public class SelCommand extends Command { } else if (action == Action.EXPAND || action == Action.CONTRACT || action == Action.SHIFT) { if (args.hasExactlyOne()) { return new TabCompleteHelper() - .append(TransformTarget.getAllNames()) - .filterPrefix(args.getString()) - .sortAlphabetically() - .stream(); + .append(TransformTarget.getAllNames()) + .filterPrefix(args.getString()) + .sortAlphabetically() + .stream(); } else { TransformTarget target = TransformTarget.getByName(args.getString()); @@ -253,29 +249,29 @@ public class SelCommand extends Command { @Override public List getLongDesc() { return asList( - "The sel command allows you to manipulate Baritone's selections, similarly to WorldEdit.", - "", - "Using these selections, you can clear areas, fill them with blocks, or something else.", - "", - "The expand/contract/shift commands use a kind of selector to choose which selections to target. Supported ones are a/all, n/newest, and o/oldest.", - "", - "Usage:", - "> sel pos1/p1/1 - Set position 1 to your current position.", - "> sel pos1/p1/1 - Set position 1 to a relative position.", - "> sel pos2/p2/2 - Set position 2 to your current position.", - "> sel pos2/p2/2 - Set position 2 to a relative position.", - "", - "> sel clear/c - Clear the selection.", - "> sel undo/u - Undo the last action (setting positions, creating selections, etc.)", - "> sel set/fill/s/f [block] - Completely fill all selections with a block.", - "> sel walls/w [block] - Fill in the walls of the selection with a specified block.", - "> sel shell/shl [block] - The same as walls, but fills in a ceiling and floor too.", - "> sel cleararea/ca - Basically 'set air'.", - "> sel replace/r - Replaces blocks with another block.", - "", - "> sel expand - Expand the targets.", - "> sel contract - Contract the targets.", - "> sel shift - Shift the targets (does not resize)." + "The sel command allows you to manipulate Baritone's selections, similarly to WorldEdit.", + "", + "Using these selections, you can clear areas, fill them with blocks, or something else.", + "", + "The expand/contract/shift commands use a kind of selector to choose which selections to target. Supported ones are a/all, n/newest, and o/oldest.", + "", + "Usage:", + "> sel pos1/p1/1 - Set position 1 to your current position.", + "> sel pos1/p1/1 - Set position 1 to a relative position.", + "> sel pos2/p2/2 - Set position 2 to your current position.", + "> sel pos2/p2/2 - Set position 2 to a relative position.", + "", + "> sel clear/c - Clear the selection.", + "> sel undo/u - Undo the last action (setting positions, creating selections, etc.)", + "> sel set/fill/s/f [block] - Completely fill all selections with a block.", + "> sel walls/w [block] - Fill in the walls of the selection with a specified block.", + "> sel shell/shl [block] - The same as walls, but fills in a ceiling and floor too.", + "> sel cleararea/ca - Basically 'set air'.", + "> sel replace/r - Replaces blocks with another block.", + "", + "> sel expand - Expand the targets.", + "> sel contract - Contract the targets.", + "> sel shift - Shift the targets (does not resize)." ); } @@ -327,8 +323,8 @@ public class SelCommand extends Command { enum TransformTarget { ALL(sels -> sels, "all", "a"), - NEWEST(sels -> new ISelection[] {sels[sels.length - 1]}, "newest", "n"), - OLDEST(sels -> new ISelection[] {sels[0]}, "oldest", "o"); + NEWEST(sels -> new ISelection[]{sels[sels.length - 1]}, "newest", "n"), + OLDEST(sels -> new ISelection[]{sels[0]}, "oldest", "o"); private final Function transform; private final String[] names; diff --git a/src/main/java/baritone/utils/command/defaults/SetCommand.java b/src/main/java/baritone/utils/command/defaults/SetCommand.java index 4588c450..7fa33d26 100644 --- a/src/main/java/baritone/utils/command/defaults/SetCommand.java +++ b/src/main/java/baritone/utils/command/defaults/SetCommand.java @@ -66,44 +66,44 @@ public class SetCommand extends Command { args.requireMax(1); List toPaginate = - (viewModified ? SettingsUtil.modifiedSettings(settings) : settings.allSettings).stream() - .filter(s -> !s.getName().equals("logger")) - .filter(s -> s.getName().toLowerCase(Locale.US).contains(search.toLowerCase(Locale.US))) - .sorted((s1, s2) -> String.CASE_INSENSITIVE_ORDER.compare(s1.getName(), s2.getName())) - .collect(Collectors.toList()); + (viewModified ? SettingsUtil.modifiedSettings(settings) : settings.allSettings).stream() + .filter(s -> !s.getName().equals("logger")) + .filter(s -> s.getName().toLowerCase(Locale.US).contains(search.toLowerCase(Locale.US))) + .sorted((s1, s2) -> String.CASE_INSENSITIVE_ORDER.compare(s1.getName(), s2.getName())) + .collect(Collectors.toList()); Paginator.paginate( - args, - new Paginator<>(toPaginate), - () -> logDirect( - !search.isEmpty() - ? String.format("All %ssettings containing the string '%s':", viewModified ? "modified " : "", search) - : String.format("All %ssettings:", viewModified ? "modified " : "") - ), - setting -> { - ITextComponent typeComponent = new TextComponentString(String.format( - " (%s)", - settingTypeToString(setting) - )); - typeComponent.getStyle().setColor(TextFormatting.DARK_GRAY); + args, + new Paginator<>(toPaginate), + () -> logDirect( + !search.isEmpty() + ? String.format("All %ssettings containing the string '%s':", viewModified ? "modified " : "", search) + : String.format("All %ssettings:", viewModified ? "modified " : "") + ), + setting -> { + ITextComponent typeComponent = new TextComponentString(String.format( + " (%s)", + settingTypeToString(setting) + )); + typeComponent.getStyle().setColor(TextFormatting.DARK_GRAY); - ITextComponent hoverComponent = new TextComponentString(""); - hoverComponent.getStyle().setColor(TextFormatting.GRAY); - hoverComponent.appendText(setting.getName()); - hoverComponent.appendText(String.format("\nType: %s", settingTypeToString(setting))); - hoverComponent.appendText(String.format("\n\nValue:\n%s", settingValueToString(setting))); - String commandSuggestion = settings.prefix.value + String.format("set %s ", setting.getName()); + ITextComponent hoverComponent = new TextComponentString(""); + hoverComponent.getStyle().setColor(TextFormatting.GRAY); + hoverComponent.appendText(setting.getName()); + hoverComponent.appendText(String.format("\nType: %s", settingTypeToString(setting))); + hoverComponent.appendText(String.format("\n\nValue:\n%s", settingValueToString(setting))); + String commandSuggestion = settings.prefix.value + String.format("set %s ", setting.getName()); - ITextComponent component = new TextComponentString(setting.getName()); - component.getStyle().setColor(TextFormatting.GRAY); - component.appendSibling(typeComponent); - component.getStyle() - .setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent)) - .setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, commandSuggestion)); + ITextComponent component = new TextComponentString(setting.getName()); + component.getStyle().setColor(TextFormatting.GRAY); + component.appendSibling(typeComponent); + component.getStyle() + .setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverComponent)) + .setClickEvent(new ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, commandSuggestion)); - return component; - }, - FORCE_COMMAND_PREFIX + "set " + arg + " " + search + return component; + }, + FORCE_COMMAND_PREFIX + "set " + arg + " " + search ); return; @@ -135,9 +135,9 @@ public class SetCommand extends Command { String settingName = doingSomething ? args.getString() : arg; Settings.Setting setting = settings.allSettings.stream() - .filter(s -> s.getName().equalsIgnoreCase(settingName)) - .findFirst() - .orElse(null); + .filter(s -> s.getName().equalsIgnoreCase(settingName)) + .findFirst() + .orElse(null); if (isNull(setting)) { throw new CommandInvalidTypeException(args.consumed(), "a valid setting"); @@ -160,9 +160,9 @@ public class SetCommand extends Command { ((Settings.Setting) setting).value ^= true; logDirect(String.format( - "Toggled setting %s to %s", - setting.getName(), - Boolean.toString((Boolean) setting.value) + "Toggled setting %s to %s", + setting.getName(), + Boolean.toString((Boolean) setting.value) )); } else { String newValue = args.getString(); @@ -177,29 +177,29 @@ public class SetCommand extends Command { if (!toggling) { logDirect(String.format( - "Successfully %s %s to %s", - resetting ? "reset" : "set", - setting.getName(), - settingValueToString(setting) + "Successfully %s %s to %s", + resetting ? "reset" : "set", + setting.getName(), + settingValueToString(setting) )); } ITextComponent oldValueComponent = new TextComponentString(String.format("Old value: %s", oldValue)); oldValueComponent.getStyle() - .setColor(TextFormatting.GRAY) - .setHoverEvent(new HoverEvent( - HoverEvent.Action.SHOW_TEXT, - new TextComponentString("Click to set the setting back to this value") - )) - .setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - FORCE_COMMAND_PREFIX + String.format("set %s %s", setting.getName(), oldValue) - )); + .setColor(TextFormatting.GRAY) + .setHoverEvent(new HoverEvent( + HoverEvent.Action.SHOW_TEXT, + new TextComponentString("Click to set the setting back to this value") + )) + .setClickEvent(new ClickEvent( + ClickEvent.Action.RUN_COMMAND, + FORCE_COMMAND_PREFIX + String.format("set %s %s", setting.getName(), oldValue) + )); logDirect(oldValueComponent); if ((setting.getName().equals("chatControl") && !(Boolean) setting.value && !settings.chatControlAnyway.value) || - setting.getName().equals("chatControlAnyway") && !(Boolean) setting.value && !settings.chatControl.value) { + setting.getName().equals("chatControlAnyway") && !(Boolean) setting.value && !settings.chatControl.value) { logDirect("Warning: Chat commands will no longer work. If you want to revert this change, use prefix control (if enabled) or click the old value listed above.", TextFormatting.RED); } else if (setting.getName().equals("prefixControl") && !(Boolean) setting.value) { logDirect("Warning: Prefixed commands will no longer work. If you want to revert this change, use chat control (if enabled) or click the old value listed above.", TextFormatting.RED); @@ -217,15 +217,15 @@ public class SetCommand extends Command { if (args.hasExactlyOne() && !asList("s", "save").contains(args.peekString().toLowerCase(Locale.US))) { if (arg.equalsIgnoreCase("reset")) { return new TabCompleteHelper() - .addModifiedSettings() - .prepend("all") - .filterPrefix(args.getString()) - .stream(); + .addModifiedSettings() + .prepend("all") + .filterPrefix(args.getString()) + .stream(); } else if (arg.equalsIgnoreCase("toggle")) { return new TabCompleteHelper() - .addToggleableSettings() - .filterPrefix(args.getString()) - .stream(); + .addToggleableSettings() + .filterPrefix(args.getString()) + .stream(); } Settings.Setting setting = settings.byLowerName.get(arg.toLowerCase(Locale.US)); @@ -247,11 +247,11 @@ public class SetCommand extends Command { } } else if (!args.has()) { return new TabCompleteHelper() - .addSettings() - .sortAlphabetically() - .prepend("list", "modified", "reset", "toggle", "save") - .filterPrefix(arg) - .stream(); + .addSettings() + .sortAlphabetically() + .prepend("list", "modified", "reset", "toggle", "save") + .filterPrefix(arg) + .stream(); } } @@ -266,18 +266,18 @@ public class SetCommand extends Command { @Override public List getLongDesc() { return asList( - "Using the set command, you can manage all of Baritone's settings. Almost every aspect is controlled by these settings - go wild!", - "", - "Usage:", - "> set - Same as `set list`", - "> set list [page] - View all settings", - "> set modified [page] - View modified settings", - "> set - View the current value of a setting", - "> set - Set the value of a setting", - "> set reset all - Reset ALL SETTINGS to their defaults", - "> set reset - Reset a setting to its default", - "> set toggle - Toggle a boolean setting", - "> set save - Save all settings (this is automatic tho)" + "Using the set command, you can manage all of Baritone's settings. Almost every aspect is controlled by these settings - go wild!", + "", + "Usage:", + "> set - Same as `set list`", + "> set list [page] - View all settings", + "> set modified [page] - View modified settings", + "> set - View the current value of a setting", + "> set - Set the value of a setting", + "> set reset all - Reset ALL SETTINGS to their defaults", + "> set reset - Reset a setting to its default", + "> set toggle - Toggle a boolean setting", + "> set save - Save all settings (this is automatic tho)" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java b/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java index 2f83cb0c..e51f96a8 100644 --- a/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java +++ b/src/main/java/baritone/utils/command/defaults/ThisWayCommand.java @@ -37,9 +37,9 @@ public class ThisWayCommand extends Command { args.requireExactly(1); GoalXZ goal = GoalXZ.fromDirection( - ctx.playerFeetAsVec(), - ctx.player().rotationYawHead, - args.getAs(Double.class) + ctx.playerFeetAsVec(), + ctx.player().rotationYawHead, + args.getAs(Double.class) ); baritone.getCustomGoalProcess().setGoal(goal); @@ -59,10 +59,10 @@ public class ThisWayCommand extends Command { @Override public List getLongDesc() { return asList( - "Creates a GoalXZ some amount of blocks in the direction you're currently looking", - "", - "Usage:", - "> thisway - makes a GoalXZ distance blocks in front of you" + "Creates a GoalXZ some amount of blocks in the direction you're currently looking", + "", + "Usage:", + "> thisway - makes a GoalXZ distance blocks in front of you" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/TunnelCommand.java b/src/main/java/baritone/utils/command/defaults/TunnelCommand.java index 8d59fba6..a355e2e2 100644 --- a/src/main/java/baritone/utils/command/defaults/TunnelCommand.java +++ b/src/main/java/baritone/utils/command/defaults/TunnelCommand.java @@ -38,8 +38,8 @@ public class TunnelCommand extends Command { args.requireMax(0); Goal goal = new GoalStrictDirection( - ctx.playerFeet(), - ctx.player().getHorizontalFacing() + ctx.playerFeet(), + ctx.player().getHorizontalFacing() ); baritone.getCustomGoalProcess().setGoal(goal); @@ -59,10 +59,10 @@ public class TunnelCommand extends Command { @Override public List getLongDesc() { return asList( - "The tunnel command sets a goal that tells Baritone to mine completely straight in the direction that you're facing.", - "", - "Usage:", - "> tunnel" + "The tunnel command sets a goal that tells Baritone to mine completely straight in the direction that you're facing.", + "", + "Usage:", + "> tunnel" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/VersionCommand.java b/src/main/java/baritone/utils/command/defaults/VersionCommand.java index 71b30c19..f6e25be4 100644 --- a/src/main/java/baritone/utils/command/defaults/VersionCommand.java +++ b/src/main/java/baritone/utils/command/defaults/VersionCommand.java @@ -59,10 +59,10 @@ public class VersionCommand extends Command { @Override public List getLongDesc() { return asList( - "The version command prints the version of Baritone you're currently running.", - "", - "Usage:", - "> version - View version information, if present" + "The version command prints the version of Baritone you're currently running.", + "", + "Usage:", + "> version - View version information, if present" ); } } diff --git a/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java b/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java index 7069e02f..cf02f67b 100644 --- a/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/utils/command/defaults/WaypointsCommand.java @@ -76,27 +76,27 @@ public class WaypointsCommand extends Command { component.appendSibling(nameComponent); component.appendSibling(timestamp); component.getStyle() - .setHoverEvent(new HoverEvent( - HoverEvent.Action.SHOW_TEXT, - new TextComponentString("Click to select") - )) - .setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - String.format( - "%s%s %s %s @ %d", - FORCE_COMMAND_PREFIX, - label, - _action.names[0], - waypoint.getTag().getName(), - waypoint.getCreationTimestamp() + .setHoverEvent(new HoverEvent( + HoverEvent.Action.SHOW_TEXT, + new TextComponentString("Click to select") )) - ); + .setClickEvent(new ClickEvent( + ClickEvent.Action.RUN_COMMAND, + String.format( + "%s%s %s %s @ %d", + FORCE_COMMAND_PREFIX, + label, + _action.names[0], + waypoint.getTag().getName(), + waypoint.getCreationTimestamp() + )) + ); return component; }; Function transform = waypoint -> - toComponent.apply(waypoint, action == Action.LIST ? Action.INFO : action); + toComponent.apply(waypoint, action == Action.LIST ? Action.INFO : action); if (action == Action.LIST) { IWaypoint.Tag tag = args.has() ? IWaypoint.Tag.getByName(args.peekString()) : null; @@ -106,34 +106,34 @@ public class WaypointsCommand extends Command { } IWaypoint[] waypoints = tag != null - ? ForWaypoints.getWaypointsByTag(tag) - : ForWaypoints.getWaypoints(); + ? ForWaypoints.getWaypointsByTag(tag) + : ForWaypoints.getWaypoints(); if (waypoints.length > 0) { args.requireMax(1); Paginator.paginate( - args, - waypoints, - () -> logDirect( - tag != null - ? String.format("All waypoints by tag %s:", tag.name()) - : "All waypoints:" - ), - transform, - String.format( - "%s%s %s%s", - FORCE_COMMAND_PREFIX, - label, - action.names[0], - tag != null ? " " + tag.getName() : "" - ) + args, + waypoints, + () -> logDirect( + tag != null + ? String.format("All waypoints by tag %s:", tag.name()) + : "All waypoints:" + ), + transform, + String.format( + "%s%s %s%s", + FORCE_COMMAND_PREFIX, + label, + action.names[0], + tag != null ? " " + tag.getName() : "" + ) ); } else { args.requireMax(0); throw new CommandInvalidStateException( - tag != null - ? "No waypoints found by that tag" - : "No waypoints found" + tag != null + ? "No waypoints found by that tag" + : "No waypoints found" ); } } else if (action == Action.SAVE) { @@ -145,8 +145,8 @@ public class WaypointsCommand extends Command { String name = args.has() ? args.getString() : ""; BetterBlockPos pos = args.has() - ? args.getDatatypePost(RelativeBlockPos.class, ctx.playerFeet()) - : ctx.playerFeet(); + ? args.getDatatypePost(RelativeBlockPos.class, ctx.playerFeet()) + : ctx.playerFeet(); args.requireMax(0); @@ -198,17 +198,17 @@ public class WaypointsCommand extends Command { if (waypoint == null) { args.requireMax(1); Paginator.paginate( - args, - waypoints, - () -> logDirect("Multiple waypoints were found:"), - transform, - String.format( - "%s%s %s %s", - FORCE_COMMAND_PREFIX, - label, - action.names[0], - args.consumedString() - ) + args, + waypoints, + () -> logDirect("Multiple waypoints were found:"), + transform, + String.format( + "%s%s %s %s", + FORCE_COMMAND_PREFIX, + label, + action.names[0], + args.consumedString() + ) ); } else { if (action == Action.INFO) { @@ -216,34 +216,34 @@ public class WaypointsCommand extends Command { logDirect(String.format("Position: %s", waypoint.getLocation())); ITextComponent deleteComponent = new TextComponentString("Click to delete this waypoint"); deleteComponent.getStyle().setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - String.format( - "%s%s delete %s @ %d", - FORCE_COMMAND_PREFIX, - label, - waypoint.getTag().getName(), - waypoint.getCreationTimestamp() - ) + ClickEvent.Action.RUN_COMMAND, + String.format( + "%s%s delete %s @ %d", + FORCE_COMMAND_PREFIX, + label, + waypoint.getTag().getName(), + waypoint.getCreationTimestamp() + ) )); ITextComponent goalComponent = new TextComponentString("Click to set goal to this waypoint"); goalComponent.getStyle().setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - String.format( - "%s%s goal %s @ %d", - FORCE_COMMAND_PREFIX, - label, - waypoint.getTag().getName(), - waypoint.getCreationTimestamp() - ) + ClickEvent.Action.RUN_COMMAND, + String.format( + "%s%s goal %s @ %d", + FORCE_COMMAND_PREFIX, + label, + waypoint.getTag().getName(), + waypoint.getCreationTimestamp() + ) )); ITextComponent backComponent = new TextComponentString("Click to return to the waypoints list"); backComponent.getStyle().setClickEvent(new ClickEvent( - ClickEvent.Action.RUN_COMMAND, - String.format( - "%s%s list", - FORCE_COMMAND_PREFIX, - label - ) + ClickEvent.Action.RUN_COMMAND, + String.format( + "%s%s list", + FORCE_COMMAND_PREFIX, + label + ) )); logDirect(deleteComponent); logDirect(goalComponent); @@ -265,20 +265,20 @@ public class WaypointsCommand extends Command { if (args.has()) { if (args.hasExactlyOne()) { return new TabCompleteHelper() - .append(Action.getAllNames()) - .sortAlphabetically() - .filterPrefix(args.getString()) - .stream(); + .append(Action.getAllNames()) + .sortAlphabetically() + .filterPrefix(args.getString()) + .stream(); } else { Action action = Action.getByName(args.getString()); if (args.hasExactlyOne()) { if (action == Action.LIST || action == Action.SAVE || action == Action.CLEAR) { return new TabCompleteHelper() - .append(IWaypoint.Tag.getAllNames()) - .sortAlphabetically() - .filterPrefix(args.getString()) - .stream(); + .append(IWaypoint.Tag.getAllNames()) + .sortAlphabetically() + .filterPrefix(args.getString()) + .stream(); } else { return args.tabCompleteDatatype(ForWaypoints.class); } @@ -301,20 +301,20 @@ public class WaypointsCommand extends Command { @Override public List getLongDesc() { return asList( - "The waypoint command allows you to manage Baritone's waypoints.", - "", - "Waypoints can be used to mark positions for later. Waypoints are each given a tag and an optional name.", - "", - "Note that the info, delete, and goal commands let you specify a waypoint by tag. If there is more than one waypoint with a certain tag, then they will let you select which waypoint you mean.", - "", - "Usage:", - "> wp [l/list] - List all waypoints.", - "> wp - Save your current position as an unnamed waypoint with the specified tag.", - "> wp - Save the waypoint with the specified name.", - "> wp - Save the waypoint with the specified name and position.", - "> wp - Show info on a waypoint by tag.", - "> wp - Delete a waypoint by tag.", - "> wp - Set a goal to a waypoint by tag." + "The waypoint command allows you to manage Baritone's waypoints.", + "", + "Waypoints can be used to mark positions for later. Waypoints are each given a tag and an optional name.", + "", + "Note that the info, delete, and goal commands let you specify a waypoint by tag. If there is more than one waypoint with a certain tag, then they will let you select which waypoint you mean.", + "", + "Usage:", + "> wp [l/list] - List all waypoints.", + "> wp - Save your current position as an unnamed waypoint with the specified tag.", + "> wp - Save the waypoint with the specified name.", + "> wp - Save the waypoint with the specified name and position.", + "> wp - Show info on a waypoint by tag.", + "> wp - Delete a waypoint by tag.", + "> wp - Set a goal to a waypoint by tag." ); } diff --git a/src/main/java/baritone/utils/schematic/schematica/SchematicAdapter.java b/src/main/java/baritone/utils/schematic/schematica/SchematicAdapter.java index 548e3e37..4743b79b 100644 --- a/src/main/java/baritone/utils/schematic/schematica/SchematicAdapter.java +++ b/src/main/java/baritone/utils/schematic/schematica/SchematicAdapter.java @@ -18,7 +18,6 @@ package baritone.utils.schematic.schematica; import baritone.api.utils.ISchematic; - import com.github.lunatrius.schematica.client.world.SchematicWorld; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/baritone/utils/schematic/schematica/SchematicaHelper.java b/src/main/java/baritone/utils/schematic/schematica/SchematicaHelper.java index 63b85670..bacf1e9d 100644 --- a/src/main/java/baritone/utils/schematic/schematica/SchematicaHelper.java +++ b/src/main/java/baritone/utils/schematic/schematica/SchematicaHelper.java @@ -39,7 +39,7 @@ public enum SchematicaHelper { public static Optional> getOpenSchematic() { return Optional.ofNullable(ClientProxy.schematic) - .map(world -> new Tuple<>(new SchematicAdapter(world), world.position)); + .map(world -> new Tuple<>(new SchematicAdapter(world), world.position)); } } diff --git a/src/schematica_api/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java b/src/schematica_api/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java index 80c1b2a2..d24074c4 100644 --- a/src/schematica_api/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java +++ b/src/schematica_api/java/com/github/lunatrius/schematica/client/world/SchematicWorld.java @@ -21,7 +21,7 @@ import com.github.lunatrius.core.util.math.MBlockPos; import com.github.lunatrius.schematica.api.ISchematic; public class SchematicWorld { - public final MBlockPos position = (MBlockPos)(Object)"cringe"; + public final MBlockPos position = (MBlockPos) (Object) "cringe"; public ISchematic getSchematic() { throw new LinkageError("LOL");