Sneaking parity for all versions

Author: lowercasebtw

versions/1.20.1-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

@@ -10,6 +10,7 @@
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.entity.Entity;
 import net.minecraft.text.Text;
 import org.joml.Matrix4f;
 import org.polyfrost.polynametag.client.NametagRenderer;
@@ -25,25 +26,27 @@ public abstract class Mixin_ReplaceTextRendering {
             Text text,
             float x,
             float y,
-            int color,
+            int inColor,
             boolean shadow,
             Matrix4f matrix4f,
             VertexConsumerProvider vertexConsumerProvider,
             TextRenderer.TextLayerType textLayerType,
             int backgroundColor,
             int light,
             Operation<Integer> original,
-            @Local(argsOnly = true) MatrixStack matrixStack
+            @Local(argsOnly = true) MatrixStack matrixStack,
+            @Local(argsOnly = true) Entity entity
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrixStack), text.getString(), x, y, new OmniColor(ColorFormat.ARGB, color));
+            final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(entity.isSneaking() ? 32 : 255);
+            return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrixStack), text.getString(), x, y, color);
         } else {
             return original.call(
                     instance,
                     text,
                     x,
                     y,
-                    color,
+                    inColor,
                     shadow,
                     matrix4f,
                     vertexConsumerProvider,
@@ -53,4 +56,13 @@ public abstract class Mixin_ReplaceTextRendering {
             );
         }
     }
+
+    @WrapOperation(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;isSneaky()Z"))
+    private boolean polynametag$renderCustomTextWhilstSneaking(Entity instance, Operation<Boolean> original) {
+        if (PolyNametagConfig.isEnabled()) {
+            return false;
+        } else {
+            return original.call(instance);
+        }
+    }
 }

…rost/polynametag/LabelCommandMatrix.java …ost/polynametag/LabelCommandStorage.javaversions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/LabelCommandMatrix.java renamed to versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/LabelCommandStorage.java versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/LabelCommandMatrix.java renamed to versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/LabelCommandStorage.java

@@ -3,8 +3,12 @@
 import dev.deftu.omnicore.api.client.render.stack.OmniMatrixStack;
 import net.minecraft.client.util.math.MatrixStack;
 
-public interface LabelCommandMatrix {
+public interface LabelCommandStorage {
     OmniMatrixStack polynametag$getMatrixStack();
 
     void polynametag$setMatrixStack(MatrixStack matrixStack);
+
+    boolean polynametag$isSneaking();
+
+    void polynametag$setSneaking(boolean sneaking);
 }

versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ImplementLabelCommandMatrix.java

@@ -4,15 +4,18 @@
 import dev.deftu.omnicore.api.client.render.stack.OmniMatrixStacks;
 import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
 import net.minecraft.client.util.math.MatrixStack;
-import org.polyfrost.polynametag.LabelCommandMatrix;
+import org.polyfrost.polynametag.LabelCommandStorage;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 
 @Mixin(OrderedRenderCommandQueueImpl.LabelCommand.class)
-public abstract class Mixin_ImplementLabelCommandMatrix implements LabelCommandMatrix {
+public abstract class Mixin_ImplementLabelCommandMatrix implements LabelCommandStorage {
     @Unique
     private OmniMatrixStack polynametag$matrixStack = OmniMatrixStacks.create();
 
+    @Unique
+    private boolean polynametag$sneaking = false;
+
     @Override
     public OmniMatrixStack polynametag$getMatrixStack() {
         return polynametag$matrixStack;
@@ -22,4 +25,14 @@ public abstract class Mixin_ImplementLabelCommandMatrix implements LabelCommandM
     public void polynametag$setMatrixStack(MatrixStack matrixStack) {
         polynametag$matrixStack = OmniMatrixStacks.vanilla(matrixStack);
     }
+
+    @Override
+    public boolean polynametag$isSneaking() {
+        return polynametag$sneaking;
+    }
+
+    @Override
+    public void polynametag$setSneaking(boolean sneaking) {
+        polynametag$sneaking = sneaking;
+    }
 }

versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceBackgroundRendering.java

@@ -9,7 +9,7 @@
 import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
 import net.minecraft.text.Text;
 import org.joml.Matrix4f;
-import org.polyfrost.polynametag.LabelCommandMatrix;
+import org.polyfrost.polynametag.LabelCommandStorage;
 import org.polyfrost.polynametag.client.NametagRenderer;
 import org.polyfrost.polynametag.client.PolyNametagConfig;
 import org.spongepowered.asm.mixin.Mixin;
@@ -34,7 +34,7 @@ public abstract class Mixin_ReplaceBackgroundRendering {
             @Local OrderedRenderCommandQueueImpl.LabelCommand labelCommand
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            NametagRenderer.drawBackground(((LabelCommandMatrix) (Object) labelCommand).polynametag$getMatrixStack(), text);
+            NametagRenderer.drawBackground(((LabelCommandStorage) (Object) labelCommand).polynametag$getMatrixStack(), text);
         } else {
             original.call(
                     instance,

versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

@@ -11,7 +11,7 @@
 import net.minecraft.client.render.command.OrderedRenderCommandQueueImpl;
 import net.minecraft.text.Text;
 import org.joml.Matrix4f;
-import org.polyfrost.polynametag.LabelCommandMatrix;
+import org.polyfrost.polynametag.LabelCommandStorage;
 import org.polyfrost.polynametag.client.NametagRenderer;
 import org.polyfrost.polynametag.client.PolyNametagConfig;
 import org.spongepowered.asm.mixin.Mixin;
@@ -25,7 +25,7 @@ public abstract class Mixin_ReplaceTextRendering {
             Text text,
             float x,
             float y,
-            int color,
+            int inColor,
             boolean shadow,
             Matrix4f matrix4f,
             VertexConsumerProvider vertexConsumerProvider,
@@ -36,14 +36,16 @@ public abstract class Mixin_ReplaceTextRendering {
             @Local OrderedRenderCommandQueueImpl.LabelCommand labelCommand
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            NametagRenderer.drawNametagString(((LabelCommandMatrix) (Object) labelCommand).polynametag$getMatrixStack(), text.getString(), x, y, new OmniColor(ColorFormat.ARGB, color));
+            LabelCommandStorage labelCommandStorage = (LabelCommandStorage) (Object) labelCommand;
+            final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(labelCommandStorage.polynametag$isSneaking() ? 32 : 255);
+            NametagRenderer.drawNametagString(labelCommandStorage.polynametag$getMatrixStack(), text.getString(), x, y, color);
         } else {
             original.call(
                     instance,
                     text,
                     x,
                     y,
-                    color,
+                    inColor,
                     shadow,
                     matrix4f,
                     vertexConsumerProvider,

versions/1.21.10-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_SaveMatrixStackInLabelCommand.java

@@ -5,17 +5,41 @@
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.client.render.command.LabelCommandRenderer;
 import net.minecraft.client.util.math.MatrixStack;
-import org.polyfrost.polynametag.LabelCommandMatrix;
+import org.polyfrost.polynametag.LabelCommandStorage;
+import org.polyfrost.polynametag.client.PolyNametagConfig;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 import java.util.List;
 
 @Mixin(LabelCommandRenderer.Commands.class)
 public abstract class Mixin_SaveMatrixStackInLabelCommand {
+    @Unique
+    private boolean polynametag$sneaking = false;
+
     @WrapOperation(method = "add", at = @At(value = "INVOKE", target = "Ljava/util/List;add(Ljava/lang/Object;)Z"))
-    private <E> boolean polynametag$storeMatrixStack(List<E> instance, E labelCommand, Operation<Boolean> original, @Local(argsOnly = true) MatrixStack matrixStack) {
-        ((LabelCommandMatrix) labelCommand).polynametag$setMatrixStack(matrixStack);
+    private <E> boolean polynametag$storeMatrixStack(
+            List<E> instance,
+            E labelCommand,
+            Operation<Boolean> original,
+            @Local(argsOnly = true) MatrixStack matrixStack,
+            @Local(argsOnly = true) boolean notSneaking
+    ) {
+        ((LabelCommandStorage) labelCommand).polynametag$setMatrixStack(matrixStack);
+        ((LabelCommandStorage) labelCommand).polynametag$setSneaking(polynametag$sneaking);
         return original.call(instance, labelCommand);
     }
+
+    // Disable sneaking logic
+    @ModifyVariable(method = "add", at = @At("HEAD"), argsOnly = true)
+    private boolean polynametag$renderCustomTextWhilstSneaking(boolean original) {
+        if (PolyNametagConfig.isEnabled()) {
+            polynametag$sneaking = !original;
+            return true;
+        } else {
+            return original;
+        }
+    }
 }

versions/1.21.4-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

@@ -9,6 +9,7 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
+import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import org.joml.Matrix4f;
@@ -25,20 +26,43 @@ public abstract class Mixin_ReplaceTextRendering {
             Text text,
             float x,
             float y,
-            int color,
+            int inColor,
             boolean shadow,
-            Matrix4f matrix,
+            Matrix4f matrix4f,
             VertexConsumerProvider buffer,
             TextRenderer.TextLayerType textLayerType,
             int backgroundColor,
             int light,
             Operation<Integer> original,
-            @Local(argsOnly = true) MatrixStack matrices
+            @Local(argsOnly = true) MatrixStack matrices,
+            @Local(argsOnly = true) EntityRenderState entityRenderState
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrices), text.getString(), x, y, new OmniColor(ColorFormat.ARGB, color));
+            final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(entityRenderState.sneaking ? 32 : 255);
+            return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrices), text.getString(), x, y, color);
         } else {
-            return original.call(instance, text, x, y, color, shadow, matrix, buffer, textLayerType, backgroundColor, light);
+            return original.call(
+                    instance,
+                    text,
+                    x,
+                    y,
+                    inColor,
+                    shadow,
+                    matrix4f,
+                    buffer,
+                    textLayerType,
+                    backgroundColor,
+                    light
+            );
+        }
+    }
+
+    @WrapOperation(method = "renderLabelIfPresent", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/entity/state/EntityRenderState;sneaking:Z"))
+    private boolean polynametag$renderCustomTextWhilstSneaking(EntityRenderState instance, Operation<Boolean> original) {
+        if (PolyNametagConfig.isEnabled()) {
+            return false;
+        } else {
+            return original.call(instance);
         }
     }
 }

versions/1.21.8-fabric/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

@@ -9,6 +9,7 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderer;
+import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.text.Text;
 import org.joml.Matrix4f;
@@ -25,25 +26,27 @@ public abstract class Mixin_ReplaceTextRendering {
             Text text,
             float x,
             float y,
-            int color,
+            int inColor,
             boolean shadow,
             Matrix4f matrix4f,
             VertexConsumerProvider vertexConsumerProvider,
             TextRenderer.TextLayerType textLayerType,
             int backgroundColor,
             int light,
             Operation<Void> original,
-            @Local(argsOnly = true) MatrixStack matrices
+            @Local(argsOnly = true) MatrixStack matrices,
+            @Local(argsOnly = true) EntityRenderState entityRenderState
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrices), text.getString(), x, y, new OmniColor(ColorFormat.ARGB, color));
+            final OmniColor color = new OmniColor(ColorFormat.ARGB, inColor).withAlpha(entityRenderState.sneaking ? 32 : 255);
+            NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(matrices), text.getString(), x, y, color);
         } else {
             original.call(
                     instance,
                     text,
                     x,
                     y,
-                    color,
+                    inColor,
                     shadow,
                     matrix4f,
                     vertexConsumerProvider,
@@ -53,4 +56,13 @@ public abstract class Mixin_ReplaceTextRendering {
             );
         }
     }
+
+    @WrapOperation(method = "renderLabelIfPresent", at = @At(value = "FIELD", target = "Lnet/minecraft/client/render/entity/state/EntityRenderState;sneaking:Z"))
+    private boolean polynametag$renderCustomTextWhilstSneaking(EntityRenderState instance, Operation<Boolean> original) {
+        if (PolyNametagConfig.isEnabled()) {
+            return false;
+        } else {
+            return original.call(instance);
+        }
+    }
 }