0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Store deleted waypoints per world

Browse Source 
Different dimensions are actually different worlds and the user might expect the wapoints to be restorable until they leave the server, so discrading them when the world changes would be too early.
This commit is contained in:
ZacSharp 2021-10-19 01:17:23 +02:00
parent 3244b102ad
commit 724162f37f
No known key found for this signature in database
GPG Key ID: 9453647B005083A3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/baritone/command/defaults/WaypointsCommand.java
View File

@ -21,6 +21,7 @@ import baritone.Baritone;
import baritone.api.IBaritone; import baritone.api.IBaritone;
import baritone.api.cache.IWaypoint; import baritone.api.cache.IWaypoint;
import baritone.api.cache.Waypoint; import baritone.api.cache.Waypoint;
import baritone.api.cache.IWorldData;
import baritone.api.command.Command; import baritone.api.command.Command;
import baritone.api.command.argument.IArgConsumer; import baritone.api.command.argument.IArgConsumer;
import baritone.api.command.datatypes.ForWaypoints; import baritone.api.command.datatypes.ForWaypoints;
@ -49,7 +50,7 @@ import static baritone.api.command.IBaritoneChatControl.FORCE_COMMAND_PREFIX;
public class WaypointsCommand extends Command { public class WaypointsCommand extends Command {
private List<IWaypoint> deletedWaypoints = new ArrayList<>(); private Map<IWorldData,List<IWaypoint>> deletedWaypoints = new HashMap<>();
public WaypointsCommand(IBaritone baritone) { public WaypointsCommand(IBaritone baritone) {
super(baritone, "waypoints", "waypoint", "wp"); super(baritone, "waypoints", "waypoint", "wp");
@ -153,7 +154,7 @@ public class WaypointsCommand extends Command {
for (IWaypoint waypoint : waypoints) { for (IWaypoint waypoint : waypoints) {
ForWaypoints.waypoints(this.baritone).removeWaypoint(waypoint); ForWaypoints.waypoints(this.baritone).removeWaypoint(waypoint);
} }
deletedWaypoints.addAll(Arrays.<IWaypoint>asList(waypoints)); deletedWaypoints.computeIfAbsent(baritone.getWorldProvider().getCurrentWorld(), k -> new ArrayList<>()).addAll(Arrays.<IWaypoint>asList(waypoints));
ITextComponent textComponent = new TextComponentString(String.format("Cleared %d waypoints, click to restore them", waypoints.length)); ITextComponent textComponent = new TextComponentString(String.format("Cleared %d waypoints, click to restore them", waypoints.length));
textComponent.getStyle().setClickEvent(new ClickEvent( textComponent.getStyle().setClickEvent(new ClickEvent(
ClickEvent.Action.RUN_COMMAND, ClickEvent.Action.RUN_COMMAND,
@ -167,6 +168,7 @@ public class WaypointsCommand extends Command {
logDirect(textComponent); logDirect(textComponent);
} else if (action == Action.RESTORE) { } else if (action == Action.RESTORE) {
List<IWaypoint> waypoints = new ArrayList<>(); List<IWaypoint> waypoints = new ArrayList<>();
List<IWaypoint> deletedWaypoints = this.deletedWaypoints.getOrDefault(baritone.getWorldProvider().getCurrentWorld(), Collections.emptyList());
if (args.peekString().equals("@")) { if (args.peekString().equals("@")) {
args.get(); args.get();
// no args.requireMin(1) because if the user clears an empty tag there is nothing to restore // no args.requireMin(1) because if the user clears an empty tag there is nothing to restore
@ -285,7 +287,7 @@ public class WaypointsCommand extends Command {
logDirect(backComponent); logDirect(backComponent);
} else if (action == Action.DELETE) { } else if (action == Action.DELETE) {
ForWaypoints.waypoints(this.baritone).removeWaypoint(waypoint); ForWaypoints.waypoints(this.baritone).removeWaypoint(waypoint);
deletedWaypoints.add(waypoint); deletedWaypoints.computeIfAbsent(baritone.getWorldProvider().getCurrentWorld(), k -> new ArrayList<>()).add(waypoint);
ITextComponent textComponent = new TextComponentString("That waypoint has successfully been deleted, click to restore it"); ITextComponent textComponent = new TextComponentString("That waypoint has successfully been deleted, click to restore it");
textComponent.getStyle().setClickEvent(new ClickEvent( textComponent.getStyle().setClickEvent(new ClickEvent(
ClickEvent.Action.RUN_COMMAND, ClickEvent.Action.RUN_COMMAND,