Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-06-26 06:35:01 +02:00
Code Issues Projects Releases Wiki Activity

Show input when name not found, fixes #2209

Browse Source
This commit is contained in:
PikaMug 2024-05-17 19:41:42 -04:00
parent 181f4e0dec
commit 9f26e9d053
13 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/me/pikamug/quests/commands/quest/BukkitQuestCommandHandler.java
View File

@ -221,7 +221,7 @@ public class BukkitQuestCommandHandler {
}
}
} else {
cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("questNotFound"));
cs.sendMessage(ChatColor.YELLOW + BukkitLang.get("questNotFound").replace("<input>", name.toString()));
}
} else {
cs.sendMessage(ChatColor.RED + BukkitLang.get("noPermission"));

6
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminFinishCommand.java
View File

@ -90,9 +90,11 @@ public class BukkitQuestadminFinishCommand extends BukkitQuestsSubCommand {
msg = msg.replace("<player>", 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("<input>", questName != null ? questName : ""));
return;
}
String msg1 = BukkitLang.get("questForceFinish");

2
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminGiveCommand.java
View File

@ -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("<input>", name.toString()));
} else {
final Quester quester = plugin.getQuester(target.getUniqueId());
for (final Quest q : quester.getCurrentQuests().keySet()) {

6
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminNextstageCommand.java
View File

@ -90,9 +90,11 @@ public class BukkitQuestadminNextstageCommand extends BukkitQuestsSubCommand {
msg = msg.replace("<player>", 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("<input>", questName != null ? questName : ""));
return;
}
String msg1 = BukkitLang.get("questForceNextStage");

6
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminQuitCommand.java
View File

@ -90,9 +90,11 @@ public class BukkitQuestadminQuitCommand extends BukkitQuestsSubCommand {
msg = msg.replace("<player>", 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("<input>", questName != null ? questName : ""));
return;
}
String msg1 = BukkitLang.get("questForceQuit");

6
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminRemoveCommand.java
View File

@ -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("<input>", questName != null ? questName : ""));
return;
}
final Quester quester = plugin.getQuester(target.getUniqueId());

4
core/src/main/java/me/pikamug/quests/commands/questadmin/subcommands/BukkitQuestadminSetstageCommand.java
View File

@ -97,9 +97,11 @@ public class BukkitQuestadminSetstageCommand extends BukkitQuestsSubCommand {
msg = msg.replace("<player>", 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("<input>", questName != null ? questName : ""));
return;
}
if (!quester.getCurrentQuests().containsKey(quest)) {

4
core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsQuitCommand.java
View File

@ -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("<input>", questName != null ? questName : ""));
}
} else {
BukkitLang.send(player, ChatColor.YELLOW + BukkitLang.get(player, "noActiveQuest"));

8
core/src/main/java/me/pikamug/quests/commands/quests/subcommands/BukkitQuestsTakeCommand.java
View File

@ -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("<input>", questToFindName != null ? questToFindName : ""));
}
} else {
BukkitLang.send(player, ChatColor.RED + BukkitLang.get(player, "noPermission"));

6
core/src/main/java/me/pikamug/quests/convo/actions/menu/ActionMenuPrompt.java
View File

@ -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>", 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>", input));
return new ActionSelectDeletePrompt(context);
} else {
return new ActionMenuPrompt(context);

6
core/src/main/java/me/pikamug/quests/convo/conditions/menu/ConditionMenuPrompt.java
View File

@ -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>", 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>", input));
return new ConditionSelectDeletePrompt(context);
} else {
return new ConditionMenuPrompt(context);

6
core/src/main/java/me/pikamug/quests/convo/quests/menu/QuestMenuPrompt.java
View File

@ -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>", 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>", input));
return new QuestSelectDeletePrompt(context);
} else {
return new QuestMenuPrompt(context);

7
core/src/main/resources/strings.yml
View File

@ -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 '<input>' 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 '<input>' not found."
conditionEditorExists: "Condition already exists!"
conditionEditorInUse: "The following quests use the condition"
conditionEditorEnterName: "Enter condition name, <cancel>"
@ -666,7 +665,7 @@ mcMMOLevel: "level"
haveCompleted: "You have completed %purple%<quest>"
mustComplete: "Must complete <quest>"
cannotComplete: "Cannot complete %purple%<quest>"
questNotFound: "Quest not found."
questNotFound: "Quest '<input>' not found."
alreadyConversing: "You are already in a conversation!"
inputNum: "Input must be a number."
inputPosNum: "Input must be a positive number."