Updated ItemHandler

Author: cev-api

README.md

@@ -391,7 +391,7 @@ Reports number of waypoints changed.
 - Prevents push back from TNT, creeper explosions, respawn anchors, crystals, wither skulls, wither spawn explosions, ghast fireballs, breeze gusts (and wind charges) and other custom plugins/entities that use explosion physics.
 
 ### ItemHandler
-- Jade-style Popup HUD and full GUI that lists nearby dropped items grouped by item ID with aggregated counts (With optional registry IDs).
+- Jade-style Popup HUD and full GUI that lists nearby dropped items, items in item frames or worn by mobs grouped by item ID with aggregated counts (with optional registry IDs).
 - Able to select or reject which item/s to pick up when moving over them:
   - Pick: reject (drop) everything except the selected types (only selected types will be picked up).
   - Reject: reject the selected types and drop them.
@@ -402,7 +402,7 @@ Reports number of waypoints changed.
 - Toggle to adhere to the ItemESP ignored list (Including a link to edit the list)
 - Adjustable distance for item detection
 - Adjustable font scale setting (scales text and popup icon size)
-- Adjustable Popup HUD display offset X/Y
+- Adjustable popup HUD display offset X/Y or simply click and drag to reposition (when in inventory or chest)
 - Detects XP Orbs and shows the exact XP each orb will give
 - Optionally detects items held or worn by mobs (Item count will be for all mobs in the area)
   - Can also filter out default mob items to prevent spam

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

@@ -31,6 +31,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.entity.decoration.ArmorStand;
+import net.minecraft.world.entity.decoration.ItemFrame;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.item.ItemStack;
@@ -510,6 +511,10 @@ private void scanNearbyItems()
 				player.getBoundingBox().inflate((float)scanRadius),
 				o -> o != null && o.isAlive() && !o.isRemoved());
 
+		List<ItemFrame> foundFrames = MC.level.getEntitiesOfClass(
+			ItemFrame.class, player.getBoundingBox().inflate((float)scanRadius),
+			this::shouldTrackItemFrame);
+		
 		trackedItems.clear();
 		for(ItemEntity entity : found)
 		{
@@ -532,6 +537,15 @@ private void scanNearbyItems()
 				distance, orb.position(), SourceType.XP_ORB, null));
 		}
 
+		for(ItemFrame frame : foundFrames)
+		{
+			ItemStack stack = frame.getItem().copy();
+			double distance = frame.distanceTo(player);
+			trackedItems
+				.add(new GroundItem(frame.getId(), frame.getUUID(), stack,
+					distance, frame.position(), SourceType.ITEM_FRAME, null));
+		}
+		
 		if(includeMobEquipment.isChecked())
 			addMobEquipmentItems(player, scanRadius);
 
@@ -645,6 +659,16 @@ private boolean shouldTrack(ItemEntity entity)
 			&& !entity.getItem().isEmpty();
 	}
 
+	private boolean shouldTrackItemFrame(ItemFrame frame)
+	{
+		if(frame == null || !frame.isAlive() || frame.isRemoved())
+			return false;
+		ItemStack stack = frame.getItem();
+		if(stack == null || stack.isEmpty())
+			return false;
+		return !isIgnoredByItemEsp(stack);
+	}
+	
 	private boolean shouldTrackMobEquipment(ItemStack stack)
 	{
 		if(stack == null || stack.isEmpty())
@@ -1004,6 +1028,32 @@ public int getHudOffsetY()
 		return hudOffsetY.getValueI();
 	}
 
+	public int getHudOffsetMinX()
+	{
+		return (int)hudOffsetX.getMinimum();
+	}
+	
+	public int getHudOffsetMaxX()
+	{
+		return (int)hudOffsetX.getMaximum();
+	}
+	
+	public int getHudOffsetMinY()
+	{
+		return (int)hudOffsetY.getMinimum();
+	}
+	
+	public int getHudOffsetMaxY()
+	{
+		return (int)hudOffsetY.getMaximum();
+	}
+	
+	public void setHudOffsets(int x, int y)
+	{
+		hudOffsetX.setValue(x);
+		hudOffsetY.setValue(y);
+	}
+	
 	public boolean isShowRegistryName()
 	{
 		return showRegistryName.isChecked();
@@ -1039,6 +1089,8 @@ public String sourceLabel()
 				return "held by " + (sourceName != null ? sourceName : "mob");
 			if(sourceType == SourceType.MOB_WORN)
 				return "worn by " + (sourceName != null ? sourceName : "mob");
+			if(sourceType == SourceType.ITEM_FRAME)
+				return "in item frame";
 			return "";
 		}
 
@@ -1151,6 +1203,7 @@ public enum SourceType
 	{
 		GROUND,
 		XP_ORB,
+		ITEM_FRAME,
 		MOB_HELD,
 		MOB_WORN
 	}

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

@@ -22,13 +22,20 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.wurstclient.WurstClient;
 import net.wurstclient.util.RenderUtils;
 
 public class ItemHandlerHud
 {
 	private static final Minecraft MC = WurstClient.MC;
-	// rendering per-frame guard removed: was causing flicker
+	private boolean dragging;
+	private double dragStartMouseX;
+	private double dragStartMouseY;
+	private int dragStartOffsetX;
+	private int dragStartOffsetY;
+	private int dragOffsetX;
+	private int dragOffsetY;
 	private boolean lastLeftDown = false;
 
 	public void render(GuiGraphics context, float partialTicks)
@@ -113,8 +120,6 @@ class MergeEntry
 		}
 
 		int guiW = context.guiWidth();
-		int x = guiW + hack.getHudOffsetX();
-		int y = hack.getHudOffsetY();
 
 		// Render only one popup (expanded list). The previous header
 		// duplicate is removed to avoid showing two linked popups.
@@ -148,11 +153,26 @@ class MergeEntry
 			iconSpace + padding + maxNameW + gap + maxDistW + padding;
 		if(boxWidth < 120)
 			boxWidth = 120;
+		
+		int hudOffsetX = dragging ? dragOffsetX : hack.getHudOffsetX();
+		int hudOffsetY = dragging ? dragOffsetY : hack.getHudOffsetY();
+		int x = guiW + hudOffsetX;
+		int y = hudOffsetY;
 		int ex = x - boxWidth;
 		int ey = y + headerHeight;
 		int rowHeight = 16;
 		int footer = items.size() > maxDisplay ? 1 : 0;
 		int height = maxDisplay * rowHeight + footer * rowHeight + 6;
+		
+		handleDrag(context, hack, ex, ey, boxWidth, height);
+		
+		hudOffsetX = dragging ? dragOffsetX : hack.getHudOffsetX();
+		hudOffsetY = dragging ? dragOffsetY : hack.getHudOffsetY();
+		x = guiW + hudOffsetX;
+		y = hudOffsetY;
+		ex = x - boxWidth;
+		ey = y + headerHeight;
+		
 		context.fill(ex, ey, ex + boxWidth, ey + height, 0xCC101010);
 		context.guiRenderState.up();
 
@@ -219,22 +239,79 @@ class MergeEntry
 				scale * 0.95);
 		}
 
+		// Do not open the ItemHandler GUI from the popup via mouse clicks.
+		// Opening the ItemHandler GUI remains available via keybind/command
+		// and the settings button.
+	}
+	
+	private void handleDrag(GuiGraphics context, ItemHandlerHack hack, int ex,
+		int ey, int boxWidth, int height)
+	{
+		Window window = MC.getWindow();
+		if(window == null)
+		{
+			dragging = false;
+			lastLeftDown = false;
+			return;
+		}
+		
+		boolean leftDown = GLFW.glfwGetMouseButton(window.handle(),
+			GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS;
+		boolean containerOpen = MC.screen instanceof AbstractContainerScreen<?>;
+		if(!containerOpen)
+		{
+			if(dragging)
+			{
+				hack.setHudOffsets(dragOffsetX, dragOffsetY);
+				dragging = false;
+			}
+			lastLeftDown = leftDown;
+			return;
+		}
+		
 		double mouseX = getScaledMouseX(context);
 		double mouseY = getScaledMouseY(context);
-		// hitbox covers the single list popup
 		boolean overList = mouseX >= ex && mouseX <= ex + boxWidth
 			&& mouseY >= ey && mouseY <= ey + height;
-		Window window = MC.getWindow();
-		boolean leftDown = GLFW.glfwGetMouseButton(window.handle(),
-			GLFW.GLFW_MOUSE_BUTTON_LEFT) == GLFW.GLFW_PRESS;
-		// Do not open the ItemHandler GUI from the popup via mouse clicks.
-		// This avoids the popup behind other full-screen GUIs triggering
-		// the ItemHandler screen when clicking in overlapping areas.
-		// (Opening the ItemHandler GUI is available via the dedicated
-		// settings button or a keybind/command.)
+		
+		if(!dragging && leftDown && !lastLeftDown && overList)
+		{
+			dragging = true;
+			dragStartMouseX = mouseX;
+			dragStartMouseY = mouseY;
+			dragStartOffsetX = hack.getHudOffsetX();
+			dragStartOffsetY = hack.getHudOffsetY();
+			dragOffsetX = dragStartOffsetX;
+			dragOffsetY = dragStartOffsetY;
+		}
+		
+		if(dragging)
+		{
+			if(leftDown)
+			{
+				int dx = (int)Math.round(mouseX - dragStartMouseX);
+				int dy = (int)Math.round(mouseY - dragStartMouseY);
+				int minX = hack.getHudOffsetMinX();
+				int maxX = hack.getHudOffsetMaxX();
+				int minY = hack.getHudOffsetMinY();
+				int maxY = hack.getHudOffsetMaxY();
+				dragOffsetX = clamp(dragStartOffsetX + dx, minX, maxX);
+				dragOffsetY = clamp(dragStartOffsetY + dy, minY, maxY);
+			}else
+			{
+				hack.setHudOffsets(dragOffsetX, dragOffsetY);
+				dragging = false;
+			}
+		}
+		
 		lastLeftDown = leftDown;
 	}
 
+	private static int clamp(int value, int min, int max)
+	{
+		return Math.max(min, Math.min(max, value));
+	}
+	
 	private static double getScaledMouseX(GuiGraphics context)
 	{
 		Window window = MC.getWindow();