Added a config option to disable curses.

11 files changed, 32 insertions, 7 deletions

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
index f7ab76f..47a7667 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseBlind.java
@@ -36,6 +36,12 @@ public class CurseBlind extends Curse
     }

     

     @Override

+    public boolean canCurseBeActivated()

+    {

+        return ConfigHandler.CURSE_BLIND;

+    }

+    

+    @Override

     public int weight(World world, EntityPlayer player, Random random)

     {

         return 7;

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java
index 3a4d984..3e4da7f 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseDeathsTouch.java
@@ -2,6 +2,7 @@ package darkknight.jewelrycraft.curses;
 

 import darkknight.jewelrycraft.JewelrycraftMod;

 import darkknight.jewelrycraft.api.Curse;

+import darkknight.jewelrycraft.config.ConfigHandler;

 import darkknight.jewelrycraft.entities.EntityHalfHeart;

 import darkknight.jewelrycraft.entities.EntityHeart;

 import darkknight.jewelrycraft.network.PacketSendClientPlayerInfo;

@@ -45,5 +46,11 @@ public class CurseDeathsTouch extends Curse
 	{

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

 	}

+

+    @Override

+    public boolean canCurseBeActivated()

+    {

+        return ConfigHandler.CURSE_DEATHS_TOUCH;

+    }

 	

 }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
index 4a559b6..6772d92 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseFlamingSoul.java
@@ -26,7 +26,7 @@ public class CurseFlamingSoul extends Curse
     }

 

     @Override

-    public boolean canCurseBeActivated(World world)

+    public boolean canCurseBeActivated()

     {

         return ConfigHandler.CURSE_FLAMING_SOUL;

     }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
index 37a774a..9a1901b 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseGreed.java
@@ -33,7 +33,7 @@ public class CurseGreed extends Curse
     }

 

     @Override

-    public boolean canCurseBeActivated(World world)

+    public boolean canCurseBeActivated()

     {

         return ConfigHandler.CURSE_GREED;

     }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
index 855277c..8f3272a 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseHumbleBundle.java
@@ -67,7 +67,7 @@ public class CurseHumbleBundle extends Curse
 	}

 

     @Override

-    public boolean canCurseBeActivated(World world)

+    public boolean canCurseBeActivated()

     {

         return ConfigHandler.CURSE_HUMBLE_BUNDLE;

     }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
index f56c66d..600548f 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseInfamy.java
@@ -86,7 +86,7 @@ public class CurseInfamy extends Curse
 	}

 

     @Override

-    public boolean canCurseBeActivated(World world)

+    public boolean canCurseBeActivated()

     {

         return ConfigHandler.CURSE_INFAMY;

     }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
index 0ce2810..8395647 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseMidasTouch.java
@@ -110,6 +110,12 @@ public class CurseMidasTouch extends Curse
     {

         return world.getWorldInfo().isHardcoreModeEnabled() ? false : ConfigHandler.CURSE_MIDAS_TOUCH;

     }

+

+    @Override

+    public boolean canCurseBeActivated()

+    {

+        return ConfigHandler.CURSE_MIDAS_TOUCH;

+    }

     

     @Override

     public int weight(World world, EntityPlayer player, Random random)

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
index 56a1b11..1ac9361 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CursePentagram.java
@@ -139,7 +139,7 @@ public class CursePentagram extends Curse {
 	}

 

 	@Override

-	public boolean canCurseBeActivated(World world) {

+	public boolean canCurseBeActivated() {

 		return ConfigHandler.CURSE_PENTAGRAM;

 	}

 }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
index ed4d294..32ea0fb 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRabbitsPaw.java
@@ -73,7 +73,7 @@ public class CurseRabbitsPaw extends Curse
 	}

 

     @Override

-    public boolean canCurseBeActivated(World world)

+    public boolean canCurseBeActivated()

     {

         return ConfigHandler.CURSE_RABBIT_PAW;

     }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
index 5cb47cd..95f1a2c 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseRottenHeart.java
@@ -38,4 +38,10 @@ public class CurseRottenHeart extends Curse
     {

         return world.getWorldInfo().isHardcoreModeEnabled() ? false : ConfigHandler.CURSE_ROTTEN_HEART;

     }

+    

+    @Override

+    public boolean canCurseBeActivated()

+    {

+        return ConfigHandler.CURSE_ROTTEN_HEART;

+    }

 }

diff --git a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
index 3d6a2da..e2d278e 100644
--- a/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
+++ b/src/main/java/darkknight/jewelrycraft/curses/CurseVampireHunger.java
@@ -46,7 +46,7 @@ public class CurseVampireHunger extends Curse
 	}

 

     @Override

-    public boolean canCurseBeActivated(World world)

+    public boolean canCurseBeActivated()

     {

         return ConfigHandler.CURSE_VAMPIRE_HUNGER;

     }