From a17661124c6c50fecfba18498ff536be36c8f588 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Thu, 18 Jul 2019 13:19:30 +0200
Subject: [PATCH] Update HDSkins

---
 gradle.properties                                    |  2 +-
 .../minelittlepony/client/hdskins/MineLPHDSkins.java |  4 ++--
 .../{RenderDummyPony.java => DummyPonyRenderer.java} | 12 +++++++++---
 .../minelittlepony/client/model/ClientPonyModel.java |  1 -
 4 files changed, 12 insertions(+), 7 deletions(-)
 rename src/main/java/com/minelittlepony/client/hdskins/gui/{RenderDummyPony.java => DummyPonyRenderer.java} (86%)

diff --git a/gradle.properties b/gradle.properties
index 588bdeee..e9dbcd92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,4 @@ org.gradle.daemon=false
 # Dependencies
 	fabric_version=0.3.0+
 	kirin_version=1.14.3-1.4-SNAPSHOT
-	hd_skins_version=1.14.3-5.3.2-SNAPSHOT
+	hd_skins_version=1.14.3-5.3.3-SNAPSHOT
diff --git a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
index 77ad4788..a9576d51 100644
--- a/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
+++ b/src/main/java/com/minelittlepony/client/hdskins/MineLPHDSkins.java
@@ -4,7 +4,7 @@ import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.SkinsProxy;
 import com.minelittlepony.client.hdskins.gui.DummyPony;
 import com.minelittlepony.client.hdskins.gui.GuiSkinsMineLP;
-import com.minelittlepony.client.hdskins.gui.RenderDummyPony;
+import com.minelittlepony.client.hdskins.gui.DummyPonyRenderer;
 import com.minelittlepony.common.event.ClientReadyCallback;
 import com.minelittlepony.hdskins.SkinCacheClearCallback;
 import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;
@@ -24,7 +24,7 @@ class MineLPHDSkins {
         ClientReadyCallback.EVENT.register(this::postInit);
 
         // Preview on the select skin gui
-        EntityRendererRegistry.INSTANCE.register(DummyPony.class, RenderDummyPony::new);
+        EntityRendererRegistry.INSTANCE.register(DummyPony.class, DummyPonyRenderer::new);
     }
 
     private void postInit(MinecraftClient minecraft) {
diff --git a/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java
similarity index 86%
rename from src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java
rename to src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java
index 46ec2509..64bdfb5b 100644
--- a/src/main/java/com/minelittlepony/client/hdskins/gui/RenderDummyPony.java
+++ b/src/main/java/com/minelittlepony/client/hdskins/gui/DummyPonyRenderer.java
@@ -7,9 +7,10 @@ import com.minelittlepony.client.model.races.PlayerModels;
 import com.minelittlepony.client.render.IPonyRender;
 import com.minelittlepony.client.render.RenderPony;
 import com.minelittlepony.client.render.layer.LayerGear;
+import com.minelittlepony.client.render.layer.LayerHeldPonyItemMagical;
 import com.minelittlepony.client.render.layer.LayerPonyArmor;
 import com.minelittlepony.client.render.layer.LayerPonyElytra;
-import com.minelittlepony.hdskins.dummy.RenderDummyPlayer;
+import com.minelittlepony.hdskins.dummy.DummyPlayerRenderer;
 import com.minelittlepony.pony.IPony;
 import com.minelittlepony.pony.meta.Race;
 import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
@@ -23,11 +24,11 @@ import net.minecraft.util.Identifier;
 /**
  * Renderer used for the dummy pony model when selecting a skin.
  */
-public class RenderDummyPony extends RenderDummyPlayer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
+public class DummyPonyRenderer extends DummyPlayerRenderer<DummyPony, ClientPonyModel<DummyPony>> implements IPonyRender<DummyPony, ClientPonyModel<DummyPony>> {
 
     protected final RenderPony<DummyPony, ClientPonyModel<DummyPony>> renderPony = new RenderPony<>(this);
 
-    public RenderDummyPony(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) {
+    public DummyPonyRenderer(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) {
         super(manager, context);
         addFeature(new LayerGear<>(this));
 
@@ -90,6 +91,11 @@ public class RenderDummyPony extends RenderDummyPlayer<DummyPony, ClientPonyMode
         return new LayerPonyArmor<>(this);
     }
 
+    @Override
+    protected FeatureRenderer<DummyPony, ClientPonyModel<DummyPony>> getHeldItemLayer() {
+        return new LayerHeldPonyItemMagical<>(this);
+    }
+
     @Override
     protected FeatureRenderer<DummyPony, ClientPonyModel<DummyPony>> getElytraLayer() {
         return new LayerPonyElytra<DummyPony, ClientPonyModel<DummyPony>>(this) {
diff --git a/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java b/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java
index 9c682f9d..a24d40d0 100644
--- a/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java
+++ b/src/main/java/com/minelittlepony/client/model/ClientPonyModel.java
@@ -3,7 +3,6 @@ package com.minelittlepony.client.model;
 import net.minecraft.client.model.Cuboid;
 import net.minecraft.client.render.entity.model.BipedEntityModel;
 import net.minecraft.client.render.entity.model.PlayerEntityModel;
-import net.minecraft.client.render.entity.model.BipedEntityModel.ArmPose;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.AbsoluteHand;