1 files changed, 136 insertions, 206 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java b/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java
index 8c152e3..0c58784 100644
--- a/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java
+++ b/src/main/java/darkknight/jewelrycraft/block/BlockMolder.java
@@ -1,206 +1,136 @@
-package darkknight.jewelrycraft.block;
-
-import java.util.Random;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockContainer;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IIconRegister;
-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;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.StatCollector;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import darkknight.jewelrycraft.config.ConfigHandler;
-import darkknight.jewelrycraft.item.ItemList;
-import darkknight.jewelrycraft.tileentity.TileEntityMolder;
-import darkknight.jewelrycraft.util.Variables;
-
-public class BlockMolder extends BlockContainer
-{
-    Random rand = new Random();
-    
-    /**
-     * @param par2Material
-     */
-    protected BlockMolder(Material par2Material)
-    {
-        super(par2Material);
-        setBlockBounds(0.1F, 0F, 0.1F, 0.9F, 0.2F, 0.9F);
-    }
-    
-    /**
-     * @param world
-     * @param var2
-     * @return
-     */
-    @Override
-    public TileEntity createNewTileEntity(World world, int var2)
-    {
-        return new TileEntityMolder();
-    }
-    
-    /**
-     * @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)
-    {
-        TileEntityMolder te = (TileEntityMolder)world.getTileEntity(i, j, k);
-        ItemStack item = entityPlayer.inventory.getCurrentItem();
-        if (te != null && !world.isRemote){
-            if (item != null && !te.hasMold && item.getItem() == ItemList.molds){
-                te.mold = item.copy();
-                te.hasMold = true;
-                if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
-                entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage." + Variables.MODID + ".molder.addedmold", te.mold.getDisplayName())));
-                te.isDirty = true;
-            }
-            if (te.hasMold && entityPlayer.isSneaking() && !te.hasMoltenMetal){
-                dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.mold.copy());
-                te.mold = new ItemStack(Item.getItemById(0), 0, 0);
-                te.hasMold = false;
-                te.isDirty = true;
-            }else if (te.hasMoltenMetal) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.hasmoltenmetal")));
-        }
-        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 + 0.5D, z + 0.5D, stack);
-        entityitem.motionX = 0;
-        entityitem.motionZ = 0;
-        entityitem.motionY = 0.11000000298023224D;
-        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)
-    {
-        TileEntityMolder te = (TileEntityMolder)world.getTileEntity(i, j, k);
-        if (te != null){
-            if (te.hasJewelBase) dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, te.jewelBase.copy());
-            if (te.hasMold) dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.mold.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)
-    {
-        int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-        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)
-    {
-        TileEntityMolder me = (TileEntityMolder)world.getTileEntity(i, j, k);
-        if (me != null && !world.isRemote){
-            if (me.hasJewelBase){
-                dropItem(me.getWorldObj(), me.xCoord, me.yCoord, me.zCoord, me.jewelBase.copy());
-                me.jewelBase = new ItemStack(Item.getItemById(0), 0, 0);
-                me.hasJewelBase = false;
-            }else if (me.hasMoltenMetal && me.cooling >= 0) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.metaliscooling") + " (" + (ConfigHandler.INGOT_COOLING_TIME - me.cooling) * 100 / ConfigHandler.INGOT_COOLING_TIME + "%)"));
-            else if (me.mold.getItem() == ItemList.molds && !me.hasMoltenMetal) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.moldisempty")));
-            else if (me.mold.getItem() != ItemList.molds) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.moldismissing")));
-            me.isDirty = true;
-        }
-    }
-    
-    /**
-     * @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)
-    {
-        blockIcon = icon.registerIcon(Variables.MODID + ":molder");
-    }
-}
+package darkknight.jewelrycraft.block;
+
+import java.util.Random;
+import darkknight.jewelrycraft.config.ConfigHandler;
+import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.tileentity.TileEntityMolder;
+import darkknight.jewelrycraft.util.Variables;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+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;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.StatCollector;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+public class BlockMolder extends BlockContainer
+{
+    Random rand = new Random();
+    
+    protected BlockMolder(Material par2Material)
+    {
+        super(par2Material);
+        setBlockBounds(0.1F, 0F, 0.1F, 0.9F, 0.2F, 0.9F);
+    }
+    
+    @Override
+    public TileEntity createNewTileEntity(World world, int var2)
+    {
+        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)
+    {
+        TileEntityMolder te = (TileEntityMolder)world.getTileEntity(i, j, k);
+        ItemStack item = entityPlayer.inventory.getCurrentItem();
+        if (te != null && !world.isRemote){
+            if (item != null && !te.hasMold && item.getItem() == ItemList.molds){
+                te.mold = item.copy();
+                te.hasMold = true;
+                if (!entityPlayer.capabilities.isCreativeMode) --item.stackSize;
+                entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocalFormatted("chatmessage." + Variables.MODID + ".molder.addedmold", te.mold.getDisplayName())));
+                te.isDirty = true;
+            }
+            if (te.hasMold && entityPlayer.isSneaking() && !te.hasMoltenMetal){
+                dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.mold.copy());
+                te.mold = new ItemStack(Item.getItemById(0), 0, 0);
+                te.hasMold = false;
+                te.isDirty = true;
+            }else if (te.hasMoltenMetal) entityPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.hasmoltenmetal")));
+        }
+        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 breakBlock(World world, int i, int j, int k, Block par5, int par6)
+    {
+        TileEntityMolder te = (TileEntityMolder)world.getTileEntity(i, j, k);
+        if (te != null){
+            if (te.hasJewelBase) dropItem(te.getWorldObj(), te.xCoord, te.yCoord, te.zCoord, te.jewelBase.copy());
+            if (te.hasMold) dropItem(world, te.xCoord, te.yCoord, te.zCoord, te.mold.copy());
+            world.removeTileEntity(i, j, k);
+        }
+        super.breakBlock(world, i, j, k, par5, par6);
+    }
+    
+    @Override
+    public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entityLiving, ItemStack par6ItemStack)
+    {
+        int rotation = MathHelper.floor_double(entityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+        world.setBlockMetadataWithNotify(i, j, k, rotation, 2);
+    }
+    
+    @Override
+    public void onBlockClicked(World world, int i, int j, int k, EntityPlayer player)
+    {
+        TileEntityMolder me = (TileEntityMolder)world.getTileEntity(i, j, k);
+        if (me != null && !world.isRemote){
+            if (me.hasJewelBase){
+                dropItem(me.getWorldObj(), me.xCoord, me.yCoord, me.zCoord, me.jewelBase.copy());
+                me.jewelBase = new ItemStack(Item.getItemById(0), 0, 0);
+                me.hasJewelBase = false;
+            }else if (me.hasMoltenMetal && me.cooling >= 0) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.metaliscooling") + " (" + (ConfigHandler.INGOT_COOLING_TIME - me.cooling) * 100 / ConfigHandler.INGOT_COOLING_TIME + "%)"));
+            else if (me.mold.getItem() == ItemList.molds && !me.hasMoltenMetal) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.moldisempty")));
+            else if (me.mold.getItem() != ItemList.molds) player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".molder.moldismissing")));
+            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 registerBlockIcons(IIconRegister icon)
+    {
+        blockIcon = icon.registerIcon("minecraft:cobblestone");
+    }
+}