diff --git a/build.gradle b/build.gradle index 45359927..fb8bc443 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ apply plugin: 'net.minecraftforge.gradle.liteloader' apply plugin: 'org.spongepowered.mixin' group = 'com.minelittlepony' -version = '1.12.0.1' +version = '1.12.0.2' description = 'Mine Little Pony' targetCompatibility = 1.8 @@ -28,7 +28,7 @@ sourceCompatibility = 1.8 minecraft { version = "1.12" - mappings = 'snapshot_20170615' + mappings = 'snapshot_20170627' runDir = 'run' replace '@VERSION@', project.version } diff --git a/build.number b/build.number index f8e852e5..7130e891 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Thu Jun 22 00:35:21 EDT 2017 -build.number=382 +#Fri Jul 28 14:25:09 EDT 2017 +build.number=417 diff --git a/src/hdskins/resources/mixin.hdskins.json b/src/hdskins/resources/mixin.hdskins.json index 50424bac..24b9f738 100644 --- a/src/hdskins/resources/mixin.hdskins.json +++ b/src/hdskins/resources/mixin.hdskins.json @@ -1,6 +1,6 @@ { "required": true, - "minVersion": "0.6", + "minVersion": "0.7", "package": "com.voxelmodpack.hdskins.mixin", "refmap": "mixin.hdskins.refmap.json", "mixins": [ diff --git a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java index 9c641c3e..8e083394 100644 --- a/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java +++ b/src/main/java/com/minelittlepony/mixin/MixinRenderPlayer.java @@ -27,6 +27,7 @@ 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; @@ -34,6 +35,8 @@ 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 implements IRenderPony { @@ -240,7 +243,12 @@ public abstract class MixinRenderPlayer extends RenderLivingBase