From 6ebec3fa89d47a0c91664d71e28ba3425afc288f Mon Sep 17 00:00:00 2001 From: CrazyPants Date: Thu, 17 Jul 2014 16:15:34 +0800 Subject: [PATCH] Enchanter now breaks correctly. --- .../enderio/machine/enchanter/BlockEnchanter.java | 11 ++++++++--- .../enderio/machine/enchanter/GuiEnchanter.java | 1 + 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java index b059f3d8..ef40c27d 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/BlockEnchanter.java @@ -100,8 +100,8 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean harvested) { if(!world.isRemote) { TileEntity te = world.getTileEntity(x, y, z); - if(te instanceof TileVacuumChest) { - TileEnchanter cb = (TileEnchanter) te; + if(te instanceof TileEnchanter) { + TileEnchanter enchanter = (TileEnchanter) te; if(!player.capabilities.isCreativeMode) { ItemStack itemStack = new ItemStack(this); float f = 0.7F; @@ -112,7 +112,12 @@ public class BlockEnchanter extends BlockEio implements IGuiHandler, IResourceTo entityitem.delayBeforeCanPickup = 10; world.spawnEntityInWorld(entityitem); - Util.dropItems(world, cb, x, y, z, true); + if(enchanter.getStackInSlot(0) != null) { + Util.dropItems(world, enchanter.getStackInSlot(0), x, y, z, true); + } + if(enchanter.getStackInSlot(1) != null) { + Util.dropItems(world, enchanter.getStackInSlot(1), x, y, z, true); + } } } } diff --git a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java index 3458f5e3..69c78dca 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/GuiEnchanter.java @@ -47,6 +47,7 @@ public class GuiEnchanter extends GuiContainer { col = 8453920; //all good } else { col = 16736352; //not enough levels + RenderUtil.bindTexture("enderio:textures/gui/enchanter.png"); drawTexturedModalRect(sx + 99, sy + 33, 176, 0, 28, 21); } String s = I18n.format("container.repair.cost", new Object[] {Integer.valueOf(curCost)});