Sync stuff :)

1 files changed, 28 insertions, 14 deletions

diff --git a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
index b24f69d..d151808 100644
--- a/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
+++ b/common/darkknight/jewelrycraft/block/BlockJewelrsCraftingTable.java
@@ -5,13 +5,18 @@ import java.util.Random;
 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.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;
 import net.minecraft.world.World;
 import darkknight.jewelrycraft.item.ItemList;
+import darkknight.jewelrycraft.item.ItemRing;
 import darkknight.jewelrycraft.tileentity.TileEntityJewelrsCraftingTable;
 
 public class BlockJewelrsCraftingTable extends BlockContainer
@@ -19,31 +24,31 @@ public class BlockJewelrsCraftingTable extends BlockContainer
     Random rand        = new Random();
     int    modifiers[] = new int[] { Item.blazePowder.itemID };
     int    effects[]   = new int[] { 12 };
-    
+
     protected BlockJewelrsCraftingTable(int par1, Material par2Material)
     {
         super(par1, par2Material);
         this.setBlockBounds(0.0F, 0F, 0.0F, 1.0F, 0.8F, 1.0F);
     }
-    
+
     @Override
     public TileEntity createNewTileEntity(World world)
     {
         return new TileEntityJewelrsCraftingTable();
     }
-    
+
     @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)
     {
         TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getBlockTileEntity(i, j, k);
         ItemStack item = entityPlayer.inventory.getCurrentItem();
-        if (te != null)
+        if (te != null && !world.isRemote)
         {
             if (!te.hasJewel && item != null && item.getItem().itemID == ItemList.ring.itemID)
             {
@@ -57,7 +62,7 @@ public class BlockJewelrsCraftingTable extends BlockContainer
                 te.hasModifier = true;
                 --item.stackSize;
             }
-            
+
             if (te.hasModifier && entityPlayer.isSneaking())
             {
                 entityPlayer.inventory.addItemStackToInventory(new ItemStack(te.modifier.itemID, 1, te.modifier.getItemDamage()));
@@ -70,25 +75,33 @@ public class BlockJewelrsCraftingTable extends BlockContainer
                 te.jewel = new ItemStack(0, 0, 0);
                 te.hasJewel = false;
             }
+            te.isDirty = true;
             world.setBlockTileEntity(i, j, k, te);
         }
         return true;
     }
-    
+
     public void giveJewelToPlayer(TileEntityJewelrsCraftingTable cf, EntityPlayer player, ItemStack item, ItemStack modifier)
     {
         if (item != null)
         {
-            //            ItemRing.addEffect(item, new PotionEffect(Potion.fireResistance.id, 120));
+            ItemRing.addEffect(item, Potion.fireResistance.id);
             player.inventory.addItemStackToInventory(item);
         }
     }
-    
+
+    @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)
     {
         TileEntityJewelrsCraftingTable te = (TileEntityJewelrsCraftingTable) world.getBlockTileEntity(i, j, k);
-        if (te != null)
+        if (te != null && !world.isRemote)
         {
             if (te.hasEndItem)
             {
@@ -103,27 +116,28 @@ public class BlockJewelrsCraftingTable extends BlockContainer
             else if (!te.hasModifier && !world.isRemote)
                 player.addChatMessage("You need a modifier");
             te.timer = 5;
+            te.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)
     {