From 9f26e9d0537ae3b435e9246685444bb7c1f815b5 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Fri, 17 May 2024 19:41:42 -0400
Subject: [PATCH] Show input when name not found, fixes #2209
---
.../quests/commands/quest/BukkitQuestCommandHandler.java | 2 +-
.../subcommands/BukkitQuestadminFinishCommand.java | 6 ++++--
.../subcommands/BukkitQuestadminGiveCommand.java | 2 +-
.../subcommands/BukkitQuestadminNextstageCommand.java | 6 ++++--
.../subcommands/BukkitQuestadminQuitCommand.java | 6 ++++--
.../subcommands/BukkitQuestadminRemoveCommand.java | 6 ++++--
.../subcommands/BukkitQuestadminSetstageCommand.java | 4 +++-
.../quests/subcommands/BukkitQuestsQuitCommand.java | 4 +++-
.../quests/subcommands/BukkitQuestsTakeCommand.java | 8 +++++---
.../quests/convo/actions/menu/ActionMenuPrompt.java | 6 ++++--
.../quests/convo/conditions/menu/ConditionMenuPrompt.java | 6 ++++--
.../pikamug/quests/convo/quests/menu/QuestMenuPrompt.java | 6 ++++--
core/src/main/resources/strings.yml | 7 +++----
13 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/core/src/main/java/me/pikamug/quests/commands/quest/BukkitQuestCommandHandler.java b/core/src/main/java/me/pikamug/quests/commands/quest/BukkitQuestCommandHandler.java
index 4b14d157f..d58439a5f 100644
--- a/core/src/main/java/me/pikamug/quests/commands/quest/BukkitQuestCommandHandler.java
+++ b/core/src/main/java/me/pikamug/quests/commands/quest/BukkitQuestCommandHandler.java
@@ -221,7 +221,7 @@ public class BukkitQuestCommandHandler {
}
}
} else {
- cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("questNotFound").replace("", name.toString()));
}
} else {
cs.sendMessage(ChatColor.RED + BukkitLang.get("noPermission"));
diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java
index f0cd76a0e..af80aebed 100644
--- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java
@@ -90,9 +90,11 @@ public class BukkitQuestadminFinishCommand extends BukkitQuestsSubCommand {
msg = msg.replace("", target.getName());
cs.sendMessage(ChatColor.YELLOW + msg);
} else {
- final Quest quest = plugin.getQuest(concatArgArray(args, 2, args.length - 1, ' '));
+ final String questName = concatArgArray(args, 2, args.length - 1, ' ');
+ final Quest quest = plugin.getQuest(questName);
if (quest == null) {
- cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", questName != null ? questName : ""));
return;
}
String msg1 = BukkitLang.get("questForceFinish");
diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java
index bba784afd..533a24531 100644
--- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java
@@ -99,7 +99,7 @@ public class BukkitQuestadminGiveCommand extends BukkitQuestsSubCommand {
}
questToGive = plugin.getQuest(name.toString());
if (questToGive == null) {
- cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("questNotFound").replace("", name.toString()));
} else {
final Quester quester = plugin.getQuester(target.getUniqueId());
for (final Quest q : quester.getCurrentQuests().keySet()) {
diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java
index b40185d5b..07ca2eb90 100644
--- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java
@@ -90,9 +90,11 @@ public class BukkitQuestadminNextstageCommand extends BukkitQuestsSubCommand {
msg = msg.replace("", target.getName());
cs.sendMessage(ChatColor.YELLOW + msg);
} else {
- final Quest quest = plugin.getQuest(concatArgArray(args, 2, args.length - 1, ' '));
+ final String questName = concatArgArray(args, 2, args.length - 1, ' ');
+ final Quest quest = plugin.getQuest(questName);
if (quest == null) {
- cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", questName != null ? questName : ""));
return;
}
String msg1 = BukkitLang.get("questForceNextStage");
diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminQuitCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminQuitCommand.java
index dda9cc480..1ee51b3ee 100644
--- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminQuitCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminQuitCommand.java
@@ -90,9 +90,11 @@ public class BukkitQuestadminQuitCommand extends BukkitQuestsSubCommand {
msg = msg.replace("", target.getName());
cs.sendMessage(ChatColor.YELLOW + msg);
} else {
- final Quest quest = plugin.getQuest(concatArgArray(args, 2, args.length - 1, ' '));
+ final String questName = concatArgArray(args, 2, args.length - 1, ' ');
+ final Quest quest = plugin.getQuest(questName);
if (quest == null) {
- cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", questName != null ? questName : ""));
return;
}
String msg1 = BukkitLang.get("questForceQuit");
diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminRemoveCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminRemoveCommand.java
index 066b17aa6..b5e9e04cb 100644
--- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminRemoveCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminRemoveCommand.java
@@ -84,9 +84,11 @@ public class BukkitQuestadminRemoveCommand extends BukkitQuestsSubCommand {
cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("playerNotFound"));
return;
}
- final Quest toRemove = plugin.getQuest(concatArgArray(args, 2, args.length - 1, ' '));
+ final String questName = concatArgArray(args, 2, args.length - 1, ' ');
+ final Quest toRemove = plugin.getQuest(questName);
if (toRemove == null) {
- cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", questName != null ? questName : ""));
return;
}
final Quester quester = plugin.getQuester(target.getUniqueId());
diff --git a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java
index 7d31d7274..f7577db3e 100644
--- a/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java
@@ -97,9 +97,11 @@ public class BukkitQuestadminSetstageCommand extends BukkitQuestsSubCommand {
msg = msg.replace("", target.getName());
cs.sendMessage(ChatColor.YELLOW + msg);
} else {
+ final String questName = concatArgArray(args, 2, args.length - 2, ' ');
final Quest quest = plugin.getQuest(concatArgArray(args, 2, args.length - 2, ' '));
if (quest == null) {
- cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound"));
+ cs.sendMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", questName != null ? questName : ""));
return;
}
if (!quester.getCurrentQuests().containsKey(quest)) {
diff --git a/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsQuitCommand.java b/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsQuitCommand.java
index c1e96861c..8102464a6 100644
--- a/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsQuitCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsQuitCommand.java
@@ -75,6 +75,7 @@ public class BukkitQuestsQuitCommand extends BukkitQuestsSubCommand {
if (player.hasPermission(getPermission())) {
final Quester quester = plugin.getQuester(player.getUniqueId());
if (!quester.getCurrentQuests().isEmpty()) {
+ final String questName = concatArgArray(args, 1, args.length - 1, ' ');
final Quest quest = plugin.getQuest(concatArgArray(args, 1, args.length - 1, ' '));
if (quest != null) {
if (quest.getOptions().canAllowQuitting()) {
@@ -85,7 +86,8 @@ public class BukkitQuestsQuitCommand extends BukkitQuestsSubCommand {
BukkitLang.send(player, ChatColor.YELLOW + BukkitLang.get(player, "questQuitDisabled"));
}
} else {
- BukkitLang.send(player, ChatColor.RED + BukkitLang.get(player, "questNotFound"));
+ BukkitLang.send(player, ChatColor.RED + BukkitLang.get(player, "questNotFound")
+ .replace("", questName != null ? questName : ""));
}
} else {
BukkitLang.send(player, ChatColor.YELLOW + BukkitLang.get(player, "noActiveQuest"));
diff --git a/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsTakeCommand.java b/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsTakeCommand.java
index da3504d7b..2cc448d9e 100644
--- a/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsTakeCommand.java
+++ b/core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsTakeCommand.java
@@ -73,9 +73,10 @@ public class BukkitQuestsTakeCommand extends BukkitQuestsSubCommand {
final Player player = (Player) cs;
if (plugin.getConfigSettings().canAllowCommands()) {
if (player.hasPermission(getPermission())) {
- final Quest questToFind = plugin.getQuest(concatArgArray(args, 1, args.length - 1, ' '));
- final Quester quester = plugin.getQuester(player.getUniqueId());
+ final String questToFindName = concatArgArray(args, 1, args.length - 1, ' ');
+ final Quest questToFind = plugin.getQuest(questToFindName);
if (questToFind != null) {
+ final Quester quester = plugin.getQuester(player.getUniqueId());
for (final Quest q : quester.getCurrentQuests().keySet()) {
if (q.getId().equals(questToFind.getId())) {
BukkitLang.send(player, ChatColor.RED + BukkitLang.get(player, "questAlreadyOn"));
@@ -84,7 +85,8 @@ public class BukkitQuestsTakeCommand extends BukkitQuestsSubCommand {
}
quester.offerQuest(questToFind, true);
} else {
- BukkitLang.send(player, ChatColor.YELLOW + BukkitLang.get(player, "questNotFound"));
+ BukkitLang.send(player, ChatColor.YELLOW + BukkitLang.get(player, "questNotFound")
+ .replace("", questToFindName != null ? questToFindName : ""));
}
} else {
BukkitLang.send(player, ChatColor.RED + BukkitLang.get(player, "noPermission"));
diff --git a/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java b/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
index 4aed2b28d..808dfc158 100644
--- a/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
+++ b/core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
@@ -251,7 +251,8 @@ public class ActionMenuPrompt extends ActionsEditorNumericPrompt {
plugin.getActionFactory().loadData(context, action);
return new ActionMainPrompt(context);
}
- context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("eventEditorNotFound"));
+ context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("eventEditorNotFound")
+ .replace("", input));
return new ActionSelectEditPrompt(context);
} else {
return new ActionMenuPrompt(context);
@@ -316,7 +317,8 @@ public class ActionMenuPrompt extends ActionsEditorNumericPrompt {
return new ActionSelectDeletePrompt(context);
}
}
- context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("eventEditorNotFound"));
+ context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("eventEditorNotFound")
+ .replace("", input));
return new ActionSelectDeletePrompt(context);
} else {
return new ActionMenuPrompt(context);
diff --git a/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java b/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
index 03f515de5..eaf1745d7 100644
--- a/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
+++ b/core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
@@ -251,7 +251,8 @@ public class ConditionMenuPrompt extends ConditionsEditorNumericPrompt {
plugin.getConditionFactory().loadData(context, c);
return new ConditionMainPrompt(context);
}
- context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("conditionEditorNotFound"));
+ context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("conditionEditorNotFound")
+ .replace("", input));
return new ConditionSelectEditPrompt(context);
} else {
return new ConditionMenuPrompt(context);
@@ -317,7 +318,8 @@ public class ConditionMenuPrompt extends ConditionsEditorNumericPrompt {
return new ConditionSelectDeletePrompt(context);
}
}
- context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("conditionEditorNotFound"));
+ context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("conditionEditorNotFound")
+ .replace("", input));
return new ConditionSelectDeletePrompt(context);
} else {
return new ConditionMenuPrompt(context);
diff --git a/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java b/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
index 2b9f362e9..c58baa112 100644
--- a/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
+++ b/core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
@@ -235,7 +235,8 @@ public class QuestMenuPrompt extends QuestsEditorNumericPrompt {
plugin.getQuestFactory().loadQuest(context, q);
return new QuestMainPrompt(context);
}
- context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questEditorQuestNotFound"));
+ context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", input));
return new QuestSelectEditPrompt(context);
} else {
return new QuestMenuPrompt(context);
@@ -300,7 +301,8 @@ public class QuestMenuPrompt extends QuestsEditorNumericPrompt {
return new QuestSelectDeletePrompt(context);
}
}
- context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questEditorQuestNotFound"));
+ context.getForWhom().sendRawMessage(ChatColor.RED + BukkitLang.get("questNotFound")
+ .replace("", input));
return new QuestSelectDeletePrompt(context);
} else {
return new QuestMenuPrompt(context);
diff --git a/core/src/main/resources/strings.yml b/core/src/main/resources/strings.yml
index 01dcc8b11..fdfff1d0c 100644
--- a/core/src/main/resources/strings.yml
+++ b/core/src/main/resources/strings.yml
@@ -90,7 +90,6 @@ questEditorPositiveAmount: "Amount must be a positive number."
questEditorQuestAsRequirement1: "The following quests have"
questEditorQuestAsRequirement2: "as a requirement:"
questEditorQuestAsRequirement3: "You must modify these quests so that they do not use it before deleting it."
-questEditorQuestNotFound: "Quest not found!"
questEditorSave: "Finish and save?"
questEditorNeedAskMessage: "You must set an ask message!"
questEditorNeedFinishMessage: "You must set a finish message!"
@@ -253,7 +252,7 @@ eventEditorEdit: "Edit an action"
eventEditorDelete: "Delete an action"
eventEditorNoneToEdit: "No actions currently exist to be edited!"
eventEditorNoneToDelete: "No actions currently exist to be deleted!"
-eventEditorNotFound: "Action not found!"
+eventEditorNotFound: "Action '' not found."
eventEditorExists: "Action already exists!"
eventEditorDeleted: "Action deleted. Quest and action data reloaded."
eventEditorSaved: "Action saved. Quest and action data reloaded."
@@ -368,7 +367,7 @@ conditionEditorEdit: "Edit a condition"
conditionEditorDelete: "Delete a condition"
conditionEditorNoneToEdit: "No conditions currently exist to be edited!"
conditionEditorNoneToDelete: "No conditions currently exist to be deleted!"
-conditionEditorNotFound: "Condition not found!"
+conditionEditorNotFound: "Condition '' not found."
conditionEditorExists: "Condition already exists!"
conditionEditorInUse: "The following quests use the condition"
conditionEditorEnterName: "Enter condition name, "
@@ -666,7 +665,7 @@ mcMMOLevel: "level"
haveCompleted: "You have completed %purple%"
mustComplete: "Must complete "
cannotComplete: "Cannot complete %purple%"
-questNotFound: "Quest not found."
+questNotFound: "Quest '' not found."
alreadyConversing: "You are already in a conversation!"
inputNum: "Input must be a number."
inputPosNum: "Input must be a positive number."