PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-25 05:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update to 1.10

Browse source
This commit is contained in:
Matthew Messinger 2016-06-19 15:46:37 -04:00
parent 95b1975357
commit 6645410497
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -21,19 +21,19 @@ buildscript {
} }
} }
ext.revision = 220 ext.revision = 221
apply plugin: 'net.minecraftforge.gradle.liteloader' apply plugin: 'net.minecraftforge.gradle.liteloader'
apply plugin: 'org.spongepowered.mixin' apply plugin: 'org.spongepowered.mixin'
apply plugin: 'mnm.gradle.ap-ide' apply plugin: 'mnm.gradle.ap-ide'
group = 'com.brohoof.minelp' group = 'com.brohoof.minelp'
version = '1.9.4.2' version = '1.10.0.0'
description = 'Mine Little Pony' description = 'Mine Little Pony'
minecraft { minecraft {
version = "1.9.4" version = "1.10"
mappings = 'snapshot_20160517' mappings = 'snapshot_20160619'
runDir = 'run' runDir = 'run'
replace '@VERSION@',project.version replace '@VERSION@',project.version
} }

1
src/main/java/com/brohoof/minelittlepony/PonyManager.java
View file

@ -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 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 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 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 STEVE = new ResourceLocation(NAMESPACE, "textures/entity/steve_pony.png");
public static final ResourceLocation ALEX = new ResourceLocation(NAMESPACE, "textures/entity/alex_pony.png"); public static final ResourceLocation ALEX = new ResourceLocation(NAMESPACE, "textures/entity/alex_pony.png");

14
src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java
View file

@ -13,6 +13,7 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntitySkeleton;
import net.minecraft.entity.monster.SkeletonType;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
public class RenderPonySkeleton extends RenderPonyMob<EntitySkeleton> { public class RenderPonySkeleton extends RenderPonyMob<EntitySkeleton> {
@ -30,7 +31,8 @@ public class RenderPonySkeleton extends RenderPonyMob<EntitySkeleton> {
@Override @Override
protected void preRenderCallback(EntitySkeleton skeleton, float partialTicks) { protected void preRenderCallback(EntitySkeleton skeleton, float partialTicks) {
super.preRenderCallback(skeleton, 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); GlStateManager.scale(1.2F, 1.2F, 1.2F);
} }
@ -49,13 +51,19 @@ public class RenderPonySkeleton extends RenderPonyMob<EntitySkeleton> {
} }
PonySize[] sizes = PonySize.values(); PonySize[] sizes = PonySize.values();
PonySize size = sizes[rand.nextInt(sizes.length)]; 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.setTail(TailLengths.STUB);
this.playerModel.getModel().metadata.setGlowColor(rand.nextInt()); this.playerModel.getModel().metadata.setGlowColor(rand.nextInt());
} }
@Override @Override
protected ResourceLocation getEntityTexture(EntitySkeleton skeleton) { 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;
} }
} }