From baf377e3047bac69f567a6f68b220e29c9ab331d Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Sun, 15 May 2022 11:21:54 -0400 Subject: [PATCH] Properly display command usage --- .../questadmin/QuestadminCommandHandler.java | 3 +- .../subcommands/QuestadminFinishCommand.java | 2 +- .../subcommands/QuestadminGiveCommand.java | 2 +- .../QuestadminGivepointsCommand.java | 2 +- .../QuestadminNextstageCommand.java | 2 +- .../subcommands/QuestadminPointsCommand.java | 2 +- .../QuestadminPointsallCommand.java | 2 +- .../subcommands/QuestadminQuitCommand.java | 2 +- .../subcommands/QuestadminRemoveCommand.java | 2 +- .../subcommands/QuestadminResetCommand.java | 2 +- .../QuestadminSetstageCommand.java | 14 +-- .../subcommands/QuestadminStatsCommand.java | 2 +- .../QuestadminTakepointsCommand.java | 2 +- .../commands/quests/QuestsCommandHandler.java | 2 +- .../quests/subcommands/QuestsInfoCommand.java | 6 +- .../quests/subcommands/QuestsQuitCommand.java | 8 +- .../quests/subcommands/QuestsTakeCommand.java | 28 +++--- .../quests/subcommands/QuestsTopCommand.java | 96 +++++++++---------- core/src/main/resources/strings.yml | 3 - 19 files changed, 85 insertions(+), 97 deletions(-) diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/QuestadminCommandHandler.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/QuestadminCommandHandler.java index cf81e84e2..994f5b94f 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/QuestadminCommandHandler.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/QuestadminCommandHandler.java @@ -185,6 +185,7 @@ public class QuestadminCommandHandler { private String getAdminCommandUsage(final String cmd) { return ChatColor.RED + Lang.get("usage") + ": " + ChatColor.YELLOW + "/questadmin " - + Lang.get(Lang.getKeyFromPrefix("COMMAND_QUESTADMIN_", cmd) + "_HELP"); + + Lang.get(Lang.getKeyFromPrefix("COMMAND_QUESTADMIN_", cmd) + "_HELP") + .replace("", cmd.toLowerCase()); } } diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminFinishCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminFinishCommand.java index 75e3b6c67..7b114fe99 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminFinishCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminFinishCommand.java @@ -70,7 +70,7 @@ public class QuestadminFinishCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_FINISH_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.finish")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGiveCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGiveCommand.java index 6d7747d9a..3584a76ad 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGiveCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGiveCommand.java @@ -69,7 +69,7 @@ public class QuestadminGiveCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_GIVE_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.give")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGivepointsCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGivepointsCommand.java index 3544e860e..ad359fb15 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGivepointsCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminGivepointsCommand.java @@ -67,7 +67,7 @@ public class QuestadminGivepointsCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_GIVEPOINTS_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.givepoints")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminNextstageCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminNextstageCommand.java index 7434cf5ad..7b4d5337f 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminNextstageCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminNextstageCommand.java @@ -70,7 +70,7 @@ public class QuestadminNextstageCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_NEXTSTAGE_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.nextstage")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsCommand.java index a55e79512..644ca6031 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsCommand.java @@ -67,7 +67,7 @@ public class QuestadminPointsCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_POINTS_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.points")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsallCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsallCommand.java index 20bdf0b92..8d100f047 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsallCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminPointsallCommand.java @@ -67,7 +67,7 @@ public class QuestadminPointsallCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_POINTSALL_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.pointsall")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminQuitCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminQuitCommand.java index c5034fc17..cbfd4e88f 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminQuitCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminQuitCommand.java @@ -70,7 +70,7 @@ public class QuestadminQuitCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_QUIT_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.quit")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminRemoveCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminRemoveCommand.java index 0a1e86aa7..c2b4ead70 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminRemoveCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminRemoveCommand.java @@ -70,7 +70,7 @@ public class QuestadminRemoveCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_REMOVE_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") && cs.hasPermission("quests.admin.remove")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminResetCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminResetCommand.java index 071ccedec..a7d366a8f 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminResetCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminResetCommand.java @@ -69,7 +69,7 @@ public class QuestadminResetCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_RESET_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.reset")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminSetstageCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminSetstageCommand.java index fe73ae8b0..5e3ac73bf 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminSetstageCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminSetstageCommand.java @@ -71,7 +71,7 @@ public class QuestadminSetstageCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_SETSTAGE_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.setstage")) { @@ -85,14 +85,10 @@ public class QuestadminSetstageCommand extends QuestsSubCommand { } } int stage = -1; - if (args.length > 3) { - try { - stage = Integer.parseInt(args[args.length - 1]); - } catch (final NumberFormatException e) { - cs.sendMessage(ChatColor.YELLOW + Lang.get("inputNum")); - } - } else { - cs.sendMessage(ChatColor.YELLOW + Lang.get("COMMAND_QUESTADMIN_SETSTAGE_USAGE")); + try { + stage = Integer.parseInt(args[args.length - 1]); + } catch (final NumberFormatException e) { + cs.sendMessage(ChatColor.YELLOW + Lang.get("inputNum")); return; } final IQuester quester = plugin.getQuester(target.getUniqueId()); diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminStatsCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminStatsCommand.java index 7207dc0c7..a74c1aabb 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminStatsCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminStatsCommand.java @@ -68,7 +68,7 @@ public class QuestadminStatsCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_STATS_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") && cs.hasPermission("quests.admin.stats")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminTakepointsCommand.java b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminTakepointsCommand.java index 06b53dda0..0c17e8734 100644 --- a/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminTakepointsCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/questadmin/subcommands/QuestadminTakepointsCommand.java @@ -67,7 +67,7 @@ public class QuestadminTakepointsCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (args.length == 1) { - cs.sendMessage(ChatColor.RED + Lang.get("COMMAND_QUESTADMIN_TAKEPOINTS_HELP")); + // Shows command usage return; } if (cs.hasPermission("quests.admin.*") || cs.hasPermission("quests.admin.takepoints")) { diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/QuestsCommandHandler.java b/core/src/main/java/me/blackvein/quests/commands/quests/QuestsCommandHandler.java index be475e157..1ccfa3eca 100644 --- a/core/src/main/java/me/blackvein/quests/commands/quests/QuestsCommandHandler.java +++ b/core/src/main/java/me/blackvein/quests/commands/quests/QuestsCommandHandler.java @@ -120,6 +120,6 @@ public class QuestsCommandHandler { private String getCommandUsage(final String cmd) { return ChatColor.RED + Lang.get("usage") + ": " + ChatColor.YELLOW + "/quests " - + Lang.get(Lang.getKeyFromPrefix("COMMAND_", cmd) + "_HELP"); + + Lang.get(Lang.getKeyFromPrefix("COMMAND_", cmd) + "_HELP").replace("", cmd.toLowerCase()); } } diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsInfoCommand.java b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsInfoCommand.java index 10dcfde8d..97e77eae5 100644 --- a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsInfoCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsInfoCommand.java @@ -58,12 +58,10 @@ public class QuestsInfoCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { if (cs.hasPermission("quests.info")) { - cs.sendMessage(ChatColor.YELLOW + "Quests " + ChatColor.GOLD - + plugin.getDescription().getVersion()); + cs.sendMessage(ChatColor.YELLOW + "Quests " + ChatColor.GOLD + plugin.getDescription().getVersion()); cs.sendMessage(ChatColor.GOLD + Lang.get("createdBy") + " " + ChatColor.RED + "Blackvein" + ChatColor.GOLD + " " + Lang.get("continuedBy") + " " + ChatColor.RED + "PikaMug & contributors"); - cs.sendMessage(ChatColor.DARK_AQUA + "" + ChatColor.UNDERLINE - + "https://github.com/PikaMug/Quests"); + cs.sendMessage(ChatColor.DARK_AQUA + "" + ChatColor.UNDERLINE + "https://github.com/PikaMug/Quests"); } } } diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsQuitCommand.java b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsQuitCommand.java index d42dce140..8a6ff250a 100644 --- a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsQuitCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsQuitCommand.java @@ -66,15 +66,15 @@ public class QuestsQuitCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { + if (args.length == 1) { + // Shows command usage + return; + } if (assertNonPlayer(cs)) { return; } final Player player = (Player) cs; if (player.hasPermission(getPermission())) { - if (args.length == 1) { - Lang.send(player, ChatColor.RED + Lang.get(player, "COMMAND_QUIT_HELP")); - return; - } final IQuester quester = plugin.getQuester(player.getUniqueId()); if (!quester.getCurrentQuestsTemp().isEmpty()) { final IQuest quest = plugin.getQuestTemp(concatArgArray(args, 1, args.length - 1, ' ')); diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTakeCommand.java b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTakeCommand.java index 9b19cedfe..27a7f20be 100644 --- a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTakeCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTakeCommand.java @@ -65,28 +65,28 @@ public class QuestsTakeCommand extends QuestsSubCommand { @Override public void execute(CommandSender cs, String[] args) { + if (args.length == 1) { + // Shows command usage + return; + } if (assertNonPlayer(cs)) { return; } final Player player = (Player) cs; if (plugin.getSettings().canAllowCommands()) { if (player.hasPermission(getPermission())) { - if (args.length == 1) { - Lang.send(player, ChatColor.YELLOW + Lang.get(player, "COMMAND_TAKE_USAGE")); - } else { - final IQuest questToFind = plugin.getQuestTemp(concatArgArray(args, 1, args.length - 1, ' ')); - final IQuester quester = plugin.getQuester(player.getUniqueId()); - if (questToFind != null) { - for (final IQuest q : quester.getCurrentQuestsTemp().keySet()) { - if (q.getId().equals(questToFind.getId())) { - Lang.send(player, ChatColor.RED + Lang.get(player, "questAlreadyOn")); - return; - } + final IQuest questToFind = plugin.getQuestTemp(concatArgArray(args, 1, args.length - 1, ' ')); + final IQuester quester = plugin.getQuester(player.getUniqueId()); + if (questToFind != null) { + for (final IQuest q : quester.getCurrentQuestsTemp().keySet()) { + if (q.getId().equals(questToFind.getId())) { + Lang.send(player, ChatColor.RED + Lang.get(player, "questAlreadyOn")); + return; } - quester.offerQuest(questToFind, true); - } else { - Lang.send(player, ChatColor.YELLOW + Lang.get(player, "questNotFound")); } + quester.offerQuest(questToFind, true); + } else { + Lang.send(player, ChatColor.YELLOW + Lang.get(player, "questNotFound")); } } else { Lang.send(player, ChatColor.RED + Lang.get(player, "noPermission")); diff --git a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTopCommand.java b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTopCommand.java index 6cb33de0e..3708876bc 100644 --- a/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTopCommand.java +++ b/core/src/main/java/me/blackvein/quests/commands/quests/subcommands/QuestsTopCommand.java @@ -63,65 +63,61 @@ public class QuestsTopCommand extends QuestsSubCommand { @Override public int getMaxArguments() { - return 2; + return 1; } @Override public void execute(CommandSender cs, String[] args) { if (cs.hasPermission(getPermission())) { - if (args.length > 2) { - cs.sendMessage(ChatColor.YELLOW + Lang.get("COMMAND_TOP_USAGE")); + final int topNumber; + if (args.length == 1) { + topNumber = 5; // default } else { - final int topNumber; - if (args.length == 1) { - topNumber = 5; // default - } else { - try { - topNumber = Integer.parseInt(args[1]); - } catch (final NumberFormatException e) { - cs.sendMessage(ChatColor.YELLOW + Lang.get("inputNum")); - return; - } - } - if (topNumber < 1 || topNumber > plugin.getSettings().getTopLimit()) { - cs.sendMessage(ChatColor.YELLOW + Lang.get("invalidRange").replace("", "1") - .replace("", String.valueOf(plugin.getSettings().getTopLimit()))); + try { + topNumber = Integer.parseInt(args[1]); + } catch (final NumberFormatException e) { + cs.sendMessage(ChatColor.YELLOW + Lang.get("inputNum")); return; } - Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { - final File folder = new File(plugin.getDataFolder(), "data"); - final File[] playerFiles = folder.listFiles(); - final Map questPoints = new HashMap<>(); - if (playerFiles != null) { - for (final File f : playerFiles) { - if (!f.isDirectory()) { - final FileConfiguration data = new YamlConfiguration(); - try { - data.load(f); - } catch (final IOException | InvalidConfigurationException e) { - e.printStackTrace(); - } - questPoints.put(data.getString("lastKnownName", "Unknown"), - data.getInt("quest-points", 0)); - } - } - } - final LinkedHashMap sortedMap = (LinkedHashMap) sort(questPoints); - int numPrinted = 0; - String msg = Lang.get("topQuestersTitle"); - msg = msg.replace("", ChatColor.DARK_PURPLE + "" + topNumber + ChatColor.GOLD); - cs.sendMessage(ChatColor.GOLD + msg); - for (final Map.Entry entry : sortedMap.entrySet()) { - numPrinted++; - cs.sendMessage(ChatColor.YELLOW + String.valueOf(numPrinted) + ". " + entry.getKey() + " - " - + ChatColor.DARK_PURPLE + entry.getValue() + ChatColor.YELLOW + " " - + Lang.get("questPoints")); - if (numPrinted == topNumber) { - break; - } - } - }); } + if (topNumber < 1 || topNumber > plugin.getSettings().getTopLimit()) { + cs.sendMessage(ChatColor.YELLOW + Lang.get("invalidRange").replace("", "1") + .replace("", String.valueOf(plugin.getSettings().getTopLimit()))); + return; + } + Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> { + final File folder = new File(plugin.getDataFolder(), "data"); + final File[] playerFiles = folder.listFiles(); + final Map questPoints = new HashMap<>(); + if (playerFiles != null) { + for (final File f : playerFiles) { + if (!f.isDirectory()) { + final FileConfiguration data = new YamlConfiguration(); + try { + data.load(f); + } catch (final IOException | InvalidConfigurationException e) { + e.printStackTrace(); + } + questPoints.put(data.getString("lastKnownName", "Unknown"), + data.getInt("quest-points", 0)); + } + } + } + final LinkedHashMap sortedMap = (LinkedHashMap) sort(questPoints); + int numPrinted = 0; + String msg = Lang.get("topQuestersTitle"); + msg = msg.replace("", ChatColor.DARK_PURPLE + "" + topNumber + ChatColor.GOLD); + cs.sendMessage(ChatColor.GOLD + msg); + for (final Map.Entry entry : sortedMap.entrySet()) { + numPrinted++; + cs.sendMessage(ChatColor.YELLOW + String.valueOf(numPrinted) + ". " + entry.getKey() + " - " + + ChatColor.DARK_PURPLE + entry.getValue() + ChatColor.YELLOW + " " + + Lang.get("questPoints")); + if (numPrinted == topNumber) { + break; + } + } + }); } } } diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml index 4b72e2041..e2a154a9d 100644 --- a/core/src/main/resources/strings.yml +++ b/core/src/main/resources/strings.yml @@ -2,7 +2,6 @@ COMMAND_LIST: "list" COMMAND_LIST_HELP: " [page] - List available quests" COMMAND_TAKE: "take" COMMAND_TAKE_HELP: " [quest] - Accept a quest via command" -COMMAND_TAKE_USAGE: "Usage: /quests take [quest]" COMMAND_QUIT: "quit" COMMAND_QUIT_HELP: " [quest] - Quit a current quest" COMMAND_JOURNAL: "journal" @@ -17,7 +16,6 @@ COMMAND_STATS: "stats" COMMAND_STATS_HELP: " - View quest statistics" COMMAND_TOP: "top" COMMAND_TOP_HELP: " [number] - View plugin leaderboards" -COMMAND_TOP_USAGE: "Usage: /quests top [number]" COMMAND_INFO: "info" COMMAND_INFO_HELP: " - View plugin information" COMMAND_QUEST_HELP: "- View current quest objectives" @@ -43,7 +41,6 @@ COMMAND_QUESTADMIN_NEXTSTAGE: "nextstage" COMMAND_QUESTADMIN_NEXTSTAGE_HELP: " [player] [quest] - Force a player to complete current stage" COMMAND_QUESTADMIN_SETSTAGE: "setstage" COMMAND_QUESTADMIN_SETSTAGE_HELP: " [player] [quest] [stage] - Set the current stage for a player" -COMMAND_QUESTADMIN_SETSTAGE_USAGE: 'Usage: /questadmin setstage [player] [quest] [stage]' COMMAND_QUESTADMIN_RESET: "reset" COMMAND_QUESTADMIN_RESET_HELP: " [player] - Clear all questing data of a player" COMMAND_QUESTADMIN_REMOVE: "remove"