Fixing SuperAbility strings

mcmmo-core/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -929,11 +929,11 @@ public class McMMOPlayer {
         }
 
         if (useChatNotifications()) {
-            pluginRef.getNotificationManager().sendPlayerInformation(player, NotificationType.SUPER_ABILITY, pluginRef.getSkillTools().getSuperAbilityOn(superAbility));
+            pluginRef.getNotificationManager().sendPlayerInformation(player, NotificationType.SUPER_ABILITY, pluginRef.getSkillTools().getSuperAbilityOnLocaleKey(superAbility));
         }
 
         pluginRef.getSkillTools().sendSkillMessage(player, NotificationType.SUPER_ABILITY_ALERT_OTHERS,
-                pluginRef.getSkillTools().getSuperAbilityOtherPlayerActivationStr(superAbility));
+                pluginRef.getSkillTools().getSuperAbilityOtherPlayerActivationLocaleKey(superAbility));
 
         //Sounds
         pluginRef.getSoundManager().worldSendSound(player.getWorld(), player.getLocation(), SoundType.ABILITY_ACTIVATED_GENERIC);

mcmmo-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java

@@ -25,7 +25,7 @@ public class AbilityCooldownTask extends BukkitRunnable {
 
         mcMMOPlayer.setAbilityInformed(superAbilityType, true);
 
-        pluginRef.getNotificationManager().sendPlayerInformation(mcMMOPlayer.getPlayer(), NotificationType.ABILITY_REFRESHED, pluginRef.getSkillTools().getSuperAbilityRefreshedStr(superAbilityType));
+        pluginRef.getNotificationManager().sendPlayerInformation(mcMMOPlayer.getPlayer(), NotificationType.ABILITY_REFRESHED, pluginRef.getSkillTools().getSuperAbilityRefreshedLocaleKey(superAbilityType));
         //mcMMOPlayer.getPlayer().sendMessage(ability.getAbilityRefresh());
     }
 }

mcmmo-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java

@@ -50,12 +50,12 @@ public class AbilityDisableTask extends BukkitRunnable {
         if (mcMMOPlayer.useChatNotifications()) {
             //player.sendMessage(ability.getAbilityOff());
             pluginRef.getNotificationManager().sendPlayerInformation(player, NotificationType.ABILITY_OFF,
-                    pluginRef.getSkillTools().getSuperAbilityOff(superAbilityType));
+                    pluginRef.getSkillTools().getSuperAbilityOffLocaleKey(superAbilityType));
         }
 
 
         pluginRef.getSkillTools().sendSkillMessage(player, NotificationType.SUPER_ABILITY_ALERT_OTHERS,
-                pluginRef.getSkillTools().getSuperAbilityOtherPlayerDeactivationStr(superAbilityType));
+                pluginRef.getSkillTools().getSuperAbilityOtherPlayerDeactivationLocaleKey(superAbilityType));
         new AbilityCooldownTask(pluginRef, mcMMOPlayer, superAbilityType).runTaskLater(pluginRef,
                 pluginRef.getPerkUtils().handleCooldownPerks(player,
                         pluginRef.getSkillTools().getSuperAbilityCooldown(superAbilityType) * pluginRef.getMiscTools().TICK_CONVERSION_FACTOR));

mcmmo-core/src/main/java/com/gmail/nossr50/util/StringUtils.java

@@ -37,7 +37,7 @@ public class StringUtils {
         return createPrettyString(entity.toString());
     }
 
-    public static String getPrettyAbilityString(SuperAbilityType ability) {
+    public static String getPrettySuperAbilityString(SuperAbilityType ability) {
         return createPrettyString(ability.toString());
     }
 
@@ -86,6 +86,24 @@ public class StringUtils {
         return createPrettyString(partyFeature.toString());
     }
 
+    public static String convertToCamelCaseString(String baseString, String splitBy) {
+        String[] substrings = baseString.split(splitBy);
+        String prettyString = "";
+        int size = 1;
+
+        for (String string : substrings) {
+            prettyString = prettyString.concat(getCapitalized(string));
+
+            if (size < substrings.length) {
+                prettyString = prettyString.concat("");
+            }
+
+            size++;
+        }
+
+        return prettyString;
+    }
+
     private static String createPrettyString(String baseString) {
         String[] substrings = baseString.split("_");
         String prettyString = "";

mcmmo-core/src/main/java/com/gmail/nossr50/util/skills/SkillTools.java

@@ -770,30 +770,33 @@ public class SkillTools {
         return pluginRef.getConfigManager().getConfigSuperAbilities().getMaxLengthForSuper(pluginRef, superAbilityType);
     }
 
-    public String getSuperAbilityOn(SuperAbilityType superAbilityType) {
-        return pluginRef.getLocaleManager().getString("SuperAbility." + superAbilityType.toString() + ".On");
+    public String getSuperAbilityOnLocaleKey(SuperAbilityType superAbilityType) {
+        return "SuperAbility." + getPrettyCamelCaseName(superAbilityType) + ".On";
     }
 
-    public String getSuperAbilityOff(SuperAbilityType superAbilityType) {
-        return pluginRef.getLocaleManager().getString("SuperAbility." + superAbilityType.toString() + ".Off");
+    public String getSuperAbilityOffLocaleKey(SuperAbilityType superAbilityType) {
+        return "SuperAbility." + getPrettyCamelCaseName(superAbilityType) + ".Off";
     }
 
-    public String getSuperAbilityOtherPlayerActivationStr(SuperAbilityType superAbilityType) {
-        return pluginRef.getLocaleManager().getString("SuperAbility." + superAbilityType.toString() + ".Other.On");
+    public String getSuperAbilityOtherPlayerActivationLocaleKey(SuperAbilityType superAbilityType) {
+        return "SuperAbility." + getPrettyCamelCaseName(superAbilityType) + ".Other.On";
     }
 
-    public String getSuperAbilityOtherPlayerDeactivationStr(SuperAbilityType superAbilityType) {
-        return pluginRef.getLocaleManager().getString("SuperAbility." + superAbilityType.toString() + "Other.Off");
+    public String getSuperAbilityOtherPlayerDeactivationLocaleKey(SuperAbilityType superAbilityType) {
+        return "SuperAbility." + getPrettyCamelCaseName(superAbilityType) + "Other.Off";
     }
 
-    public String getSuperAbilityRefreshedStr(SuperAbilityType superAbilityType) {
-        return pluginRef.getLocaleManager().getString("SuperAbility." + superAbilityType.toString() + ".Refresh");
+    public String getSuperAbilityRefreshedLocaleKey(SuperAbilityType superAbilityType) {
+        return "SuperAbility." + getPrettyCamelCaseName(superAbilityType) + ".Refresh";
     }
 
-    public String getPrettySuperAbilityName(SuperAbilityType superAbilityType) {
-        return StringUtils.getPrettyAbilityString(superAbilityType);
+    public String getPrettyCamelCaseName(Enum en) {
+        return StringUtils.convertToCamelCaseString(en.toString(), "_");
     }
 
+    public String getPrettySuperAbilityName(SuperAbilityType superAbilityType) {
+        return StringUtils.getPrettySuperAbilityString(superAbilityType);
+    }
 
     /**
      * Get the permissions for this ability.