From d92eb059135c2f47c93c13d7b79536618d0bb651 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Tue, 8 Aug 2017 16:41:04 -0400
Subject: [PATCH] Fix mixins for 0.7

---
 .gitignore                                           |  2 ++
 build.gradle                                         |  4 ++--
 build.number                                         |  4 ++--
 .../com/minelittlepony/mixin/MixinRenderPlayer.java  | 12 +++++++++---
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c52f7d5f..1877dc7d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ run/
 logs/
 .idea/
 classes/
+*.iml
+out/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index be293bdc..d0b4e227 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 	}
 	dependencies {
 		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
-		classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
+		classpath 'org.spongepowered:mixingradle:0.5-SNAPSHOT'
 	}
 }
 
@@ -20,7 +20,7 @@ apply plugin: 'net.minecraftforge.gradle.liteloader'
 apply plugin: 'org.spongepowered.mixin'
 
 group = 'com.minelittlepony'
-version = '1.11.2.3'
+version = '1.11.2.4'
 description = 'Mine Little Pony'
 
 targetCompatibility = 1.8
diff --git a/build.number b/build.number
index 8e630431..74b3d856 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Tue Mar 28 02:04:51 EDT 2017
-build.number=312
+#Tue Aug 08 16:46:27 EDT 2017
+build.number=318
diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
index fe50a5fe..d78874f2 100644
--- a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
+++ b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
@@ -8,7 +8,11 @@ import com.minelittlepony.model.PMAPI;
 import com.minelittlepony.model.PlayerModel;
 import com.minelittlepony.model.pony.ModelHumanPlayer;
 import com.minelittlepony.model.pony.ModelPlayerPony;
-import com.minelittlepony.renderer.layer.*;
+import com.minelittlepony.renderer.layer.LayerHeldPonyItem;
+import com.minelittlepony.renderer.layer.LayerPonyArmor;
+import com.minelittlepony.renderer.layer.LayerPonyCape;
+import com.minelittlepony.renderer.layer.LayerPonyCustomHead;
+import com.minelittlepony.renderer.layer.LayerPonyElytra;
 import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.model.ModelPlayer;
 import net.minecraft.client.model.ModelRenderer;
@@ -231,8 +235,10 @@ public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientP
         this.playerModel.apply(thePony.metadata);
     }
 
-    @Override
-    public ResourceLocation getEntityTexture(AbstractClientPlayer player) {
+    @Redirect(
+            method = "getEntityTexture(Lnet/minecraft/client/entity/AbstractClientPlayer;)Lnet/minecraft/util/ResourceLocation;",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getLocationSkin()Lnet/minecraft/util/ResourceLocation;"))
+    private ResourceLocation redirectEntityTexture(AbstractClientPlayer player) {
         Pony thePony = MineLittlePony.getInstance().getManager().getPonyFromResourceRegistry(player);
         return thePony.getTextureResourceLocation();
     }