PlayerESP, ClickGUI, OfflineSettings Updates & Fixes

Author: cev-api

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

@@ -28,6 +28,8 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.input.CharacterEvent;
+import net.minecraft.client.input.KeyEvent;
 import net.minecraft.client.input.MouseButtonEvent;
 import net.wurstclient.Category;
 import net.wurstclient.Feature;
@@ -63,6 +65,7 @@ public final class ClickGui
 	private String tooltip = "";
 
 	private boolean leftMouseButtonPressed;
+	private KeyboardInput keyboardInput;
 
 	public ClickGui(Path windowsFile)
 	{
@@ -359,6 +362,57 @@ public boolean handleNavigatorMouseScroll(double mouseX, double mouseY,
 		return popupScrolled;
 	}
 
+	public boolean handleKeyPressed(KeyEvent context)
+	{
+		if(keyboardInput != null && keyboardInput.onKeyPressed(context))
+			return true;
+		
+		if(context.key() == GLFW.GLFW_KEY_ESCAPE && keyboardInput != null)
+		{
+			clearKeyboardInput();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	public boolean handleCharTyped(CharacterEvent event)
+	{
+		return keyboardInput != null && keyboardInput.onCharTyped(event);
+	}
+	
+	public void requestKeyboardInput(KeyboardInput handler)
+	{
+		if(handler == null || keyboardInput == handler)
+			return;
+		
+		if(keyboardInput != null)
+			clearKeyboardInput();
+		
+		keyboardInput = handler;
+	}
+	
+	public void releaseKeyboardInput(KeyboardInput handler)
+	{
+		if(handler != null && keyboardInput == handler)
+			keyboardInput = null;
+	}
+	
+	public void clearKeyboardInput()
+	{
+		if(keyboardInput == null)
+			return;
+		
+		KeyboardInput handler = keyboardInput;
+		keyboardInput = null;
+		handler.onKeyboardFocusLost();
+	}
+	
+	public boolean isKeyboardInputCaptured()
+	{
+		return keyboardInput != null;
+	}
+	
 	public void handleNavigatorMouseClick(double cMouseX, double cMouseY,
 		int mouseButton, Window window, MouseButtonEvent context)
 	{
@@ -587,6 +641,9 @@ private void handleComponentMouseClick(Window window, double mouseX,
 				|| mouseY >= c.getY() + c.getHeight())
 				continue;
 
+			if(keyboardInput != null && keyboardInput != c)
+				clearKeyboardInput();
+			
 			c.handleMouseClick(mouseX, mouseY, mouseButton, context);
 			break;
 		}

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright (c) 2014-2025 Wurst-Imperium and contributors.
+ *
+ * This source code is subject to the terms of the GNU General Public
+ * License, version 3. If a copy of the GPL was not distributed with this
+ * file, You can obtain one at: https://www.gnu.org/licenses/gpl-3.0.txt
+ */
+package net.wurstclient.clickgui;
+
+import net.minecraft.client.input.CharacterEvent;
+import net.minecraft.client.input.KeyEvent;
+
+/**
+ * Minimal interface for ClickGUI components that want to capture keyboard
+ * input. Components can request focus through {@link ClickGui} and receive key
+ * and char events without opening a fullscreen screen.
+ */
+public interface KeyboardInput
+{
+	boolean onKeyPressed(KeyEvent event);
+	
+	boolean onCharTyped(CharacterEvent event);
+	
+	void onKeyboardFocusLost();
+}

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

@@ -25,6 +25,7 @@ public final class StringDropdownComponent extends Component
 	private static final ClickGui GUI = WurstClient.INSTANCE.getGui();
 	private static final Font TR = WurstClient.MC.font;
 	private static final int ARROW_SIZE = 11;
+	private static final int LABEL_HEIGHT = 11;
 
 	private final StringDropdownSetting setting;
 	private StringDropdownPopup popup;
@@ -40,11 +41,16 @@ public StringDropdownComponent(StringDropdownSetting setting)
 	public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
 		MouseButtonEvent context)
 	{
-		int popupWidth = computePopupWidth();
+		double localX = mouseX - getX();
+		double localY = mouseY - getY();
+		if(localX < 0 || localX >= getWidth())
+			return;
 
-		if(mouseX < getX() + getWidth() - popupWidth - ARROW_SIZE - 4)
+		if(localY < LABEL_HEIGHT)
 			return;
 
+		int popupWidth = computePopupWidth();
+		
 		switch(mouseButton)
 		{
 			case GLFW.GLFW_MOUSE_BUTTON_LEFT:
@@ -87,35 +93,36 @@ public void render(GuiGraphics context, int mouseX, int mouseY,
 		int popupWidth = computePopupWidth();
 		int x1 = getX();
 		int x2 = x1 + getWidth();
-		int x3 = x2 - ARROW_SIZE;
-		int x4 = x3 - popupWidth - 4;
-		int y1 = getY();
-		int y2 = y1 + getHeight();
+		int boxY1 = getY() + LABEL_HEIGHT;
+		int boxY2 = boxY1 + ARROW_SIZE;
+		int arrowX1 = x2 - ARROW_SIZE;
+		int arrowX2 = x2;
 
 		boolean hovering = isHovering(mouseX, mouseY);
-		boolean hText = hovering && mouseX < x4;
-		boolean hBox = hovering && mouseX >= x4;
+		boolean hText = hovering && mouseY < boxY1;
+		boolean hBox = hovering && mouseY >= boxY1;
 
 		if(hText)
 			GUI.setTooltip(setting.getWrappedDescription(200));
 
-		context.fill(x1, y1, x4, y2, getFillColor(false));
-		context.fill(x4, y1, x2, y2, getFillColor(hBox));
+		context.fill(x1, getY(), x2, boxY1, getFillColor(false));
+		context.fill(x1, boxY1, x2, boxY2, getFillColor(hBox));
 
 		context.guiRenderState.up();
 
 		int outlineColor = RenderUtils.toIntColor(GUI.getAcColor(), 0.5F);
-		RenderUtils.drawBorder2D(context, x4, y1, x2, y2, outlineColor);
-		RenderUtils.drawLine2D(context, x3, y1, x3, y2, outlineColor);
+		RenderUtils.drawBorder2D(context, x1, boxY1, x2, boxY2, outlineColor);
+		RenderUtils.drawLine2D(context, arrowX1, boxY1, arrowX1, boxY2,
+			outlineColor);
 
-		ClickGuiIcons.drawMinimizeArrow(context, x3, y1 + 0.5F, x2, y2 - 0.5F,
-			hBox, !isPopupOpen());
+		ClickGuiIcons.drawMinimizeArrow(context, arrowX1, boxY1 + 0.5F, arrowX2,
+			boxY2 - 0.5F, hBox, !isPopupOpen());
 
 		String name = setting.getName();
 		String value = setting.getSelected();
 		int txtColor = GUI.getTxtColor();
-		context.drawString(TR, name, x1, y1 + 2, txtColor, false);
-		context.drawString(TR, value, x4 + 2, y1 + 2, txtColor, false);
+		context.drawString(TR, name, x1, getY() + 2, txtColor, false);
+		context.drawString(TR, value, x1 + 2, boxY1 + 2, txtColor, false);
 	}
 
 	private int computePopupWidth()
@@ -134,12 +141,14 @@ private int getFillColor(boolean hovering)
 	public int getDefaultWidth()
 	{
 		int popupWidth = computePopupWidth();
-		return TR.width(setting.getName()) + popupWidth + ARROW_SIZE + 6;
+		int boxWidth = popupWidth + ARROW_SIZE + 6;
+		int labelWidth = TR.width(setting.getName()) + 4;
+		return Math.max(labelWidth, boxWidth);
 	}
 
 	@Override
 	public int getDefaultHeight()
 	{
-		return ARROW_SIZE;
+		return LABEL_HEIGHT + ARROW_SIZE;
 	}
 }