Add Fluid capability (master branch)

patches/minecraft/net/minecraft/item/ItemBucket.java.patch

@@ -9,3 +9,13 @@
 
          if (raytraceresult == null)
          {
+@@ -175,4 +177,9 @@
+             }
+         }
+     }
++
++    @Override
++    public net.minecraftforge.common.capabilities.ICapabilityProvider initCapabilities(ItemStack stack, net.minecraft.nbt.NBTTagCompound nbt) {
++        return new net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper(stack);
++    }
+ }

patches/minecraft/net/minecraft/item/ItemBucketMilk.java.patch

@@ -9,3 +9,13 @@
          }
 
          if (p_77654_3_ instanceof EntityPlayer)
+@@ -55,4 +55,9 @@
+         p_77659_3_.func_184598_c(p_77659_4_);
+         return new ActionResult(EnumActionResult.SUCCESS, p_77659_1_);
+     }
++
++    @Override
++    public net.minecraftforge.common.capabilities.ICapabilityProvider initCapabilities(ItemStack stack, net.minecraft.nbt.NBTTagCompound nbt) {
++        return new net.minecraftforge.fluids.capability.wrappers.FluidBucketWrapper(stack);
++    }
+ }

src/main/java/net/minecraftforge/client/model/ModelDynBucket.java

@@ -31,8 +31,10 @@
 import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 import net.minecraftforge.fluids.IFluidContainerItem;
 
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.google.common.base.Function;
@@ -237,14 +239,7 @@ private BakedDynBucketOverrideHandler()
         @Override
         public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, World world, EntityLivingBase entity)
         {
-            FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack);
-            if (fluidStack == null)
-            {
-                if (stack.getItem() instanceof IFluidContainerItem)
-                {
-                    fluidStack = ((IFluidContainerItem) stack.getItem()).getFluid(stack);
-                }
-            }
+            FluidStack fluidStack = FluidUtil.getFluidContained(stack);
 
             // not a fluid item apparently
             if (fluidStack == null)

src/main/java/net/minecraftforge/client/model/ModelLoader.java

@@ -69,9 +69,10 @@
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.Properties;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
+import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.ProgressManager;
 import net.minecraftforge.fml.common.ProgressManager.ProgressBar;
@@ -355,8 +356,9 @@ public int compare(Item i1, Item i2)
             {
                 // can the milk be put into a bucket?
                 Fluid milk = FluidRegistry.getFluid("milk");
-                FluidStack milkStack = new FluidStack(milk, FluidContainerRegistry.BUCKET_VOLUME);
-                if(FluidContainerRegistry.getContainerCapacity(milkStack, new ItemStack(Items.BUCKET)) == FluidContainerRegistry.BUCKET_VOLUME)
+                FluidStack milkStack = new FluidStack(milk, Fluid.BUCKET_VOLUME);
+                IFluidHandler bucketHandler = FluidUtil.getFluidHandler(new ItemStack(Items.BUCKET));
+                if (bucketHandler != null && bucketHandler.fill(milkStack, false) == Fluid.BUCKET_VOLUME)
                 {
                     setBucketModel(Items.MILK_BUCKET);
                 }

src/main/java/net/minecraftforge/common/ForgeModContainer.java

@@ -36,6 +36,7 @@
 import net.minecraftforge.common.model.animation.CapabilityAnimation;
 import net.minecraftforge.common.network.ForgeNetworkHandler;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.fluids.UniversalBucket;
 import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -372,6 +373,7 @@ public void modConstruction(FMLConstructionEvent evt)
     public void preInit(FMLPreInitializationEvent evt)
     {
         CapabilityItemHandler.register();
+        CapabilityFluidHandler.register();
         CapabilityAnimation.register();
         MinecraftForge.EVENT_BUS.register(MinecraftForge.INTERNAL_HANDLER);
         ForgeChunkManager.captureConfig(evt.getModConfigurationDirectory());

src/main/java/net/minecraftforge/common/capabilities/CapabilityDispatcher.java

@@ -1,5 +1,6 @@
 package net.minecraftforge.common.capabilities;
 
+import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
@@ -66,7 +67,7 @@ public CapabilityDispatcher(Map<ResourceLocation, ICapabilityProvider> list, ICa
     }
 
     @Override
-    public boolean hasCapability(Capability<?> capability, EnumFacing facing)
+    public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing)
     {
         for (ICapabilityProvider cap : caps)
         {
@@ -79,7 +80,7 @@ public boolean hasCapability(Capability<?> capability, EnumFacing facing)
     }
 
     @Override
-    public <T> T getCapability(Capability<T> capability, EnumFacing facing)
+    public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing)
     {
         for (ICapabilityProvider cap : caps)
         {

src/main/java/net/minecraftforge/common/capabilities/ICapabilityProvider.java

@@ -1,5 +1,7 @@
 package net.minecraftforge.common.capabilities;
 
+import javax.annotation.Nullable;
+
 import net.minecraft.util.EnumFacing;
 
 public interface ICapabilityProvider
@@ -19,7 +21,7 @@ public interface ICapabilityProvider
      *   CAN BE NULL. Null is defined to represent 'internal' or 'self'
      * @return True if this object supports the capability.
      */
-    boolean hasCapability(Capability<?> capability, EnumFacing facing);
+    boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing);
 
     /**
      * Retrieves the handler for the capability requested on the specific side.
@@ -31,5 +33,5 @@ public interface ICapabilityProvider
      *   CAN BE NULL. Null is defined to represent 'internal' or 'self'
      * @return True if this object supports the capability.
      */
-    <T> T getCapability(Capability<T> capability, EnumFacing facing);
+    <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing);
 }

src/main/java/net/minecraftforge/fluids/BlockFluidClassic.java

@@ -24,7 +24,7 @@ public class BlockFluidClassic extends BlockFluidBase
     public BlockFluidClassic(Fluid fluid, Material material)
     {
         super(fluid, material);
-        stack = new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME);
+        stack = new FluidStack(fluid, Fluid.BUCKET_VOLUME);
     }
 
     public BlockFluidClassic setFluidStack(FluidStack stack)

src/main/java/net/minecraftforge/fluids/BlockFluidFinite.java

@@ -226,7 +226,7 @@ else if (amt > 0)
     @Override
     public FluidStack drain(World world, BlockPos pos, boolean doDrain)
     {
-        final FluidStack fluidStack = new FluidStack(getFluid(), MathHelper.floor_float(getQuantaPercentage(world, pos) * FluidContainerRegistry.BUCKET_VOLUME));
+        final FluidStack fluidStack = new FluidStack(getFluid(), MathHelper.floor_float(getQuantaPercentage(world, pos) * Fluid.BUCKET_VOLUME));
 
         if (doDrain)
         {

src/main/java/net/minecraftforge/fluids/Fluid.java

@@ -30,6 +30,8 @@
  */
 public class Fluid
 {
+    public static final int BUCKET_VOLUME = 1000;
+
     /** The unique identification name for this fluid. */
     protected final String fluidName;
 

src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java

@@ -17,10 +17,7 @@
  * Register simple items that contain fluids here. Useful for buckets, bottles, and things that have
  * ID/metadata mappings.
  *
- * For more complex items, use {@link IFluidContainerItem} instead.
- *
- * Deprecated: We will eventually be moving this ALL away from a registry and instead EVERYTHING will use IFluidContainerItem.
- * We need to decide a way of swapping Items/Stacks.
+ * @deprecated This will be removed soon. Create an item like {@link net.minecraftforge.fluids.capability.ItemFluidContainer}
  */
 @Deprecated
 public abstract class FluidContainerRegistry
@@ -70,8 +67,11 @@ public boolean equals(Object o)
     private static Map<ContainerKey, FluidContainerData> filledContainerMap = Maps.newHashMap();
     private static Set<ContainerKey> emptyContainers = Sets.newHashSet();
 
-    public static final int BUCKET_VOLUME = 1000;
+    @Deprecated
+    public static final int BUCKET_VOLUME = Fluid.BUCKET_VOLUME;
+    @Deprecated
     public static final ItemStack EMPTY_BUCKET = new ItemStack(Items.BUCKET);
+    @Deprecated
     public static final ItemStack EMPTY_BOTTLE = new ItemStack(Items.GLASS_BOTTLE);
     private static final ItemStack NULL_EMPTYCONTAINER = new ItemStack(Items.BUCKET);
 
@@ -348,6 +348,21 @@ public static boolean isFilledContainer(ItemStack container)
         return container != null && getFluidForFilledItem(container) != null;
     }
 
+    public static boolean hasNullEmptyContainer(ItemStack container)
+    {
+        if (container == null)
+        {
+            return false;
+        }
+
+        FluidContainerData data = containerFluidMap.get(new ContainerKey(container));
+        if (data != null)
+        {
+            return data.emptyContainer == NULL_EMPTYCONTAINER;
+        }
+        return false;
+    }
+
     public static FluidContainerData[] getRegisteredFluidContainerData()
     {
         return containerFluidMap.values().toArray(new FluidContainerData[containerFluidMap.size()]);

src/main/java/net/minecraftforge/fluids/FluidStack.java

@@ -174,12 +174,7 @@ public boolean isFluidEqual(ItemStack other)
             return false;
         }
 
-        if (other.getItem() instanceof IFluidContainerItem)
-        {
-            return isFluidEqual(((IFluidContainerItem) other.getItem()).getFluid(other));
-        }
-
-        return isFluidEqual(FluidContainerRegistry.getFluidForFilledItem(other));
+        return isFluidEqual(FluidUtil.getFluidContained(other));
     }
 
     @Override