Navigator and EnchantmentHandler Fixes

Author: cev-api

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

@@ -322,6 +322,22 @@ public boolean handleNavigatorPopupClick(double mouseX, double mouseY,
 		return popupClicked;
 	}
 
+	public boolean handleNavigatorMouseScroll(double mouseX, double mouseY,
+		double delta)
+	{
+		boolean popupScrolled = handlePopupMouseScroll(mouseX, mouseY, delta);
+		if(popupScrolled)
+		{
+			for(Popup popup : popups)
+				if(popup.getOwner().getParent().isClosing())
+					popup.close();
+				
+			popups.removeIf(Popup::isClosing);
+		}
+		
+		return popupScrolled;
+	}
+	
 	public void handleNavigatorMouseClick(double cMouseX, double cMouseY,
 		int mouseButton, Window window, Click context)
 	{

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

@@ -20,6 +20,7 @@ public class Window
 	private int y;
 	private int width;
 	private int height;
+	private boolean clampPosition = true;
 
 	private boolean valid;
 	private final ArrayList<Component> children = new ArrayList<>();
@@ -68,6 +69,9 @@ public final void setTitle(String title)
 	 */
 	public final int getX()
 	{
+		if(!clampPosition)
+			return x;
+		
 		int scaledWidth = WurstClient.MC.getWindow().getScaledWidth();
 		return MathHelper.clamp(x, -width + 1, scaledWidth - 1);
 	}
@@ -92,6 +96,9 @@ public final void setX(int x)
 	 */
 	public final int getY()
 	{
+		if(!clampPosition)
+			return y;
+		
 		int scaledHeight = WurstClient.MC.getWindow().getScaledHeight();
 		return MathHelper.clamp(y, -12, scaledHeight - 1);
 	}
@@ -111,6 +118,11 @@ public final void setY(int y)
 		this.y = y;
 	}
 
+	public final void setClampPosition(boolean clampPosition)
+	{
+		this.clampPosition = clampPosition;
+	}
+	
 	public final int getWidth()
 	{
 		return width;

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

@@ -1391,7 +1391,7 @@ private void takeEntry(GearEntry entry, ScreenHandler handler)
 		if(entry.slotId < 0)
 			return;
 
-		Slot slot = handler.getSlot(entry.slotId);
+		Slot slot = getSlotSafe(handler, entry.slotId);
 		if(slot == null || !slot.hasStack())
 			return;
 
@@ -1408,7 +1408,7 @@ private void takeEntry(BookEntry entry, ScreenHandler handler)
 		if(entry.slotId < 0)
 			return;
 
-		Slot slot = handler.getSlot(entry.slotId);
+		Slot slot = getSlotSafe(handler, entry.slotId);
 		if(slot == null || !slot.hasStack())
 			return;
 
@@ -1425,7 +1425,7 @@ private void takeEntry(PotionEntry entry, ScreenHandler handler)
 		if(entry.slotId < 0)
 			return;
 
-		Slot slot = handler.getSlot(entry.slotId);
+		Slot slot = getSlotSafe(handler, entry.slotId);
 		if(slot == null || !slot.hasStack())
 			return;
 
@@ -1460,7 +1460,7 @@ private void takeGearCategory(GearCategory category, ScreenHandler handler,
 		{
 			if(entry.slotId < 0)
 				continue; // display-only (in shulker)
-			Slot slot = handler.getSlot(entry.slotId);
+			Slot slot = getSlotSafe(handler, entry.slotId);
 			if(slot == null || !slot.hasStack())
 				continue;
 
@@ -1497,7 +1497,7 @@ private void takeBookCategory(BookCategory category, ScreenHandler handler,
 		{
 			if(entry.slotId < 0)
 				continue;
-			Slot slot = handler.getSlot(entry.slotId);
+			Slot slot = getSlotSafe(handler, entry.slotId);
 			if(slot == null || !slot.hasStack())
 				continue;
 			MC.interactionManager.clickSlot(handler.syncId, entry.slotId, 0,
@@ -1533,7 +1533,7 @@ private void takePotionCategory(PotionCategory category,
 		{
 			if(entry.slotId < 0)
 				continue;
-			Slot slot = handler.getSlot(entry.slotId);
+			Slot slot = getSlotSafe(handler, entry.slotId);
 			if(slot == null || !slot.hasStack())
 				continue;
 			MC.interactionManager.clickSlot(handler.syncId, entry.slotId, 0,
@@ -1543,6 +1543,18 @@ private void takePotionCategory(PotionCategory category,
 		needsRescan = true;
 	}
 
+	private Slot getSlotSafe(ScreenHandler handler, int slotId)
+	{
+		if(handler == null || slotId < 0)
+			return null;
+		
+		List<Slot> slots = handler.slots;
+		if(slots == null || slotId >= slots.size())
+			return null;
+		
+		return handler.getSlot(slotId);
+	}
+	
 	private int panelInnerHeight()
 	{
 		float scale = MathHelper.clamp(textScale.getValueF(), 0.5F, 1.25F);

src/main/java/net/wurstclient/navigator/NavigatorFeatureScreen.java

@@ -63,6 +63,8 @@ public NavigatorFeatureScreen(Feature feature, NavigatorMainScreen parent)
 		this.parent = parent;
 		hasBackground = false;
 
+		window.setClampPosition(false);
+		
 		for(Setting setting : feature.getSettings().values())
 		{
 			Component c = setting.getComponent();

src/main/java/net/wurstclient/navigator/NavigatorScreen.java

@@ -110,6 +110,10 @@ public final boolean mouseReleased(Click context)
 	public final boolean mouseScrolled(double mouseX, double mouseY,
 		double horizontalAmount, double verticalAmount)
 	{
+		if(WurstClient.INSTANCE.getGui().handleNavigatorMouseScroll(mouseX,
+			mouseY, verticalAmount))
+			return true;
+		
 		// scrollbar
 		if(!scrollbarLocked)
 		{