From 66454104974b4882038f0b9d798cf9c78af211fd Mon Sep 17 00:00:00 2001 From: Matthew Messinger Date: Sun, 19 Jun 2016 15:46:37 -0400 Subject: [PATCH] Update to 1.10 --- build.gradle | 8 ++++---- .../com/brohoof/minelittlepony/PonyManager.java | 1 + .../renderer/RenderPonySkeleton.java | 14 +++++++++++--- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 63f7833f..3184cac9 100644 --- a/build.gradle +++ b/build.gradle @@ -21,19 +21,19 @@ buildscript { } } -ext.revision = 220 +ext.revision = 221 apply plugin: 'net.minecraftforge.gradle.liteloader' apply plugin: 'org.spongepowered.mixin' apply plugin: 'mnm.gradle.ap-ide' group = 'com.brohoof.minelp' -version = '1.9.4.2' +version = '1.10.0.0' description = 'Mine Little Pony' minecraft { - version = "1.9.4" - mappings = 'snapshot_20160517' + version = "1.10" + mappings = 'snapshot_20160619' runDir = 'run' replace '@VERSION@',project.version } diff --git a/src/main/java/com/brohoof/minelittlepony/PonyManager.java b/src/main/java/com/brohoof/minelittlepony/PonyManager.java index 52114fb0..b1e8a115 100644 --- a/src/main/java/com/brohoof/minelittlepony/PonyManager.java +++ b/src/main/java/com/brohoof/minelittlepony/PonyManager.java @@ -21,6 +21,7 @@ public class PonyManager { public static final ResourceLocation PIGMAN = new ResourceLocation(NAMESPACE, "textures/entity/zombie/zombie_pigman_pony.png"); public static final ResourceLocation SKELETON = new ResourceLocation(NAMESPACE, "textures/entity/skeleton/skeleton_pony.png"); public static final ResourceLocation WITHER_SKELETON = new ResourceLocation(NAMESPACE, "textures/entity/skeleton/skeleton_wither_pony.png"); + public static final ResourceLocation STRAY_SKELETON = new ResourceLocation(NAMESPACE, "textures/entity/skeleton/stray_pony.png"); public static final ResourceLocation STEVE = new ResourceLocation(NAMESPACE, "textures/entity/steve_pony.png"); public static final ResourceLocation ALEX = new ResourceLocation(NAMESPACE, "textures/entity/alex_pony.png"); diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java index 5362d463..ae47ec92 100644 --- a/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java @@ -13,6 +13,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.SkeletonType; import net.minecraft.util.ResourceLocation; public class RenderPonySkeleton extends RenderPonyMob { @@ -30,7 +31,8 @@ public class RenderPonySkeleton extends RenderPonyMob { @Override protected void preRenderCallback(EntitySkeleton skeleton, float partialTicks) { super.preRenderCallback(skeleton, partialTicks); - if (skeleton.getSkeletonType() == 1) { + if (skeleton.func_189771_df() == SkeletonType.WITHER) {// getSkeletonType() + // == 1) { GlStateManager.scale(1.2F, 1.2F, 1.2F); } @@ -49,13 +51,19 @@ public class RenderPonySkeleton extends RenderPonyMob { } PonySize[] sizes = PonySize.values(); PonySize size = sizes[rand.nextInt(sizes.length)]; - this.playerModel.getModel().metadata.setSize(size== PonySize.FOAL ? PonySize.NORMAL : size); + this.playerModel.getModel().metadata.setSize(size == PonySize.FOAL ? PonySize.NORMAL : size); this.playerModel.getModel().metadata.setTail(TailLengths.STUB); this.playerModel.getModel().metadata.setGlowColor(rand.nextInt()); } @Override protected ResourceLocation getEntityTexture(EntitySkeleton skeleton) { - return skeleton.getSkeletonType() == 1 ? PonyManager.WITHER_SKELETON : PonyManager.SKELETON; + SkeletonType type = skeleton.func_189771_df(); + if (type == SkeletonType.WITHER) + return PonyManager.WITHER_SKELETON; + else if (type == SkeletonType.STRAY) + return PonyManager.STRAY_SKELETON; + else + return PonyManager.SKELETON; } }