From b867357cd9e2fc798de1a258ec2935f9ba7db909 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 29 Nov 2019 12:17:50 +0200
Subject: [PATCH] Fixed snouts not rendering and fixed inverted lighting

---
 .../client/model/entity/race/ModelEarthPony.java          | 1 +
 .../client/render/entity/RenderPonyMob.java               | 5 +++++
 .../assets/minelittlepony/models/components/snout.json    | 8 ++++----
 .../resources/assets/minelittlepony/models/skull.json     | 6 ------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java b/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java
index b474f59d..f67f3047 100644
--- a/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java
+++ b/src/main/java/com/minelittlepony/client/model/entity/race/ModelEarthPony.java
@@ -52,6 +52,7 @@ public class ModelEarthPony<T extends LivingEntity> extends AbstractPonyModel<T>
     @Override
     public void setVisible(boolean visible) {
         super.setVisible(visible);
+        snout.setVisible(visible);
         tail.setVisible(visible);
     }
 
diff --git a/src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java
index 5b2c65fd..27bd889b 100644
--- a/src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java
+++ b/src/main/java/com/minelittlepony/client/render/entity/RenderPonyMob.java
@@ -23,6 +23,7 @@ import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.MobEntityRenderer;
 import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.client.render.entity.model.PlayerEntityModel;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.util.Identifier;
@@ -81,6 +82,10 @@ public abstract class RenderPonyMob<T extends MobEntity, M extends EntityModel<T
     @Override
     public void scale(T entity, MatrixStack stack, float ticks) {
         renderPony.preRenderCallback(entity, stack, ticks);
+        if (this.getModel() instanceof PlayerEntityModel) {
+            ((PlayerEntityModel<?>)getModel()).setVisible(true);
+        }
+
         // shadowRadius
         field_4673 = renderPony.getShadowScale();
 
diff --git a/src/main/resources/assets/minelittlepony/models/components/snout.json b/src/main/resources/assets/minelittlepony/models/components/snout.json
index cc8e95ba..a5885ef7 100644
--- a/src/main/resources/assets/minelittlepony/models/components/snout.json
+++ b/src/main/resources/assets/minelittlepony/models/components/snout.json
@@ -2,13 +2,13 @@
 	"texture": {"w": 64, "h": 64, "u": 16, "v": 8},
 	"locals": {
 		"x": 0,
-		"y": 0,
-		"z": 0
+		"y": -1,
+		"z": -2
 	},
 	"stallion": {
 		"type": "mson:planar",
 		"offset": ["#x", "#y", "#z"],
-		"south": [-2, 1, -5, 4, 3, 10, 13],
+		"north": [-2, 1, -5, 4, 3, 10, 13],
 		"up":    [-2, 1, -5, 4, 1, 10, 13],
 		"down":  [-2, 4, -5, 4, 1, 18, 7],
 		"west":  [-2, 1, -5, 3, 1, 10, 13],
@@ -17,7 +17,7 @@
 	"mare": {
 		"type": "mson:planar",
 		"offset": ["#x", "#y", "#z"],
-		"south": [
+		"north": [
 			[-2, 2, -5, 4, 2, 10, 14],
 			[-1, 1, -5, 2, 1, 11, 13]
 		],
diff --git a/src/main/resources/assets/minelittlepony/models/skull.json b/src/main/resources/assets/minelittlepony/models/skull.json
index a98965ed..3ea613ef 100644
--- a/src/main/resources/assets/minelittlepony/models/skull.json
+++ b/src/main/resources/assets/minelittlepony/models/skull.json
@@ -1,11 +1,5 @@
 {
 	"texture": {"w": 64, "h": 64},
-	"locals": {
-		"snout_x": -3,
-		"snout_z": 2,
-		"horn_x": -1,
-		"horn_z": 4
-	},
 	"skull": {
 		"cubes": [
 			{"from": [-4, -8, -4], "size": [8, 8, 8]}