Merge branch 'master' of github.com:BuildCraft/BuildCraft into 6.1.x

This commit is contained in:
Adrian Siekierka 2014-11-04 12:04:30 +01:00
commit 8daf2f695a

View file

@ -257,11 +257,7 @@ public class EntityRobot extends EntityRobotBase implements
if (energyFX >= 100) {
energyFX = 0;
Minecraft.getMinecraft().effectRenderer.addEffect(new EntityRobotEnergyFX(
worldObj,
posX + steamDx * 0.25, posY + steamDy * 0.25, posZ + steamDz * 0.25,
steamDx * 0.05, steamDy * 0.05, steamDz * 0.05,
energySpendPerCycle * 0.075F < 1 ? 1 : energySpendPerCycle * 0.075F));
spawnEnergyFX();
}
}
@ -317,6 +313,14 @@ public class EntityRobot extends EntityRobotBase implements
super.onEntityUpdate();
}
@SideOnly(Side.CLIENT)
private void spawnEnergyFX() {
Minecraft.getMinecraft().effectRenderer.addEffect(new EntityRobotEnergyFX(
worldObj,
posX + steamDx * 0.25, posY + steamDy * 0.25, posZ + steamDz * 0.25,
steamDx * 0.05, steamDy * 0.05, steamDz * 0.05,
energySpendPerCycle * 0.075F < 1 ? 1 : energySpendPerCycle * 0.075F));
}
public void setRegularBoundingBox() {
width = 0.5F;