Improved SignESP and BedESP tracking

Author: cev-api

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

@@ -101,6 +101,7 @@ public final class BedEspHack extends Hack implements UpdateListener,
 	private boolean groupsUpToDate;
 	private ChunkPos lastPlayerChunk;
 	private int foundCount;
+	private int lastMatchesVersion;
 	private List<BlockPos> cachedTrialSpawners = List.of();
 	private List<Vec3d> cachedVillagerPositions = List.of();
 	private List<Vec3d> cachedGolemPositions = List.of();
@@ -137,6 +138,7 @@ protected void onEnable()
 		EVENTS.add(CameraTransformViewBobbingListener.class, this);
 		EVENTS.add(RenderListener.class, this);
 		lastPlayerChunk = new ChunkPos(MC.player.getBlockPos());
+		lastMatchesVersion = coordinator.getMatchesVersion();
 		lastTrialFilterState = filterTrialChambers.isChecked();
 		lastVillageFilterState = filterVillageBeds.isChecked();
 	}
@@ -150,6 +152,7 @@ protected void onDisable()
 		EVENTS.remove(RenderListener.class, this);
 
 		coordinator.reset();
+		lastMatchesVersion = coordinator.getMatchesVersion();
 		groups.forEach(BedEspBlockGroup::clear);
 		// reset count
 		foundCount = 0;
@@ -164,6 +167,12 @@ public void onUpdate()
 		boolean searchersChanged = coordinator.update();
 		if(searchersChanged)
 			groupsUpToDate = false;
+		int matchesVersion = coordinator.getMatchesVersion();
+		if(matchesVersion != lastMatchesVersion)
+		{
+			lastMatchesVersion = matchesVersion;
+			groupsUpToDate = false;
+		}
 		// Recenter per chunk when sticky is off
 		ChunkPos currentChunk = new ChunkPos(MC.player.getBlockPos());
 		if(!stickyArea.isChecked() && !currentChunk.equals(lastPlayerChunk))

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

@@ -86,6 +86,7 @@ public final class SignEspHack extends Hack implements UpdateListener,
 	private ChunkAreaSetting.ChunkArea lastAreaSelection;
 	private ChunkPos lastPlayerChunk;
 	private int foundCount;
+	private int lastMatchesVersion;
 
 	// Above-ground filter
 	private final CheckboxSetting onlyAboveGround = new CheckboxSetting(
@@ -116,6 +117,7 @@ protected void onEnable()
 		groupsUpToDate = false;
 		lastAreaSelection = area.getSelected();
 		lastPlayerChunk = new ChunkPos(MC.player.getBlockPos());
+		lastMatchesVersion = coordinator.getMatchesVersion();
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(CameraTransformViewBobbingListener.class, this);
 		EVENTS.add(RenderListener.class, this);
@@ -132,6 +134,7 @@ protected void onDisable()
 		EVENTS.remove(net.wurstclient.events.PacketInputListener.class,
 			coordinator);
 		coordinator.reset();
+		lastMatchesVersion = coordinator.getMatchesVersion();
 		groups.forEach(SignEspGroup::clear);
 		entityGroups.forEach(FrameEspEntityGroup::clear);
 		foundCount = 0;
@@ -158,6 +161,12 @@ public void onUpdate()
 		boolean searchersChanged = coordinator.update();
 		if(searchersChanged)
 			groupsUpToDate = false;
+		int matchesVersion = coordinator.getMatchesVersion();
+		if(matchesVersion != lastMatchesVersion)
+		{
+			lastMatchesVersion = matchesVersion;
+			groupsUpToDate = false;
+		}
 		if(!groupsUpToDate && coordinator.isDone())
 			updateGroupBoxes();
 	}