diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index c5827080b..2d5799eec 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -261,7 +261,7 @@ public class ClientTickHandler { SoundHandler.addSound(player, JETPACK, client.replaceSoundsWhenResuming); } - + SoundHandler.playSound(player, JETPACK); } } diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 8609d478e..e22cce1dd 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -110,12 +110,7 @@ public class RenderTickHandler continue; } - Pos3D playerPos = new Pos3D(p); - - if(p != mc.thePlayer) - { - playerPos = playerPos.translate(0, 1.7, 0); - } + Pos3D playerPos = new Pos3D(p).translate(0, 1.7, 0); float random = (rand.nextFloat() - 0.5F) * 0.1F; diff --git a/src/main/java/mekanism/client/render/entity/RenderBalloon.java b/src/main/java/mekanism/client/render/entity/RenderBalloon.java index a892fdd86..8faf5fe79 100644 --- a/src/main/java/mekanism/client/render/entity/RenderBalloon.java +++ b/src/main/java/mekanism/client/render/entity/RenderBalloon.java @@ -60,7 +60,6 @@ public class RenderBalloon extends Render GL11.glPushMatrix(); GL11.glTranslated(x, y, z); GL11.glRotatef(180, 1, 0, 0); - GL11.glTranslatef(0, 0.9F, 0); mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Balloon.png")); diff --git a/src/main/java/mekanism/common/entity/EntityBalloon.java b/src/main/java/mekanism/common/entity/EntityBalloon.java index a6d6fcb1c..9297c1196 100644 --- a/src/main/java/mekanism/common/entity/EntityBalloon.java +++ b/src/main/java/mekanism/common/entity/EntityBalloon.java @@ -40,7 +40,6 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData ignoreFrustumCheck = true; preventEntitySpawning = true; setPosition(posX + 0.5F, posY + 3F, posZ + 0.5F); -//TODO yOffset = height / 2.0F; setSize(0.25F, 0.25F); motionY = 0.04; @@ -89,7 +88,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData this(world); latched = obj; - setPosition(latched.getX() + 0.5F, latched.getY() + 2.8F, latched.getZ() + 0.5F); + setPosition(latched.getX() + 0.5F, latched.getY() + 1.9F, latched.getZ() + 0.5F); prevPosX = posX; prevPosY = posY; @@ -218,7 +217,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData public double getAddedHeight() { - return latchedEntity.height + (latchedEntity instanceof EntityPlayer ? 0.25F : 1.7F); + return latchedEntity.height + 0.8; } private int getFloor(EntityLivingBase entity) @@ -272,7 +271,7 @@ public class EntityBalloon extends Entity implements IEntityAdditionalSpawnData @SideOnly(Side.CLIENT) private void doParticle() { - Pos3D pos = new Pos3D(posX + (rand.nextFloat()*.6 - 0.3), posY - 0.8 + (rand.nextFloat()*.6 - 0.3), posZ + (rand.nextFloat()*.6 - 0.3)); + Pos3D pos = new Pos3D(posX + (rand.nextFloat()*.6 - 0.3), posY + (rand.nextFloat()*.6 - 0.3), posZ + (rand.nextFloat()*.6 - 0.3)); EntityFX fx = new EntityReddustFX.Factory().getEntityFX(0, worldObj, pos.xCoord, pos.yCoord, pos.zCoord, 0, 0, 0); fx.setRBGColorF(color.getColor(0), color.getColor(1), color.getColor(2));