Working on the bench

2 files changed, 45 insertions, 7 deletions

diff --git a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
index 1c22062..3ece175 100644
--- a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
+++ b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
@@ -6,11 +6,15 @@ import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 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.tileentity.TileEntityMolder;
+import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.tileentity.TileEntityJewelrsCraftingTable;
+import darkknight.jewelrycraft.tileentity.TileEntitySmelter;
 
 public class BlockJewelrsCraftingTable extends BlockContainer
 {
@@ -19,13 +23,13 @@ public class BlockJewelrsCraftingTable extends BlockContainer
     protected BlockJewelrsCraftingTable(int par1, Material par2Material)
     {
         super(par1, par2Material);
-        this.setBlockBounds(0.1F, 0F, 0.1F, 0.9F, 0.2F, 0.9F);
+        this.setBlockBounds(0.0F, 0F, 0.0F, 1.0F, 0.8F, 1.0F);
     }
     
     @Override
     public TileEntity createNewTileEntity(World world)
     {
-        return new TileEntityMolder();
+        return new TileEntityJewelrsCraftingTable();
     }
     
     @Override
@@ -37,6 +41,35 @@ public class BlockJewelrsCraftingTable extends BlockContainer
     @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.getBlockTileEntity(i, j, k);
+        ItemStack item = entityPlayer.inventory.getCurrentItem();
+        if (te != null && !world.isRemote)
+        {
+            if (!te.hasJewel && item != null && item.getItem().itemID == ItemList.ring.itemID)
+            {
+                te.jewel = item;
+                te.hasJewel = true;
+                --item.stackSize;
+            }
+            if (!te.hasModifier && item != null && item.getItem().itemID == ItemList.ring.itemID)
+            {
+                te.modifier = item;
+                te.hasModifier = true;
+                --item.stackSize;
+            }   
+            
+            if (te.hasModifier && entityPlayer.isSneaking())
+            {
+                entityPlayer.dropPlayerItem(te.modifier);
+                te.hasModifier = false;
+            }            
+            if (te.hasJewel && entityPlayer.isSneaking())
+            {
+                entityPlayer.dropPlayerItem(te.jewel);
+                te.hasJewel = false;
+            }
+            world.setBlockTileEntity(i, j, k, te);
+        }
         return true;
     }
     
@@ -77,6 +110,6 @@ public class BlockJewelrsCraftingTable extends BlockContainer
     @Override
     public void registerIcons(IconRegister icon)
     {
-        this.blockIcon = icon.registerIcon("jewelrycraft:jewelrdCraftingTable");
+        this.blockIcon = icon.registerIcon("jewelrycraft:jewelrCraftingTable");
     }
 }
diff --git a/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java b/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
index 870190e..51db2da 100644
--- a/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
+++ b/common/darkknight/jewelrycraft/renders/TileEntityJewelrsCraftingTableRender.java
@@ -2,19 +2,21 @@ package darkknight.jewelrycraft.renders;
 
 import org.lwjgl.opengl.GL11;
 
-import darkknight.jewelrycraft.model.ModelMolder;
+import darkknight.jewelrycraft.model.ModelJewlersCraftingBench;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.Entity;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
 public class TileEntityJewelrsCraftingTableRender extends TileEntitySpecialRenderer
 {
-    ModelMolder modelTable = new ModelMolder();
-    String      texture     = "textures/tileentities/JewelrsCraftingTable.png";
+    ModelJewlersCraftingBench modelTable = new ModelJewlersCraftingBench();
+    String      texture     = "textures/tileentities/JewelrsCraftingBench.png";
     
     @Override
     public void renderTileEntityAt(TileEntity te, double x, double y, double z, float scale)
@@ -22,6 +24,9 @@ public class TileEntityJewelrsCraftingTableRender extends TileEntitySpecialRende
         GL11.glPushMatrix();
         GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
         
+        ResourceLocation blockTexture = new ResourceLocation("jewelrycraft", texture);
+        Minecraft.getMinecraft().renderEngine.bindTexture(blockTexture);
+        
         GL11.glPushMatrix();
         GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F);
         modelTable.render((Entity) null, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F);