From 243275b41457346650ba94df7fe2d4a4396ce1c0 Mon Sep 17 00:00:00 2001
From: Kr4ight <dhecxba@gmail.com>
Date: Tue, 7 Apr 2026 21:32:22 +0200
Subject: [PATCH] Fix 2

---
 .../impl/cosmetics/CloakFeatureRenderer.java        | 11 +++++++++--
 .../impl/cosmetics/HatFeatureRenderer.java          | 10 ++++++++--
 .../impl/mixins/MinecraftClientMixin.java           |  4 ++--
 .../org/saturnclient/impl/mixins/TextMixin.java     |  4 +++-
 .../org/saturnclient/impl/ui/EntityDrawerImpl.java  | 13 ++++++-------
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
index 54ce803..aea5585 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/CloakFeatureRenderer.java
@@ -11,6 +11,7 @@ import org.saturnclient.impl.cosmetics.utils.ShaderUtils;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.equipment.EquipmentModel;
 import net.minecraft.client.render.entity.equipment.EquipmentModelLoader;
 import net.minecraft.client.render.entity.equipment.EquipmentModel.LayerType;
@@ -273,11 +274,11 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
     public void render(MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int light,
             PlayerEntityRenderState playerEntityRenderState, float f, float g) {
         if (playerEntityRenderState.invisible || !playerEntityRenderState.capeVisible
-                || playerEntityRenderState.skinTextures.capeTexture() != null) {
+                || playerEntityRenderState.skinTextures.cape() != null) {
             return;
         }
 
-        SaturnPlayer player = SaturnPlayer.get(playerEntityRenderState.name);
+        SaturnPlayer player = SaturnPlayer.get(playerEntityRenderState.displayName.getString());
 
         if (player == null) {
             return;
@@ -332,4 +333,10 @@ public class CloakFeatureRenderer extends FeatureRenderer<PlayerEntityRenderStat
 
         matrixStack.pop();
     }
+
+    @Override
+    public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
+            float limbAngle, float limbDistance) {
+
+    }
 }
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
index cce3ec2..4c4a3e0 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/cosmetics/HatFeatureRenderer.java
@@ -7,6 +7,7 @@ import org.saturnclient.impl.cosmetics.obj.ObjModel;
 
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.feature.FeatureRenderer;
 import net.minecraft.client.render.entity.feature.FeatureRendererContext;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
@@ -19,10 +20,10 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
         super(context);
     }
 
-    @Override
+    // @Override
     public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light,
             PlayerEntityRenderState state, float limbAngle, float limbDistance) {
-        SaturnPlayer player = SaturnPlayer.get(state.name);
+        SaturnPlayer player = SaturnPlayer.get(state.displayName.getString());
 
         if (state.invisible || player == null || player.hat.isEmpty()) {
             return;
@@ -39,4 +40,9 @@ public class HatFeatureRenderer extends FeatureRenderer<PlayerEntityRenderState,
 
         matrices.pop();
     }
+
+    @Override
+    public void render(MatrixStack matrices, OrderedRenderCommandQueue queue, int light, PlayerEntityRenderState state,
+            float limbAngle, float limbDistance) {
+    }
 }
\ No newline at end of file
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java
index b0a269a..bf6bc27 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/MinecraftClientMixin.java
@@ -141,7 +141,7 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
         if (entry == null)
             return null;
 
-        return entry.getProfile().getName();
+        return entry.getProfile().name();
     }
 
     @Override
@@ -157,6 +157,6 @@ public abstract class MinecraftClientMixin implements MinecraftClientRef {
         if (entry == null)
             return null;
 
-        return entry.getProfile().getId();
+        return entry.getProfile().id();
     }
 }
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/TextMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/TextMixin.java
index 3e1a8b8..01dd4bc 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/TextMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/mixins/TextMixin.java
@@ -14,7 +14,9 @@ public interface TextMixin extends TextRef {
 
     @Override
     public default TextRef withFont(IdentifierRef font) {
-        return (TextRef) (((Text) this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font)));
+        // return (TextRef) (((Text)
+        // this).copy().setStyle(Style.EMPTY.withFont((Identifier) (Object) font)));
+        return this;
     }
 
     @Override
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java
index c2bfe84..7fa86bd 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/ui/EntityDrawerImpl.java
@@ -8,7 +8,6 @@ import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.components.SkinPreview.EntityDrawer;
 
-import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.entity.LivingEntity;
@@ -59,12 +58,12 @@ public class EntityDrawerImpl implements EntityDrawer {
     public static void drawEntity(RenderScope renderScope, int x1, int y1, int x2, int y2, float scale,
             Vector3f translation, Quaternionf rotation, @Nullable Quaternionf overrideCameraAngle,
             LivingEntity entity) {
-        EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
-        EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(entity);
-        EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(entity, 1.0F);
-        entityRenderState.hitbox = null;
+        // EntityRenderDispatcher entityRenderDispatcher = SaturnClient.client.getEntityRenderDispatcher();
+        // EntityRenderer<? super LivingEntity, ?> entityRenderer = entityRenderDispatcher.getRenderer(entity);
+        // EntityRenderState entityRenderState = entityRenderer.getAndUpdateRenderState(entity, 1.0F);
+        // entityRenderState.hitbox = null;
 
-        if (renderScope instanceof RenderScopeImpl i)
-            i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
+        // if (renderScope instanceof RenderScopeImpl i)
+        //     i.addEntity(entityRenderState, scale, translation, rotation, overrideCameraAngle, x1, y1, x2, y2);
     }
 }