From cb38639e11275a3e49e100a3c4590e4665dbff72 Mon Sep 17 00:00:00 2001
From: Klesti Selimaj <klesti.selimay@icloud.com>
Date: Wed, 8 Apr 2026 10:08:19 +0200
Subject: [PATCH] 1.21.11: Small stuff

---
 .../saturnclient/impl/cosmetics/CloakFeatureRenderer.java   | 6 +++---
 .../org/saturnclient/impl/cosmetics/HatFeatureRenderer.java | 4 ++--
 .../saturnclient/mixin/PlayerEntityRendererMixin.java       | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java b/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
index a52c331..ec3a287 100644
--- a/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
+++ b/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
@@ -288,7 +288,7 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
             return;
         }
 
-        SaturnPlayer player = SaturnPlayer.get(playerEntityRenderState.displayName.getString());
+        SaturnPlayer player = SaturnPlayer.get(playerEntityRenderState.playerName.getString());
 
         if (player == null) {
             return;
@@ -347,12 +347,12 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     @Override
     public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
             float limbAngle, float limbDistance) {
-        if (state.displayName == null || state.invisible || !state.capeVisible
+        if (state.playerName == null || state.invisible || !state.capeVisible
                 || state.skinTextures.cape() != null) {
             return;
         }
 
-        SaturnPlayer player = SaturnPlayer.get(state.displayName.getString());
+        SaturnPlayer player = SaturnPlayer.get(state.playerName.getString());
 
         if (player == null) {
             return;
diff --git a/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java b/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
index 35110ec..502d6de 100644
--- a/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
+++ b/versions/1.21.11/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
@@ -23,10 +23,10 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
     // @Override
     public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
             PlayerEntityRenderState state, float limbAngle, float limbDistance) {
-        if (state.displayName == null)
+        if (state.playerName == null)
             return;
 
-        SaturnPlayer player = SaturnPlayer.get(state.displayName.getString());
+        SaturnPlayer player = SaturnPlayer.get(state.playerName.getString());
 
         if (state.invisible || player == null || player.hat.isEmpty()) {
             return;
diff --git a/versions/1.21.11/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java b/versions/1.21.11/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
index 39ed555..5fb1533 100644
--- a/versions/1.21.11/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
+++ b/versions/1.21.11/src/main/java/org/saturnclient/saturnclient/mixin/PlayerEntityRendererMixin.java
@@ -41,7 +41,7 @@ public abstract class PlayerEntityRendererMixin
     @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
     protected void renderLabelIfPresent(PlayerEntityRenderState state, MatrixStack matrices,
             OrderedRenderCommandQueue queue, CameraRenderState cameraRenderState, CallbackInfo ci) {
-        if (state.displayName == null)
+        if (state.playerName == null || state.displayName == null)
             return;
 
         UUID uuid = isSaturn(state);
@@ -61,7 +61,7 @@ public abstract class PlayerEntityRendererMixin
 
     private UUID isSaturn(PlayerEntityRenderState state) {
         if (state instanceof PlayerEntityRenderState) {
-            String name = ((PlayerEntityRenderState) state).displayName.getString();
+            String name = ((PlayerEntityRenderState) state).playerName.getString();
             SaturnPlayer player = SaturnPlayer.get(name);
             if (player != null) {
                 return player.uuid;