Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Updates.

Browse source
This commit is contained in:
AJ Fleming 2012-07-09 19:00:24 -05:00
parent 945f9c962b
commit 9d720d48ec
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
minecraft/net/minecraft/src/eui/pipes/TileEntityPipe.java
View file

@ -47,9 +47,12 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer
}
else
{
if(tileEntity instanceof ILiquidConsumer || tileEntity instanceof ILiquidProducer)
if(tileEntity instanceof ILiquidProducer)
{
this.connectedBlocks[side] = tileEntity;
if(((ILiquidProducer) tileEntity).canConnectFromTypeAndSide(this.getType(), side)) this.connectedBlocks[side] = tileEntity;
}else if(tileEntity instanceof ILiquidConsumer)
{
if(((ILiquidConsumer) tileEntity).canConnectFromTypeAndSide(this.getType(), side)) this.connectedBlocks[side] = tileEntity;
}
else
{
@ -67,13 +70,13 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer
* @return watt - The amount of rejected power to be sent back into the conductor
*/
@Override
public int onReceiveLiquid(int type,int watt, byte side)
public int onReceiveLiquid(int type,int amt, byte side)
{
if(type == this.type)
{
int rejectedElectricity = Math.max((this.getStoredLiquid(type) + watt) - this.capacity, 0);
this.liquidStored = watt - rejectedElectricity;
return rejectedElectricity;
int rejectedLiquid = Math.max((this.getStoredLiquid(type) + amt) - this.capacity, 0);
this.liquidStored += watt - rejectedElectricity;
return rejectedLiquid;
}
return watt;
}
@ -154,7 +157,7 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer
}
/**
* @return Return the stored electricity in this consumer. Called by conductors to spread electricity to this unit.
* @return Return the stored liquid in this consumer. Called by conductors to spread electricity to this unit.
*/
@Override
public int getStoredLiquid(int type)