From 8aa8ae81a76a82f9c6ddd4c5a2914f8c1b585940 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 28 Jul 2018 12:33:45 +0200
Subject: [PATCH] Fixed lighting and rendering shenanigans

---
 .../com/voxelmodpack/hdskins/gui/GuiSkins.java | 14 +++-----------
 .../hdskins/gui/RenderPlayerModel.java         | 18 ++++++++++++------
 .../hdskins/gui/RenderPonyModel.java           |  1 +
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index e9c866dd..5e1c45eb 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -479,25 +479,17 @@ public class GuiSkins extends GameGui {
         pushMatrix();
         translate(xPosition, yPosition, 300);
 
-        scale(-scale, scale, scale);
-        rotate(180, 0, 0, 1);
-        rotate(135, 0, 1, 0);
+        scale(scale, scale, scale);
+        rotate(-15, 1, 0, 0);
 
         RenderHelper.enableStandardItemLighting();
 
-        rotate(-135, 0, 1, 0);
-        rotate(15, 1, 0, 0);
-
         rotate(((updateCounter + partialTick) * 2.5F) % 360, 0, 1, 0);
 
         thePlayer.rotationYawHead = (float)Math.atan(mouseX / 20) * 30;
         thePlayer.rotationPitch = (float)Math.atan(mouseY / 40) * -20;
 
-        translate(0, thePlayer.getYOffset(), 0);
-
-        RenderManager rm = Minecraft.getMinecraft().getRenderManager();
-        rm.playerViewY = 180;
-        rm.renderEntity(thePlayer, 0, 0, 0, 0, 1, false);
+        mc.getRenderManager().renderEntity(thePlayer, 0, 0, 0, 0, 1, false);
 
         popMatrix();
         RenderHelper.disableStandardItemLighting();
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java
index ee4f2866..c7754d91 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/RenderPlayerModel.java
@@ -14,7 +14,6 @@ import net.minecraft.init.Items;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
 
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
 
@@ -94,7 +93,7 @@ public class RenderPlayerModel<M extends EntityPlayerModel> extends RenderLiving
     @Override
     public void doRender(M entity, double x, double y, double z, float entityYaw, float partialTicks) {
         ModelPlayer player = this.getEntityModel(entity);
-        this.mainModel = player;
+        mainModel = player;
 
         Set<EnumPlayerModelParts> parts = Minecraft.getMinecraft().gameSettings.getModelParts();
         player.bipedHeadwear.isHidden = !parts.contains(EnumPlayerModelParts.HAT);
@@ -107,19 +106,26 @@ public class RenderPlayerModel<M extends EntityPlayerModel> extends RenderLiving
         player.leftArmPose = ArmPose.EMPTY;
         player.rightArmPose = ArmPose.EMPTY;
 
-        super.doRender(entity, x, y, z, entityYaw, partialTicks);
-
         GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
 
-        pushMatrix();
-        scale(1, -1, 1);
+        double offset = entity.getYOffset() + 0.01;
 
+        pushMatrix();
+        enableBlend();
         color(1, 1, 1, 0.3F);
+        translate(0, offset, 0);
 
         super.doRender(entity, x, y, z, entityYaw, partialTicks);
 
         color(1, 1, 1, 1);
+        disableBlend();
+        popMatrix();
 
+        pushMatrix();
+        scale(1, -1, 1);
+        translate(0, offset, 0);
+
+        super.doRender(entity, x, y, z, entityYaw, partialTicks);
         popMatrix();
 
         popAttrib();
diff --git a/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java b/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java
index 379a8b07..3b4c1732 100644
--- a/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java
+++ b/src/main/java/com/minelittlepony/hdskins/gui/RenderPonyModel.java
@@ -58,6 +58,7 @@ public class RenderPonyModel extends RenderPlayerModel<EntityPonyModel> implemen
         if (renderingAsHuman) {
             super.preRenderCallback(entity, ticks);
         } else {
+            //GlStateManager.scale(1.1, 1.1, 1.1);
             renderPony.preRenderCallback(entity, ticks);
 
             GlStateManager.translate(0, 0, -entity.width / 2); // move us to the center of the shadow