From c8860ab837e9c47a3d64b6778762839e5bc14d55 Mon Sep 17 00:00:00 2001
From: Kr4ight <dhecxba@gmail.com>
Date: Tue, 7 Apr 2026 21:53:48 +0200
Subject: [PATCH] Running 1.21.9 #72

---
 .../features/mixins/misc/NametagsMixin.java   | 76 +++++++++----------
 .../saturnclient/mixin/NameTagMixin.java      |  2 +-
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java
index 8c1763d..0823c81 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/impl/features/mixins/misc/NametagsMixin.java
@@ -46,50 +46,50 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class NametagsMixin {
 
     /** Guards against the recursive call we make with the replacement text. */
-    @Unique
-    private static final ThreadLocal<Boolean> saturn$rendering = ThreadLocal.withInitial(() -> false);
+    // @Unique
+    // private static final ThreadLocal<Boolean> saturn$rendering = ThreadLocal.withInitial(() -> false);
 
-    @Shadow
-    protected abstract <S extends EntityRenderState> void renderLabelIfPresent(
-            S state, Text text,
-            MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light);
+    // @Shadow
+    // protected abstract <S extends EntityRenderState> void renderLabelIfPresent(
+    //         S state, Text text,
+    //         MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light);
 
-    @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
-    private <S extends EntityRenderState> void saturn$replaceNametag(
-            S state, Text text,
-            MatrixStack matrices, VertexConsumerProvider vertexConsumers,
-            int light, CallbackInfo ci) {
+    // @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
+    // private <S extends EntityRenderState> void saturn$replaceNametag(
+    //         S state, Text text,
+    //         MatrixStack matrices, VertexConsumerProvider vertexConsumers,
+    //         int light, CallbackInfo ci) {
 
-        // Skip our own recursive call
-        if (saturn$rendering.get())
-            return;
+    //     // Skip our own recursive call
+    //     if (saturn$rendering.get())
+    //         return;
 
-        if (!NametagsMod.shouldReplaceName())
-            return;
+    //     if (!NametagsMod.shouldReplaceName())
+    //         return;
 
-        // Only living entities carry health data
-        if (!(state instanceof LivingEntityRenderState living))
-            return;
-        if (!(living instanceof HealthRenderState hrs))
-            return;
+    //     // Only living entities carry health data
+    //     if (!(state instanceof LivingEntityRenderState living))
+    //         return;
+    //     if (!(living instanceof HealthRenderState hrs))
+    //         return;
 
-        // Build the platform-neutral EntityState from the render-state snapshot
-        // (health/type were written by LivingEntityRendererMixin at extract time).
-        String customName = text != null ? text.getString() : null;
-        EntityFeatureImpl.RenderStateEntityState entityState = new EntityFeatureImpl.RenderStateEntityState(
-                customName, hrs);
+    //     // Build the platform-neutral EntityState from the render-state snapshot
+    //     // (health/type were written by LivingEntityRendererMixin at extract time).
+    //     String customName = text != null ? text.getString() : null;
+    //     EntityFeatureImpl.RenderStateEntityState entityState = new EntityFeatureImpl.RenderStateEntityState(
+    //             customName, hrs);
 
-        // Ask the feature for the replacement string
-        String replacement = NametagsMod.getNametagString(entityState);
-        if (replacement == null)
-            return; // feature decided not to replace this entity
+    //     // Ask the feature for the replacement string
+    //     String replacement = NametagsMod.getNametagString(entityState);
+    //     if (replacement == null)
+    //         return; // feature decided not to replace this entity
 
-        ci.cancel();
-        saturn$rendering.set(true);
-        try {
-            renderLabelIfPresent(state, Text.literal(replacement), matrices, vertexConsumers, light);
-        } finally {
-            saturn$rendering.set(false);
-        }
-    }
+    //     ci.cancel();
+    //     saturn$rendering.set(true);
+    //     try {
+    //         renderLabelIfPresent(state, Text.literal(replacement), matrices, vertexConsumers, light);
+    //     } finally {
+    //         saturn$rendering.set(false);
+    //     }
+    // }
 }
diff --git a/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java b/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
index a6d755a..064c111 100644
--- a/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
+++ b/versions/1.21.9/src/main/java/org/saturnclient/saturnclient/mixin/NameTagMixin.java
@@ -32,7 +32,7 @@ public abstract class NameTagMixin<S extends EntityRenderState> {
      * @reason Adds the Saturn Client icon to the player's name if they are online
      *         with Saturn Client
      */
-    @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)
+    @Inject(method = "renderLabelIfPresent", at = @At("HEAD"), cancellable = true)
     protected void renderLabelIfPresent(S state, MatrixStack matrices, OrderedRenderCommandQueue queue,
             CameraRenderState cameraRenderState, CallbackInfo ci) {
         UUID uuid = isSaturn(state);