diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java index 44e471bf..a3e952c7 100644 --- a/src/api/java/baritone/api/Settings.java +++ b/src/api/java/baritone/api/Settings.java @@ -707,7 +707,7 @@ public final class Settings { /** * Move without having to force the client-sided rotations */ - public final Setting freeLook = new Setting<>(true); + public final Setting freeLook = new Setting<>(false); /** * Will cause some minor behavioral differences to ensure that Baritone works on anticheats. diff --git a/src/main/java/baritone/behavior/LookBehavior.java b/src/main/java/baritone/behavior/LookBehavior.java index 6fc57140..65485738 100644 --- a/src/main/java/baritone/behavior/LookBehavior.java +++ b/src/main/java/baritone/behavior/LookBehavior.java @@ -57,6 +57,7 @@ public final class LookBehavior extends Behavior implements ILookBehavior { this.force = force || !Baritone.settings().freeLook.value; } + // TODO: for some reason with freecam on this breaks @Override public void onPlayerUpdate(PlayerUpdateEvent event) { if (this.target == null) { @@ -78,10 +79,13 @@ public final class LookBehavior extends Behavior implements ILookBehavior { this.target = null; } + if (silent) { this.lastYaw = ctx.player().rotationYaw; + ctx.player().rotationPitch = this.target.getPitch(); ctx.player().rotationYaw = this.target.getYaw(); } + break; } case POST: { @@ -116,6 +120,11 @@ public final class LookBehavior extends Behavior implements ILookBehavior { } } + /** + * Smoothly pans to desired rotation + * @param desiredYaw + * @param desiredPitch + */ private void lookTo(float desiredYaw, float desiredPitch) { if (desiredPitch == ctx.player().rotationPitch) { desiredPitch = 0; diff --git a/src/main/java/baritone/command/defaults/LitematicaCommand.java b/src/main/java/baritone/command/defaults/LitematicaCommand.java index bfe0079b..acc90fb5 100644 --- a/src/main/java/baritone/command/defaults/LitematicaCommand.java +++ b/src/main/java/baritone/command/defaults/LitematicaCommand.java @@ -44,7 +44,7 @@ public class LitematicaCommand extends Command { try { baritone.getBuilderProcess().buildOpenLitematic(schematic); } catch (IndexOutOfBoundsException e) { - logDirect("Pleas provide a valid index."); + logDirect("Please provide a valid index."); } } diff --git a/src/main/java/baritone/command/defaults/WaypointsCommand.java b/src/main/java/baritone/command/defaults/WaypointsCommand.java index cf420e90..c3731e51 100644 --- a/src/main/java/baritone/command/defaults/WaypointsCommand.java +++ b/src/main/java/baritone/command/defaults/WaypointsCommand.java @@ -26,9 +26,7 @@ import baritone.api.command.Command; import baritone.api.command.argument.IArgConsumer; import baritone.api.command.datatypes.ForWaypoints; import baritone.api.command.datatypes.RelativeBlockPos; -import baritone.api.command.exception.CommandException; -import baritone.api.command.exception.CommandInvalidStateException; -import baritone.api.command.exception.CommandInvalidTypeException; +import baritone.api.command.exception.*; import baritone.api.command.helpers.Paginator; import baritone.api.command.helpers.TabCompleteHelper; import baritone.api.pathing.goals.Goal; @@ -151,9 +149,11 @@ public class WaypointsCommand extends Command { args.requireMax(1); IWaypoint.Tag tag = IWaypoint.Tag.getByName(args.getString()); IWaypoint[] waypoints = ForWaypoints.getWaypointsByTag(this.baritone, tag); + for (IWaypoint waypoint : waypoints) { ForWaypoints.waypoints(this.baritone).removeWaypoint(waypoint); } + deletedWaypoints.computeIfAbsent(baritone.getWorldProvider().getCurrentWorld(), k -> new ArrayList<>()).addAll(Arrays.asList(waypoints)); ITextComponent textComponent = new TextComponentString(String.format("Cleared %d waypoints, click to restore them", waypoints.length)); textComponent.getStyle().setClickEvent(new ClickEvent(