From 524f48d3fbfccbaebe22e931a10d007b65e87bd1 Mon Sep 17 00:00:00 2001
From: PikaMug <unconfigured@null.spigotmc.org>
Date: Thu, 14 Nov 2019 02:30:49 -0500
Subject: [PATCH] Match quest/action name selection prompts

---
 .../main/java/me/blackvein/quests/QuestFactory.java   | 11 +++++------
 .../me/blackvein/quests/actions/ActionFactory.java    |  6 +++---
 main/src/main/resources/strings.yml                   |  1 -
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/main/src/main/java/me/blackvein/quests/QuestFactory.java b/main/src/main/java/me/blackvein/quests/QuestFactory.java
index 896ab073a..88d33dc6f 100644
--- a/main/src/main/java/me/blackvein/quests/QuestFactory.java
+++ b/main/src/main/java/me/blackvein/quests/QuestFactory.java
@@ -497,8 +497,7 @@ public class QuestFactory implements ConversationAbandonedListener {
         }
         
         public String getQueryText() {
-            return ChatColor.AQUA + Lang.get("questEditorCreate") + " " + ChatColor.GOLD + "- " 
-                    + Lang.get("questEditorEnterQuestName");
+            return Lang.get("questEditorEnterQuestName");
         }
         
         @Override
@@ -507,7 +506,7 @@ public class QuestFactory implements ConversationAbandonedListener {
                     = new QuestsEditorPostOpenSelectCreatePromptEvent(context);
             plugin.getServer().getPluginManager().callEvent(event);
             
-            String text = ChatColor.GOLD + getTitle()+ "\n" + getQueryText();
+            String text = ChatColor.GOLD + getTitle()+ "\n" + ChatColor.YELLOW + getQueryText();
             return text;
         }
 
@@ -543,9 +542,9 @@ public class QuestFactory implements ConversationAbandonedListener {
         public String getPromptText(ConversationContext context) {
             String s = ChatColor.GOLD + Lang.get("questEditTitle") + "\n";
             for (Quest q : plugin.getQuests()) {
-                s += ChatColor.GRAY + "- " + ChatColor.YELLOW + q.getName() + "\n";
+                s += ChatColor.GRAY + "- " + ChatColor.AQUA + q.getName() + "\n";
             }
-            return s + ChatColor.GOLD + Lang.get("questEditorEnterQuestName");
+            return s + ChatColor.YELLOW + Lang.get("questEditorEnterQuestName");
         }
 
         @Override
@@ -945,7 +944,7 @@ public class QuestFactory implements ConversationAbandonedListener {
         public String getPromptText(ConversationContext context) {
             String text = ChatColor.GOLD + Lang.get("questDeleteTitle") + "\n";
             for (Quest quest : plugin.getQuests()) {
-                text += ChatColor.AQUA + quest.getName() + ChatColor.YELLOW + ",";
+                text += ChatColor.AQUA + quest.getName() + ChatColor.GRAY + ",";
             }
             text = text.substring(0, text.length() - 1) + "\n";
             text += ChatColor.YELLOW + Lang.get("questEditorEnterQuestName");
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 07bd2ea54..8c75332fb 100644
--- a/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
+++ b/main/src/main/java/me/blackvein/quests/actions/ActionFactory.java
@@ -400,7 +400,7 @@ public class ActionFactory implements ConversationAbandonedListener {
 
         @Override
         public String getPromptText(ConversationContext context) {
-            String text = ChatColor.AQUA + Lang.get("eventEditorCreate") + ChatColor.GOLD + " - " 
+            String text = ChatColor.GOLD + Lang.get("eventEditorCreate") + "\n" + ChatColor.YELLOW
                     + Lang.get("eventEditorEnterEventName");
             return text;
         }
@@ -437,7 +437,7 @@ public class ActionFactory implements ConversationAbandonedListener {
         public String getPromptText(ConversationContext context) {
             String text = ChatColor.GOLD + "- " + Lang.get("eventEditorEdit") + " -\n";
             for (Action a : plugin.getActions()) {
-                text += ChatColor.AQUA + a.getName() + ChatColor.YELLOW + ", ";
+                text += ChatColor.AQUA + a.getName() + ChatColor.GRAY + ", ";
             }
             text = text.substring(0, text.length() - 2) + "\n";
             text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
@@ -562,7 +562,7 @@ public class ActionFactory implements ConversationAbandonedListener {
         public String getPromptText(ConversationContext context) {
             String text = ChatColor.GOLD + "- " + Lang.get("eventEditorDelete") + " -\n";
             for (Action a : plugin.getActions()) {
-                text += ChatColor.AQUA + a.getName() + ChatColor.YELLOW + ",";
+                text += ChatColor.AQUA + a.getName() + ChatColor.GRAY + ",";
             }
             text = text.substring(0, text.length() - 1) + "\n";
             text += ChatColor.YELLOW + Lang.get("eventEditorEnterEventName");
diff --git a/main/src/main/resources/strings.yml b/main/src/main/resources/strings.yml
index 487cde49a..2268a9be5 100644
--- a/main/src/main/resources/strings.yml
+++ b/main/src/main/resources/strings.yml
@@ -49,7 +49,6 @@ COMMAND_QUESTADMIN_REMOVE_HELP: "<command> [player] [quest] - Remove a completed
 COMMAND_QUESTADMIN_RELOAD: "reload"
 COMMAND_QUESTADMIN_RELOAD_HELP: "<command> - Safely reload the plugin"
 questEditorHeader: "Create Quest"
-questEditorCreate: "Create new Quest"
 questEditorEdit: "Edit a Quest"
 questEditorDelete: "Delete Quest"
 questEditorName: "Set name"