From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/curses/CurseRottenHeart.java | 68 +++++++++++----------- 1 file changed, 35 insertions(+), 33 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java (limited to 'src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java') diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java old mode 100644 new mode 100755 index 95f1a2c..050605d --- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java +++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java @@ -9,39 +9,41 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -public class CurseRottenHeart extends Curse -{ - public CurseRottenHeart(String name, int txtID, String pack) - { - super(name, txtID, pack); - } - - @Override - public void action(World world, EntityPlayer player) - { - if (!player.isPotionActive(Potion.poison) || player.getActivePotionEffect(Potion.poison).getDuration() < 30) player.addPotionEffect(new PotionEffect(Potion.poison.id, 80)); - } - - public String getDescription() - { - return StatCollector.translateToLocal("curse." + Variables.MODID + ".rottenheart.description"); - } - +public class CurseRottenHeart extends Curse { + public CurseRottenHeart(String name, int txtID, String pack) { + super(name, txtID, pack); + } + + @Override + public void action(World world, EntityPlayer player) { + if (!player.isPotionActive(Potion.poison) || player + .getActivePotionEffect(Potion.poison).getDuration() < 30) + player.addPotionEffect(new PotionEffect(Potion.poison.id, 80)); + } + + @Override + public String getDescription() { + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".rottenheart.description"); + } + + @Override + public String getDisplayName() { + return StatCollector.translateToLocal( + "curse." + Variables.MODID + ".rottenheart"); + } + + @Override + public boolean canCurseBeActivated(World world) { + if (world.getWorldInfo().isHardcoreModeEnabled()) { + return false; + } + + return ConfigHandler.CURSE_ROTTEN_HEART; + } + @Override - public String getDisplayName() - { - return StatCollector.translateToLocal("curse." + Variables.MODID + ".rottenheart"); + public boolean canCurseBeActivated() { + return ConfigHandler.CURSE_ROTTEN_HEART; } - - @Override - public boolean canCurseBeActivated(World world) - { - return world.getWorldInfo().isHardcoreModeEnabled() ? false : ConfigHandler.CURSE_ROTTEN_HEART; - } - - @Override - public boolean canCurseBeActivated() - { - return ConfigHandler.CURSE_ROTTEN_HEART; - } } -- cgit v1.2.3