diff options
5 files changed, 11 insertions, 9 deletions
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()) diff --git a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java index f026fb5..413e290 100644 --- a/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java +++ b/common/darkknight/jewelrycraft/renders/TileEntityMolderRender.java @@ -45,10 +45,10 @@ public class TileEntityMolderRender extends TileEntitySpecialRenderer me.mold.getIconIndex().getInterpolatedU(0); int decal = 0; int decal2 = 0; -// if (me.mold.getItemDamage() == 0) -// decal = 32; -// else if (me.mold.getItemDamage() > 0) -// decal = 64; + if (me.mold.getItemDamage() == 0) + decal = 32; + else if (me.mold.getItemDamage() > 0) + decal = 64; double minu = me.mold.getIconIndex().getInterpolatedU(decal2); double minv = me.mold.getIconIndex().getInterpolatedV(-decal); double maxu = me.mold.getIconIndex().getInterpolatedU(256 + decal2); diff --git a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java index 00e727c..d86b4b9 100644 --- a/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java +++ b/common/darkknight/jewelrycraft/tileentity/TileEntitySmelter.java @@ -79,7 +79,7 @@ public class TileEntitySmelter extends TileEntity if (flow <= 0) n = 0; } - if (metal.itemID != 0) + if (this.hasMetal) { for (int l = 0; l < 2; ++l) { diff --git a/resources/assets/jewelrycraft/lang/en_US.lang b/resources/assets/jewelrycraft/lang/en_US.lang index ae2cd3f..579add8 100644 --- a/resources/assets/jewelrycraft/lang/en_US.lang +++ b/resources/assets/jewelrycraft/lang/en_US.lang @@ -19,6 +19,7 @@ chatmessage.jewelrycraft.molder.moldismissing=Molder does not contain a mold. chatmessage.jewelrycraft.smelter.alreadyhasingot=The Smelter already contains a %s chatmessage.jewelrycraft.smelter.hasmolteningot=The Smelter contains a molten %s chatmessage.jewelrycraft.smelter.itemneedstobeingot=The item needs to be an ingot! +chatmessage.jewelrycraft.smelter.itemrenamedtoingot=Nice try, but renaming it to an ingot doesn't make it an ingot :p You can't fool me player! chatmessage.jewelrycraft.smelter.molderhasmoltenmetal=The Molder already has molten metal in it! chatmessage.jewelrycraft.smelter.molderhasnomold=The Molder doesn't have a mold in it! You might as well pour this stuff on the ground, eh? chatmessage.jewelrycraft.smelter.modlerhasitem=The Molder contains an item in it. Now you wouldn't want it to be destroyed, would you? |