diff --git a/core/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java b/core/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java index ccec5950a..7ae3151d3 100644 --- a/core/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/conditions/tasks/EntityPrompt.java @@ -269,10 +269,8 @@ public class EntityPrompt extends ConditionsEditorNumericPrompt { final Set selectingNpcs = plugin.getQuestFactory().getSelectingNpcs(); selectingNpcs.add(((Player) context.getForWhom()).getUniqueId()); plugin.getQuestFactory().setSelectingNpcs(selectingNpcs); - return ChatColor.YELLOW + getQueryText(context) + "\n" + ChatColor.GOLD + Lang.get("npcHint"); - } else { - return ChatColor.YELLOW + getQueryText(context); } + return ChatColor.YELLOW + getQueryText(context); } @Override diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java index 9cc84cebb..6e165a858 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/options/OptionsPrompt.java @@ -92,9 +92,9 @@ public class OptionsPrompt extends QuestsEditorNumericPrompt { context.getPlugin().getServer().getPluginManager().callEvent(event); } - final StringBuilder text = new StringBuilder(ChatColor.DARK_GREEN + getTitle(context) + final StringBuilder text = new StringBuilder(ChatColor.DARK_GREEN + "- " + getTitle(context) .replace((String) Objects.requireNonNull(context.getSessionData(CK.Q_NAME)), ChatColor.AQUA - + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_GREEN)); + + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_GREEN) + " -"); for (int i = 1; i <= size; i++) { text.append("\n").append(getNumberColor(context, i)).append(ChatColor.BOLD).append(i) .append(ChatColor.RESET).append(" - ").append(getSelectionText(context, i)); diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/planner/PlannerPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/planner/PlannerPrompt.java index daeb7a2fb..d30a61944 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/planner/PlannerPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/planner/PlannerPrompt.java @@ -164,8 +164,9 @@ public class PlannerPrompt extends QuestsEditorNumericPrompt { } final String name = Objects.requireNonNull((String) context.getSessionData(CK.Q_NAME)); - final StringBuilder text = new StringBuilder(ChatColor.DARK_AQUA + getTitle(context) - .replace(name, ChatColor.AQUA + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_AQUA)); + final StringBuilder text = new StringBuilder(ChatColor.DARK_AQUA + "- " + getTitle(context) + .replace(name, ChatColor.AQUA + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_AQUA) + + " -"); for (int i = 1; i <= size; i++) { text.append("\n").append(getNumberColor(context, i)).append(ChatColor.BOLD).append(i) .append(ChatColor.RESET).append(" - ").append(getSelectionText(context, i)).append(" ") diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java index fce90af12..02a59fac0 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java @@ -360,9 +360,9 @@ public class RequirementsPrompt extends QuestsEditorNumericPrompt { context.getPlugin().getServer().getPluginManager().callEvent(event); } - final StringBuilder text = new StringBuilder(ChatColor.DARK_AQUA + getTitle(context).replace((String) Objects - .requireNonNull(context.getSessionData(CK.Q_NAME)), ChatColor.AQUA - + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_AQUA)); + final StringBuilder text = new StringBuilder(ChatColor.DARK_AQUA + "- " + getTitle(context) + .replace((String) Objects.requireNonNull(context.getSessionData(CK.Q_NAME)), ChatColor.AQUA + + (String) context.getSessionData(CK.Q_NAME) + ChatColor.DARK_AQUA) + " -"); for (int i = 1; i <= size; i++) { text.append("\n").append(getNumberColor(context, i)).append(ChatColor.BOLD).append(i) .append(ChatColor.RESET).append(" - ").append(getSelectionText(context, i)).append(" ") diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java index db08bb47e..2677dfa2a 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java @@ -379,9 +379,9 @@ public class RewardsPrompt extends QuestsEditorNumericPrompt { context.getPlugin().getServer().getPluginManager().callEvent(event); } - final StringBuilder text = new StringBuilder(ChatColor.LIGHT_PURPLE + getTitle(context).replace((String) Objects - .requireNonNull(context.getSessionData(CK.Q_NAME)), ChatColor.AQUA + (String) context - .getSessionData(CK.Q_NAME) + ChatColor.LIGHT_PURPLE)); + final StringBuilder text = new StringBuilder(ChatColor.LIGHT_PURPLE + "- " + getTitle(context) + .replace((String) Objects.requireNonNull(context.getSessionData(CK.Q_NAME)), ChatColor.AQUA + + (String) context.getSessionData(CK.Q_NAME) + ChatColor.LIGHT_PURPLE) + " -"); for (int i = 1; i <= size; i++) { text.append("\n").append(getNumberColor(context, i)).append(ChatColor.BOLD).append(i) .append(ChatColor.RESET).append(" - ").append(getSelectionText(context, i)).append(" ") diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java index 6f1d3ba8e..362f2f3be 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java @@ -686,7 +686,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { switch(number) { case 1: if (context.getSessionData(stagePrefix + CK.S_REACH_LOCATIONS) == null) { - return ChatColor.GRAY + " (" + Lang.get("noneSet") + ")"; + return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; } else { final StringBuilder text = new StringBuilder(); final List locations @@ -701,7 +701,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { } case 2: if (context.getSessionData(stagePrefix + CK.S_REACH_LOCATIONS_RADIUS) == null) { - return ChatColor.GRAY + " (" + Lang.get("noneSet") + ")"; + return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; } else { final StringBuilder text = new StringBuilder(); final List radius @@ -715,7 +715,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { } case 3: if (context.getSessionData(stagePrefix + CK.S_REACH_LOCATIONS_NAMES) == null) { - return ChatColor.GRAY + " (" + Lang.get("noneSet") + ")"; + return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; } else { final StringBuilder text = new StringBuilder(); final List names @@ -1051,7 +1051,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { switch(number) { case 1: if (context.getSessionData(stagePrefix + CK.S_PASSWORD_DISPLAYS) == null) { - return ChatColor.GRAY + " (" + Lang.get("noneSet") + ")"; + return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; } else { final StringBuilder text = new StringBuilder(); final List displays = (List) context.getSessionData(stagePrefix @@ -1066,7 +1066,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { } case 2: if (context.getSessionData(stagePrefix + CK.S_PASSWORD_PHRASES) == null) { - return ChatColor.GRAY + " (" + Lang.get("noneSet") + ")"; + return ChatColor.GRAY + "(" + Lang.get("noneSet") + ")"; } else { final StringBuilder text = new StringBuilder(); final List phrases = (List) context.getSessionData(stagePrefix diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml index 04cd5f9e3..0ea91f7e1 100644 --- a/core/src/main/resources/strings.yml +++ b/core/src/main/resources/strings.yml @@ -596,10 +596,10 @@ eventDeleteTitle: "- Delete Action -" conditionCreateTitle: "- Create Condition -" conditionEditTitle: "- Edit Condition -" conditionDeleteTitle: "- Delete Condition -" -requirementsTitle: "- | Requirements -" -rewardsTitle: "- | Rewards -" -plannerTitle: "- | Planner -" -optionsTitle: "- | Options -" +requirementsTitle: "Requirements | " +rewardsTitle: "Rewards | " +plannerTitle: "Planner | " +optionsTitle: "Options | " itemRequirementsTitle: "- Item Requirements -" itemRewardsTitle: "- Item Rewards -" permissionRewardsTitle: "- Permission Rewards -"