From 44fe425139ef64eebe512c61cfe8b66ee839056f Mon Sep 17 00:00:00 2001 From: ThisTestUser Date: Fri, 4 Oct 2024 16:29:04 +0000 Subject: [PATCH] ProfileKeys fix --- .../altmanager/MicrosoftLoginManager.java | 2 +- .../wurstclient/mixin/MinecraftClientMixin.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java b/src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java index 2d4acab168..244da40080 100644 --- a/src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java +++ b/src/main/java/net/wurstclient/altmanager/MicrosoftLoginManager.java @@ -104,7 +104,7 @@ public static void login(String email, String password) Session session = new Session(mcProfile.getName(), mcProfile.getUUID(), mcProfile.getAccessToken(), Optional.empty(), Optional.empty(), - Session.AccountType.MOJANG); + Session.AccountType.MSA); WurstClient.IMC.setSession(session); } diff --git a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java b/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java index 50c6320935..f1434baedb 100644 --- a/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java +++ b/src/main/java/net/wurstclient/mixin/MinecraftClientMixin.java @@ -8,7 +8,6 @@ package net.wurstclient.mixin; import java.io.File; -import java.util.UUID; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -27,7 +26,6 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.client.network.ClientPlayerInteractionManager; import net.minecraft.client.session.ProfileKeys; -import net.minecraft.client.session.ProfileKeysImpl; import net.minecraft.client.session.Session; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; @@ -59,7 +57,7 @@ public abstract class MinecraftClientMixin private YggdrasilAuthenticationService authenticationService; private Session wurstSession; - private ProfileKeysImpl wurstProfileKeys; + private ProfileKeys wurstProfileKeys; private MinecraftClientMixin(WurstClient wurst, String name) { @@ -213,10 +211,12 @@ public void setSession(Session session) { wurstSession = session; - UserApiService userApiService = authenticationService - .createUserApiService(session.getAccessToken()); - UUID uuid = wurstSession.getUuidOrNull(); + UserApiService userApiService = + session.getAccountType() == Session.AccountType.MSA + ? authenticationService.createUserApiService( + session.getAccessToken()) + : UserApiService.OFFLINE; wurstProfileKeys = - new ProfileKeysImpl(userApiService, uuid, runDirectory.toPath()); + ProfileKeys.create(userApiService, session, runDirectory.toPath()); } }