From 90305364073a79e8824e8c0c8cb780137b8e5ff5 Mon Sep 17 00:00:00 2001 From: ThisTestUser Date: Mon, 8 Jul 2024 18:36:07 -0400 Subject: [PATCH] Convert to WrapOperation --- .../wurstclient/mixin/LivingEntityRendererMixin.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java b/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java index 24d05ff8..c3dee14b 100644 --- a/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java +++ b/src/main/java/net/wurstclient/mixin/LivingEntityRendererMixin.java @@ -10,9 +10,11 @@ package net.wurstclient.mixin; 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.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; + import net.minecraft.client.render.entity.EntityRenderDispatcher; import net.minecraft.client.render.entity.LivingEntityRenderer; import net.minecraft.entity.Entity; @@ -25,16 +27,17 @@ public abstract class LivingEntityRendererMixin /** * Disables the distance limit in hasLabel() if configured in NameTags. */ - @Redirect(at = @At(value = "INVOKE", + @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/EntityRenderDispatcher;getSquaredDistanceToCamera(Lnet/minecraft/entity/Entity;)D", ordinal = 0), method = "hasLabel(Lnet/minecraft/entity/LivingEntity;)Z") - private double adjustDistance(EntityRenderDispatcher render, Entity entity) + private double adjustDistance(EntityRenderDispatcher render, Entity entity, + Operation original) { // pretend the distance is 1 so the check always passes if(WurstClient.INSTANCE.getHax().nameTagsHack.isUnlimitedRange()) return 1; - return render.getSquaredDistanceToCamera(entity); + return original.call(render, entity); } /**