Updated Waypoints

Author: cev-api

README.md

@@ -174,7 +174,7 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 
 ### Waypoints
 - Create and save waypoints, with optional automatic death waypoints for all players.  
-- Manager UI (`.waypoints` or apostrophe key).  
+- Manager UI (`.waypoints` or apostrophe key) which sorts, highlights and filters waypoints.
 - Compass overlay: Show a bar at the top of the screen that shows the waypoint icons in your field of view
     - Shows names of waypoints when you're directly facing them
     - Adjustable position and transparency
@@ -190,6 +190,27 @@ I did not, nor could I copy their code directly as most are Meteor based mods. S
 - Adjustable Tri-state Beacon Mode on waypoints (On/Off/ESP) that matches the waypoint's color.
 - Toggleable automatic portal logging, logs numerically each portal you enter and matches it in the opposite dimension with the same number.
 
+
+#### Waypoint Commands
+
+Create a waypoint at the given coords (player position used when coords omitted).
+
+Set color, icon, visibility, line/beacon behavior, auto-action when near, max visible distance and label scale.
+
+```.waypoint add <name> [x=<int>] [y=<int>] [z=<int>] [dim=<overworld|nether|end>] [color=<#RRGGBB|#AARRGGBB>] [icon=<square|circle|triangle|star|diamond|skull|heart|check|x|arrow_down|sun|snowflake>] [visible=<true|false>] [lines=<true|false>] [opposite=<true|false>] [beacon=<off|solid|esp>] [action=<disabled|hide|delete>] [actiondist=<int>] [maxvisible=<int>] [scale=<decimal>]```
+
+#### Radius command
+
+Modify or remove waypoints within <radius> blocks of the player (current dimension only).
+
+```.waypoint radius <radius> [key=value ...] (alias: setradius)```
+
+Common keys: delete/remove, clear, color=<hex>, visible=<bool>, lines=<bool>, beacon=<mode>, maxvisible=<int>, icon=<name>.
+
+Booleans: true/false/1/0/yes/no/on/off. Color accepts leading # or 0x; 6‑digit -> opaque.
+
+Reports number of waypoints changed.
+
 ![WayPoints](https://i.imgur.com/dxFc17N.png) ![Waypoint Manager](https://i.imgur.com/K2xGVqc.png) ![Waypoint Editor](https://i.imgur.com/23i14s1.png)
 
 ### Chest Search

src/main/java/net/wurstclient/clickgui/screens/WaypointsScreen.java

@@ -46,6 +46,16 @@ public final class WaypointsScreen extends Screen
 	// Dimension filter (null = show all)
 	private net.wurstclient.waypoints.WaypointDimension filterDim = null;
 
+	private static enum SortMode
+	{
+		DATE,
+		NEAREST,
+		FURTHEST,
+		NAME
+	}
+	
+	private SortMode sortMode = SortMode.DATE;
+	
 	// One row = 4 buttons. We keep references so we can reposition & toggle
 	// visibility.
 	private static final class RowWidgets
@@ -62,6 +72,7 @@ private static final class RowWidgets
 	// Persisted scroll per-world+dimension so returning keeps the same
 	// position even if a new screen instance was created.
 	private static final Map<String, Integer> savedScrolls = new HashMap<>();
+	private static final Map<String, SortMode> savedSortModes = new HashMap<>();
 
 	private void saveScrollState()
 	{
@@ -70,6 +81,7 @@ private void saveScrollState()
 			String key = resolveWorldId() + ":"
 				+ (filterDim == null ? "ALL" : filterDim.name());
 			savedScrolls.put(key, scroll);
+			savedSortModes.put(key, sortMode);
 		}catch(Exception ignored)
 		{}
 	}
@@ -172,6 +184,39 @@ protected void init()
 			if(filterDim == null || w.getDimension() == filterDim)
 				cachedList.add(w);
 		}
+		
+		// Apply sorting
+		switch(sortMode)
+		{
+			case DATE -> cachedList.sort(
+				(a, b) -> Long.compare(b.getCreatedAt(), a.getCreatedAt()));
+			case NAME -> cachedList
+				.sort((a, b) -> a.getName().compareToIgnoreCase(b.getName()));
+			case NEAREST ->
+			{
+				if(minecraft.player != null)
+				{
+					BlockPos playerPos =
+						BlockPos.containing(minecraft.player.getX(),
+							minecraft.player.getY(), minecraft.player.getZ());
+					cachedList.sort(
+						(a, b) -> Double.compare(a.getPos().distSqr(playerPos),
+							b.getPos().distSqr(playerPos)));
+				}
+			}
+			case FURTHEST ->
+			{
+				if(minecraft.player != null)
+				{
+					BlockPos playerPos =
+						BlockPos.containing(minecraft.player.getX(),
+							minecraft.player.getY(), minecraft.player.getZ());
+					cachedList.sort(
+						(a, b) -> Double.compare(b.getPos().distSqr(playerPos),
+							a.getPos().distSqr(playerPos)));
+				}
+			}
+		}
 		listStartY = y;
 
 		// Determine viewport for the list (space until the Back button line)
@@ -186,6 +231,9 @@ protected void init()
 			Integer s = savedScrolls.get(key);
 			if(s != null)
 				scroll = s;
+			SortMode sm = savedSortModes.get(key);
+			if(sm != null)
+				sortMode = sm;
 		}catch(Exception ignored)
 		{}
 
@@ -263,9 +311,26 @@ protected void init()
 			scrollToBottom();
 		}).bounds(arrowX + 20, viewportBottom, 20, 20).build());
 
+		// Back button (smaller) and Sort button on same line
+		int backWidth = 200;
+		int sortWidth = 90;
+		addRenderableWidget(
+			Button.builder(Component.literal("Sort: " + sortMode.name()), b -> {
+				// cycle sort modes
+				sortMode = switch(sortMode)
+				{
+					case DATE -> SortMode.NEAREST;
+					case NEAREST -> SortMode.FURTHEST;
+					case FURTHEST -> SortMode.NAME;
+					default -> SortMode.DATE;
+				};
+				saveScrollState();
+				minecraft.setScreen(this);
+			}).bounds(x, this.height - 28, sortWidth, 20).build());
 		addRenderableWidget(Button
 			.builder(Component.literal("Back"), b -> minecraft.setScreen(prev))
-			.bounds(x, this.height - 28, 300, 20).build());
+			.bounds(x + sortWidth + 10, this.height - 28, backWidth, 20)
+			.build());
 	}
 
 	private void scrollBy(int dy)
@@ -412,12 +477,58 @@ public void render(GuiGraphics context, int mouseX, int mouseY, float delta)
 			rw.copyBtn.visible = visible;
 		}
 
+		// Hide default button labels for name buttons so we can draw a single
+		// centered/scrolling label later and avoid duplicate text (built-in
+		// rendering + our custom rendering causing two copies).
+		java.util.Map<RowWidgets, Component> _savedLabels =
+			new java.util.HashMap<>();
+		for(RowWidgets _rw : rows)
+		{
+			if(_rw == null || _rw.nameBtn == null || !_rw.nameBtn.visible)
+				continue;
+			_savedLabels.put(_rw, _rw.nameBtn.getMessage());
+			_rw.nameBtn.setMessage(Component.literal(""));
+		}
+		
 		super.render(context, mouseX, mouseY, delta);
 
+		// Restore messages so our custom drawing can read them
+		for(java.util.Map.Entry<RowWidgets, Component> e : _savedLabels
+			.entrySet())
+		{
+			RowWidgets _rw = e.getKey();
+			if(_rw != null && _rw.nameBtn != null)
+				_rw.nameBtn.setMessage(e.getValue());
+		}
+		
 		// Title
 		context.drawCenteredString(minecraft.font, "Waypoints", this.width / 2,
 			12, 0xFFFFFFFF);
 
+		// Draw beacon button backgrounds (overlay) and collect line outlines
+		java.util.List<RowWidgets> lineOutlineRows =
+			new java.util.ArrayList<>();
+		for(RowWidgets rw : rows)
+		{
+			if(rw == null || rw.nameBtn == null || !rw.nameBtn.visible)
+				continue;
+			if(rw.w.hasBeacon())
+			{
+				int nameLeft = x; // name button left
+				int nameTop = rw.nameBtn.getY();
+				int nameRight = nameLeft + 140; // name button width
+				int nameBottom = nameTop + 20;
+				int baseColor = rw.w.getColor();
+				// overlay with ~40% opacity so button shading remains visible
+				int overlay = (baseColor & 0x00FFFFFF) | 0x66000000; //
+				context.fill(nameLeft, nameTop, nameRight, nameBottom, overlay);
+				// label will be drawn later (consistent scrolling/clip)
+				{}
+			}
+			if(rw.w.isLines())
+				lineOutlineRows.add(rw);
+		}
+		
 		// Draw small color boxes for each saved waypoint next to the name
 		// Use the same filtered list as the rows to render color boxes and clip
 		// to viewport
@@ -458,10 +569,90 @@ public void render(GuiGraphics context, int mouseX, int mouseY, float delta)
 				0xFF333333);
 			// fill
 			context.fill(boxLeft, boxY, boxLeft + 16, boxY + 16, color);
+			
 		}
 
 		context.disableScissor();
 
+		// Draw line outlines collected earlier (use waypoint color and clamp to
+		// screen to avoid cut-off)
+		for(RowWidgets rw : lineOutlineRows)
+		{
+			if(rw == null || rw.nameBtn == null || !rw.nameBtn.visible)
+				continue;
+			int nameLeft = x;
+			int nameTop = rw.nameBtn.getY();
+			int nameRight = nameLeft + 140;
+			int nameBottom = nameTop + 20;
+			int stroke = rw.w.getColor();
+			int top = Math.max(0, nameTop - 1);
+			int bottom = Math.min(this.height, nameBottom + 1);
+			if(top >= bottom)
+				continue;
+			// top
+			context.fill(nameLeft - 1, top, nameRight + 1,
+				Math.min(bottom, nameTop), stroke);
+			// bottom
+			context.fill(nameLeft - 1, Math.max(top, nameBottom), nameRight + 1,
+				bottom, stroke);
+			// left
+			context.fill(nameLeft - 1, top, nameLeft, bottom, stroke);
+			// right
+			context.fill(nameRight, top, nameRight + 1, bottom, stroke);
+		}
+		
+		// Draw labels for all visible name buttons with clipping and centered
+		// scrolling
+		for(RowWidgets rw : rows)
+		{
+			if(rw == null || rw.nameBtn == null || !rw.nameBtn.visible)
+				continue;
+			int nameLeft = x;
+			int nameTop = rw.nameBtn.getY();
+			int nameRight = nameLeft + 140;
+			int nameBottom = nameTop + 20;
+			String label = rw.nameBtn.getMessage().getString();
+			int textWidth = minecraft.font.width(label);
+			int centerX = (nameLeft + nameRight) / 2;
+			int maxTextWidth = nameRight - nameLeft - 8; // padding both sides
+			if(maxTextWidth < 0)
+				maxTextWidth = 0;
+			context.enableScissor(nameLeft, nameTop, nameRight, nameBottom);
+			if(textWidth <= maxTextWidth || maxTextWidth == 0)
+			{
+				// draw centered
+				context.drawCenteredString(minecraft.font, label, centerX,
+					nameTop + 6, 0xFFFFFFFF);
+			}else
+			{
+				int gap = 20;
+				int period = textWidth + gap;
+				long t = System.currentTimeMillis();
+				int speed = 90; // text scroll, ms pixel
+				int offset = (int)((t / (long)speed) % period);
+				int x1 = centerX - textWidth / 2 - offset;
+				context.drawString(minecraft.font, label, x1, nameTop + 6,
+					0xFFFFFFFF);
+				context.drawString(minecraft.font, label, x1 + textWidth + gap,
+					nameTop + 6, 0xFFFFFFFF);
+			}
+			context.disableScissor();
+		}
+		
+		// Darken the "Hide" buttons for hidden waypoints with a 25% black
+		// overlay so they appear darker.
+		for(RowWidgets _rw : rows)
+		{
+			if(_rw == null || _rw.visBtn == null || !_rw.visBtn.visible)
+				continue;
+			if(!_rw.w.isVisible())
+			{
+				int vx = x + 145;
+				int vy = _rw.visBtn.getY();
+				context.fill(vx, vy, vx + 55, vy + 20, 0x66000000);
+			}
+		}
+		
 		// Draw scrollbar track & thumb (to the right of the list area)
 		int contentHeight = rows.size() * ROW_HEIGHT;
 		int trackWidth = 8;

src/main/java/net/wurstclient/commands/WaypointCmd.java

@@ -37,7 +37,8 @@ public WaypointCmd()
 				+ ">] [visible=<true|false>] [lines=<true|false>]"
 				+ " [opposite=<true|false>] [beacon=<off|solid|esp>]"
 				+ " [action=<disabled|hide|delete>] [actiondist=<int>]"
-				+ " [maxvisible=<int>] [scale=<decimal>]");
+				+ " [maxvisible=<int>] [scale=<decimal>]"
+				+ "\n.waypoint radius <radius> [key=value ...]  — modify/remove waypoints within radius around player");
 	}
 
 	@Override
@@ -53,6 +54,11 @@ public void call(String[] args) throws CmdException
 			handleAdd(Arrays.copyOfRange(args, 1, args.length));
 			break;
 
+			case "setradius":
+			case "radius":
+			handleSetRadius(Arrays.copyOfRange(args, 1, args.length));
+			break;
+			
 			default:
 			throw new CmdSyntaxError("Unknown subcommand: " + sub);
 		}
@@ -142,6 +148,40 @@ private void handleAdd(String[] args) throws CmdException
 				name, x, y, z, dim.name()));
 	}
 
+	private void handleSetRadius(String[] args) throws CmdException
+	{
+		if(args.length == 0)
+			throw new CmdSyntaxError("Missing radius.");
+		int radius;
+		try
+		{
+			radius = Integer.parseInt(args[0]);
+			if(radius < 0)
+				throw new NumberFormatException();
+		}catch(NumberFormatException e)
+		{
+			throw new CmdError("Invalid radius: " + args[0]);
+		}
+		Map<String, String> options = new LinkedHashMap<>();
+		for(int i = 1; i < args.length; i++)
+		{
+			String arg = args[i];
+			int eq = arg.indexOf('=');
+			if(eq < 0)
+				options.put(arg.toLowerCase(Locale.ROOT), "");
+			else
+			{
+				String key = arg.substring(0, eq).toLowerCase(Locale.ROOT);
+				String value = arg.substring(eq + 1);
+				options.put(key, value);
+			}
+		}
+		int changed =
+			WURST.getHax().waypointsHack.applyRadiusCommand(radius, options);
+		ChatUtils.message("Modified " + changed + " waypoint(s) within radius "
+			+ radius + ".");
+	}
+	
 	private int parseInt(String raw, String key, Integer fallback)
 		throws CmdException
 	{