Wire up Hardcore/Vampirism

src/main/java/com/gmail/nossr50/config/MainConfig.java

@@ -259,31 +259,6 @@ public class MainConfig extends ConfigValidated {
         return getBooleanValue(GENERAL, REFRESH_CHUNKS);
     }
 
-    /* Hardcore Mode */
-    public boolean getHardcoreStatLossEnabled(PrimarySkillType primarySkillType) {
-        return getBooleanValue(HARDCORE, DEATH_STAT_LOSS, ENABLED, StringUtils.getCapitalized(primarySkillType.toString()));
-    }
-
-    public double getHardcoreDeathStatPenaltyPercentage() {
-        return getDoubleValue(HARDCORE, DEATH_STAT_LOSS, PENALTY_PERCENTAGE);
-    }
-
-    public int getHardcoreDeathStatPenaltyLevelThreshold() {
-        return getIntValue(HARDCORE, DEATH_STAT_LOSS, LEVEL_THRESHOLD);
-    }
-
-    public boolean getHardcoreVampirismEnabled(PrimarySkillType primarySkillType) {
-        return getBooleanValue(HARDCORE, VAMPIRISM, ENABLED, StringUtils.getCapitalized(primarySkillType.toString()));
-    }
-
-    public double getHardcoreVampirismStatLeechPercentage() {
-        return getDoubleValue(HARDCORE, VAMPIRISM, LEECH_PERCENTAGE);
-    }
-
-    public int getHardcoreVampirismLevelThreshold() {
-        return getIntValue(HARDCORE, VAMPIRISM, LEVEL_THRESHOLD);
-    }
-
     /* Particles */
     public boolean getAbilityActivationEffectEnabled() {
         return getBooleanValue(PARTICLES, ABILITY_ACTIVATION);

src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java

@@ -208,11 +208,11 @@ public enum PrimarySkillType {
     }
 
     public boolean getHardcoreStatLossEnabled() {
-        return MainConfig.getInstance().getHardcoreStatLossEnabled(this);
+        return mcMMO.getConfigManager().getConfigHardcore().getDeathPenalty().getSkillToggleMap().get(this);
     }
 
     public boolean getHardcoreVampirismEnabled() {
-        return MainConfig.getInstance().getHardcoreVampirismEnabled(this);
+        return mcMMO.getConfigManager().getConfigHardcore().getVampirism().getSkillToggleMap().get(this);
     }
 
     public ToolType getTool() {

src/main/java/com/gmail/nossr50/util/HardcoreManager.java

@@ -4,6 +4,7 @@ import com.gmail.nossr50.config.MainConfig;
 import com.gmail.nossr50.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.entity.Player;
@@ -15,8 +16,8 @@ public final class HardcoreManager {
     }
 
     public static void invokeStatPenalty(Player player) {
-        double statLossPercentage = MainConfig.getInstance().getHardcoreDeathStatPenaltyPercentage();
-        int levelThreshold = MainConfig.getInstance().getHardcoreDeathStatPenaltyLevelThreshold();
+        double statLossPercentage = mcMMO.getConfigManager().getConfigHardcore().getDeathPenalty().getPenaltyPercentage();
+        int levelThreshold = mcMMO.getConfigManager().getConfigHardcore().getDeathPenalty().getLevelThreshold();
 
         if (UserManager.getPlayer(player) == null)
             return;
@@ -60,8 +61,8 @@ public final class HardcoreManager {
     }
 
     public static void invokeVampirism(Player killer, Player victim) {
-        double vampirismStatLeechPercentage = MainConfig.getInstance().getHardcoreVampirismStatLeechPercentage();
-        int levelThreshold = MainConfig.getInstance().getHardcoreVampirismLevelThreshold();
+        double vampirismStatLeechPercentage = mcMMO.getConfigManager().getConfigHardcore().getVampirism().getPenaltyPercentage();
+        int levelThreshold = mcMMO.getConfigManager().getConfigHardcore().getVampirism().getLevelThreshold();
 
         if (UserManager.getPlayer(killer) == null || UserManager.getPlayer(victim) == null)
             return;

src/main/java/com/gmail/nossr50/util/Motd.java

@@ -71,11 +71,11 @@ public final class Motd {
         player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Enabled", statLossInfo + seperator + vampirismInfo));
 
         if (deathStatLossEnabled) {
-            player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.DeathStatLoss.Stats", MainConfig.getInstance().getHardcoreDeathStatPenaltyPercentage()));
+            player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.DeathStatLoss.Stats", mcMMO.getConfigManager().getConfigHardcore().getDeathPenalty().getPenaltyPercentage()));
         }
 
         if (vampirismEnabled) {
-            player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Vampirism.Stats", MainConfig.getInstance().getHardcoreVampirismStatLeechPercentage()));
+            player.sendMessage(LocaleLoader.getString("MOTD.Hardcore.Vampirism.Stats", mcMMO.getConfigManager().getConfigHardcore().getVampirism().getPenaltyPercentage()));
         }
     }