Fix Hacklist

Author: cev-api

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

@@ -704,16 +704,11 @@ public void handleMouseScroll(double mouseX, double mouseY, double delta)
 		if(handlePopupMouseScroll(mouseX, mouseY, delta))
 			return;
 
-		int dWheel = (int)delta * 4;
-		if(dWheel == 0)
-			return;
-		
 		for(int i = windows.size() - 1; i >= 0; i--)
 		{
 			Window window = windows.get(i);
 
-			if(!window.isScrollingEnabled() || window.isMinimized()
-				|| window.isInvisible())
+			if(window.isMinimized() || window.isInvisible())
 				continue;
 
 			if(mouseX < window.getX() || mouseY < window.getY() + 13)
@@ -722,6 +717,19 @@ public void handleMouseScroll(double mouseX, double mouseY, double delta)
 				|| mouseY >= window.getY() + window.getHeight())
 				continue;
 
+			if(handleWindowComponentMouseScroll(window, mouseX, mouseY, delta))
+			{
+				closeInvalidPopups();
+				break;
+			}
+			
+			int dWheel = (int)delta * 4;
+			if(dWheel == 0)
+				return;
+			
+			if(!window.isScrollingEnabled())
+				continue;
+			
 			int scroll = window.getScrollOffset() + dWheel;
 			scroll = Math.min(scroll, 0);
 			scroll = Math.max(scroll,
@@ -742,17 +750,13 @@ public boolean handlePinnedMouseScroll(double mouseX, double mouseY,
 		if(handlePinnedPopupMouseScroll(mouseX, mouseY, delta))
 			return true;
 
-		int dWheel = (int)delta * 4;
-		if(dWheel == 0)
-			return false;
-		
 		for(int i = windows.size() - 1; i >= 0; i--)
 		{
 			Window window = windows.get(i);
 			if(!window.isPinned() || window.isInvisible())
 				continue;
 
-			if(!window.isScrollingEnabled() || window.isMinimized())
+			if(window.isMinimized())
 				continue;
 
 			if(mouseX < window.getX() || mouseY < window.getY() + 13)
@@ -761,6 +765,19 @@ public boolean handlePinnedMouseScroll(double mouseX, double mouseY,
 				|| mouseY >= window.getY() + window.getHeight())
 				continue;
 
+			if(handleWindowComponentMouseScroll(window, mouseX, mouseY, delta))
+			{
+				closeInvalidPopups();
+				return true;
+			}
+			
+			int dWheel = (int)delta * 4;
+			if(dWheel == 0)
+				return false;
+			
+			if(!window.isScrollingEnabled())
+				continue;
+			
 			int scroll = window.getScrollOffset() + dWheel;
 			scroll = Math.min(scroll, 0);
 			scroll = Math.max(scroll,
@@ -1309,6 +1326,20 @@ private void handleComponentMouseClick(Window window, double mouseX,
 		}
 	}
 
+	private boolean handleWindowComponentMouseScroll(Window window,
+		double mouseX, double mouseY, double delta)
+	{
+		window.validate();
+		
+		int cMouseX = (int)(mouseX - window.getX());
+		int cMouseY = (int)(mouseY - window.getY() - 13);
+		if(window.isScrollingEnabled())
+			cMouseY -= window.getScrollOffset();
+		
+		return handleNavigatorComponentMouseScroll(cMouseX, cMouseY, delta,
+			window);
+	}
+	
 	public void extractRenderState(GuiGraphicsExtractor context, int mouseX,
 		int mouseY, float partialTicks)
 	{

src/main/java/net/wurstclient/other_features/HackListOtf.java

@@ -59,6 +59,7 @@ public final class HackListOtf extends OtherFeature
 		@Override
 		public void update()
 		{
+			syncHiddenHackStates();
 			refreshGui();
 		}
 	};
@@ -172,6 +173,7 @@ public HackListOtf()
 	public void loadHiddenHacksFile()
 	{
 		hiddenHacksFile.load();
+		syncHiddenHackStates();
 	}
 
 	public boolean isHidden(Hack hack)
@@ -193,6 +195,7 @@ public void setHidden(Hack hack, boolean hidden)
 			hiddenHacks.remove(hack);
 
 		hiddenHacksFile.save();
+		syncHackState(hack);
 		refreshGui();
 	}
 
@@ -218,6 +221,27 @@ private void refreshGui()
 		{}
 	}
 
+	private void syncHiddenHackStates()
+	{
+		var hud = WURST.getHud();
+		if(hud == null)
+			return;
+		
+		var hackList = hud.getHackList();
+		for(net.wurstclient.Feature feature : hiddenHacks)
+			if(feature instanceof Hack hack)
+				hackList.updateState(hack);
+	}
+	
+	private void syncHackState(Hack hack)
+	{
+		var hud = WURST.getHud();
+		if(hud == null)
+			return;
+		
+		hud.getHackList().updateState(hack);
+	}
+	
 	private List<Hack> getSortedHacks()
 	{
 		return WURST.getHax().getAllHax().stream()
@@ -434,7 +458,7 @@ public boolean handleMouseScroll(double mouseX, double mouseY,
 			int visibleRows = Math.max(1, getHeight() / ROW_HEIGHT);
 			int maxOffset = Math.max(0, hacks.size() - visibleRows);
 			if(maxOffset <= 0)
-				return true;
+				return false;
 
 			int direction = (int)Math.signum(delta);
 			if(direction == 0)