PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 16:24:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed parrots spazzing out when riding a pony. I GET IT I'M A TALKING HORSE GASH

Browse source
This commit is contained in:
Sollace 2018-06-07 23:19:54 +02:00
parent 9611198a86
commit a4a6e7a1c4
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/com/minelittlepony/render/layer/LayerEntityOnPonyShoulder.java
View file

@ -14,9 +14,6 @@ import net.minecraft.nbt.NBTTagCompound;
import javax.annotation.Nullable; import javax.annotation.Nullable;
/**
* TODO: Looks like {@link LayerEntityOnShoulder}
*/
public class LayerEntityOnPonyShoulder extends AbstractPonyLayer<AbstractClientPlayer> { public class LayerEntityOnPonyShoulder extends AbstractPonyLayer<AbstractClientPlayer> {
private final RenderManager renderManager; private final RenderManager renderManager;
@ -38,20 +35,20 @@ public class LayerEntityOnPonyShoulder extends AbstractPonyLayer<AbstractClientP
NBTTagCompound leftTag = player.getLeftShoulderEntity(); NBTTagCompound leftTag = player.getLeftShoulderEntity();
if (!leftTag.hasNoTags()) { if (!leftTag.hasNoTags()) {
leftEntity = renderShoulderEntity(player, leftEntity, leftTag, partialTicks, true); leftEntity = renderShoulderEntity(player, leftEntity, leftTag, headYaw, headPitch, true);
} }
NBTTagCompound rightTag = player.getRightShoulderEntity(); NBTTagCompound rightTag = player.getRightShoulderEntity();
if (!rightTag.hasNoTags()) { if (!rightTag.hasNoTags()) {
rightEntity = renderShoulderEntity(player, rightEntity, rightTag, partialTicks, false); rightEntity = renderShoulderEntity(player, rightEntity, rightTag, headYaw, headPitch, false);
} }
GlStateManager.disableRescaleNormal(); GlStateManager.disableRescaleNormal();
} }
@Nullable @Nullable
private EntityLivingBase renderShoulderEntity(AbstractClientPlayer player, @Nullable EntityLivingBase entity, NBTTagCompound shoulderTag, float partialTicks, boolean left) { private EntityLivingBase renderShoulderEntity(AbstractClientPlayer player, @Nullable EntityLivingBase entity, NBTTagCompound shoulderTag, float headYaw, float headPitch, boolean left) {
if (entity == null || !entity.getUniqueID().equals(shoulderTag.getUniqueId("UUID"))) { if (entity == null || !entity.getUniqueID().equals(shoulderTag.getUniqueId("UUID"))) {
entity = (EntityLivingBase) EntityList.createEntityFromNBT(shoulderTag, player.world); entity = (EntityLivingBase) EntityList.createEntityFromNBT(shoulderTag, player.world);
@ -76,7 +73,13 @@ public class LayerEntityOnPonyShoulder extends AbstractPonyLayer<AbstractClientP
GlStateManager.scale(1, -1, -1); GlStateManager.scale(1, -1, -1);
GlStateManager.rotate(left ? -5 : 5, 0, 0, 1); GlStateManager.rotate(left ? -5 : 5, 0, 0, 1);
render.doRender(entity, 0, 0, 0, 0, partialTicks); // look where the player is looking
entity.prevRotationYawHead = headYaw;
entity.rotationYawHead = headYaw;
entity.rotationPitch = headPitch;
entity.prevRotationPitch = headPitch;
render.doRender(entity, 0, 0, 0, 0, 0);
GlStateManager.popMatrix(); GlStateManager.popMatrix();
return entity; return entity;