added name tags

src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java

@@ -7,6 +7,7 @@ import org.saturnclient.ui.SaturnUi;
 import org.saturnclient.ui.Textures;
 import org.saturnclient.ui.animations.FadeIn;
 
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.ColorHelper;
 
@@ -51,6 +52,23 @@ public class SaturnClientConfig {
         return realisticLogo.value ? "" : "";
     }
 
+    /*
+     * Gets the icon color of a specific individual, here are the different colors
+     * 
+     * - Owner: Dark Red
+     * - Admin: Red
+     * - Partners: Gold
+     * - Contributor: Aqua
+     * - Other/player: White
+    */
+    public static Formatting getIconColor(String uuid) {
+        if (uuid.equals("d362a04228bd49e1a807ae74dbe8aba9")) {
+            return Formatting.DARK_RED; // Owner
+        }
+
+        return Formatting.WHITE;
+    }
+
     public static void init() {
         config = new ConfigManager("Saturn Client");
 

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

@@ -9,6 +9,7 @@ import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Vec3d;
@@ -35,43 +36,32 @@ public abstract class NameTagMixin<S extends EntityRenderState> {
     @Inject(method = "renderLabelIfPresent(Lnet/minecraft/client/render/entity/state/EntityRenderState;Lnet/minecraft/text/Text;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;I)V", at = @At("HEAD"), cancellable = true)
     private void onRenderLabelIfPresent(S state, Text text, MatrixStack matrices,
             VertexConsumerProvider vertexConsumers, int light, CallbackInfo ci) {
-        if (isSaturn(state)) {
+
-            renderLabel(state, Text.literal(SaturnClientConfig.getSaturnIndicator()).formatted(getIconColor(state)).append(text.copy().withColor(-1)), matrices,
+        String uuid = isSaturn(state);
+
+        if (uuid != null) {
+            MutableText iconText = Text.literal(SaturnClientConfig.getSaturnIndicator())
+            .styled(style -> style.withColor(SaturnClientConfig.getIconColor(uuid)));
+        
+            Text nameText = text.copy().styled(style -> style.withColor(Formatting.WHITE));
+
+            renderLabel(state, iconText.append(nameText), matrices,
                     vertexConsumers, light);
+
             ci.cancel();
         }
     }
 
-    private boolean isSaturn(S state) {
+    private String isSaturn(S state) {
         if (state instanceof PlayerEntityRenderState) {
             String name = ((PlayerEntityRenderState) state).name;
             String uuid = Auth.playerNames.get(name);
-            return uuid != null && Auth.players.containsKey(uuid);
+            if (Auth.players.containsKey(uuid)) {
-        }
+                return uuid;
-        return false;
-    }
-
-    /*
-     * Gets the icon color of a specific individual, here are the different colors
-     * 
-     * - Owner: Dark Red
-     * - Admin: Red
-     * - Partners: Gold
-     * - Contributor: Aqua
-     * - Other/player: White
-    */
-    private Formatting getIconColor(S state) {
-        if (state instanceof PlayerEntityRenderState) {
-            PlayerEntityRenderState playerState = ((PlayerEntityRenderState) state);
-
-            if (playerState.name == "HexLeo") {
-                return Formatting.DARK_RED; // Owner
-            } else {
-                return Formatting.WHITE;
             }
         }
 
-        return Formatting.WHITE;
+        return null;
     }
 
     private void renderLabel(S state, Text text, MatrixStack matrices,

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

@@ -1,6 +1,7 @@
 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;
 
@@ -31,23 +32,11 @@ public abstract class TabListMixin {
         String name = profile.getName();
         String uuid = profile.getId().toString().replaceAll("-", "");
 
-        return Auth.players.containsKey(uuid) ? Text.literal(SaturnClientConfig.getSaturnIndicator()).formatted(getIconColor(name)).append(Text.literal(name).withColor(-1)) : Text.literal(name);
+        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);
-     * Gets the icon color of a specific individual, here are the different colors
-     * 
-     * - Owner: Dark Red
-     * - Admin: Red
-     * - Partners: Gold
-     * - Contributor: Aqua
-     * - Other/player: White
-    */
-    private Formatting getIconColor(String name) {
-        if (name == "HexLeo") {
-            return Formatting.DARK_RED; // Owner
-        } else {
-            return Formatting.WHITE;
-        }
     }
 }