Updated ItemHandler and KeyBinds

Author: cev-api

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

@@ -12,6 +12,7 @@
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
 import net.wurstclient.settings.CheckboxSetting;
+import net.wurstclient.settings.ButtonSetting;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -27,6 +28,11 @@
 import net.minecraft.world.phys.Vec3;
 import net.wurstclient.Category;
 import net.wurstclient.events.UpdateListener;
+import net.wurstclient.events.RenderListener;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.world.phys.AABB;
+import net.wurstclient.util.RenderUtils;
+import net.wurstclient.util.ChatUtils;
 import net.wurstclient.hack.Hack;
 import net.wurstclient.mixinterface.IKeyBinding;
 import net.wurstclient.settings.Setting;
@@ -39,7 +45,8 @@
 // no screen import needed; we embed ItemESP's editor component directly
 import net.wurstclient.util.InventoryUtils;
 
-public class ItemHandlerHack extends Hack implements UpdateListener
+public class ItemHandlerHack extends Hack
+	implements UpdateListener, RenderListener
 {
 	private static final double SCAN_RADIUS = 2.5;
 	// When the popup is set to "infinite", use this large but finite
@@ -83,7 +90,7 @@ public class ItemHandlerHack extends Hack implements UpdateListener
 
 	// Adjust popup/UI scale (affects text size and icon size heuristically)
 	private final SliderSetting popupScale = new SliderSetting(
-		"Popup font scale", 0.75, 0.5, 1.5, 0.05, ValueDisplay.DECIMAL);
+		"Popup HUD font scale", 0.75, 0.5, 1.5, 0.05, ValueDisplay.DECIMAL);
 
 	// Respect ItemESP's ignored items list
 	private final CheckboxSetting respectItemEspIgnores =
@@ -101,6 +108,8 @@ public ItemHandlerHack()
 		setCategory(Category.ITEMS);
 		addPossibleKeybind("itemhandler gui",
 			"ItemHandler GUI (open manual pickup screen)");
+		// Top-level button to open the ItemHandler GUI from settings
+		addSetting(new ButtonSetting("Open ItemHandler GUI", this::openScreen));
 		addSetting(rejectRadius);
 		addSetting(rejectExpiry);
 		addSetting(hudEnabled);
@@ -118,6 +127,7 @@ public ItemHandlerHack()
 	protected void onEnable()
 	{
 		EVENTS.add(UpdateListener.class, this);
+		EVENTS.add(RenderListener.class, this);
 		trackedItems.clear();
 		pickupWhitelist.clear();
 		pickupQueue.clear();
@@ -127,6 +137,7 @@ protected void onEnable()
 	protected void onDisable()
 	{
 		EVENTS.remove(UpdateListener.class, this);
+		EVENTS.remove(RenderListener.class, this);
 		trackedItems.clear();
 		pickupWhitelist.clear();
 		pickupQueue.clear();
@@ -202,6 +213,12 @@ private void processRejectedPickup()
 				continue;
 
 			int gained = count - prev;
+			// if player gained items of this id, unmark tracing for that id
+			if(gained > 0 && tracedItems.contains(id))
+			{
+				tracedItems.remove(id);
+				ChatUtils.message("Untraced " + id + " after pickup.");
+			}
 			// Total rejected amount for this id (sum across rules that match
 			// player's position)
 			int totalRejected = 0;
@@ -336,7 +353,7 @@ private void scanNearbyItems()
 			{
 				net.wurstclient.hacks.ItemEspHack esp =
 					net.wurstclient.WurstClient.INSTANCE.getHax().itemEspHack;
-				if(esp != null && esp.shouldUseIgnoredItems())
+				if(esp != null)
 				{
 					String id =
 						net.minecraft.core.registries.BuiltInRegistries.ITEM
@@ -565,6 +582,46 @@ public String distanceText()
 		}
 	}
 
+	@Override
+	public void onRender(PoseStack matrixStack, float partialTicks)
+	{
+		if(tracedItems.isEmpty())
+			return;
+		// Avoid duplicate rendering if ItemESP is enabled
+		net.wurstclient.hacks.ItemEspHack esp =
+			net.wurstclient.WurstClient.INSTANCE.getHax().itemEspHack;
+		if(esp != null && esp.isEnabled())
+			return;
+		
+		java.util.ArrayList<AABB> boxes = new java.util.ArrayList<>();
+		java.util.ArrayList<Vec3> ends = new java.util.ArrayList<>();
+		for(GroundItem gi : trackedItems)
+		{
+			String id = net.minecraft.core.registries.BuiltInRegistries.ITEM
+				.getKey(gi.stack().getItem()).toString();
+			if(!isTraced(id))
+				continue;
+			Vec3 p = gi.position();
+			boxes.add(new AABB(p.x - 0.18, p.y - 0.18, p.z - 0.18, p.x + 0.18,
+				p.y + 0.18, p.z + 0.18));
+			ends.add(p);
+		}
+		if(boxes.isEmpty() && ends.isEmpty())
+			return;
+		float[] rf = RenderUtils.getRainbowColor();
+		int traceLines = RenderUtils.toIntColor(rf, 0.5f);
+		int traceQuads = RenderUtils.toIntColor(rf, 0.35f);
+		if(!boxes.isEmpty())
+		{
+			RenderUtils.drawSolidBoxes(matrixStack, boxes, traceQuads, false);
+			RenderUtils.drawOutlinedBoxes(matrixStack, boxes, traceLines,
+				false);
+		}
+		if(!ends.isEmpty())
+			RenderUtils.drawTracers(matrixStack, partialTicks, ends, traceLines,
+				false);
+	}
+	
 	// Inline ItemESP ignored-items editor in ItemHandler settings
 	private final Setting itemEspIgnoredListSetting =
 		new Setting("Ignored items", WText.empty())

src/main/java/net/wurstclient/keybinds/KeybindList.java

@@ -117,21 +117,29 @@ public void saveProfile(String fileName) throws IOException, JsonException
 	private static Set<Keybind> createDefaultKeybinds()
 	{
 		Set<Keybind> set = new LinkedHashSet<>();
+		addKB(set, "apostrophe", ".waypoints");
 		addKB(set, "b", "fastplace;fastbreak");
 		addKB(set, "c", "fullbright");
+		addKB(set, "comma", ".autosort");
 		addKB(set, "g", "flight");
-		addKB(set, "semicolon", "speednuker");
 		addKB(set, "h", "say /home");
 		addKB(set, "j", "jesus");
 		addKB(set, "k", "multiaura");
+		addKB(set, "keypad.7", "Blink");
+		addKB(set, "keypad.8", "SafeTP");
+		addKB(set, "keypad.add", "Panic");
+		addKB(set, "keypad.decimal", "panic restore");
+		addKB(set, "left.bracket", "ChestSearch");
+		addKB(set, "menu", "clickgui");
 		addKB(set, "n", "nuker");
-		addKB(set, "r", "killaura");
+		addKB(set, "r", "multiaura");
+		addKB(set, "right.alt", "WindChargeKey");
+		addKB(set, "right.bracket", ".setcheckbox breadcrumbs paused toggle");
 		addKB(set, "right.shift", "navigator");
-		addKB(set, "right.control", "clickgui");
+		addKB(set, "semicolon", "itemhandler gui");
 		addKB(set, "u", "freecam");
 		addKB(set, "x", "x-ray");
-		addKB(set, "y", "sneak");
-		// Default shortcut to open the Waypoints manager
+		addKB(set, "y", "ChestESP");
 		addKB(set, "apostrophe", ".waypoints");
 		return Collections.unmodifiableSet(set);
 	}

src/main/java/net/wurstclient/keybinds/KeybindProcessor.java

@@ -8,6 +8,7 @@
 package net.wurstclient.keybinds;
 
 import org.lwjgl.glfw.GLFW;
+import java.util.Locale;
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.input.KeyEvent;
@@ -44,7 +45,12 @@ public void onKeyPress(KeyPressEvent event)
 			return;
 
 		Screen screen = WurstClient.MC.screen;
-		if(screen != null && !(screen instanceof ClickGuiScreen))
+		// Allow processing when no screen is open, when the Click GUI is open,
+		// or when Waypoints or ItemHandler screens are open so their keybinds
+		// can toggle/close them with the same key.
+		if(screen != null && !(screen instanceof ClickGuiScreen)
+			&& !(screen instanceof net.wurstclient.clickgui.screens.WaypointsScreen)
+			&& !(screen instanceof net.wurstclient.hacks.itemhandler.ItemHandlerScreen))
 			return;
 
 		// if ClickGuiScreen is open and user typed a printable key, open
@@ -112,11 +118,45 @@ private void processCmds(String cmds)
 
 	private void processCmd(String cmd)
 	{
+		String trimmed = cmd.trim();
+		// Special-case: toggle Waypoints manager when bound to ".waypoints"
+		if(trimmed.equalsIgnoreCase(".waypoints"))
+		{
+			// If Waypoints screen is open, close it; otherwise open manager
+			if(net.minecraft.client.Minecraft
+				.getInstance().screen instanceof net.wurstclient.clickgui.screens.WaypointsScreen)
+			{
+				net.minecraft.client.Minecraft.getInstance().setScreen(null);
+				return;
+			}
+			// open via hack utility
+			WurstClient.INSTANCE.getHax().waypointsHack.openManager();
+			return;
+		}
+		
 		if(cmd.startsWith("."))
 			cmdProcessor.process(cmd.substring(1));
 		else if(cmd.contains(" "))
+		{
+			// special-case: open/close ItemHandler GUI when key bound to
+			// "itemhandler gui"
+			String lower = cmd.toLowerCase(Locale.ROOT).trim();
+			if(lower.equals("itemhandler gui"))
+			{
+				net.minecraft.client.gui.screens.Screen s =
+					net.minecraft.client.Minecraft.getInstance().screen;
+				if(s instanceof net.wurstclient.hacks.itemhandler.ItemHandlerScreen)
+				{
+					net.minecraft.client.Minecraft.getInstance()
+						.setScreen(null);
+					return;
+				}
+				// Open ItemHandler screen via hack utility when not open
+				WurstClient.INSTANCE.getHax().itemHandlerHack.openScreen();
+				return;
+			}
 			cmdProcessor.process(cmd);
-		else
+		}else
 		{
 			Hack hack = hax.getHackByName(cmd);
 

src/main/java/net/wurstclient/nicewurst/NiceWurstModule.java

@@ -100,7 +100,7 @@ public final class NiceWurstModule
 
 		ALLOWED_HACKS.put(Category.ITEMS,
 			Set.of("AntiDrop", "AutoDisenchant", "AutoDrop", "AutoEat",
-				"AutoSteal", "ChestSearch", "EnchantmentHandler",
+				"AutoSteal", "ChestSearch", "EnchantmentHandler", "ItemHandler",
 				"QuickShulker", "SignFramePT", "XCarry"));
 	}