From 5ecaeaa112b82b1ac526d01c317bf35273f27189 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 16 Mar 2014 18:32:28 +0000 Subject: [PATCH] Some enchanter fixes. --- .../vazkii/botania/client/render/tile/RenderTileEnchanter.java | 2 ++ MODSRC/vazkii/botania/common/block/BlockEnchanter.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java b/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java index 5faa35868..d5ff7d37d 100644 --- a/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java +++ b/MODSRC/vazkii/botania/client/render/tile/RenderTileEnchanter.java @@ -49,6 +49,8 @@ public class RenderTileEnchanter extends TileEntitySpecialRenderer { item = new EntityItem(enchanter.worldObj, enchanter.xCoord, enchanter.yCoord + 1, enchanter.zCoord, enchanter.itemToEnchant); item.age = (int) tileentity.worldObj.getTotalWorldTime(); + item.setEntityItemStack(enchanter.itemToEnchant); + GL11.glColor4f(1F, 1F, 1F, 1F); GL11.glTranslatef(0.5F, 1.25F, 0.5F); ((Render) RenderManager.instance.entityRenderMap.get(EntityItem.class)).doRender(item, d0, d1, d2, 1F, f); diff --git a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java index 1cba32c06..f07bca5d8 100644 --- a/MODSRC/vazkii/botania/common/block/BlockEnchanter.java +++ b/MODSRC/vazkii/botania/common/block/BlockEnchanter.java @@ -75,7 +75,7 @@ public class BlockEnchanter extends BlockModContainer implements IWandable { if(stack != null && stack.itemID == ModItems.twigWand.itemID) return false; - boolean stackEnchantable = stack != null && stack.isItemEnchantable() && stack.stackSize == 1; + boolean stackEnchantable = stack != null && stack.isItemEnchantable() && stack.stackSize == 1 && stack.getItem().getItemEnchantability() > 0; if(enchanter.itemToEnchant == null) { if(stackEnchantable) {