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

Cleanup

Browse source
This commit is contained in:
Aidan C. Brady 2014-08-25 09:00:01 -04:00
parent ba71f26a75
commit ec1c02d2e5
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/mekanism/common/multipart/PartUniversalCable.java
View file

@ -26,7 +26,6 @@ import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver; import buildcraft.api.power.PowerHandler.PowerReceiver;
import codechicken.lib.vec.Vector3; import codechicken.lib.vec.Vector3;
import cofh.api.energy.IEnergyHandler; import cofh.api.energy.IEnergyHandler;
import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.common.Optional.InterfaceList;
import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.common.Optional.Method;
@ -93,6 +92,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
if(MekanismUtils.useIC2()) if(MekanismUtils.useIC2())
{ {
List<ForgeDirection> sides = getConnections(ConnectionType.PULL); List<ForgeDirection> sides = getConnections(ConnectionType.PULL);
if(!sides.isEmpty()) if(!sides.isEmpty())
{ {
TileEntity[] connectedOutputters = CableUtils.getConnectedOutputters(tile()); TileEntity[] connectedOutputters = CableUtils.getConnectedOutputters(tile());
@ -105,14 +105,15 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
if(acceptor instanceof IEnergySource) if(acceptor instanceof IEnergySource)
{ {
double received = ((IEnergySource) acceptor).getOfferedEnergy() * general.FROM_IC2; double received = ((IEnergySource) acceptor).getOfferedEnergy()*general.FROM_IC2;
double toDraw = received; double toDraw = received;
if(received > 0) if(received > 0)
{ {
toDraw -= getTransmitterNetwork().emit(received); toDraw -= getTransmitterNetwork().emit(received);
} }
((IEnergySource) acceptor).drawEnergy(toDraw * general.TO_IC2);
((IEnergySource)acceptor).drawEnergy(toDraw*general.TO_IC2);
} }
} }
} }
@ -310,7 +311,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
@Method(modid = "CoFHAPI|energy") @Method(modid = "CoFHAPI|energy")
public int getMaxEnergyStored(ForgeDirection from) public int getMaxEnergyStored(ForgeDirection from)
{ {
return (int)Math.round(getTransmitterNetwork().getEnergyNeeded()* general.TO_TE); return (int)Math.round(getTransmitterNetwork().getEnergyNeeded()*general.TO_TE);
} }
@Override @Override
@ -387,7 +388,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
@Method(modid = "BuildCraftAPI|power") @Method(modid = "BuildCraftAPI|power")
private void reconfigure() private void reconfigure()
{ {
float needed = (float)(getTransmitterNetwork().getEnergyNeeded()* general.TO_BC); float needed = (float)(getTransmitterNetwork().getEnergyNeeded()*general.TO_BC);
powerHandler.configure(1, needed, 0, needed); powerHandler.configure(1, needed, 0, needed);
} }
@ -397,7 +398,7 @@ public class PartUniversalCable extends PartTransmitter<EnergyNetwork> implement
{ {
if(powerHandler.getEnergyStored() > 0) if(powerHandler.getEnergyStored() > 0)
{ {
getTransmitterNetwork().emit(powerHandler.getEnergyStored()* general.FROM_BC); getTransmitterNetwork().emit(powerHandler.getEnergyStored()*general.FROM_BC);
} }
powerHandler.setEnergy(0); powerHandler.setEnergy(0);