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

6 files changed, 141 insertions, 65 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java
new file mode 100644
index 0000000..3a4d984
--- /dev/null
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java
@@ -0,0 +1,49 @@
+package darkknight.jewelrycraft.curses;

+

+import darkknight.jewelrycraft.JewelrycraftMod;

+import darkknight.jewelrycraft.api.Curse;

+import darkknight.jewelrycraft.entities.EntityHalfHeart;

+import darkknight.jewelrycraft.entities.EntityHeart;

+import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo;

+import darkknight.jewelrycraft.network.PacketSendServerPlayersInfo;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

+import darkknight.jewelrycraft.util.PlayerUtils;

+import darkknight.jewelrycraft.util.Variables;

+import net.minecraft.entity.Entity;

+import net.minecraft.entity.EntityLiving;

+import net.minecraft.entity.SharedMonsterAttributes;

+import net.minecraft.entity.monster.EntityMob;

+import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.entity.player.EntityPlayerMP;

+import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.util.DamageSource;

+import net.minecraft.util.StatCollector;

+import net.minecraft.world.World;

+import net.minecraftforge.event.entity.living.LivingAttackEvent;

+

+public class CurseDeathsTouch extends Curse

+{

+    public CurseDeathsTouch(String name, int txtID, String pack)

+    {

+        super(name, txtID, pack);

+    }

+    

+    @Override

+    public boolean attackedByPlayerActionCancelable(LivingAttackEvent event, World world, EntityPlayer player, Entity target)

+    {

+        if (!world.isRemote) target.attackEntityFrom(DamageSource.wither, event.ammount);

+        return true;

+    }

+    

+    public String getDescription()

+    {

+        return StatCollector.translateToLocal("curse." + Variables.MODID + ".deathsTouch.description");

+    }

+    

+	@Override

+	public String getDisplayName() 

+	{

+		return StatCollector.translateToLocal("curse." + Variables.MODID + ".deathsTouch");

+	}

+	

+}

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
index 138f322..f56c66d 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
@@ -11,10 +11,13 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.SharedMonsterAttributes;

 import net.minecraft.entity.monster.EntityMob;

 import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.entity.player.EntityPlayerMP;

 import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.util.StatCollector;

 import net.minecraft.world.World;

 import net.minecraftforge.client.event.RenderPlayerEvent;

+import net.minecraftforge.event.entity.living.LivingAttackEvent;

+import darkknight.jewelrycraft.JewelrycraftMod;

 import darkknight.jewelrycraft.api.Curse;

 import darkknight.jewelrycraft.config.ConfigHandler;

 import darkknight.jewelrycraft.damage.DamageSourceList;

@@ -22,6 +25,8 @@ import darkknight.jewelrycraft.entities.EntityHalfHeart;
 import darkknight.jewelrycraft.entities.EntityHeart;

 import darkknight.jewelrycraft.entities.renders.RenderHelper;

 import darkknight.jewelrycraft.item.render.MaskRender;

+import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo;

+import darkknight.jewelrycraft.network.PacketSendServerPlayersInfo;

 import darkknight.jewelrycraft.util.JewelrycraftUtil;

 import darkknight.jewelrycraft.util.PlayerUtils;

 import darkknight.jewelrycraft.util.Variables;

@@ -34,7 +39,7 @@ public class CurseInfamy extends Curse
     }

     

     @Override

-    public void attackedByPlayerAction(World world, EntityPlayer player, Entity target)

+    public void attackedByPlayerAction(LivingAttackEvent event, World world, EntityPlayer player, Entity target)

     {

         if (rand.nextInt(5) == 0 && !world.isRemote && !(target instanceof EntityMob) && target instanceof EntityLiving && !(target instanceof EntityHeart) && !(target instanceof EntityHalfHeart) && target.canAttackWithItem()){

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

@@ -44,6 +49,8 @@ public class CurseInfamy extends Curse
                 player.setHealth(player.getHealth() - 1.0F);

             }

             JewelrycraftUtil.addCursePoints(player, 10);

+			JewelrycraftMod.netWrapper.sendToAll(new PacketSendServerPlayersInfo());

+			JewelrycraftMod.netWrapper.sendTo(new PacketSendClientPlayerInfo(playerInfo), (EntityPlayerMP)player);

         }

     }

     

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
index a812b24..6c682a2 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java
@@ -1,42 +1,42 @@
-package darkknight.jewelrycraft.curses;
-
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import darkknight.jewelrycraft.api.Curse;
-import darkknight.jewelrycraft.config.ConfigHandler;
-import darkknight.jewelrycraft.util.Variables;
-
-public class CurseList
-{
-    public static Curse rotten;
-    public static Curse flaming;
-    public static Curse blind;
-    public static Curse greed;
-    public static Curse infamy;
-    public static Curse midasTouch;
-    public static Curse rabbitsPaw;
-    public static Curse pentagram;
-    public static Curse vampireHunger;
-    public static Curse humbleBundle;
-    public static Curse deathsTouch;
-    public static Curse antichrist;
-    public static Curse moneyEqualsPower;
-    
-    public static void preInit(FMLPreInitializationEvent e)
-    {
-        if (ConfigHandler.CURSES_ENABLED){
-            rotten = new CurseRottenHeart(Variables.MODNAME + ":" + "Rotten Heart", 0, Variables.MODID + "_curses_0");
-            flaming = new CurseFlamingSoul(Variables.MODNAME + ":" + "Flaming Soul", 1, Variables.MODID + "_curses_0");
-            greed = new CurseGreed(Variables.MODNAME + ":" + "Greed", 2, Variables.MODID + "_curses_0");
-            blind = new CurseBlind(Variables.MODNAME + ":" + "Blind", 3, Variables.MODID + "_curses_0");
-            infamy = new CurseInfamy(Variables.MODNAME + ":" + "Infamy", 4, Variables.MODID + "_curses_0");
-            midasTouch = new CurseMidasTouch(Variables.MODNAME + ":" + "Midas Touch", 5, Variables.MODID + "_curses_0");
-            rabbitsPaw = new CurseRabbitsPaw(Variables.MODNAME + ":" + "Rabbit's Paw", 6, Variables.MODID + "_curses_0");
-            pentagram = new CursePentagram(Variables.MODNAME + ":" + "Pentagram", 7, Variables.MODID + "_curses_0");
-            vampireHunger = new CurseVampireHunger(Variables.MODNAME + ":" + "Vampire Hunger", 8, Variables.MODID + "_curses_0");
-            humbleBundle = new CurseHumbleBundle(Variables.MODNAME + ":" + "Humble Bundle", 9, Variables.MODID + "_curses_0");
-        }
-        // deathsTouch = new CurseMidasTouch(Variables.MODNAME + ":" + "Deaths Touch", 10, Variables.MODID + "_curses_0");
-        // antichrist = new CurseMidasTouch(Variables.MODNAME + ":" + "Antichrist", 11, Variables.MODID + "_curses_0");
-        // moneyEqualsPower = new CurseMidasTouch(Variables.MODNAME + ":" + "Money Equals Power", 12, Variables.MODID + "_curses_0");
-    }
-}
+package darkknight.jewelrycraft.curses;

+

+import cpw.mods.fml.common.event.FMLPreInitializationEvent;

+import darkknight.jewelrycraft.api.Curse;

+import darkknight.jewelrycraft.config.ConfigHandler;

+import darkknight.jewelrycraft.util.Variables;

+

+public class CurseList

+{

+    public static Curse rotten;

+    public static Curse flaming;

+    public static Curse blind;

+    public static Curse greed;

+    public static Curse infamy;

+    public static Curse midasTouch;

+    public static Curse rabbitsPaw;

+    public static Curse pentagram;

+    public static Curse vampireHunger;

+    public static Curse humbleBundle;

+    public static Curse deathsTouch;

+    public static Curse antichrist;

+    public static Curse moneyEqualsPower;

+    

+    public static void preInit(FMLPreInitializationEvent e)

+    {

+        if (ConfigHandler.CURSES_ENABLED){

+            rotten = new CurseRottenHeart(Variables.MODNAME + ":" + "Rotten Heart", 0, Variables.MODID + "_curses_0");

+            flaming = new CurseFlamingSoul(Variables.MODNAME + ":" + "Flaming Soul", 1, Variables.MODID + "_curses_0");

+            greed = new CurseGreed(Variables.MODNAME + ":" + "Greed", 2, Variables.MODID + "_curses_0");

+            blind = new CurseBlind(Variables.MODNAME + ":" + "Blind", 3, Variables.MODID + "_curses_0");

+            infamy = new CurseInfamy(Variables.MODNAME + ":" + "Infamy", 4, Variables.MODID + "_curses_0");

+            midasTouch = new CurseMidasTouch(Variables.MODNAME + ":" + "Midas Touch", 5, Variables.MODID + "_curses_0");

+            rabbitsPaw = new CurseRabbitsPaw(Variables.MODNAME + ":" + "Rabbit's Paw", 6, Variables.MODID + "_curses_0");

+            pentagram = new CursePentagram(Variables.MODNAME + ":" + "Pentagram", 7, Variables.MODID + "_curses_0");

+            vampireHunger = new CurseVampireHunger(Variables.MODNAME + ":" + "Vampire Hunger", 8, Variables.MODID + "_curses_0");

+            humbleBundle = new CurseHumbleBundle(Variables.MODNAME + ":" + "Humble Bundle", 9, Variables.MODID + "_curses_0");

+            deathsTouch = new CurseDeathsTouch(Variables.MODNAME + ":" + "Deaths Touch", 10, Variables.MODID + "_curses_0");

+            // antichrist = new CurseMidasTouch(Variables.MODNAME + ":" + "Antichrist", 11, Variables.MODID + "_curses_0");

+            // moneyEqualsPower = new CurseMidasTouch(Variables.MODNAME + ":" + "Money Equals Power", 12, Variables.MODID + "_curses_0");

+        }

+    }

+}

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
index 8133b75..0ce2810 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
@@ -23,6 +23,7 @@ import net.minecraft.item.ItemSword;
 import net.minecraft.util.MathHelper;

 import net.minecraft.util.StatCollector;

 import net.minecraft.world.World;

+import net.minecraftforge.event.entity.living.LivingAttackEvent;

 import darkknight.jewelrycraft.api.Curse;

 import darkknight.jewelrycraft.block.BlockList;

 import darkknight.jewelrycraft.config.ConfigHandler;

@@ -41,7 +42,7 @@ public class CurseMidasTouch extends Curse
     }

     

     @Override

-    public void attackedByPlayerAction(World world, EntityPlayer player, Entity target)

+    public void attackedByPlayerAction(LivingAttackEvent event, World world, EntityPlayer player, Entity target)

     {

         if (!world.isRemote && target instanceof EntityLivingBase && !(target instanceof EntityHeart) && !(target instanceof EntityHalfHeart) && player.inventory.getCurrentItem() == null){

             world.setBlock(MathHelper.floor_double(target.posX), MathHelper.floor_double(target.posY), MathHelper.floor_double(target.posZ), BlockList.midasTouchBlock, 0, 2);

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index 730542a..56a1b11 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -1,5 +1,15 @@
 package darkknight.jewelrycraft.curses;

 

+import org.lwjgl.opengl.GL11;

+

+import cpw.mods.fml.relauncher.Side;

+import cpw.mods.fml.relauncher.SideOnly;

+import darkknight.jewelrycraft.achievements.AchievementsList;

+import darkknight.jewelrycraft.api.Curse;

+import darkknight.jewelrycraft.config.ConfigHandler;

+import darkknight.jewelrycraft.util.JewelrycraftUtil;

+import darkknight.jewelrycraft.util.PlayerUtils;

+import darkknight.jewelrycraft.util.Variables;

 import net.minecraft.client.Minecraft;

 import net.minecraft.client.renderer.Tessellator;

 import net.minecraft.client.renderer.texture.TextureManager;

@@ -7,26 +17,18 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;

 import net.minecraft.entity.SharedMonsterAttributes;

 import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.nbt.NBTTagCompound;

 import net.minecraft.util.AxisAlignedBB;

-import net.minecraft.util.DamageSource;

+import net.minecraft.util.ChatComponentText;

+import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.util.ResourceLocation;

 import net.minecraft.util.StatCollector;

 import net.minecraft.world.World;

-import net.minecraft.world.biome.BiomeGenBase;

 import net.minecraftforge.client.event.RenderHandEvent;

 import net.minecraftforge.client.event.RenderPlayerEvent;

 

-import org.lwjgl.opengl.GL11;

-

-import cpw.mods.fml.relauncher.Side;

-import cpw.mods.fml.relauncher.SideOnly;

-import darkknight.jewelrycraft.api.Curse;

-import darkknight.jewelrycraft.config.ConfigHandler;

-import darkknight.jewelrycraft.damage.DamageSourceList;

-import darkknight.jewelrycraft.util.Variables;

-

 public class CursePentagram extends Curse {

-	float	rot	= 0F;

+	float rot = 0F;

 

 	public CursePentagram(String name, int txtID, String pack) {

 		super(name, txtID, pack);

@@ -34,22 +36,32 @@ public class CursePentagram extends Curse {
 

 	@Override

 	public void action(World world, EntityPlayer player) {

+		super.action(world, player);

 		if (!world.isRemote) {

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

 			for (Object entity : world.getEntitiesWithinAABBExcludingEntity(player, AxisAlignedBB.getBoundingBox(player.boundingBox.minX - 0.5F, player.boundingBox.minY, player.boundingBox.minZ - 0.5F, player.boundingBox.maxX + 0.5F, player.boundingBox.maxY, player.boundingBox.maxZ + 0.5F))) {

-				if (entity instanceof EntityLivingBase && rand.nextInt(40) == 0) {

-					((EntityLivingBase) entity).getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(((EntityLivingBase) entity).getMaxHealth() - 2f);//attackEntityFrom(DamageSourceList.shadows, 2f);

-					if (player.shouldHeal()) player.heal(2F);

-					else player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);

+				if (entity instanceof EntityLivingBase) {

+					NBTTagCompound target = ((EntityLivingBase) entity).getEntityData();

+					if (target.getInteger("stolenHealth") < (JewelrycraftUtil.AchievemtUnlocked(player, AchievementsList.pentagram) ? 3 : 2) && rand.nextInt(40) == 0) {

+						((EntityLivingBase) entity).getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(((EntityLivingBase) entity).getMaxHealth() - 2f);

+						target.setInteger("stolenHealth", target.hasKey("stolenHealth") ? target.getInteger("stolenHealth") + 1 : 1);

+						playerInfo.setInteger("heartsStolen", playerInfo.hasKey("heartsStolen") ? playerInfo.getInteger("heartsStolen") + 1 : 1);

+						if (player.shouldHeal()) player.heal(2F);

+						else player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() + 2f);

+					}

+				}

+			}

+			if (!playerInfo.getBoolean(AchievementsList.pentagram.statId)) {

+				if (ticksActive > 24000 && playerInfo.getInteger("heartsStolen") <= 0) player.addStat(AchievementsList.pentagram, 1);

+				else {

+					player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.RED + StatCollector.translateToLocal("challenge.failed") + " " + EnumChatFormatting.GOLD + StatCollector.translateToLocal(AchievementsList.pentagram.statId)));

+					playerInfo.setBoolean(AchievementsList.pentagram.statId, true);

 				}

 			}

 		}

 	}

 

 	@Override

-	public void attackedByPlayerAction(World world, EntityPlayer player, Entity target) {

-	}

-

-	@Override

 	public void playerRender(EntityPlayer player, RenderPlayerEvent.Specials.Post event) {

 		ResourceLocation PENTAGRAM_TEXTURE = new ResourceLocation(Variables.MODID, "textures/gui/" + getTexturePack() + ".png");

 		GL11.glPushMatrix();

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
index c486e5d..3d6a2da 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
@@ -5,6 +5,7 @@ package darkknight.jewelrycraft.curses;
 

 import net.minecraft.entity.Entity;

 import net.minecraft.entity.player.EntityPlayer;

+import net.minecraft.util.MathHelper;

 import net.minecraft.util.StatCollector;

 import net.minecraft.world.World;

 import darkknight.jewelrycraft.api.Curse;

@@ -24,7 +25,13 @@ public class CurseVampireHunger extends Curse
     

     public void attackedByPlayerAction(World world, EntityPlayer player, Entity target)

     {

-        if(player.shouldHeal() && rand.nextInt(5) == 0) player.heal(1F);

+        if(player.shouldHeal() && rand.nextBoolean()) player.heal(1F);

+    }

+    

+    public void action(World world, EntityPlayer player)

+    {

+        if(!player.capabilities.isCreativeMode && world.isDaytime() && !world.isRaining() && world.canBlockSeeTheSky(MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY + 1F), MathHelper.floor_double(player.posZ)))

+        	player.setFire(8);

     }

     

     public String getDescription()