Reorganized Hardcore locale strings

src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java

@@ -39,7 +39,7 @@ public class HardcoreCommand extends HardcoreModeCommand {
             Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), true);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Enabled", skill));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Enabled", LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
     }
 
     @Override
@@ -53,12 +53,12 @@ public class HardcoreCommand extends HardcoreModeCommand {
             Config.getInstance().setHardcoreStatLossEnabled(SkillType.getSkill(skill), false);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Disabled", skill));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Disabled", LocaleLoader.getString("Hardcore.DeathStatLoss.Name"), skill));
     }
 
     @Override
     protected void modify() {
         Config.getInstance().setHardcoreDeathStatPenaltyPercentage(newPercent);
-        sender.sendMessage(LocaleLoader.getString("Hardcore.PercentageChanged", percent.format(newPercent / 100D)));
+        sender.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PercentageChanged", percent.format(newPercent / 100D)));
     }
 }

src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java

@@ -39,7 +39,7 @@ public class VampirismCommand extends HardcoreModeCommand {
             Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), true);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Enabled", skill));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Enabled", LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
     }
 
     @Override
@@ -53,12 +53,12 @@ public class VampirismCommand extends HardcoreModeCommand {
             Config.getInstance().setHardcoreVampirismEnabled(SkillType.getSkill(skill), false);
         }
 
-        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Vampirism.Disabled", skill));
+        mcMMO.p.getServer().broadcastMessage(LocaleLoader.getString("Hardcore.Mode.Disabled", LocaleLoader.getString("Hardcore.Vampirism.Name"), skill));
     }
 
     @Override
     protected void modify() {
         Config.getInstance().setHardcoreVampirismStatLeechPercentage(newPercent);
-        sender.sendMessage(LocaleLoader.getString("Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
+        sender.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.PercentageChanged", percent.format(newPercent / 100D)));
     }
 }

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

@@ -43,7 +43,7 @@ public final class HardcoreManager {
             playerProfile.modifySkill(skillType, playerSkillLevel - levelsLost);
         }
 
-        player.sendMessage(LocaleLoader.getString("Hardcore.Player.Loss", totalLost));
+        player.sendMessage(LocaleLoader.getString("Hardcore.DeathStatLoss.PlayerDeath", totalLost));
     }
 
     public static void invokeVampirism(Player killer, Player victim) {
@@ -80,12 +80,12 @@ public final class HardcoreManager {
         }
 
         if (totalStolen > 0) {
-            killer.sendMessage(LocaleLoader.getString("Vampirism.Killer.Success", totalStolen, victim.getName()));
-            victim.sendMessage(LocaleLoader.getString("Vampirism.Victim.Success", killer.getName(), totalStolen));
+            killer.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Killer.Success", totalStolen, victim.getName()));
+            victim.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Victim.Success", killer.getName(), totalStolen));
         }
         else {
-            killer.sendMessage(LocaleLoader.getString("Vampirism.Killer.Failure", victim.getName()));
-            victim.sendMessage(LocaleLoader.getString("Vampirism.Victim.Failure", killer.getName()));
+            killer.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Killer.Failure", victim.getName()));
+            victim.sendMessage(LocaleLoader.getString("Hardcore.Vampirism.Victim.Failure", killer.getName()));
         }
     }
 

src/main/resources/locale/locale_en_US.properties

@@ -688,17 +688,17 @@ Perks.activationtime.desc=Increases ability activation time by {0} seconds.
 Perks.activationtime.bonus=[[GOLD]] ({0}s with Endurance Perk)
 
 #HARDCORE
-Hardcore.Player.Loss=[[GOLD]][mcMMO] [[DARK_RED]]You have lost [[BLUE]]{0}[[DARK_RED]] from death.
-Vampirism.Killer.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was too unskilled to grant you any knowledge.
-Vampirism.Killer.Success=[[GOLD]][mcMMO] [[DARK_AQUA]]You have stolen [[BLUE]]{0}[[DARK_AQUA]] levels from [[YELLOW]]{1}.
-Vampirism.Victim.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was unable to steal knowledge from you!
-Vampirism.Victim.Success=[[GOLD]][mcMMO] [[YELLOW]]{0}[[DARK_RED]] has stolen [[BLUE]]{1}[[DARK_RED]] levels from you!
-Hardcore.Disabled=[[GOLD]][mcMMO] Hardcore mode disabled. {0}
-Hardcore.Enabled=[[GOLD]][mcMMO] Hardcore mode enabled. {0}
-Hardcore.PercentageChanged=[[GOLD]][mcMMO] The stat loss percentage was changed to {0}.
-Vampirism.Disabled=[[GOLD]][mcMMO] Vampirism mode disabled. {0}
-Vampirism.Enabled=[[GOLD]][mcMMO] Vampirism mode enabled. {0}
-Vampirism.PercentageChanged=[[GOLD]][mcMMO] The stat leech percentage was changed to {0}.
+Hardcore.Mode.Disabled=[[GOLD]][mcMMO] Hardcore mode {0} disabled. {1}
+Hardcore.Mode.Enabled=[[GOLD]][mcMMO] Hardcore mode {0} enabled. {1}
+Hardcore.DeathStatLoss.Name=Skill Death Penalty
+Hardcore.DeathStatLoss.PlayerDeath=[[GOLD]][mcMMO] [[DARK_RED]]You have lost [[BLUE]]{0}[[DARK_RED]] from death.
+Hardcore.DeathStatLoss.PercentageChanged=[[GOLD]][mcMMO] The stat loss percentage was changed to {0}.
+Hardcore.Vampirism.Name=Vampirism
+Hardcore.Vampirism.Killer.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was too unskilled to grant you any knowledge.
+Hardcore.Vampirism.Killer.Success=[[GOLD]][mcMMO] [[DARK_AQUA]]You have stolen [[BLUE]]{0}[[DARK_AQUA]] levels from [[YELLOW]]{1}.
+Hardcore.Vampirism.Victim.Failure=[[GOLD]][mcMMO] [[YELLOW]]{0}[[GRAY]] was unable to steal knowledge from you!
+Hardcore.Vampirism.Victim.Success=[[GOLD]][mcMMO] [[YELLOW]]{0}[[DARK_RED]] has stolen [[BLUE]]{1}[[DARK_RED]] levels from you!
+Hardcore.Vampirism.PercentageChanged=[[GOLD]][mcMMO] The stat leech percentage was changed to {0}.
 
 #SPOUT
 Spout.Donate=[[YELLOW]][mcMMO] Donate!