From 8e6eec879f149d7bc612c0abc854d8e01e90db63 Mon Sep 17 00:00:00 2001
From: johni0702 <me@johni0702.de>
Date: Sat, 24 Sep 2016 17:11:25 +0200
Subject: [PATCH] Fix name tag hiding during redering (fixes #10)

---
 .../replaymod/render/mixin/MixinRender.java   |  7 +++----
 .../render/mixin/MixinRenderLiving.java       | 21 -------------------
 .../resources/mixins.render.replaymod.json    |  1 -
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/java/com/replaymod/render/mixin/MixinRenderLiving.java

diff --git a/src/main/java/com/replaymod/render/mixin/MixinRender.java b/src/main/java/com/replaymod/render/mixin/MixinRender.java
index f29678b8..898f7140 100644
--- a/src/main/java/com/replaymod/render/mixin/MixinRender.java
+++ b/src/main/java/com/replaymod/render/mixin/MixinRender.java
@@ -7,15 +7,14 @@ import net.minecraft.entity.Entity;
 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.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(Render.class)
 public abstract class MixinRender {
-    @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true)
-    private void replayModRender_areAllNamesHidden(Entity entity, CallbackInfoReturnable<Boolean> ci) {
+    @Inject(method = "renderLivingLabel", at = @At("HEAD"), cancellable = true)
+    private void replayModRender_areAllNamesHidden(Entity entityIn, String str, double x, double y, double z, int maxDistance, CallbackInfo ci) {
         EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
         if (handler != null && !handler.getSettings().isRenderNameTags()) {
-            ci.setReturnValue(false);
             ci.cancel();
         }
     }
diff --git a/src/main/java/com/replaymod/render/mixin/MixinRenderLiving.java b/src/main/java/com/replaymod/render/mixin/MixinRenderLiving.java
deleted file mode 100644
index d8a0917d..00000000
--- a/src/main/java/com/replaymod/render/mixin/MixinRenderLiving.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.replaymod.render.mixin;
-
-import com.replaymod.render.hooks.EntityRendererHandler;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.entity.EntityLiving;
-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.CallbackInfoReturnable;
-
-@Mixin(RenderLiving.class)
-public abstract class MixinRenderLiving {
-    @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true)
-    private void replayModRender_areAllNamesHidden(EntityLiving entity, CallbackInfoReturnable<Boolean> ci) {
-        EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler();
-        if (handler != null && !handler.getSettings().isRenderNameTags()) {
-            ci.setReturnValue(false); //this calls the cancel method
-        }
-    }
-}
diff --git a/src/main/resources/mixins.render.replaymod.json b/src/main/resources/mixins.render.replaymod.json
index 203a07cb..e52d4c0e 100644
--- a/src/main/resources/mixins.render.replaymod.json
+++ b/src/main/resources/mixins.render.replaymod.json
@@ -6,7 +6,6 @@
     "MixinParticleManager",
     "MixinRender",
     "MixinRenderGlobal",
-    "MixinRenderLiving",
     "MixinRenderManager"
   ],
   "server": [],