Added just a butt ton of stuff, also thanks to pau101 for helping me with the Hand Pedestal animation :)

1 files changed, 110 insertions, 56 deletions

diff --git a/java/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/java/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
index f9dfc67..fae445e 100644
--- a/java/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
+++ b/java/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
@@ -1,7 +1,6 @@
 package darkknight.jewelrycraft.block;
 
 import java.util.Random;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -25,49 +24,68 @@ public class BlockJewelrsCraftingTable extends BlockContainer
 {
     Random rand = new Random();
     
+    /**
+     * @param par2Material
+     */
     protected BlockJewelrsCraftingTable(Material par2Material)
     {
         super(par2Material);
-        this.setBlockBounds(0.0F, 0F, 0.0F, 1.0F, 0.8F, 1.0F);
+        setBlockBounds(0.0F, 0F, 0.0F, 1.0F, 0.8F, 1.0F);
     }
     
+    /**
+     * @param world
+     * @param var2
+     * @return
+     */
     @Override
     public TileEntity createNewTileEntity(World world, int var2)
     {
         return new TileEntityJewelrsCraftingTable();
     }
     
+    /**
+     * @return
+     */
     @Override
     public boolean renderAsNormalBlock()
     {
         return false;
     }
     
+    /**
+     * @param world
+     * @param i
+     * @param j
+     * @param k
+     * @param entityPlayer
+     * @param par6
+     * @param par7
+     * @param par8
+     * @param par9
+     * @return
+     */
     @Override
     public boolean onBlockActivated(World world, int i, int j, int k, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
     {
-        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getTileEntity(i, j, k);
+        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable)world.getTileEntity(i, j, k);
         ItemStack item = entityPlayer.inventory.getCurrentItem();
-        if (te != null && !world.isRemote)
-        {
+        if (te != null && !world.isRemote){
             if (te.hasEndItem && item != null) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.hasenditem")));
-            if (!te.hasEndItem && !te.hasJewelry && item != null && JewelrycraftUtil.isJewelry(item))
-            {
+            if (!te.hasEndItem && !te.hasJewelry && item != null && JewelrycraftUtil.isJewelry(item)){
                 te.jewelry = item.copy();
                 te.hasJewelry = true;
                 if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
                 te.isDirty = true;
             }
-            if (!te.hasEndItem && !te.hasGem && item != null && JewelrycraftUtil.isGem(item))
-            {
+            if (!te.hasEndItem && !te.hasGem && item != null && JewelrycraftUtil.isGem(item)){
                 te.gem = item.copy();
                 te.gem.stackSize = 1;
                 te.hasGem = true;
                 if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
                 te.isDirty = true;
             }
-            if (!te.hasEndItem && te.hasJewelry && te.hasGem && !te.crafting)
-            {
+            if (!te.hasEndItem && te.hasJewelry && te.hasGem && !te.crafting){
                 te.carving = ConfigHandler.jewelryCraftingTime;
                 te.angle = 0;
                 te.crafting = true;
@@ -77,6 +95,13 @@ public class BlockJewelrsCraftingTable extends BlockContainer
         return true;
     }
     
+    /**
+     * @param world
+     * @param x
+     * @param y
+     * @param z
+     * @param stack
+     */
     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);
@@ -86,19 +111,35 @@ public class BlockJewelrsCraftingTable extends BlockContainer
         world.spawnEntityInWorld(entityitem);
     }
     
+    /**
+     * @param world
+     * @param i
+     * @param j
+     * @param k
+     * @param par5
+     * @param par6
+     */
+    @Override
     public void breakBlock(World world, int i, int j, int k, Block par5, int par6)
     {
-        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getTileEntity(i, j, k);
-        if (te != null)
-        {
-            if (te.hasJewelry) dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.jewelry.copy());
-            if (te.hasGem) dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.gem.copy());
-            if (te.hasEndItem) dropItem(te.getWorldObj(), (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.endItem.copy());
+        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable)world.getTileEntity(i, j, k);
+        if (te != null){
+            if (te.hasJewelry) dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.jewelry.copy());
+            if (te.hasGem) dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.gem.copy());
+            if (te.hasEndItem) dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, te.endItem.copy());
             world.removeTileEntity(i, j, k);
         }
         super.breakBlock(world, i, j, k, par5, par6);
     }
     
+    /**
+     * @param world
+     * @param i
+     * @param j
+     * @param k
+     * @param entityLiving
+     * @param par6ItemStack
+     */
     @Override
     public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack)
     {
@@ -106,71 +147,84 @@ public class BlockJewelrsCraftingTable extends BlockContainer
         world.setBlockMetadataWithNotify(i, j, k, rotation, 2);
     }
     
+    /**
+     * @param world
+     * @param i
+     * @param j
+     * @param k
+     * @param player
+     */
     @Override
     public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player)
     {
-        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getTileEntity(i, j, k);
-        if (te != null && !world.isRemote)
-        {
-            if (player.isSneaking())
-            {
-                if (te.hasJewelry)
-                {
-                    dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.jewelry.copy());
-                    te.jewelry = new ItemStack(Item.getItemById(0), 0, 0);
-                    te.hasJewelry = false;
-                    te.carving = -1;
-                    te.crafting = false;
-                    te.angle = 0F;
-                    te.isDirty = true;
-                }
-                if (te.hasGem)
-                {
-                    dropItem(world, (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.gem.copy());
-                    te.gem = new ItemStack(Item.getItemById(0), 0, 0);
-                    te.hasGem = false;
-                    te.carving = -1;
-                    te.crafting = false;
-                    te.angle = 0F;
-                    te.isDirty = true;
-                }
+        TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable)world.getTileEntity(i, j, k);
+        if (te != null && !world.isRemote) if (player.isSneaking()){
+            if (te.hasJewelry){
+                dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.jewelry.copy());
+                te.jewelry = new ItemStack(Item.getItemById(0), 0, 0);
+                te.hasJewelry = false;
+                te.carving = -1;
+                te.crafting = false;
+                te.angle = 0F;
+                te.isDirty = true;
             }
-            else
-            {
-                if (te.hasEndItem)
-                {
-                    dropItem(te.getWorldObj(), (double) te.xCoord, (double) te.yCoord, (double) te.zCoord, te.endItem.copy());
-                    te.endItem = new ItemStack(Item.getItemById(0), 0, 0);
-                    te.hasEndItem = false;
-                    te.isDirty = true;
-                }
-                else if (te.hasJewelry && te.hasGem && te.carving > 0 && te.jewelry != null) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.table.iscrafting", te.jewelry.getDisplayName()) + " (" + ((ConfigHandler.jewelryCraftingTime - te.carving) * 100 / ConfigHandler.jewelryCraftingTime) + "%)"));
-                else if (!te.hasGem) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missinggem")));
-                else if (!te.hasJewelry) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missingjewelry")));
+            if (te.hasGem){
+                dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.gem.copy());
+                te.gem = new ItemStack(Item.getItemById(0), 0, 0);
+                te.hasGem = false;
+                te.carving = -1;
+                te.crafting = false;
+                te.angle = 0F;
+                te.isDirty = true;
             }
-        }
+        }else if (te.hasEndItem){
+            dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, te.endItem.copy());
+            te.endItem = new ItemStack(Item.getItemById(0), 0, 0);
+            te.hasEndItem = false;
+            te.isDirty = true;
+        }else if (te.hasJewelry && te.hasGem && te.carving > 0 && te.jewelry != null) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage.Jewelrycraft.table.iscrafting", te.jewelry.getDisplayName()) + " (" + (ConfigHandler.jewelryCraftingTime - te.carving) * 100 / ConfigHandler.jewelryCraftingTime + "%)"));
+        else if (!te.hasGem) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missinggem")));
+        else if (!te.hasJewelry) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage.Jewelrycraft.table.missingjewelry")));
     }
     
+    /**
+     * @param iblockaccess
+     * @param i
+     * @param j
+     * @param k
+     * @param l
+     * @return
+     */
     @Override
     public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
     {
         return false;
     }
     
+    /**
+     * @return
+     */
     @Override
     public boolean isOpaqueCube()
     {
         return false;
     }
     
+    /**
+     * @return
+     */
     @Override
     public int getRenderType()
     {
         return -1;
     }
     
+    /**
+     * @param icon
+     */
+    @Override
     public void registerBlockIcons(IIconRegister icon)
     {
-        this.blockIcon = icon.registerIcon("jewelrycraft:jewelrsCraftingTable");
+        blockIcon = icon.registerIcon("jewelrycraft:jewelrsCraftingTable");
     }
 }