From 94453ef28ff7e8856c19db0b234b5620f53b2a76 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Fri, 20 Dec 2013 14:48:37 +0200 Subject: Working on stuph --- common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java | 5 ++--- common/darkknight/jewelrycraft/block/BlockSmelter.java | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'common/darkknight/jewelrycraft/block') diff --git a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java index 967aa18..e67249c 100644 --- a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java +++ b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java @@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; @@ -65,14 +64,14 @@ public class BlockJewelrsCraftingTable extends BlockContainer if (te.hasModifier && entityPlayer.isSneaking()) { - entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.modifier.itemID, 1, te.modifier.getItemDamage())); + entityPlayer.inventory.addItemStackToInventory(te.modifier); entityPlayer.inventory.onInventoryChanged(); te.modifier = new ItemStack(0, 0, 0); te.hasModifier = false; } if (te.hasJewel && entityPlayer.isSneaking()) { - entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.jewel.itemID, 1, te.jewel.getItemDamage())); + entityPlayer.inventory.addItemStackToInventory(te.jewel); entityPlayer.inventory.onInventoryChanged(); te.jewel = new ItemStack(0, 0, 0); te.hasJewel = false; diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java index 57501a2..5576ea3 100644 --- a/common/darkknight/jewelrycraft/block/BlockSmelter.java +++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java @@ -92,7 +92,9 @@ public class BlockSmelter extends BlockContainer entityPlayer.addChatMessage(StatCollector.translateToLocalFormatted("chatmessage.jewelrycraft.smelter.alreadyhasingot", te.metal.getDisplayName())); else if (te.hasMoltenMetal) entityPlayer.addChatMessage(StatCollector.translateToLocalFormatted("chatmessage.jewelrycraft.smelter.hasmolteningot", te.moltenMetal.getDisplayName())); - else if (item != null && !item.getDisplayName().contains("Ingot")) + else if (item != null && !item.getUnlocalizedName().toLowerCase().contains("ingot") && item.getDisplayName().contains("Ingot")) + entityPlayer.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.smelter.itemrenamedtoingot")); + else if (item != null && !item.getUnlocalizedName().toLowerCase().contains("ingot")) entityPlayer.addChatMessage(StatCollector.translateToLocal("chatmessage.jewelrycraft.smelter.itemneedstobeingot")); if (te.hasMetal && entityPlayer.isSneaking()) -- cgit v1.2.3