From bb026761b1cf1bc83c01debc03f13b413da8f6a4 Mon Sep 17 00:00:00 2001 From: Sollace Date: Mon, 20 Apr 2020 00:00:23 +0200 Subject: [PATCH] Fixed nameplates causing debug bounding boxes to be offset --- .../client/render/entity/PlayerPonyRenderer.java | 4 +++- .../com/minelittlepony/client/render/entity/PonyRenderer.java | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java index f291d93f..9cb4c1b8 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java @@ -96,7 +96,6 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen stack.multiply(Vector3f.NEGATIVE_Y.getDegreesQuaternion(yaw)); stack.translate(0, 0, -l); } - } @Override @@ -119,6 +118,8 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen @Override protected void renderLabelIfPresent(AbstractClientPlayerEntity entity, String name, MatrixStack stack, VertexConsumerProvider renderContext, int maxDistance) { + stack.push(); + if (entity.isSleeping()) { if (entity.getSleepingPosition().isPresent() && entity.getEntityWorld().getBlockState(entity.getSleepingPosition().get()).getBlock() instanceof BedBlock) { double bedRad = Math.toRadians(entity.getSleepingDirection().asRotation()); @@ -128,6 +129,7 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen } stack.translate(0, manager.getNamePlateYOffset(entity), 0); super.renderLabelIfPresent(entity, name, stack, renderContext, maxDistance); + stack.pop(); } @Override diff --git a/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java index a1dc0b9b..e8022312 100644 --- a/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java +++ b/src/main/java/com/minelittlepony/client/render/entity/PonyRenderer.java @@ -104,8 +104,10 @@ public abstract class PonyRenderer @Override protected void renderLabelIfPresent(T entity, String name, MatrixStack stack, VertexConsumerProvider renderContext, int maxDistance) { + stack.push(); stack.translate(0, manager.getNamePlateYOffset(entity), 0); super.renderLabelIfPresent(entity, name, stack, renderContext, maxDistance); + stack.pop(); } @Deprecated