Xray Bug Fix, Xray Improvements, Waypoints Improvements

Author: cev-api

README.md

@@ -59,6 +59,7 @@ All credit for the original client goes to Wurst-Imperium and its contributors.
 ### Waypoints
 - Create and save waypoints, with optional automatic death waypoints for all players.  
 - Manager UI (`.waypoints` or apostrophe key).  
+- Preset icons
 - Features: name, coords, dimension, icon, visibility, lines, color, copy button, opposite coords, death pruning.  
 - Constant-size labels and optional tracers.  
 - Stored per world/server under `wurst/waypoints/<worldId>.json`.  
@@ -77,14 +78,14 @@ All credit for the original client goes to Wurst-Imperium and its contributors.
 Highlights dropped, equipped, and framed items with powerful filters and customization.
 
 - Base highlighting: all dropped items with configurable base color.  
-- Special filters: List, Item ID, or Query (keywords).  
+- Special filters: List, Item ID, or Query (multi-term keywords).  
 - Special colors & styles: fixed or rainbow, outline-only, lines-only-for-special.  
 - Equipped specials: highlight items held or worn by players/mobs (not yourself).  
 - Item frames: highlight frames if the contained item matches special criteria.  
-- Keyword matching: supports base ID, translation key, and display name (works with renamed/NBT/plugin-modified items).  
+- Keyword matching: supports base ID, translation key, and display name (works with renamed/NBT/plugin-modified items). 
+- Multi-term queries: comma-separated (e.g., `head, axe`).   
 - Rendering: boxes with fill + outline; tracers use special color (or base color).  
 - Robust parsing: lists accept unknown entries as keywords (safe parsing via `Identifier.tryParse`).  
-- Works across item, block, and entity lists (Search, MobSearch, X-Ray, BaseFinder, HandNoClip, Nuker).  
 
 Examples:  
 - Highlight skulls → Item ID: `minecraft:player_head`, special color: magenta, outline-only ON.  
@@ -93,13 +94,16 @@ Examples:
 ### Search improvements
 - Keyword queries supported; falls back to picker when empty.  
 - List mode with visual item list.  
-- Multi-term queries supported.  
+- Multi-term queries: comma-separated (e.g., `ore, ancient`).  
 - Rendering: Boxes, Lines, or Both. Tracers cancel view-bobbing.  
 - Fixed/rainbow line colors.  
 - Safer rescans and better crash handling.  
 
-### Xray improvements
-- Opacity and block type changes apply live without toggling.  
+### X-Ray improvements
+- Added ESP (Highlight Corners and or Fill Blocks)
+    - Uses cached positions for speed
+- Multi-term queries: comma-separated (e.g., `diamond, ancient`).  
+- Opacity, block type changes and 'only show exposed' apply live without toggling.  
 
 ### BaseFinder improvements
 - Updated natural blocks list to latest versions.  

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

@@ -57,8 +57,16 @@ public final class WaypointEditScreen extends Screen
 	private int dimIndex;
 	private ButtonWidget dimButton;
 
-	private static final String[] ICONS = new String[]{"square", "circle",
-		"triangle", "star", "diamond", "skull"};
+	private static final String[] ICON_KEYS =
+		new String[]{"square", "circle", "triangle", "star", "diamond", "skull",
+			"heart", "check", "x", "arrow_down", "sun", "snowflake"};
+	private static final String[] ICONS; // display labels (symbol + name)
+	static
+	{
+		ICONS = new String[ICON_KEYS.length];
+		for(int i = 0; i < ICON_KEYS.length; i++)
+			ICONS[i] = iconChar(ICON_KEYS[i]) + " " + ICON_KEYS[i];
+	}
 	private int iconIndex;
 	private ButtonWidget iconButton;
 
@@ -189,8 +197,8 @@ protected void init()
 		// removed yIcon tracking
 		iconIndex = 0;
 		String currentIcon = waypoint.getIcon();
-		for(int i = 0; i < ICONS.length; i++)
-			if(ICONS[i].equalsIgnoreCase(currentIcon))
+		for(int i = 0; i < ICON_KEYS.length; i++)
+			if(ICON_KEYS[i].equalsIgnoreCase(currentIcon))
 			{
 				iconIndex = i;
 				break;
@@ -333,7 +341,7 @@ private void saveAndBack()
 		waypoint.setDimension(WaypointDimension.values()[dimIndex]);
 
 		// Icon
-		waypoint.setIcon(ICONS[iconIndex]);
+		waypoint.setIcon(ICON_KEYS[iconIndex]);
 
 		// Color + transparency
 		int saveAlpha = (int)Math
@@ -355,6 +363,43 @@ private String toHex6(int argb)
 		return s;
 	}
 
+	private static String iconChar(String icon)
+	{
+		if(icon == null)
+			return "";
+		switch(icon.toLowerCase())
+		{
+			case "square":
+			return "■";
+			case "circle":
+			return "●";
+			case "triangle":
+			return "▲";
+			case "triangle_down":
+			return "▼";
+			case "star":
+			return "★";
+			case "diamond":
+			return "♦";
+			case "skull":
+			return "☠";
+			case "heart":
+			return "♥";
+			case "check":
+			return "✓";
+			case "x":
+			return "✗";
+			case "arrow_down":
+			return "↓";
+			case "sun":
+			return "☀";
+			case "snowflake":
+			return "❄";
+			default:
+			return "";
+		}
+	}
+	
 	@Override
 	public void render(DrawContext context, int mouseX, int mouseY, float delta)
 	{

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

@@ -49,6 +49,7 @@ protected void init()
 					w.setPos(BlockPos.ORIGIN);
 				w.setDimension(currentDim());
 				w.setMaxVisible(5000);
+				w.setLines(false); // default new waypoints without lines
 				client
 					.setScreen(new WaypointEditScreen(this, manager, w, true));
 			}).dimensions(x, y, 300, 20).build());

src/main/java/net/wurstclient/hacks/WaypointsHack.java

@@ -506,12 +506,26 @@ private String iconChar(String icon)
 			return "●";
 			case "triangle":
 			return "▲";
+			case "triangle_down":
+			return "▼";
 			case "star":
 			return "★";
 			case "diamond":
 			return "♦";
 			case "skull":
 			return "☠";
+			case "heart":
+			return "♥";
+			case "check":
+			return "✓";
+			case "x":
+			return "✗";
+			case "arrow_down":
+			return "↓";
+			case "sun":
+			return "☀";
+			case "snowflake":
+			return "❄";
 			default:
 			return "";
 		}