From 2f0f8d90814367eebbb995dd434912a6470abf54 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 10 Jul 2012 03:05:30 -0700 Subject: [PATCH 1/2] Added Liquid fill function. --- .../net/minecraft/src/buildcraft/api/BuildCraftAPI.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java b/common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java index 1290a92b..8ece2bce 100644 --- a/common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java +++ b/common/net/minecraft/src/buildcraft/api/BuildCraftAPI.java @@ -65,6 +65,15 @@ public class BuildCraftAPI { return null; } + + public static ItemStack fillLiquidContainer(int liquidId, ItemStack emptyContainer){ + for(LiquidData data : liquids) { + if(data.liquidId == liquidId && data.container.isItemEqual(emptyContainer)) { + return data.filled.copy(); + } + } + return null; + } public static boolean isLiquid(int blockId) { if (blockId == 0) { From ace10b05f4f1f0a924ab61e6e801da6e88b8f906 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Tue, 10 Jul 2012 03:07:56 -0700 Subject: [PATCH 2/2] Changed fill code to safer BuildcraftAPI.fillLiquidContainer() --- .../net/minecraft/src/buildcraft/factory/TankBucketHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/net/minecraft/src/buildcraft/factory/TankBucketHandler.java b/common/net/minecraft/src/buildcraft/factory/TankBucketHandler.java index 10ae7ea5..2bf677a2 100644 --- a/common/net/minecraft/src/buildcraft/factory/TankBucketHandler.java +++ b/common/net/minecraft/src/buildcraft/factory/TankBucketHandler.java @@ -25,7 +25,7 @@ public class TankBucketHandler implements IBucketHandler { int qty = tank.empty(BuildCraftAPI.BUCKET_VOLUME, false); - ItemStack filledBucket = BuildCraftAPI.getFilledItemForLiquid(tank.getLiquidId()); + ItemStack filledBucket = BuildCraftAPI.fillLiquidContainer(tank.getLiquidId(), new ItemStack(Item.bucketEmpty)); if (qty >= BuildCraftAPI.BUCKET_VOLUME && filledBucket != null) { tank.empty(BuildCraftAPI.BUCKET_VOLUME, true);