package net.minecraftforge.liquids;

import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;

/**
 * ItemStack substitute for liquids
 * @author SirSengir
 */
public class LiquidStack
{
    public int itemID;
    public int amount;
    public int itemMeta;

    private LiquidStack(){}

    public LiquidStack(int itemID,  int amount) { this(itemID,        amount, 0); }
    public LiquidStack(Item item,   int amount) { this(item.itemID,   amount, 0); }
    public LiquidStack(Block block, int amount) { this(block.blockID, amount, 0); }

    public LiquidStack(int itemID, int amount, int itemDamage)
    {
        this.itemID = itemID;
        this.amount = amount;
        this.itemMeta = itemDamage;
    }

    public NBTTagCompound writeToNBT(NBTTagCompound nbt)
    {
        nbt.setShort("Id", (short)itemID);
        nbt.setInteger("Amount", amount);
        nbt.setShort("Meta", (short)itemMeta);
        return nbt;
    }

    public void readFromNBT(NBTTagCompound nbt)
    {
        itemID = nbt.getShort("Id");
        amount = nbt.getInteger("Amount");
        itemMeta = nbt.getShort("Meta");
    }

    /**
     * @return A copy of this LiquidStack
     */
    public LiquidStack copy()
    {
        return new LiquidStack(itemID, amount, itemMeta);
    }

    /**
     * @param other
     * @return true if this LiquidStack contains the same liquid as the one passed in.
     */
    public boolean isLiquidEqual(LiquidStack other)
    {
        return other != null && itemID == other.itemID && itemMeta == other.itemMeta;
    }

    /**
     * @param other
     * @return true if this LiquidStack contains the other liquid (liquids are equal and amount >= other.amount).
     */
    public boolean containsLiquid(LiquidStack other)
    {
        return isLiquidEqual(other) && amount >= other.amount;
    }

    /**
     * @param other ItemStack containing liquids.
     * @return true if this LiquidStack contains the same liquid as the one passed in.
     */
    public boolean isLiquidEqual(ItemStack other)
    {
        if (other == null)
        {
            return false;
        }

        if (itemID == other.itemID && itemMeta == other.getItemDamage())
        {
            return true;
        }
        
        return isLiquidEqual(LiquidContainerRegistry.getLiquidForFilledItem(other));
    }

    /**
     * @return ItemStack representation of this LiquidStack
     */
    public ItemStack asItemStack()
    {
        return new ItemStack(itemID, 1, itemMeta);
    }

    /**
     * Reads a liquid stack from the passed nbttagcompound and returns it.
     *
     * @param nbt
     * @return the liquid stack
     */
    public static LiquidStack loadLiquidStackFromNBT(NBTTagCompound nbt)
    {
        LiquidStack liquidstack = new LiquidStack();
        liquidstack.readFromNBT(nbt);
        return liquidstack.itemID == 0 ? null : liquidstack;
    }
}

@@ -41,33 +41,186 @@
 ort 
-net.minecraft.block.Block
+static cpw.mods.fml.relauncher.Side.CLIENT;%0Aimport cpw.mods.fml.relauncher.SideOnly;%0Aimport net.minecraft.block.Block;%0Aimport net.minecraft.client.renderer.texture.TextureManager
 ;%0Aim
@@ -326,16 +326,48 @@
 ompound;
+%0Aimport net.minecraft.util.Icon;
 %0A%0A/**%0A *
@@ -2495,24 +2495,16 @@
       %7D%0A
-        
 %0A       
@@ -3147,11 +3147,280 @@
 k;%0A    %7D
+%0A%0A    @SideOnly(CLIENT)%0A    private Icon renderingIcon;%0A%0A    @SideOnly(CLIENT)%0A    public Icon getRenderingIcon()%0A    %7B%0A        return renderingIcon;%0A    %7D%0A%0A    @SideOnly(CLIENT)%0A    public void setRenderingIcon(Icon icon)%0A    %7B%0A        this.renderingIcon = icon;%0A    %7D
 %0A%7D%0A

Add an Icon to the LiquidStack, for rendering the liquid in various ways