Fixed LootSearch, Updated ChestSearch

Author: cev-api

README.md

@@ -432,9 +432,10 @@ Reports number of waypoints changed.
 - Using [my fork](https://github.com/cev-api/SeedMapper-CevAPI) of [SeedMapper](https://github.com/xpple/SeedMapper/) you can export loot tables for selected/all structures and then parse that information using the same UI as ChestSearch.
 - Sorted by closest chest.
 - You can search for specific loot and set a waypoint towards it.
+- Supports enchantments.
 - Will not function without a valid SeedMapper loot export JSON for the server you're in.
 
-![Loot](https://i.imgur.com/7pkTPxW.png)
+![Loot](https://i.imgur.com/pe7bbAB.png)
 
 ### SpearAssist
 - Boost Modes:

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

@@ -59,6 +59,7 @@ public final class ChestSearchScreen extends Screen
 	private int scrollThumbTop = 0;
 	private int scrollThumbHeight = 0;
 	private double scrollMaxOffset = 0.0;
+	private int contentWidth = 340;
 
 	// persist temp waypoints across screen instances
 	private static final class TempWp
@@ -122,6 +123,23 @@ private static String makeEntryKey(ChestEntry entry)
 			+ formatBlockPos(max);
 	}
 
+	private int getContentWidth()
+	{
+		int max = Math.max(0, this.width - 4);
+		int width = contentWidth;
+		if(width < 340)
+			width = 340;
+		if(width > max)
+			width = max;
+		return width;
+	}
+	
+	private int getContentLeft()
+	{
+		int width = getContentWidth();
+		return (this.width - width) / 2;
+	}
+	
 	public static boolean isWaypointActive(String dimension, BlockPos pos)
 	{
 		String key = makePosKey(dimension, pos);
@@ -577,7 +595,7 @@ private void rebuildRowButtons()
 		}
 		rowButtons.clear();
 
-		int x = this.width / 2 - 150;
+		int x = getContentLeft();
 		int resultsTop = getResultsTop();
 		int y = resultsTop - (int)Math.round(scrollOffset);
 		int visibleTop = resultsTop;
@@ -708,7 +726,7 @@ private void rebuildRowButtons()
 							.create(Component.literal("ESP active")));
 			}
 			// position esp and wp buttons to the right side of the result box
-			int boxRight = x + 340;
+			int boxRight = x + getContentWidth();
 			int wpWidth = 56;
 			int espWidth = isLootManager ? 0 : 40;
 			int deleteWidth = 56;
@@ -1004,8 +1022,37 @@ public void render(GuiGraphics 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;
+		int shown = results == null ? 0 : results.size();
+		String limiter = limitedResults
+			? " (showing first " + WurstClient.INSTANCE.getHax().chestSearchHack
+				.getMaxSearchResults() + ")"
+			: "";
+		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 summaryExtra = summaryExtras.isEmpty() ? ""
+			: " (" + String.join(", ", summaryExtras) + ")";
+		String matchLabel =
+			currentQuery.isEmpty() ? "Listed items" : "Matching items";
+		String summary = "Showing " + shown + "/" + totalMatches + limiter
+			+ summaryExtra + " - " + matchLabel + ": " + totalMatchingItems
+			+ " - Tracking " + totalChestsLogged + " chests, "
+			+ totalItemsLogged + " items";
+		int summaryPadding = 8;
+		int summaryWidth = this.font.width(summary) + summaryPadding * 2;
+		if(summaryWidth > this.width - 4)
+			summaryWidth = this.width - 4;
+		int desiredWidth = Math.max(340, summaryWidth);
+		if(desiredWidth != contentWidth)
+		{
+			contentWidth = desiredWidth;
+			clampScroll();
+			rebuildRowButtons();
+		}
 		// draw result panels BEFORE super.render so buttons draw on top
-		int x = this.width / 2 - 150;
+		int x = getContentLeft();
 		int visibleTop = getResultsTop();
 		int visibleBottom = getVisibleBottom();
 		int visibleHeight = Math.max(0, visibleBottom - visibleTop);
@@ -1032,7 +1079,7 @@ else if(scrollOffset > maxScroll)
 		int y = visibleTop - (int)Math.round(scrollOffset);
 
 		int trackWidth = 8;
-		int trackX = x + 340 + 6;
+		int trackX = x + getContentWidth() + 6;
 		int buttonWidth =
 			scrollUpButton != null ? scrollUpButton.getWidth() : 44;
 		int buttonHeight =
@@ -1118,10 +1165,11 @@ else if(scrollOffset > maxScroll)
 			if(y > visibleBottom)
 				break;
 			int bgColor = pinnedEntry ? 0x80423210 : 0x80202020;
-			context.fill(x - 6, y, x + 340, y + boxHeight, bgColor);
+			context.fill(x - 6, y, x + getContentWidth(), y + boxHeight,
+				bgColor);
 			int headerY = y + 6;
 			String locationLabel = formatLocationLabel(e, dim);
-			int boxRight = x + 340;
+			int boxRight = x + getContentWidth();
 			// compute available width for location text (leave space for
 			// buttons)
 			int wpWidth = 56;
@@ -1330,28 +1378,6 @@ else if(scrollOffset > maxScroll)
 		}
 		// now draw children (buttons etc.) on top
 		super.render(context, mouseX, mouseY, delta);
-		int shown = results == null ? 0 : results.size();
-		String limiter = limitedResults
-			? " (showing first " + WurstClient.INSTANCE.getHax().chestSearchHack
-				.getMaxSearchResults() + ")"
-			: "";
-		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 matchLabel =
-			currentQuery.isEmpty() ? "Listed items" : "Matching items";
-		String summary =
-			"Showing " + shown + "/" + totalMatches + limiter + extra + " - "
-				+ matchLabel + ": " + totalMatchingItems + " - Tracking "
-				+ totalChestsLogged + " chests, " + totalItemsLogged + " items";
-		int summaryPadding = 8;
-		int summaryWidth = this.font.width(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);

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

@@ -53,11 +53,14 @@ protected void onEnable()
 			if(f == null)
 			{
 				if(WurstClient.MC != null && WurstClient.MC.player != null)
+				{
 					WurstClient.MC.player
 						.displayClientMessage(
 							net.minecraft.network.chat.Component.literal(
 								"No loot export found for this server."),
 							false);
+					sendLootSearchDebug(serverIp, dir);
+				}
 				setEnabled(false);
 				return;
 			}
@@ -72,4 +75,47 @@ protected void onEnable()
 		}
 		setEnabled(false);
 	}
+	
+	private void sendLootSearchDebug(String serverIp, File dir)
+	{
+		if(WurstClient.MC == null || WurstClient.MC.player == null)
+			return;
+		
+		String ip = serverIp == null ? "<null>" : serverIp;
+		String dirPath = dir == null ? "<null>" : dir.getAbsolutePath();
+		WurstClient.MC.player
+			.displayClientMessage(net.minecraft.network.chat.Component
+				.literal("LootSearch debug: serverIp=" + ip), false);
+		WurstClient.MC.player
+			.displayClientMessage(net.minecraft.network.chat.Component
+				.literal("LootSearch debug: lootDir=" + dirPath), false);
+		
+		if(dir == null || !dir.exists() || !dir.isDirectory())
+			return;
+		
+		File[] files =
+			dir.listFiles((d, name) -> name.toLowerCase().endsWith(".json"));
+		if(files == null || files.length == 0)
+		{
+			WurstClient.MC.player.displayClientMessage(
+				net.minecraft.network.chat.Component.literal(
+					"LootSearch debug: no .json files in lootDir"),
+				false);
+			return;
+		}
+		
+		StringBuilder names = new StringBuilder();
+		for(int i = 0; i < files.length && i < 10; i++)
+		{
+			if(i > 0)
+				names.append(", ");
+			names.append(files[i].getName());
+		}
+		if(files.length > 10)
+			names.append(" ... (").append(files.length).append(" total)");
+		
+		WurstClient.MC.player
+			.displayClientMessage(net.minecraft.network.chat.Component
+				.literal("LootSearch debug: files=" + names), false);
+	}
 }