Updated to match 1.21.10 branch

Author: cev-api

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

@@ -12,9 +12,8 @@
 import org.lwjgl.glfw.GLFW;
 
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.input.MouseButtonEvent;
-import net.wurstclient.clickgui.ClickGuiIcons;
 import net.wurstclient.clickgui.ClickGui;
+import net.wurstclient.clickgui.ClickGuiIcons;
 import net.wurstclient.clickgui.Component;
 import net.wurstclient.settings.Setting;
 import net.wurstclient.settings.SettingGroup;
@@ -109,15 +108,13 @@ private boolean togglePopoutWindow()
 	}
 
 	@Override
-	public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
-		MouseButtonEvent context)
+	public void handleMouseClick(double mouseX, double mouseY, int mouseButton)
 	{
 		if(mouseButton != GLFW.GLFW_MOUSE_BUTTON_LEFT)
 		{
 			if(expanded)
 				for(Component child : childComponents)
-					child.handleMouseClick(mouseX, mouseY, mouseButton,
-						context);
+					child.handleMouseClick(mouseX, mouseY, mouseButton);
 			return;
 		}
 
@@ -162,7 +159,7 @@ public void handleMouseClick(double mouseX, double mouseY, int mouseButton,
 			if(mouseX < cx1 || mouseX > cx2 || mouseY < cy1 || mouseY > cy2)
 				continue;
 
-			child.handleMouseClick(mouseX, mouseY, mouseButton, context);
+			child.handleMouseClick(mouseX, mouseY, mouseButton);
 			break;
 		}
 	}

src/main/java/net/wurstclient/mixin/MultiplayerScreenMixin.java

@@ -58,23 +58,12 @@ private void onInit(CallbackInfo ci)
 				b -> LastServerRememberer.joinLastServer(mpScreen))
 			.width(100).build();
 		addRenderableWidget(lastServerButton);
+		
+		refreshCustomButtons();
 	}
 
-	@Inject(at = @At(value = "INVOKE",
-		target = "Lnet/minecraft/client/gui/screens/multiplayer/JoinMultiplayerScreen;repositionElements()V",
-		ordinal = 0), method = "init()V")
-	private void afterVanillaButtons(CallbackInfo ci,
-		@Local(ordinal = 1) LinearLayout footerTopRow,
-		@Local(ordinal = 2) LinearLayout footerBottomRow)
-	{
-		if(!WurstClient.INSTANCE.isEnabled())
-			return;
-		// Footer buttons are not added here to avoid duplicates; corner buttons
-		// are created/positioned in `repositionElements()` instead.
-	}
-	
-	@Inject(at = @At("TAIL"), method = "repositionElements()V")
-	private void onRefreshWidgetPositions(CallbackInfo ci)
+	@Unique
+	private void refreshCustomButtons()
 	{
 		updateLastServerButton();