Updated PortalESP

Author: cev-api

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

@@ -334,7 +334,10 @@ public void onUpdate()
 			|| e.getValue().untilMs() < now);
 		offlineStasisLabels.entrySet()
 			.removeIf(e -> seenPearls.contains(e.getKey())
-				|| e.getValue() == null || e.getValue().untilMs() < now);
+				|| e.getValue() == null || e.getValue().untilMs() < now
+				|| isPositionOccupiedByVisiblePearl(
+					e.getValue() != null ? e.getValue().pos() : null,
+					seenPearls));
 
 		// Disconnect inference: pearls that disappeared since last frame
 		if(inferOwnership.isChecked())
@@ -343,31 +346,36 @@ public void onUpdate()
 			vanished.removeAll(seenPearls);
 			for(UUID vanishedUuid : vanished)
 			{
+				Vec3 vanishedPos = lastPearlPositions.get(vanishedUuid);
+				if(vanishedPos == null)
+					continue;
+					
+				// Skip if a currently visible pearl is at the same position
+				// (UUID change due to server re-creating the entity)
+				if(isPositionOccupiedByVisiblePearl(vanishedPos, seenPearls))
+					continue;
+				
 				UUID existingOwner = pearlOwnerUuids.get(vanishedUuid);
 				if(existingOwner != null)
 				{
-					Vec3 pos = lastPearlPositions.get(vanishedUuid);
-					if(pos != null)
-					{
-						String inferred = getOwnerUuidLabel(existingOwner);
-						if(inferred != null)
-							offlineStasisLabels.put(vanishedUuid,
-								new StasisLabel(
-									formatOfflineLabelText(vanishedUuid,
-										inferred),
-									pos, now + OFFLINE_STASIS_STICKY_MS));
-					}
+					// Never create offline labels for your own pearls. You
+					// already know where they are and "Owner: You" is noise.
+					if(MC.player != null
+						&& existingOwner.equals(MC.player.getUUID()))
+						continue;
+					
+					String inferred = getOwnerUuidLabel(existingOwner);
+					if(inferred != null)
+						putOfflineStasisLabel(vanishedUuid,
+							formatOfflineLabelText(vanishedUuid, inferred),
+							vanishedPos, now);
 					continue;
 				}
 
 				String inferred = inferOwnerFromLeaveTiming(vanishedUuid);
 				if(inferred != null)
-				{
-					Vec3 pos = lastPearlPositions.get(vanishedUuid);
-					if(pos != null)
-						offlineStasisLabels.put(vanishedUuid, new StasisLabel(
-							inferred, pos, now + OFFLINE_STASIS_STICKY_MS));
-				}
+					putOfflineStasisLabel(vanishedUuid, inferred, vanishedPos,
+						now);
 			}
 		}
 		previousPearlUuids = seenPearls;
@@ -1314,6 +1322,10 @@ private String inferOwnerFromLeaveTiming(UUID pearlUuid)
 		if(candidateCount != 1 || bestCandidate == null)
 			return null;
 
+		// Never infer yourself — you know you didn't leave
+		if(MC.player != null && bestCandidate.equals(MC.player.getUUID()))
+			return null;
+		
 		String label = getOwnerUuidLabel(bestCandidate);
 		if(label == null)
 			return null;
@@ -1338,6 +1350,12 @@ private void inferOwnersFromPlayerLeave(UUID playerUuid, long now)
 	{
 		if(playerUuid == null)
 			return;
+			
+		// Ignore REMOVE_PLAYER info refreshes where the player is still
+		// visible in the world (common on servers that send remove+add
+		// cycles for tab-list/latency updates).
+		if(isPlayerVisibleInWorld(playerUuid))
+			return;
 
 		Integer playerEntityId = null;
 		PlayerIdentity identity = playerIdentities.get(playerUuid);
@@ -1389,9 +1407,8 @@ private void inferOwnersFromPlayerLeave(UUID playerUuid, long now)
 
 			Vec3 pos = lastPearlPositions.get(pearlUuid);
 			if(pos != null)
-				offlineStasisLabels.put(pearlUuid,
-					new StasisLabel(formatOfflineLabelText(pearlUuid, label),
-						pos, now + OFFLINE_STASIS_STICKY_MS));
+				putOfflineStasisLabel(pearlUuid,
+					formatOfflineLabelText(pearlUuid, label), pos, now);
 
 			inferredCount++;
 		}
@@ -1523,6 +1540,73 @@ private OwnerConfidence getPearlConfidence(UUID pearlUuid)
 		return pid != null ? pid.confidence() : null;
 	}
 
+	/**
+	 * Checks whether any currently visible pearl is at approximately the
+	 * same position as the given vanished position. This prevents creating
+	 * duplicate offline labels when the server re-creates a pearl entity
+	 * with a new UUID (common in bubble-column stasis chambers).
+	 */
+	private boolean isPositionOccupiedByVisiblePearl(Vec3 vanishedPos,
+		HashSet<UUID> seenPearls)
+	{
+		if(vanishedPos == null)
+			return false;
+		double threshold = 0.5;
+		for(UUID seenUuid : seenPearls)
+		{
+			Vec3 seenPos = lastPearlPositions.get(seenUuid);
+			if(seenPos != null
+				&& seenPos.distanceToSqr(vanishedPos) < threshold * threshold)
+				return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Checks whether a player with the given UUID is currently visible
+	 * among the entities being rendered in the world.
+	 */
+	private boolean isPlayerVisibleInWorld(UUID playerUuid)
+	{
+		if(playerUuid == null || MC.level == null)
+			return false;
+		for(Entity entity : MC.level.entitiesForRendering())
+		{
+			if(entity instanceof Player && playerUuid.equals(entity.getUUID()))
+				return true;
+		}
+		return false;
+	}
+	
+	/**
+	 * Adds or refreshes an offline stasis label, de-duplicating by position.
+	 * If an existing offline label exists at approximately the same position,
+	 * its timestamp is refreshed instead of creating a duplicate.
+	 */
+	private void putOfflineStasisLabel(UUID vanishedUuid, String text, Vec3 pos,
+		long now)
+	{
+		double threshold = 0.5;
+		long untilMs = now + OFFLINE_STASIS_STICKY_MS;
+		
+		// Check for an existing offline label at the same position
+		for(Map.Entry<UUID, StasisLabel> entry : offlineStasisLabels.entrySet())
+		{
+			StasisLabel existing = entry.getValue();
+			if(existing != null && existing.pos() != null
+				&& existing.pos().distanceToSqr(pos) < threshold * threshold)
+			{
+				// Refresh the existing entry instead of adding a duplicate
+				offlineStasisLabels.put(entry.getKey(),
+					new StasisLabel(existing.text(), existing.pos(), untilMs));
+				return;
+			}
+		}
+		
+		offlineStasisLabels.put(vanishedUuid,
+			new StasisLabel(text, pos, untilMs));
+	}
+	
 	private float computeDistanceScale(Vec3 labelPos, float baseScale)
 	{
 		if(MC.player == null)

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

@@ -181,6 +181,18 @@ public final class PortalEspHack extends Hack implements UpdateListener,
 	private final SliderSetting aboveGroundY = new SliderSetting(
 		"Set ESP Y limit", 62, -65, 255, 1, SliderSetting.ValueDisplay.INTEGER);
 
+	private final CheckboxSetting disableTracersAlertsForWaypointPortals =
+		new CheckboxSetting("Disable tracers/alerts for waypoint portals",
+			"Disables tracers and alerts (sounds + text) for portals\n"
+				+ "that already have a Wurst waypoint nearby.",
+			false);
+	
+	private final CheckboxSetting disableHighlightingForWaypointPortals =
+		new CheckboxSetting("Disable highlighting for waypoint portals",
+			"Disables ESP entirely for portals that already have\n"
+				+ "a Wurst waypoint nearby.",
+			false);
+	
 	private final BiPredicate<BlockPos, BlockState> query =
 		(pos, state) -> state.getBlock() == Blocks.NETHER_PORTAL
 			|| state.getBlock() == Blocks.END_PORTAL
@@ -232,6 +244,8 @@ public PortalEspHack()
 		addSetting(stickyArea);
 		addSetting(onlyAboveGround);
 		addSetting(aboveGroundY);
+		addSetting(disableTracersAlertsForWaypointPortals);
+		addSetting(disableHighlightingForWaypointPortals);
 	}
 
 	public List<PortalEspBlockGroup> getMapaGroups()
@@ -345,7 +359,11 @@ private void renderBoxes(PoseStack matrixStack)
 			if(!group.isEnabled())
 				continue;
 
-			List<AABB> boxes = group.getBoxes();
+			List<AABB> boxes = disableHighlightingForWaypointPortals.isChecked()
+				? getBoxesFilteringWaypoints(group) : group.getBoxes();
+			if(boxes.isEmpty())
+				continue;
+			
 			int quadsColor = group.getColorI(0x40);
 			int linesColor = group.getColorI(0x80);
 
@@ -355,6 +373,17 @@ private void renderBoxes(PoseStack matrixStack)
 		}
 	}
 
+	private List<AABB> getBoxesFilteringWaypoints(PortalEspBlockGroup group)
+	{
+		List<BlockPos> positions = group.getPositions();
+		List<AABB> boxes = group.getBoxes();
+		ArrayList<AABB> filtered = new ArrayList<>();
+		for(int i = 0; i < positions.size(); i++)
+			if(!isNearWaypoint(positions.get(i)))
+				filtered.add(boxes.get(i));
+		return filtered;
+	}
+	
 	private void renderTracers(PoseStack matrixStack, float partialTicks)
 	{
 		for(PortalEspBlockGroup group : groups)
@@ -369,6 +398,16 @@ private void renderTracers(PoseStack matrixStack, float partialTicks)
 			if(ends.isEmpty())
 				continue;
 
+			if(shouldSuppressAlertsAndTracers())
+				ends =
+					ends.stream()
+						.filter(v -> !isNearWaypoint(
+							new BlockPos((int)v.x, (int)v.y, (int)v.z)))
+						.toList();
+			
+			if(ends.isEmpty())
+				continue;
+			
 			int color = group.getColorI(0x80);
 			if(tracerFlash.isChecked())
 				color = RenderUtils.flashColor(color);
@@ -411,6 +450,9 @@ private void updateGroupBoxes()
 		HashMap<PortalEspBlockGroup, ArrayList<BlockPos>> newBlocksByGroup =
 			commitCandidates(candidatesByGroup);
 
+		if(shouldSuppressAlertsAndTracers())
+			newBlocksByGroup = filterNewBlocksByWaypoint(newBlocksByGroup);
+		
 		ArrayList<DiscoveryHit> discoveries =
 			buildDiscoveries(newBlocksByGroup);
 
@@ -1938,6 +1980,35 @@ BlockPos toPos(int primary, int y, int plane)
 	private record DiscoveryHit(String label, Vec3 pos)
 	{}
 
+	private boolean isNearWaypoint(BlockPos pos)
+	{
+		return WURST.getHax().waypointsHack != null
+			&& WURST.getHax().waypointsHack.hasWaypointNear(pos, 5.0);
+	}
+	
+	private boolean shouldSuppressAlertsAndTracers()
+	{
+		return disableTracersAlertsForWaypointPortals.isChecked()
+			|| disableHighlightingForWaypointPortals.isChecked();
+	}
+	
+	private HashMap<PortalEspBlockGroup, ArrayList<BlockPos>> filterNewBlocksByWaypoint(
+		HashMap<PortalEspBlockGroup, ArrayList<BlockPos>> newBlocksByGroup)
+	{
+		HashMap<PortalEspBlockGroup, ArrayList<BlockPos>> filtered =
+			new HashMap<>();
+		for(var entry : newBlocksByGroup.entrySet())
+		{
+			ArrayList<BlockPos> filteredBlocks = new ArrayList<>();
+			for(BlockPos pos : entry.getValue())
+				if(!isNearWaypoint(pos))
+					filteredBlocks.add(pos);
+			if(!filteredBlocks.isEmpty())
+				filtered.put(entry.getKey(), filteredBlocks);
+		}
+		return filtered;
+	}
+	
 	private enum DetectionSound
 	{
 		NOTE_BLOCK_CHIME("Note Block Chime",