Yaay! I finished another update :)

2 files changed, 23 insertions, 23 deletions

diff --git a/common/darkknight/jewelrycraft/item/ItemNecklace.java b/common/darkknight/jewelrycraft/item/ItemNecklace.java
index 7559f53..1218191 100644
--- a/common/darkknight/jewelrycraft/item/ItemNecklace.java
+++ b/common/darkknight/jewelrycraft/item/ItemNecklace.java
@@ -118,17 +118,17 @@ public class ItemNecklace extends Item
         return stack;
     }
 
-    @Override
-    public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity)
-    {
-        if (!player.worldObj.isRemote && entity instanceof EntityLivingBase && JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar)) && JewelryNBT.isModifierX(stack, new ItemStack(Block.chest)) && JewelryNBT.entity(stack, player) == null){
-            JewelryNBT.addEntity(stack, entity);
-            JewelryNBT.addEntityID(stack, entity);
-            entity.setDead();
-            JewelryNBT.addFakeEnchantment(stack);
-        }
-        return true;
-    }
+//    @Override
+//    public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity)
+//    {
+//        if (!player.worldObj.isRemote && entity instanceof EntityLivingBase && JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar)) && JewelryNBT.isModifierX(stack, new ItemStack(Block.chest)) && JewelryNBT.entity(stack, player) == null){
+//            JewelryNBT.addEntity(stack, entity);
+//            JewelryNBT.addEntityID(stack, entity);
+//            entity.setDead();
+//            JewelryNBT.addFakeEnchantment(stack);
+//        }
+//        return true;
+//    }
 
     /**
      * allows items to add custom lines of information to the mouseover
@@ -220,14 +220,14 @@ public class ItemNecklace extends Item
     @Override
     public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5)
     {
-        amplifier = 1D;
+        amplifier = 0D;
         if (!world.isRemote)
         {
             EntityPlayer entityplayer = (EntityPlayer) entity;
             int posX = (int)Math.floor(entityplayer.posX), posY = (int)Math.floor(entityplayer.posY), posZ = (int)Math.floor(entityplayer.posZ);
 
-            if (JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond))) amplifier = 2D;
-            else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.emerald))) amplifier = 3D;
+            if (JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond))) amplifier = 1D;
+            else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.emerald))) amplifier = 2D;
             else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar))) amplifier = 5D;            
 
             if(JewelryNBT.isModifierX(stack, new ItemStack(Item.dyePowder, 1, 15)) && world.getBlockId(posX, posY - 1, posZ) == Block.tilledField.blockID) 
diff --git a/common/darkknight/jewelrycraft/item/ItemRing.java b/common/darkknight/jewelrycraft/item/ItemRing.java
index 900039b..92416f4 100644
--- a/common/darkknight/jewelrycraft/item/ItemRing.java
+++ b/common/darkknight/jewelrycraft/item/ItemRing.java
@@ -161,7 +161,7 @@ public class ItemRing extends Item
 
     public String getItemDisplayName(ItemStack stack)
     {
-        if (JewelryNBT.ingot(stack) != null && JewelryNBT.jewel(stack) != null && JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond)) && JewelryNBT.isIngotX(stack, new ItemStack(Item.ingotGold))) return "Wedding Ring";
+        if (JewelryNBT.ingot(stack) != null && JewelryNBT.jewel(stack) != null && JewelryNBT.modifier(stack) == null && JewelryNBT.isJewelX(stack, new ItemStack(Item.diamond)) && JewelryNBT.isIngotX(stack, new ItemStack(Item.ingotGold))) return "Wedding Ring";
         else if(JewelryNBT.ingot(stack) != null) return JewelryNBT.ingot(stack).getDisplayName().replace("Ingot", " ").trim() + " " + ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
         return ("" + StatCollector.translateToLocal(this.getUnlocalizedNameInefficiently(stack) + ".name")).trim();
     }
@@ -394,7 +394,7 @@ public class ItemRing extends Item
             else if (JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar))) amplifier = 7;
 
             if(JewelryNBT.isModifierX(stack, new ItemStack(Item.dyePowder, 1, 15)) && world.getBlockId(posX, posY - 1, posZ) == Block.tilledField.blockID) 
-                world.setBlockMetadataWithNotify(posX, posY - 1, posZ, 1, 2);            
+                world.setBlockMetadataWithNotify(posX, posY - 1, posZ, 1, 7);            
 
             if(JewelryNBT.isModeX(stack, "Activated"))
             {
@@ -429,8 +429,8 @@ public class ItemRing extends Item
             if(entityplayer.inventory.getCurrentItem() != null && JewelryNBT.isJewelX(stack, new ItemStack(Item.netherStar)) && JewelryNBT.isModifierX(stack, new ItemStack(Item.book)) && entityplayer.inventory.getCurrentItem().equals(stack))
             {
                 ItemStack item = null;
-                if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
-                if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
+                if(entityplayer.inventory.currentItem + 1 <= 8 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
+                if(entityplayer.inventory.currentItem - 1 >= 0 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1).isItemEnchanted()) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
                 if(item != null && JewelryNBT.isModeX(stack, "Disenchant"))
                 {
                     ItemStack enchBook = new ItemStack(Item.enchantedBook);
@@ -457,9 +457,9 @@ public class ItemRing extends Item
                         }
                     }
                 }
-                if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && JewelryNBT.isModeX(stack, "Transfer"))
+                if(entityplayer.inventory.currentItem + 1 <= 8 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null && entityplayer.inventory.currentItem - 1 >= 0 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null && JewelryNBT.isModeX(stack, "Transfer"))
                 {
-                    if(cooldown > 0) entityplayer.addChatMessage("Ring is currently cooling down (" + cooldown + ")");
+                    if(cooldown > 0) entityplayer.addChatMessage("Ring is currently cooling down!");
                     ItemStack enchantedItem = null, enchantableItem = null;
                     if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1).isItemEnchanted() && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null)
                     {
@@ -483,13 +483,13 @@ public class ItemRing extends Item
                                 EnchantmentHelper.setEnchantments(resultItem, enchantableItem);
                                 enchItem.remove(Integer.valueOf(e));
                                 EnchantmentHelper.setEnchantments(enchItem, enchantedItem);
-                                cooldown = 1000;
+                                cooldown = 50000;
                             }
                         }
                     }
                 }
-                if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
-                else if(entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
+                if(entityplayer.inventory.currentItem + 1 <= 8 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem + 1);
+                else if(entityplayer.inventory.currentItem - 1 >= 0 && entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1) != null) item = entityplayer.inventory.getStackInSlot(entityplayer.inventory.currentItem - 1);
                 if(item != null && !item.isItemEnchanted() && item.isItemEnchantable() && entityplayer.experienceLevel > 0 && JewelryNBT.isModeX(stack, "Enchant"))
                 {
                     Map enchItem = EnchantmentHelper.getEnchantments(item);