Shelf Support in ItemESP & ItemHandler, New Preset

Author: cev-api

src/main/java/net/wurstclient/clickgui/ClickGui.java

@@ -2043,10 +2043,10 @@ private void sortFavoritesWindow(Window window)
 		// sort by feature name when possible
 		all.sort((c1, c2) -> {
 			String n1 = c1 instanceof FeatureButton
-				? ((FeatureButton)c1).getFeature().getName()
+				? getFeatureSortName(((FeatureButton)c1).getFeature())
 				: c1.getClass().getName();
 			String n2 = c2 instanceof FeatureButton
-				? ((FeatureButton)c2).getFeature().getName()
+				? getFeatureSortName(((FeatureButton)c2).getFeature())
 				: c2.getClass().getName();
 			return n1.compareToIgnoreCase(n2);
 		});
@@ -2073,10 +2073,10 @@ private void sortWindowByFeatureName(Window window)
 
 		all.sort((c1, c2) -> {
 			String n1 = c1 instanceof FeatureButton
-				? ((FeatureButton)c1).getFeature().getName()
+				? getFeatureSortName(((FeatureButton)c1).getFeature())
 				: c1.getClass().getName();
 			String n2 = c2 instanceof FeatureButton
-				? ((FeatureButton)c2).getFeature().getName()
+				? getFeatureSortName(((FeatureButton)c2).getFeature())
 				: c2.getClass().getName();
 			return n1.compareToIgnoreCase(n2);
 		});
@@ -2088,4 +2088,13 @@ private void sortWindowByFeatureName(Window window)
 
 		window.pack();
 	}
+	
+	private static String getFeatureSortName(Feature feature)
+	{
+		String name = feature.getName();
+		if(name != null && name.startsWith("."))
+			return name.substring(1);
+		
+		return name;
+	}
 }

src/main/java/net/wurstclient/commands/MapaCmd.java

@@ -22,9 +22,10 @@ public final class MapaCmd extends Command
 {
 	public MapaCmd()
 	{
-		super("mapa", "Controls the integrated Mapa minimap.", ".mapa",
-			".mapa open", ".mapa reset", ".mapa toggle",
-			".mapa enabled <true|false>", ".mapa size <72-256>",
+		super("mapa",
+			"Controls the integrated Mapa minimap.\nBare .mapa toggles it.",
+			".mapa", ".mapa show", ".mapa status", ".mapa open", ".mapa reset",
+			".mapa toggle", ".mapa enabled <true|false>", ".mapa size <72-256>",
 			".mapa zoom <0.25-10>", ".mapa samples <32-512>",
 			".mapa textScale <0.5-4>", ".mapa pos <x> <y>",
 			".mapa rotate <true|false>", ".mapa underground <true|false>",
@@ -47,7 +48,14 @@ public void call(String[] args) throws CmdException
 	{
 		MapaHack mapa = WURST.getHax().mapaHack;
 
-		if(args.length == 0 || equalsAny(args[0], "show", "status"))
+		if(args.length == 0)
+		{
+			mapa.setEnabled(!mapa.isEnabled());
+			ChatUtils.message("Mapa enabled set to " + mapa.isEnabled() + ".");
+			return;
+		}
+		
+		if(equalsAny(args[0], "show", "status"))
 		{
 			ChatUtils.message(statusLine(mapa));
 			return;

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

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Locale;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphicsExtractor;
@@ -30,6 +31,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.entity.ShelfBlockEntity;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.wurstclient.Category;
@@ -49,6 +51,8 @@
 import net.wurstclient.util.EntityUtils;
 import net.wurstclient.util.EspLimitUtils;
 import net.wurstclient.util.RenderUtils;
+import net.wurstclient.util.ShelfUtils;
+import net.wurstclient.util.chunk.ChunkUtils;
 
 @SearchTags({"item esp", "ItemTracers", "item tracers"})
 public final class ItemEspHack extends Hack implements UpdateListener,
@@ -144,9 +148,10 @@ private enum XpMode
 			XpMode.values(), XpMode.NORMAL);
 
 	// New: include item frames holding special items
-	private final CheckboxSetting includeItemFrames =
-		new CheckboxSetting("Highlight frames with special",
-			"Also highlight item frames if the item inside is special.", true);
+	private final CheckboxSetting includeItemFrames = new CheckboxSetting(
+		"Highlight frames with special",
+		"Also highlight item frames and shelves if the displayed item is special.",
+		true);
 
 	// New: optionally show detected count in HackList
 	private final CheckboxSetting showCountInHackList = new CheckboxSetting(
@@ -666,12 +671,7 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 			}
 		}
 
-		// update count for HackList from final filtered/drawn data only
-		int displayedCount =
-			normalBoxes.size() + specialBoxes.size() + tracedBoxes.size();
-		foundCount = Math.min(displayedCount, 999);
-		
-		// Item frames holding special items
+		// Item frames and shelves holding special items
 		if(includeItemFrames.isChecked())
 		{
 			for(Entity ent : MC.level.entitiesForRendering())
@@ -693,6 +693,36 @@ public void onRender(PoseStack matrixStack, float partialTicks)
 				specialBoxes.add(fbox);
 				specialEnds.add(fbox.getCenter());
 			}
+			
+			ChunkUtils.getLoadedBlockEntities().forEach(be -> {
+				if(!(be instanceof ShelfBlockEntity shelf))
+					return;
+				
+				List<ItemStack> shelfItems = shelf.getItems();
+				for(int slot = 0; slot < shelfItems.size(); slot++)
+				{
+					ItemStack shelfStack = shelfItems.get(slot);
+					if(shelfStack == null || shelfStack.isEmpty())
+						continue;
+					if(isIgnored(shelfStack))
+						continue;
+					if(!isSpecial(shelfStack))
+						continue;
+					
+					Vec3 itemPos = ShelfUtils.getItemPosition(shelf, slot);
+					if(itemPos == null)
+						continue;
+					if(onlyAboveGround.isChecked()
+						&& itemPos.y < aboveGroundY.getValue())
+						continue;
+					
+					AABB box = smallBoxAt(itemPos);
+					if(box == null)
+						continue;
+					specialBoxes.add(box);
+					specialEnds.add(box.getCenter());
+				}
+			});
 		}
 
 		// Equipped specials (held or head) on entities
@@ -764,6 +794,10 @@ && isSpecial(head))
 			}
 		}
 
+		int displayedCount =
+			normalBoxes.size() + specialBoxes.size() + tracedBoxes.size();
+		foundCount = Math.min(displayedCount, 999);
+		
 		if(style.hasBoxes())
 		{
 			// Normal items: always draw with base color

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

@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.UUID;
 import java.util.LinkedHashSet;
+import java.nio.charset.StandardCharsets;
 import java.lang.reflect.Method;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;
@@ -46,6 +47,7 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.ItemEnchantments;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.ShelfBlockEntity;
 import net.minecraft.world.level.block.entity.SignBlockEntity;
 import net.minecraft.world.level.block.entity.SignText;
 import net.minecraft.world.phys.Vec3;
@@ -69,6 +71,7 @@
 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.ShelfUtils;
 import net.wurstclient.util.chunk.ChunkUtils;
 
 public class ItemHandlerHack extends Hack
@@ -591,6 +594,8 @@ private void scanNearbyItems()
 					distance, frame.position(), SourceType.ITEM_FRAME, null));
 		}
 
+		addTrackedShelfItems(player, scanRadius);
+		
 		if(includeMobEquipment.isChecked())
 			addMobEquipmentItems(player, scanRadius);
 
@@ -600,6 +605,43 @@ private void scanNearbyItems()
 		// manual toggling should untrace.)
 	}
 
+	private void addTrackedShelfItems(LocalPlayer player, double scanRadius)
+	{
+		Vec3 playerPos = player.position();
+		double scanRadiusSq =
+			scanRadius >= INFINITE_SCAN_RADIUS ? -1 : scanRadius * scanRadius;
+		
+		ChunkUtils.getLoadedBlockEntities().forEach(be -> {
+			if(!(be instanceof ShelfBlockEntity shelf))
+				return;
+			
+			Vec3 shelfCenter = shelf.position();
+			if(scanRadiusSq >= 0
+				&& shelfCenter.distanceToSqr(playerPos) > scanRadiusSq)
+				return;
+			
+			BlockPos shelfPos = shelf.getBlockPos();
+			List<ItemStack> shelfItems = shelf.getItems();
+			for(int slot = 0; slot < shelfItems.size(); slot++)
+			{
+				ItemStack stack = shelfItems.get(slot);
+				if(stack == null || stack.isEmpty())
+					continue;
+				if(isIgnoredByItemEsp(stack))
+					continue;
+				
+				Vec3 itemPos = ShelfUtils.getItemPosition(shelf, slot);
+				if(itemPos == null)
+					itemPos = shelfCenter;
+				double distance = itemPos.distanceTo(playerPos);
+				trackedItems
+					.add(new GroundItem(getShelfSlotEntityId(shelfPos, slot),
+						getShelfSlotUuid(shelfPos, slot), stack.copy(),
+						distance, itemPos, SourceType.SHELF, null));
+			}
+		});
+	}
+	
 	private void scanNearbySigns()
 	{
 		boolean guiOpen = MC.screen instanceof ItemHandlerScreen;
@@ -1348,6 +1390,8 @@ public String traceId()
 			}
 			if(sourceType == SourceType.ITEM_FRAME)
 				return baseId + ":item_frame";
+			if(sourceType == SourceType.SHELF)
+				return baseId + ":shelf";
 			return baseId;
 		}
 
@@ -1359,6 +1403,8 @@ public String sourceLabel()
 				return "worn by " + (sourceName != null ? sourceName : "mob");
 			if(sourceType == SourceType.ITEM_FRAME)
 				return "in item frame";
+			if(sourceType == SourceType.SHELF)
+				return "in shelf";
 			return "";
 		}
 
@@ -1541,10 +1587,26 @@ public enum SourceType
 		GROUND,
 		XP_ORB,
 		ITEM_FRAME,
+		SHELF,
 		MOB_HELD,
 		MOB_WORN
 	}
 
+	private static int getShelfSlotEntityId(BlockPos pos, int slot)
+	{
+		int hash = Long
+			.hashCode(pos.asLong() ^ ((long)slot + 1L) * 0x9E3779B97F4A7C15L);
+		if(hash == 0)
+			return Integer.MIN_VALUE;
+		return hash > 0 ? -hash : hash;
+	}
+	
+	private static UUID getShelfSlotUuid(BlockPos pos, int slot)
+	{
+		String key = "shelf:" + pos.asLong() + ":" + slot;
+		return UUID.nameUUIDFromBytes(key.getBytes(StandardCharsets.UTF_8));
+	}
+	
 	private static String getCraftedEntityTraceId(UUID uuid)
 	{
 		if(uuid == null)

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014-2026 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.util;
+
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.block.ShelfBlock;
+import net.minecraft.world.level.block.entity.ShelfBlockEntity;
+import net.minecraft.world.phys.Vec3;
+
+public enum ShelfUtils
+{
+	;
+	
+	public static Vec3 getItemPosition(ShelfBlockEntity shelf, int slot)
+	{
+		if(shelf == null)
+			return null;
+		
+		double itemSlotPosition = (slot - 1) * 0.3125;
+		Vec3 itemOffset = new Vec3(itemSlotPosition,
+			shelf.getAlignItemsToBottom() ? -0.25 : 0.0, -0.25);
+		Direction facing =
+			(Direction)shelf.getBlockState().getValue(ShelfBlock.FACING);
+		float yRot =
+			facing.getAxis().isHorizontal() ? -facing.toYRot() : 180.0F;
+		return shelf.position().add(rotateY(itemOffset, yRot));
+	}
+	
+	private static Vec3 rotateY(Vec3 offset, float degrees)
+	{
+		double radians = Math.toRadians(degrees);
+		double sin = Math.sin(radians);
+		double cos = Math.cos(radians);
+		return new Vec3(offset.x * cos + offset.z * sin, offset.y,
+			offset.z * cos - offset.x * sin);
+	}
+}