More work on localization update

src/main/java/com/gmail/nossr50/api/ChatAPI.java

@@ -1,11 +1,11 @@
 package com.gmail.nossr50.api;
 
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.Users;
 
@@ -30,14 +30,12 @@ public final class ChatAPI {
             return;
         }
 
-        String pPrefix = ChatColor.GREEN + "(" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.GREEN + ") ";
-
         mcMMO.p.getLogger().info("[P](" + chatEvent.getParty() + ")" + "<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
 
         for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
             if (Users.getProfile(player).inParty()) {
                 if (Users.getProfile(player).getParty().getName().equalsIgnoreCase(chatEvent.getParty())) {
-                    player.sendMessage(pPrefix + chatEvent.getMessage());
+                    player.sendMessage(LocaleLoader.getString("Commands.Party.Chat.Prefix", new Object[] {chatEvent.getSender()} ) + chatEvent.getMessage());
                 }
             }
         }
@@ -59,13 +57,11 @@ public final class ChatAPI {
             return;
         }
 
-        String aPrefix = ChatColor.AQUA + "{" + ChatColor.WHITE + chatEvent.getSender() + ChatColor.AQUA + "} ";
-
         mcMMO.p.getLogger().info("[A]<" + chatEvent.getSender() + "> " + chatEvent.getMessage());
 
         for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
             if (Permissions.adminChat(player) || player.isOp())
-                player.sendMessage(aPrefix + chatEvent.getMessage());
+                player.sendMessage(LocaleLoader.getString("Commands.AdminChat.Prefix", new Object[] {chatEvent.getSender()} ) + chatEvent.getMessage());
         }
     }
 }

src/main/java/com/gmail/nossr50/datatypes/popups/Menu.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.datatypes.popups;
 
-import org.bukkit.ChatColor;
 import org.getspout.spoutapi.gui.GenericLabel;
 import org.getspout.spoutapi.gui.GenericPopup;
 import org.getspout.spoutapi.gui.InGameHUD;
@@ -12,6 +11,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.datatypes.buttons.McmmoButton;
 import com.gmail.nossr50.datatypes.buttons.McmmoButton.Slot;
+import com.gmail.nossr50.locale.LocaleLoader;
 
 public class Menu extends GenericPopup {
     private McmmoButton hudButton;
@@ -23,19 +23,19 @@ public class Menu extends GenericPopup {
 
     public Menu(final SpoutPlayer spoutPlayer, final PlayerProfile playerProfile) {
         //240, 427 are the bottom right
-        titleLabel.setText(ChatColor.GOLD + "~mcMMO Menu~"); //TODO: Needs more locale
+        titleLabel.setText(LocaleLoader.getString("Spout.Menu.Title"));
         titleLabel.setWidth(100);
         titleLabel.setHeight(100);
         titleLabel.setX(centerX - 35);
         titleLabel.setY((centerY / 2) - 20);
 
-        escapeLabel.setText(ChatColor.GRAY + "Press ESCAPE to exit!"); //TODO: Needs more locale
+        escapeLabel.setText(LocaleLoader.getString("Spout.Menu.Exit"));
         escapeLabel.setWidth(100);
         escapeLabel.setHeight(100);
         escapeLabel.setX(titleLabel.getX() - 15);
         escapeLabel.setY(titleLabel.getY() + 10);
 
-        hudButton = new McmmoButton("HUD Type: " + playerProfile.getHudType().toString(), "Change your HUD style!");
+        hudButton = new McmmoButton(LocaleLoader.getString("Spout.Menu.HudButton.1", new Object[] {playerProfile.getHudType().toString()}), LocaleLoader.getString("Spout.Menu.HudButton.2"));
         hudButton.setWidth(120);
         hudButton.setHeight(20);
         hudButton.setX(centerX - (hudButton.getWidth() / 2));
@@ -54,7 +54,7 @@ public class Menu extends GenericPopup {
             }
         });
 
-        escapeButton = new McmmoButton("EXIT", null);
+        escapeButton = new McmmoButton(LocaleLoader.getString("Spout.Menu.ExitButton"), null);
         escapeButton.setWidth(60);
         escapeButton.setHeight(20);
         escapeButton.setX(centerX - (escapeButton.getWidth() / 2));

src/main/java/com/gmail/nossr50/listeners/SpoutListener.java

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.listeners;
 
-import org.bukkit.ChatColor;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.getspout.spoutapi.event.input.KeyPressedEvent;
@@ -17,6 +16,7 @@ import com.gmail.nossr50.datatypes.SpoutHud;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.buttons.McmmoButton;
 import com.gmail.nossr50.datatypes.popups.Menu;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.spout.SpoutStuff;
 import com.gmail.nossr50.util.Users;
 
@@ -34,7 +34,7 @@ public class SpoutListener implements Listener {
 
         //TODO: Add custom titles based on skills
         if (SpoutConfig.getInstance().getShowPowerLevel()) {
-            spoutPlayer.setTitle(spoutPlayer.getName() + "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE+"." + ChatColor.GREEN + String.valueOf(mcMMOPlayer.getPowerLevel()));
+            spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", new Object[] {spoutPlayer.getName(), mcMMOPlayer.getPowerLevel()}));
         }
 
         profile.setSpoutHud(new SpoutHud(mcMMOPlayer)); //Setup Party HUD stuff

src/main/java/com/gmail/nossr50/spout/SpoutStuff.java

@@ -11,7 +11,6 @@ import java.util.ArrayList;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.getspout.spoutapi.SpoutManager;
@@ -25,6 +24,7 @@ import com.gmail.nossr50.config.SpoutConfig;
 import com.gmail.nossr50.datatypes.PlayerProfile;
 import com.gmail.nossr50.datatypes.SkillType;
 import com.gmail.nossr50.listeners.SpoutListener;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.Users;
 
@@ -548,8 +548,7 @@ public class SpoutStuff {
             break;
         }
 
-        //TODO: Use Locale
-        spoutPlayer.sendNotification(ChatColor.GREEN + "Level Up!", ChatColor.YELLOW + Misc.getCapitalized(skillType.toString()) + ChatColor.DARK_AQUA + " (" + ChatColor.GREEN + profile.getSkillLevel(skillType) + ChatColor.DARK_AQUA + ")", mat);
+        spoutPlayer.sendNotification(LocaleLoader.getString("Spout.LevelUp.1"), LocaleLoader.getString("Spout.LevelUp.2", new Object[] {Misc.getCapitalized(LocaleLoader.getString(Misc.getCapitalized(skillType.toString()) + ".SkillName")), profile.getSkillLevel(skillType)} ), mat);
         SpoutSounds.playLevelUpNoise(spoutPlayer, plugin);
     }
 

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

@@ -2,7 +2,6 @@ package com.gmail.nossr50.util;
 
 import java.util.ArrayList;
 
-import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
 import com.gmail.nossr50.datatypes.SkillType;
@@ -32,7 +31,7 @@ public class Page {
         ArrayList<String> allStrings = new ArrayList<String>();
         String split[] = LocaleLoader.getString(address).split("\n");
 
-        allStrings.add(ChatColor.GOLD+"-="+ChatColor.GREEN+header+ChatColor.GOLD+"=-"); //So stylish
+        allStrings.add(LocaleLoader.getString("Guides.Header", new Object[] {header} ));
 
         //Add targeted strings
 
@@ -56,47 +55,36 @@ public class Page {
         }
     }
 
-    public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args)
-    {
-        
+    public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) {
         String skillName = skilltype.toString();
         String capitalized = Misc.getCapitalized(skillName);
         String localized = Misc.getCapitalized(LocaleLoader.getString(capitalized + ".SkillName"));
-        player.sendMessage(ChatColor.DARK_AQUA+"Guide for "+localized+" available type /"+skilltype.toString().toLowerCase()+" ? [Page#]"); //TODO: Needs more locale.
-        if (args.length >= 1)
-        {
-            if (args[0].equals("?"))
-            {
+        player.sendMessage(LocaleLoader.getString("Guides.Available", new Object[] {localized, localized.toLowerCase()} ));
 
+        if (args.length >= 1) {
+            if (args[0].equals("?")) {
                 String address = "Guides."+capitalized;
 
-                if (args.length > 1 && Misc.isInt(args[1]) && Misc.getInt(args[1]) <= Page.getTotalPageNumber(address))
-                {
+                if (args.length > 1 && Misc.isInt(args[1]) && Misc.getInt(args[1]) <= Page.getTotalPageNumber(address)) {
                     Page.clearChat(player);
-                    for (String target : Page.grabPageContents(capitalized+" Guide", address, Misc.getInt(args[1])))
-                    {
+                    for (String target : Page.grabPageContents(localized+" Guide", address, Misc.getInt(args[1]))) {
                         player.sendMessage(target);
                     }
-                } else if (args.length == 1)
-                {
+                }
+                else if (args.length == 1) {
                     Page.clearChat(player);
-                    for (String target : Page.grabPageContents(capitalized+" Guide", address, 1))
-                    {
+                    for (String target : Page.grabPageContents(localized+" Guide", address, 1)) {
                         player.sendMessage(target);
                     }
                 }
-                else if (args.length > 1 && Misc.getInt(args[1]) > Page.getTotalPageNumber(address))
-                {
-                    player.sendMessage("That page doesn't exist, there are only "+Page.getTotalPageNumber(address)+" total pages"); //TODO: Needs more locale.
-                }
-                else if (args.length > 1 && !Misc.isInt(args[1]))
-                {
-                    player.sendMessage("Not a valid page number!"); //TODO: Needs more locale.
+                else if (args.length > 1 && Misc.getInt(args[1]) > Page.getTotalPageNumber(address)) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.OutOfRange", new Object[] {Page.getTotalPageNumber(address)} ));
                 }
+                else if (args.length > 1 && !Misc.isInt(args[1])) {
+                    player.sendMessage(LocaleLoader.getString("Guides.Page.Invalid"));                }
             }
-            else
-            {
-                player.sendMessage(ChatColor.RED + "Usage is /"+skilltype.toString().toLowerCase()+" ? [page]"); //TODO: Needs more locale.
+            else {
+                player.sendMessage(LocaleLoader.getString("Guides.Usage", new Object[] {localized.toLowerCase()} ));
             }
         }
     }

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

@@ -1,6 +1,5 @@
 package com.gmail.nossr50.util;
 
-import org.bukkit.ChatColor;
 import org.bukkit.block.Block;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
@@ -224,7 +223,7 @@ public class Skills {
 
                     /* Update custom titles */
                     if (SpoutConfig.getInstance().getShowPowerLevel()) {
-                        spoutPlayer.setTitle(spoutPlayer.getName()+ "\n" + ChatColor.YELLOW + "P" + ChatColor.GOLD + "lvl" + ChatColor.WHITE + "." + ChatColor.GREEN + String.valueOf(Users.getPlayer(player).getPowerLevel()));
+                        spoutPlayer.setTitle(LocaleLoader.getString("Spout.Title", new Object[] {spoutPlayer.getName(), Users.getPlayer(player).getPowerLevel()} ));
                     }
                 }
                 else {