From 75f6d6d1548a6b1ceea98d555c0f7c94f9aed9b6 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 11 Mar 2021 16:18:12 +0200
Subject: [PATCH] Use the entity's height to inform a correct position for the
 nameplate

---
 .../client/model/entity/EnderStallionModel.java               | 1 -
 .../minelittlepony/client/model/entity/SkeleponyModel.java    | 1 -
 .../minelittlepony/client/model/entity/VillagerPonyModel.java | 2 +-
 .../minelittlepony/client/model/entity/WitchPonyModel.java    | 2 +-
 .../com/minelittlepony/client/render/EquineRenderManager.java | 2 +-
 .../client/render/entity/PlayerPonyRenderer.java              | 4 ++++
 src/main/java/com/minelittlepony/model/ModelAttributes.java   | 1 +
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java b/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java
index 5ff46598..4142b169 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/EnderStallionModel.java
@@ -21,7 +21,6 @@ public class EnderStallionModel extends SkeleponyModel<EndermanEntity> {
 
     public EnderStallionModel() {
         super();
-        attributes.visualHeight = 3;
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java b/src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java
index 999392c6..819ff58f 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/SkeleponyModel.java
@@ -32,7 +32,6 @@ public class SkeleponyModel<T extends HostileEntity> extends AlicornModel<T> imp
     public void animateModel(T entity, float move, float swing, float ticks) {
         isUnicorn = entity.getUuid().getLeastSignificantBits() % 3 != 0;
         isWithered = entity instanceof WitherSkeletonEntity;
-        attributes.visualHeight = isWithered ? 2.5F : 2;
 
         rightArmPose = ArmPose.EMPTY;
         leftArmPose = ArmPose.EMPTY;
diff --git a/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java b/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java
index e320460e..04e3c8ea 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/VillagerPonyModel.java
@@ -68,7 +68,7 @@ public class VillagerPonyModel<T extends LivingEntity & VillagerDataContainer> e
 
         VillagerProfession profession = entity.getVillagerData().getProfession();
 
-        attributes.visualHeight = PonyTextures.isCrownPony(entity) ? 2.3F : 2;
+        attributes.visualHeight += PonyTextures.isCrownPony(entity) ? 0.3F : -0.1F;
         apron.visible = !special && profession == VillagerProfession.BUTCHER;
         trinket.visible = !special && !apron.visible && profession != VillagerProfession.NONE && profession != VillagerProfession.NITWIT;
     }
diff --git a/src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java b/src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java
index 575f7372..ff1c669f 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/WitchPonyModel.java
@@ -12,7 +12,6 @@ public class WitchPonyModel extends ZebraModel<WitchEntity> {
 
     public WitchPonyModel() {
         super(false);
-        attributes.visualHeight = 2.5F;
     }
 
     @Override
@@ -22,6 +21,7 @@ public class WitchPonyModel extends ZebraModel<WitchEntity> {
         if (entity.hasCustomName() && "Filly".equals(entity.getCustomName().getString())) {
             child = true;
         }
+        attributes.visualHeight += 0.5F;
         leftArmPose = ArmPose.EMPTY;
         rightArmPose = entity.getMainHandStack().isEmpty() ? ArmPose.EMPTY : ArmPose.ITEM;
     }
diff --git a/src/main/java/com/minelittlepony/client/render/EquineRenderManager.java b/src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
index f87027f7..6142e3a3 100644
--- a/src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
+++ b/src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
@@ -176,7 +176,7 @@ public class EquineRenderManager<T extends LivingEntity, M extends EntityModel<T
     public double getNamePlateYOffset(T entity) {
 
         // We start by negating the height calculation done by mahjong.
-        float y = -(entity.getHeight() + 0.5F - (entity.isInSneakingPose() ? 0.25F : 0));
+        float y = -(entity.getHeight() + 0.5F);
 
         // Then we add our own offsets.
         y += getModel().getAttributes().visualHeight * getScaleFactor() + 0.25F;
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 8950bde8..683d18d4 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/PlayerPonyRenderer.java
@@ -99,6 +99,10 @@ public class PlayerPonyRenderer extends PlayerEntityRenderer implements IPonyRen
         }
     }
 
+    protected boolean hasLabel(AbstractClientPlayerEntity entity) {
+        return true;
+    }
+
     @Override
     protected void setupTransforms(AbstractClientPlayerEntity entity, MatrixStack stack, float ageInTicks, float rotationYaw, float partialTicks) {
         manager.preRenderCallback(entity, stack, partialTicks);
diff --git a/src/main/java/com/minelittlepony/model/ModelAttributes.java b/src/main/java/com/minelittlepony/model/ModelAttributes.java
index 270ff8f4..9ea83033 100644
--- a/src/main/java/com/minelittlepony/model/ModelAttributes.java
+++ b/src/main/java/com/minelittlepony/model/ModelAttributes.java
@@ -118,6 +118,7 @@ public class ModelAttributes<T extends LivingEntity> {
     }
 
     public void updateLivingState(T entity, IPony pony, EquineRenderManager.Mode mode) {
+        visualHeight = entity.getHeight() + 0.125F;
         isSitting = pony.isSitting(entity);
         isCrouching = !isSitting && mode == Mode.THIRD_PERSON && pony.isCrouching(entity);
         isSleeping = entity.isSleeping();