From 34095a43e90edb31dba8d9337b4191a818a6d830 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Fri, 8 Mar 2013 14:28:16 -0600 Subject: [PATCH] Update classes for lang file. --- lang.yml | 3 ++- .../drtshock/playervaults/commands/Feedback.java | 16 +++++++--------- .../playervaults/commands/VaultOperations.java | 9 ++++----- src/com/drtshock/playervaults/util/Lang.java | 3 ++- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/lang.yml b/lang.yml index 923e005..6d2c81e 100644 --- a/lang.yml +++ b/lang.yml @@ -10,4 +10,5 @@ delete-other-vault: "&fDeleted vault &a%v &fof &a%p" 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 +delete-vault-error: +no-permissions: "&cYou don't have permission for that!" \ No newline at end of file diff --git a/src/com/drtshock/playervaults/commands/Feedback.java b/src/com/drtshock/playervaults/commands/Feedback.java index 2f33a0e..1674793 100644 --- a/src/com/drtshock/playervaults/commands/Feedback.java +++ b/src/com/drtshock/playervaults/commands/Feedback.java @@ -1,8 +1,9 @@ package com.drtshock.playervaults.commands; -import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; +import com.drtshock.playervaults.util.Lang; + public class Feedback { public enum Type { @@ -11,23 +12,20 @@ public class Feedback { WORKBENCH, //For later versions FURNACE; } - static String pv = ChatColor.DARK_RED + "[" + ChatColor.WHITE + "PlayerVaults" + - ChatColor.DARK_RED + "]" + ChatColor.WHITE + ": "; public static void noPerms(CommandSender sender) { - sender.sendMessage(pv + "You don't have permission for that!"); + sender.sendMessage(Lang.TITLE + "" + Lang.NO_PERMS); return; } - public static void showHelp(CommandSender sender, Type t) { if(t == Type.OPEN) { - sender.sendMessage(pv + "/pv "); - sender.sendMessage(pv + "/pv "); + sender.sendMessage(Lang.TITLE + "/pv "); + sender.sendMessage(Lang.TITLE + "/pv "); } else if(t == Type.DELETE) { - sender.sendMessage(pv + "/pvdel "); - sender.sendMessage(pv + "/pvdel "); + sender.sendMessage(Lang.TITLE + "/pvdel "); + sender.sendMessage(Lang.TITLE + "/pvdel "); } } } diff --git a/src/com/drtshock/playervaults/commands/VaultOperations.java b/src/com/drtshock/playervaults/commands/VaultOperations.java index 5d98bdd..e0767e2 100644 --- a/src/com/drtshock/playervaults/commands/VaultOperations.java +++ b/src/com/drtshock/playervaults/commands/VaultOperations.java @@ -39,7 +39,6 @@ public class VaultOperations { if(checkPerms(sender, number)) { vm.loadVault(sender, sender.getName(), 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); @@ -76,12 +75,12 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + "You need to specify a number!"); + sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); } try { vm.deleteVault(sender, sender.getName(), number); } catch (IOException e) { - sender.sendMessage(Lang.TITLE.toString() + "There was an error deleting that vault!"); + sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); } } } @@ -93,12 +92,12 @@ public class VaultOperations { number = Integer.parseInt(arg); } catch(NumberFormatException nfe) { - sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + "You need to specify a number!"); + sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); } try { vm.deleteVault(sender, user, number); } catch (IOException e) { - sender.sendMessage(Lang.TITLE.toString() + "There was an error deleting that vault!"); + sender.sendMessage(Lang.TITLE.toString() + Lang.DELETE_VAULT_ERROR); } } } diff --git a/src/com/drtshock/playervaults/util/Lang.java b/src/com/drtshock/playervaults/util/Lang.java index b1adef8..dfb47cb 100644 --- a/src/com/drtshock/playervaults/util/Lang.java +++ b/src/com/drtshock/playervaults/util/Lang.java @@ -12,7 +12,8 @@ public enum Lang { DELETE_OTHER_VAULT("delete-other-vault"), PLAYER_ONLY("player-only"), MUST_BE_NUMBER("must-be-number"), - DELETE_VAULT_ERROR("delete-vault-error"); + DELETE_VAULT_ERROR("delete-vault-error"), + NO_PERMS("no-permissions"); private String path = ""; private static YamlConfiguration lang;