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

Fixed witch hats being in the wrong position when riding

Browse source
This commit is contained in:
Sollace 2018-08-18 16:16:11 +02:00
parent 9c446122b8
commit 50c7b373fc
2 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/main/java/com/minelittlepony/model/ponies/ModelWitchPony.java
View file

@ -1,6 +1,7 @@
package com.minelittlepony.model.ponies; package com.minelittlepony.model.ponies;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EntityLivingBase;
@ -8,7 +9,10 @@ import net.minecraft.entity.monster.EntityWitch;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import org.lwjgl.opengl.GL11;
import com.minelittlepony.model.player.ModelZebra; import com.minelittlepony.model.player.ModelZebra;
import com.minelittlepony.pony.data.Pony;
import com.minelittlepony.render.PonyRenderer; import com.minelittlepony.render.PonyRenderer;
public class ModelWitchPony extends ModelZebra { public class ModelWitchPony extends ModelZebra {
@ -21,7 +25,9 @@ public class ModelWitchPony extends ModelZebra {
super(false); super(false);
} }
public void setLivingAnimations(EntityLivingBase entity, float move, float swing, float ticks) { @Override
public void updateLivingState(EntityLivingBase entity, Pony pony) {
super.updateLivingState(entity, pony);
EntityWitch witch = ((EntityWitch) entity); EntityWitch witch = ((EntityWitch) entity);
leftArmPose = ArmPose.EMPTY; leftArmPose = ArmPose.EMPTY;
@ -68,14 +74,21 @@ public class ModelWitchPony extends ModelZebra {
} }
@Override @Override
public void render(Entity entityIn, float move, float swing, float ticks, float headYaw, float headPitch, float scale) { public boolean isChild() {
super.render(entityIn, move, swing, ticks, headYaw, headPitch, scale); return isChild;
}
copyModelAngles(bipedHead, witchHat); @Override
protected void renderHead(Entity entity, float move, float swing, float ticks, float headYaw, float headPitch, float scale) {
super.renderHead(entity, move, swing, ticks, headYaw, headPitch, scale);
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
TextureManager tex = Minecraft.getMinecraft().getRenderManager().renderEngine; TextureManager tex = Minecraft.getMinecraft().getRenderManager().renderEngine;
tex.bindTexture(WITCH_TEXTURES); tex.bindTexture(WITCH_TEXTURES);
witchHat.render(scale * 1.3f); witchHat.render(scale * 1.3F);
GlStateManager.popAttrib();
} }
@Override @Override

12
src/main/java/com/minelittlepony/render/ponies/RenderPonyWitch.java
View file

@ -3,7 +3,6 @@ package com.minelittlepony.render.ponies;
import com.minelittlepony.model.PMAPI; import com.minelittlepony.model.PMAPI;
import com.minelittlepony.render.RenderPonyMob; import com.minelittlepony.render.RenderPonyMob;
import com.minelittlepony.render.layer.LayerHeldPonyItem; import com.minelittlepony.render.layer.LayerHeldPonyItem;
import com.minelittlepony.render.layer.LayerHeldPonyItemMagical;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType;
@ -23,16 +22,11 @@ public class RenderPonyWitch extends RenderPonyMob<EntityWitch> {
@Override @Override
protected LayerHeldPonyItem<EntityWitch> createItemHoldingLayer() { protected LayerHeldPonyItem<EntityWitch> createItemHoldingLayer() {
return new LayerHeldPonyItemMagical<EntityWitch>(this) { return new LayerHeldPonyItem<EntityWitch>(this) {
@Override @Override
protected void preItemRender(EntityWitch entity, ItemStack drop, TransformType transform, EnumHandSide hand) { protected void preItemRender(EntityWitch entity, ItemStack drop, TransformType transform, EnumHandSide hand) {
if (isUnicorn()) { GlStateManager.translate(0, -0.3F, -0.8F);
GlStateManager.translate(-0.1F, 0.7F, 0); GlStateManager.rotate(10, 1, 0, 0);
GlStateManager.rotate(110, 1, 0, 0);
} else {
GlStateManager.translate(0, -0.3F, -0.8F);
GlStateManager.rotate(10, 1, 0, 0);
}
} }
}; };
} }