From cd270875b6b9b5f26e444a0e683fefa3495e2784 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Sun, 15 Dec 2013 23:17:49 +0200 Subject: More Molds and Molder stuff --- common/darkknight/jewelrycraft/block/BlockMolder.java | 15 +++++++-------- common/darkknight/jewelrycraft/block/BlockSmelter.java | 1 + 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'common/darkknight/jewelrycraft/block') diff --git a/common/darkknight/jewelrycraft/block/BlockMolder.java b/common/darkknight/jewelrycraft/block/BlockMolder.java index d982cfe..36a48f7 100644 --- a/common/darkknight/jewelrycraft/block/BlockMolder.java +++ b/common/darkknight/jewelrycraft/block/BlockMolder.java @@ -48,6 +48,12 @@ public class BlockMolder extends BlockContainer te.hasMold = true; --item.stackSize; } + if(te != null && te.hasMold && entityPlayer.isSneaking()) + { + entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.mold.itemID, 1, te.mold.getItemDamage())); + te.mold = new ItemStack(0, 0, 0); + te.hasMold = false; + } return true; } @@ -99,19 +105,12 @@ public class BlockMolder extends BlockContainer public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player) { - TileEntityMolder me = (TileEntityMolder) world.getBlockTileEntity(i, j, k); + TileEntityMolder me = (TileEntityMolder) world.getBlockTileEntity(i, j, k); if(me != null && me.hasJewelBase) { player.inventory.addItemStackToInventory(new ItemStack(me.jewelBase.itemID, 1, me.jewelBase.getItemDamage())); me.jewelBase = new ItemStack(0, 0, 0); me.hasJewelBase = false; - } - if(me != null && me.hasMold) - { - player.addChatMessage(me.mold.getDisplayName()); - player.inventory.addItemStackToInventory(new ItemStack(me.mold.itemID, 1, me.mold.getItemDamage())); - me.mold = new ItemStack(0, 0, 0); - me.hasMold = false; } } diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java index 03019fc..cf9782d 100644 --- a/common/darkknight/jewelrycraft/block/BlockSmelter.java +++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java @@ -115,6 +115,7 @@ public class BlockSmelter extends BlockContainer { me.moltenMetal = te.moltenMetal; me.hasMoltenMetal = true; + me.cooling = 2000; te.moltenMetal = new ItemStack(0, 0, 0); te.hasMoltenMetal = false; } -- cgit v1.2.3