From 13ca691f5d1922571cfabaf6198b9b0f59500ade Mon Sep 17 00:00:00 2001 From: ZacSharp <68165024+ZacSharp@users.noreply.github.com> Date: Wed, 16 Sep 2020 17:41:46 +0200 Subject: [PATCH 1/3] make `#wp goto` behave like `#goto` It now is a combined `#wp goal` and `#path` just like `#goto` is `#goal` and `#path` --- .../java/baritone/command/defaults/WaypointsCommand.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/baritone/command/defaults/WaypointsCommand.java b/src/main/java/baritone/command/defaults/WaypointsCommand.java index 62c74212c..fb15b0537 100644 --- a/src/main/java/baritone/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -235,6 +235,10 @@ public class WaypointsCommand extends Command { Goal goal = new GoalBlock(waypoint.getLocation()); baritone.getCustomGoalProcess().setGoal(goal); logDirect(String.format("Goal: %s", goal)); + } else if (action == Action.GOTO) { + Goal goal = new GoalBlock(waypoint.getLocation()); + baritone.getCustomGoalProcess().setGoalAndPath(goal); + logDirect(String.format("Going to: %s", goal)); } } } @@ -302,7 +306,8 @@ public class WaypointsCommand extends Command { SAVE("save", "s"), INFO("info", "show", "i"), DELETE("delete", "d"), - GOAL("goal", "goto", "g"); + GOAL("goal", "g"), + GOTO("goto"); private final String[] names; Action(String... names) { From 508dacac639fd9bfc780b320bd1b60cef9107487 Mon Sep 17 00:00:00 2001 From: ZacSharp <68165024+ZacSharp@users.noreply.github.com> Date: Fri, 18 Sep 2020 22:41:33 +0200 Subject: [PATCH 2/3] directly start pathing after `#home` just like servers directly teleport you after `/home` without waiting for something like `/teleport` --- src/main/java/baritone/command/defaults/DefaultCommands.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/baritone/command/defaults/DefaultCommands.java b/src/main/java/baritone/command/defaults/DefaultCommands.java index 67555ed51..a08ff0ff0 100644 --- a/src/main/java/baritone/command/defaults/DefaultCommands.java +++ b/src/main/java/baritone/command/defaults/DefaultCommands.java @@ -63,7 +63,7 @@ public final class DefaultCommands { new ThisWayCommand(baritone), new WaypointsCommand(baritone), new CommandAlias(baritone, "sethome", "Sets your home waypoint", "waypoints save home"), - new CommandAlias(baritone, "home", "Set goal to your home waypoint", "waypoints goal home"), + new CommandAlias(baritone, "home", "Path to your home waypoint", "waypoints goto home"), new SelCommand(baritone) )); ExecutionControlCommands prc = new ExecutionControlCommands(baritone); From 8a572516fcd42158a16870214b560e1844423bb8 Mon Sep 17 00:00:00 2001 From: ZacSharp <68165024+ZacSharp@users.noreply.github.com> Date: Wed, 23 Sep 2020 22:54:41 +0200 Subject: [PATCH 3/3] Update description of WaypointsCommand --- src/main/java/baritone/command/defaults/WaypointsCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/baritone/command/defaults/WaypointsCommand.java b/src/main/java/baritone/command/defaults/WaypointsCommand.java index fb15b0537..67aad3654 100644 --- a/src/main/java/baritone/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -296,7 +296,8 @@ public class WaypointsCommand extends Command { "> 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." + "> wp - Set a goal to a waypoint by tag.", + "> wp - Set a goal to a waypoint by tag and start pathing." ); }