From 7180f22f4f03d2cb84f1947b79261c71c74c9e4a Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Mon, 16 Dec 2024 22:40:41 +0100
Subject: [PATCH] Fixed cape offset from the body when lying down

---
 .../client/render/entity/EnderStallionRenderer.java  | 10 ++--------
 .../client/render/entity/feature/CapeFeature.java    |  5 +----
 .../render/entity/feature/GlowingEyesFeature.java    | 12 +++---------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java b/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java
index 3b63258c..614ddff3 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/EnderStallionRenderer.java
@@ -8,7 +8,6 @@ import com.minelittlepony.client.model.entity.EnderStallionModel;
 import com.minelittlepony.client.render.entity.feature.GlowingEyesFeature;
 import com.minelittlepony.client.render.entity.feature.HeldItemFeature;
 import com.minelittlepony.client.render.entity.npc.textures.TextureSupplier;
-import com.minelittlepony.client.render.entity.feature.GlowingEyesFeature.IGlowingRenderer;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.VertexConsumerProvider;
@@ -24,7 +23,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Random;
 
-public class EnderStallionRenderer extends PonyRenderer<EndermanEntity, EnderStallionRenderer.State, EnderStallionModel> implements IGlowingRenderer {
+public class EnderStallionRenderer extends PonyRenderer<EndermanEntity, EnderStallionRenderer.State, EnderStallionModel> {
     public static final Identifier ENDERMAN = MineLittlePony.id("textures/entity/enderman/enderman_pony.png");
     private static final Identifier EYES = MineLittlePony.id("textures/entity/enderman/enderman_pony_eyes.png");
 
@@ -39,7 +38,7 @@ public class EnderStallionRenderer extends PonyRenderer<EndermanEntity, EnderSta
     protected void addFeatures(EntityRendererFactory.Context context) {
         addPonyFeature(createHeldItemFeature(context));
         addPonyFeature(new StuckArrowsFeatureRenderer<EnderStallionModel>((PonyRenderer)this, context));
-        addPonyFeature(new GlowingEyesFeature<EnderStallionRenderer.State, EnderStallionModel>(this));
+        addPonyFeature(new GlowingEyesFeature<EnderStallionRenderer.State, EnderStallionModel>(this, EYES));
     }
 
     @Override
@@ -81,11 +80,6 @@ public class EnderStallionRenderer extends PonyRenderer<EndermanEntity, EnderSta
         super.render(entity, matrices, vertices, light);
     }
 
-    @Override
-    public Identifier getEyeTexture() {
-        return EYES;
-    }
-
     public class State extends SkeleponyRenderer.State {
         public boolean angry;
         @Nullable
diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java
index 65befb0e..16d878c1 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/feature/CapeFeature.java
@@ -52,11 +52,8 @@ public class CapeFeature extends CapeFeatureRenderer {
                     rendered[0] = true;
 
                     matrices.translate(0, 0.34F, 0);
-                    if (((PlayerPonyRenderState)player).getAttributes().isLyingDown) {
-                        matrices.translate(0, -0.05F, 0);
-                    }
                     model.transform((PlayerPonyRenderState)player, BodyPart.BODY, matrices);
-                    model.getBodyPart(BodyPart.BODY).rotate(matrices);
+                    model.body.rotate(matrices);
                     matrices.multiply(RotationAxis.POSITIVE_X.rotationDegrees(85));
                     if (player.baby) {
                         matrices.scale(1.1F, 1.1F, 1.1F);
diff --git a/src/main/java/com/minelittlepony/client/render/entity/feature/GlowingEyesFeature.java b/src/main/java/com/minelittlepony/client/render/entity/feature/GlowingEyesFeature.java
index 5e75131b..c78afcb0 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/feature/GlowingEyesFeature.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/feature/GlowingEyesFeature.java
@@ -2,7 +2,6 @@ package com.minelittlepony.client.render.entity.feature;
 
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.entity.feature.EyesFeatureRenderer;
-import net.minecraft.client.render.entity.feature.FeatureRendererContext;
 import net.minecraft.client.render.entity.state.PlayerEntityRenderState;
 import net.minecraft.util.Identifier;
 
@@ -17,18 +16,13 @@ public class GlowingEyesFeature<
 
     private final RenderLayer layer;
 
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    public <V extends FeatureRendererContext & PonyRenderContext<?, S, M> & IGlowingRenderer> GlowingEyesFeature(V renderer) {
-        super(renderer);
-        layer = RenderLayer.getEyes(renderer.getEyeTexture());
+    public GlowingEyesFeature(PonyRenderContext<?, S, M> context, Identifier texture) {
+        super(context.upcast());
+        layer = RenderLayer.getEyes(texture);
     }
 
     @Override
     public RenderLayer getEyesTexture() {
         return layer;
     }
-
-    public interface IGlowingRenderer {
-        Identifier getEyeTexture();
-    }
 }