Updated Chest Search

Author: cev-api

README.md

@@ -105,6 +105,7 @@ All credit for the original client goes to Wurst-Imperium and its contributors.
 - Chests are auto-removed if it has been detected as broken/missing
 - Adjustable Waypoint and ESP timeout
 - Adjustable ESP and Waypoint colors
+- Adjustable search radius
 
 ![ChestSearch](https://i.imgur.com/o5DYBqR.png)
 

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

@@ -8,13 +8,15 @@
 package net.wurstclient.clickgui.screens;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.wurstclient.WurstClient;
 import net.wurstclient.chestsearch.ChestManager;
 import net.wurstclient.chestsearch.ChestEntry;
@@ -34,6 +36,9 @@ public final class ChestSearchScreen extends Screen
 	private int totalChestsLogged = 0;
 	private long totalItemsLogged = 0;
 	private int totalMatches = 0;
+	private boolean radiusFilterActive = false;
+	private int radiusLimitBlocks = Integer.MAX_VALUE;
+	private int radiusFilteredOut = 0;
 	private boolean limitedResults = false;
 	private double scrollOffset = 0.0;
 	private ButtonWidget scrollUpButton;
@@ -70,6 +75,18 @@ private static String normalizeDimension(String dimension)
 		return dimension == null ? "" : dimension;
 	}
 
+	private static String canonicalDimension(String dimension)
+	{
+		String dim = normalizeDimension(dimension).trim();
+		if(dim.isEmpty())
+			return "";
+		String lower = dim.toLowerCase(Locale.ROOT);
+		int colon = lower.indexOf(':');
+		if(colon >= 0 && colon < lower.length() - 1)
+			return lower.substring(colon + 1);
+		return lower;
+	}
+	
 	private static String makePosKey(String dimension, BlockPos pos)
 	{
 		String dim = normalizeDimension(dimension);
@@ -296,8 +313,8 @@ private void onSearchChanged(String q)
 		java.util.List<ChestEntry> ordered = new java.util.ArrayList<>();
 		ordered.addAll(pinned);
 		ordered.addAll(others);
-		totalMatches = ordered.size();
-		results = ordered;
+		results = applyRadiusFilter(ordered);
+		totalMatches = results.size();
 		int maxResults = 50;
 		try
 		{
@@ -312,6 +329,78 @@ private void onSearchChanged(String q)
 		rebuildRowButtons();
 	}
 
+	private java.util.List<ChestEntry> applyRadiusFilter(
+		java.util.List<ChestEntry> entries)
+	{
+		radiusFilterActive = false;
+		radiusFilteredOut = 0;
+		radiusLimitBlocks = Integer.MAX_VALUE;
+		if(entries == null || entries.isEmpty())
+			return entries;
+		
+		net.minecraft.client.MinecraftClient mc = WurstClient.MC;
+		if(mc == null || mc.player == null)
+			return entries;
+		
+		net.wurstclient.hacks.ChestSearchHack hack;
+		try
+		{
+			hack = WurstClient.INSTANCE.getHax().chestSearchHack;
+		}catch(Throwable ignored)
+		{
+			hack = null;
+		}
+		if(hack == null || hack.isDisplayRadiusUnlimited())
+			return entries;
+		
+		int radiusBlocks = hack.getDisplayRadius();
+		if(radiusBlocks <= 0 || radiusBlocks >= Integer.MAX_VALUE)
+			return entries;
+		
+		radiusFilterActive = true;
+		radiusLimitBlocks = radiusBlocks;
+		double radiusSq = (double)radiusBlocks * (double)radiusBlocks;
+		Vec3d playerPos =
+			new Vec3d(mc.player.getX(), mc.player.getY(), mc.player.getZ());
+		String playerDim = "";
+		try
+		{
+			if(mc.world != null)
+				playerDim = mc.world.getRegistryKey().getValue().toString();
+		}catch(Throwable ignored)
+		{}
+		String playerDimKey = canonicalDimension(playerDim);
+		
+		java.util.ArrayList<ChestEntry> filtered =
+			new java.util.ArrayList<>(entries.size());
+		int filteredOut = 0;
+		for(ChestEntry entry : entries)
+		{
+			if(entry == null)
+				continue;
+			boolean include = true;
+			String entryDimKey = canonicalDimension(entry.dimension);
+			if(!entryDimKey.isEmpty() && !playerDimKey.isEmpty()
+				&& !entryDimKey.equals(playerDimKey))
+				include = false;
+			
+			if(include)
+			{
+				BlockPos pos = entry.getClickedPos();
+				Vec3d chestPos = Vec3d.ofCenter(pos);
+				if(chestPos.squaredDistanceTo(playerPos) > radiusSq)
+					include = false;
+			}
+			
+			if(include)
+				filtered.add(entry);
+			else
+				filteredOut++;
+		}
+		radiusFilteredOut = filteredOut;
+		return filtered;
+	}
+	
 	private void rebuildRowButtons()
 	{
 		for(ButtonWidget btn : rowButtons)
@@ -700,8 +789,6 @@ public void render(DrawContext context, int mouseX, int mouseY, float delta)
 		int sfY = 18;
 		context.fill(sfX - 2, sfY - 2, sfX + 222, sfY + 22, 0xFF333333);
 		int summaryY = sfY + 24;
-		context.fill(sfX - 2, summaryY - 2, sfX + 360, summaryY + 18,
-			0xFF222222);
 		// draw result panels BEFORE super.render so buttons draw on top
 		int x = this.width / 2 - 150;
 		int visibleTop = getResultsTop();
@@ -899,11 +986,29 @@ else if(scrollOffset > maxScroll)
 			? " (showing first " + WurstClient.INSTANCE.getHax().chestSearchHack
 				.getMaxSearchResults() + ")"
 			: "";
-		String summary =
-			"Showing " + shown + "/" + totalMatches + limiter + " - Tracking "
-				+ totalChestsLogged + " chests, " + totalItemsLogged + " items";
-		context.drawText(this.textRenderer, Text.literal(summary), sfX,
-			summaryY + 2, 0xFFCCCCCC, false);
+		java.util.ArrayList<String> summaryExtras = new java.util.ArrayList<>();
+		if(radiusFilterActive && radiusLimitBlocks < Integer.MAX_VALUE)
+			summaryExtras.add("radius <= " + radiusLimitBlocks + " blocks");
+		if(radiusFilterActive && radiusFilteredOut > 0)
+			summaryExtras.add(radiusFilteredOut + " outside radius");
+		String extra = summaryExtras.isEmpty() ? ""
+			: " (" + String.join(", ", summaryExtras) + ")";
+		String summary = "Showing " + shown + "/" + totalMatches + limiter
+			+ extra + " - Tracking " + totalChestsLogged + " chests, "
+			+ totalItemsLogged + " items";
+		int summaryPadding = 8;
+		int summaryWidth =
+			this.textRenderer.getWidth(summary) + summaryPadding * 2;
+		if(summaryWidth > this.width - 4)
+			summaryWidth = this.width - 4;
+		int summaryHalf = summaryWidth / 2;
+		int summaryCenter = this.width / 2;
+		int summaryLeft = Math.max(0, summaryCenter - summaryHalf);
+		int summaryRight = Math.min(this.width, summaryCenter + summaryHalf);
+		context.fill(summaryLeft, summaryY - 2, summaryRight, summaryY + 18,
+			0xFF222222);
+		context.drawCenteredTextWithShadow(this.textRenderer,
+			Text.literal(summary), this.width / 2, summaryY + 2, 0xFFCCCCCC);
 
 		if(shown == 0)
 		{

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

@@ -9,12 +9,14 @@
 
 import net.wurstclient.Category;
 import net.wurstclient.hack.Hack;
+import net.wurstclient.settings.ColorSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
-import net.wurstclient.settings.ColorSetting;
 
 public final class ChestSearchHack extends Hack
 {
+	private static final int DISPLAY_RADIUS_UNLIMITED = 2001;
+	
 	private final net.wurstclient.settings.CheckboxSetting automaticMode =
 		new net.wurstclient.settings.CheckboxSetting("Automatic mode",
 			"Automatically scan chests on open.", true);
@@ -29,6 +31,10 @@ public final class ChestSearchHack extends Hack
 		"Cleaner scan radius", 64, 8, 512, 8, ValueDisplay.INTEGER);
 	private final SliderSetting maxResults = new SliderSetting(
 		"Max search results", 50, 10, 1000, 10, ValueDisplay.INTEGER);
+	private final SliderSetting displayRadius = new SliderSetting(
+		"Display radius", DISPLAY_RADIUS_UNLIMITED, 1, DISPLAY_RADIUS_UNLIMITED,
+		1, ValueDisplay.INTEGER.withSuffix(" blocks")
+			.withLabel(DISPLAY_RADIUS_UNLIMITED, "Unlimited"));
 	private final ColorSetting waypointColor =
 		new ColorSetting("Waypoint color", new java.awt.Color(0xFFFF00));
 	private final ColorSetting espFillColor =
@@ -49,6 +55,7 @@ public ChestSearchHack()
 		addSetting(gracePeriodSec);
 		addSetting(scanRadius);
 		addSetting(maxResults);
+		addSetting(displayRadius);
 		addSetting(waypointColor);
 		addSetting(espFillColor);
 		addSetting(espLineColor);
@@ -69,6 +76,17 @@ public int getMaxSearchResults()
 		return maxResults.getValueI();
 	}
 
+	public boolean isDisplayRadiusUnlimited()
+	{
+		return displayRadius.getValueI() >= DISPLAY_RADIUS_UNLIMITED;
+	}
+	
+	public int getDisplayRadius()
+	{
+		return isDisplayRadiusUnlimited() ? Integer.MAX_VALUE
+			: displayRadius.getValueI();
+	}
+	
 	public int getWaypointTimeMs()
 	{
 		return (int)(waypointTimeSec.getValue() * 1000);