Anvilcraft/aether-legacy
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Aerbunny hop tweak

Browse source
This commit is contained in:
Kino 2017-03-04 23:09:31 -05:00
parent c364f687ef
commit 80173becd4
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/legacy/aether/client/renders/entities/AerbunnyRenderer.java
View file

@ -40,7 +40,7 @@ public class AerbunnyRenderer extends RenderLiving<EntityAerbunny>
}
}
this.model.puffiness = (float)entitybunny.getPuffiness() / 10.0F;
this.model.puffiness = (float)(entitybunny.getRidingEntity() != null ? entitybunny.getPuffinessClient() : entitybunny.getPuffiness()) / 10.0F;
}
protected void preRenderCallback(EntityAerbunny entitybunny, float f)

45
src/main/java/com/legacy/aether/server/entities/passive/mountable/EntityAerbunny.java
View file

@ -28,6 +28,8 @@ import com.legacy.aether.server.registry.sounds.SoundsAether;
public class EntityAerbunny extends EntityAetherAnimal
{
public static final DataParameter<Integer> PUFF = EntityDataManager.<Integer>createKey(EntityAerbunny.class, DataSerializers.VARINT);
public int puffiness;
private int jumpTicks;
@ -102,26 +104,43 @@ public class EntityAerbunny extends EntityAetherAnimal
}
}
public int getPuffiness()
public int getPuffinessClient()
{
return this.puffiness;
}
public void setPuffiness(int i)
public int getPuffiness()
{
return this.dataManager.get(PUFF);
}
public void setPuffinessClient(int i)
{
this.puffiness = i;
}
public void setPuffiness(int i)
{
this.dataManager.set(PUFF, i);
}
@Override
protected void entityInit()
{
super.entityInit();
this.dataManager.register(PUFF, new Integer(0));
}
public void onUpdate()
{
this.setPuffinessClient(this.getPuffinessClient() - 1);
this.setPuffiness(this.getPuffiness() - 1);
if (this.getPuffinessClient() < 0)
{
this.setPuffinessClient(0);
}
if (this.getPuffiness() < 0)
{
this.setPuffiness(0);
@ -155,6 +174,8 @@ public class EntityAerbunny extends EntityAetherAnimal
if (this.getRidingEntity() != null && this.getRidingEntity() instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer) this.getRidingEntity();
if (this.worldObj.isRemote)
{
for(int k = 0; k < 3; k++)
@ -169,22 +190,26 @@ public class EntityAerbunny extends EntityAetherAnimal
this.getNavigator().clearPathEntity();
this.setRotation(this.getRidingEntity().rotationYaw, this.getRidingEntity().rotationPitch);
this.setRotation(player.rotationYaw, player.rotationPitch);
this.getRidingEntity().fallDistance = 0.0F;
player.fallDistance = 0.0F;
if(!this.getRidingEntity().onGround)
if(!player.onGround)
{
this.getRidingEntity().motionY += 0.05000000074505806D;
this.getRidingEntity().fallDistance = 0.0F;
if (!player.capabilities.isFlying)
{
player.motionY += 0.05000000074505806D;
}
if (this.getRidingEntity().motionY < -0.22499999403953552D)
player.fallDistance = 0.0F;
if (player.motionY < -0.22499999403953552D)
{
if (PlayerAether.get((EntityPlayer) this.getRidingEntity()).isJumping())
{
this.setPuffiness(11);
this.setPuffinessClient(11);
this.spawnExplosionParticle();
this.getRidingEntity().motionY = 0.125D;
player.motionY = 0.125D;
}
}
}