From 29c427f1df7cf7ed838d73add518566a6e20adae Mon Sep 17 00:00:00 2001 From: PikaMug Date: Wed, 9 Oct 2019 01:03:21 -0400 Subject: [PATCH 001/148] Correct comparison of more Potion types, fixes #955 --- main/src/main/java/me/blackvein/quests/util/LocaleQuery.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java b/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java index 27e5b9dbe..886e3a3ca 100644 --- a/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java +++ b/main/src/main/java/me/blackvein/quests/util/LocaleQuery.java @@ -139,7 +139,8 @@ public class LocaleQuery { } if (meta != null && meta instanceof PotionMeta) { matKey = "item.minecraft.potion.effect." + ((PotionMeta)meta).getBasePotionData().getType().name().toLowerCase() - .replace("regen", "regeneration").replace("speed", "swiftness"); + .replace("regen", "regeneration").replace("speed", "swiftness").replace("jump", "leaping") + .replace("instant_heal", "healing").replace("instant_damage", "harming"); } if (enchantments != null && !enchantments.isEmpty()) { int count = 0; From cfb3bf7d3d0e1fb65b024a9ad4a7a9aafc8ec627 Mon Sep 17 00:00:00 2001 From: PikaMug Date: Wed, 9 Oct 2019 01:24:42 -0400 Subject: [PATCH 002/148] Only send multiplayer messages if not blank, per #958 --- .../quests/listeners/DungeonsListener.java | 24 ++++++++++++++----- .../quests/listeners/PartiesListener.java | 24 ++++++++++++++----- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java b/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java index 264b9d9ad..f868e4976 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/DungeonsListener.java @@ -27,12 +27,16 @@ import me.blackvein.quests.util.Lang; public class DungeonsListener implements Listener { @EventHandler public void onGroupCreate(DGroupCreateEvent event) { - event.getCreator().sendMessage(ChatColor.YELLOW + Lang.get("questDungeonsCreate")); + if (Lang.get("questDungeonsCreate").length() > 0) { + event.getCreator().sendMessage(ChatColor.YELLOW + Lang.get("questDungeonsCreate")); + } } @EventHandler public void onGroupDisbandEvent(DGroupDisbandEvent event) { - event.getDisbander().sendMessage(ChatColor.RED + Lang.get("questDungeonsDisband")); + if (Lang.get("questDungeonsDisband").length() > 0) { + event.getDisbander().sendMessage(ChatColor.RED + Lang.get("questDungeonsDisband")); + } } @EventHandler @@ -41,8 +45,12 @@ public class DungeonsListener implements Listener { Player i = event.getDGroup().getCaptain(); Player p = event.getDPlayer().getPlayer(); if (i != null && p != null) { - i.sendMessage(ChatColor.GREEN + Lang.get(i, "questDungeonsInvite").replace("", p.getName())); - p.sendMessage(ChatColor.GREEN + Lang.get(p, "questDungeonsJoin").replace("", i.getName())); + if (Lang.get("questDungeonsInvite").length() > 0) { + i.sendMessage(ChatColor.GREEN + Lang.get(i, "questDungeonsInvite").replace("", p.getName())); + } + if (Lang.get("questDungeonsJoin").length() > 0) { + p.sendMessage(ChatColor.GREEN + Lang.get(p, "questDungeonsJoin").replace("", i.getName())); + } } } } @@ -53,8 +61,12 @@ public class DungeonsListener implements Listener { Player k = event.getDGroup().getCaptain(); Player p = event.getDPlayer().getPlayer(); if (k != null && p != null) { - k.sendMessage(ChatColor.RED + Lang.get(k, "questDungeonsKicked").replace("", k.getName())); - p.sendMessage(ChatColor.RED + Lang.get(p, "questDungeonsLeave").replace("", p.getName())); + if (Lang.get("questDungeonsKicked").length() > 0) { + k.sendMessage(ChatColor.RED + Lang.get(k, "questDungeonsKicked").replace("", k.getName())); + } + if (Lang.get("questDungeonsLeave").length() > 0) { + p.sendMessage(ChatColor.RED + Lang.get(p, "questDungeonsLeave").replace("", p.getName())); + } } } } diff --git a/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java b/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java index 57a823925..c127291d7 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java +++ b/main/src/main/java/me/blackvein/quests/listeners/PartiesListener.java @@ -32,7 +32,9 @@ public class PartiesListener implements Listener { if (event.getCreator() != null) { Player p = Bukkit.getServer().getPlayer(event.getCreator().getPlayerUUID()); if (p != null) { - p.sendMessage(ChatColor.YELLOW + Lang.get("questPartiesCreate")); + if (Lang.get("questPartiesCreate").length() > 0) { + p.sendMessage(ChatColor.YELLOW + Lang.get("questPartiesCreate")); + } } } } @@ -42,7 +44,9 @@ public class PartiesListener implements Listener { if (event.getCommandSender() != null) { Player p = Bukkit.getServer().getPlayer(event.getCommandSender().getPlayerUUID()); if (p != null) { - p.sendMessage(ChatColor.RED + Lang.get("questPartiesDelete")); + if (Lang.get("questPartiesDelete").length() > 0) { + p.sendMessage(ChatColor.RED + Lang.get("questPartiesDelete")); + } } } } @@ -52,12 +56,16 @@ public class PartiesListener implements Listener { if (event.isInvited() && event.getInviter() != null) { Player i = Bukkit.getServer().getPlayer(event.getInviter()); if (i != null) { - i.sendMessage(ChatColor.GREEN + Lang.get(i, "questPartiesInvite").replace("", i.getName())); + if (Lang.get("questPartiesInvite").length() > 0) { + i.sendMessage(ChatColor.GREEN + Lang.get(i, "questPartiesInvite").replace("", i.getName())); + } } } Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID()); if (p != null) { - p.sendMessage(ChatColor.GREEN + Lang.get(p, "questPartiesJoin").replace("", p.getName())); + if (Lang.get("questPartiesJoin").length() > 0) { + p.sendMessage(ChatColor.GREEN + Lang.get(p, "questPartiesJoin").replace("", p.getName())); + } } } @@ -66,12 +74,16 @@ public class PartiesListener implements Listener { if (event.isKicked() && event.getKicker() != null) { Player k = Bukkit.getServer().getPlayer(event.getKicker().getPlayerUUID()); if (k != null) { - k.sendMessage(ChatColor.RED + Lang.get(k, "questPartiesKicked").replace("", k.getName())); + if (Lang.get("questPartiesKicked").length() > 0) { + k.sendMessage(ChatColor.RED + Lang.get(k, "questPartiesKicked").replace("", k.getName())); + } } } Player p = Bukkit.getServer().getPlayer(event.getPartyPlayer().getPlayerUUID()); if (p != null) { - p.sendMessage(ChatColor.RED + Lang.get(p, "questPartiesLeave").replace("", p.getName())); + if (Lang.get("questPartiesLeave").length() > 0) { + p.sendMessage(ChatColor.RED + Lang.get(p, "questPartiesLeave").replace("", p.getName())); + } } } } From 2337dc51b9281a5b3ff47b56bef9e608fc9686b8 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Wed, 9 Oct 2019 23:11:33 -0400 Subject: [PATCH 003/148] New translations strings.yml (Chinese Simplified) --- main/src/main/resources/lang/zh-CN/strings.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/main/src/main/resources/lang/zh-CN/strings.yml b/main/src/main/resources/lang/zh-CN/strings.yml index 1c183e477..13e99515c 100644 --- a/main/src/main/resources/lang/zh-CN/strings.yml +++ b/main/src/main/resources/lang/zh-CN/strings.yml @@ -476,7 +476,7 @@ optCommandsDenied: "你不能在任务 中使用命令。" optUseDungeonsXLPlugin: "使用DungeonsXL插件" optUsePartiesPlugin: "使用Parties插件" optShareProgressLevel: "Level of progress sharing" -optRequireSameQuest: "Require same quest" +optRequireSameQuest: "需要相同的任务" rewSetMoney: "设置金钱奖励" rewSetQuestPoints: "设置任务点奖励" rewSetItems: "设置物品奖励" @@ -659,7 +659,7 @@ mcMMOLevel: "等级" haveCompleted: "您已完成 " cannotComplete: "无法完成 " questNotFound: "找不到该任务。" -alreadyConversing: "You already are in a conversation!" +alreadyConversing: "您已经在一场对话中！" inputNum: "输入值必须为数字。" inputPosNum: "输入值必须是一个正数。" questModified: "Your active Quest has been modified. You have been forced to quit the Quest." @@ -674,8 +674,8 @@ questNoEquip: "您不能装备任务物品。" questNoDispense: "您不能将任务物品放入发射器。" questNoEnchant: "您不能附魔任务物品。" questNoSmelt: "You may not smelt using Quest items." -pageSelectionNum: "Page selection must be a number." -pageSelectionPosNum: "Page selection must be a positive number." +pageSelectionNum: "选择页面数必须是一个数字。" +pageSelectionPosNum: "选择页面数必须是一个正整数。" questTakeDisabled: "已禁用通过命令进行任务。" questQuit: "您已放弃任务 " questQuitDisabled: "已禁用退出此任务。" @@ -684,10 +684,10 @@ pageNotExist: "页面不存在。" pageFooter: "- 页面 / -" questsReloaded: "已重新加载任务插件。" numQuestsLoaded: "已加载任务。" -questForceTake: " has forcibly started the Quest ." -questForcedTake: " has forced you to take the Quest ." -questForceQuit: " has forcibly quit the Quest ." -questForcedQuit: " has forced you to quit the Quest ." +questForceTake: " 已被强制接受任务 。" +questForcedTake: " 强制你接受任务 。" +questForceQuit: " 已被强制放弃任务 。" +questForcedQuit: " 强制你放弃任务 。" questForceFinish: " has forcibly finished their Quest ." questForcedFinish: " has forced you to finish your Quest ." questForceNextStage: " has advanced to the next Stage in the Quest ." From a87711b2db83cb4657c324285524e98cf41e3383 Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Thu, 10 Oct 2019 00:11:19 -0400 Subject: [PATCH 004/148] New translations strings.yml (Chinese Simplified) --- main/src/main/resources/lang/zh-CN/strings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/resources/lang/zh-CN/strings.yml b/main/src/main/resources/lang/zh-CN/strings.yml index 13e99515c..0942bd72d 100644 --- a/main/src/main/resources/lang/zh-CN/strings.yml +++ b/main/src/main/resources/lang/zh-CN/strings.yml @@ -673,7 +673,7 @@ questNoCraft: "您不能合成任务物品。" questNoEquip: "您不能装备任务物品。" questNoDispense: "您不能将任务物品放入发射器。" questNoEnchant: "您不能附魔任务物品。" -questNoSmelt: "You may not smelt using Quest items." +questNoSmelt: "您不能熔炼任务物品。" pageSelectionNum: "选择页面数必须是一个数字。" pageSelectionPosNum: "选择页面数必须是一个正整数。" questTakeDisabled: "已禁用通过命令进行任务。" From c34342df25de6a3d53e75a04e84ef30bf364a4ba Mon Sep 17 00:00:00 2001 From: PikaMug Date: Thu, 10 Oct 2019 01:08:21 -0400 Subject: [PATCH 005/148] Correct item rewards string in editor --- .../main/java/me/blackvein/quests/prompts/RewardsPrompt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java index 7756dfcfc..8d389a5cb 100644 --- a/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java +++ b/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java @@ -102,7 +102,7 @@ public class RewardsPrompt extends NumericPrompt { case 2: return ChatColor.YELLOW + Lang.get("rewSetQuestPoints"); case 3: - return ChatColor.YELLOW + Lang.get("rewSetItem"); + return ChatColor.YELLOW + Lang.get("rewSetItems"); case 4: return ChatColor.YELLOW + Lang.get("rewSetExperience"); case 5: From 6e5d13032243732dd22ea3289c2faca9aa2d7a79 Mon Sep 17 00:00:00 2001 From: PikaMug Date: Thu, 10 Oct 2019 01:45:11 -0400 Subject: [PATCH 006/148] Allow partial list of command display overrides, fixes #960 --- main/src/main/java/me/blackvein/quests/Quest.java | 10 ++++------ .../me/blackvein/quests/prompts/RewardsPrompt.java | 8 +++++++- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/Quest.java b/main/src/main/java/me/blackvein/quests/Quest.java index 3097f2433..6e9fc1a42 100644 --- a/main/src/main/java/me/blackvein/quests/Quest.java +++ b/main/src/main/java/me/blackvein/quests/Quest.java @@ -653,12 +653,10 @@ public class Quest { int index = 0; for (String s : rews.getCommands()) { if (rews.getCommandsOverrideDisplay().isEmpty() == false && rews.getCommandsOverrideDisplay().size() - >= index) { - if (rews.getCommandsOverrideDisplay().size() > index) { - if (!rews.getCommandsOverrideDisplay().get(index).trim().equals("")) { - player.sendMessage("- " + ChatColor.DARK_GREEN - + rews.getCommandsOverrideDisplay().get(index)); - } + > index) { + if (!rews.getCommandsOverrideDisplay().get(index).trim().equals("")) { + player.sendMessage("- " + ChatColor.DARK_GREEN + + rews.getCommandsOverrideDisplay().get(index)); } } else { player.sendMessage("- " + ChatColor.DARK_GREEN + s); diff --git a/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java b/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java index 8d389a5cb..9c8a903c6 100644 --- a/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java +++ b/main/src/main/java/me/blackvein/quests/prompts/RewardsPrompt.java @@ -166,7 +166,13 @@ public class RewardsPrompt extends NumericPrompt { List overrides = (List) context.getSessionData(CK.REW_COMMAND_OVERRIDE_DISPLAY); int index = 0; for (String cmd : commands) { - text += ChatColor.GRAY + " - " + ChatColor.AQUA + cmd + (overrides != null ? ChatColor.GRAY + " (\"" + ChatColor.AQUA + overrides.get(index) + ChatColor.GRAY + "\")" : "") + "\n"; + text += ChatColor.GRAY + " - " + ChatColor.AQUA + cmd; + if (overrides != null) { + if (index < overrides.size()) { + text += ChatColor.GRAY + " (\"" + ChatColor.AQUA + overrides.get(index) + ChatColor.GRAY + "\")"; + } + } + text += "\n"; index++; } return text; From 4d183edaea7ba656eaab526cfd723607ab30f336 Mon Sep 17 00:00:00 2001 From: PikaMug Date: Mon, 14 Oct 2019 16:45:34 -0400 Subject: [PATCH 007/148] Enforce maximum line width of 120, part 3 --- .../me/blackvein/quests/actions/Action.java | 165 ++++-- .../quests/actions/ActionFactory.java | 539 ++++++++++++------ .../quests/listeners/CmdExecutor.java | 199 ++++--- .../quests/listeners/DungeonsListener.java | 3 +- .../quests/listeners/NpcListener.java | 95 ++- .../quests/listeners/PlayerListener.java | 190 ++++-- .../quests/particle/ParticleProvider.java | 20 +- .../particle/ParticleProvider_Bukkit.java | 3 +- .../quests/particle/PreBuiltParticle.java | 3 +- .../quests/prompts/BlocksPrompt.java | 333 +++++++---- .../quests/prompts/CreateStagePrompt.java | 351 ++++++++---- .../quests/prompts/DateTimePrompt.java | 37 +- .../quests/prompts/GUIDisplayPrompt.java | 6 +- .../quests/prompts/ItemStackPrompt.java | 72 ++- .../blackvein/quests/prompts/ItemsPrompt.java | 132 +++-- .../blackvein/quests/prompts/MobsPrompt.java | 193 +++++-- .../blackvein/quests/prompts/NPCsPrompt.java | 152 +++-- .../quests/prompts/OptionsPrompt.java | 87 ++- .../quests/prompts/PlannerPrompt.java | 40 +- .../quests/prompts/QuestOfferPrompt.java | 23 +- .../quests/prompts/RequirementsPrompt.java | 208 +++++-- .../quests/prompts/RewardsPrompt.java | 190 ++++-- .../quests/prompts/StagesPrompt.java | 90 ++- .../blackvein/quests/timers/ActionTimer.java | 3 +- .../me/blackvein/quests/util/DenizenAPI.java | 30 +- .../quests/util/DenizenAPI_1_1_0.java | 3 +- .../me/blackvein/quests/util/ItemUtil.java | 37 +- .../java/me/blackvein/quests/util/Lang.java | 32 +- .../me/blackvein/quests/util/LocaleQuery.java | 22 +- .../me/blackvein/quests/util/MiscUtil.java | 6 +- .../blackvein/quests/util/WorldGuardAPI.java | 21 +- .../quests/util/WorldGuardAPI_7_0_0.java | 3 +- .../particle/ParticleProvider_v1_8_R1.java | 7 +- .../particle/ParticleProvider_v1_8_R2.java | 7 +- .../particle/ParticleProvider_v1_8_R3.java | 7 +- 35 files changed, 2257 insertions(+), 1052 deletions(-) diff --git a/main/src/main/java/me/blackvein/quests/actions/Action.java b/main/src/main/java/me/blackvein/quests/actions/Action.java index 6c093294b..122ffabe8 100644 --- a/main/src/main/java/me/blackvein/quests/actions/Action.java +++ b/main/src/main/java/me/blackvein/quests/actions/Action.java @@ -317,7 +317,8 @@ public class Action { } if (commands.isEmpty() == false) { for (String s : commands) { - plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), s.replaceAll("", quester.getPlayer().getName())); + plugin.getServer().dispatchCommand(plugin.getServer().getConsoleSender(), + s.replaceAll("", quester.getPlayer().getName())); } } if (potionEffects.isEmpty() == false) { @@ -341,7 +342,8 @@ public class Action { if (!book.isEmpty()) { if (plugin.getDependencies().getCitizensBooksApi() != null) { if (plugin.getDependencies().getCitizensBooksApi().hasFilter(book)) { - plugin.getDependencies().getCitizensBooksApi().openBook(player, plugin.getDependencies().getCitizensBooksApi().getFilter(book)); + plugin.getDependencies().getCitizensBooksApi().openBook(player, plugin.getDependencies() + .getCitizensBooksApi().getFilter(book)); } } } @@ -431,7 +433,9 @@ public class Action { if (data.isBoolean(actionKey + "clear-inventory")) { action.clearInv = data.getBoolean(actionKey + "clear-inventory"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "clear-inventory: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a true/false value!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "clear-inventory: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a true/false value!"); return null; } } @@ -439,7 +443,9 @@ public class Action { if (data.isBoolean(actionKey + "fail-quest")) { action.failQuest = data.getBoolean(actionKey + "fail-quest"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "fail-quest: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a true/false value!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "fail-quest: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a true/false value!"); return null; } } @@ -448,14 +454,19 @@ public class Action { for (String s : data.getStringList(actionKey + "explosions")) { Location loc = Quests.getLocation(s); if (loc == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + loc + ChatColor.GOLD + " inside " + ChatColor.GREEN + "explosions: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not in proper location format!"); - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Proper location format is: \"WorldName x y z\""); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + loc + ChatColor.GOLD + + " inside " + ChatColor.GREEN + "explosions: " + ChatColor.GOLD + "inside Action " + + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not in proper location format!"); + plugin.getLogger().severe(ChatColor.GOLD + + "[Quests] Proper location format is: \"WorldName x y z\""); return null; } action.explosions.add(loc); } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "explosions: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of locations!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "explosions: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of locations!"); return null; } } @@ -469,26 +480,39 @@ public class Action { Effect effect = Effect.valueOf(s.toUpperCase()); Location l = Quests.getLocation(effectLocs.get(effectList.indexOf(s))); if (effect == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + ChatColor.GOLD + " inside " + ChatColor.GREEN + "effects: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a valid effect name!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + + ChatColor.GOLD + " inside " + ChatColor.GREEN + "effects: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a valid effect name!"); return null; } if (l == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + effectLocs.get(effectList.indexOf(s)) + ChatColor.GOLD + " inside " + ChatColor.GREEN + "effect-locations: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not in proper location format!"); - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Proper location format is: \"WorldName x y z\""); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + + effectLocs.get(effectList.indexOf(s)) + ChatColor.GOLD + " inside " + + ChatColor.GREEN + "effect-locations: " + ChatColor.GOLD + "inside Action " + + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not in proper location format!"); + plugin.getLogger().severe(ChatColor.GOLD + + "[Quests] Proper location format is: \"WorldName x y z\""); return null; } action.effects.put(l, effect); } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "effect-locations: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of locations!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "effect-locations: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of locations!"); return null; } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is missing " + ChatColor.RED + "effect-locations:"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is missing " + ChatColor.RED + "effect-locations:"); return null; } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "effects: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of effects!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "effects: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of effects!"); return null; } } @@ -513,12 +537,17 @@ public class Action { temp.add(stack); } } catch (Exception e) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] \"" + ChatColor.RED + item + ChatColor.GOLD + "\" inside " + ChatColor.GREEN + " items: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not formatted properly!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] \"" + ChatColor.RED + item + + ChatColor.GOLD + "\" inside " + ChatColor.GREEN + " items: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not formatted properly!"); return null; } } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "items: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of items!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "items: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of items!"); return null; } } @@ -527,38 +556,48 @@ public class Action { if (data.contains(actionKey + "storm-world")) { World w = plugin.getServer().getWorld(data.getString(actionKey + "storm-world")); if (w == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "storm-world: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a valid World name!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "storm-world: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a valid World name!"); return null; } if (data.contains(actionKey + "storm-duration")) { if (data.getInt(actionKey + "storm-duration", -999) != -999) { action.stormDuration = data.getInt(actionKey + "storm-duration") * 1000; } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "storm-duration: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "storm-duration: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a number!"); return null; } action.stormWorld = w; } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is missing " + ChatColor.RED + "storm-duration:"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is missing " + ChatColor.RED + "storm-duration:"); return null; } } if (data.contains(actionKey + "thunder-world")) { World w = plugin.getServer().getWorld(data.getString(actionKey + "thunder-world")); if (w == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "thunder-world: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a valid World name!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "thunder-world: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a valid World name!"); return null; } if (data.contains(actionKey + "thunder-duration")) { if (data.getInt(actionKey + "thunder-duration", -999) != -999) { action.thunderDuration = data.getInt(actionKey + "thunder-duration"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "thunder-duration: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "thunder-duration: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a number!"); return null; } action.thunderWorld = w; } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is missing " + ChatColor.RED + "thunder-duration:"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is missing " + ChatColor.RED + "thunder-duration:"); return null; } } @@ -571,12 +610,19 @@ public class Action { EntityType type = Quests.getMobType(section.getString(s + ".mob-type")); Integer mobAmount = section.getInt(s + ".spawn-amounts"); if (spawnLocation == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + ChatColor.GOLD + " inside " + ChatColor.GREEN + " mob-spawn-locations: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not in proper location format!"); - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Proper location format is: \"WorldName x y z\""); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + ChatColor.GOLD + + " inside " + ChatColor.GREEN + " mob-spawn-locations: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not in proper location format!"); + plugin.getLogger().severe(ChatColor.GOLD + + "[Quests] Proper location format is: \"WorldName x y z\""); return null; } if (type == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + section.getString(s + ".mob-type") + ChatColor.GOLD + " inside " + ChatColor.GREEN + " mob-spawn-types: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a valid mob name!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + + section.getString(s + ".mob-type") + ChatColor.GOLD + " inside " + ChatColor.GREEN + + " mob-spawn-types: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is not a valid mob name!"); return null; } ItemStack[] inventory = new ItemStack[5]; @@ -603,14 +649,20 @@ public class Action { for (String s : data.getStringList(actionKey + "lightning-strikes")) { Location loc = Quests.getLocation(s); if (loc == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + ChatColor.GOLD + " inside " + ChatColor.GREEN + " lightning-strikes: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not in proper location format!"); - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Proper location format is: \"WorldName x y z\""); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + ChatColor.GOLD + + " inside " + ChatColor.GREEN + " lightning-strikes: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not in proper location format!"); + plugin.getLogger().severe(ChatColor.GOLD + + "[Quests] Proper location format is: \"WorldName x y z\""); return null; } action.lightningStrikes.add(loc); } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "lightning-strikes: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of locations!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "lightning-strikes: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of locations!"); return null; } } @@ -623,7 +675,9 @@ public class Action { action.commands.add(s); } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "commands: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of commands!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "commands: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of commands!"); return null; } } @@ -639,30 +693,42 @@ public class Action { for (String s : types) { PotionEffectType type = PotionEffectType.getByName(s); if (type == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + ChatColor.GOLD + " inside " + ChatColor.GREEN + " lightning-strikes: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a valid potion effect name!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + s + + ChatColor.GOLD + " inside " + ChatColor.GREEN + " lightning-strikes: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is not a valid potion effect name!"); return null; } - PotionEffect effect = new PotionEffect(type, durations.get(types.indexOf(s)), amplifiers.get(types.indexOf(s))); + PotionEffect effect = new PotionEffect(type, durations + .get(types.indexOf(s)), amplifiers.get(types.indexOf(s))); action.potionEffects.add(effect); } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "potion-effect-amplifiers: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of numbers!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + + "potion-effect-amplifiers: " + ChatColor.GOLD + "inside Action " + + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of numbers!"); return null; } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is missing " + ChatColor.RED + "potion-effect-amplifiers:"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is missing " + ChatColor.RED + "potion-effect-amplifiers:"); return null; } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "potion-effect-durations: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of numbers!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + + "potion-effect-durations: " + ChatColor.GOLD + "inside Action " + + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of numbers!"); return null; } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is missing " + ChatColor.RED + "potion-effect-durations:"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Action " + ChatColor.DARK_PURPLE + name + + ChatColor.GOLD + " is missing " + ChatColor.RED + "potion-effect-durations:"); return null; } } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "potion-effect-types: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a list of potion effects!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "potion-effect-types: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a list of potion effects!"); return null; } } @@ -670,7 +736,8 @@ public class Action { if (data.getInt(actionKey + "hunger", -999) != -999) { action.hunger = data.getInt(actionKey + "hunger"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "hunger: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "hunger: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); return null; } } @@ -678,7 +745,9 @@ public class Action { if (data.getInt(actionKey + "saturation", -999) != -999) { action.saturation = data.getInt(actionKey + "saturation"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "saturation: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "saturation: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a number!"); return null; } } @@ -686,7 +755,8 @@ public class Action { if (data.getInt(actionKey + "health", -999) != -999) { action.health = data.getInt(actionKey + "health"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "health: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "health: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); return null; } } @@ -694,13 +764,19 @@ public class Action { if (data.isString(actionKey + "teleport-location")) { Location l = Quests.getLocation(data.getString(actionKey + "teleport-location")); if (l == null) { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + data.getString(actionKey + "teleport-location") + ChatColor.GOLD + "for " + ChatColor.GREEN + " teleport-location: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not in proper location format!"); - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] Proper location format is: \"WorldName x y z\""); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + data.getString(actionKey + + "teleport-location") + ChatColor.GOLD + "for " + ChatColor.GREEN + " teleport-location: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not in proper location format!"); + plugin.getLogger().severe(ChatColor.GOLD + + "[Quests] Proper location format is: \"WorldName x y z\""); return null; } action.teleport = l; } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "teleport-location: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a location!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "teleport-location: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a location!"); return null; } } @@ -708,7 +784,8 @@ public class Action { if (data.isInt(actionKey + "timer")) { action.timer = data.getInt(actionKey + "timer"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "timer: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "timer: " + ChatColor.GOLD + + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a number!"); return null; } } @@ -716,7 +793,9 @@ public class Action { if (data.isBoolean(actionKey + "cancel-timer")) { action.cancelTimer = data.getBoolean(actionKey + "cancel-timer"); } else { - plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "cancel-timer: " + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + " is not a boolean!"); + plugin.getLogger().severe(ChatColor.GOLD + "[Quests] " + ChatColor.RED + "cancel-timer: " + + ChatColor.GOLD + "inside Action " + ChatColor.DARK_PURPLE + name + ChatColor.GOLD + + " is not a boolean!"); return null; } } diff --git a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java index f42caebd7..3e11fbc7c 100644 --- a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java +++ b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java @@ -74,7 +74,10 @@ public class ActionFactory implements ConversationAbandonedListener { this.plugin = plugin; actionsFile = new File(plugin.getDataFolder(), "actions.yml"); // Ensure to initialize convoCreator last so that 'this' is fully initialized before it is passed - this.convoCreator = new ConversationFactory(plugin).withModality(false).withLocalEcho(false).withPrefix(new QuestCreatorPrefix()).withFirstPrompt(new MenuPrompt()).withTimeout(3600).thatExcludesNonPlayersWithMessage("Console may not perform this operation!").addConversationAbandonedListener(this); + this.convoCreator = new ConversationFactory(plugin).withModality(false).withLocalEcho(false) + .withPrefix(new QuestCreatorPrefix()).withFirstPrompt(new MenuPrompt()).withTimeout(3600) + .thatExcludesNonPlayersWithMessage("Console may not perform this operation!") + .addConversationAbandonedListener(this); } public Map getSelectedExplosionLocations() { @@ -150,7 +153,12 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public String getPromptText(ConversationContext context) { - String text = ChatColor.GOLD + Lang.get("eventEditorTitle") + "\n" + ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorCreate") + "\n" + ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorEdit") + "\n" + ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorDelete") + "\n" + ChatColor.GREEN + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("exit"); + String text = ChatColor.GOLD + Lang.get("eventEditorTitle") + "\n" + ChatColor.BLUE + "" + ChatColor.BOLD + + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorCreate") + "\n" + + ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorEdit") + "\n" + ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + + ChatColor.YELLOW + " - " + Lang.get("eventEditorDelete") + "\n" + ChatColor.GREEN + "" + + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("exit"); return text; } @@ -158,7 +166,8 @@ public class ActionFactory implements ConversationAbandonedListener { protected Prompt acceptValidatedInput(ConversationContext context, String input) { final Player player = (Player) context.getForWhom(); if (input.equalsIgnoreCase("1")) { - if (player.hasPermission("quests.editor.actions.create") || player.hasPermission("quests.editor.events.create")) { + if (player.hasPermission("quests.editor.actions.create") + || player.hasPermission("quests.editor.events.create")) { context.setSessionData(CK.E_OLD_EVENT, ""); return new ActionNamePrompt(); } else { @@ -166,9 +175,11 @@ public class ActionFactory implements ConversationAbandonedListener { return new MenuPrompt(); } } else if (input.equalsIgnoreCase("2")) { - if (player.hasPermission("quests.editor.actions.edit") || player.hasPermission("quests.editor.events.edit")) { + if (player.hasPermission("quests.editor.actions.edit") + || player.hasPermission("quests.editor.events.edit")) { if (plugin.getActions().isEmpty()) { - ((Player) context.getForWhom()).sendMessage(ChatColor.YELLOW + Lang.get("eventEditorNoneToEdit")); + ((Player) context.getForWhom()).sendMessage(ChatColor.YELLOW + + Lang.get("eventEditorNoneToEdit")); return new MenuPrompt(); } else { return new SelectEditPrompt(); @@ -178,9 +189,11 @@ public class ActionFactory implements ConversationAbandonedListener { return new MenuPrompt(); } } else if (input.equalsIgnoreCase("3")) { - if (player.hasPermission("quests.editor.actions.delete") || player.hasPermission("quests.editor.events.delete")) { + if (player.hasPermission("quests.editor.actions.delete") + || player.hasPermission("quests.editor.events.delete")) { if (plugin.getActions().isEmpty()) { - ((Player) context.getForWhom()).sendMessage(ChatColor.YELLOW + Lang.get("eventEditorNoneToDelete")); + ((Player) context.getForWhom()).sendMessage(ChatColor.YELLOW + + Lang.get("eventEditorNoneToDelete")); return new MenuPrompt(); } else { return new SelectDeletePrompt(); @@ -376,7 +389,8 @@ public class ActionFactory implements ConversationAbandonedListener { if (a != null) { for (Quest quest : plugin.getQuests()) { for (Stage stage : quest.getStages()) { - if (stage.getFinishEvent() != null && stage.getFinishEvent().getName().equalsIgnoreCase(a.getName())) { + if (stage.getFinishEvent() != null + && stage.getFinishEvent().getName().equalsIgnoreCase(a.getName())) { used.add(quest.getName()); break; } @@ -386,11 +400,13 @@ public class ActionFactory implements ConversationAbandonedListener { context.setSessionData(CK.ED_EVENT_DELETE, a.getName()); return new DeletePrompt(); } else { - ((Player) context.getForWhom()).sendMessage(ChatColor.RED + Lang.get("eventEditorEventInUse") + " \"" + ChatColor.DARK_PURPLE + a.getName() + ChatColor.RED + "\":"); + ((Player) context.getForWhom()).sendMessage(ChatColor.RED + Lang.get("eventEditorEventInUse") + + " \"" + ChatColor.DARK_PURPLE + a.getName() + ChatColor.RED + "\":"); for (String s : used) { ((Player) context.getForWhom()).sendMessage(ChatColor.RED + "- " + ChatColor.DARK_RED + s); } - ((Player) context.getForWhom()).sendMessage(ChatColor.RED + Lang.get("eventEditorMustModifyQuests")); + ((Player) context.getForWhom()).sendMessage(ChatColor.RED + + Lang.get("eventEditorMustModifyQuests")); return new SelectDeletePrompt(); } } @@ -406,9 +422,12 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public String getPromptText(ConversationContext context) { - String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + "" + ChatColor.GREEN + " - " + Lang.get("yesWord") + "\n"; - text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + "" + ChatColor.RED + " - " + Lang.get("noWord"); - return ChatColor.RED + Lang.get("confirmDelete") + " (" + ChatColor.YELLOW + (String) context.getSessionData(CK.ED_EVENT_DELETE) + ChatColor.RED + ")\n" + text; + String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + "" + ChatColor.GREEN + " - " + + Lang.get("yesWord") + "\n"; + text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + "" + ChatColor.RED + " - " + + Lang.get("noWord"); + return ChatColor.RED + Lang.get("confirmDelete") + " (" + ChatColor.YELLOW + + (String) context.getSessionData(CK.ED_EVENT_DELETE) + ChatColor.RED + ")\n" + text; } @Override @@ -433,28 +452,43 @@ public class ActionFactory implements ConversationAbandonedListener { @SuppressWarnings("unchecked") @Override public String getPromptText(ConversationContext context) { - String text = ChatColor.GOLD + "- " + Lang.get("event") + ": " + ChatColor.AQUA + context.getSessionData(CK.E_NAME) + ChatColor.GOLD + " -\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetName") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.GOLD + " - " + Lang.get("eventEditorPlayer") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.GOLD + " - " + Lang.get("eventEditorTimer") +"\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.GOLD + " - " + Lang.get("eventEditorEffect") +"\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.GOLD + " - " + Lang.get("eventEditorWeather") +"\n"; + String text = ChatColor.GOLD + "- " + Lang.get("event") + ": " + ChatColor.AQUA + + context.getSessionData(CK.E_NAME) + ChatColor.GOLD + " -\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetName") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.GOLD + " - " + + Lang.get("eventEditorPlayer") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.GOLD + " - " + + Lang.get("eventEditorTimer") +"\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.GOLD + " - " + + Lang.get("eventEditorEffect") +"\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.GOLD + " - " + + Lang.get("eventEditorWeather") +"\n"; if (context.getSessionData(CK.E_MOB_TYPES) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobSpawns") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobSpawns") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { LinkedList types = (LinkedList) context.getSessionData(CK.E_MOB_TYPES); - text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobSpawns") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobSpawns") + "\n"; for (String s : types) { QuestMob qm = QuestMob.fromString(s); - text += ChatColor.GRAY + " - " + ChatColor.AQUA + qm.getType().name() + ((qm.getName() != null) ? ": " + qm.getName() : "") + ChatColor.GRAY + " x " + ChatColor.DARK_AQUA + qm.getSpawnAmounts() + ChatColor.GRAY + " -> " + ChatColor.GREEN + Quests.getLocationInfo(qm.getSpawnLocation()) + "\n"; + text += ChatColor.GRAY + " - " + ChatColor.AQUA + qm.getType().name() + + ((qm.getName() != null) ? ": " + qm.getName() : "") + ChatColor.GRAY + " x " + + ChatColor.DARK_AQUA + qm.getSpawnAmounts() + ChatColor.GRAY + " -> " + ChatColor.GREEN + + Quests.getLocationInfo(qm.getSpawnLocation()) + "\n"; } } if (context.getSessionData(CK.E_FAIL_QUEST) == null) { context.setSessionData(CK.E_FAIL_QUEST, Lang.get("noWord")); } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorFailQuest") + ": " + ChatColor.AQUA + context.getSessionData(CK.E_FAIL_QUEST) + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.GREEN + " - " + Lang.get("save") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.RED + " - " + Lang.get("exit"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorFailQuest") + ": " + ChatColor.AQUA + context.getSessionData(CK.E_FAIL_QUEST) + + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.GREEN + " - " + + Lang.get("save") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.RED + " - " + + Lang.get("exit"); return text; } @@ -504,18 +538,25 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + "- " + Lang.get("eventEditorPlayer") + " -\n"; if (context.getSessionData(CK.E_MESSAGE) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMessage") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMessage") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMessage") + " (" + ChatColor.AQUA + context.getSessionData(CK.E_MESSAGE) + ChatColor.RESET + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMessage") + " (" + ChatColor.AQUA + + context.getSessionData(CK.E_MESSAGE) + ChatColor.RESET + ChatColor.YELLOW + ")\n"; } if (context.getSessionData(CK.E_CLEAR_INVENTORY) == null) { context.setSessionData(CK.E_CLEAR_INVENTORY, Lang.get("noWord")); } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorClearInv") + ": " + ChatColor.AQUA + context.getSessionData(CK.E_CLEAR_INVENTORY) + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorClearInv") + ": " + ChatColor.AQUA + + context.getSessionData(CK.E_CLEAR_INVENTORY) + "\n"; if (context.getSessionData(CK.E_ITEMS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetItems") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetItems") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetItems") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetItems") + "\n"; LinkedList items = (LinkedList) context.getSessionData(CK.E_ITEMS); for (ItemStack is : items) { if (is != null) { @@ -524,47 +565,66 @@ public class ActionFactory implements ConversationAbandonedListener { } } if (context.getSessionData(CK.E_POTION_TYPES) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionEffects") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionEffects") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionEffects") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionEffects") + "\n"; LinkedList types = (LinkedList) context.getSessionData(CK.E_POTION_TYPES); LinkedList durations = (LinkedList) context.getSessionData(CK.E_POTION_DURATIONS); LinkedList mags = (LinkedList) context.getSessionData(CK.E_POTION_STRENGHT); int index = -1; for (String type : types) { index++; - text += ChatColor.GRAY + " - " + ChatColor.AQUA + type + ChatColor.DARK_PURPLE + " " + RomanNumeral.getNumeral(mags.get(index)) + ChatColor.GRAY + " -> " + ChatColor.DARK_AQUA + Quests.getTime(durations.get(index) * 50L) + "\n"; + text += ChatColor.GRAY + " - " + ChatColor.AQUA + type + ChatColor.DARK_PURPLE + " " + + RomanNumeral.getNumeral(mags.get(index)) + ChatColor.GRAY + " -> " + ChatColor.DARK_AQUA + + Quests.getTime(durations.get(index) * 50L) + "\n"; } } if (context.getSessionData(CK.E_HUNGER) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetHunger") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetHunger") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetHunger") + ChatColor.AQUA + " (" + (Integer) context.getSessionData(CK.E_HUNGER) + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetHunger") + ChatColor.AQUA + " (" + + (Integer) context.getSessionData(CK.E_HUNGER) + ")\n"; } if (context.getSessionData(CK.E_SATURATION) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetSaturation") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetSaturation") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetSaturation") + ChatColor.AQUA + " (" + (Integer) context.getSessionData(CK.E_SATURATION) + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetSaturation") + ChatColor.AQUA + " (" + + (Integer) context.getSessionData(CK.E_SATURATION) + ")\n"; } if (context.getSessionData(CK.E_HEALTH) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetHealth") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetHealth") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetHealth") + ChatColor.AQUA + " (" + (Integer) context.getSessionData(CK.E_HEALTH) + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetHealth") + ChatColor.AQUA + " (" + + (Integer) context.getSessionData(CK.E_HEALTH) + ")\n"; } if (context.getSessionData(CK.E_TELEPORT) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetTeleport") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetTeleport") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetTeleport") + ChatColor.AQUA + " (" + (String) context.getSessionData(CK.E_TELEPORT) + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetTeleport") + ChatColor.AQUA + " (" + + (String) context.getSessionData(CK.E_TELEPORT) + ")\n"; } if (context.getSessionData(CK.E_COMMANDS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetCommands") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetCommands") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetCommands") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetCommands") + "\n"; for (String s : (LinkedList) context.getSessionData(CK.E_COMMANDS)) { text += ChatColor.GRAY + " - " + ChatColor.AQUA + s + "\n"; } } - text += ChatColor.GREEN + "" + ChatColor.BOLD + "10 " + ChatColor.RESET + ChatColor.YELLOW + "- " + Lang.get("done") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "10 " + ChatColor.RESET + ChatColor.YELLOW + "- " + + Lang.get("done") + "\n"; return text; } @@ -610,15 +670,21 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + "- " + Lang.get("eventEditorTimer") + " -\n"; if (context.getSessionData(CK.E_TIMER) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetTimer") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetTimer") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetTimer") + "(" + ChatColor.AQUA + "\"" + context.getSessionData(CK.E_TIMER) + "\"" + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetTimer") + "(" + ChatColor.AQUA + "\"" + + context.getSessionData(CK.E_TIMER) + "\"" + ChatColor.YELLOW + ")\n"; } if (context.getSessionData(CK.E_CANCEL_TIMER) == null) { context.setSessionData(CK.E_CANCEL_TIMER, Lang.get("noWord")); } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorCancelTimer") + ": " + ChatColor.AQUA + context.getSessionData(CK.E_CANCEL_TIMER) + "\n"; - text += ChatColor.GREEN + "" + ChatColor.BOLD + "3 " + ChatColor.RESET + ChatColor.YELLOW + "- " + Lang.get("done") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorCancelTimer") + ": " + ChatColor.AQUA + + context.getSessionData(CK.E_CANCEL_TIMER) + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "3 " + ChatColor.RESET + ChatColor.YELLOW + "- " + + Lang.get("done") + "\n"; return text; } @@ -650,25 +716,31 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + "- " + Lang.get("eventEditorEffect") + " -\n"; if (context.getSessionData(CK.E_EFFECTS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetEffects") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetEffects") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetEffects") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetEffects") + "\n"; LinkedList effects = (LinkedList) context.getSessionData(CK.E_EFFECTS); LinkedList locations = (LinkedList) context.getSessionData(CK.E_EFFECTS_LOCATIONS); for (String effect : effects) { - text += ChatColor.GRAY + " - " + ChatColor.AQUA + effect + ChatColor.GRAY + " at " + ChatColor.DARK_AQUA + locations.get(effects.indexOf(effect)) + "\n"; + text += ChatColor.GRAY + " - " + ChatColor.AQUA + effect + ChatColor.GRAY + " at " + + ChatColor.DARK_AQUA + locations.get(effects.indexOf(effect)) + "\n"; } } if (context.getSessionData(CK.E_EXPLOSIONS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetExplosions") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetExplosions") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetExplosions") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetExplosions") + "\n"; LinkedList locations = (LinkedList) context.getSessionData(CK.E_EXPLOSIONS); for (String loc : locations) { text += ChatColor.GRAY + " - " + ChatColor.AQUA + loc + "\n"; } } - text += ChatColor.GREEN + "" + ChatColor.BOLD + "3 " + ChatColor.RESET + ChatColor.YELLOW + "- " + Lang.get("done") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "3 " + ChatColor.RESET + ChatColor.YELLOW + "- " + + Lang.get("done") + "\n"; return text; } @@ -695,26 +767,39 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + "- " + Lang.get("eventEditorWeather") + " -\n"; if (context.getSessionData(CK.E_WORLD_STORM) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetStorm") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetStorm") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetStorm") + " (" + ChatColor.AQUA + (String) context.getSessionData(CK.E_WORLD_STORM) + ChatColor.YELLOW + " -> " + ChatColor.DARK_AQUA + Quests.getTime(Long.valueOf((int)context.getSessionData(CK.E_WORLD_STORM_DURATION) * 1000)) + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetStorm") + " (" + ChatColor.AQUA + + (String) context.getSessionData(CK.E_WORLD_STORM) + ChatColor.YELLOW + " -> " + + ChatColor.DARK_AQUA + Quests.getTime(Long.valueOf((int)context + .getSessionData(CK.E_WORLD_STORM_DURATION) * 1000)) + ChatColor.YELLOW + ")\n"; } if (context.getSessionData(CK.E_WORLD_THUNDER) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetThunder") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetThunder") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetThunder") + " (" + ChatColor.AQUA + (String) context.getSessionData(CK.E_WORLD_THUNDER) + ChatColor.YELLOW + " -> " + ChatColor.DARK_AQUA + Quests.getTime(Long.valueOf((int)context.getSessionData(CK.E_WORLD_THUNDER_DURATION) * 1000)) + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetThunder") + " (" + ChatColor.AQUA + + (String) context.getSessionData(CK.E_WORLD_THUNDER) + ChatColor.YELLOW + " -> " + + ChatColor.DARK_AQUA + Quests.getTime(Long.valueOf((int)context + .getSessionData(CK.E_WORLD_THUNDER_DURATION) * 1000)) + ChatColor.YELLOW + ")\n"; } if (context.getSessionData(CK.E_LIGHTNING) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetLightning") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetLightning") + ChatColor.GRAY + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetLightning") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetLightning") + "\n"; LinkedList locations = (LinkedList) context.getSessionData(CK.E_LIGHTNING); for (String loc : locations) { text += ChatColor.GRAY + " - " + ChatColor.AQUA + loc + "\n"; } } - text += ChatColor.GREEN + "" + ChatColor.BOLD + "4 " + ChatColor.RESET + ChatColor.GREEN + "- " + Lang.get("done") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "4 " + ChatColor.RESET + ChatColor.GREEN + "- " + + Lang.get("done") + "\n"; return text; } @@ -769,7 +854,8 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public String getPromptText(ConversationContext context) { - String text = ChatColor.YELLOW + Lang.get("questEditorSave") + " \"" + ChatColor.AQUA + context.getSessionData(CK.E_NAME) + ChatColor.YELLOW + "\"?\n"; + String text = ChatColor.YELLOW + Lang.get("questEditorSave") + " \"" + ChatColor.AQUA + + context.getSessionData(CK.E_NAME) + ChatColor.YELLOW + "\"?\n"; if (modified.isEmpty() == false) { text += ChatColor.RED + Lang.get("eventEditorModifiedNote") + "\n"; for (String s : modified) { @@ -797,8 +883,9 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public String getPromptText(ConversationContext context) { - String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.GREEN + " - " + Lang.get("yesWord") + "\n" - + ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.RED + " - " + Lang.get("noWord"); + String text = ChatColor.GREEN + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.GREEN + " - " + + Lang.get("yesWord") + "\n" + ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + + ChatColor.RED + " - " + Lang.get("noWord"); return ChatColor.YELLOW + Lang.get("confirmDelete") + "\n" + text; } @@ -1167,7 +1254,8 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public Prompt acceptInput(ConversationContext context, String input) { - if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { + if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false + && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { context.setSessionData(CK.E_MESSAGE, input); } else if (input.equalsIgnoreCase(Lang.get("cmdClear"))) { context.setSessionData(CK.E_MESSAGE, null); @@ -1200,16 +1288,22 @@ public class ActionFactory implements ConversationAbandonedListener { } String text = ChatColor.GOLD + Lang.get("eventEditorGiveItemsTitle") + "\n"; if (context.getSessionData(CK.E_ITEMS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("stageEditorDeliveryAddItem") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("stageEditorDeliveryAddItem") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } else { for (ItemStack is : getItems(context)) { text += ChatColor.GRAY + " - " + ItemUtil.getDisplayString(is) + "\n"; } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("stageEditorDeliveryAddItem") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("stageEditorDeliveryAddItem") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } return text; } @@ -1244,25 +1338,34 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + "- " + Lang.get("eventEditorEffects") + " -\n"; if (context.getSessionData(CK.E_EFFECTS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddEffect") + " (" + Lang.get("noneSet") + ")\n"; - text += ChatColor.GRAY + "2 - " + Lang.get("eventEditorAddEffectLocation") + " (" + Lang.get("eventEditorNoEffects") + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorAddEffect") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.GRAY + "2 - " + Lang.get("eventEditorAddEffectLocation") + " (" + + Lang.get("eventEditorNoEffects") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddEffect") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorAddEffect") + "\n"; for (String s : getEffects(context)) { text += ChatColor.GRAY + " - " + ChatColor.AQUA + s + "\n"; } if (context.getSessionData(CK.E_EFFECTS_LOCATIONS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddEffectLocation") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorAddEffectLocation") + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddEffectLocation") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorAddEffectLocation") + "\n"; for (String s : getEffectLocations(context)) { text += ChatColor.GRAY + " - " + ChatColor.AQUA + s + "\n"; } } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } return text; } @@ -1361,16 +1464,22 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public String getPromptText(ConversationContext context) { String effects = ChatColor.LIGHT_PURPLE + Lang.get("eventEditorEffectsTitle") + "\n"; - effects += ChatColor.DARK_PURPLE + "BLAZE_SHOOT " + ChatColor.GRAY + "- " + Lang.get("effBlazeShoot") + "\n"; + effects += ChatColor.DARK_PURPLE + "BLAZE_SHOOT " + ChatColor.GRAY + "- " + Lang.get("effBlazeShoot") + + "\n"; effects += ChatColor.DARK_PURPLE + "BOW_FIRE " + ChatColor.GRAY + "- " + Lang.get("effBowFire") + "\n"; effects += ChatColor.DARK_PURPLE + "CLICK1 " + ChatColor.GRAY + "- " + Lang.get("effClick1") + "\n"; effects += ChatColor.DARK_PURPLE + "CLICK2 " + ChatColor.GRAY + "- " + Lang.get("effClick2") + "\n"; - effects += ChatColor.DARK_PURPLE + "DOOR_TOGGLE " + ChatColor.GRAY + "- " + Lang.get("effDoorToggle") + "\n"; + effects += ChatColor.DARK_PURPLE + "DOOR_TOGGLE " + ChatColor.GRAY + "- " + Lang.get("effDoorToggle") + + "\n"; effects += ChatColor.DARK_PURPLE + "EXTINGUISH " + ChatColor.GRAY + "- " + Lang.get("effExtinguish") + "\n"; - effects += ChatColor.DARK_PURPLE + "GHAST_SHOOT " + ChatColor.GRAY + "- " + Lang.get("effGhastShoot") + "\n"; - effects += ChatColor.DARK_PURPLE + "GHAST_SHRIEK " + ChatColor.GRAY + "- " + Lang.get("effGhastShriek") + "\n"; - effects += ChatColor.DARK_PURPLE + "ZOMBIE_CHEW_IRON_DOOR " + ChatColor.GRAY + "- " + Lang.get("effZombieWood") + "\n"; - effects += ChatColor.DARK_PURPLE + "ZOMBIE_CHEW_WOODEN_DOOR " + ChatColor.GRAY + "- " + Lang.get("effZombieIron") + "\n"; + effects += ChatColor.DARK_PURPLE + "GHAST_SHOOT " + ChatColor.GRAY + "- " + Lang.get("effGhastShoot") + + "\n"; + effects += ChatColor.DARK_PURPLE + "GHAST_SHRIEK " + ChatColor.GRAY + "- " + Lang.get("effGhastShriek") + + "\n"; + effects += ChatColor.DARK_PURPLE + "ZOMBIE_CHEW_IRON_DOOR " + ChatColor.GRAY + "- " + + Lang.get("effZombieWood") + "\n"; + effects += ChatColor.DARK_PURPLE + "ZOMBIE_CHEW_WOODEN_DOOR " + ChatColor.GRAY + "- " + + Lang.get("effZombieIron") + "\n"; return ChatColor.YELLOW + effects + Lang.get("effEnterName"); } @@ -1391,7 +1500,8 @@ public class ActionFactory implements ConversationAbandonedListener { selectedEffectLocations.remove(player.getUniqueId()); return new SoundEffectListPrompt(); } else { - player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + Lang.get("eventEditorInvalidEffect")); + player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + + Lang.get("eventEditorInvalidEffect")); return new SoundEffectPrompt(); } } else { @@ -1411,20 +1521,31 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + Lang.get("eventEditorStormTitle") + "\n"; if (context.getSessionData(CK.E_WORLD_STORM) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetWorld") + " (" + Lang.get("noneSet") + ")\n"; - text += ChatColor.GRAY + "2 - " + Lang.get("eventEditorSetDuration") + " " + Lang.get("eventEditorNoWorld") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetWorld") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.GRAY + "2 - " + Lang.get("eventEditorSetDuration") + " " + + Lang.get("eventEditorNoWorld") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetWorld") + " (" + ChatColor.AQUA + ((String) context.getSessionData(CK.E_WORLD_STORM)) + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetWorld") + " (" + ChatColor.AQUA + + ((String) context.getSessionData(CK.E_WORLD_STORM)) + ChatColor.YELLOW + ")\n"; if (context.getSessionData(CK.E_WORLD_STORM_DURATION) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetDuration") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetDuration") + " (" + Lang.get("noneSet") + ")\n"; } else { int dur = (int) context.getSessionData(CK.E_WORLD_STORM_DURATION); - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetDuration") + " (" + ChatColor.AQUA + Quests.getTime(dur * 1000) + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetDuration") + " (" + ChatColor.AQUA + Quests.getTime(dur * 1000) + + ChatColor.YELLOW + ")\n"; } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } return text; } @@ -1446,7 +1567,8 @@ public class ActionFactory implements ConversationAbandonedListener { context.setSessionData(CK.E_WORLD_STORM_DURATION, null); return new StormPrompt(); } else if (input.equalsIgnoreCase("4")) { - if (context.getSessionData(CK.E_WORLD_STORM) != null && context.getSessionData(CK.E_WORLD_STORM_DURATION) == null) { + if (context.getSessionData(CK.E_WORLD_STORM) != null + && context.getSessionData(CK.E_WORLD_STORM_DURATION) == null) { context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("eventEditorMustSetStormDuration")); return new StormPrompt(); } else { @@ -1476,7 +1598,8 @@ public class ActionFactory implements ConversationAbandonedListener { if (plugin.getServer().getWorld(input) != null) { context.setSessionData(CK.E_WORLD_STORM, plugin.getServer().getWorld(input).getName()); } else { - player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + Lang.get("eventEditorInvalidWorld")); + player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + + Lang.get("eventEditorInvalidWorld")); return new StormWorldPrompt(); } } @@ -1494,7 +1617,8 @@ public class ActionFactory implements ConversationAbandonedListener { @Override protected Prompt acceptValidatedInput(ConversationContext context, Number input) { if (input.intValue() < 1) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("invalidMinimum").replace("", "1")); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("invalidMinimum").replace("", "1")); return new StormDurationPrompt(); } else { context.setSessionData(CK.E_WORLD_STORM_DURATION, input.intValue()); @@ -1513,20 +1637,31 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + Lang.get("eventEditorThunderTitle") + "\n"; if (context.getSessionData(CK.E_WORLD_THUNDER) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetWorld") + " (" + Lang.get("noneSet") + ")\n"; - text += ChatColor.GRAY + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.GRAY + " - " + Lang.get("eventEditorSetDuration") + " " + Lang.get("eventEditorNoWorld") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetWorld") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.GRAY + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.GRAY + " - " + + Lang.get("eventEditorSetDuration") + " " + Lang.get("eventEditorNoWorld") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetWorld") + " (" + ChatColor.AQUA + ((String) context.getSessionData(CK.E_WORLD_THUNDER)) + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetWorld") + " (" + ChatColor.AQUA + + ((String) context.getSessionData(CK.E_WORLD_THUNDER)) + ChatColor.YELLOW + ")\n"; if (context.getSessionData(CK.E_WORLD_THUNDER_DURATION) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetDuration") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetDuration") + " (" + Lang.get("noneSet") + ")\n"; } else { int dur = (int) context.getSessionData(CK.E_WORLD_THUNDER_DURATION); - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetDuration") + " (" + ChatColor.AQUA + Quests.getTime(dur * 1000) + ChatColor.YELLOW + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetDuration") + " (" + ChatColor.AQUA + Quests.getTime(dur * 1000) + + ChatColor.YELLOW + ")\n"; } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } return text; } @@ -1548,7 +1683,8 @@ public class ActionFactory implements ConversationAbandonedListener { context.setSessionData(CK.E_WORLD_THUNDER_DURATION, null); return new ThunderPrompt(); } else if (input.equalsIgnoreCase("4")) { - if (context.getSessionData(CK.E_WORLD_THUNDER) != null && context.getSessionData(CK.E_WORLD_THUNDER_DURATION) == null) { + if (context.getSessionData(CK.E_WORLD_THUNDER) != null + && context.getSessionData(CK.E_WORLD_THUNDER_DURATION) == null) { context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("eventEditorMustSetThunderDuration")); return new ThunderPrompt(); } else { @@ -1578,7 +1714,8 @@ public class ActionFactory implements ConversationAbandonedListener { if (plugin.getServer().getWorld(input) != null) { context.setSessionData(CK.E_WORLD_THUNDER, plugin.getServer().getWorld(input).getName()); } else { - player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + Lang.get("eventEditorInvalidWorld")); + player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + + Lang.get("eventEditorInvalidWorld")); return new ThunderWorldPrompt(); } } @@ -1596,7 +1733,8 @@ public class ActionFactory implements ConversationAbandonedListener { @Override protected Prompt acceptValidatedInput(ConversationContext context, Number input) { if (input.intValue() < 1) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("invalidMinimum").replace("", "1")); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("invalidMinimum").replace("", "1")); return new ThunderDurationPrompt(); } else { context.setSessionData(CK.E_WORLD_THUNDER_DURATION, input.intValue()); @@ -1611,20 +1749,29 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + Lang.get("eventEditorMobSpawnsTitle") + "\n"; if (context.getSessionData(CK.E_MOB_TYPES) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddMobTypes") + " (" + Lang.get("noneSet") + ")\n"; - text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.GREEN + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorAddMobTypes") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.RED + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } else { @SuppressWarnings("unchecked") LinkedList types = (LinkedList) context.getSessionData(CK.E_MOB_TYPES); for (int i = 0; i < types.size(); i++) { QuestMob qm = QuestMob.fromString(types.get(i)); - text += ChatColor.BLUE + "" + ChatColor.BOLD + (i + 1) + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("edit") + ": " - + ChatColor.AQUA + qm.getType().name() + ((qm.getName() != null) ? ": " + qm.getName() : "") + ChatColor.GRAY + " x " + ChatColor.DARK_AQUA + qm.getSpawnAmounts() + ChatColor.GRAY + " -> " + ChatColor.GREEN + Quests.getLocationInfo(qm.getSpawnLocation()) + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + (i + 1) + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("edit") + ": " + ChatColor.AQUA + qm.getType().name() + + ((qm.getName() != null) ? ": " + qm.getName() : "") + ChatColor.GRAY + " x " + + ChatColor.DARK_AQUA + qm.getSpawnAmounts() + ChatColor.GRAY + " -> " + ChatColor.GREEN + + Quests.getLocationInfo(qm.getSpawnLocation()) + "\n"; } - text += ChatColor.BLUE + "" + ChatColor.BOLD + (types.size() + 1) + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddMobTypes") + "\n"; - text += ChatColor.RED + "" + ChatColor.BOLD + (types.size() + 2) + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.GREEN + "" + ChatColor.BOLD + (types.size() + 3) + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + (types.size() + 1) + ChatColor.RESET + ChatColor.YELLOW + + " - " + Lang.get("eventEditorAddMobTypes") + "\n"; + text += ChatColor.RED + "" + ChatColor.BOLD + (types.size() + 2) + ChatColor.RESET + ChatColor.YELLOW + + " - " + Lang.get("clear") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + (types.size() + 3) + ChatColor.RESET + ChatColor.YELLOW + + " - " + Lang.get("done"); } return text; } @@ -1648,7 +1795,8 @@ public class ActionFactory implements ConversationAbandonedListener { try { inp = Integer.parseInt(input); } catch (NumberFormatException e) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("reqNotANumber").replace("", input)); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("reqNotANumber").replace("", input)); return new MobPrompt(); } if (inp == types.size() + 1) { @@ -1695,22 +1843,66 @@ public class ActionFactory implements ConversationAbandonedListener { context.setSessionData("newItem", null); context.setSessionData("tempStack", null); } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobName") + ChatColor.GRAY + " (" + ((questMob.getName() == null) ? Lang.get("noneSet") : ChatColor.AQUA + questMob.getName()) + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobType") + ChatColor.GRAY + " (" + ((questMob.getType() == null) ? Lang.get("noneSet") : ChatColor.AQUA + questMob.getType().name()) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorAddSpawnLocation") + ChatColor.GRAY + " (" + ((questMob.getSpawnLocation() == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + Quests.getLocationInfo(questMob.getSpawnLocation())) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobSpawnAmount") + ChatColor.GRAY + " (" + ((questMob.getSpawnAmounts() == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + "" + questMob.getSpawnAmounts()) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobItemInHand") + ChatColor.GRAY + " (" + ((questMob.getInventory()[0] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + ItemUtil.getDisplayString(questMob.getInventory()[0])) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobItemInHandDrop") + ChatColor.GRAY + " (" + ((questMob.getDropChances()[0] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + "" + questMob.getDropChances()[0]) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobBoots") + ChatColor.GRAY + " (" + ((questMob.getInventory()[1] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + ItemUtil.getDisplayString(questMob.getInventory()[1])) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobBootsDrop") + ChatColor.GRAY + " (" + ((questMob.getDropChances()[1] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + "" + questMob.getDropChances()[1]) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobLeggings") + ChatColor.GRAY + " (" + ((questMob.getInventory()[2] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + ItemUtil.getDisplayString(questMob.getInventory()[2])) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "10" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobLeggingsDrop") + ChatColor.GRAY + " (" + ((questMob.getDropChances()[2] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + "" + questMob.getDropChances()[2]) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "11" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobChestPlate") + ChatColor.GRAY + " (" + ((questMob.getInventory()[3] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + ItemUtil.getDisplayString(questMob.getInventory()[3])) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobChestPlateDrop") + ChatColor.GRAY + " (" + ((questMob.getDropChances()[3] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + "" + questMob.getDropChances()[3]) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "13" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobHelmet") + ChatColor.GRAY + " (" + ((questMob.getInventory()[4] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + ItemUtil.getDisplayString(questMob.getInventory()[4])) + ChatColor.GRAY + ")\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "14" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetMobHelmetDrop") + ChatColor.GRAY + " (" + ((questMob.getDropChances()[4] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + "" + questMob.getDropChances()[4]) + ChatColor.GRAY + ")\n"; - text += ChatColor.GREEN + "" + ChatColor.BOLD + "15" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done") + "\n"; - text += ChatColor.RED + "" + ChatColor.BOLD + "16" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("cancel"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobName") + ChatColor.GRAY + " (" + + ((questMob.getName() == null) ? Lang.get("noneSet") : ChatColor.AQUA + questMob.getName()) + + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobType") + ChatColor.GRAY + " (" + + ((questMob.getType() == null) ? Lang.get("noneSet") : ChatColor.AQUA + questMob.getType().name()) + + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorAddSpawnLocation") + ChatColor.GRAY + " (" + + ((questMob.getSpawnLocation() == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + Quests.getLocationInfo(questMob.getSpawnLocation())) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobSpawnAmount") + ChatColor.GRAY + " (" + + ((questMob.getSpawnAmounts() == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + "" + questMob.getSpawnAmounts()) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobItemInHand") + ChatColor.GRAY + " (" + + ((questMob.getInventory()[0] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + ItemUtil.getDisplayString(questMob.getInventory()[0])) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "6" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobItemInHandDrop") + ChatColor.GRAY + " (" + + ((questMob.getDropChances()[0] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + "" + questMob.getDropChances()[0]) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "7" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobBoots") + ChatColor.GRAY + " (" + + ((questMob.getInventory()[1] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + ItemUtil.getDisplayString(questMob.getInventory()[1])) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "8" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobBootsDrop") + ChatColor.GRAY + " (" + + ((questMob.getDropChances()[1] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + "" + questMob.getDropChances()[1]) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "9" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobLeggings") + ChatColor.GRAY + " (" + + ((questMob.getInventory()[2] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + ItemUtil.getDisplayString(questMob.getInventory()[2])) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "10" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobLeggingsDrop") + ChatColor.GRAY + " (" + + ((questMob.getDropChances()[2] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + "" + questMob.getDropChances()[2]) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "11" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobChestPlate") + ChatColor.GRAY + " (" + + ((questMob.getInventory()[3] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + ItemUtil.getDisplayString(questMob.getInventory()[3])) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "12" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobChestPlateDrop") + ChatColor.GRAY + " (" + + ((questMob.getDropChances()[3] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + "" + questMob.getDropChances()[3]) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "13" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobHelmet") + ChatColor.GRAY + " (" + + ((questMob.getInventory()[4] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + ItemUtil.getDisplayString(questMob.getInventory()[4])) + ChatColor.GRAY + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "14" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetMobHelmetDrop") + ChatColor.GRAY + " (" + + ((questMob.getDropChances()[4] == null) ? ChatColor.GRAY + Lang.get("noneSet") : ChatColor.AQUA + + "" + questMob.getDropChances()[4]) + ChatColor.GRAY + ")\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "15" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done") + "\n"; + text += ChatColor.RED + "" + ChatColor.BOLD + "16" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("cancel"); return text; } @@ -1762,7 +1954,8 @@ public class ActionFactory implements ConversationAbandonedListener { context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("eventEditorMustSetMobAmountsFirst")); return new QuestMobPrompt(mobIndex, questMob); } - if (context.getSessionData(CK.E_MOB_TYPES) == null || ((LinkedList) context.getSessionData(CK.E_MOB_TYPES)).isEmpty()) { + if (context.getSessionData(CK.E_MOB_TYPES) == null + || ((LinkedList) context.getSessionData(CK.E_MOB_TYPES)).isEmpty()) { LinkedList list = new LinkedList(); list.add(questMob.serialize()); context.setSessionData(CK.E_MOB_TYPES, list); @@ -1850,7 +2043,8 @@ public class ActionFactory implements ConversationAbandonedListener { if (MiscUtil.getProperMobType(input) != null) { questMob.setType(MiscUtil.getProperMobType(input)); } else { - player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + Lang.get("eventEditorInvalidMob")); + player.sendMessage(ChatColor.LIGHT_PURPLE + input + " " + ChatColor.RED + + Lang.get("eventEditorInvalidMob")); return new MobTypePrompt(mobIndex, questMob); } } @@ -2028,35 +2222,48 @@ public class ActionFactory implements ConversationAbandonedListener { public String getPromptText(ConversationContext context) { String text = ChatColor.GOLD + Lang.get("eventEditorPotionEffectsTitle") + "\n"; if (context.getSessionData(CK.E_POTION_TYPES) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionEffectTypes") + " (" + Lang.get("noneSet") + ")\n"; - text += ChatColor.GRAY + "2 - " + Lang.get("eventEditorSetPotionDurations") + " " + Lang.get("noneSet") + "\n"; - text += ChatColor.GRAY + "3 - " + Lang.get("eventEditorSetPotionMagnitudes") + " " + Lang.get("noneSet") + "\n"; - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.GREEN + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionEffectTypes") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.GRAY + "2 - " + Lang.get("eventEditorSetPotionDurations") + " " + Lang.get("noneSet") + + "\n"; + text += ChatColor.GRAY + "3 - " + Lang.get("eventEditorSetPotionMagnitudes") + " " + Lang.get("noneSet") + + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionEffectTypes") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "1" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionEffectTypes") + "\n"; for (String s : (LinkedList) context.getSessionData(CK.E_POTION_TYPES)) { text += ChatColor.GRAY + " - " + ChatColor.AQUA + s + "\n"; } if (context.getSessionData(CK.E_POTION_DURATIONS) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionDurations") + " (" + Lang.get("noneSet") + ")\n"; - text += ChatColor.GRAY + "3 - " + Lang.get("eventEditorSetPotionMagnitudes") + " " + Lang.get("noneSet") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionDurations") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.GRAY + "3 - " + Lang.get("eventEditorSetPotionMagnitudes") + " " + + Lang.get("noneSet") + "\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("noneSet") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "2" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("noneSet") + "\n"; for (Long l : (LinkedList) context.getSessionData(CK.E_POTION_DURATIONS)) { text += ChatColor.GRAY + " - " + ChatColor.DARK_AQUA + Quests.getTime(l * 50L) + "\n"; } if (context.getSessionData(CK.E_POTION_STRENGHT) == null) { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionMagnitudes") + " (" + Lang.get("noneSet") + ")\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionMagnitudes") + " (" + Lang.get("noneSet") + ")\n"; } else { - text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("eventEditorSetPotionMagnitudes") + "\n"; + text += ChatColor.BLUE + "" + ChatColor.BOLD + "3" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("eventEditorSetPotionMagnitudes") + "\n"; for (int i : (LinkedList) context.getSessionData(CK.E_POTION_STRENGHT)) { text += ChatColor.GRAY + " - " + ChatColor.DARK_PURPLE + i + "\n"; } } } - text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("clear") + "\n"; - text += ChatColor.GREEN + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + Lang.get("done"); + text += ChatColor.BLUE + "" + ChatColor.BOLD + "4" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("clear") + "\n"; + text += ChatColor.GREEN + "" + ChatColor.BOLD + "5" + ChatColor.RESET + ChatColor.YELLOW + " - " + + Lang.get("done"); } return text; } @@ -2075,10 +2282,12 @@ public class ActionFactory implements ConversationAbandonedListener { } } else if (input.equalsIgnoreCase("3")) { if (context.getSessionData(CK.E_POTION_TYPES) == null) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("eventEditorMustSetPotionTypesAndDurationsFirst")); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("eventEditorMustSetPotionTypesAndDurationsFirst")); return new PotionEffectPrompt(); } else if (context.getSessionData(CK.E_POTION_DURATIONS) == null) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("eventEditorMustSetPotionDurationsFirst")); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("eventEditorMustSetPotionDurationsFirst")); return new PotionEffectPrompt(); } else { return new PotionMagnitudesPrompt(); @@ -2140,7 +2349,8 @@ public class ActionFactory implements ConversationAbandonedListener { effTypes.add(PotionEffectType.getByName(s.toUpperCase()).getName()); context.setSessionData(CK.E_POTION_TYPES, effTypes); } else { - player.sendMessage(ChatColor.LIGHT_PURPLE + s + " " + ChatColor.RED + Lang.get("eventEditorInvalidPotionType")); + player.sendMessage(ChatColor.LIGHT_PURPLE + s + " " + ChatColor.RED + + Lang.get("eventEditorInvalidPotionType")); return new PotionTypesPrompt(); } } @@ -2225,13 +2435,15 @@ public class ActionFactory implements ConversationAbandonedListener { try { int i = Integer.parseInt(input); if (i < 0) { - ((Player) context.getForWhom()).sendMessage(ChatColor.RED + Lang.get("invalidMinimum").replace("", "0")); + ((Player) context.getForWhom()).sendMessage(ChatColor.RED + + Lang.get("invalidMinimum").replace("", "0")); return new HungerPrompt(); } else { context.setSessionData(CK.E_HUNGER, (Integer) i); } } catch (NumberFormatException e) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("reqNotANumber").replace("", input)); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("reqNotANumber").replace("", input)); return new HungerPrompt(); } } else { @@ -2254,13 +2466,15 @@ public class ActionFactory implements ConversationAbandonedListener { try { int i = Integer.parseInt(input); if (i < 0) { - ((Player) context.getForWhom()).sendMessage(ChatColor.RED + Lang.get("invalidMinimum").replace("", "0")); + ((Player) context.getForWhom()).sendMessage(ChatColor.RED + + Lang.get("invalidMinimum").replace("", "0")); return new SaturationPrompt(); } else { context.setSessionData(CK.E_SATURATION, (Integer) i); } } catch (NumberFormatException e) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("reqNotANumber").replace("", input)); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("reqNotANumber").replace("", input)); return new SaturationPrompt(); } } else { @@ -2283,13 +2497,15 @@ public class ActionFactory implements ConversationAbandonedListener { try { int i = Integer.parseInt(input); if (i < 0) { - ((Player) context.getForWhom()).sendMessage(ChatColor.RED + Lang.get("invalidMinimum").replace("", "0")); + ((Player) context.getForWhom()).sendMessage(ChatColor.RED + + Lang.get("invalidMinimum").replace("", "0")); return new HealthPrompt(); } else { context.setSessionData(CK.E_HEALTH, (Integer) i); } } catch (NumberFormatException e) { - context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("reqNotANumber").replace("", input)); + context.getForWhom().sendRawMessage(ChatColor.RED + + Lang.get("reqNotANumber").replace("", input)); return new HealthPrompt(); } } else { @@ -2343,7 +2559,8 @@ public class ActionFactory implements ConversationAbandonedListener { @Override public Prompt acceptInput(ConversationContext context, String input) { - if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { + if (input.equalsIgnoreCase(Lang.get("cmdCancel")) == false + && input.equalsIgnoreCase(Lang.get("cmdClear")) == false) { String[] commands = input.split(Lang.get("charSemi")); LinkedList cmdList = new LinkedList(); cmdList.addAll(Arrays.asList(commands)); diff --git a/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java b/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java index ab74668ee..066efc258 100644 --- a/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java +++ b/main/src/main/java/me/blackvein/quests/listeners/CmdExecutor.java @@ -185,7 +185,8 @@ public class CmdExecutor implements CommandExecutor { plugin.showObjectives(q, quester, false); } else { long time = plugin.getQuester(player.getUniqueId()).getStageTime(q); - String msg = ChatColor.YELLOW + "(" + Lang.get(player, "delay") + ") " + ChatColor.RED + Lang.get(player, "plnTooEarly"); + String msg = ChatColor.YELLOW + "(" + Lang.get(player, "delay") + ") " + ChatColor.RED + + Lang.get(player, "plnTooEarly"); msg = msg.replace("", q.getName()); msg = msg.replace("