Changed Shadow Ingot image, added item renders to the blocks and working on item dropping

3 files changed, 76 insertions, 100 deletions

diff --git a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
index e67249c..4f327ff 100644
--- a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
+++ b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
@@ -6,6 +6,7 @@ import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -49,30 +50,33 @@ public class BlockJewelrsCraftingTable extends BlockContainer
         ItemStack item = entityPlayer.inventory.getCurrentItem();
         if (te != null && !world.isRemote)
         {
-            if (!te.hasJewel && item != null && item.getItem().itemID == ItemList.ring.itemID)
+            te.isDirty = true;
+            if (!te.hasEndItem && !te.hasJewel && item != null && item.getItem().itemID == ItemList.ring.itemID)
             {
                 te.jewel = item.copy();
                 te.hasJewel = true;
                 --item.stackSize;
+                entityPlayer.inventory.onInventoryChanged();
             }
-            if (!te.hasModifier && item != null && item.getItem().itemID == modifiers[0])
+            if (!te.hasEndItem && !te.hasModifier && item != null && item.getItem().itemID == modifiers[0])
             {
                 te.modifier = item.copy();
+                te.modifier.stackSize = 1;
                 te.hasModifier = true;
                 --item.stackSize;
+                entityPlayer.inventory.onInventoryChanged();
             }
+            if(te.hasEndItem && item != null) entityPlayer.addChatMessage("First take out the crafted jewel before inserting new stuff.");
 
             if (te.hasModifier && entityPlayer.isSneaking())
             {
-                entityPlayer.inventory.addItemStackToInventory(te.modifier);
-                entityPlayer.inventory.onInventoryChanged();
+                dropItem( world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.modifier);
                 te.modifier = new ItemStack(0, 0, 0);
                 te.hasModifier = false;
             }
             if (te.hasJewel && entityPlayer.isSneaking())
             {
-                entityPlayer.inventory.addItemStackToInventory(te.jewel);
-                entityPlayer.inventory.onInventoryChanged();
+                dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.jewel);
                 te.jewel = new ItemStack(0, 0, 0);
                 te.hasJewel = false;
             }
@@ -82,13 +86,33 @@ public class BlockJewelrsCraftingTable extends BlockContainer
         return true;
     }
 
-    public void giveJewelToPlayer(TileEntityJewelrsCraftingTable cf, EntityPlayer player, ItemStack item, ItemStack modifier)
+    public void dropItem(World world, double x, double y, double z, ItemStack stack)
+    {
+        EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1D, z + 0.5D, stack);
+        entityitem.motionX = 0;
+        entityitem.motionZ = 0;
+        entityitem.motionY = 0.21000000298023224D;
+        world.spawnEntityInWorld(entityitem);
+    }
+
+    public void breakBlock(World world, int i, int j, int k, int par5, int par6)
+    {
+        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getBlockTileEntity(i, j, k);
+        if (te != null)
+        {
+            if(te.hasModifier) dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.modifier);
+            if(te.hasJewel) dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.jewel);
+            if(te.hasEndItem) giveJewelToPlayer(te, te.endItem, te.modifier);
+        }
+        super.breakBlock(world, i, j, k, par5, par6);
+    }
+
+    public void giveJewelToPlayer(TileEntityJewelrsCraftingTable cf, ItemStack item, ItemStack modifier)
     {
         if (item != null)
         {
             ItemRing.addEffect(item, Potion.fireResistance.id);
-            player.inventory.addItemStackToInventory(item);
-            player.inventory.onInventoryChanged();
+            dropItem(cf.worldObj, (double)cf.xCoord, (double)cf.yCoord, (double)cf.zCoord, item);
         }
     }
 
@@ -107,7 +131,7 @@ public class BlockJewelrsCraftingTable extends BlockContainer
         {
             if (te.hasEndItem)
             {
-                giveJewelToPlayer(te, player, te.endItem, te.modifier);
+                giveJewelToPlayer(te, te.endItem, te.modifier);
                 te.endItem = new ItemStack(0, 0, 0);
                 te.hasEndItem = false;
             }
@@ -117,7 +141,7 @@ public class BlockJewelrsCraftingTable extends BlockContainer
                 player.addChatMessage("You're missing a ring");
             else if (!te.hasModifier && !world.isRemote)
                 player.addChatMessage("You need a modifier");
-            te.timer = 5;
+            te.timer = 2000;
             te.isDirty = true;
         }
     }
diff --git a/common/darkknight/jewelrycraft/block/BlockMolder.java b/common/darkknight/jewelrycraft/block/BlockMolder.java
index 7967cbd..a58323b 100644
--- a/common/darkknight/jewelrycraft/block/BlockMolder.java
+++ b/common/darkknight/jewelrycraft/block/BlockMolder.java
@@ -8,10 +8,8 @@ import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.StatCollector;
-import net.minecraft.world.Explosion;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import darkknight.jewelrycraft.item.ItemList;
@@ -21,25 +19,25 @@ import darkknight.jewelrycraft.tileentity.TileEntityMolder;
 public class BlockMolder extends BlockContainer
 {
     Random rand = new Random();
-    
+
     protected BlockMolder(int par1, Material par2Material)
     {
         super(par1, par2Material);
         this.setBlockBounds(0.1F, 0F, 0.1F, 0.9F, 0.2F, 0.9F);
     }
-    
+
     @Override
     public TileEntity createNewTileEntity(World world)
     {
         return new TileEntityMolder();
     }
-    
+
     @Override
     public boolean renderAsNormalBlock()
     {
         return false;
     }
-    
+
     @Override
     public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
     {
@@ -56,64 +54,37 @@ public class BlockMolder extends BlockContainer
         }
         if (te.hasMold && entityPlayer.isSneaking() && !world.isRemote)
         {
-            entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.mold.itemID, 1, te.mold.getItemDamage()));
-            entityPlayer.inventory.onInventoryChanged();
+            dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.mold);
             te.mold = new ItemStack(0, 0, 0);
             te.hasMold = false;
             te.isDirty = true;
         }
         return true;
     }
+
+    public void dropItem(World world, double x, double y, double z, ItemStack stack)
+    {
+        EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 0.5D, z + 0.5D, stack);
+        entityitem.motionX = 0;
+        entityitem.motionZ = 0;
+        entityitem.motionY = 0.11000000298023224D;
+        world.spawnEntityInWorld(entityitem);
+    }
     
-    @Override
-    public void onBlockDestroyedByPlayer(World world, int i, int j, int k, int par5)
+    public void breakBlock(World world, int i, int j, int k, int par5, int par6)
     {
         TileEntityMolder te = (TileEntityMolder) world.getBlockTileEntity(i, j, k);
+
         if (te != null)
         {
-            float f = this.rand.nextFloat() * 0.8F + 0.1F;
-            float f1 = this.rand.nextFloat() * 0.8F + 0.1F;
-            float f2 = this.rand.nextFloat() * 0.8F + 0.1F;
-            if (te.hasMold)
-            {
-                EntityItem entityitem = new EntityItem(world, i + f, j + f1, k + f2, new ItemStack(te.mold.itemID, 1, te.mold.getItemDamage()));
-                
-                if (te.mold.hasTagCompound())
-                {
-                    entityitem.getEntityItem().setTagCompound((NBTTagCompound) te.mold.getTagCompound().copy());
-                }
-                
-                float f3 = 0.05F;
-                entityitem.motionX = (float) this.rand.nextGaussian() * f3;
-                entityitem.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F;
-                entityitem.motionZ = (float) this.rand.nextGaussian() * f3;
-                world.spawnEntityInWorld(entityitem);
-            }
-            if (te.hasJewelBase)
-            {
-                EntityItem entityitem = new EntityItem(world, i + f, j + f1, k + f2, new ItemStack(te.jewelBase.itemID, 1, te.jewelBase.getItemDamage()));
-                
-                if (te.jewelBase.hasTagCompound())
-                {
-                    entityitem.getEntityItem().setTagCompound((NBTTagCompound) te.jewelBase.getTagCompound().copy());
-                }
-                
-                float f3 = 0.05F;
-                entityitem.motionX = (float) this.rand.nextGaussian() * f3;
-                entityitem.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F;
-                entityitem.motionZ = (float) this.rand.nextGaussian() * f3;
-                world.spawnEntityInWorld(entityitem);
-            }
+            if(te.hasJewelBase) giveJewelToPlayer(te, te.jewelBase, te.ringMetal);
+            if(te.hasMold) dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.mold);
         }
+
+        super.breakBlock(world, i, j, k, par5, par6);
     }
-    
-    @Override
-    public void onBlockDestroyedByExplosion(World world, int i, int j, int k, Explosion par5Explosion)
-    {
-        onBlockDestroyedByPlayer(world, i, j, k, 0);
-    }
-    
-    public void giveJewelToPlayer(TileEntityMolder md, EntityPlayer player, ItemStack item, ItemStack metal)
+
+    public void giveJewelToPlayer(TileEntityMolder md, ItemStack item, ItemStack metal)
     {
         if (item != null)
         {
@@ -121,11 +92,11 @@ public class BlockMolder extends BlockContainer
             {
                 ItemRing.addMetal(item, metal);
             }
-            player.inventory.addItemStackToInventory(item);
-            player.inventory.onInventoryChanged();
+            dropItem(md.worldObj, (double)md.xCoord, (double)md.yCoord, (double)md.zCoord, item);
+            md.isDirty = true;
         }
     }
-    
+
     @Override
     public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player)
     {
@@ -134,7 +105,7 @@ public class BlockMolder extends BlockContainer
         {
             if (me.hasJewelBase)
             {
-                giveJewelToPlayer(me, player, me.jewelBase, me.ringMetal);
+                giveJewelToPlayer(me, me.jewelBase, me.ringMetal);
                 me.jewelBase = new ItemStack(0, 0, 0);
                 me.hasJewelBase = false;
             }
@@ -147,25 +118,25 @@ public class BlockMolder extends BlockContainer
             me.isDirty = true;
         }
     }
-    
+
     @Override
     public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
     {
         return false;
     }
-    
+
     @Override
     public boolean isOpaqueCube()
     {
         return false;
     }
-    
+
     @Override
     public int getRenderType()
     {
         return -1;
     }
-    
+
     @Override
     public void registerIcons(IconRegister icon)
     {
diff --git a/common/darkknight/jewelrycraft/block/BlockSmelter.java b/common/darkknight/jewelrycraft/block/BlockSmelter.java
index 5576ea3..f58812b 100644
--- a/common/darkknight/jewelrycraft/block/BlockSmelter.java
+++ b/common/darkknight/jewelrycraft/block/BlockSmelter.java
@@ -9,11 +9,9 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.StatCollector;
-import net.minecraft.world.Explosion;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import darkknight.jewelrycraft.tileentity.TileEntityMolder;
@@ -40,37 +38,20 @@ public class BlockSmelter extends BlockContainer
         return false;
     }
     
-    @Override
-    public void onBlockDestroyedByPlayer(World world, int i, int j, int k, int par5)
+    public void dropItem(World world, double x, double y, double z, ItemStack stack)
     {
-        TileEntitySmelter te = (TileEntitySmelter) world.getBlockTileEntity(i, j, k);
-        if (te != null)
-        {
-            float f = this.rand.nextFloat() * 0.8F + 0.1F;
-            float f1 = this.rand.nextFloat() * 0.8F + 0.1F;
-            float f2 = this.rand.nextFloat() * 0.8F + 0.1F;
-            if (te.hasMetal)
-            {
-                EntityItem entityitem = new EntityItem(world, i + f, j + f1, k + f2, new ItemStack(te.metal.itemID, 1, te.metal.getItemDamage()));
-                
-                if (te.metal.hasTagCompound())
-                {
-                    entityitem.getEntityItem().setTagCompound((NBTTagCompound) te.metal.getTagCompound().copy());
-                }
-                
-                float f3 = 0.05F;
-                entityitem.motionX = (float) this.rand.nextGaussian() * f3;
-                entityitem.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F;
-                entityitem.motionZ = (float) this.rand.nextGaussian() * f3;
-                world.spawnEntityInWorld(entityitem);
-            }
-        }
+        EntityItem entityitem = new EntityItem(world, x + 0.5D, y + 1.3D, z + 0.5D, stack);
+        entityitem.motionX = 0;
+        entityitem.motionZ = 0;
+        entityitem.motionY = 0.11000000298023224D;
+        world.spawnEntityInWorld(entityitem);
     }
     
-    @Override
-    public void onBlockDestroyedByExplosion(World world, int i, int j, int k, Explosion par5Explosion)
+    public void breakBlock(World world, int i, int j, int k, int par5, int par6)
     {
-        onBlockDestroyedByPlayer(world, i, j, k, 0);
+        TileEntitySmelter te = (TileEntitySmelter) world.getBlockTileEntity(i, j, k);
+        if (te != null && te.hasMetal) dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.metal);
+        super.breakBlock(world, i, j, k, par5, par6);
     }
     
     @Override
@@ -99,7 +80,7 @@ public class BlockSmelter extends BlockContainer
             
             if (te.hasMetal && entityPlayer.isSneaking())
             {
-                entityPlayer.dropPlayerItem(te.metal);
+                dropItem(world, (double)te.xCoord, (double)te.yCoord, (double)te.zCoord, te.metal);
                 te.hasMetal = false;
             }
             world.setBlockTileEntity(i, j, k, te);