I rearranged files and added a few cool stuff.

3 files changed, 80 insertions, 75 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
index 949d0d8..fdcdd3b 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
@@ -15,6 +15,7 @@ import darkknight.jewelrycraft.item.ItemNecklace;
 import darkknight.jewelrycraft.item.ItemRing;
 import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.PlayerUtils;
+import darkknight.jewelrycraft.util.Variables;
 
 public class EffectBlazePowder extends ModifierEffects
 {
@@ -26,70 +27,58 @@ public class EffectBlazePowder extends ModifierEffects
     @Override
     public void action(ItemStack item, EntityPlayer player, Item jewelry)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        if (jewelry instanceof ItemNecklace && pos != -1){
-            //Positive for necklace
-            player.extinguish();
-            
-            //Negative for necklace
-            if (player.isInWater()) player.attackEntityFrom(DamageSource.drown, 1f);
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        if (jewelry instanceof ItemNecklace && exists){
+            // Positive for necklace
+            if (player.isBurning() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) player.extinguish();
+            // Negative for necklace
+            if (player.isInWater()) player.attackEntityFrom(DamageSource.drown, 1f + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F);
         }
-        //Negative for bracelet
-        if (jewelry instanceof ItemBracelet && pos != -1 && player.isInWater()){
-            player.motionX *= 0.6D;
-            player.motionY *= 0.6D;
-            player.motionZ *= 0.6D;
-            player.motionY -= 0.02D;
+        // Negative for bracelet
+        if (jewelry instanceof ItemBracelet && exists && player.isInWater()){
+            double slowAmount = 0.6D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.05D;
+            player.motionX *= slowAmount;
+            player.motionY *= slowAmount;
+            player.motionZ *= slowAmount;
+            player.motionY -= (0.02D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.005D);
             if (player.isCollidedHorizontally) player.motionY = 0.30000001192092896D;
         }
-            
-        //Negative for earrings
-        if (jewelry instanceof ItemEarrings && pos != -1){
+        // Negative for earrings
+        if (jewelry instanceof ItemEarrings && exists){
             if (player.getAir() >= 300) player.setAir(player.getAir() / 2);
-            else player.setAir(player.getAir() - 1);            
-        }        
+            else player.setAir(player.getAir() - JewelryNBT.numberOfModifiers(item));
+        }
     }
     
     @Override
     public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        //Balanced for ring
-        if (jewelry instanceof ItemRing && pos != -1 && !player.isInWater()) target.setFire(2);
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        // Balanced for ring
+        if (jewelry instanceof ItemRing && exists && !player.isInWater() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) target.setFire(2);
         return false;
     }
     
     @Override
     public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
     {
-//        int pos = JewelryNBT.doesModifierExist(item, modifier);
-//        if (jewelry instanceof ItemEarrings && pos != -1 && rand.nextInt(4) == 0) if (source == DamageSource.lava || source == DamageSource.inFire || source == DamageSource.onFire){
-//            //Positive for earrings
-//            int stackSize = JewelryNBT.modifier(item).get(pos).stackSize;
-//            player.heal((float)(0.05 * stackSize));
-//            return true;
-//        }
-//        //Positive for bracelet
-//        if (jewelry instanceof ItemBracelet && pos != -1) if (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava && player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY - 0.7, player.boundingBox.maxZ), Material.lava) && !player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY + 0.9, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY, player.boundingBox.maxZ), Material.lava)) return true;
         return false;
     }
     
     public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
-    {
-        
-    }
+    {}
     
     public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-        if (jewelry instanceof ItemEarrings && pos != -1 && rand.nextInt(4) == 0) if (source == DamageSource.lava || source == DamageSource.inFire || source == DamageSource.onFire){
-            //Positive for earrings
-            int stackSize = JewelryNBT.modifier(item).get(pos).stackSize;
-            player.heal((float)(0.05 * stackSize));
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
+        if (jewelry instanceof ItemEarrings && exists && rand.nextInt(4) == 0) if (source == DamageSource.lava || source == DamageSource.inFire || source == DamageSource.onFire){
+            // Positive for earrings
+            int stackSize = JewelryNBT.modifierSize(item, modifier);
+            player.heal(stackSize*0.05F - (JewelryNBT.numberOfModifiers(item) - 1)*0.01F);
             playerInfo.setBoolean("negateDamage", true);
         }
-        //Positive for bracelet
-        if (jewelry instanceof ItemBracelet && pos != -1) if (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava && player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY - 0.7, player.boundingBox.maxZ), Material.lava) && !player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY + 0.9, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY, player.boundingBox.maxZ), Material.lava)) playerInfo.setBoolean("negateDamage", true);
+        // Positive for bracelet
+        if (jewelry instanceof ItemBracelet && exists) if (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava && player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY - 0.7, player.boundingBox.maxZ), Material.lava) && !player.worldObj.isMaterialInBB(AxisAlignedBB.getBoundingBox(player.boundingBox.minX, player.boundingBox.minY + 0.9, player.boundingBox.minZ, player.boundingBox.maxX, player.boundingBox.maxY, player.boundingBox.maxZ), Material.lava)) playerInfo.setBoolean("negateDamage", true);
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
index eb7bef7..4c36593 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectEnderEye.java
@@ -27,6 +27,7 @@ public class EffectEnderEye extends ModifierEffects
 {
     private boolean originalVD = false;
     private float originalViewDistance;
+    
     public EffectEnderEye()
     {
         super(new ItemStack(Items.ender_eye));
@@ -35,8 +36,8 @@ public class EffectEnderEye extends ModifierEffects
     @Override
     public void action(ItemStack item, EntityPlayer player, Item jewelry)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        if (jewelry instanceof ItemEarrings && pos != -1 && !player.worldObj.isRemote){
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        if (jewelry instanceof ItemEarrings && exists && !player.worldObj.isRemote){
             for(Object e: player.worldObj.getEntitiesWithinAABB(EntityEnderman.class, player.boundingBox.expand(100D, 0D, 100D))){
                 EntityEnderman enderman = (EntityEnderman)e;
                 ReflectionHelper.setPrivateValue(EntityEnderman.class, enderman, -1, "stareTimer", "field_70826_g");
@@ -46,34 +47,41 @@ public class EffectEnderEye extends ModifierEffects
                 vec31 = vec31.normalize();
                 double d1 = vec3.dotProduct(vec31);
                 if (d1 > 1.0D - 0.025D / d0 && player.canEntityBeSeen(enderman)){
-                    enderman.setTarget(null);
-                    if (!player.isPotionActive(Potion.confusion) || player.getActivePotionEffect(Potion.confusion).getDuration() <= 80) player.addPotionEffect(new PotionEffect(Potion.confusion.id, 300, 2));
+                    // Positive earrings
+                    if (rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) enderman.setTarget(null);
+                    // Negative earrings
+                    if (!player.isPotionActive(Potion.confusion) || player.getActivePotionEffect(Potion.confusion).getDuration() <= 80) player.addPotionEffect(new PotionEffect(Potion.confusion.id, 300, 2 + JewelryNBT.numberOfModifiers(item) / 4));
                 }
             }
         }
-        if (jewelry instanceof ItemNecklace && pos != -1 && !player.worldObj.isRemote){
+        // Positive necklace
+        if (jewelry instanceof ItemNecklace && exists && !player.worldObj.isRemote){
             ChunkPosition chunkposition = player.worldObj.findClosestStructure("Stronghold", (int)player.posX, (int)player.posY, (int)player.posZ);
             if (chunkposition != null){
-                Minecraft.getMinecraft().thePlayer.motionX += 0.01D * Math.signum((double)chunkposition.chunkPosX - player.posX);
-                Minecraft.getMinecraft().thePlayer.motionZ += 0.01D * Math.signum((double)chunkposition.chunkPosZ - player.posZ);
+                Minecraft.getMinecraft().thePlayer.motionX += 0.01D * Math.signum((double)chunkposition.chunkPosX - player.posX) * (rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0 ? 1 : -1);
+                Minecraft.getMinecraft().thePlayer.motionZ += 0.01D * Math.signum((double)chunkposition.chunkPosZ - player.posZ) * (rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0 ? 1 : -1);
             }
         }
-        if (jewelry instanceof ItemBracelet && pos != -1 && !player.worldObj.isRemote && player.worldObj.getBiomeGenForCoords((int)player.posX, (int)player.posZ) == BiomeGenBase.sky && (!player.isPotionActive(Potion.moveSpeed) || player.getActivePotionEffect(Potion.moveSpeed).getDuration() < 30)) player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 140, 1));
-        if (jewelry instanceof ItemBracelet && pos != -1 && !player.worldObj.isRemote && rand.nextInt(500) == 15) player.setPositionAndUpdate(player.posX + rand.nextInt(30)*(rand.nextBoolean()?-1:1), player.posY, player.posZ + rand.nextInt(30)*(rand.nextBoolean()?-1:1));
-        if (jewelry instanceof ItemRing && pos != -1 && rand.nextInt(200) == 12){
-            Minecraft.getMinecraft().gameSettings.setOptionFloatValue(Options.RENDER_DISTANCE, 1.0F);
+        // Positive bracelet
+        if (jewelry instanceof ItemBracelet && exists && !player.worldObj.isRemote && player.worldObj.getBiomeGenForCoords((int)player.posX, (int)player.posZ) == BiomeGenBase.sky && (!player.isPotionActive(Potion.moveSpeed) || player.getActivePotionEffect(Potion.moveSpeed).getDuration() < 30)) player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 150 - JewelryNBT.numberOfModifiers(item) * 10, 2 - JewelryNBT.numberOfModifiers(item) / 5));
+        // Negative bracelet
+        if (jewelry instanceof ItemBracelet && exists && !player.worldObj.isRemote && rand.nextInt(520 - JewelryNBT.numberOfModifiers(item) * 20) == 15) player.setPositionAndUpdate(player.posX + rand.nextInt(30) * (rand.nextBoolean() ? -1 : 1), player.posY, player.posZ + rand.nextInt(30) * (rand.nextBoolean() ? -1 : 1));
+        // Negative ring
+        if (jewelry instanceof ItemRing && exists) Minecraft.getMinecraft().gameSettings.setOptionFloatValue(Options.RENDER_DISTANCE, 2.2F - JewelryNBT.numberOfModifiers(item) * 0.1F);
+        // Positive ring
+        if (jewelry instanceof ItemRing && exists && rand.nextInt(180 + JewelryNBT.numberOfModifiers(item)*20) == 12){
             for(int i = (int)player.posX - 2; i <= (int)player.posX + 2; i++)
                 for(int j = (int)player.posY - 2; j <= (int)player.posY + 2; j++)
                     for(int k = (int)player.posZ - 2; k <= (int)player.posZ + 2; k++)
-                        if(player.worldObj.getBlock(i, j, k) instanceof BlockOre) 
-                            player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.GRAY + "You sense some " + player.worldObj.getBlock(i, j, k).getLocalizedName() + " around you."));
+                        if (player.worldObj.getBlock(i, j, k) instanceof BlockOre) player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.GRAY + "You sense some " + player.worldObj.getBlock(i, j, k).getLocalizedName() + " around you."));
         }
     }
     
     @Override
     public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        if (jewelry instanceof ItemNecklace && pos != -1 && !player.worldObj.isRemote) player.addPotionEffect(new PotionEffect(Potion.blindness.id, 100, 1));
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        // Negative necklace
+        if (jewelry instanceof ItemNecklace && exists && !player.worldObj.isRemote) player.addPotionEffect(new PotionEffect(Potion.blindness.id, 100 + JewelryNBT.numberOfModifiers(item)*30, 1));
     }
 }
diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
index 2acaf76..512a25b 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
@@ -3,12 +3,15 @@ package darkknight.jewelrycraft.effects;
 import java.util.Iterator;
 import java.util.List;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.init.Items;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.DamageSource;
@@ -20,6 +23,7 @@ import darkknight.jewelrycraft.item.ItemNecklace;
 import darkknight.jewelrycraft.item.ItemRing;
 import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.PlayerUtils;
+import darkknight.jewelrycraft.util.Variables;
 
 public class EffectFeather extends ModifierEffects
 {
@@ -31,39 +35,42 @@ public class EffectFeather extends ModifierEffects
     @Override
     public void action(ItemStack item, EntityPlayer player, Item jewelry)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         // Positive earrings
-        if (jewelry instanceof ItemEarrings && pos != -1){
+        if (jewelry instanceof ItemEarrings && exists){
             AxisAlignedBB axisalignedbb = player.boundingBox.expand(1.0D, 1.0D, 1.0D);
             List list = player.worldObj.getEntitiesWithinAABB(EntityArrow.class, axisalignedbb);
             if (!player.worldObj.isRemote && list != null && !list.isEmpty()){
                 Iterator iterator = list.iterator();
                 while (iterator.hasNext()){
                     EntityArrow arrow = (EntityArrow)iterator.next();
-                    if (rand.nextInt(3) == 0 && (arrow.shootingEntity == null || !(arrow.shootingEntity.equals(player)) || arrow.canBePickedUp == 0)) arrow.setDead();
+                    if ((arrow.shootingEntity == null || !(arrow.shootingEntity.equals(player)) || arrow.canBePickedUp == 0) && rand.nextInt(2 + JewelryNBT.numberOfModifiers(item)) == 0) arrow.setDead();
                 }
             }
         }
-        // Positive bracelet
-        if (jewelry instanceof ItemBracelet && pos != -1){
-            if (player.motionY < 0) player.motionY *= 0.6D;
-            player.setAIMoveSpeed(player.getAIMoveSpeed() / 2);
-            player.fallDistance = 0F;
+        if (jewelry instanceof ItemBracelet && exists){
+            // Positive bracelet
+            if (player.motionY < 0) player.motionY *= (0.6D + (JewelryNBT.numberOfModifiers(item) - 1) * 0.03D);
+            if (rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) player.fallDistance = 0F;
+            // Negative bracelet
+            if (!player.isPotionActive(Potion.moveSlowdown) || player.getActivePotionEffect(Potion.moveSlowdown).getDuration() < 30) player.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 80 + JewelryNBT.numberOfModifiers(item) * 10, 1 + JewelryNBT.numberOfModifiers(item) / 4));
         }
     }
     
     @Override
     public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
         NBTTagCompound enemyData = target.getEntityData();
-        if (jewelry instanceof ItemRing && pos != -1 && enemyData.getInteger("reAttacked") == 0){
+        if (jewelry instanceof ItemRing && exists && enemyData.getInteger("reAttacked") == 0){
+            // Negative ring
             enemyData.setInteger("reAttacked", enemyData.getInteger("reAttacked") + 1);
-            target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount / 2F);
+            target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount / (2F + (JewelryNBT.numberOfModifiers(item)-1)*0.1F));
+            // Positive ring
             if (rand.nextInt(2) == 0){
-                enemyData.setInteger("stunTime", 50);
+                enemyData.setInteger("stunTime", 51 - JewelryNBT.numberOfModifiers(item));
                 enemyData.setBoolean("stunned", true);
             }
             playerInfo.setBoolean("weakDamage", true);
@@ -74,15 +81,16 @@ public class EffectFeather extends ModifierEffects
     @Override
     public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)
     {
-        int pos = JewelryNBT.doesModifierExist(item, modifier);
-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, "Jewelrycraft");
-        if (jewelry instanceof ItemNecklace && pos != -1 && rand.nextInt(4) == 0 && source != DamageSourceList.weak && source != DamageSource.inFire && source != DamageSource.onFire && source != DamageSource.lava){
+        boolean exists = JewelryNBT.doesModifierExist(item, modifier);
+        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);
+        // Positive necklace
+        if (jewelry instanceof ItemNecklace && exists && rand.nextInt(3 + JewelryNBT.numberOfModifiers(item)) == 0 && source != DamageSourceList.weak && source != DamageSource.inFire && source != DamageSource.onFire && source != DamageSource.lava){
             player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.GRAY + "The necklace protected you from taking damage!"));
             playerInfo.setBoolean("negateDamage", true);
         }
         // Negative necklace
-        if (jewelry instanceof ItemNecklace && pos != -1 && (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava) && source != DamageSourceList.weak) player.attackEntityFrom(DamageSourceList.weak, amount * 3F);
+        if (jewelry instanceof ItemNecklace && exists && (source == DamageSource.inFire || source == DamageSource.onFire || source == DamageSource.lava) && source != DamageSourceList.weak) player.attackEntityFrom(DamageSourceList.weak, amount * (3F + (JewelryNBT.numberOfModifiers(item) - 1)*0.1F));
         // Negative earrings
-        if (jewelry instanceof ItemEarrings && pos != -1 && source.damageType.equals("arrow") && source != DamageSourceList.weak) player.attackEntityFrom(DamageSourceList.weak, amount * 2F);
+        if (jewelry instanceof ItemEarrings && exists && source.damageType.equals("arrow") && source != DamageSourceList.weak) player.attackEntityFrom(DamageSourceList.weak, amount * (2F + (JewelryNBT.numberOfModifiers(item) - 1)*0.1F));
     }
 }