diff options
| author | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-04-12 16:29:24 +0300 |
|---|---|---|
| committer | OnyxDarkKnight <sor1n.iliutza16@gmail.com> | 2015-04-12 16:29:24 +0300 |
| commit | 4f29b0ed24e393be7074abd851e207aadab38196 (patch) | |
| tree | be8e5211a2956589c08b5e88b5e083e6aaeb96ce /src/main/java/darkknight/jewelrycraft/curses | |
| parent | 6312636fd9a4d0f56dc7c9ff474a99d879bcb4e9 (diff) | |
I rearranged files and added a few cool stuff.
Diffstat (limited to 'src/main/java/darkknight/jewelrycraft/curses')
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java | 3 | ||||
| -rw-r--r-- | src/main/java/darkknight/jewelrycraft/curses/CurseList.java | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java index aa815f7..1a86862 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java @@ -12,6 +12,7 @@ import darkknight.jewelrycraft.entities.EntityHalfHeart; import darkknight.jewelrycraft.entities.EntityHeart; import darkknight.jewelrycraft.util.JewelrycraftUtil; import darkknight.jewelrycraft.util.PlayerUtils; +import darkknight.jewelrycraft.util.Variables; public class CurseInfamy extends Curse { @@ -24,7 +25,7 @@ public class CurseInfamy extends Curse public void attackedByPlayerAction(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, "Jewelrycraft"); + NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(player, Variables.MODID); if (playerInfo.getFloat("BlackHeart") < 20F) playerInfo.setFloat("BlackHeart", playerInfo.getFloat("BlackHeart") + 1.0F); if (player.getMaxHealth() >= 3F){ player.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(player.getMaxHealth() - 1.0F); diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java index 4e796ff..a076e07 100644 --- a/src/main/java/darkknight/jewelrycraft/curses/CurseList.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseList.java @@ -1,7 +1,7 @@ package darkknight.jewelrycraft.curses; import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import darkknight.jewelrycraft.lib.Reference; +import darkknight.jewelrycraft.util.Variables; public class CurseList { @@ -14,11 +14,11 @@ public class CurseList public static void preInit(FMLPreInitializationEvent e) { if (!isInitialized){ - rotten = new CurseRottenHeart(0, Reference.MODNAME + ":" + "Rotten Heart", 0); - flaming = new CurseFlamingSoul(1, Reference.MODNAME + ":" + "Flaming Soul", 0); - greed = new CurseGreed(2, Reference.MODNAME + ":" + "Greed", 0); - blind = new CurseBlind(3, Reference.MODNAME + ":" + "Blind", 0); - infamy = new CurseInfamy(4, Reference.MODNAME + ":" + "Infamy", 0); + rotten = new CurseRottenHeart(0, Variables.MODNAME + ":" + "Rotten Heart", 0); + flaming = new CurseFlamingSoul(1, Variables.MODNAME + ":" + "Flaming Soul", 0); + greed = new CurseGreed(2, Variables.MODNAME + ":" + "Greed", 0); + blind = new CurseBlind(3, Variables.MODNAME + ":" + "Blind", 0); + infamy = new CurseInfamy(4, Variables.MODNAME + ":" + "Infamy", 0); isInitialized = true; } } |