TabList

src/main/java/org/saturnclient/saturnclient/event/KeyInputHandler.java

@@ -7,6 +7,7 @@ import net.minecraft.client.util.InputUtil;
 
 import org.saturnclient.saturnclient.SaturnClient;
 import org.saturnclient.saturnclient.SaturnClientConfig;
+import org.saturnclient.saturnclient.client.ServiceClient;
 import org.saturnclient.ui2.screens.EmoteWheel;
 import org.saturnclient.ui2.screens.ShiftMenu;
 
@@ -46,7 +47,7 @@ public class KeyInputHandler {
                 AnimationStack animationStack = PlayerAnimationAccess.getPlayerAnimLayer(SaturnClient.client.player);
                 if (animationStack.isActive() && animationStack.getPriority() == 1000) {
                     animationStack.removeLayer(1000);
-                    Auth.emote("");
+                    ServiceClient.emote("");
                 }
             }
         });

src/main/java/org/saturnclient/saturnclient/mixin/TabListMixin.java

@@ -1,13 +1,14 @@
 package org.saturnclient.saturnclient.mixin;
 
 import net.minecraft.client.network.PlayerListEntry;
-import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 
+import java.util.UUID;
+
 import org.jetbrains.annotations.Nullable;
 import org.saturnclient.saturnclient.SaturnClientConfig;
-import org.saturnclient.saturnclient.auth.Auth;
+import org.saturnclient.saturnclient.client.player.SaturnPlayer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
@@ -30,13 +31,13 @@ public abstract class TabListMixin {
     public Text getDisplayName() {
         GameProfile profile = ((PlayerListEntry) (Object) this).getProfile();
         String name = profile.getName();
-        String uuid = profile.getId().toString().replaceAll("-", "");
+        UUID uuid = profile.getId();
 
-        MutableText iconText = Text.literal(SaturnClientConfig.getSaturnIndicator())
-            .styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid)));
-        
-        Text nameText = Text.literal(name).styled(style -> style.withColor(Formatting.WHITE));
-
-        return Auth.players.containsKey(uuid) ? iconText.append(nameText) : Text.literal(name);
+        if (SaturnPlayer.get(uuid) != null) {
+            return Text.literal(SaturnClientConfig.getSaturnIndicator())
+                    .styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid)))
+                    .append(Text.literal(name).styled(style -> style.withColor(Formatting.WHITE)));
+        }
+        return Text.literal(name);
     }
 }