Updated AltManager

Author: cev-api

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

@@ -64,6 +64,23 @@ public void edit(Alt oldAlt, String newNameOrEmail, String newPassword)
 				oldAlt.isFavorite()));
 	}
 
+	public void updateTokenAltName(TokenAlt tokenAlt, String newName)
+	{
+		if(tokenAlt == null)
+			return;
+		
+		for(Alt alt : alts)
+		{
+			if(alt != tokenAlt)
+				continue;
+			
+			tokenAlt.setName(newName);
+			sortAlts();
+			altsFile.save(this);
+			return;
+		}
+	}
+	
 	/**
 	 * Logs the user in with this Alt. Also updates the counter for checked alts
 	 * and saves the alt list file as necessary.

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

@@ -36,6 +36,12 @@ public final class AltRenderer
 	private static final ConcurrentHashMap<String, Identifier> onlineSkins =
 		new ConcurrentHashMap<>();
 
+	private static final ConcurrentHashMap<String, PlayerModelType> onlineModels =
+		new ConcurrentHashMap<>();
+	
+	private static final ConcurrentHashMap.KeySetView<String, Boolean> loadingSkins =
+		ConcurrentHashMap.newKeySet();
+	
 	private static final HashMap<String, Identifier> offlineSkins =
 		new HashMap<>();
 
@@ -46,15 +52,34 @@ private static Identifier getSkinTexture(String name)
 
 		Identifier offlineSkin = offlineSkins.get(name);
 		if(offlineSkin == null)
-		{
-			queueOnlineSkinLoading(name);
 			offlineSkin = loadOfflineSkin(name);
-		}
 
 		Identifier onlineSkin = onlineSkins.get(name);
+		if(onlineSkin == null)
+			queueOnlineSkinLoading(name);
+		
 		return onlineSkin != null ? onlineSkin : offlineSkin;
 	}
 
+	public static void refreshSkin(String name)
+	{
+		if(name == null || name.isBlank())
+			return;
+		
+		onlineSkins.remove(name);
+		onlineModels.remove(name);
+		loadingSkins.remove(name);
+		queueOnlineSkinLoading(name);
+	}
+	
+	public static boolean isSkinLoading(String name)
+	{
+		if(name == null || name.isBlank())
+			return false;
+		
+		return loadingSkins.contains(name);
+	}
+	
 	private static Identifier loadOfflineSkin(String name)
 	{
 		UUID uuid = UUIDUtil.createOfflinePlayerUUID(name);
@@ -67,6 +92,12 @@ private static Identifier loadOfflineSkin(String name)
 
 	private static void queueOnlineSkinLoading(String name)
 	{
+		if(name == null || name.isBlank())
+			return;
+		
+		if(!loadingSkins.add(name))
+			return;
+		
 		Minecraft mc = WurstClient.MC;
 
 		CompletableFuture.supplyAsync(() -> {
@@ -90,9 +121,17 @@ private static void queueOnlineSkinLoading(String name)
 		}, BACKGROUND_THREAD).thenAcceptAsync(skinTextures -> {
 
 			if(skinTextures != null)
+			{
 				onlineSkins.put(name, skinTextures.body().texturePath());
+				onlineModels.put(name, skinTextures.model());
+			}
 
-		}, BACKGROUND_THREAD);
+			loadingSkins.remove(name);
+			
+		}, BACKGROUND_THREAD).exceptionally(error -> {
+			loadingSkins.remove(name);
+			return null;
+		});
 	}
 
 	public static void drawAltFace(GuiGraphics context, String name, int x,
@@ -132,9 +171,7 @@ public static void drawAltBody(GuiGraphics context, String name, int x,
 		{
 			Identifier texture = getSkinTexture(name);
 
-			boolean slim =
-				DefaultPlayerSkin.get(UUIDUtil.createOfflinePlayerUUID(name))
-					.model() == PlayerModelType.SLIM;
+			boolean slim = getModelType(name) == PlayerModelType.SLIM;
 
 			// Face
 			x = x + width / 4;
@@ -271,9 +308,7 @@ public static void drawAltBack(GuiGraphics context, String name, int x,
 		{
 			Identifier texture = getSkinTexture(name);
 
-			boolean slim =
-				DefaultPlayerSkin.get(UUIDUtil.createOfflinePlayerUUID(name))
-					.model() == PlayerModelType.SLIM;
+			boolean slim = getModelType(name) == PlayerModelType.SLIM;
 
 			// Face
 			x = x + width / 4;
@@ -402,4 +437,14 @@ public static void drawAltBack(GuiGraphics context, String name, int x,
 			e.printStackTrace();
 		}
 	}
+	
+	private static PlayerModelType getModelType(String name)
+	{
+		PlayerModelType onlineModel = onlineModels.get(name);
+		if(onlineModel != null)
+			return onlineModel;
+		
+		return DefaultPlayerSkin.get(UUIDUtil.createOfflinePlayerUUID(name))
+			.model();
+	}
 }

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

@@ -105,30 +105,12 @@ public static void login(String email, String password)
 
 	public static void loginWithToken(String token) throws LoginException
 	{
-		if(token == null || token.isBlank())
-			throw new LoginException("Token cannot be empty.");
-		
-		String trimmedToken = token.trim();
 		System.out.println("Logging in with token...");
 		long startTime = System.nanoTime();
 
 		try
 		{
-			try
-			{
-				MinecraftProfile mcProfile = getMinecraftProfile(trimmedToken);
-				setSession(mcProfile);
-				System.out.println("Token login successful after "
-					+ (System.nanoTime() - startTime) / 1e6D + " ms");
-				return;
-				
-			}catch(LoginException ignored)
-			{
-				// Token may be a Microsoft token instead of a Minecraft token.
-			}
-			
-			MinecraftProfile mcProfile =
-				getAccountFromMicrosoftAccessToken(trimmedToken);
+			MinecraftProfile mcProfile = authenticateTokenWithoutSession(token);
 			setSession(mcProfile);
 			System.out.println("Token login successful after "
 				+ (System.nanoTime() - startTime) / 1e6D + " ms");
@@ -144,19 +126,13 @@ public static void loginWithToken(String token) throws LoginException
 	public static void loginWithRefreshToken(String refreshToken)
 		throws LoginException
 	{
-		if(refreshToken == null || refreshToken.isBlank())
-			throw new LoginException("Refresh token cannot be empty.");
-		
 		System.out.println("Logging in with refresh token...");
 		long startTime = System.nanoTime();
 
 		try
 		{
-			String msftAccessToken =
-				getMicrosoftAccessTokenFromRefreshToken(refreshToken.trim());
-			
 			MinecraftProfile mcProfile =
-				getAccountFromMicrosoftAccessToken(msftAccessToken);
+				authenticateRefreshTokenWithoutSession(refreshToken);
 			setSession(mcProfile);
 
 			System.out.println("Refresh-token login successful after "
@@ -170,6 +146,54 @@ public static void loginWithRefreshToken(String refreshToken)
 		}
 	}
 
+	public static MinecraftProfile authenticateTokenWithoutSession(String token)
+		throws LoginException
+	{
+		if(token == null || token.isBlank())
+			throw new LoginException("Token cannot be empty.");
+		
+		String trimmedToken = token.trim();
+		
+		try
+		{
+			return getMinecraftProfile(trimmedToken);
+			
+		}catch(LoginException ignored)
+		{
+			// Token may be a Microsoft token instead of a Minecraft token.
+		}
+		
+		return getAccountFromMicrosoftAccessToken(trimmedToken);
+	}
+	
+	public static MinecraftProfile authenticateRefreshTokenWithoutSession(
+		String refreshToken) throws LoginException
+	{
+		if(refreshToken == null || refreshToken.isBlank())
+			throw new LoginException("Refresh token cannot be empty.");
+		
+		String msftAccessToken =
+			getMicrosoftAccessTokenFromRefreshToken(refreshToken.trim());
+		return getAccountFromMicrosoftAccessToken(msftAccessToken);
+	}
+	
+	public static MinecraftProfile authenticateTokenAltWithoutSession(
+		String token, String refreshToken) throws LoginException
+	{
+		String trimmedRefresh = refreshToken == null ? "" : refreshToken.trim();
+		
+		if(!trimmedRefresh.isEmpty())
+			return authenticateRefreshTokenWithoutSession(trimmedRefresh);
+		
+		return authenticateTokenWithoutSession(token);
+	}
+	
+	public static MinecraftProfile getMinecraftProfileByAccessToken(
+		String mcAccessToken) throws LoginException
+	{
+		return getMinecraftProfile(mcAccessToken);
+	}
+	
 	private static MinecraftProfile getAccount(String email, String password)
 		throws LoginException
 	{