From 6fa4329ac7f62c83585fe3c21c32a61a30a76425 Mon Sep 17 00:00:00 2001 From: HappyPikachu Date: Sun, 27 Aug 2017 21:36:02 -0400 Subject: [PATCH] Consistency with redo-delay --- src/main/java/me/blackvein/quests/NpcEffectThread.java | 2 +- src/main/java/me/blackvein/quests/Quester.java | 2 +- src/main/java/me/blackvein/quests/Quests.java | 4 ++-- .../java/me/blackvein/quests/prompts/QuestAcceptPrompt.java | 2 +- src/main/java/me/blackvein/quests/util/Lang.java | 2 +- src/main/resources/config.yml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/me/blackvein/quests/NpcEffectThread.java b/src/main/java/me/blackvein/quests/NpcEffectThread.java index 8720d2dee..f4cb60b3e 100644 --- a/src/main/java/me/blackvein/quests/NpcEffectThread.java +++ b/src/main/java/me/blackvein/quests/NpcEffectThread.java @@ -40,7 +40,7 @@ public class NpcEffectThread implements Runnable { if (plugin.hasQuest(npc, quester)) { showEffect(player, npc, Quests.effect); } else if (plugin.hasCompletedQuest(npc, quester)) { - showEffect(player, npc, Quests.repeatEffect); + showEffect(player, npc, Quests.redoEffect); } } } diff --git a/src/main/java/me/blackvein/quests/Quester.java b/src/main/java/me/blackvein/quests/Quester.java index 2bb4aac19..a60353a20 100644 --- a/src/main/java/me/blackvein/quests/Quester.java +++ b/src/main/java/me/blackvein/quests/Quester.java @@ -2504,7 +2504,7 @@ public class Quester { ItemMeta meta = display.getItemMeta(); if (completedQuests.contains(quests.get(i).name)) { meta.setDisplayName(ChatColor.DARK_PURPLE + Quests.parseString(quests.get(i).getName() - + " " + ChatColor.GREEN + Lang.get("completedTag"), npc)); + + " " + ChatColor.GREEN + Lang.get("redoCompleted"), npc)); } else { meta.setDisplayName(ChatColor.DARK_PURPLE + Quests.parseString(quests.get(i).getName(), npc)); } diff --git a/src/main/java/me/blackvein/quests/Quests.java b/src/main/java/me/blackvein/quests/Quests.java index 291025e16..f5dff3ec7 100644 --- a/src/main/java/me/blackvein/quests/Quests.java +++ b/src/main/java/me/blackvein/quests/Quests.java @@ -101,7 +101,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener public static int acceptTimeout = 20; public static int maxQuests = 0; public static String effect = "note"; - public static String repeatEffect = "angry_villager"; + public static String redoEffect = "angry_villager"; public final Map questers = new HashMap(); public final List questerBlacklist = new LinkedList(); public final List customRequirements = new LinkedList(); @@ -394,7 +394,7 @@ public class Quests extends JavaPlugin implements ConversationAbandonedListener genFilesOnJoin = config.getBoolean("generate-files-on-join", true); npcEffects = config.getBoolean("npc-effects.enabled", true); effect = config.getString("npc-effects.new-quest", "note"); - repeatEffect = config.getString("npc-effects.repeat-quest", "angry_villager"); + redoEffect = config.getString("npc-effects.redo-quest", "angry_villager"); killDelay = config.getInt("kill-delay", 600); acceptTimeout = config.getInt("accept-timeout", 20); convertData = config.getBoolean("convert-data-on-startup", false); diff --git a/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java b/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java index 44c8c9abc..1eedc55c2 100644 --- a/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java +++ b/src/main/java/me/blackvein/quests/prompts/QuestAcceptPrompt.java @@ -38,7 +38,7 @@ public class QuestAcceptPrompt extends StringPrompt { for (int i = 1; i <= quests.size(); i++) { Quest quest = quests.get(i - 1); if (quester.completedQuests.contains(quest.getName())) { - menu += ChatColor.DARK_GREEN + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.GREEN + "" + ChatColor.ITALIC + quest.getName() + ChatColor.RESET + "" + ChatColor.GREEN + " " + Lang.get("completedTag") + "\n"; + menu += ChatColor.DARK_GREEN + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.GREEN + "" + ChatColor.ITALIC + quest.getName() + ChatColor.RESET + "" + ChatColor.GREEN + " " + Lang.get("redoCompleted") + "\n"; } else { menu += ChatColor.GOLD + "" + ChatColor.BOLD + "" + i + ". " + ChatColor.RESET + "" + ChatColor.YELLOW + "" + ChatColor.ITALIC + quest.getName() + "\n"; } diff --git a/src/main/java/me/blackvein/quests/util/Lang.java b/src/main/java/me/blackvein/quests/util/Lang.java index 4b2f44a05..bb4bd3a40 100644 --- a/src/main/java/me/blackvein/quests/util/Lang.java +++ b/src/main/java/me/blackvein/quests/util/Lang.java @@ -753,7 +753,7 @@ public class Lang { langMap.put("shearSheep", "Shear sheep"); langMap.put("goTo", "Go to "); langMap.put("completed", "Completed"); - langMap.put("completedTag", "(Completed)"); + langMap.put("redoCompleted", "(Completed)"); // langMap.put("invalidSelection", "Invalid selection!"); langMap.put("noActiveQuest", "You do not currently have any active Quests."); diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a37598359..758ab6b74 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -12,7 +12,7 @@ kill-delay: 600 npc-effects: enabled: true new-quest: note - repeat-quest: angry_villager + redo-quest: angry_villager max-quests: 0 convert-data-on-startup: false quester-blacklist: