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

A bit more tidying

Browse source
This commit is contained in:
Aidan C. Brady 2015-04-06 11:10:57 -04:00
parent ec7b0555c9
commit 034d732e15
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/mekanism/api/energy/EnergyAcceptorWrapper.java
View file

@ -18,6 +18,7 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
public static EnergyAcceptorWrapper get(TileEntity tileEntity)
{
EnergyAcceptorWrapper wrapper = null;
if(tileEntity instanceof IStrictEnergyAcceptor)
{
wrapper = new MekanismAcceptor((IStrictEnergyAcceptor)tileEntity);
@ -30,10 +31,12 @@ public abstract class EnergyAcceptorWrapper implements IStrictEnergyAcceptor
{
wrapper = new IC2Acceptor((IEnergySink)tileEntity);
}
if(wrapper != null)
{
wrapper.coord = Coord4D.get(tileEntity);
}
return wrapper;
}

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

@ -62,8 +62,8 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
{
currentPower = (9 * currentPower + targetPower) / 10;
}
} else
{
}
else {
if(getTransmitter().hasTransmitterNetwork() && getTransmitter().getTransmitterNetworkSize() > 0)
{
double last = getSaveShare();
@ -102,7 +102,8 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
((IStrictEnergyStorage)outputter).setEnergy(((IStrictEnergyStorage)outputter).getEnergy() - toDraw);
}
} else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider)
}
else if(MekanismUtils.useRF() && outputter instanceof IEnergyProvider)
{
double received = ((IEnergyProvider)outputter).extractEnergy(side.getOpposite(), (int)(canDraw*general.TO_TE), true) * general.FROM_TE;
double toDraw = received;
@ -341,8 +342,8 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
if(getTransmitter().hasTransmitterNetwork())
{
return getTransmitter().getTransmitterNetwork().buffer.amount;
} else
{
}
else {
return buffer.amount;
}
}
@ -353,8 +354,8 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
if(getTransmitter().hasTransmitterNetwork())
{
getTransmitter().getTransmitterNetwork().buffer.amount = energy;
} else
{
}
else {
buffer.amount = energy;
}
}
@ -367,10 +368,12 @@ public class PartUniversalCable extends PartTransmitter<EnergyAcceptorWrapper, E
}
else {
double used = Math.min(getCapacity() - buffer.amount, energy);
if(doEmit)
{
buffer.amount += used;
}
return energy - used;
}
}