Updated Search

Author: cev-api

README.md

@@ -166,7 +166,7 @@ All credit for the original client goes to Wurst-Imperium and its contributors.
 - Works together with XRay
 - Add items with the list UI, meaning you can add keywords or just select multiple blocks easily. 
 
-![Surface](https://i.ibb.co.com/WptKT2yY/Untitldded.png) 
+![Surface](https://i.imgur.com/fQzefis.png) 
 
 ### AntiDrop
 - Prevents you from dropping the selected items by accident. Defaults to all weapons, tools, and shulker boxes.
@@ -177,7 +177,7 @@ All credit for the original client goes to Wurst-Imperium and its contributors.
 - Renders on top of the vanilla screen darkening, stays aligned beside the container and has an adjustable size and font scaling
 - Works with books and gear and will separate them in the list by category and type
 
-![Chest](https://i.ibb.co/0yRPQ0jy/javaw-sg-VUhu-MCDY.png)
+![Chest](https://i.imgur.com/6u9S2OD.png)
 
 ## What’s changed or improved in this fork?
 
@@ -227,6 +227,7 @@ Examples:
 - New minimum search to 100 results.
 - Replaced full-sort approach to bounded max-heap (PriorityQueue) that keeps the closest N matches. This avoids sorting entire result and keeps search as fast as X-Ray.
 - Safer rescans and better crash handling.
+- Improved search speed.
 
 ![Search](https://i.imgur.com/zpITuWb.png)
 
@@ -296,7 +297,10 @@ Examples:
 - Ignores shulker boxes
 
 ### AutoLibrarian Improved
-- Can now discover enchantments provided by modpacks
+- Can now discover enchantments provided by data packs.
+- Able to search for enchantments by keywords.
+
+![Library](https://i.imgur.com/ZCK7Frz.png)
 
 ### Unsafe Chat Toast
 - Optional; toggle via NoChatReports or Wurst Options.  

gradle.properties

@@ -15,13 +15,13 @@ loom_version=1.11-SNAPSHOT
 fabric_version=0.135.0+1.21.10
 
 # Mod Properties
-mod_version=v7.50.3-MC1.21.10
+mod_version=v7.50.3-CevAPI-MC1.21.10
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric
 
 # GitHub
-gh_repo_id=Wurst-Imperium/Wurst7
+gh_repo_id=cev-api/Wurst7-CevAPI
 mcx_repo_id=Wurst-Imperium/Wurst-MCX2
 
 # Dependencies

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

@@ -129,6 +129,7 @@ private enum SearchMode
 	// Precomputed tracer endpoints
 	private java.util.List<net.minecraft.util.math.Vec3d> tracerEnds;
 	private ChunkPos lastPlayerChunk;
+	private int lastMatchesVersion;
 
 	private SearchMode lastMode;
 	private int lastListHash;
@@ -200,6 +201,7 @@ protected void onEnable()
 		lastMode = mode.getSelected();
 		lastListHash = blockList.getBlockNames().hashCode();
 		applySearchCriteria(block.getBlock(), "");
+		lastMatchesVersion = coordinator.getMatchesVersion();
 		EVENTS.add(UpdateListener.class, this);
 		EVENTS.add(PacketInputListener.class, coordinator);
 		EVENTS.add(RenderListener.class, this);
@@ -213,7 +215,7 @@ protected void onDisable()
 		EVENTS.remove(PacketInputListener.class, coordinator);
 		EVENTS.remove(RenderListener.class, this);
 		EVENTS.remove(CameraTransformViewBobbingListener.class, this);
-		stopBuildingBuffer();
+		stopBuildingBuffer(true);
 		coordinator.reset();
 		forkJoinPool.shutdownNow();
 		if(vertexBuffer != null)
@@ -229,14 +231,13 @@ protected void onDisable()
 	@Override
 	public void onUpdate()
 	{
-		boolean searchersChanged = false;
-		// Mode/list changes
 		SearchMode currentMode = mode.getSelected();
+		
+		// Mode/list changes
 		if(currentMode != lastMode)
 		{
 			lastMode = currentMode;
 			applySearchCriteria(block.getBlock(), "");
-			searchersChanged = true;
 		}
 		if(currentMode == SearchMode.LIST)
 		{
@@ -245,59 +246,61 @@ public void onUpdate()
 			{
 				lastListHash = listHash;
 				applySearchCriteria(block.getBlock(), "");
-				searchersChanged = true;
 			}
 		}
+		
 		// Recenter per chunk when sticky is off
 		ChunkPos currentChunk = new ChunkPos(MC.player.getBlockPos());
 		if(!stickyArea.isChecked() && !currentChunk.equals(lastPlayerChunk))
 		{
 			lastPlayerChunk = currentChunk;
 			coordinator.reset();
-			stopBuildingBuffer();
-			searchersChanged = true;
+			stopBuildingBuffer(false);
 		}
+		
 		// Area changes
 		ChunkAreaSetting.ChunkArea currentArea = area.getSelected();
 		if(currentArea != lastAreaSelection)
 		{
 			lastAreaSelection = currentArea;
 			coordinator.reset();
-			searchersChanged = true;
+			stopBuildingBuffer(true);
+			notify = true;
 		}
+		
 		// Criteria changes only for modes that use them
 		if(currentMode == SearchMode.BLOCK_ID)
 		{
 			Block currentBlock = block.getBlock();
 			if(currentBlock != lastBlock)
-			{
 				applySearchCriteria(currentBlock, "");
-				searchersChanged = true;
-			}
 		}else if(currentMode == SearchMode.QUERY)
 		{
 			String currentQuery = normalizeQuery(query.getValue());
 			if(!currentQuery.equals(lastQuery))
-			{
 				applySearchCriteria(block.getBlock(), currentQuery);
-				searchersChanged = true;
-			}
 		}
-		// Coordinator update
-		if(coordinator.update())
-			searchersChanged = true;
-		if(searchersChanged)
-			stopBuildingBuffer();
-		if(!coordinator.isDone())
-			return;
+		
+		// Update coordinator (adds/removes searchers, applies packet updates)
+		coordinator.update();
+		
+		int matchesVersion = coordinator.getMatchesVersion();
+		if(matchesVersion != lastMatchesVersion)
+		{
+			lastMatchesVersion = matchesVersion;
+			stopBuildingBuffer(false);
+		}
 
 		if(limit.getValueI() != prevLimit)
 		{
-			stopBuildingBuffer();
+			stopBuildingBuffer(false);
 			prevLimit = limit.getValueI();
 			notify = true;
 		}
 
+		if(!coordinator.hasReadyMatches())
+			return;
+		
 		if(getMatchingBlocksTask == null)
 			startGetMatchingBlocksTask();
 
@@ -326,34 +329,31 @@ public void onCameraTransformViewBobbing(
 	@Override
 	public void onRender(MatrixStack matrixStack, float partialTicks)
 	{
-		if(vertexBuffer == null || bufferRegion == null)
-		{
-			if(style.hasLines() && tracerEnds != null && !tracerEnds.isEmpty())
-			{
-				int color = useFixedColor.isChecked()
-					? net.wurstclient.util.RenderUtils
-						.toIntColor(fixedColor.getColorF(), 0.5F)
-					: net.wurstclient.util.RenderUtils.toIntColor(
-						net.wurstclient.util.RenderUtils.getRainbowColor(),
-						0.5F);
-				net.wurstclient.util.RenderUtils.drawTracers(matrixStack,
-					partialTicks, tracerEnds, color, false);
-			}
+		boolean drawBoxes =
+			style.hasBoxes() && vertexBuffer != null && bufferRegion != null;
+		boolean drawTracers =
+			style.hasLines() && tracerEnds != null && !tracerEnds.isEmpty();
+		
+		if(!drawBoxes && !drawTracers)
 			return;
-		}
-		matrixStack.push();
-		RenderUtils.applyRegionalRenderOffset(matrixStack, bufferRegion);
+		
 		float[] rgb = useFixedColor.isChecked() ? fixedColor.getColorF()
 			: RenderUtils.getRainbowColor();
-		vertexBuffer.draw(matrixStack, WurstRenderLayers.ESP_QUADS, rgb, 0.5F);
-		matrixStack.pop();
-		if(style.hasLines() && tracerEnds != null && !tracerEnds.isEmpty())
+		
+		if(drawBoxes)
 		{
-			int color = useFixedColor.isChecked()
-				? RenderUtils.toIntColor(fixedColor.getColorF(), 0.5F)
-				: RenderUtils.toIntColor(RenderUtils.getRainbowColor(), 0.5F);
+			matrixStack.push();
+			RenderUtils.applyRegionalRenderOffset(matrixStack, bufferRegion);
+			vertexBuffer.draw(matrixStack, WurstRenderLayers.ESP_QUADS, rgb,
+				0.5F);
+			matrixStack.pop();
+		}
+		
+		if(drawTracers)
+		{
+			int tracerColor = RenderUtils.toIntColor(rgb, 0.5F);
 			RenderUtils.drawTracers(matrixStack, partialTicks, tracerEnds,
-				color, false);
+				tracerColor, false);
 		}
 	}
 
@@ -375,6 +375,8 @@ private String abbreviate(String text)
 
 	private void applySearchCriteria(Block currentBlock, String normalizedQuery)
 	{
+		stopBuildingBuffer(true);
+		
 		switch(mode.getSelected())
 		{
 			case LIST:
@@ -445,6 +447,7 @@ private void applySearchCriteria(Block currentBlock, String normalizedQuery)
 			lastQuery = "";
 		}
 		notify = true;
+		lastMatchesVersion = coordinator.getMatchesVersion();
 	}
 
 	private boolean blockMatchesQuery(Block block, String normalizedQuery)
@@ -487,7 +490,7 @@ private void startGetMatchingBlocksTask()
 				(a, b) -> Integer.compare(b.getManhattanDistance(eyesPos),
 					a.getManhattanDistance(eyesPos)));
 			java.util.Iterator<ChunkSearcher.Result> it =
-				coordinator.getMatches().iterator();
+				coordinator.getReadyMatches().iterator();
 			while(it.hasNext())
 			{
 				ChunkSearcher.Result r = it.next();
@@ -556,7 +559,7 @@ private void setBufferFromTask()
 		}
 	}
 
-	private void stopBuildingBuffer()
+	private void stopBuildingBuffer(boolean discardCurrent)
 	{
 		if(getMatchingBlocksTask != null)
 			getMatchingBlocksTask.cancel(true);
@@ -565,6 +568,17 @@ private void stopBuildingBuffer()
 			compileVerticesTask.cancel(true);
 		compileVerticesTask = null;
 		bufferUpToDate = false;
-		tracerEnds = null;
+		if(discardCurrent)
+		{
+			tracerEnds = null;
+			lastMatchingBlocks = null;
+			foundCount = 0;
+			if(vertexBuffer != null)
+			{
+				vertexBuffer.close();
+				vertexBuffer = null;
+			}
+			bufferRegion = null;
+		}
 	}
 }