From 2d1be7a2d5fb3f6bbe96e4af63997a22cf68e1aa Mon Sep 17 00:00:00 2001 From: gr8pefish Date: Tue, 17 Feb 2015 15:32:05 -0700 Subject: [PATCH 1/2] Update BlockAltar.java Added ability to remove water from the alter by clicking on it with an empty bucket. --- .../java/vazkii/botania/common/block/BlockAltar.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 6cc4865e1..40e57c837 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -106,6 +106,15 @@ public class BlockAltar extends BlockModContainer implements ILexiconable { tile.setLava(true); par1World.func_147453_f(par2, par3, par4, this); + return true; + } else if(stack != null && stack.getItem() == Items.bucket) { + if (!par5EntityPlayer.capabilities.isCreativeMode) + par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack)); + else + par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, new ItemStack(Items.water_bucket)); + tile.setWater(false); + par1World.func_147453_f(par2, par3, par4, this); + return true; } } From a7702b42bdf454dfae0238888335d60ef164fd0d Mon Sep 17 00:00:00 2001 From: wiiv Date: Wed, 18 Feb 2015 16:21:18 +0000 Subject: [PATCH 2/2] What? Did someone say Mana Cookie Cake? --- .../textures/items/unused/manaCookieCake.png | Bin 0 -> 19701 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/botania/textures/items/unused/manaCookieCake.png diff --git a/src/main/resources/assets/botania/textures/items/unused/manaCookieCake.png b/src/main/resources/assets/botania/textures/items/unused/manaCookieCake.png new file mode 100644 index 0000000000000000000000000000000000000000..dc2895dac5786f71fd55ea297e88197f0e71f0ce GIT binary patch literal 19701 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 U3Hob_O3~