Added hacklist improvements, logout waypoints, co-ordinates on disconnect

Author: cev-api

README.md

@@ -20,6 +20,7 @@
 import net.wurstclient.hacks.TooManyHaxHack;
 import net.wurstclient.util.ChatUtils;
 import net.wurstclient.util.RenderUtils;
+import net.wurstclient.ui.UiScale;
 import org.lwjgl.glfw.GLFW;
 
 public final class FeatureButton extends Component
@@ -152,7 +153,10 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		String name = feature.getName();
 		int tx = x1 + (x3 - x1 - TR.getWidth(name)) / 2;
 		int ty = y1 + 2;
-		context.drawText(TR, name, tx, ty, GUI.getTxtColor(), false);
+		double scale = UiScale.OVERRIDE_SCALE != 1.0 ? UiScale.OVERRIDE_SCALE
+			: UiScale.getScale();
+		RenderUtils.drawScaledText(context, TR, name, tx, ty, GUI.getTxtColor(),
+			false, scale);
 
 		context.state.goDownLayer();
 	}

src/main/java/net/wurstclient/clickgui/components/FeatureButton.java

@@ -8,6 +8,7 @@
 package net.wurstclient.hacks;
 
 import java.awt.Color;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +28,8 @@
 import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.util.RenderUtils;
+import net.wurstclient.waypoints.Waypoint;
+import net.wurstclient.waypoints.WaypointDimension;
 
 @SearchTags({"logout spots", "logouts"})
 public final class LogoutSpotsHack extends Hack
@@ -55,10 +58,14 @@ private static final class Entry
 			net.wurstclient.settings.SliderSetting.ValueDisplay.DECIMAL);
 	private final net.wurstclient.settings.CheckboxSetting showTracers =
 		new net.wurstclient.settings.CheckboxSetting("Show tracers", true);
+	private final net.wurstclient.settings.CheckboxSetting addAsWaypoint =
+		new net.wurstclient.settings.CheckboxSetting(
+			"Add logout spot as waypoint", false);
 
 	private final Map<UUID, Entry> spots = new HashMap<>();
 	private List<PlayerListEntry> lastList = List.of();
 	private Map<UUID, PlayerEntity> lastPlayers = Map.of();
+	private final Map<UUID, java.util.UUID> spotToWaypoint = new HashMap<>();
 
 	public LogoutSpotsHack()
 	{
@@ -68,6 +75,7 @@ public LogoutSpotsHack()
 		addSetting(lineColor);
 		addSetting(scale);
 		addSetting(showTracers);
+		addSetting(addAsWaypoint);
 	}
 
 	@Override
@@ -77,6 +85,7 @@ protected void onEnable()
 		snapshot();
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(RenderListener.class, this);
+		spotToWaypoint.clear();
 	}
 
 	@Override
@@ -85,6 +94,13 @@ protected void onDisable()
 		EVENTS.remove(UpdateListener.class, this);
 		EVENTS.remove(RenderListener.class, this);
 		spots.clear();
+		// remove any temporary waypoints that we created
+		if(WURST.getHax().waypointsHack != null)
+		{
+			for(java.util.UUID wp : new ArrayList<>(spotToWaypoint.values()))
+				WURST.getHax().waypointsHack.removeTemporaryWaypoint(wp);
+		}
+		spotToWaypoint.clear();
 	}
 
 	@Override
@@ -112,6 +128,31 @@ public void onUpdate()
 						float h = p.getHealth();
 						spots.put(id, new Entry(id, p.getName().getString(), b,
 							h, currentDimKey()));
+						// Optionally add a temporary waypoint for this logout
+						// spot
+						if(addAsWaypoint.isChecked()
+							&& WURST.getHax().waypointsHack != null
+							&& WURST.getHax().waypointsHack.isEnabled())
+						{
+							Waypoint w =
+								new Waypoint(java.util.UUID.randomUUID(),
+									System.currentTimeMillis());
+							w.setName("Logout: " + p.getName().getString());
+							w.setIcon("skull");
+							w.setColor(0xFF88CCFF);
+							w.setPos(new net.minecraft.util.math.BlockPos(
+								(int)p.getX(), (int)p.getY(), (int)p.getZ()));
+							// set waypoint dimension based on current world
+							w.setDimension(
+								mapDimKeyToWaypointDim(currentDimKey()));
+							w.setActionWhenNear(Waypoint.ActionWhenNear.DELETE);
+							w.setActionWhenNearDistance(4);
+							w.setLines(showTracers.isChecked());
+							// add as temporary waypoint via WaypointsHack API
+							java.util.UUID wpUuid = WURST.getHax().waypointsHack
+								.addTemporaryWaypoint(w);
+							spotToWaypoint.put(id, wpUuid);
+						}
 					}
 				}
 			snapshot();
@@ -120,7 +161,13 @@ public void onUpdate()
 		if(MC.world != null)
 		{
 			for(PlayerEntity p : MC.world.getPlayers())
+			{
 				spots.remove(p.getUuid());
+				// remove any temporary waypoint associated with this spot
+				java.util.UUID wp = spotToWaypoint.remove(p.getUuid());
+				if(wp != null && WURST.getHax().waypointsHack != null)
+					WURST.getHax().waypointsHack.removeTemporaryWaypoint(wp);
+			}
 		}
 	}
 
@@ -198,4 +245,15 @@ private void drawWorldLabel(MatrixStack matrices, String text, double x,
 		vcp.draw();
 		matrices.pop();
 	}
+	
+	private WaypointDimension mapDimKeyToWaypointDim(String dimKey)
+	{
+		return switch(dimKey == null ? "overworld" : dimKey)
+		{
+			case "overworld" -> WaypointDimension.OVERWORLD;
+			case "nether" -> WaypointDimension.NETHER;
+			case "end" -> WaypointDimension.END;
+			default -> WaypointDimension.OVERWORLD;
+		};
+	}
 }

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

@@ -20,7 +20,6 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.hud.BossBarHud;
-import net.minecraft.client.gui.hud.ClientBossBar;
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
@@ -106,6 +105,8 @@ public final class WaypointsHack extends Hack
 	private final CheckboxSetting showPlayerCoordsAboveCompass =
 		new CheckboxSetting("Show player XYZ above compass", false);
 
+	private final Set<java.util.UUID> tempWaypoints = new HashSet<>();
+	
 	public WaypointsHack()
 	{
 		super("Waypoints");
@@ -151,7 +152,7 @@ protected void onEnable()
 	@Override
 	protected void onDisable()
 	{
-		manager.save(worldId);
+		saveExcludingTemporaries();
 		EVENTS.remove(RenderListener.class, this);
 		EVENTS.remove(net.wurstclient.events.UpdateListener.class, this);
 		EVENTS.remove(DeathListener.class, this);
@@ -161,13 +162,65 @@ protected void onDisable()
 		knownDead.clear();
 	}
 
+	// Add a temporary waypoint that should not be persisted. Returns the
+	// created waypoint UUID.
+	public java.util.UUID addTemporaryWaypoint(Waypoint w)
+	{
+		manager.addOrUpdate(w);
+		tempWaypoints.add(w.getUuid());
+		// Do not persist permanently; but update file without temporaries
+		saveExcludingTemporaries();
+		return w.getUuid();
+	}
+	
+	public void removeTemporaryWaypoint(java.util.UUID uuid)
+	{
+		// remove from manager and from temp tracking
+		// find waypoint by uuid
+		Waypoint toRemove = null;
+		for(Waypoint wp : new ArrayList<>(manager.all()))
+			if(wp.getUuid().equals(uuid))
+			{
+				toRemove = wp;
+				break;
+			}
+		if(toRemove != null)
+		{
+			manager.remove(toRemove);
+			tempWaypoints.remove(uuid);
+			saveExcludingTemporaries();
+		}
+	}
+	
+	private void saveExcludingTemporaries()
+	{
+		if(tempWaypoints.isEmpty())
+		{
+			manager.save(worldId);
+			return;
+		}
+		// Backup temporary waypoints
+		ArrayList<Waypoint> backups = new ArrayList<>();
+		for(Waypoint w : new ArrayList<>(manager.all()))
+			if(tempWaypoints.contains(w.getUuid()))
+				backups.add(w);
+		// Remove temporaries from manager
+		for(Waypoint w : backups)
+			manager.remove(w);
+		// Save without temporaries
+		manager.save(worldId);
+		// Re-add temporaries
+		for(Waypoint w : backups)
+			manager.addOrUpdate(w);
+	}
+	
 	@Override
 	public void onUpdate()
 	{
 		String wid = resolveWorldId();
 		if(!wid.equals(worldId))
 		{
-			manager.save(worldId);
+			saveExcludingTemporaries();
 			worldId = wid;
 			manager.load(worldId);
 		}
@@ -204,7 +257,7 @@ public void onUpdate()
 						// Always save and prune
 						manager.addOrUpdate(w);
 						pruneDeaths();
-						manager.save(worldId);
+						saveExcludingTemporaries();
 						// Announce in chat if enabled (guard recursion)
 						if(chatOnDeath.isChecked())
 						{
@@ -290,7 +343,7 @@ public void onReceivedMessage(ChatInputEvent event)
 			// Always save and prune
 			manager.addOrUpdate(w);
 			pruneDeaths();
-			manager.save(worldId);
+			saveExcludingTemporaries();
 			otherDeathCooldown.put(id, now);
 
 			// If chat is enabled, append coordinates to the incoming line
@@ -464,7 +517,7 @@ public void onDeath()
 			w.setLines(deathWaypointLines.isChecked());
 			manager.addOrUpdate(w);
 			pruneDeaths();
-			manager.save(worldId);
+			saveExcludingTemporaries();
 		}
 
 		lastDeathAt = at;
@@ -853,7 +906,7 @@ private int getBossBarBottom(DrawContext context)
 		int maxY = screenHeight / 3;
 		// Vanilla boss bars start at y=12 and advance by 19px per entry.
 		int y = 12;
-		for(ClientBossBar bar : bossBarHud.bossBars.values())
+		for(int i = 0; i < bossBarHud.bossBars.size(); i++)
 		{
 			if(y >= maxY)
 				return maxY;