From 5e5c3dba08510a7424618063aa05f55c6f115b86 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Sat, 14 Jul 2012 06:11:40 -0700 Subject: [PATCH] Added support for non-standard capacity liquid container filling. --- common/net/minecraft/src/buildcraft/factory/BlockTank.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/net/minecraft/src/buildcraft/factory/BlockTank.java b/common/net/minecraft/src/buildcraft/factory/BlockTank.java index 45510e60..25779fbf 100644 --- a/common/net/minecraft/src/buildcraft/factory/BlockTank.java +++ b/common/net/minecraft/src/buildcraft/factory/BlockTank.java @@ -110,13 +110,14 @@ public class BlockTank extends BlockContainer implements ITextureProvider { int qty = tank.empty(BuildCraftAPI.BUCKET_VOLUME, false); - if(filled != null && qty >= BuildCraftAPI.BUCKET_VOLUME){ + LiquidStack liquid = LiquidManager.getLiquidForFilledItem(filled); + if(liquid != null && qty >= liquid.amount){ if(current.stackSize > 1 && !entityplayer.inventory.addItemStackToInventory(filled)){ return false; } entityplayer.inventory.setInventorySlotContents(entityplayer.inventory.currentItem, Utils.consumeItem(current)); - tank.empty(BuildCraftAPI.BUCKET_VOLUME, true); + tank.empty(liquid.amount, true); return true; } }