Merge upstream commit 8634ddf into master (resolved conflicts)

Author: cev-api

build.gradle

@@ -29,15 +29,15 @@ repositories {
 // Override vulnerable dependencies until Minecraft updates to newer versions
 configurations.all {
 	resolutionStrategy {
-		// v2.5.1, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2024-57699
+		// v2.5.1, used by Minecraft 1.21.4 - 1.21.9, is vulnerable to CVE-2024-57699
 		force "net.minidev:json-smart:2.5.2"
-		// v2.13.4, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-52999
+		// v2.13.4, used by Minecraft 1.21.4 - 1.21.9, is vulnerable to CVE-2025-52999
 		force "com.fasterxml.jackson.core:jackson-core:2.15.0"
-		// v3.17.0, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-48924
+		// v3.17.0, used by Minecraft 1.21.4 - 1.21.9, is vulnerable to CVE-2025-48924
 		force "org.apache.commons:commons-lang3:3.18.0"
-		// v9.40, used by Minecraft 1.21.4 - 1.21.8, is vulnerable to CVE-2025-53864
+		// v9.40, used by Minecraft 1.21.4 - 1.21.9, is vulnerable to CVE-2025-53864
 		force "com.nimbusds:nimbus-jose-jwt:10.0.2"
-		// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.8, is vulnerable to CVE-2025-58057
+		// v4.1.118.Final, used by Minecraft 1.21.5 - 1.21.9, is vulnerable to CVE-2025-58057
 		force "io.netty:netty-codec:4.1.125.Final"
 	}
 }

gradle.properties

@@ -1,27 +1,27 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
-org.gradle.parallel=true
-org.gradle.configuration-cache=true
-
-# Fabric Properties
-# check these at https://fabricmc.net/develop/ and
-# https://modrinth.com/mod/fabric-api/versions
-minecraft_version=1.21.8
-yarn_mappings=1.21.8+build.1
-loader_version=0.17.2
-loom_version=1.11-SNAPSHOT
-
-# Fabric API
-fabric_version=0.133.4+1.21.8
-
-# Mod Properties
-mod_version=v7.50.2-MC1.21.8
-maven_group=net.wurstclient
-archives_base_name=Wurst-Client
-mod_loader=Fabric
-
-# GitHub
-gh_repo_id=Wurst-Imperium/Wurst7
-mcx_repo_id=Wurst-Imperium/Wurst-MCX2
-
-# Dependencies
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx2G
+org.gradle.parallel=true
+org.gradle.configuration-cache=true
+
+# Fabric Properties
+# check these at https://fabricmc.net/develop/ and
+# https://modrinth.com/mod/fabric-api/versions
+minecraft_version=1.21.9
+yarn_mappings=1.21.9+build.1
+loader_version=0.17.2
+loom_version=1.11-SNAPSHOT
+
+# Fabric API
+fabric_version=0.133.14+1.21.9
+
+# Mod Properties
+mod_version=v7.50.2-MC1.21.9
+maven_group=net.wurstclient
+archives_base_name=Wurst-Client
+mod_loader=Fabric
+
+# GitHub
+gh_repo_id=Wurst-Imperium/Wurst7
+mcx_repo_id=Wurst-Imperium/Wurst-MCX2
+
+# Dependencies

src/main/java/net/wurstclient/WurstClient.java

@@ -51,7 +51,7 @@ public enum WurstClient
 	public static IMinecraftClient IMC;
 
 	public static final String VERSION = "7.50.2";
-	public static final String MC_VERSION = "1.21.8";
+	public static final String MC_VERSION = "1.21.9";
 
 	private PlausibleAnalytics plausible;
 	private EventManager eventManager;

src/main/java/net/wurstclient/ai/FlyPathProcessor.java

@@ -30,8 +30,8 @@ public FlyPathProcessor(ArrayList<PathPos> path, boolean creativeFlying)
 	public void process()
 	{
 		// get positions
-		BlockPos pos = BlockPos.ofFloored(MC.player.getPos());
-		Vec3d posVec = MC.player.getPos();
+		BlockPos pos = BlockPos.ofFloored(MC.player.getEntityPos());
+		Vec3d posVec = MC.player.getEntityPos();
 		BlockPos nextPos = path.get(index);
 		int posIndex = path.indexOf(pos);
 		Box nextBox = new Box(nextPos.getX() + 0.3, nextPos.getY(),
@@ -113,7 +113,7 @@ public void process()
 		// horizontal movement
 		if(horizontal)
 		{
-			if(!creativeFlying && MC.player.getPos().distanceTo(
+			if(!creativeFlying && MC.player.getEntityPos().distanceTo(
 				vecInPos) <= WURST.getHax().flightHack.horizontalSpeed
 					.getValue())
 			{
@@ -132,7 +132,7 @@ else if(posVec.y < nextBox.minY)
 			// vertical movement
 		}else if(y)
 		{
-			if(!creativeFlying && MC.player.getPos().distanceTo(
+			if(!creativeFlying && MC.player.getEntityPos().distanceTo(
 				vecInPos) <= WURST.getHax().flightHack.verticalSpeed.getValue())
 			{
 				MC.player.setPosition(vecInPos.x, vecInPos.y, vecInPos.z);

src/main/java/net/wurstclient/ai/PathFinder.java

@@ -61,7 +61,7 @@ public PathFinder(BlockPos goal)
 			start = new PathPos(BlockPos.ofFloored(MC.player.getX(),
 				MC.player.getY() + 0.5, MC.player.getZ()));
 		else
-			start = new PathPos(BlockPos.ofFloored(MC.player.getPos()));
+			start = new PathPos(BlockPos.ofFloored(MC.player.getEntityPos()));
 		this.goal = goal;
 
 		costMap.put(start, 0F);

src/main/java/net/wurstclient/ai/WalkPathProcessor.java

@@ -36,7 +36,7 @@ public void process()
 				WurstClient.MC.player.getY() + 0.5,
 				WurstClient.MC.player.getZ());
 		else
-			pos = BlockPos.ofFloored(WurstClient.MC.player.getPos());
+			pos = BlockPos.ofFloored(WurstClient.MC.player.getEntityPos());
 		PathPos nextPos = path.get(index);
 		int posIndex = path.indexOf(pos);
 

src/main/java/net/wurstclient/altmanager/AltRenderer.java

@@ -23,7 +23,8 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.network.PlayerListEntry;
 import net.minecraft.client.util.DefaultSkinHelper;
-import net.minecraft.client.util.SkinTextures;
+import net.minecraft.entity.player.PlayerSkinType;
+import net.minecraft.entity.player.SkinTextures;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Uuids;
 import net.wurstclient.WurstClient;
@@ -60,7 +61,7 @@ private static Identifier loadOfflineSkin(String name)
 		UUID uuid = Uuids.getOfflinePlayerUuid(name);
 		GameProfile profile = new GameProfile(uuid, name);
 		PlayerListEntry entry = new PlayerListEntry(profile, false);
-		Identifier texture = entry.getSkinTextures().texture();
+		Identifier texture = entry.getSkinTextures().body().texturePath();
 		offlineSkins.put(name, texture);
 		return texture;
 	}
@@ -73,7 +74,7 @@ private static void queueOnlineSkinLoading(String name)
 
 			UUID uuid = SkinStealer.getUUIDOrNull(name);
 			ProfileResult result =
-				mc.getSessionService().fetchProfile(uuid, false);
+				mc.getApiServices().sessionService().fetchProfile(uuid, false);
 
 			return result == null ? null : result.profile();
 
@@ -90,7 +91,7 @@ private static void queueOnlineSkinLoading(String name)
 		}, BACKGROUND_THREAD).thenAcceptAsync(skinTextures -> {
 
 			if(skinTextures != null)
-				onlineSkins.put(name, skinTextures.texture());
+				onlineSkins.put(name, skinTextures.body().texturePath());
 
 		}, BACKGROUND_THREAD);
 	}
@@ -134,7 +135,7 @@ public static void drawAltBody(DrawContext context, String name, int x,
 
 			boolean slim = DefaultSkinHelper
 				.getSkinTextures(Uuids.getOfflinePlayerUuid(name))
-				.model() == SkinTextures.Model.SLIM;
+				.model() == PlayerSkinType.SLIM;
 
 			// Face
 			x = x + width / 4;
@@ -273,7 +274,7 @@ public static void drawAltBack(DrawContext context, String name, int x,
 
 			boolean slim = DefaultSkinHelper
 				.getSkinTextures(Uuids.getOfflinePlayerUuid(name))
-				.model() == SkinTextures.Model.SLIM;
+				.model() == PlayerSkinType.SLIM;
 
 			// Face
 			x = x + width / 4;

src/main/java/net/wurstclient/altmanager/LoginManager.java

@@ -21,7 +21,7 @@ public static void changeCrackedName(String newName)
 	{
 		Session session =
 			new Session(newName, Uuids.getOfflinePlayerUuid(newName), "",
-				Optional.empty(), Optional.empty(), Session.AccountType.MOJANG);
+				Optional.empty(), Optional.empty());
 
 		WurstClient.IMC.setWurstSession(session);
 	}

src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java

@@ -103,8 +103,7 @@ public static void login(String email, String password)
 		MinecraftProfile mcProfile = getAccount(email, password);
 
 		Session session = new Session(mcProfile.getName(), mcProfile.getUUID(),
-			mcProfile.getAccessToken(), Optional.empty(), Optional.empty(),
-			Session.AccountType.MSA);
+			mcProfile.getAccessToken(), Optional.empty(), Optional.empty());
 
 		WurstClient.IMC.setWurstSession(session);
 	}

src/main/java/net/wurstclient/altmanager/screens/AltEditorScreen.java

@@ -16,11 +16,13 @@
 
 import org.lwjgl.glfw.GLFW;
 
+import net.minecraft.client.gui.Click;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.Drawable;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.input.KeyInput;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
@@ -66,12 +68,9 @@ public final void init()
 		passwordBox = new TextFieldWidget(textRenderer, width / 2 - 100, 100,
 			200, 20, Text.literal(""));
 		passwordBox.setText(getDefaultPassword());
-		passwordBox.setRenderTextProvider((text, int_1) -> {
-			String stars = "";
-			for(int i = 0; i < text.length(); i++)
-				stars += "*";
-			return OrderedText.styledForwardsVisitedString(stars, Style.EMPTY);
-		});
+		passwordBox.addFormatter(
+			(text, startIndex) -> OrderedText.styledForwardsVisitedString(
+				"*".repeat(text.length()), Style.EMPTY));
 		passwordBox.setMaxLength(256);
 		addSelectableChild(passwordBox);
 
@@ -203,30 +202,30 @@ private final String stealSkin(String name)
 	}
 
 	@Override
-	public boolean keyPressed(int keyCode, int scanCode, int int_3)
+	public boolean keyPressed(KeyInput context)
 	{
-		if(keyCode == GLFW.GLFW_KEY_ENTER)
-			doneButton.onPress();
+		if(context.key() == GLFW.GLFW_KEY_ENTER)
+			doneButton.onPress(context);
 
-		return super.keyPressed(keyCode, scanCode, int_3);
+		return super.keyPressed(context);
 	}
 
 	@Override
-	public boolean mouseClicked(double x, double y, int button)
+	public boolean mouseClicked(Click context, boolean doubleClick)
 	{
-		nameOrEmailBox.mouseClicked(x, y, button);
-		passwordBox.mouseClicked(x, y, button);
+		nameOrEmailBox.mouseClicked(context, doubleClick);
+		passwordBox.mouseClicked(context, doubleClick);
 
 		if(nameOrEmailBox.isFocused() || passwordBox.isFocused())
 			message = "";
 
-		if(button == GLFW.GLFW_MOUSE_BUTTON_4)
+		if(context.button() == GLFW.GLFW_MOUSE_BUTTON_4)
 		{
 			close();
 			return true;
 		}
 
-		return super.mouseClicked(x, y, button);
+		return super.mouseClicked(context, doubleClick);
 	}
 
 	@Override