From f04d67cabaffdc38b333486f0861c3afd1ff43bd Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Wed, 29 Aug 2018 20:03:42 -0400
Subject: [PATCH] Forge doesn't like notch names and neither do I.

---
 .../java/com/minelittlepony/PonyManager.java    |  2 +-
 .../mixin/MixinDefaultPlayerSkin.java           | 17 +++--------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/minelittlepony/PonyManager.java b/src/main/java/com/minelittlepony/PonyManager.java
index 9ea6ec97..bc91dcc2 100644
--- a/src/main/java/com/minelittlepony/PonyManager.java
+++ b/src/main/java/com/minelittlepony/PonyManager.java
@@ -164,7 +164,7 @@ public class PonyManager implements IResourceManagerReloadListener, ISkinCacheCl
         MineLittlePony.logger.info("Detected {} background ponies installed.", getNumberOfPonies());
     }
 
-    private ResourceLocation getDefaultSkin(UUID uuid) {
+    public static ResourceLocation getDefaultSkin(UUID uuid) {
         return isSlimSkin(uuid) ? ALEX : STEVE;
     }
 
diff --git a/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java b/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java
index af248960..30e97ac0 100644
--- a/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java
+++ b/src/main/java/com/minelittlepony/mixin/MixinDefaultPlayerSkin.java
@@ -6,7 +6,6 @@ import com.minelittlepony.pony.data.PonyLevel;
 import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.util.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -16,16 +15,6 @@ import java.util.UUID;
 @Mixin(DefaultPlayerSkin.class)
 public abstract class MixinDefaultPlayerSkin {
 
-    @Shadow
-    private static boolean isSlimSkin(UUID playerUUID) {
-        return false;
-    }
-
-    @Shadow
-    public static ResourceLocation getDefaultSkin(UUID playerUUID) {
-        return null;
-    }
-
     @Inject(method = "getDefaultSkinLegacy", at = @At("HEAD"), cancellable = true)
     private static void legacySkin(CallbackInfoReturnable<ResourceLocation> cir) {
         if (MineLittlePony.getConfig().getPonyLevel() == PonyLevel.PONIES) {
@@ -36,7 +25,7 @@ public abstract class MixinDefaultPlayerSkin {
     @Inject(method = "getDefaultSkin", at = @At("HEAD"), cancellable = true)
     private static void defaultSkin(UUID uuid, CallbackInfoReturnable<ResourceLocation> cir) {
         if (MineLittlePony.getConfig().getPonyLevel() == PonyLevel.PONIES) {
-            cir.setReturnValue(isSlimSkin(uuid) ? PonyManager.ALEX : PonyManager.STEVE);
+            cir.setReturnValue(PonyManager.getDefaultSkin(uuid));
         }
     }
 
@@ -45,10 +34,10 @@ public abstract class MixinDefaultPlayerSkin {
         if (MineLittlePony.getConfig().getPonyLevel() == PonyLevel.PONIES) {
 
             cir.setReturnValue(MineLittlePony.getInstance().getManager()
-                    .getPony(getDefaultSkin(uuid), uuid)
+                    .getPony(PonyManager.getDefaultSkin(uuid), uuid)
                     .getRace(false)
                     .getModel()
-                    .getId(isSlimSkin(uuid)));
+                    .getId(PonyManager.isSlimSkin(uuid)));
         }
     }