Updated to match master branch

cev-api · cev-api · commit 9481138d131b · 2025-11-26T13:00:35.000+10:00
diff --git a/src/main/java/net/wurstclient/WurstClient.java b/src/main/java/net/wurstclient/WurstClient.java
@@ -53,7 +53,7 @@ public enum WurstClient
 	public static IMinecraftClient IMC;
 	
 	public static final String VERSION = "7.51.2";
-	public static final String MC_VERSION = "1.21.10";
+	public static final String MC_VERSION = "1.21.8";
 	
 	private PlausibleAnalytics plausible;
 	private EventManager eventManager;
diff --git a/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java b/src/main/java/net/wurstclient/altmanager/screens/AltManagerScreen.java
@@ -592,7 +592,7 @@ public boolean mouseClicked(double mouseX, double mouseY,
 			if(mouseButton != GLFW.GLFW_MOUSE_BUTTON_LEFT)
 				return false;
 			
-			super.mouseClicked(context, doubleClick);
+			super.mouseClicked(mouseX, mouseY, mouseButton);
 			
 			long timeSinceLastClick = Util.getMillis() - lastClickTime;
 			lastClickTime = Util.getMillis();
@@ -657,7 +657,7 @@ private final class ListGui
 		public ListGui(Minecraft minecraft, AltManagerScreen screen,
 			List<Alt> list)
 		{
-			super(minecraft, screen.width, screen.height - 96, 36, 30, 0);
+			super(minecraft, screen.width, screen.height - 96, 36, 30);
 			
 			list.stream().map(alt -> new AltManagerScreen.Entry(this, alt))
 				.forEach(this::addEntry);
diff --git a/src/main/java/net/wurstclient/clickgui/ClickGui.java b/src/main/java/net/wurstclient/clickgui/ClickGui.java
@@ -28,9 +28,6 @@
 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;
 import net.wurstclient.WurstClient;
@@ -262,7 +259,7 @@ public void handleMouseClick(int mouseX, int mouseY, int mouseButton)
 		{
 			boolean closedPopups = closeActivePopups();
 			if(!closedPopups)
-				handleWindowMouseClick(mouseX, mouseY, mouseButton, context);
+				handleWindowMouseClick(mouseX, mouseY, mouseButton);
 		}
 		
 		for(Popup popup : popups)
@@ -360,12 +357,13 @@ public boolean handleNavigatorMouseScroll(double mouseX, double mouseY,
 		return popupScrolled;
 	}
 	
-	public boolean handleKeyPressed(KeyEvent context)
+	public boolean handleKeyPressed(int keyCode, int scanCode, int modifiers)
 	{
-		if(keyboardInput != null && keyboardInput.onKeyPressed(context))
+		if(keyboardInput != null
+			&& keyboardInput.onKeyPressed(keyCode, scanCode, modifiers))
 			return true;
 		
-		if(context.key() == GLFW.GLFW_KEY_ESCAPE && keyboardInput != null)
+		if(keyCode == GLFW.GLFW_KEY_ESCAPE && keyboardInput != null)
 		{
 			clearKeyboardInput();
 			return true;
@@ -374,9 +372,10 @@ public boolean handleKeyPressed(KeyEvent context)
 		return false;
 	}
 	
-	public boolean handleCharTyped(CharacterEvent event)
+	public boolean handleCharTyped(char chr, int modifiers)
 	{
-		return keyboardInput != null && keyboardInput.onCharTyped(event);
+		return keyboardInput != null
+			&& keyboardInput.onCharTyped(chr, modifiers);
 	}
 	
 	public void requestKeyboardInput(KeyboardInput handler)
@@ -640,7 +639,7 @@ private void handleComponentMouseClick(Window window, double mouseX,
 			if(keyboardInput != null && keyboardInput != c)
 				clearKeyboardInput();
 			
-			c.handleMouseClick(mouseX, mouseY, mouseButton, context);
+			c.handleMouseClick(mouseX, mouseY, mouseButton);
 			break;
 		}
 	}
diff --git a/src/main/java/net/wurstclient/clickgui/KeyboardInput.java b/src/main/java/net/wurstclient/clickgui/KeyboardInput.java
@@ -7,19 +7,16 @@
  */
 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 onKeyPressed(int keyCode, int scanCode, int modifiers);
 	
-	boolean onCharTyped(CharacterEvent event);
+	boolean onCharTyped(char chr, int modifiers);
 	
 	void onKeyboardFocusLost();
 }
diff --git a/src/main/java/net/wurstclient/clickgui/components/StringDropdownComponent.java b/src/main/java/net/wurstclient/clickgui/components/StringDropdownComponent.java
@@ -11,7 +11,6 @@
 
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.wurstclient.WurstClient;
 import net.wurstclient.clickgui.ClickGui;
 import net.wurstclient.clickgui.ClickGuiIcons;
@@ -38,8 +37,7 @@ public StringDropdownComponent(StringDropdownSetting setting)
 	}
 	
 	@Override
-	public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
-		MouseButtonEvent context)
+	public void handleMouseClick(double mouseX, double mouseY, int mouseButton)
 	{
 		double localX = mouseX - getX();
 		double localY = mouseY - getY();
diff --git a/src/main/java/net/wurstclient/clickgui/components/TextFieldEditButton.java b/src/main/java/net/wurstclient/clickgui/components/TextFieldEditButton.java
@@ -13,9 +13,6 @@
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.input.CharacterEvent;
-import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.wurstclient.clickgui.ClickGui;
 import net.wurstclient.clickgui.Component;
 import net.wurstclient.clickgui.KeyboardInput;
@@ -66,7 +63,8 @@ public void handleMouseClick(double mouseX, double mouseY, int mouseButton)
 			{
 				if(!editing)
 					startEditing();
-				inlineField.mouseClicked(context, false);
+				inlineField.mouseClicked(toAbsoluteMouseX(mouseX),
+					toAbsoluteMouseY(mouseY), mouseButton);
 			}else if(editing)
 				finishEditing(true);
 			break;
@@ -182,12 +180,11 @@ private int toAbsoluteMouseY(double mouseY)
 	}
 	
 	@Override
-	public boolean onKeyPressed(KeyEvent event)
+	public boolean onKeyPressed(int keyCode, int scanCode, int modifiers)
 	{
 		if(!editing)
 			return false;
 		
-		int keyCode = event.key();
 		if(keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER)
 		{
 			finishEditing(true);
@@ -200,13 +197,13 @@ public boolean onKeyPressed(KeyEvent event)
 			return true;
 		}
 		
-		return inlineField.keyPressed(event);
+		return inlineField.keyPressed(keyCode, scanCode, modifiers);
 	}
 	
 	@Override
-	public boolean onCharTyped(CharacterEvent event)
+	public boolean onCharTyped(char chr, int modifiers)
 	{
-		return editing && inlineField.charTyped(event);
+		return editing && inlineField.charTyped(chr, modifiers);
 	}
 	
 	@Override
diff --git a/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java b/src/main/java/net/wurstclient/clickgui/screens/ClickGuiScreen.java
@@ -10,9 +10,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.input.CharacterEvent;
-import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.wurstclient.clickgui.ClickGui;
 
@@ -56,21 +53,21 @@ public boolean mouseScrolled(double mouseX, double mouseY,
 	}
 	
 	@Override
-	public boolean keyPressed(KeyEvent context)
+	public boolean keyPressed(int keyCode, int scanCode, int modifiers)
 	{
-		if(gui.handleKeyPressed(context))
+		if(gui.handleKeyPressed(keyCode, scanCode, modifiers))
 			return true;
 		
-		return super.keyPressed(context);
+		return super.keyPressed(keyCode, scanCode, modifiers);
 	}
 	
 	@Override
-	public boolean charTyped(CharacterEvent event)
+	public boolean charTyped(char chr, int modifiers)
 	{
-		if(gui.handleCharTyped(event))
+		if(gui.handleCharTyped(chr, modifiers))
 			return true;
 		
-		return super.charTyped(event);
+		return super.charTyped(chr, modifiers);
 	}
 	
 	@Override
diff --git a/src/main/java/net/wurstclient/hacks/TargetPlaceHack.java b/src/main/java/net/wurstclient/hacks/TargetPlaceHack.java
@@ -88,8 +88,8 @@ public void onUpdate()
 		InputConstants.Key key = getActivationKey();
 		if(key != null)
 		{
-			boolean currentlyDown =
-				InputConstants.isKeyDown(MC.getWindow(), key.getValue());
+			boolean currentlyDown = InputConstants
+				.isKeyDown(MC.getWindow().getWindow(), key.getValue());
 			if(currentlyDown && !activationKeyDown)
 				handleActivation(MC.options.keyShift.isDown());
 			activationKeyDown = currentlyDown;
diff --git a/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java b/src/main/java/net/wurstclient/mixin/DisconnectedScreenMixin.java
@@ -526,10 +526,10 @@ private void showPlayerPicker(OfflineSettingsHack hack)
 		{
 			minecraft.player.connection.getOnlinePlayers().forEach(info -> {
 				if(info == null || info.getProfile() == null
-					|| info.getProfile().name() == null)
+					|| info.getProfile().getName() == null)
 					return;
 				
-				String name = info.getProfile().name().trim();
+				String name = info.getProfile().getName().trim();
 				if(!name.isEmpty() && !names.contains(name))
 					names.add(name);
 			});
diff --git a/src/main/java/net/wurstclient/navigator/NavigatorListScreen.java b/src/main/java/net/wurstclient/navigator/NavigatorListScreen.java
@@ -15,8 +15,6 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.input.KeyEvent;
-import net.minecraft.client.input.MouseButtonEvent;
 import net.minecraft.network.chat.Component;
 import net.minecraft.util.CommonColors;
 import net.minecraft.util.Mth;
@@ -71,15 +69,15 @@ public void init()
 	}
 	
 	@Override
-	public boolean keyPressed(KeyEvent event)
+	public boolean keyPressed(int keyCode, int scanCode, int modifiers)
 	{
-		if(event.key() == GLFW.GLFW_KEY_ESCAPE)
+		if(keyCode == GLFW.GLFW_KEY_ESCAPE)
 		{
 			cancelSelection();
 			return true;
 		}
 		
-		return super.keyPressed(event);
+		return super.keyPressed(keyCode, scanCode, modifiers);
 	}
 	
 	@Override
@@ -94,12 +92,8 @@ public boolean mouseScrolled(double mouseX, double mouseY,
 	}
 	
 	@Override
-	public boolean mouseClicked(MouseButtonEvent context, boolean doubleClick)
+	public boolean mouseClicked(double mouseX, double mouseY, int button)
 	{
-		double mouseX = context.x();
-		double mouseY = context.y();
-		int button = context.button();
-		
 		if(button == GLFW.GLFW_MOUSE_BUTTON_LEFT)
 		{
 			if(mouseX >= listLeft && mouseX <= listRight && mouseY >= listTop
@@ -135,7 +129,7 @@ public boolean mouseClicked(MouseButtonEvent context, boolean doubleClick)
 			}
 		}
 		
-		return super.mouseClicked(context, doubleClick);
+		return super.mouseClicked(mouseX, mouseY, button);
 	}
 	
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,6 @@`
`28`	`28`	`import net.minecraft.client.Minecraft;`
`29`	`29`	`import net.minecraft.client.gui.Font;`
`30`	`30`	`import net.minecraft.client.gui.GuiGraphics;`
`31`		`-import net.minecraft.client.input.CharacterEvent;`
`32`		`-import net.minecraft.client.input.KeyEvent;`
`33`		`-import net.minecraft.client.input.MouseButtonEvent;`
`34`	`31`	`import net.wurstclient.Category;`
`35`	`32`	`import net.wurstclient.Feature;`
`36`	`33`	`import net.wurstclient.WurstClient;`
`@@ -262,7 +259,7 @@ public void handleMouseClick(int mouseX, int mouseY, int mouseButton)`
`262`	`259`	`{`
`263`	`260`	`boolean closedPopups = closeActivePopups();`
`264`	`261`	`if(!closedPopups)`
`265`		`- handleWindowMouseClick(mouseX, mouseY, mouseButton, context);`
	`262`	`+ handleWindowMouseClick(mouseX, mouseY, mouseButton);`
`266`	`263`	`}`
`267`	`264`
`268`	`265`	`for(Popup popup : popups)`
`@@ -360,12 +357,13 @@ public boolean handleNavigatorMouseScroll(double mouseX, double mouseY,`
`360`	`357`	`return popupScrolled;`
`361`	`358`	`}`
`362`	`359`
`363`		`- public boolean handleKeyPressed(KeyEvent context)`
	`360`	`+ public boolean handleKeyPressed(int keyCode, int scanCode, int modifiers)`
`364`	`361`	`{`
`365`		`- if(keyboardInput != null && keyboardInput.onKeyPressed(context))`
	`362`	`+ if(keyboardInput != null`
	`363`	`+ && keyboardInput.onKeyPressed(keyCode, scanCode, modifiers))`
`366`	`364`	`return true;`
`367`	`365`
`368`		`- if(context.key() == GLFW.GLFW_KEY_ESCAPE && keyboardInput != null)`
	`366`	`+ if(keyCode == GLFW.GLFW_KEY_ESCAPE && keyboardInput != null)`
`369`	`367`	`{`
`370`	`368`	`clearKeyboardInput();`
`371`	`369`	`return true;`
`@@ -374,9 +372,10 @@ public boolean handleKeyPressed(KeyEvent context)`
`374`	`372`	`return false;`
`375`	`373`	`}`
`376`	`374`
`377`		`- public boolean handleCharTyped(CharacterEvent event)`
	`375`	`+ public boolean handleCharTyped(char chr, int modifiers)`
`378`	`376`	`{`
`379`		`- return keyboardInput != null && keyboardInput.onCharTyped(event);`
	`377`	`+ return keyboardInput != null`
	`378`	`+ && keyboardInput.onCharTyped(chr, modifiers);`
`380`	`379`	`}`
`381`	`380`
`382`	`381`	`public void requestKeyboardInput(KeyboardInput handler)`
`@@ -640,7 +639,7 @@ private void handleComponentMouseClick(Window window, double mouseX,`
`640`	`639`	`if(keyboardInput != null && keyboardInput != c)`
`641`	`640`	`clearKeyboardInput();`
`642`	`641`
`643`		`- c.handleMouseClick(mouseX, mouseY, mouseButton, context);`
	`642`	`+ c.handleMouseClick(mouseX, mouseY, mouseButton);`
`644`	`643`	`break;`
`645`	`644`	`}`
`646`	`645`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`	`import net.minecraft.client.gui.Font;`
`14`	`14`	`import net.minecraft.client.gui.GuiGraphics;`
`15`	`15`	`import net.minecraft.client.gui.components.EditBox;`
`16`		`-import net.minecraft.client.input.CharacterEvent;`
`17`		`-import net.minecraft.client.input.KeyEvent;`
`18`		`-import net.minecraft.client.input.MouseButtonEvent;`
`19`	`16`	`import net.wurstclient.clickgui.ClickGui;`
`20`	`17`	`import net.wurstclient.clickgui.Component;`
`21`	`18`	`import net.wurstclient.clickgui.KeyboardInput;`
`@@ -66,7 +63,8 @@ public void handleMouseClick(double mouseX, double mouseY, int mouseButton)`
`66`	`63`	`{`
`67`	`64`	`if(!editing)`
`68`	`65`	`startEditing();`
`69`		`- inlineField.mouseClicked(context, false);`
	`66`	`+ inlineField.mouseClicked(toAbsoluteMouseX(mouseX),`
	`67`	`+ toAbsoluteMouseY(mouseY), mouseButton);`
`70`	`68`	`}else if(editing)`
`71`	`69`	`finishEditing(true);`
`72`	`70`	`break;`
`@@ -182,12 +180,11 @@ private int toAbsoluteMouseY(double mouseY)`
`182`	`180`	`}`
`183`	`181`
`184`	`182`	`@Override`
`185`		`- public boolean onKeyPressed(KeyEvent event)`
	`183`	`+ public boolean onKeyPressed(int keyCode, int scanCode, int modifiers)`
`186`	`184`	`{`
`187`	`185`	`if(!editing)`
`188`	`186`	`return false;`
`189`	`187`
`190`		`- int keyCode = event.key();`
`191`	`188`	`if(keyCode == GLFW.GLFW_KEY_ENTER \|\| keyCode == GLFW.GLFW_KEY_KP_ENTER)`
`192`	`189`	`{`
`193`	`190`	`finishEditing(true);`
`@@ -200,13 +197,13 @@ public boolean onKeyPressed(KeyEvent event)`
`200`	`197`	`return true;`
`201`	`198`	`}`
`202`	`199`
`203`		`- return inlineField.keyPressed(event);`
	`200`	`+ return inlineField.keyPressed(keyCode, scanCode, modifiers);`
`204`	`201`	`}`
`205`	`202`
`206`	`203`	`@Override`
`207`		`- public boolean onCharTyped(CharacterEvent event)`
	`204`	`+ public boolean onCharTyped(char chr, int modifiers)`
`208`	`205`	`{`
`209`		`- return editing && inlineField.charTyped(event);`
	`206`	`+ return editing && inlineField.charTyped(chr, modifiers);`
`210`	`207`	`}`
`211`	`208`
`212`	`209`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@`
`15`	`15`	`import net.minecraft.client.gui.components.Button;`
`16`	`16`	`import net.minecraft.client.gui.components.Renderable;`
`17`	`17`	`import net.minecraft.client.gui.screens.Screen;`
`18`		`-import net.minecraft.client.input.KeyEvent;`
`19`		`-import net.minecraft.client.input.MouseButtonEvent;`
`20`	`18`	`import net.minecraft.network.chat.Component;`
`21`	`19`	`import net.minecraft.util.CommonColors;`
`22`	`20`	`import net.minecraft.util.Mth;`
`@@ -71,15 +69,15 @@ public void init()`
`71`	`69`	`}`
`72`	`70`
`73`	`71`	`@Override`
`74`		`- public boolean keyPressed(KeyEvent event)`
	`72`	`+ public boolean keyPressed(int keyCode, int scanCode, int modifiers)`
`75`	`73`	`{`
`76`		`- if(event.key() == GLFW.GLFW_KEY_ESCAPE)`
	`74`	`+ if(keyCode == GLFW.GLFW_KEY_ESCAPE)`
`77`	`75`	`{`
`78`	`76`	`cancelSelection();`
`79`	`77`	`return true;`
`80`	`78`	`}`
`81`	`79`
`82`		`- return super.keyPressed(event);`
	`80`	`+ return super.keyPressed(keyCode, scanCode, modifiers);`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`@Override`
`@@ -94,12 +92,8 @@ public boolean mouseScrolled(double mouseX, double mouseY,`
`94`	`92`	`}`
`95`	`93`
`96`	`94`	`@Override`
`97`		`- public boolean mouseClicked(MouseButtonEvent context, boolean doubleClick)`
	`95`	`+ public boolean mouseClicked(double mouseX, double mouseY, int button)`
`98`	`96`	`{`
`99`		`- double mouseX = context.x();`
`100`		`- double mouseY = context.y();`
`101`		`- int button = context.button();`
`102`		`-`
`103`	`97`	`if(button == GLFW.GLFW_MOUSE_BUTTON_LEFT)`
`104`	`98`	`{`
`105`	`99`	`if(mouseX >= listLeft && mouseX <= listRight && mouseY >= listTop`
`@@ -135,7 +129,7 @@ public boolean mouseClicked(MouseButtonEvent context, boolean doubleClick)`
`135`	`129`	`}`
`136`	`130`	`}`
`137`	`131`
`138`		`- return super.mouseClicked(context, doubleClick);`
	`132`	`+ return super.mouseClicked(mouseX, mouseY, button);`
`139`	`133`	`}`
`140`	`134`
`141`	`135`	`@Override`