Merge branch 'master' of github.com:SirSengir/BuildCraft into LiquidPipeRewrite

This commit is contained in:
Krapht 2012-07-21 13:18:49 +02:00
commit 500aab5925
2 changed files with 7 additions and 0 deletions

View file

@ -9,6 +9,7 @@ public interface ILiquidTank {
*/ */
LiquidStack getLiquid(); LiquidStack getLiquid();
void setLiquid(LiquidStack liquid); void setLiquid(LiquidStack liquid);
void setCapacity(int capacity);
int getCapacity(); int getCapacity();
/** /**

View file

@ -25,10 +25,16 @@ public class LiquidTank implements ILiquidTank {
this.liquid = liquid; this.liquid = liquid;
} }
@Override
public void setCapacity(int capacity) {
this.capacity = capacity;
}
@Override @Override
public int getCapacity() { public int getCapacity() {
return this.capacity; return this.capacity;
} }
@Override @Override
public int fill(LiquidStack resource, boolean doFill) { public int fill(LiquidStack resource, boolean doFill) {
if(resource == null || resource.itemID <= 0) if(resource == null || resource.itemID <= 0)