tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a few energy transfer issues

Browse source
This commit is contained in:
Aidan C. Brady 2014-07-23 13:49:42 -04:00
parent 2b5bb53bc6
commit bb8985b6f8
4 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/mekanism/common/tile/TileEntityEnergyCube.java
View file

@ -20,7 +20,6 @@ import net.minecraft.util.MathHelper;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.Optional.Method;
import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.ILuaContext;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.api.peripheral.IPeripheral;
@ -55,6 +54,8 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe
{ {
super.onUpdate(); super.onUpdate();
if(!worldObj.isRemote)
{
ChargeUtils.charge(0, this); ChargeUtils.charge(0, this);
ChargeUtils.discharge(1, this); ChargeUtils.discharge(1, this);
@ -72,6 +73,7 @@ public class TileEntityEnergyCube extends TileEntityElectricBlock implements IPe
prevScale = newScale; prevScale = newScale;
} }
}
@Override @Override
public String getInventoryName() public String getInventoryName()

4
src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java
View file

@ -46,10 +46,10 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui
{ {
super.onUpdate(); super.onUpdate();
ChargeUtils.charge(1, this);
if(inventory[0] != null) if(inventory[0] != null)
{ {
ChargeUtils.charge(1, this);
FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]); FluidStack fluid = FluidContainerRegistry.getFluidForFilledItem(inventory[0]);
if(fluid != null && FluidRegistry.isFluidRegistered("bioethanol")) if(fluid != null && FluidRegistry.isFluidRegistered("bioethanol"))

5
src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java
View file

@ -15,7 +15,6 @@ import net.minecraft.world.biome.BiomeGenDesert;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.ModAPIManager;
import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.Optional.Method;
import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.ILuaContext;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
@ -63,10 +62,10 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
{ {
super.onUpdate(); super.onUpdate();
ChargeUtils.charge(0, this);
if(!worldObj.isRemote) if(!worldObj.isRemote)
{ {
ChargeUtils.charge(0, this);
if(worldObj.isDaytime() && ((!worldObj.isRaining() && !worldObj.isThundering()) || isDesert()) && !worldObj.provider.hasNoSky && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord)) if(worldObj.isDaytime() && ((!worldObj.isRaining() && !worldObj.isThundering()) || isDesert()) && !worldObj.provider.hasNoSky && worldObj.canBlockSeeTheSky(xCoord, yCoord+1, zCoord))
{ {
seesSun = true; seesSun = true;

5
src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java
View file

@ -8,7 +8,6 @@ import mekanism.common.util.MekanismUtils;
import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.MekanismGenerators;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.Optional.Method;
import dan200.computercraft.api.lua.ILuaContext; import dan200.computercraft.api.lua.ILuaContext;
import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IComputerAccess;
@ -28,10 +27,10 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound
{ {
super.onUpdate(); super.onUpdate();
ChargeUtils.charge(0, this);
if(!worldObj.isRemote) if(!worldObj.isRemote)
{ {
ChargeUtils.charge(0, this);
if(canOperate()) if(canOperate())
{ {
setActive(true); setActive(true);