Updated ItemHandler and WindChargeKey

Author: cev-api

README.md

@@ -409,6 +409,7 @@ Reports number of waypoints changed.
   - Can also filter out default mob items to prevent spam
 - Optionally can read the contents of signs in the popup HUD
 - Optionally pin special items (from ItemESP list) to the top of the popup HUD
+- Optionally display enchantments of gear in lieu of the registry name
 
 ![Popup](https://i.imgur.com/VQw20x0.png)
 ![GUI](https://i.imgur.com/oZFLufE.png)

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

@@ -8,6 +8,9 @@
 package net.wurstclient.hacks;
 
 import com.mojang.blaze3d.platform.InputConstants;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import org.lwjgl.glfw.GLFW;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.network.protocol.game.ServerboundMovePlayerPacket;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
@@ -20,17 +23,14 @@
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
-import net.wurstclient.settings.TextFieldSetting;
 
 @SearchTags({"wind charge", "auto wind charge", "windcharge"})
 public final class WindChargeKeyHack extends Hack implements UpdateListener
 {
-	private final TextFieldSetting keybind = new TextFieldSetting("Keybind",
-		"Determines the activation key.\n\n"
-			+ "Use translation keys such as \u00a7lkey.keyboard.g\u00a7r.\n"
-			+ "You can find these by looking at the F3 debug screen or by\n"
-			+ "checking vanilla keybind configuration files.",
-		"key.keyboard.g", this::isValidKey);
+	private static final KeyMapping activationKey =
+		KeyBindingHelper.registerKeyBinding(new KeyMapping(
+			"key.wurst.windchargekey", InputConstants.Type.KEYSYM,
+			GLFW.GLFW_KEY_SPACE, KeyMapping.Category.MISC));
 
 	private final SliderSetting switchDelayMs = new SliderSetting(
 		"Switch delay", 50, 0, 500, 5, ValueDisplay.INTEGER.withSuffix("ms"));
@@ -53,7 +53,6 @@ public final class WindChargeKeyHack extends Hack implements UpdateListener
 	private final SliderSetting jumpDelayMs = new SliderSetting("Jump delay",
 		10, 0, 200, 5, ValueDisplay.INTEGER.withSuffix("ms"));
 
-	private boolean keyPressed;
 	private int originalSlot = -1;
 	private boolean needsSlotRestore;
 	private boolean firstThrow = true;
@@ -75,7 +74,6 @@ public WindChargeKeyHack()
 		super("WindChargeKey");
 		setCategory(Category.COMBAT);
 
-		addSetting(keybind);
 		addSetting(switchDelayMs);
 		addSetting(throwDelayMs);
 		addSetting(silentMode);
@@ -109,19 +107,9 @@ public void onUpdate()
 			return;
 
 		if(MC.screen != null)
-		{
-			keyPressed = false;
 			return;
-		}
-		
-		InputConstants.Key key = getBoundKey();
-		if(key == null)
-			return;
-		
-		boolean currentlyPressed =
-			InputConstants.isKeyDown(MC.getWindow(), key.getValue());
 
-		if(currentlyPressed && !keyPressed)
+		while(activationKey.consumeClick())
 			handleWindChargeThrow();
 
 		long now = System.currentTimeMillis();
@@ -166,7 +154,6 @@ public void onUpdate()
 			originalSlot = -1;
 		}
 
-		keyPressed = currentlyPressed;
 	}
 
 	private void handleWindChargeThrow()
@@ -360,18 +347,6 @@ private int findWindChargeInHotbar()
 		return -1;
 	}
 
-	private InputConstants.Key getBoundKey()
-	{
-		try
-		{
-			return InputConstants.getKey(keybind.getValue());
-			
-		}catch(IllegalArgumentException e)
-		{
-			return null;
-		}
-	}
-	
 	private long getSwitchDelay()
 	{
 		return Math.max(0L, Math.round(switchDelayMs.getValue()));
@@ -387,26 +362,13 @@ private long getJumpDelay()
 		return Math.max(0L, Math.round(jumpDelayMs.getValue()));
 	}
 
-	private boolean isValidKey(String translationKey)
-	{
-		try
-		{
-			return InputConstants.getKey(translationKey) != null;
-			
-		}catch(IllegalArgumentException e)
-		{
-			return false;
-		}
-	}
-	
 	private void resetState()
 	{
 		clearPending();
 
 		if(restorePitch && MC.player != null)
 			restorePitchImmediate(savedPitch);
 
-		keyPressed = false;
 		originalSlot = -1;
 		needsSlotRestore = false;
 		firstThrow = true;

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

@@ -21,9 +21,12 @@
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
+import java.util.LinkedHashSet;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Holder;
+import net.minecraft.core.component.DataComponents;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.ExperienceOrb;
@@ -36,6 +39,8 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
 import net.minecraft.world.level.block.entity.SignText;
 import net.minecraft.world.phys.Vec3;
@@ -55,6 +60,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
+import it.unimi.dsi.fastutil.objects.Object2IntMap;
 // no screen import needed; we embed ItemESP's editor component directly
 import net.wurstclient.util.InventoryUtils;
 import net.wurstclient.util.chunk.ChunkUtils;
@@ -118,6 +124,11 @@ public class ItemHandlerHack extends Hack
 	private final CheckboxSetting showRegistryName =
 		new CheckboxSetting("Show registry names", false);
 
+	private final CheckboxSetting showEnchantmentsInNames =
+		new CheckboxSetting("Show enchantments in names",
+			"Shows enchantments on the second line in ItemHandler HUD and GUI.",
+			false);
+	
 	// How many items to show in the popup HUD
 	private final SliderSetting popupMaxItems = new SliderSetting(
 		"Popup HUD max items", 8, 1, 10, 1, ValueDisplay.INTEGER);
@@ -182,6 +193,7 @@ public ItemHandlerHack()
 		addSetting(new ButtonSetting("Open ItemHandler GUI", this::openScreen));
 		addSetting(hudEnabled);
 		addSetting(showRegistryName);
+		addSetting(showEnchantmentsInNames);
 		addSetting(includeMobEquipment);
 		addSetting(filterDefaultMobEquipment);
 		addSetting(respectItemEspIgnores);
@@ -561,7 +573,8 @@ private void scanNearbyItems()
 
 	private void scanNearbySigns()
 	{
-		if(!showSignsInHud.isChecked())
+		boolean guiOpen = MC.screen instanceof ItemHandlerScreen;
+		if(!showSignsInHud.isChecked() && !guiOpen)
 		{
 			trackedSigns.clear();
 			return;
@@ -985,14 +998,26 @@ public List<NearbySign> getTrackedSigns()
 		return List.copyOf(trackedSigns);
 	}
 
+	public static String getSignTraceId(BlockPos pos)
+	{
+		if(pos == null)
+			return null;
+		return "sign:" + pos.asLong();
+	}
+	
 	public boolean isShowSignsInHud()
 	{
 		return showSignsInHud.isChecked();
 	}
 
 	public record NearbySign(BlockPos pos, ItemStack icon, String text,
 		double distance)
-	{}
+	{
+		public String traceId()
+		{
+			return getSignTraceId(pos);
+		}
+	}
 
 	public boolean isHudEnabled()
 	{
@@ -1063,6 +1088,11 @@ public boolean isShowRegistryName()
 		return showRegistryName.isChecked();
 	}
 
+	public boolean isShowEnchantmentsInNames()
+	{
+		return showEnchantmentsInNames.isChecked();
+	}
+	
 	public record GroundItem(int entityId, UUID uuid, ItemStack stack,
 		double distance, Vec3 position, SourceType sourceType,
 		String sourceName)
@@ -1084,6 +1114,8 @@ public String traceId()
 				int xp = net.wurstclient.util.ItemUtils.getXpAmount(stack);
 				return baseId + ":xp:" + xp;
 			}
+			if(sourceType == SourceType.ITEM_FRAME)
+				return baseId + ":item_frame";
 			return baseId;
 		}
 
@@ -1104,6 +1136,7 @@ public String displayName()
 			if(name == null || name.isBlank())
 				name = net.minecraft.core.registries.BuiltInRegistries.ITEM
 					.getKey(stack.getItem()).getPath();
+			
 			String label = sourceLabel();
 			if(label == null || label.isBlank())
 				return name;
@@ -1163,6 +1196,22 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 			if(shouldDrawTracers)
 				ends.add(new RenderUtils.ColoredPoint(p, 0));
 		}
+		
+		for(NearbySign sign : trackedSigns)
+		{
+			if(sign == null || sign.pos() == null)
+				continue;
+			String traceId = sign.traceId();
+			boolean traced = traceId != null && isTraced(traceId);
+			if(!traced)
+				continue;
+			BlockPos pos = sign.pos();
+			Vec3 p = Vec3.atCenterOf(pos);
+			if(shouldDrawBoxes)
+				boxes.add(new AABB(pos));
+			if(shouldDrawTracers)
+				ends.add(new RenderUtils.ColoredPoint(p, 0));
+		}
 		boolean hasBoxes = shouldDrawBoxes && boxes != null && !boxes.isEmpty();
 		boolean hasTracers =
 			shouldDrawTracers && ends != null && !ends.isEmpty();
@@ -1263,4 +1312,35 @@ public java.util.Set<net.wurstclient.keybinds.PossibleKeybind> getPossibleKeybin
 				return java.util.Collections.emptySet();
 			}
 		};
+	
+	public String getEnchantmentSummary(ItemStack stack)
+	{
+		if(stack == null || stack.isEmpty())
+			return "";
+		
+		ArrayList<String> parts = new ArrayList<>();
+		LinkedHashSet<String> seen = new LinkedHashSet<>();
+		appendEnchantmentParts(parts, seen, stack
+			.getOrDefault(DataComponents.ENCHANTMENTS, ItemEnchantments.EMPTY));
+		appendEnchantmentParts(parts, seen, stack.getOrDefault(
+			DataComponents.STORED_ENCHANTMENTS, ItemEnchantments.EMPTY));
+		if(parts.isEmpty())
+			return "";
+		return String.join(", ", parts);
+	}
+	
+	private static void appendEnchantmentParts(List<String> out,
+		Set<String> seen, ItemEnchantments enchantments)
+	{
+		for(Object2IntMap.Entry<Holder<Enchantment>> entry : enchantments
+			.entrySet())
+		{
+			Holder<Enchantment> holder = entry.getKey();
+			int level = entry.getIntValue();
+			String key = holder.getRegisteredName() + "#" + level;
+			if(!seen.add(key))
+				continue;
+			out.add(Enchantment.getFullname(holder, level).getString());
+		}
+	}
 }

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

@@ -143,6 +143,19 @@ class MergeEntry
 			MergeEntry me = items.get(ii);
 			String name = me.displayName;
 			int wName = (int)Math.round(font.width(name) * scale);
+			String subtitle = "";
+			if(hack != null)
+			{
+				if(hack.isShowEnchantmentsInNames())
+					subtitle = hack.getEnchantmentSummary(me.rep);
+				if(subtitle.isBlank() && hack.isShowRegistryName())
+					subtitle =
+						net.minecraft.core.registries.BuiltInRegistries.ITEM
+							.getKey(me.rep.getItem()).toString();
+			}
+			if(!subtitle.isBlank())
+				wName = Math.max(wName,
+					(int)Math.round(font.width(subtitle) * (scale * 0.6)));
 			String dist = ((int)Math.round(me.closest)) + " blocks";
 			int wDist = (int)Math.round(font.width(dist) * scale);
 			maxNameW = Math.max(maxNameW, wName);
@@ -217,14 +230,19 @@ class MergeEntry
 					0xFFFFFFFF, false, countScale);
 			}
 
-			// optionally show registry id as subtitle
-			if(hack != null && hack.isShowRegistryName())
+			// Optional subtitle line: enchantments or registry id.
+			if(hack != null)
 			{
-				String reg =
-					net.minecraft.core.registries.BuiltInRegistries.ITEM
-						.getKey(me.rep.getItem()).toString();
-				RenderUtils.drawScaledText(context, tr, reg, ex + 22, iy + 9,
-					0xFF909090, false, 0.6);
+				String subtitle = "";
+				if(hack.isShowEnchantmentsInNames())
+					subtitle = hack.getEnchantmentSummary(me.rep);
+				if(subtitle.isBlank() && hack.isShowRegistryName())
+					subtitle =
+						net.minecraft.core.registries.BuiltInRegistries.ITEM
+							.getKey(me.rep.getItem()).toString();
+				if(!subtitle.isBlank())
+					RenderUtils.drawScaledText(context, tr, subtitle, ex + 22,
+						iy + 9, 0xFF909090, false, 0.6);
 			}
 			i++;
 		}