Added Server Search & Command Auto-Complete. Update LootSearch,

ChestSearch, CoordLogger

Author: cev-api

gradle.properties

@@ -15,7 +15,7 @@ fabric_api_version=0.147.0+26.1.2
 
 # Mod Properties
 mod_version=v7.53.1-CevAPI-MC26.1.2
-fork_release_version=0.54
+fork_release_version=0.55
 maven_group=net.wurstclient
 archives_base_name=Wurst-Client
 mod_loader=Fabric

src/main/java/net/wurstclient/chestsearch/ChestDatabase.java

@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.stream.Collectors;
+import net.wurstclient.WurstClient;
+import net.wurstclient.hacks.ChestSearchHack;
 
 public class ChestDatabase
 {
@@ -77,8 +79,8 @@ public synchronized void save()
 		try(FileWriter w = new FileWriter(file))
 		{
 			gson.toJson(entries, w);
-			System.out.println("[ChestDatabase] saved " + entries.size()
-				+ " entries to " + file.getAbsolutePath());
+			log("[ChestDatabase] saved " + entries.size() + " entries to "
+				+ file.getAbsolutePath());
 		}catch(Exception e)
 		{
 			e.printStackTrace();
@@ -126,9 +128,8 @@ public synchronized void upsert(ChestEntry entry)
 						entry.touch();
 						entries.add(entry);
 						finalizeInsert(entry);
-						System.out.println(
-							"[ChestDatabase] merged entry by contents; preserved primary="
-								+ entry.x + "," + entry.y + "," + entry.z);
+						log("[ChestDatabase] merged entry by contents; preserved primary="
+							+ entry.x + "," + entry.y + "," + entry.z);
 						return;
 					}
 				}
@@ -152,7 +153,7 @@ public synchronized void upsert(ChestEntry entry)
 				it.remove();
 				entries.add(entry);
 				finalizeInsert(entry);
-				System.out.println("[ChestDatabase] updated entry at bounds "
+				log("[ChestDatabase] updated entry at bounds "
 					+ entry.getMinPos() + " -> " + entry.getMaxPos()
 					+ " facing=" + entry.facing + " (preserved primary="
 					+ entry.x + "," + entry.y + "," + entry.z + ")");
@@ -162,9 +163,8 @@ public synchronized void upsert(ChestEntry entry)
 		entry.touch();
 		entries.add(entry);
 		finalizeInsert(entry);
-		System.out.println(
-			"[ChestDatabase] added entry at bounds " + entry.getMinPos()
-				+ " -> " + entry.getMaxPos() + " facing=" + entry.facing);
+		log("[ChestDatabase] added entry at bounds " + entry.getMinPos()
+			+ " -> " + entry.getMaxPos() + " facing=" + entry.facing);
 	}
 
 	public synchronized void removeAt(String serverIp, String dimension, int x,
@@ -175,8 +175,7 @@ public synchronized void removeAt(String serverIp, String dimension, int x,
 				&& e.x == x && e.y == y && e.z == z))
 			.collect(Collectors.toList());
 		save();
-		System.out.println(
-			"[ChestDatabase] removed entry at " + x + "," + y + "," + z);
+		log("[ChestDatabase] removed entry at " + x + "," + y + "," + z);
 	}
 
 	public synchronized List<ChestEntry> search(String query)
@@ -320,8 +319,7 @@ private void finalizeInsert(ChestEntry entry)
 	{
 		boolean removed = removeOverlappingDuplicates(entry);
 		if(removed)
-			System.out.println(
-				"[ChestDatabase] cleaned overlapping duplicates after insert.");
+			log("[ChestDatabase] cleaned overlapping duplicates after insert.");
 		save();
 	}
 
@@ -360,14 +358,35 @@ private boolean removeOverlappingDuplicates(ChestEntry reference)
 			if(!overlap)
 				continue;
 			it.remove();
-			System.out
-				.println("[ChestDatabase] removed overlapping duplicate at "
-					+ other.getMinPos() + " -> " + other.getMaxPos());
+			log("[ChestDatabase] removed overlapping duplicate at "
+				+ other.getMinPos() + " -> " + other.getMaxPos());
 			removed = true;
 		}
 		return removed;
 	}
 
+	private static void log(String message)
+	{
+		if(shouldLogConsole())
+			System.out.println(message);
+	}
+	
+	private static boolean shouldLogConsole()
+	{
+		try
+		{
+			if(WurstClient.INSTANCE == null
+				|| WurstClient.INSTANCE.getHax() == null)
+				return true;
+			ChestSearchHack hack =
+				WurstClient.INSTANCE.getHax().chestSearchHack;
+			return hack == null || hack.shouldShowConsoleLogs();
+		}catch(Throwable ignored)
+		{
+			return true;
+		}
+	}
+	
 	private boolean dedupeLoadedEntries()
 	{
 		if(entries == null || entries.isEmpty())

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

@@ -69,6 +69,9 @@ public final class ChestSearchHack extends Hack
 		new CheckboxSetting("Loot mismatch notifications",
 			"Show a chat notification when a chest does not match the loot table.",
 			false);
+	private final CheckboxSetting consoleLogs =
+		new CheckboxSetting("Console logs",
+			"Print ChestSearch debug messages to the console.", true);
 	private final SliderSetting textScale = new SliderSetting("Text scale", 1.0,
 		0.5, 1.25, 0.05, ValueDisplay.DECIMAL);
 
@@ -96,6 +99,7 @@ public ChestSearchHack()
 		addSetting(markXColor);
 		addSetting(recordedChestNotifications);
 		addSetting(lootMismatchNotifications);
+		addSetting(consoleLogs);
 	}
 
 	public int getMarkXColorARGB()
@@ -135,6 +139,11 @@ public boolean isLootMismatchNotificationEnabled()
 		return lootMismatchNotifications.isChecked();
 	}
 
+	public boolean shouldShowConsoleLogs()
+	{
+		return consoleLogs.isChecked();
+	}
+	
 	public int getCleanerGraceTicks()
 	{
 		return (int)(gracePeriodSec.getValueI() * 20);

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

@@ -18,7 +18,10 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ClientboundLevelEventPacket;
+import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
+import net.minecraft.network.protocol.game.ClientboundSoundPacket;
 import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
+import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
@@ -310,6 +313,20 @@ public void onReceivedPacket(PacketInputEvent event)
 			if(packet instanceof ClientboundLevelEventPacket lvl)
 			{
 				handleLevelEvent(lvl);
+				return;
+			}
+			
+			// Sound packets (used by some servers/versions for wither spawn
+			// direction hints)
+			if(packet instanceof ClientboundSoundPacket sound)
+			{
+				handleSoundPacket(sound);
+				return;
+			}
+			
+			if(packet instanceof ClientboundSoundEntityPacket soundEntity)
+			{
+				handleSoundEntityPacket(soundEntity);
 			}
 		}catch(Throwable t)
 		{
@@ -499,6 +516,83 @@ private void handleLevelEvent(ClientboundLevelEventPacket packet)
 		}
 	}
 
+	private void handleSoundPacket(ClientboundSoundPacket packet)
+	{
+		if(packet == null || MC == null || MC.player == null)
+			return;
+		if(!logMobs.isChecked())
+			return;
+		
+		String soundId;
+		try
+		{
+			soundId = BuiltInRegistries.SOUND_EVENT
+				.getKey(packet.getSound().value()).toString();
+		}catch(Throwable t)
+		{
+			return;
+		}
+		
+		if(!"minecraft:entity.wither.spawn".equals(soundId))
+			return;
+		
+		Vec3 soundPos = new Vec3(packet.getX(), packet.getY(), packet.getZ());
+		double dist = MC.player.position().distanceTo(soundPos);
+		if(dist < minDistance.getValue())
+			return;
+		
+		String dir = getCompassDirection(MC.player.position(), soundPos);
+		String msg = String.format(
+			"[CoordLogger] Wither spawn sound at x=%.1f, y=%.1f, z=%.1f (dist=%.1f, dir=%s)",
+			soundPos.x, soundPos.y, soundPos.z, dist, dir);
+		MC.execute(() -> ChatUtils.message(msg));
+		
+		boolean isFar = dist > NEAR_EVENT_DISTANCE;
+		markers.add(new EventMarker(soundPos, isFar, 1023, "WITHER_SPAWN_SOUND",
+			EventCategory.MOBS));
+	}
+	
+	private void handleSoundEntityPacket(ClientboundSoundEntityPacket packet)
+	{
+		if(packet == null || MC == null || MC.player == null
+			|| MC.level == null)
+			return;
+		if(!logMobs.isChecked())
+			return;
+		
+		String soundId;
+		try
+		{
+			soundId = BuiltInRegistries.SOUND_EVENT
+				.getKey(packet.getSound().value()).toString();
+		}catch(Throwable t)
+		{
+			return;
+		}
+		
+		if(!"minecraft:entity.wither.spawn".equals(soundId))
+			return;
+		
+		Entity entity = MC.level.getEntity(packet.getId());
+		if(entity == null)
+			return;
+		
+		Vec3 soundPos = entity.position();
+		double dist = MC.player.position().distanceTo(soundPos);
+		if(dist < minDistance.getValue())
+			return;
+		
+		String dir = getCompassDirection(MC.player.position(), soundPos);
+		String msg = String.format(
+			"[CoordLogger] Wither spawn sound(entity) at x=%.1f, y=%.1f, z=%.1f (dist=%.1f, dir=%s)",
+			soundPos.x, soundPos.y, soundPos.z, dist, dir);
+		MC.execute(() -> ChatUtils.message(msg));
+		
+		boolean isFar = dist > NEAR_EVENT_DISTANCE;
+		markers.add(new EventMarker(soundPos, isFar, 1023,
+			"WITHER_SPAWN_SOUND_ENTITY", EventCategory.MOBS));
+	}
+	
 	private double distanceToPlayer(BlockPos pos)
 	{
 		if(MC.player == null)

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

@@ -15,6 +15,7 @@
 import net.wurstclient.hack.Hack;
 import net.wurstclient.lootsearch.LootChestManager;
 import net.wurstclient.lootsearch.LootSearchUtil;
+import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.FileSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
@@ -48,13 +49,19 @@ public final class LootSearchHack extends Hack
 		ValueDisplay.INTEGER.withSuffix(" min")
 			.withLabel(WAYPOINT_TIME_MINUTES_INFINITE, "Infinite"));
 
+	private final CheckboxSetting compareOpenedChests = new CheckboxSetting(
+		"Compare opened chests",
+		"Compare opened chests against the loot export and report mismatches.",
+		false);
+	
 	public LootSearchHack()
 	{
 		super("LootSearch");
 		setCategory(Category.ITEMS);
 		addSetting(lootJsonPicker);
 		addSetting(literalJsonPath);
 		addSetting(waypointTimeMinutes);
+		addSetting(compareOpenedChests);
 	}
 
 	public int getWaypointTimeMs()
@@ -65,6 +72,11 @@ public int getWaypointTimeMs()
 		return minutes * 60 * 1000;
 	}
 
+	public boolean shouldCompareOpenedChests()
+	{
+		return compareOpenedChests.isChecked();
+	}
+	
 	@Override
 	protected void onEnable()
 	{