Colorful UI

Author: cev-api

README.md

@@ -302,8 +302,10 @@ Examples:
 - Hacklist has font scaler, transparency, X & Y position adjustments, adjustable shadow box.
 - Hacklist has the ability to highlight entries pursuant to the selected ESP color.
 - Hacklist has the ability show the count of detected ESP items/blocks/entities (BedESP, SignESP, WorkstationESP, RedstoneESP, ChestESP, MobsearchESP, MobESP, ItemESP). They're toggled in each hack.
+- UI now has more color options which are also applied to the Navigator UI
+- New Isolate Windows toggle which allows the active window (or sub category/setting) to not display any other windows behind it
 
-![HackList](https://i.imgur.com/FsOxPD2.png)
+![HackList](https://i.imgur.com/fzcQdjy.png)
 
 ### Search Improvements
 - Keyword queries supported; falls back to picker when empty.  

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

@@ -15,6 +15,7 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
@@ -51,11 +52,15 @@ public final class ClickGui
 
 	private float[] bgColor = new float[3];
 	private float[] acColor = new float[3];
+	private float[] enabledHackColor = new float[3];
+	private float[] dropdownButtonColor = new float[3];
+	private float[] pinButtonColor = new float[3];
 	private int txtColor;
 	private float opacity;
 	private float ttOpacity;
 	private int maxHeight;
 	private int maxSettingsHeight;
+	private boolean isolateWindows;
 
 	private String tooltip = "";
 
@@ -130,7 +135,10 @@ public void init()
 		uiSettings.add(new FeatureButton(WURST.getOtfs().hackListOtf));
 		uiSettings.add(new FeatureButton(WURST.getOtfs().keybindManagerOtf));
 		ClickGuiHack clickGuiHack = WURST.getHax().clickGuiHack;
-		Stream<Setting> settings = clickGuiHack.getSettings().values().stream();
+		uiSettings.add(clickGuiHack.getIsolateWindowsSetting().getComponent());
+		Stream<Setting> settings =
+			clickGuiHack.getSettings().values().stream().filter(
+				setting -> setting != clickGuiHack.getIsolateWindowsSetting());
 		settings.map(Setting::getComponent).forEach(c -> uiSettings.add(c));
 		// Removed secondary Chest Search button from UI Settings so Chest
 		// Search
@@ -580,6 +588,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 		matrixStack.pushMatrix();
 
 		tooltip = "";
+		ArrayList<Window> visibleWindows = new ArrayList<>();
 		for(Window window : windows)
 		{
 			if(window.isInvisible())
@@ -602,10 +611,19 @@ public void render(DrawContext context, int mouseX, int mouseY,
 				else
 					window.stopDraggingScrollbar();
 
-			context.state.goUpLayer();
-			renderWindow(context, window, mouseX, mouseY, partialTicks);
+			visibleWindows.add(window);
 		}
 
+		if(isolateWindows && !visibleWindows.isEmpty())
+			renderWindowsWithIsolation(context, visibleWindows, mouseX, mouseY,
+				partialTicks);
+		else
+			for(Window window : visibleWindows)
+			{
+				context.state.goUpLayer();
+				renderWindow(context, window, mouseX, mouseY, partialTicks);
+			}
+		
 		renderPopups(context, mouseX, mouseY);
 		renderTooltip(context, mouseX, mouseY);
 
@@ -679,15 +697,26 @@ public void renderTooltip(DrawContext context, int mouseX, int mouseY)
 
 	public void renderPinnedWindows(DrawContext context, float partialTicks)
 	{
+		ArrayList<Window> pinnedWindows = new ArrayList<>();
 		for(Window window : windows)
 		{
-			if(!window.isPinned() || window.isInvisible())
-				continue;
-			
-			context.state.goUpLayer();
-			renderWindow(context, window, Integer.MIN_VALUE, Integer.MIN_VALUE,
-				partialTicks);
+			if(window.isPinned() && !window.isInvisible())
+				pinnedWindows.add(window);
 		}
+		
+		if(pinnedWindows.isEmpty())
+			return;
+		
+		if(isolateWindows)
+			renderWindowsWithIsolation(context, pinnedWindows,
+				Integer.MIN_VALUE, Integer.MIN_VALUE, partialTicks);
+		else
+			for(Window window : pinnedWindows)
+			{
+				context.state.goUpLayer();
+				renderWindow(context, window, Integer.MIN_VALUE,
+					Integer.MIN_VALUE, partialTicks);
+			}
 	}
 
 	public void updateColors()
@@ -698,6 +727,10 @@ public void updateColors()
 		ttOpacity = clickGui.getTooltipOpacity();
 		bgColor = clickGui.getBackgroundColor();
 		txtColor = clickGui.getTextColor();
+		enabledHackColor = clickGui.getEnabledHackColor();
+		dropdownButtonColor = clickGui.getDropdownButtonColor();
+		pinButtonColor = clickGui.getPinButtonColor();
+		isolateWindows = clickGui.isWindowIsolationEnabled();
 		maxHeight = clickGui.getMaxHeight();
 		maxSettingsHeight = clickGui.getMaxSettingsHeight();
 
@@ -910,11 +943,95 @@ public float[] getAcColor()
 		return acColor;
 	}
 
+	public float[] getEnabledHackColor()
+	{
+		return enabledHackColor;
+	}
+	
 	public int getTxtColor()
 	{
 		return txtColor;
 	}
 
+	public float[] getDropdownButtonColor()
+	{
+		return dropdownButtonColor;
+	}
+	
+	public float[] getPinButtonColor()
+	{
+		return pinButtonColor;
+	}
+	
+	public boolean isWindowIsolationEnabled()
+	{
+		return isolateWindows;
+	}
+	
+	private void renderWindowsWithIsolation(DrawContext context,
+		List<Window> windowsToRender, int mouseX, int mouseY,
+		float partialTicks)
+	{
+		List<List<Rect>> occlusionMasks = buildOcclusionMasks(windowsToRender);
+		
+		for(int i = 0; i < windowsToRender.size(); i++)
+		{
+			Window window = windowsToRender.get(i);
+			List<Rect> visibleAreas =
+				computeVisibleAreas(window, occlusionMasks.get(i));
+			
+			if(visibleAreas.isEmpty())
+				continue;
+			
+			for(Rect rect : visibleAreas)
+			{
+				context.enableScissor(rect.x1, rect.y1, rect.x2, rect.y2);
+				context.state.goUpLayer();
+				renderWindow(context, window, mouseX, mouseY, partialTicks);
+				context.disableScissor();
+			}
+		}
+	}
+	
+	private List<List<Rect>> buildOcclusionMasks(List<Window> windowsToRender)
+	{
+		ArrayList<List<Rect>> masks = new ArrayList<>(windowsToRender.size());
+		for(int i = 0; i < windowsToRender.size(); i++)
+			masks.add(new ArrayList<>());
+		
+		ArrayList<Rect> accumulated = new ArrayList<>();
+		for(int i = windowsToRender.size() - 1; i >= 0; i--)
+		{
+			ArrayList<Rect> copy = new ArrayList<>(accumulated.size());
+			for(Rect rect : accumulated)
+				copy.add(rect.copy());
+			masks.set(i, copy);
+			
+			accumulated.add(Rect.fromWindow(windowsToRender.get(i)));
+		}
+		
+		return masks;
+	}
+	
+	private List<Rect> computeVisibleAreas(Window window, List<Rect> occluders)
+	{
+		ArrayList<Rect> visible = new ArrayList<>();
+		visible.add(Rect.fromWindow(window));
+		
+		for(Rect occluder : occluders)
+			visible = subtractRectangles(visible, occluder);
+		
+		return visible;
+	}
+	
+	private ArrayList<Rect> subtractRectangles(List<Rect> source, Rect occluder)
+	{
+		ArrayList<Rect> result = new ArrayList<>();
+		for(Rect rect : source)
+			result.addAll(rect.subtract(occluder));
+		return result;
+	}
+	
 	public float getOpacity()
 	{
 		return opacity;
@@ -930,6 +1047,72 @@ public void setTooltip(String tooltip)
 		this.tooltip = Objects.requireNonNull(tooltip);
 	}
 
+	private static final class Rect
+	{
+		final int x1;
+		final int y1;
+		final int x2;
+		final int y2;
+		
+		Rect(int x1, int y1, int x2, int y2)
+		{
+			this.x1 = x1;
+			this.y1 = y1;
+			this.x2 = x2;
+			this.y2 = y2;
+		}
+		
+		static Rect fromWindow(Window window)
+		{
+			int x1 = window.getX();
+			int y1 = window.getY();
+			int width = window.getWidth();
+			int height = window.isMinimized() ? 13 : window.getHeight();
+			return new Rect(x1, y1, x1 + width, y1 + height);
+		}
+		
+		Rect copy()
+		{
+			return new Rect(x1, y1, x2, y2);
+		}
+		
+		List<Rect> subtract(Rect other)
+		{
+			ArrayList<Rect> pieces = new ArrayList<>();
+			if(!intersects(other))
+			{
+				pieces.add(this);
+				return pieces;
+			}
+			
+			int ox1 = Math.max(x1, other.x1);
+			int oy1 = Math.max(y1, other.y1);
+			int ox2 = Math.min(x2, other.x2);
+			int oy2 = Math.min(y2, other.y2);
+			
+			if(oy1 > y1)
+				pieces.add(new Rect(x1, y1, x2, oy1));
+			if(oy2 < y2)
+				pieces.add(new Rect(x1, oy2, x2, y2));
+			
+			if(oy1 < oy2)
+			{
+				if(ox1 > x1)
+					pieces.add(new Rect(x1, oy1, ox1, oy2));
+				if(ox2 < x2)
+					pieces.add(new Rect(ox2, oy1, x2, oy2));
+			}
+			
+			return pieces;
+		}
+		
+		private boolean intersects(Rect other)
+		{
+			return x1 < other.x2 && x2 > other.x1 && y1 < other.y2
+				&& y2 > other.y1;
+		}
+	}
+	
 	public void addWindow(Window window)
 	{
 		windows.add(window);

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

@@ -18,6 +18,11 @@ public enum ClickGuiIcons
 	public static void drawMinimizeArrow(DrawContext context, float x1,
 		float y1, float x2, float y2, boolean hovering, boolean minimized)
 	{
+		ClickGui gui = WurstClient.INSTANCE.getGui();
+		int collapsedColor =
+			RenderUtils.toIntColor(gui.getDropdownButtonColor(), 1F);
+		int collapsedHoverColor = scaleColor(collapsedColor, 1.15F);
+		
 		float xa1 = x1 + 1;
 		float xa2 = (x1 + x2) / 2;
 		float xa3 = x2 - 1;
@@ -31,7 +36,7 @@ public static void drawMinimizeArrow(DrawContext context, float x1,
 		{
 			ya1 = y1 + 3;
 			ya2 = y2 - 2.5F;
-			arrowColor = hovering ? 0xFF00FF00 : 0xFF00D900;
+			arrowColor = hovering ? collapsedHoverColor : collapsedColor;
 			arrowVertices = new float[][]{{xa1, ya1}, {xa2, ya2}, {xa3, ya1}};
 
 		}else
@@ -102,6 +107,11 @@ public static void drawPin(DrawContext context, float x1, float y1,
 
 		}else
 		{
+			ClickGui gui = WurstClient.INSTANCE.getGui();
+			int basePinColor =
+				RenderUtils.toIntColor(gui.getPinButtonColor(), 1F);
+			int hoverPinColor = scaleColor(basePinColor, 1.15F);
+			
 			float xk1 = x2 - 3.5F;
 			float xk2 = x2 - 0.5F;
 			float xk3 = x2 - 3;
@@ -118,7 +128,7 @@ public static void drawPin(DrawContext context, float x1, float y1,
 			float yk7 = y2 - 1;
 
 			// knob
-			int knobColor = hovering ? 0xFF00FF00 : 0xFF00D900;
+			int knobColor = hovering ? hoverPinColor : basePinColor;
 			float[][] knobVertices = {{xk4, yk4}, {xk3, yk3}, {xk2, yk2},
 				{xk1, yk1}, {xk5, yk5}, {xk7, yk4}, {xk3, yk7}, {xk6, yk6}};
 			RenderUtils.fillQuads2D(context, knobVertices, knobColor);
@@ -224,4 +234,22 @@ public static void drawCross(DrawContext context, float x1, float y1,
 			{xc6, yc7}, {xc2, yc4}, {xc1, yc3}, {xc5, yc6}};
 		RenderUtils.drawLineStrip2D(context, outlineVertices, outlineColor);
 	}
+	
+	private static int scaleColor(int color, float factor)
+	{
+		int a = color >>> 24;
+		int r = clampChannel((int)Math.round(((color >> 16) & 0xFF) * factor));
+		int g = clampChannel((int)Math.round(((color >> 8) & 0xFF) * factor));
+		int b = clampChannel((int)Math.round((color & 0xFF) * factor));
+		return a << 24 | r << 16 | g << 8 | b;
+	}
+	
+	private static int clampChannel(int value)
+	{
+		if(value < 0)
+			return 0;
+		if(value > 255)
+			return 255;
+		return value;
+	}
 }

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

@@ -146,7 +146,7 @@ public void render(DrawContext context, int mouseX, int mouseY,
 
 	private int getButtonColor(boolean enabled, boolean hovering)
 	{
-		float[] rgb = enabled ? new float[]{0, 1, 0} : GUI.getBgColor();
+		float[] rgb = enabled ? GUI.getEnabledHackColor() : GUI.getBgColor();
 		float opacity = GUI.getOpacity() * (hovering ? 1.5F : 1);
 		return RenderUtils.toIntColor(rgb, opacity);
 	}

src/main/java/net/wurstclient/hack/HackList.java

@@ -34,8 +34,8 @@ public final class HackList implements UpdateListener
 	public final AntiAfkHack antiAfkHack = new AntiAfkHack();
 	public final AntiBlindHack antiBlindHack = new AntiBlindHack();
 	public final AntiCactusHack antiCactusHack = new AntiCactusHack();
-	public final AntiDropHack antiDropHack = new AntiDropHack();
-	public final AntiBlastHack antiBlastHack = new AntiBlastHack();
+	public final AntiDropHack antiDropHack = new AntiDropHack();
+	public final AntiBlastHack antiBlastHack = new AntiBlastHack();
 	public final AntiEntityPushHack antiEntityPushHack =
 		new AntiEntityPushHack();
 	public final AntiHungerHack antiHungerHack = new AntiHungerHack();