TriggerBot Improvements + Scrollable Drop-Downs

Author: cev-api

README.md

@@ -339,6 +339,10 @@ Examples:
 
 ![ESP](https://i.imgur.com/1F7zU31.png)
 
+### TriggerBot Improvements
+- Can now select the mob and the desired weapon/tool to use against them and it will quickly auto-switch when detected
+  - Limited to three different mobs for now to prevent clutter
+
 ### Nuker Improvements
 - Auto toggle AutoTool option (If it wasn't on already, it will be enabled when using Nuker then turned off with Nuker)
 
@@ -403,6 +407,7 @@ Examples:
 
 ### Usability
 - Right-click Area setting resets it to default.  
+- Can now scroll all drop down/pop ups with your mouse.
 
 ### Stability
 - Fixed crashes on empty/zero-size shapes.  

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

@@ -267,6 +267,12 @@ public void handleMouseRelease(double mouseX, double mouseY,
 
 	public void handleMouseScroll(double mouseX, double mouseY, double delta)
 	{
+		if(delta == 0)
+			return;
+		
+		if(handlePopupMouseScroll(mouseX, mouseY, delta))
+			return;
+		
 		int dWheel = (int)delta * 4;
 		if(dWheel == 0)
 			return;
@@ -364,7 +370,43 @@ private boolean handlePopupMouseClick(double mouseX, double mouseY,
 		return false;
 	}
 
-	private void handleWindowMouseClick(int mouseX, int mouseY, int mouseButton)
+	private boolean handlePopupMouseScroll(double mouseX, double mouseY,
+		double delta)
+	{
+		for(int i = popups.size() - 1; i >= 0; i--)
+		{
+			Popup popup = popups.get(i);
+			if(popup.getWidth() <= 0 || popup.getHeight() <= 0)
+				continue;
+			
+			Component owner = popup.getOwner();
+			Window parent = owner.getParent();
+			
+			int x0 = parent.getX() + owner.getX();
+			int y0 =
+				parent.getY() + 13 + parent.getScrollOffset() + owner.getY();
+			
+			int x1 = x0 + popup.getX();
+			int y1 = y0 + popup.getY();
+			int x2 = x1 + popup.getWidth();
+			int y2 = y1 + popup.getHeight();
+			
+			if(mouseX < x1 || mouseY < y1)
+				continue;
+			if(mouseX >= x2 || mouseY >= y2)
+				continue;
+			
+			int cMouseX = (int)(mouseX - x0);
+			int cMouseY = (int)(mouseY - y0);
+			if(popup.handleMouseScroll(cMouseX, cMouseY, delta))
+				return true;
+		}
+		
+		return false;
+	}
+	
+	private void handleWindowMouseClick(int mouseX, int mouseY, int mouseButton,
+		Click context)
 	{
 		for(int i = windows.size() - 1; i >= 0; i--)
 		{

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

@@ -19,9 +19,14 @@ public final class ComboBoxPopup<T extends Enum<T>> extends Popup
 {
 	private static final ClickGui GUI = WurstClient.INSTANCE.getGui();
 	private static final TextRenderer TR = WurstClient.MC.textRenderer;
+	private static final int ROW_HEIGHT = 11;
+	private static final int MAX_VISIBLE_ROWS = 8;
 
 	private final EnumSetting<T> setting;
 	private final int popupWidth;
+	private final int totalRows;
+	private final int visibleRows;
+	private int scrollOffset;
 
 	public ComboBoxPopup(Component owner, EnumSetting<T> setting,
 		int popupWidth)
@@ -30,6 +35,9 @@ public ComboBoxPopup(Component owner, EnumSetting<T> setting,
 		this.setting = setting;
 		this.popupWidth = popupWidth;
 
+		totalRows = Math.max(0, setting.getValues().length - 1);
+		visibleRows = Math.min(MAX_VISIBLE_ROWS, totalRows);
+		
 		setWidth(getDefaultWidth());
 		setHeight(getDefaultHeight());
 
@@ -40,30 +48,47 @@ public ComboBoxPopup(Component owner, EnumSetting<T> setting,
 	@Override
 	public void handleMouseClick(int mouseX, int mouseY, int mouseButton)
 	{
-		if(mouseButton != GLFW.GLFW_MOUSE_BUTTON_LEFT)
+		if(mouseButton != GLFW.GLFW_MOUSE_BUTTON_LEFT || visibleRows <= 0)
 			return;
 
-		int yi1 = getY() - 11;
-		for(T value : setting.getValues())
-		{
-			if(value == setting.getSelected())
-				continue;
-			
-			yi1 += 11;
-			int yi2 = yi1 + 11;
-			
-			if(mouseY < yi1 || mouseY >= yi2)
-				continue;
-			
-			setting.setSelected(value);
-			close();
-			break;
-		}
+		int localX = mouseX - getX();
+		int localY = mouseY - getY();
+		if(localX < 0 || localX >= getWidth() || localY < 0
+			|| localY >= getHeight())
+			return;
+		
+		int row = localY / ROW_HEIGHT;
+		T value = getValueAt(row + scrollOffset);
+		if(value == null)
+			return;
+		
+		setting.setSelected(value);
+		close();
+	}
+	
+	@Override
+	public boolean handleMouseScroll(int mouseX, int mouseY, double delta)
+	{
+		if(totalRows <= visibleRows || visibleRows <= 0)
+			return false;
+		
+		int direction = (int)Math.signum(delta);
+		if(direction == 0)
+			return false;
+		
+		scrollOffset -= direction;
+		clampScroll();
+		return true;
 	}
 
 	@Override
 	public void render(DrawContext context, int mouseX, int mouseY)
 	{
+		if(visibleRows <= 0)
+			return;
+		
+		clampScroll();
+		
 		int x1 = getX();
 		int x2 = x1 + getWidth();
 		int y1 = getY();
@@ -77,14 +102,21 @@ public void render(DrawContext context, int mouseX, int mouseY)
 		RenderUtils.drawBorder2D(context, x1, y1, x2, y2,
 			RenderUtils.toIntColor(GUI.getAcColor(), 0.5F));
 
-		int yi1 = y1 - 11;
+		int drawn = 0;
+		int skipped = 0;
 		for(T value : setting.getValues())
 		{
 			if(value == setting.getSelected())
 				continue;
 
-			yi1 += 11;
-			int yi2 = yi1 + 11;
+			if(skipped++ < scrollOffset)
+				continue;
+			
+			if(drawn >= visibleRows)
+				break;
+			
+			int yi1 = y1 + drawn * ROW_HEIGHT;
+			int yi2 = yi1 + ROW_HEIGHT;
 
 			boolean hValue = hovering && mouseY >= yi1 && mouseY < yi2;
 			context.fill(x1, yi1, x2, yi2, RenderUtils.toIntColor(
@@ -93,10 +125,40 @@ public void render(DrawContext context, int mouseX, int mouseY)
 			context.state.goUpLayer();
 			context.drawText(TR, value.toString(), x1 + 2, yi1 + 2,
 				GUI.getTxtColor(), false);
-			context.state.goDownLayer();
+			
+			drawn++;
 		}
 	}
 
+	private void clampScroll()
+	{
+		int maxOffset = Math.max(0, totalRows - visibleRows);
+		if(scrollOffset < 0)
+			scrollOffset = 0;
+		else if(scrollOffset > maxOffset)
+			scrollOffset = maxOffset;
+	}
+	
+	private T getValueAt(int index)
+	{
+		if(index < 0)
+			return null;
+		
+		int skipped = 0;
+		for(T value : setting.getValues())
+		{
+			if(value == setting.getSelected())
+				continue;
+			
+			if(skipped == index)
+				return value;
+			
+			skipped++;
+		}
+		
+		return null;
+	}
+	
 	private boolean isHovering(int mouseX, int mouseY, int x1, int x2, int y1,
 		int y2)
 	{
@@ -112,7 +174,6 @@ public int getDefaultWidth()
 	@Override
 	public int getDefaultHeight()
 	{
-		int numValues = setting.getValues().length;
-		return (numValues - 1) * 11;
+		return visibleRows * ROW_HEIGHT;
 	}
 }

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

@@ -33,6 +33,11 @@ public abstract void handleMouseClick(int mouseX, int mouseY,
 
 	public abstract int getDefaultHeight();
 
+	public boolean handleMouseScroll(int mouseX, int mouseY, double delta)
+	{
+		return false;
+	}
+	
 	public Component getOwner()
 	{
 		return owner;