diff --git a/lang.yml b/lang.yml index 5836b06..923e005 100644 --- a/lang.yml +++ b/lang.yml @@ -2,12 +2,12 @@ # %p is where the player name will get inserted. # %v is where the vault number will get inserted. # Made with love :) -title-name: "&4[&fPlayerVaults&4]" +title-name: "&4[&fPlayerVaults&4]: " open-vault: "&fOpening vault &a%v" open-other-vault: "&fOpening vault &a%v &fof &a%p" delete-vault: "&fDeleted vault &a%v" delete-other-vault: "&fDeleted vault &a%v &fof &a%p" -player-only: -must-be-number: +player-only: "Sorry but that can only be run by a player!" +must-be-number: "You need to specify a number" invalid-args: "&fInvalid args!" delete-vault-error: \ No newline at end of file diff --git a/src/com/drtshock/playervaults/Main.java b/src/com/drtshock/playervaults/Main.java index 5f3651e..8f888da 100644 --- a/src/com/drtshock/playervaults/Main.java +++ b/src/com/drtshock/playervaults/Main.java @@ -21,16 +21,14 @@ public class Main extends JavaPlugin { public Logger log; public static boolean update = false; public static String name = ""; - Commands commands = new Commands(); + Commands commands; @Override public void onEnable() { + loadLang(); log = getServer().getLogger(); getServer().getPluginManager().registerEvents(new Listeners(this), this); - getCommand("pv").setExecutor(commands); - getCommand("pvdel").setExecutor(commands); loadConfig(); - loadLang(); startMetrics(); Updater u = new Updater(); @@ -40,7 +38,9 @@ public class Main extends JavaPlugin { name = u.getNewVersion(); } } catch (Exception e) {} - + commands = new Commands(); + getCommand("pv").setExecutor(commands); + getCommand("pvdel").setExecutor(commands); } public void startMetrics() { diff --git a/src/com/drtshock/playervaults/commands/Commands.java b/src/com/drtshock/playervaults/commands/Commands.java index e65eb19..8c4f745 100644 --- a/src/com/drtshock/playervaults/commands/Commands.java +++ b/src/com/drtshock/playervaults/commands/Commands.java @@ -8,12 +8,12 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; +import com.drtshock.playervaults.util.Lang; + public class Commands implements CommandExecutor { public static HashMap inVault = new HashMap(); - private final String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + - ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; @Override public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { @@ -34,7 +34,7 @@ public class Commands implements CommandExecutor { Feedback.showHelp(sender, Feedback.Type.OPEN); } } - else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); + else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY); } else if(cmd.getName().equalsIgnoreCase("pvdel")) { @@ -44,7 +44,7 @@ public class Commands implements CommandExecutor { Player p = (Player) sender; VaultOperations.deleteOwnVault(p, args[0]); } - else sender.sendMessage(pv + "Sorry but that can only be run by a player!"); + else sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY); break; case 2: VaultOperations.deleteOtherVault(sender, args[0], args[1]); diff --git a/src/com/drtshock/playervaults/commands/VaultOperations.java b/src/com/drtshock/playervaults/commands/VaultOperations.java index cfced16..5d98bdd 100644 --- a/src/com/drtshock/playervaults/commands/VaultOperations.java +++ b/src/com/drtshock/playervaults/commands/VaultOperations.java @@ -15,8 +15,6 @@ public class VaultOperations { private static Main plugin; private static VaultManager vm = new VaultManager(plugin); - static String pv = Lang.TITLE.toString(); - public static boolean checkPerms(CommandSender cs, int number) { if(cs.hasPermission("playervaults.amount." + String.valueOf(number))) return true; @@ -35,12 +33,13 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); + sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); return false; } if(checkPerms(sender, number)) { vm.loadVault(sender, sender.getName(), number); - sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); + sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_VAULT.toString().replace("%v", arg)); + sender.sendMessage(Lang.TITLE.toString() + "Opening vault " + ChatColor.GREEN + number); return true; } else { Feedback.noPerms(sender); @@ -58,10 +57,10 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); + sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); } vm.loadVault(sender, user, number); - sender.sendMessage(pv + "Opening vault " + ChatColor.GREEN + number); + sender.sendMessage(Lang.TITLE.toString() + Lang.OPEN_OTHER_VAULT.toString().replace("%v", arg).replace("%p", user)); return true; } } @@ -77,12 +76,12 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv+ChatColor.RED + "You need to specify a number!"); + sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + "You need to specify a number!"); } try { vm.deleteVault(sender, sender.getName(), number); } catch (IOException e) { - sender.sendMessage(pv + "There was an error deleting that vault!"); + sender.sendMessage(Lang.TITLE.toString() + "There was an error deleting that vault!"); } } } @@ -94,12 +93,12 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(pv + ChatColor.RED + "You need to specify a number!"); + sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + "You need to specify a number!"); } try { vm.deleteVault(sender, user, number); } catch (IOException e) { - sender.sendMessage(pv + "There was an error deleting that vault!"); + sender.sendMessage(Lang.TITLE.toString() + "There was an error deleting that vault!"); } } } diff --git a/src/com/drtshock/playervaults/util/Lang.java b/src/com/drtshock/playervaults/util/Lang.java index 0136361..b1adef8 100644 --- a/src/com/drtshock/playervaults/util/Lang.java +++ b/src/com/drtshock/playervaults/util/Lang.java @@ -1,5 +1,6 @@ package com.drtshock.playervaults.util; +import org.bukkit.ChatColor; import org.bukkit.configuration.file.YamlConfiguration; public enum Lang { @@ -26,6 +27,6 @@ public enum Lang { @Override public String toString() { - return lang.getString(this.path); + return ChatColor.translateAlternateColorCodes('&', lang.getString(this.path)); } } diff --git a/src/com/drtshock/playervaults/util/VaultManager.java b/src/com/drtshock/playervaults/util/VaultManager.java index 11c4a77..b8287e5 100644 --- a/src/com/drtshock/playervaults/util/VaultManager.java +++ b/src/com/drtshock/playervaults/util/VaultManager.java @@ -3,7 +3,6 @@ package com.drtshock.playervaults.util; import java.io.File; import java.io.IOException; - import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -20,9 +19,6 @@ public class VaultManager { public VaultManager(Main instance) { this.plugin = instance; } - - String title = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + - ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; private final String directory = "plugins" + File.separator + "PlayerVaults" + File.separator + "vaults"; @@ -65,10 +61,10 @@ public class VaultManager { FileConfiguration playerFile = YamlConfiguration.loadConfiguration(file); if(file.exists()) { playerFile.set("vault" + number, null); - sender.sendMessage(title + "Deleting " + ChatColor.GREEN + " " + number); + sender.sendMessage(Lang.TITLE.toString() + "Deleting " + ChatColor.GREEN + " " + number); playerFile.save(file); } else { - sender.sendMessage(title + " That doesn't exist!"); + sender.sendMessage(Lang.TITLE.toString() + " That doesn't exist!"); } }