diff options
Diffstat (limited to 'bukkit')
21 files changed, 95 insertions, 74 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminInfoCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminInfoCommandHandler.java index 4ff8fb08..b807035e 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminInfoCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminInfoCommandHandler.java @@ -39,7 +39,7 @@ public class AdminInfoCommandHandler implements CommandHandler { } else { Quest quest = plugin.getQuestManager().getQuestById(args[2]); if (quest == null) { - sender.sendMessage(Messages.COMMAND_QUEST_GENERAL_DOESNTEXIST.getMessage().replace("{quest}", args[2])); + Messages.COMMAND_QUEST_GENERAL_DOESNTEXIST.send(sender, "{quest}", args[2]); } else { sender.sendMessage(ChatColor.RED.toString() + ChatColor.BOLD + "Information for quest '" + quest.getId() + "'"); sender.sendMessage(ChatColor.RED.toString() + ChatColor.UNDERLINE + "Task configurations (" + quest.getTasks().size() + ")"); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCompleteCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCompleteCommandHandler.java index 001e4305..48265aad 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCompleteCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataCompleteCommandHandler.java @@ -30,12 +30,12 @@ public class AdminModdataCompleteCommandHandler implements CommandHandler { QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); Quest quest = plugin.getQuestManager().getQuestById(args[4]); if (quest == null) { - sender.sendMessage(Messages.COMMAND_QUEST_START_DOESNTEXIST.getMessage().replace("{quest}", args[4])); + Messages.COMMAND_QUEST_START_DOESNTEXIST.send(sender, "{quest}", args[4]); return; } qPlayer.completeQuest(quest); plugin.getPlayerManager().savePlayerSync(qPlayer.getPlayerUUID(), questProgressFile); - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_COMPLETE_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_COMPLETE_SUCCESS.send(sender, "{player}", args[3], "{quest}", quest.getId()); if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) { plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataFullresetCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataFullresetCommandHandler.java index 457f32e7..a2b0a225 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataFullresetCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataFullresetCommandHandler.java @@ -32,7 +32,7 @@ public class AdminModdataFullresetCommandHandler implements CommandHandler { if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) { plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID()); } - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_FULLRESET.getMessage().replace("{player}", args[3])); + Messages.COMMAND_QUEST_ADMIN_FULLRESET.send(sender, "{player}", args[3]); if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) { plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataRandomCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataRandomCommandHandler.java index 50040d00..df871c04 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataRandomCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataRandomCommandHandler.java @@ -44,7 +44,7 @@ public class AdminModdataRandomCommandHandler implements CommandHandler { } else { Category category = plugin.getQuestManager().getCategoryById(args[4]); if (category == null) { - sender.sendMessage(Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.getMessage().replace("{category}", args[1])); + Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.send(sender, "{category}", args[1]); } else { for (String questId : category.getRegisteredQuestIds()) { Quest quest = plugin.getQuestManager().getQuestById(questId); @@ -58,12 +58,11 @@ public class AdminModdataRandomCommandHandler implements CommandHandler { if (validQuests.isEmpty()) { if (fromCategory) { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RANDOM_CATEGORY_NONE.getMessage() - .replace("{player}", args[3]) - .replace("{category}", args[4])); + Messages.COMMAND_QUEST_ADMIN_RANDOM_CATEGORY_NONE.send(sender, + "{player}", args[3], + "{category}", args[4]); } else { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RANDOM_NONE.getMessage() - .replace("{player}", args[3])); + Messages.COMMAND_QUEST_ADMIN_RANDOM_NONE.send(sender, "{player}", args[3]); } return; } @@ -73,14 +72,14 @@ public class AdminModdataRandomCommandHandler implements CommandHandler { plugin.getPlayerManager().savePlayerSync(qPlayer.getPlayerUUID(), questProgressFile); if (fromCategory) { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RANDOM_CATEGORY_SUCCESS.getMessage() - .replace("{player}", args[3]) - .replace("{category}", args[4]) - .replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_RANDOM_CATEGORY_SUCCESS.send(sender, + "{player}", args[3], + "{category}", args[4], + "{quest}", quest.getId()); } else { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RANDOM_SUCCESS.getMessage() - .replace("{player}", args[3]) - .replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_RANDOM_SUCCESS.send(sender, + "{player}", args[3], + "{quest}", quest.getId()); } if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) { diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java index b0037918..adebf7da 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataResetCommandHandler.java @@ -29,13 +29,13 @@ public class AdminModdataResetCommandHandler implements CommandHandler { if (qPlayer == null) return; Quest quest = plugin.getQuestManager().getQuestById(args[4]); if (quest == null) { - sender.sendMessage(Messages.COMMAND_QUEST_START_DOESNTEXIST.getMessage().replace("{quest}", args[4])); + Messages.COMMAND_QUEST_START_DOESNTEXIST.send(sender, "{quest}", args[4]); return; } QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); questProgressFile.generateBlankQuestProgress(quest); plugin.getPlayerManager().savePlayerSync(qPlayer.getPlayerUUID(), questProgressFile); - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_RESET_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_RESET_SUCCESS.send(sender, "{player}", args[3], "{quest}", quest.getId()); if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) { plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java index a0a7da0b..5653ba50 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminModdataStartCommandHandler.java @@ -31,36 +31,36 @@ public class AdminModdataStartCommandHandler implements CommandHandler { QuestProgressFile questProgressFile = qPlayer.getQuestProgressFile(); Quest quest = plugin.getQuestManager().getQuestById(args[4]); if (quest == null) { - sender.sendMessage(Messages.COMMAND_QUEST_START_DOESNTEXIST.getMessage().replace("{quest}", args[4])); + Messages.COMMAND_QUEST_START_DOESNTEXIST.send(sender, "{quest}", args[4]); return; } QuestStartResult response = qPlayer.startQuest(quest); switch (response) { case QUEST_LIMIT_REACHED: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILLIMIT.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILLIMIT.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; case QUEST_ALREADY_COMPLETED: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCOMPLETE.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILCOMPLETE.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; case QUEST_COOLDOWN: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCOOLDOWN.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILCOOLDOWN.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; case QUEST_LOCKED: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILLOCKED.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILLOCKED.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; case QUEST_ALREADY_STARTED: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILSTARTED.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILSTARTED.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; case QUEST_NO_PERMISSION: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILPERMISSION.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILPERMISSION.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; case NO_PERMISSION_FOR_CATEGORY: - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_FAILCATEGORYPERMISSION.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_FAILCATEGORYPERMISSION.send(sender, "{player}", args[3], "{quest}", quest.getId()); return; } plugin.getPlayerManager().savePlayerSync(qPlayer.getPlayerUUID(), questProgressFile); - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_START_SUCCESS.getMessage().replace("{player}", args[3]).replace("{quest}", quest.getId())); + Messages.COMMAND_QUEST_ADMIN_START_SUCCESS.send(sender, "{player}", args[3], "{quest}", quest.getId()); if (Bukkit.getPlayer(qPlayer.getPlayerUUID()) == null) { plugin.getPlayerManager().dropPlayer(qPlayer.getPlayerUUID()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiCategoryCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiCategoryCommandHandler.java index 8e4a3069..5c8d527f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiCategoryCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiCategoryCommandHandler.java @@ -25,12 +25,12 @@ public class AdminOpenguiCategoryCommandHandler implements CommandHandler { public void handle(CommandSender sender, String[] args) { if (args.length > 4) { if (!plugin.getQuestsConfig().getBoolean("options.categories-enabled")) { - sender.sendMessage(Messages.COMMAND_CATEGORY_OPEN_DISABLED.getMessage()); + Messages.COMMAND_CATEGORY_OPEN_DISABLED.send(sender); return; } Category category = plugin.getQuestManager().getCategoryById(args[4]); if (category == null) { - sender.sendMessage(Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.getMessage().replace("{category}", args[4])); + Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.send(sender, "{category}", args[4]); return; } Player player = Bukkit.getPlayer(args[3]); @@ -38,16 +38,16 @@ public class AdminOpenguiCategoryCommandHandler implements CommandHandler { QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer != null) { if (plugin.getMenuController().openQuestCategory(qPlayer, category, null, false) == 0) { - sender.sendMessage(Messages.COMMAND_QUEST_OPENCATEGORY_ADMIN_SUCCESS.getMessage().replace("{player}", player.getName()) - .replace("{category}", category.getId())); + Messages.COMMAND_QUEST_OPENCATEGORY_ADMIN_SUCCESS.send(sender, + "{player}", player.getName(), + "{category}", category.getId()); } else { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_CATEGORY_PERMISSION.getMessage().replace("{player}", player.getName()) - .replace("{category}", category.getId())); + Messages.COMMAND_QUEST_ADMIN_CATEGORY_PERMISSION.send(sender, "{player}", player.getName(), "{category}", category.getId()); } return; } } - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_PLAYERNOTFOUND.getMessage().replace("{player}", args[3])); + Messages.COMMAND_QUEST_ADMIN_PLAYERNOTFOUND.send(sender, "{player}", args[3]); return; } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiQuestCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiQuestCommandHandler.java index b1f44799..c94174d2 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiQuestCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminOpenguiQuestCommandHandler.java @@ -28,11 +28,12 @@ public class AdminOpenguiQuestCommandHandler implements CommandHandler { QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer != null) { plugin.getMenuController().openMainMenu(qPlayer); - sender.sendMessage(Messages.COMMAND_QUEST_OPENQUESTS_ADMIN_SUCCESS.getMessage().replace("{player}", player.getName())); + Messages.COMMAND_QUEST_OPENQUESTS_ADMIN_SUCCESS.send(sender, + "{player}", player.getName()); return; } } - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_PLAYERNOTFOUND.getMessage().replace("{player}", args[3])); + Messages.COMMAND_QUEST_ADMIN_PLAYERNOTFOUND.send(sender, "{player}", args[3]); } sender.sendMessage(ChatColor.RED + "/quests a/admin opengui q/quest <player>"); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminTypesCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminTypesCommandHandler.java index 840395a4..8865f5ff 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminTypesCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminTypesCommandHandler.java @@ -36,7 +36,7 @@ public class AdminTypesCommandHandler implements CommandHandler { } } if (taskType == null) { - sender.sendMessage(Messages.COMMAND_TASKVIEW_ADMIN_FAIL.getMessage().replace("{task}", args[2])); + Messages.COMMAND_TASKVIEW_ADMIN_FAIL.send(sender, "{task}", args[2]); } else { sender.sendMessage(ChatColor.RED + "Task type: " + ChatColor.GRAY + taskType.getType()); sender.sendMessage(ChatColor.RED + "Author: " + ChatColor.GRAY + taskType.getAuthor()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminUpdateCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminUpdateCommandHandler.java index a64929a6..d5e1d55b 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminUpdateCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/AdminUpdateCommandHandler.java @@ -7,6 +7,7 @@ import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.Nullable; +import javax.swing.*; import java.util.Collections; import java.util.List; @@ -24,11 +25,10 @@ public class AdminUpdateCommandHandler implements CommandHandler { Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> { plugin.getUpdater().check(); if (plugin.getUpdater().isUpdateReady()) { - String updateMessage = Messages.QUEST_UPDATER.getMessage() - .replace("{newver}", plugin.getUpdater().getReturnedVersion()) - .replace("{oldver}", plugin.getUpdater().getInstalledVersion()) - .replace("{link}", plugin.getUpdater().getUpdateLink()); - sender.sendMessage(updateMessage); + Messages.QUEST_UPDATER.send(sender, + "{newver}", plugin.getUpdater().getReturnedVersion(), + "{oldver}", plugin.getUpdater().getInstalledVersion(), + "{link}", plugin.getUpdater().getUpdateLink()); } else { sender.sendMessage(ChatColor.GRAY + "No updates were found."); } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CancelCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CancelCommandHandler.java index 73d2fd61..f5a8f15f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CancelCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CancelCommandHandler.java @@ -24,7 +24,7 @@ public class CancelCommandHandler implements CommandHandler { Player player = (Player) sender; QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer == null) { - player.sendMessage(Messages.COMMAND_DATA_NOT_LOADED.getMessage()); + Messages.COMMAND_DATA_NOT_LOADED.send(player); return; } @@ -34,11 +34,11 @@ public class CancelCommandHandler implements CommandHandler { } else if (args.length >= 2) { quest = plugin.getQuestManager().getQuestById(args[1]); if (quest == null) { - sender.sendMessage(Messages.COMMAND_QUEST_GENERAL_DOESNTEXIST.getMessage().replace("{quest}", args[1])); + Messages.COMMAND_QUEST_GENERAL_DOESNTEXIST.send(sender, "{quest}", args[1]); return; } } else { - sender.sendMessage(Messages.COMMAND_QUEST_CANCEL_SPECIFY.getMessage()); + Messages.COMMAND_QUEST_CANCEL_SPECIFY.send(sender); return; } qPlayer.cancelQuest(quest); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CategoryCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CategoryCommandHandler.java index f0e03e40..a21e0ccd 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CategoryCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/CategoryCommandHandler.java @@ -23,7 +23,7 @@ public class CategoryCommandHandler implements CommandHandler { @Override public void handle(CommandSender sender, String[] args) { if (!plugin.getQuestsConfig().getBoolean("options.categories-enabled")) { - sender.sendMessage(Messages.COMMAND_CATEGORY_OPEN_DISABLED.getMessage()); + Messages.COMMAND_CATEGORY_OPEN_DISABLED.send(sender); return; } Player player = (Player) sender; @@ -31,11 +31,11 @@ public class CategoryCommandHandler implements CommandHandler { Category category = plugin.getQuestManager().getCategoryById(args[1]); QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer == null) { - player.sendMessage(Messages.COMMAND_DATA_NOT_LOADED.getMessage()); + Messages.COMMAND_DATA_NOT_LOADED.send(player); return; } if (category == null) { - sender.sendMessage(Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.getMessage().replace("{category}", args[1])); + Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.send(sender, "{category}", args[1]); } else { plugin.getMenuController().openQuestCategory(qPlayer, category, null, false); } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestCommandHandler.java index 6fdce976..a827d7cb 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestCommandHandler.java @@ -28,11 +28,11 @@ public class QuestCommandHandler implements CommandHandler { Quest quest = plugin.getQuestManager().getQuestById(args[1]); QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer == null) { - player.sendMessage(Messages.COMMAND_DATA_NOT_LOADED.getMessage()); + Messages.COMMAND_DATA_NOT_LOADED.send(player); return; } if (quest == null) { - sender.sendMessage(Messages.COMMAND_QUEST_GENERAL_DOESNTEXIST.getMessage().replace("{quest}", args[1])); + Messages.COMMAND_QUEST_GENERAL_DOESNTEXIST.send(sender, "{quest}", args[1]); return; } if (args[2].equalsIgnoreCase("s") || args[2].equalsIgnoreCase("start")) { @@ -42,7 +42,7 @@ public class QuestCommandHandler implements CommandHandler { } else if (args[2].equalsIgnoreCase("t") || args[2].equalsIgnoreCase("track")) { qPlayer.trackQuest(quest); } else { - sender.sendMessage(Messages.COMMAND_SUB_DOESNTEXIST.getMessage().replace("{sub}", args[2])); + Messages.COMMAND_SUB_DOESNTEXIST.send(sender, "{sub}", args[2]); } return; } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommandSwitcher.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommandSwitcher.java index 6d3fcf10..6f13829f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommandSwitcher.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/QuestsCommandSwitcher.java @@ -57,7 +57,7 @@ public class QuestsCommandSwitcher extends CommandSwitcher implements TabExecuto Player player = (Player) sender; QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer == null) { - player.sendMessage(Messages.COMMAND_DATA_NOT_LOADED.getMessage()); + Messages.COMMAND_DATA_NOT_LOADED.send(player); return true; } plugin.getMenuController().openMainMenu(qPlayer); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/RandomCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/RandomCommandHandler.java index de1a480f..34fd70c8 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/RandomCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/RandomCommandHandler.java @@ -28,7 +28,7 @@ public class RandomCommandHandler implements CommandHandler { Player player = (Player) sender; QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer == null) { - player.sendMessage(Messages.COMMAND_DATA_NOT_LOADED.getMessage()); + Messages.COMMAND_DATA_NOT_LOADED.send(player); return; } List<Quest> validQuests = new ArrayList<>(); @@ -41,7 +41,7 @@ public class RandomCommandHandler implements CommandHandler { } else { Category category = plugin.getQuestManager().getCategoryById(args[1]); if (category == null) { - sender.sendMessage(Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.getMessage().replace("{category}", args[1])); + Messages.COMMAND_CATEGORY_OPEN_DOESNTEXIST.send(sender, "{category}", args[1]); } else { for (String questId : category.getRegisteredQuestIds()) { Quest quest = plugin.getQuestManager().getQuestById(questId); @@ -54,7 +54,7 @@ public class RandomCommandHandler implements CommandHandler { } if (validQuests.isEmpty()) { - player.sendMessage(Messages.QUEST_RANDOM_NONE.getMessage()); + Messages.QUEST_RANDOM_NONE.send(player); return; } int random = ThreadLocalRandom.current().nextInt(0, validQuests.size()); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/StartedCommandHandler.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/StartedCommandHandler.java index 76b06120..5433f7b3 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/StartedCommandHandler.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/command/StartedCommandHandler.java @@ -23,7 +23,7 @@ public class StartedCommandHandler implements CommandHandler { Player player = (Player) sender; QPlayer qPlayer = plugin.getPlayerManager().getPlayer(player.getUniqueId()); if (qPlayer == null) { - player.sendMessage(Messages.COMMAND_DATA_NOT_LOADED.getMessage()); + Messages.COMMAND_DATA_NOT_LOADED.send(player); return; } plugin.getMenuController().openStartedQuests(qPlayer); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/listener/PlayerJoinListener.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/listener/PlayerJoinListener.java index d1cf17d1..2dff4913 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/listener/PlayerJoinListener.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/listener/PlayerJoinListener.java @@ -21,7 +21,7 @@ public class PlayerJoinListener implements Listener { @EventHandler public void onEvent(PlayerJoinEvent event) { if (plugin.getDescription().getVersion().contains("beta") && event.getPlayer().hasPermission("quests.admin")) { - event.getPlayer().sendMessage(Messages.BETA_REMINDER.getMessage()); + Messages.BETA_REMINDER.send(event.getPlayer()); } if (plugin.getUpdater().isUpdateReady() && event.getPlayer().hasPermission("quests.admin")) { // delay for a bit so they actually see the message diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java index d924a71f..607931bb 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java @@ -165,7 +165,7 @@ public class CategoryQMenu implements QMenu { QuestQMenu questQMenu = categoryMenuElement.getQuestMenu(); if (plugin.getMenuController().openQuestCategory(owner, plugin.getQuestManager().getCategoryById(questQMenu.getCategoryName()), questQMenu) != 0) { - event.getWhoClicked().sendMessage(Messages.QUEST_CATEGORY_PERMISSION.getMessage()); + Messages.QUEST_CATEGORY_QUEST_PERMISSION.send(event.getWhoClicked()); } else { return true; } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java index 60300f77..35409a00 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java @@ -85,8 +85,9 @@ public class NormalQuestController implements QuestController { PreStartQuestEvent preStartQuestEvent = new PreStartQuestEvent(player, qPlayer, questResultMessage, code); Bukkit.getPluginManager().callEvent(preStartQuestEvent); // PreStartQuestEvent -- end - if (preStartQuestEvent.getQuestResultMessage() != null && code != QuestStartResult.QUEST_SUCCESS) - player.sendMessage(preStartQuestEvent.getQuestResultMessage()); + if (code != QuestStartResult.QUEST_SUCCESS) { + Messages.send(preStartQuestEvent.getQuestResultMessage(), player); + } } if (code == QuestStartResult.QUEST_SUCCESS) { QuestProgress questProgress = qPlayer.getQuestProgressFile().getQuestProgress(quest); @@ -107,8 +108,7 @@ public class NormalQuestController implements QuestController { PlayerStartQuestEvent questStartEvent = new PlayerStartQuestEvent(player, qPlayer, questProgress, questStartMessage); Bukkit.getPluginManager().callEvent(questStartEvent); // PlayerStartQuestEvent -- end - if (questStartEvent.getQuestStartMessage() != null) - player.sendMessage(questStartEvent.getQuestStartMessage()); //Don't send a message if the event message is null + Messages.send(questStartEvent.getQuestStartMessage(), player); if (config.getBoolean("options.titles-enabled")) { plugin.getTitleHandle().sendTitle(player, Messages.TITLE_QUEST_START_TITLE.getMessage().replace("{quest}", displayName), Messages.TITLE_QUEST_START_SUBTITLE.getMessage().replace("{quest}", displayName)); @@ -218,8 +218,7 @@ public class NormalQuestController implements QuestController { } } }); - if (questFinishEvent.getQuestFinishMessage() != null) - player.sendMessage(questFinishEvent.getQuestFinishMessage()); + Messages.send(questFinishEvent.getQuestFinishMessage(), player); if (config.getBoolean("options.titles-enabled")) { plugin.getTitleHandle().sendTitle(player, Messages.TITLE_QUEST_COMPLETE_TITLE.getMessage().replace("{quest}", displayName), Messages.TITLE_QUEST_COMPLETE_SUBTITLE.getMessage().replace("{quest}", displayName)); @@ -254,7 +253,7 @@ public class NormalQuestController implements QuestController { Player player = Bukkit.getPlayer(qPlayer.getPlayerUUID()); if (!questProgress.isStarted()) { if (player != null) { - player.sendMessage(Messages.QUEST_CANCEL_NOTSTARTED.getMessage()); + Messages.QUEST_CANCEL_NOTSTARTED.send(player); } return false; } @@ -270,9 +269,7 @@ public class NormalQuestController implements QuestController { PlayerCancelQuestEvent questCancelEvent = new PlayerCancelQuestEvent(player, qPlayer, questProgress, questCancelMessage); Bukkit.getPluginManager().callEvent(questCancelEvent); // PlayerCancelQuestEvent -- end - if (questCancelEvent.getQuestCancelMessage() != null) { - player.sendMessage(questCancelEvent.getQuestCancelMessage()); - } + Messages.send(questCancelEvent.getQuestCancelMessage(), player); SoundUtils.playSoundForPlayer(player, plugin.getQuestsConfig().getString("options.sounds.quest-cancel")); } if (config.getBoolean("options.allow-quest-track") @@ -296,7 +293,7 @@ public class NormalQuestController implements QuestController { if (currentTrackedQuestId != null && (currentTrackedQuest = plugin.getQuestManager().getQuestById(currentTrackedQuestId)) != null) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(currentTrackedQuest); String displayName = Chat.strip(qItemStack.getName()); - player.sendMessage(Messages.QUEST_TRACK_STOP.getMessage().replace("{quest}", displayName)); + Messages.QUEST_TRACK_STOP.send(player, "{quest}", displayName); } } } else if (qPlayer.hasStartedQuest(quest)) { @@ -305,7 +302,7 @@ public class NormalQuestController implements QuestController { qPlayer.getPlayerPreferences().setTrackedQuestId(quest.getId()); if (player != null) { Bukkit.getPluginManager().callEvent(new PlayerStartTrackQuestEvent(player, qPlayer)); - player.sendMessage(Messages.QUEST_TRACK.getMessage().replace("{quest}", displayName)); + Messages.QUEST_TRACK.send(player, "{quest}", displayName); } } } diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java index 79edc90d..ed62fd63 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/CommandUtils.java @@ -77,17 +77,17 @@ public class CommandUtils { uuid = ofp.getUniqueId(); username = ofp.getName(); } else { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_PLAYERNOTFOUND.getMessage().replace("{player}", name)); + Messages.COMMAND_QUEST_ADMIN_PLAYERNOTFOUND.send(sender, "{player}", name); return null; } QPlayer qPlayer = plugin.getPlayerManager().getPlayer(uuid); if (qPlayer == null) { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_LOADDATA.getMessage().replace("{player}", username)); + Messages.COMMAND_QUEST_ADMIN_LOADDATA.send(sender, "{player}", username); plugin.getPlayerManager().loadPlayer(uuid); qPlayer = plugin.getPlayerManager().getPlayer(uuid); } if (qPlayer == null) { - sender.sendMessage(Messages.COMMAND_QUEST_ADMIN_NODATA.getMessage().replace("{player}", username)); + Messages.COMMAND_QUEST_ADMIN_NODATA.send(sender, "{player}", username); return null; } return qPlayer; diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Messages.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Messages.java index a3cf4bee..9ef34b18 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Messages.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/util/Messages.java @@ -1,7 +1,9 @@ package com.leonardobishop.quests.bukkit.util; +import com.google.common.base.Preconditions; import com.leonardobishop.quests.bukkit.BukkitQuestsPlugin; import com.leonardobishop.quests.bukkit.util.chat.Chat; +import org.bukkit.command.CommandSender; //TODO refactor this public enum Messages { @@ -96,4 +98,26 @@ public enum Messages { return Chat.color(message); } + + public boolean send(CommandSender target, String... substitutions) { + return send(getMessage(), target, substitutions); + } + + public static boolean send(String message, CommandSender target, String... substitutions) { + if (substitutions.length % 2 != 0) { + throw new IllegalArgumentException("uneven substitutions passed"); + } + + if (message == null || message.isEmpty()) { + return false; + } + + String substitutedMessage = message; + for (int i = 0; i < substitutions.length ; i += 2) { + substitutedMessage = substitutedMessage.replace(substitutions[i], substitutions[i+1]); + } + + target.sendMessage(substitutedMessage); + return true; + } } |