Finish 1.21.10 and refactor prior mixins to be better

Author: lowercasebtw

src/main/kotlin/org/polyfrost/polynametag/client/NametagRenderer.kt

@@ -92,9 +92,9 @@ object NametagRenderer {
     //$$ @JvmStatic
     //$$ fun drawBackground(
     //$$     matrices: OmniMatrixStack,
-    //$$     entityRenderState: net.minecraft.client.render.entity.state.EntityRenderState,
+    //$$     displayName: net.minecraft.text.Text?,
     //$$ ) {
-    //$$     val displayName = entityRenderState.displayName ?: return
+    //$$     val displayName = displayName ?: return
     //$$     val halfWidth = OmniTextRenderer.width(displayName.string) / 2 + 1.0
     //$$     drawBackground(matrices, -halfWidth, halfWidth, 0.0F)
     //$$ }

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

@@ -13,7 +13,7 @@
 @Mixin(EntityRenderer.class)
 public abstract class Mixin_ReplaceBackgroundRendering<T extends Entity> {
     @WrapOperation(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;method_13427(Lnet/minecraft/client/font/TextRenderer;Ljava/lang/String;FFFIFFZZ)V", shift = At.Shift.BEFORE))
-    private void polynametag$cancelBegin(T entity, String text, double x, double y, double z, int maxDistance, Operation<Void> original) {
+    private void polynametag$renderCustomBackground(T entity, String text, double x, double y, double z, int maxDistance, Operation<Void> original) {
         if (PolyNametagConfig.isEnabled()) {
             NametagRenderer.drawBackground(OmniMatrixStacks.create(), entity);
         } else {

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

@@ -15,20 +15,10 @@
 @Mixin(EntityRenderer.class)
 public abstract class Mixin_ReplaceTextRendering<T extends Entity> {
     @Inject(method = "renderLabelIfPresent", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/GameRenderer;method_13427(Lnet/minecraft/client/font/TextRenderer;Ljava/lang/String;FFFIFFZZ)V"))
-    private void polynametag$replaceTextRendering(T entity, String text, double x, double y, double z, int maxDistance, CallbackInfo ci) {
+    private void polynametag$renderCustomText(T entity, String text, double x, double y, double z, int maxDistance, CallbackInfo ci) {
         if (PolyNametagConfig.isEnabled()) {
-            OmniColor color = OmniColors.WHITE;
-            if (entity.isSneaking()) {
-                color = color.withAlpha(32);
-            }
-
-            NametagRenderer.drawNametagString(
-                    OmniMatrixStacks.create(),
-                    text,
-                    (float) x,
-                    (float) y,
-                    color
-            );
+            final OmniColor color = OmniColors.WHITE.withAlpha(entity.isSneaking() ? 32 : 255);
+            NametagRenderer.drawNametagString(OmniMatrixStacks.create(), text, (float) x, (float) y, color);
         }
     }
 }

versions/1.16.5-forge/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceBackgroundRendering.java

@@ -18,53 +18,39 @@
 
 @Mixin(value = EntityRenderer.class, priority = 999)
 public abstract class Mixin_ReplaceBackgroundRendering<T extends Entity> {
-    @WrapOperation(
-            method = "renderNameTag",
-            at = @At(
-                    value = "INVOKE",
-                    //#if MC >= 1.20.1
-                    //$$ target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I",
-                    //#else
-                    target = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLcom/mojang/math/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;ZII)I",
-                    //#endif
-                    ordinal = 0
-            )
-    )
-    private int polynametag$cancelBegin(
+    @WrapOperation(method = "renderNameTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLcom/mojang/math/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;ZII)I", ordinal = 0))
+    private int polynametag$renderCustomBackground(
             Font instance,
-            Component arg,
-            float f,
-            float g,
-            int i,
-            boolean bl,
+            Component text,
+            float x,
+            float y,
+            int color,
+            boolean shadow,
             Matrix4f matrix4f,
-            MultiBufferSource bufferSource,
-            //#if MC >=1.20.1
-            //$$ TextRenderer.TextLayerType displayMode,
-            //#else
-            boolean displayMode,
-            //#endif
-            int x,
-            int y,
+            MultiBufferSource multiBufferSource,
+            boolean unknownArgument,
+            int backgroundColor,
+            int light,
             Operation<Integer> original,
-            @Local(argsOnly = true) PoseStack pose,
+            @Local(argsOnly = true) PoseStack poseStack,
             @Local(argsOnly = true) Entity entity
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            NametagRenderer.drawBackground(OmniMatrixStacks.vanilla(pose), entity);
+            NametagRenderer.drawBackground(OmniMatrixStacks.vanilla(poseStack), entity);
             return 0;
         } else {
             return original.call(
                     instance,
-                    arg,
-                    f,
-                    g,
-                    i,
-                    bl,
+                    text,
+                    x,
+                    y,
+                    color,
+                    shadow,
                     matrix4f,
-                    bufferSource,
-                    displayMode,
-                    x, y
+                    multiBufferSource,
+                    unknownArgument,
+                    backgroundColor,
+                    light
             );
         }
     }

versions/1.16.5-forge/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ReplaceTextRendering.java

@@ -1,5 +1,8 @@
 package org.polyfrost.polynametag.mixin.client;
 
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import dev.deftu.omnicore.api.client.render.stack.OmniMatrixStacks;
@@ -14,67 +17,38 @@
 import org.polyfrost.polynametag.client.PolyNametagConfig;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(EntityRenderer.class)
 public abstract class Mixin_ReplaceTextRendering<T extends Entity> {
-    @Redirect(
-            method = "renderNameTag",
-            at = @At(
-                    value = "INVOKE",
-                    //#if MC >=1.21.6
-                    //$$ target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;L;II)V"
-                    //#elseif MC >= 1.20.1
-                    //$$ target = "Lnet/minecraft/client/font/TextRenderer;draw(Lnet/minecraft/text/Text;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/client/font/TextRenderer$TextLayerType;II)I"
-                    //#else
-                    target = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLcom/mojang/math/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;ZII)I"
-                    //#endif
-            )
-    )
-    private int polynametag$replaceTextRendering(
+    @WrapOperation(method = "renderNameTag", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/Font;drawInBatch(Lnet/minecraft/network/chat/Component;FFIZLcom/mojang/math/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;ZII)I"))
+    private int polynametag$renderCustomText(
             Font instance,
-            Component content,
+            Component text,
             float x,
             float y,
             int color,
             boolean shadow,
-            Matrix4f matrix,
-            MultiBufferSource buffer,
-            //#if MC >= 1.20.1
-            //$$ TextRenderer.TextLayerType textLayerType,
-            //#else
-            boolean seeThrough,
-            //#endif
+            Matrix4f matrix4f,
+            MultiBufferSource multiBufferSource,
+            boolean unknownArgument,
             int backgroundColor,
             int light,
-            T entity,
-            Component displayName,
-            PoseStack matrices,
-            MultiBufferSource outerBuffers,
-            int outerPackedLight
+            Operation<Integer> original,
+            @Local(argsOnly = true) PoseStack poseStack
     ) {
         if (PolyNametagConfig.isEnabled()) {
-            return NametagRenderer.drawNametagString(
-                    OmniMatrixStacks.vanilla(matrices),
-                    content.getString(),
-                    x,
-                    y,
-                    new OmniColor(ColorFormat.ARGB, color)
-            );
+            return NametagRenderer.drawNametagString(OmniMatrixStacks.vanilla(poseStack), text.getString(), x, y, new OmniColor(ColorFormat.ARGB, color));
         } else {
-            return instance.drawInBatch(
-                    content,
+            return original.call(
+                    instance,
+                    text,
                     x,
                     y,
                     color,
                     shadow,
-                    matrix,
-                    buffer,
-                    //#if MC >= 1.20.1
-                    //$$ textLayerType,
-                    //#else
-                    seeThrough,
-                    //#endif
+                    matrix4f,
+                    multiBufferSource,
+                    unknownArgument,
                     backgroundColor,
                     light
             );

versions/1.16.5-forge/src/main/java/org/polyfrost/polynametag/mixin/client/Mixin_ShowInInventory.java

@@ -11,9 +11,6 @@
 import net.minecraft.world.entity.Entity;
 import org.polyfrost.polynametag.client.PolyNametagConfig;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(EntityRenderer.class)
 public abstract class Mixin_ShowInInventory<T extends Entity> {