From 573f58ee2fd8ef9c587e377c0c58970418755cbd Mon Sep 17 00:00:00 2001 From: drtshock Date: Mon, 27 Apr 2015 14:22:56 -0500 Subject: [PATCH] Make help message configurable. Resolves #52. --- .../com/drtshock/playervaults/commands/VaultCommand.java | 5 +---- src/main/java/com/drtshock/playervaults/util/Lang.java | 3 ++- .../playervaults/vaultmanagement/VaultOperations.java | 1 + src/main/resources/lang.yml | 3 ++- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java index 7eb52ff..c2f1260 100644 --- a/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java +++ b/src/main/java/com/drtshock/playervaults/commands/VaultCommand.java @@ -62,13 +62,10 @@ public class VaultCommand implements CommandExecutor { if (VaultOperations.openOtherVault(player, searchPlayer, args[1])) { PlayerVaults.getInstance().getInVault().put(player.getUniqueId().toString(), new VaultViewInfo(player.getUniqueId(), Integer.parseInt(args[1]))); - } else { - sender.sendMessage(Lang.TITLE.toString() + "Failed to open vault."); } break; default: - sender.sendMessage(Lang.TITLE + "/pv "); - sender.sendMessage(Lang.TITLE + "/pv "); + sender.sendMessage(Lang.TITLE.toString() + Lang.HELP.toString()); } } else { sender.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.PLAYER_ONLY.toString()); diff --git a/src/main/java/com/drtshock/playervaults/util/Lang.java b/src/main/java/com/drtshock/playervaults/util/Lang.java index 88e79eb..fc866f4 100644 --- a/src/main/java/com/drtshock/playervaults/util/Lang.java +++ b/src/main/java/com/drtshock/playervaults/util/Lang.java @@ -49,7 +49,8 @@ public enum Lang { CONVERT_PLUGIN_NOT_FOUND("plugin-not-found", "&cNo converter found for that plugin"), CONVERT_COMPLETE("conversion-complete", "&aConverted %converted players to PlayerVaults"), CONVERT_BACKGROUND("conversion-background", "&fConversion has been forked to the background. See console for updates."), - LOCKED("vaults-locked", "&cVaults are currently locked while conversion occurs. Please try again in a moment!"); + LOCKED("vaults-locked", "&cVaults are currently locked while conversion occurs. Please try again in a moment!"), + HELP("help", "/pv "); private String path; private String def; diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java index f763e66..08b8d42 100644 --- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java +++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java @@ -180,6 +180,7 @@ public class VaultOperations { try { number = Integer.parseInt(arg); if (number < 1) { + player.sendMessage(Lang.TITLE.toString() + ChatColor.RED + Lang.MUST_BE_NUMBER); return false; } } catch (NumberFormatException nfe) { diff --git a/src/main/resources/lang.yml b/src/main/resources/lang.yml index 5427643..9438abe 100644 --- a/src/main/resources/lang.yml +++ b/src/main/resources/lang.yml @@ -25,4 +25,5 @@ no-player-found: "&cCannot find player &a%p" plugin-not-found: "&cNo converter found for that plugin" conversion-complete: "&aConverted %converted players to PlayerVaults" conversion-background: "&fConversion has been forked to the background. See console for updates." -vaults-locked: "&cVaults are currently locked while conversion occurs. Please try again in a moment!" \ No newline at end of file +vaults-locked: "&cVaults are currently locked while conversion occurs. Please try again in a moment!" +help: "/pv " \ No newline at end of file