Added a new structure, a new curse, achievements, challenges, curses

entry in the guide; reworked liquids to be tile entities, cleaned the
structures code, potion code and... you know what? I improved and
changed so much stuff that I literally forgot what I did...

3 files changed, 67 insertions, 76 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
index 17db979..4e0a14b 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectBlazePowder.java
@@ -18,65 +18,52 @@ import darkknight.jewelrycraft.util.JewelryNBT;
 import darkknight.jewelrycraft.util.PlayerUtils;

 import darkknight.jewelrycraft.util.Variables;

 

-public class EffectBlazePowder extends ModifierEffects

-{

-    public EffectBlazePowder()

-    {

-        super(new ItemStack(Items.blaze_powder));

-    }

-    

-    @Override

-    public void action(ItemStack item, EntityPlayer player, Item jewelry)

-    {

-        if (jewelry instanceof ItemNecklace){

-            // 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 && 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){

-            if (player.getAir() >= 300) player.setAir(player.getAir() / 2);

-            else player.setAir(player.getAir() - JewelryNBT.numberOfModifiers(item));

-        }

-    }

-    

-    @Override

-    public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)

-    {

-        // Balanced for ring

-        if (jewelry instanceof ItemRing && !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)

-    {

-        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)

-    {

-        NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

-        if (jewelry instanceof ItemEarrings && 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) 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);

-    }

+public class EffectBlazePowder extends ModifierEffects {

+	public EffectBlazePowder() {

+		super(new ItemStack(Items.blaze_powder));

+	}

+

+	@Override

+	public void action(ItemStack item, EntityPlayer player, Item jewelry) {

+		if (jewelry instanceof ItemNecklace) {

+			// 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 && 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) {

+			if (player.getAir() >= 300) player.setAir(player.getAir() / 2);

+			else player.setAir(player.getAir() - JewelryNBT.numberOfModifiers(item));

+		}

+	}

+

+	@Override

+	public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount) {

+		// Balanced for ring

+		if (jewelry instanceof ItemRing && !player.isInWater() && rand.nextInt(JewelryNBT.numberOfModifiers(item)) == 0) target.setFire(2);

+		return false;

+	}

+

+	public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount) {

+		NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

+		if (jewelry instanceof ItemEarrings && rand.nextInt(4) == 0 && 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);

+			return true;

+		}

+		// Positive for bracelet

+		if (jewelry instanceof ItemBracelet) 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;

+	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
index d0a48d5..8efebcd 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectFeather.java
@@ -61,35 +61,37 @@ public class EffectFeather extends ModifierEffects
     }

     

     @Override

-    public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)

+    public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)

     {

         NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

         NBTTagCompound enemyData = target.getEntityData();

-        if (jewelry instanceof ItemRing){

+        if (jewelry instanceof ItemRing && !player.worldObj.isRemote){

             if (enemyData.getInteger("reAttacked") == 0){

                 // Negative ring

                 enemyData.setInteger("reAttacked", enemyData.getInteger("reAttacked") + 1);

-                target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount / (2F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F));

+                target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount / (2F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.3F));

                 // Positive ring

                 if (rand.nextInt(2) == 0 && target instanceof EntityLivingBase) ((EntityLivingBase)target).addPotionEffect(new PotionEffect(PotionList.stun.id, (51 - JewelryNBT.numberOfModifiers(item))*2, 0, false));

-                playerInfo.setBoolean("weakDamage", true);

+                return true;

             }

-            if (enemyData.getInteger("reAttacked") == 1) enemyData.setInteger("reAttacked", 0);

+            else enemyData.setInteger("reAttacked", 0);

         }

+        return false;

     }

     

     @Override

-    public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)

+    public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)

     {

         NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

         // Positive necklace

         if (jewelry instanceof ItemNecklace && 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 + StatCollector.translateToLocal("chatmessage." + Variables.MODID + ".effect.feather")));

-            playerInfo.setBoolean("negateDamage", true);

+            return true;

         }

         // Negative necklace

         if (jewelry instanceof ItemNecklace && (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 && source.damageType.equals("arrow") && source != DamageSourceList.weak) player.attackEntityFrom(DamageSourceList.weak, amount * (2F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F));

+        if (jewelry instanceof ItemEarrings && source.damageType.equals("arrow")) player.attackEntityFrom(DamageSourceList.weak, amount * (2F + (JewelryNBT.numberOfModifiers(item) - 1) * 0.1F));

+        return false;

     }

 }

diff --git a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
index cf409b2..0a7f268 100644
--- a/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
+++ b/src/main/java/darkknight/jewelrycraft/effects/EffectObsidian.java
@@ -53,22 +53,23 @@ public class EffectObsidian extends ModifierEffects
     }

     

     @Override

-    public void onPlayerAttacked(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)

+    public boolean onPlayerAttackedCacellable(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry, float amount)

     {

         NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

         if (jewelry instanceof ItemEarrings && (source == DamageSource.anvil || source.damageType.equals("arrow"))){

             if (playerInfo.hasKey("protected")) playerInfo.setInteger("protected", playerInfo.getInteger("protected") + 1);

             else playerInfo.setInteger("protected", 1);

             // Positive && Negative earrings

-            if (playerInfo.getInteger("protected") < 200) playerInfo.setBoolean("negateDamage", true);

+            if (playerInfo.getInteger("protected") < 2000) return true;

             else player.attackEntityFrom(DamageSourceList.weak, player.getHealth() * 3F);

         }

         if (jewelry instanceof ItemBracelet && source == DamageSource.fall){

             if (playerInfo.hasKey("falls")) playerInfo.setInteger("falls", playerInfo.getInteger("falls") + 1);

             else playerInfo.setInteger("falls", 1);

             // Positive bracelet

-            if (playerInfo.getInteger("falls") < 300) playerInfo.setBoolean("negateDamage", true);

+            if (playerInfo.getInteger("falls") < 3000) return true;

         }

+        return false;

     }

     

     public void onPlayerDead(ItemStack item, EntityPlayer player, DamageSource source, Item jewelry)

@@ -79,21 +80,22 @@ public class EffectObsidian extends ModifierEffects
         playerInfo.setInteger("protected", 0);

     }

     

-    public void onEntityAttacked(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)

+    public boolean onEntityAttackedCacellable(ItemStack item, EntityPlayer player, Entity target, Item jewelry, float amount)

     {

         NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID);

         NBTTagCompound enemyData = target.getEntityData();

         // Positive ring

-        if (jewelry instanceof ItemRing && playerInfo.getInteger("strikes") < 200 && !player.worldObj.isRemote){

+        if (jewelry instanceof ItemRing && playerInfo.getInteger("strikes") < 2000 && !player.worldObj.isRemote){

             if (enemyData.getInteger("reAttacked") == 0){

                 if (playerInfo.hasKey("strikes")) playerInfo.setInteger("strikes", playerInfo.getInteger("strikes") + 1);

                 else playerInfo.setInteger("strikes", 1);

                 // Negative ring

                 enemyData.setInteger("reAttacked", enemyData.getInteger("reAttacked") + 1);

-                target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount * 2F);

-                playerInfo.setBoolean("weakDamage", true);

+                target.attackEntityFrom(DamageSource.causePlayerDamage(player), amount * 1.5F);

+                return true;

             }

             if (enemyData.getInteger("reAttacked") == 1) enemyData.setInteger("reAttacked", 0);

         }

+        return false;

     }

 }