Small Fixes

Author: cev-api

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

@@ -112,10 +112,11 @@ private UUID getOwnerUuid(Entity entity)
 		return OwnerResolver.getOwnerUuid(entity, projectiles.isChecked());
 	}
 
-	private String resolveOwnerName(UUID owner)
-	{
-		return OwnerResolver.lookupPlayerName(owner);
-	}
+	private String resolveOwnerName(UUID owner)
+	{
+		String name = OwnerResolver.lookupPlayerName(owner);
+		return OwnerResolver.isResolvablePlayerName(name) ? name : null;
+	}
 
 	@Override
 	public void onRender(PoseStack matrixStack, float partialTicks)
@@ -151,12 +152,12 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 	private String getProjectileOwnerLabel(Entity projectile, Entity owner)
 	{
 		UUID ownerUuid = OwnerResolver.getOwnerUuid(projectile);
-		if(ownerUuid != null)
-		{
-			String name = OwnerResolver.lookupPlayerName(ownerUuid);
-			if(name != null)
-				return "Owner: " + name;
-		}
+		if(ownerUuid != null)
+		{
+			String name = OwnerResolver.lookupPlayerName(ownerUuid);
+			if(OwnerResolver.isResolvablePlayerName(name))
+				return "Owner: " + name;
+		}
 
 		if(owner == null)
 			return showUuidWhenUnknown.isChecked() ? "Owner: Unknown" : null;

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

@@ -984,21 +984,21 @@ private String getOwnerUuidLabel(UUID ownerUuid)
 		if(MC.player != null && ownerUuid.equals(MC.player.getUUID()))
 			return "Owner: You";
 
-		String name = resolvePlayerName(ownerUuid);
-		return name == null ? null : "Owner: " + name;
-	}
+		String name = resolvePlayerName(ownerUuid);
+		return name == null ? null : "Owner: " + name;
+	}
 
 	private String resolvePlayerName(UUID uuid)
 	{
 		if(uuid == null)
 			return null;
 
-		String name = OwnerResolver.lookupPlayerName(uuid);
-		if(name != null && !name.isBlank())
-		{
-			knownPlayerNames.put(uuid, name);
-			return name;
-		}
+		String name = OwnerResolver.lookupPlayerName(uuid);
+		if(OwnerResolver.isResolvablePlayerName(name))
+		{
+			knownPlayerNames.put(uuid, name);
+			return name;
+		}
 
 		String cached = knownPlayerNames.get(uuid);
 		if(cached != null && !cached.isBlank())

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

@@ -7,6 +7,7 @@
  */
 package net.wurstclient.hacks;
 
+import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.InventoryScreen;
 import net.minecraft.core.BlockPos;
@@ -20,6 +21,7 @@
 import net.wurstclient.events.UpdateListener;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.settings.TextFieldSetting;
 import net.wurstclient.util.ChatUtils;
 
 @SearchTags({"remote echest", "remote ender chest", "ender chest",
@@ -30,12 +32,16 @@ public final class RemoteEnderChestHack extends Hack implements UpdateListener
 
 	private boolean guiHidden;
 	private boolean guiWasOpen;
-	private boolean lastKeyState;
+	private boolean lastToggleKeyState;
 	private AbstractContainerScreen<?> savedScreen;
 	private int savedSyncId = -1;
 	private Level lastWorld;
 	private BlockPos potentialEChestPos;
 
+	private final TextFieldSetting toggleGuiKey =
+		new TextFieldSetting("Toggle GUI key", "key.keyboard.left.alt",
+			RemoteEnderChestHack::isValidKey);
+	
 	private final CheckboxSetting swapInventoryKey =
 		new CheckboxSetting("Swap inventory key",
 			"When active, pressing the inventory key (E) will open the linked\n"
@@ -47,6 +53,7 @@ public RemoteEnderChestHack()
 		super("RemoteEChest");
 		instance = this;
 		setCategory(Category.OTHER);
+		addSetting(toggleGuiKey);
 		addSetting(swapInventoryKey);
 	}
 
@@ -87,9 +94,6 @@ public static void toggleLinkedGui()
 		if(self == null || !self.isEnabled() || self.savedScreen == null)
 			return;
 
-		// Prevent double-toggle when both a mixin and onUpdate() see Left Alt.
-		self.lastKeyState = true;
-		
 		if(!self.isSavedContainerMenuStillActive())
 		{
 			self.breakLink("Ender chest handler invalid. EChest link broken.");
@@ -233,6 +237,25 @@ && isSavedContainerMenuStillActive() && guiHidden
 			return;
 		}
 
+		if(MC.screen == null && savedScreen != null
+			&& isSavedContainerMenuStillActive())
+		{
+			InputConstants.Key key = getToggleGuiKey();
+			if(key != null)
+			{
+				boolean keyDown =
+					InputConstants.isKeyDown(MC.getWindow(), key.getValue());
+				boolean keyJustPressed = keyDown && !lastToggleKeyState;
+				lastToggleKeyState = keyDown;
+				if(keyJustPressed)
+				{
+					toggleLinkedGui();
+					return;
+				}
+			}
+		}else
+			lastToggleKeyState = false;
+		
 		if(MC.hitResult instanceof BlockHitResult bhr)
 		{
 			potentialEChestPos = bhr.getBlockPos();
@@ -249,8 +272,8 @@ && isSavedContainerMenuStillActive() && guiHidden
 		}
 
 		// Opening another container, chest, player inventory, etc. invalidates
-		// the saved link. Clear it immediately so Alt cannot reopen a stale
-		// ghost GUI later.
+		// the saved link. Clear it immediately so the toggle key cannot
+		// reopen a stale ghost GUI later.
 		if(savedScreen != null
 			&& MC.screen instanceof AbstractContainerScreen<?> screen
 			&& screen != savedScreen)
@@ -281,32 +304,8 @@ && isSavedContainerMenuStillActive() && guiHidden
 			guiWasOpen = true;
 			lastWorld = MC.level;
 			ChatUtils.message(
-				"EChest link created! Press Left Alt to toggle the GUI.");
-		}
-		
-		long window = MC.getWindow().handle();
-		boolean keyDown = org.lwjgl.glfw.GLFW.glfwGetKey(window,
-			org.lwjgl.glfw.GLFW.GLFW_KEY_LEFT_ALT) == 1;
-		boolean keyJustPressed = keyDown && !lastKeyState;
-		lastKeyState = keyDown;
-		
-		if(keyJustPressed && savedScreen != null)
-		{
-			if(!isSavedContainerMenuStillActive())
-			{
-				breakLink("Ender chest handler invalid. EChest link broken.");
-				return;
-			}
-			
-			if(guiHidden)
-			{
-				MC.setScreen(savedScreen);
-				guiHidden = false;
-			}else
-			{
-				MC.setScreen(null);
-				guiHidden = true;
-			}
+				"EChest link created! Use the configured toggle key to show or"
+					+ " hide the GUI.");
 		}
 
 		if(savedScreen != null && MC.screen == null && !guiHidden && guiWasOpen)
@@ -373,7 +372,7 @@ private void resetStuff(boolean sendClosePacket)
 
 		guiHidden = false;
 		guiWasOpen = false;
-		lastKeyState = false;
+		lastToggleKeyState = false;
 		potentialEChestPos = null;
 		savedSyncId = -1;
 		savedScreen = null;
@@ -388,4 +387,31 @@ private void resetStuff(boolean sendClosePacket)
 				.send(new ServerboundContainerClosePacket(syncId));
 		}
 	}
+	
+	public String getToggleGuiKeyName()
+	{
+		return toggleGuiKey.getValue();
+	}
+	
+	private InputConstants.Key getToggleGuiKey()
+	{
+		try
+		{
+			return InputConstants.getKey(toggleGuiKey.getValue());
+		}catch(IllegalArgumentException e)
+		{
+			return null;
+		}
+	}
+	
+	private static boolean isValidKey(String keyName)
+	{
+		try
+		{
+			return InputConstants.getKey(keyName) != null;
+		}catch(IllegalArgumentException e)
+		{
+			return false;
+		}
+	}
 }

src/main/java/net/wurstclient/hacks/itemhandler/ItemHandlerHack.java

@@ -721,10 +721,11 @@ private void scanNearbySigns()
 				if(owner == null && ownerUuid == null)
 					continue;
 
-				// If we have a UUID but no entity, require a known name
-				if(owner == null
-					&& OwnerResolver.lookupPlayerName(ownerUuid) == null)
-					continue;
+				// If we have a UUID but no entity, require a known name
+				String ownerName = ownerUuid == null ? null
+					: OwnerResolver.lookupPlayerName(ownerUuid);
+				if(owner == null && !hasResolvableOwnerName(ownerName))
+					continue;
 
 				boolean ownedByMe = MC.player != null && ownerUuid != null
 					&& ownerUuid.equals(MC.player.getUUID())
@@ -1605,19 +1606,25 @@ private String getOwnerLabel(Entity entity, Entity owner)
 			if(MC.player != null && ownerUuid.equals(MC.player.getUUID()))
 				return "Owner: You";
 
-			String name = OwnerResolver.lookupPlayerName(ownerUuid);
-			if(name != null)
-				return "Owner: " + name;
+			String name = OwnerResolver.lookupPlayerName(ownerUuid);
+			if(hasResolvableOwnerName(name))
+				return "Owner: " + name;
 		}
 
 		if(owner == MC.player)
 			return "Owner: You";
 		if(owner instanceof Player player)
 			return "Owner: " + player.getName().getString();
-		if(owner != null)
-			return "Owner: " + entityDisplayName(owner);
-		return "Owner: Unknown";
-	}
+		if(owner != null)
+			return "Owner: " + entityDisplayName(owner);
+		return "Owner: Unknown";
+	}
+
+	private boolean hasResolvableOwnerName(String name)
+	{
+		return name != null && !name.isBlank()
+			&& !OwnerResolver.DUMMY_NAME.equals(name);
+	}
 
 	private UUID getEntityOwnerUuid(Entity entity)
 	{

src/main/java/net/wurstclient/mixin/ContainerScreenMixin.java

@@ -14,6 +14,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.input.KeyEvent;
@@ -126,7 +127,11 @@ public boolean keyPressed(KeyEvent event)
 				RemoteEnderChestHack.hideLinkedGui();
 				return true;
 			}
-			if(key == GLFW.GLFW_KEY_LEFT_ALT)
+			String keyName = InputConstants.getKey(
+				new KeyEvent(event.key(), event.scancode(), event.modifiers()))
+				.getName();
+			if(remote != null
+				&& keyName.equalsIgnoreCase(remote.getToggleGuiKeyName()))
 			{
 				RemoteEnderChestHack.toggleLinkedGui();
 				return true;

src/main/java/net/wurstclient/util/OwnerResolver.java

@@ -132,11 +132,16 @@ private static UUID uuidFrom(@Nullable Object value)
 		return null;
 	}
 
-	public static boolean shouldFetchFromServer(@Nullable UUID uuid)
-	{
-		String name = lookupPlayerName(uuid);
-		return name == null || name.equals(DUMMY_NAME);
-	}
+	public static boolean shouldFetchFromServer(@Nullable UUID uuid)
+	{
+		String name = lookupPlayerName(uuid);
+		return !isResolvablePlayerName(name);
+	}
+
+	public static boolean isResolvablePlayerName(@Nullable String name)
+	{
+		return name != null && !name.isBlank() && !DUMMY_NAME.equals(name);
+	}
 
 	@Nullable
 	public static String lookupPlayerName(@Nullable UUID uuid)

src/main/resources/assets/wurst/translations/en_us.json

@@ -590,11 +590,13 @@
   "hack.wurst.mapa": "Mapa",
   "description.wurst.hack.mapa": "Provides an integrated minimap and world map with optional ESP markers.",
   "hack.wurst.miningevidence": "MiningEvidence",
-  "description.wurst.hack.miningevidence": "Detects underground line-shaped item drops that suggest recent mining activity and keeps the matched trail visible for a configurable time after the items disappear.",
-  "hack.wurst.spectatormonitor": "SpectatorMonitor",
-  "description.wurst.hack.spectatormonitor": "Monitors the tab list for players entering or leaving spectator mode, with optional alerts for visible player entities missing from the tab list.",
-  "description.wurst.hack.ui-utils": "Adds UI utilities like packet control, chat-in-GUI input, and resource pack bypass tools.",
-  "hack.wurst.pearlesp": "PearlESP",
+  "description.wurst.hack.miningevidence": "Detects underground line-shaped item drops that suggest recent mining activity and keeps the matched trail visible for a configurable time after the items disappear.",
+  "hack.wurst.spectatormonitor": "SpectatorMonitor",
+  "description.wurst.hack.spectatormonitor": "Monitors the tab list for players entering or leaving spectator mode, with optional alerts for visible player entities missing from the tab list.",
+  "hack.wurst.staffmonitor": "StaffMonitor",
+  "description.wurst.hack.staffmonitor": "Monitors the tab list for players entering or leaving spectator mode, with optional alerts for hidden staff and visible player entities missing from the tab list.",
+  "description.wurst.hack.ui-utils": "Adds UI utilities like packet control, chat-in-GUI input, and resource pack bypass tools.",
+  "hack.wurst.pearlesp": "PearlESP",
   "description.wurst.hack.pearlesp": "Highlights ender pearls thrown by other players, shows predicted landing with a purple box, draws a trajectory line, and highlights when players are holding an ender pearl.",
   "hack.wurst.projectileowner": "ProjectileOwner",
   "description.wurst.hack.projectileowner": "Shows owner labels above projectiles when the owner is known client-side, ignoring projectiles thrown by you.",