diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java index 86e921166..c57ac3b97 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergyCube.java @@ -20,7 +20,6 @@ import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; - import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; @@ -55,22 +54,25 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe { super.onUpdate(); - ChargeUtils.charge(0, this); - ChargeUtils.discharge(1, this); - - if(MekanismUtils.canFunction(this)) + if(!worldObj.isRemote) { - CableUtils.emit(this); + ChargeUtils.charge(0, this); + ChargeUtils.discharge(1, this); + + if(MekanismUtils.canFunction(this)) + { + CableUtils.emit(this); + } + + int newScale = getScaledEnergyLevel(20); + + if(newScale != prevScale) + { + Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); + } + + prevScale = newScale; } - - int newScale = getScaledEnergyLevel(20); - - if(newScale != prevScale) - { - Mekanism.packetHandler.sendToAllAround(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList())), Coord4D.get(this).getTargetPoint(50D)); - } - - prevScale = newScale; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 1ea82fa74..916fab482 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -46,10 +46,10 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui { super.onUpdate(); - ChargeUtils.charge(1, this); - if(inventory[0] != null) { + ChargeUtils.charge(1, this); + FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); if(fluid != null && FluidRegistry.isFluidRegistered("bioethanol")) diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index df3a3a12a..45a642c26 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -15,7 +15,6 @@ import net.minecraft.world.biome.BiomeGenDesert; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; - import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; @@ -63,10 +62,10 @@ public class TileEntitySolarGenerator extends TileEntityGenerator { super.onUpdate(); - ChargeUtils.charge(0, this); - if(!worldObj.isRemote) { + ChargeUtils.charge(0, this); + if(worldObj.isDaytime() && ((!worldObj.isRaining() && !worldObj.isThundering()) || isDesert()) && !worldObj.provider.hasNoSky && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord)) { seesSun = true; diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java index 82cd4b4f3..f423f951b 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -8,7 +8,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Optional.Method; - import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.peripheral.IComputerAccess; @@ -28,10 +27,10 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound { super.onUpdate(); - ChargeUtils.charge(0, this); - if(!worldObj.isRemote) { + ChargeUtils.charge(0, this); + if(canOperate()) { setActive(true);