From a97190de1e86e020e523758dca65b9d4b0b4c21d Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 27 Feb 2021 21:04:39 +0100 Subject: [PATCH] Move MixinRendererLivingEntity into 1.8.9 project --- .../mixin/MixinRendererLivingEntity.java | 24 +------------------ .../mixin/MixinRendererLivingEntity.java | 21 ++++++++++++++++ 2 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 versions/1.8.9/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java diff --git a/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java b/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java index b936efda..3387d168 100644 --- a/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java +++ b/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java @@ -1,23 +1 @@ -package com.replaymod.render.mixin; - -//#if MC<10904 -//$$ import com.replaymod.render.hooks.EntityRendererHandler; -//$$ import net.minecraft.client.Minecraft; -//$$ import net.minecraft.client.renderer.entity.RendererLivingEntity; -//$$ import net.minecraft.entity.EntityLivingBase; -//$$ 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(RendererLivingEntity.class) -//$$ public abstract class MixinRendererLivingEntity { -//$$ @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true) -//$$ private void replayModRender_areAllNamesHidden(EntityLivingBase entity, CallbackInfoReturnable ci) { -//$$ EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler(); -//$$ if (handler != null && !handler.getSettings().isRenderNameTags()) { -//$$ ci.setReturnValue(false); //this calls the cancel method -//$$ } -//$$ } -//$$ } -//#endif +// 1.8.9 and below diff --git a/versions/1.8.9/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java b/versions/1.8.9/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java new file mode 100644 index 00000000..38cbe2ae --- /dev/null +++ b/versions/1.8.9/src/main/java/com/replaymod/render/mixin/MixinRendererLivingEntity.java @@ -0,0 +1,21 @@ +package com.replaymod.render.mixin; + +import com.replaymod.render.hooks.EntityRendererHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RendererLivingEntity; +import net.minecraft.entity.EntityLivingBase; +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(RendererLivingEntity.class) +public abstract class MixinRendererLivingEntity { + @Inject(method = "canRenderName", at = @At("HEAD"), cancellable = true) + private void replayModRender_areAllNamesHidden(EntityLivingBase entity, CallbackInfoReturnable ci) { + EntityRendererHandler handler = ((EntityRendererHandler.IEntityRenderer) Minecraft.getMinecraft().entityRenderer).replayModRender_getHandler(); + if (handler != null && !handler.getSettings().isRenderNameTags()) { + ci.setReturnValue(false); //this calls the cancel method + } + } +}