diff --git a/common/net/minecraftforge/liquids/LiquidTank.java b/common/net/minecraftforge/liquids/LiquidTank.java index 3aafc3f0e..eaf92b476 100644 --- a/common/net/minecraftforge/liquids/LiquidTank.java +++ b/common/net/minecraftforge/liquids/LiquidTank.java @@ -6,116 +6,137 @@ import net.minecraft.tileentity.TileEntity; * Reference implementation of ILiquidTank. Use this or implement your own. */ public class LiquidTank implements ILiquidTank { - private LiquidStack liquid; - private int capacity; - private int tankPressure; - private TileEntity tile; + private LiquidStack liquid; + private int capacity; + private int tankPressure; + private TileEntity tile; - public LiquidTank(int capacity) { - this(null, capacity); - } + public LiquidTank(int capacity) + { + this(null, capacity); + } - public LiquidTank(int liquidId, int quantity, int capacity) { - this(new LiquidStack(liquidId, quantity), capacity); - } + public LiquidTank(int liquidId, int quantity, int capacity) + { + this(new LiquidStack(liquidId, quantity), capacity); + } - public LiquidTank(int liquidId, int quantity, int capacity, TileEntity tile) { - this(liquidId, quantity, capacity); - this.tile = tile; - } + public LiquidTank(int liquidId, int quantity, int capacity, TileEntity tile) + { + this(liquidId, quantity, capacity); + this.tile = tile; + } - public LiquidTank(LiquidStack liquid, int capacity) { - this.liquid = liquid; - this.capacity = capacity; - } + public LiquidTank(LiquidStack liquid, int capacity) + { + this.liquid = liquid; + this.capacity = capacity; + } - public LiquidTank(LiquidStack liquid, int capacity, TileEntity tile) - { - this(liquid, capacity); - this.tile = tile; - } - @Override - public LiquidStack getLiquid() { - return this.liquid; - } + public LiquidTank(LiquidStack liquid, int capacity, TileEntity tile) + { + this(liquid, capacity); + this.tile = tile; + } - @Override - public int getCapacity() { - return this.capacity; - } + @Override + public LiquidStack getLiquid() + { + return this.liquid; + } - @Override - public int fill(LiquidStack resource, boolean doFill) { - if(resource == null || resource.itemID <= 0) - return 0; + @Override + public int getCapacity() + { + return this.capacity; + } - if(liquid == null || liquid.itemID <= 0) { - if(resource.amount <= capacity) { - if(doFill) - this.liquid = resource.copy(); - return resource.amount; - } else { - if(doFill) { - this.liquid = resource.copy(); - this.liquid.amount = capacity; - if (tile!=null) - LiquidEvent.fireEvent(new LiquidEvent.LiquidFillingEvent(liquid, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord, this)); - } - return capacity; - } - } + public void setLiquid(LiquidStack liquid) + { + this.liquid = liquid; + } - if(!liquid.isLiquidEqual(resource)) - return 0; + public void setCapacity(int capacity) + { + this.capacity = capacity; + } - int space = capacity - liquid.amount; - if(resource.amount <= space) { - if(doFill) - this.liquid.amount += resource.amount; - return resource.amount; - } else { + @Override + public int fill(LiquidStack resource, boolean doFill) + { + if (resource == null || resource.itemID <= 0) return 0; - if(doFill) - this.liquid.amount = capacity; - return space; - } + if (liquid == null || liquid.itemID <= 0) + { + if (resource.amount <= capacity) + { + if (doFill) this.liquid = resource.copy(); + return resource.amount; + } + else + { + if (doFill) + { + this.liquid = resource.copy(); + this.liquid.amount = capacity; + if (tile != null) + LiquidEvent.fireEvent(new LiquidEvent.LiquidFillingEvent(liquid, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord, this)); + } + return capacity; + } + } - } - @Override - public LiquidStack drain(int maxDrain, boolean doDrain) { - if(liquid == null || liquid.itemID <= 0) - return null; - if(liquid.amount <= 0) - return null; + if (!liquid.isLiquidEqual(resource)) return 0; - int used = maxDrain; - if(liquid.amount < used) - used = liquid.amount; + int space = capacity - liquid.amount; + if (resource.amount <= space) + { + if (doFill) this.liquid.amount += resource.amount; + return resource.amount; + } + else + { - if(doDrain) { - liquid.amount -= used; - } + if (doFill) this.liquid.amount = capacity; + return space; + } - LiquidStack drained = new LiquidStack(liquid.itemID, used, liquid.itemMeta); + } - // Reset liquid if emptied - if(liquid.amount <= 0) - liquid = null; + @Override + public LiquidStack drain(int maxDrain, boolean doDrain) + { + if (liquid == null || liquid.itemID <= 0) return null; + if (liquid.amount <= 0) return null; - if (doDrain && tile!=null) - LiquidEvent.fireEvent(new LiquidEvent.LiquidDrainingEvent(drained, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord, this)); + int used = maxDrain; + if (liquid.amount < used) used = liquid.amount; - return drained; - } + if (doDrain) + { + liquid.amount -= used; + } - @Override - public int getTankPressure() { - return tankPressure; - } + LiquidStack drained = new LiquidStack(liquid.itemID, used, liquid.itemMeta); - public void setTankPressure(int pressure) - { - this.tankPressure = pressure; - } + // Reset liquid if emptied + if (liquid.amount <= 0) liquid = null; + + if (doDrain && tile != null) + LiquidEvent.fireEvent(new LiquidEvent.LiquidDrainingEvent(drained, tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord, this)); + + return drained; + } + + @Override + public int getTankPressure() + { + return tankPressure; + } + + public void setTankPressure(int pressure) + { + this.tankPressure = pressure; + } } diff --git a/fml-src-1.4.6-4.6.4.505-master.zip b/fml-src-1.4.6-4.6.6.507-master.zip similarity index 98% rename from fml-src-1.4.6-4.6.4.505-master.zip rename to fml-src-1.4.6-4.6.6.507-master.zip index 49a324325..becd1b99f 100644 Binary files a/fml-src-1.4.6-4.6.4.505-master.zip and b/fml-src-1.4.6-4.6.6.507-master.zip differ