Updated ChestSearch, HackList, GameStats, EnchantmentHandler Etc

Author: cev-api

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

@@ -868,6 +868,34 @@ public void handleNavigatorMouseClick(double cMouseX, double cMouseY,
 		closeInvalidPopups();
 	}
 
+	public boolean handleNavigatorComponentMouseScroll(double cMouseX,
+		double cMouseY, double delta, Window window)
+	{
+		if(delta == 0)
+			return false;
+		
+		for(int i = window.countChildren() - 1; i >= 0; i--)
+		{
+			Component c = window.getChild(i);
+			
+			if(cMouseX < c.getX() || cMouseY < c.getY())
+				continue;
+			if(cMouseX >= c.getX() + c.getWidth()
+				|| cMouseY >= c.getY() + c.getHeight())
+				continue;
+			
+			if(c.handleMouseScroll(cMouseX, cMouseY, delta))
+			{
+				closeInvalidPopups();
+				return true;
+			}
+			
+			break;
+		}
+		
+		return false;
+	}
+	
 	public void closePopupsOutsideArea(Window window, int x1, int y1, int x2,
 		int y2)
 	{

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

@@ -30,6 +30,11 @@ public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
 
 	}
 
+	public boolean handleMouseScroll(double mouseX, double mouseY, double delta)
+	{
+		return false;
+	}
+	
 	public abstract void extractRenderState(GuiGraphicsExtractor context,
 		int mouseX, int mouseY, float partialTicks);
 

src/main/java/net/wurstclient/clickgui/components/SettingGroupComponent.java

@@ -164,6 +164,29 @@ public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
 		}
 	}
 
+	@Override
+	public boolean handleMouseScroll(double mouseX, double mouseY, double delta)
+	{
+		if(!expanded)
+			return false;
+		
+		for(Component child : childComponents)
+		{
+			int cx1 = child.getX();
+			int cy1 = child.getY();
+			int cx2 = cx1 + child.getWidth();
+			int cy2 = cy1 + child.getHeight();
+			
+			if(mouseX < cx1 || mouseX > cx2 || mouseY < cy1 || mouseY > cy2)
+				continue;
+			
+			if(child.handleMouseScroll(mouseX, mouseY, delta))
+				return true;
+		}
+		
+		return false;
+	}
+	
 	@Override
 	public void extractRenderState(GuiGraphicsExtractor context, int mouseX,
 		int mouseY, float partialTicks)

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

@@ -85,6 +85,12 @@ public final class ChestSearchHack extends Hack
 		"Fixed preview position",
 		"Shows the mouse-over chest preview at a saved screen position that can be dragged.",
 		false);
+	private final EnumSetting<PreviewAnchor> previewAnchor =
+		new EnumSetting<>("Preview anchor",
+			"Choose where the fixed chest preview should pin itself.",
+			PreviewAnchor.values(), PreviewAnchor.DRAGGED);
+	private final SliderSetting previewAnchorGap = new SliderSetting(
+		"Preview anchor gap", 8, 0, 240, 1, ValueDisplay.INTEGER);
 	private final SliderSetting previewX =
 		new SliderSetting("Preview X", 0, 0, 3840, 1, ValueDisplay.INTEGER);
 	private final SliderSetting previewY =
@@ -127,6 +133,8 @@ public ChestSearchHack()
 		addSetting(recordedChestNotifications);
 		addSetting(displayOnMouse);
 		addSetting(fixedPreviewPosition);
+		addSetting(previewAnchor);
+		addSetting(previewAnchorGap);
 		addSetting(previewX);
 		addSetting(previewY);
 		addSetting(mousePreviewBackground);
@@ -182,6 +190,28 @@ public int getPreviewX()
 		return previewX.getValueI();
 	}
 
+	public PreviewAnchor getPreviewAnchor()
+	{
+		try
+		{
+			PreviewAnchor anchor = previewAnchor.getSelected();
+			return anchor != null ? anchor : PreviewAnchor.DRAGGED;
+		}catch(Throwable t)
+		{
+			return PreviewAnchor.DRAGGED;
+		}
+	}
+	
+	public int getPreviewAnchorGap()
+	{
+		return previewAnchorGap.getValueI();
+	}
+	
+	public boolean usesPinnedPreviewAnchor()
+	{
+		return getPreviewAnchor() != PreviewAnchor.DRAGGED;
+	}
+	
 	public int getPreviewY()
 	{
 		return previewY.getValueI();
@@ -368,4 +398,28 @@ public String toString()
 			return displayName;
 		}
 	}
+	
+	public enum PreviewAnchor
+	{
+		DRAGGED("Dragged"),
+		HUD_LEFT("HUD Left"),
+		HUD_RIGHT("HUD Right"),
+		TOP_LEFT("Top Left"),
+		TOP_RIGHT("Top Right"),
+		BOTTOM_LEFT("Bottom Left"),
+		BOTTOM_RIGHT("Bottom Right");
+		
+		private final String displayName;
+		
+		private PreviewAnchor(String displayName)
+		{
+			this.displayName = displayName;
+		}
+		
+		@Override
+		public String toString()
+		{
+			return displayName;
+		}
+	}
 }

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

@@ -50,6 +50,7 @@
 import net.wurstclient.mixin.HandledScreenAccessor;
 import net.wurstclient.settings.CheckboxSetting;
 import net.wurstclient.settings.ColorSetting;
+import net.wurstclient.settings.EnumSetting;
 import net.wurstclient.settings.SliderSetting;
 import net.wurstclient.settings.SliderSetting.ValueDisplay;
 import net.wurstclient.util.ItemUtils;
@@ -123,6 +124,12 @@ public final class EnchantmentHandlerHack extends Hack
 		new CheckboxSetting("Include shulker contents", true);
 	private final CheckboxSetting showOnInventoryScreen =
 		new CheckboxSetting("Show on inventory screen", true);
+	private final EnumSetting<PanelAnchor> panelAnchor = new EnumSetting<>(
+		"Panel anchor",
+		"Pin the panel to the left, right, top, or bottom of the current inventory/container.",
+		PanelAnchor.values(), PanelAnchor.LEFT);
+	private final SliderSetting panelAnchorGap = new SliderSetting(
+		"Panel anchor gap", 6, 0, 240, 1, ValueDisplay.INTEGER);
 	private final CheckboxSetting slotHighlightEnabled =
 		new CheckboxSetting("Slot highlight", true);
 	private final ColorSetting slotHighlightColor =
@@ -191,6 +198,8 @@ public EnchantmentHandlerHack()
 		addSetting(includePlayerInventory);
 		addSetting(includeShulkerContents);
 		addSetting(showOnInventoryScreen);
+		addSetting(panelAnchor);
+		addSetting(panelAnchorGap);
 		addSetting(slotHighlightEnabled);
 		addSetting(slotHighlightColor);
 		addSetting(slotHighlightOpacity);
@@ -308,19 +317,14 @@ public void renderOnHandledScreen(AbstractContainerScreen<?> screen,
 				Math.max(60, windowHeight - 10));
 
 		renderingInventoryScreen = screen instanceof InventoryScreen;
-		int defaultX = accessor.getX() - panelWidth - PANEL_PADDING;
-		int defaultY = accessor.getY();
-		if(renderingInventoryScreen)
-		{
-			defaultX = accessor.getX();
-			defaultY = accessor.getY() + accessor.getBackgroundHeight()
-				+ PANEL_PADDING;
-		}
-		if(renderingInventoryScreen && inventoryCustomPosition)
+		int defaultX = getAnchoredPanelX(accessor);
+		int defaultY = getAnchoredPanelY(accessor);
+		boolean freePosition = usesFreePosition();
+		if(freePosition && renderingInventoryScreen && inventoryCustomPosition)
 		{
 			panelX = inventoryPanelX;
 			panelY = inventoryPanelY;
-		}else if(!renderingInventoryScreen && customPosition)
+		}else if(freePosition && !renderingInventoryScreen && customPosition)
 		{
 			panelX = containerPanelX;
 			panelY = containerPanelY;
@@ -345,11 +349,11 @@ public void renderOnHandledScreen(AbstractContainerScreen<?> screen,
 		panelX =
 			Mth.clamp(panelX, 2 - panelWidth, windowWidth - panelWidth - 2);
 		panelY = Mth.clamp(panelY, 2, windowHeight - panelHeight - 2);
-		if(renderingInventoryScreen && inventoryCustomPosition)
+		if(freePosition && renderingInventoryScreen && inventoryCustomPosition)
 		{
 			inventoryPanelX = panelX;
 			inventoryPanelY = panelY;
-		}else if(!renderingInventoryScreen && customPosition)
+		}else if(freePosition && !renderingInventoryScreen && customPosition)
 		{
 			containerPanelX = panelX;
 			containerPanelY = panelY;
@@ -376,6 +380,8 @@ public boolean handleMouseClick(AbstractContainerScreen<?> screen,
 
 		if(button == 0 && isInsideDragBar(mouseX, mouseY))
 		{
+			if(!usesFreePosition())
+				return true;
 			startPanelDrag(mouseX, mouseY);
 			return true;
 		}
@@ -531,6 +537,8 @@ private double getScrollThumbHeight(double trackHeight)
 
 	private void startPanelDrag(double mouseX, double mouseY)
 	{
+		if(!usesFreePosition())
+			return;
 		panelDragging = true;
 		dragOffsetX = (int)Math.round(mouseX - panelX);
 		dragOffsetY = (int)Math.round(mouseY - panelY);
@@ -542,6 +550,8 @@ private void startPanelDrag(double mouseX, double mouseY)
 
 	private void savePanelPosition()
 	{
+		if(!usesFreePosition())
+			return;
 		if(renderingInventoryScreen)
 		{
 			savedInventoryPosition.setChecked(inventoryCustomPosition);
@@ -562,6 +572,48 @@ private void addHiddenPositionSetting(
 		addSetting(setting);
 	}
 
+	private boolean usesFreePosition()
+	{
+		return panelAnchor.getSelected() == PanelAnchor.FREE;
+	}
+	
+	private int getAnchoredPanelX(HandledScreenAccessor accessor)
+	{
+		int gap = panelAnchorGap.getValueI();
+		return switch(panelAnchor.getSelected())
+		{
+			case LEFT -> accessor.getX() - panelWidth - gap;
+			case RIGHT -> accessor.getX() + accessor.getBackgroundWidth() + gap;
+			case TOP, BOTTOM -> accessor.getX()
+				+ (accessor.getBackgroundWidth() - panelWidth) / 2;
+			case FREE ->
+			{
+				if(renderingInventoryScreen)
+					yield accessor.getX();
+				yield accessor.getX() - panelWidth - PANEL_PADDING;
+			}
+		};
+	}
+	
+	private int getAnchoredPanelY(HandledScreenAccessor accessor)
+	{
+		int gap = panelAnchorGap.getValueI();
+		return switch(panelAnchor.getSelected())
+		{
+			case LEFT, RIGHT -> accessor.getY();
+			case TOP -> accessor.getY() - panelHeight - gap;
+			case BOTTOM -> accessor.getY() + accessor.getBackgroundHeight()
+				+ gap;
+			case FREE ->
+			{
+				if(renderingInventoryScreen)
+					yield accessor.getY() + accessor.getBackgroundHeight()
+						+ PANEL_PADDING;
+				yield accessor.getY();
+			}
+		};
+	}
+	
 	private void renderOverlay(GuiGraphicsExtractor context)
 	{
 		hitboxes.clear();
@@ -2318,6 +2370,28 @@ private static enum CategoryKind
 		POTION;
 	}
 
+	private static enum PanelAnchor
+	{
+		FREE("Free"),
+		LEFT("Left"),
+		RIGHT("Right"),
+		TOP("Top"),
+		BOTTOM("Bottom");
+		
+		private final String displayName;
+		
+		PanelAnchor(String displayName)
+		{
+			this.displayName = displayName;
+		}
+		
+		@Override
+		public String toString()
+		{
+			return displayName;
+		}
+	}
+	
 	private static enum GearCategory
 	{
 		HELMET("Armor (Helmet)"),

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

@@ -105,6 +105,9 @@ public final class GameStatsHack extends Hack implements PacketInputListener,
 	private final CheckboxSetting showAverages =
 		new CheckboxSetting("Show Averages", true);
 
+	private final CheckboxSetting pinAboveHackList =
+		new CheckboxSetting("Pin above HackList", false);
+	
 	private final CheckboxSetting showGraph =
 		new CheckboxSetting("Show graph", false);
 
@@ -163,6 +166,7 @@ public GameStatsHack()
 		addSetting(hudOffsetY);
 		addSetting(showPrefixes);
 		addSetting(showAverages);
+		addSetting(pinAboveHackList);
 		addSetting(showGraph);
 		addSetting(separateGraphWindow);
 		addSetting(fpsGraphColor);
@@ -384,6 +388,11 @@ public boolean showAverages()
 		return showAverages.isChecked();
 	}
 
+	public boolean pinAboveHackList()
+	{
+		return pinAboveHackList.isChecked();
+	}
+	
 	public boolean showGraph()
 	{
 		return showGraph.isChecked();

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

@@ -499,6 +499,12 @@ private void sendAlertIfNeeded(int currentCount)
 		if(currentCount == lastAlertCount)
 			return;
 
+		if(currentCount <= 0)
+		{
+			lastAlertCount = currentCount;
+			return;
+		}
+		
 		long now = System.currentTimeMillis();
 		long cooldownMs = alertCooldown.getValueI() * 1000L;
 		if(now - lastAlertMs < cooldownMs)

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

@@ -1563,7 +1563,9 @@ private boolean isOwnerCapableEntity(Entity entity)
 	{
 		if(entity == null || entity == MC.player)
 			return false;
-		if(entity instanceof Projectile || entity instanceof OwnableEntity)
+		if(entity instanceof Projectile projectile)
+			return isPlayerOwnedProjectile(projectile);
+		if(entity instanceof OwnableEntity)
 			return true;
 
 		try
@@ -1579,6 +1581,12 @@ private boolean isOwnerCapableEntity(Entity entity)
 		}
 	}
 
+	private static boolean isPlayerOwnedProjectile(Projectile projectile)
+	{
+		Entity owner = projectile.getOwner();
+		return owner instanceof Player;
+	}
+	
 	private Entity getEntityOwner(Entity entity)
 	{
 		if(entity instanceof Projectile projectile)