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

---
 build.gradle                                      |  4 ++--
 build.number                                      |  4 ++--
 .../minelittlepony/mixin/MixinRenderPlayer.java   | 15 ++++-----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 3a1ac70b..ba59597d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
 	}
 	dependencies {
 		classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-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.12.0.2'
+version = '1.12.0.3'
 description = 'Mine Little Pony'
 
 targetCompatibility = 1.8
diff --git a/build.number b/build.number
index cb65a971..498ef9b5 100644
--- a/build.number
+++ b/build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Sat Jul 29 00:02:32 EDT 2017
-build.number=419
+#Tue Aug 08 16:45:16 EDT 2017
+build.number=422
diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
index 9bb3123e..3f1c2fc8 100644
--- a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
+++ b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java
@@ -27,7 +27,6 @@ import net.minecraft.util.ResourceLocation;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.At.Shift;
@@ -35,8 +34,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import javax.annotation.Nonnull;
-
 @Mixin(RenderPlayer.class)
 public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientPlayer> implements IRenderPony {
 
@@ -243,14 +240,10 @@ public abstract class MixinRenderPlayer extends RenderLivingBase<AbstractClientP
         this.playerModel.apply(thePony.getMetadata());
     }
 
-    /**
-     * @author killjoy
-     * @reason Support for background ponies and default pony skin
-     */
-    @Overwrite
-    @Override
-    @Nonnull
-    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().getPony(player);
         return thePony.getTexture();
     }