Upstream
/
Quests
mirror of https://github.com/PikaMug/Quests.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve NPC UUID prompts

This commit is contained in:
PikaMug 2023-03-01 21:39:57 -05:00
parent 447023626e
commit 9b3736be87
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
core/src/main/java/me/blackvein/quests/convo/conditions/tasks/ConditionEntityPrompt.java
View File

@ -16,6 +16,7 @@ import me.blackvein.quests.Quests;
import me.blackvein.quests.convo.conditions.ConditionsEditorNumericPrompt;
import me.blackvein.quests.convo.conditions.ConditionsEditorStringPrompt;
import me.blackvein.quests.convo.conditions.main.ConditionMainPrompt;
import me.blackvein.quests.convo.quests.objectives.QuestNpcsPrompt;
import me.blackvein.quests.events.editor.conditions.ConditionsEditorPostOpenNumericPromptEvent;
import me.blackvein.quests.events.editor.conditions.ConditionsEditorPostOpenStringPromptEvent;
import me.blackvein.quests.util.CK;
@ -259,37 +260,38 @@ public class ConditionEntityPrompt extends ConditionsEditorNumericPrompt {
final Set<UUID> selectingNpcs = plugin.getQuestFactory().getSelectingNpcs();
selectingNpcs.add(((Player) context.getForWhom()).getUniqueId());
plugin.getQuestFactory().setSelectingNpcs(selectingNpcs);
return ChatColor.YELLOW + Lang.get("questEditorClickNPCStart");
} else {
return ChatColor.YELLOW + getQueryText(context);
}
return ChatColor.YELLOW + getQueryText(context);
}
@Override
@SuppressWarnings("unchecked")
public Prompt acceptInput(final @NotNull ConversationContext context, final String input) {
if (input == null) {
return null;
}
if (!input.equalsIgnoreCase(Lang.get("cmdCancel"))) {
final LinkedList<UUID> npcUuids = new LinkedList<>();
try {
for (final String s : input.split(" ")) {
try {
final UUID u = UUID.fromString(s);
if (plugin.getDependencies().getNPCEntity(u) == null) {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("questEditorInvalidNPC"));
return new ConditionNpcsPrompt(context);
}
npcUuids.add(u);
context.setSessionData(CK.C_WHILE_RIDING_NPC, npcUuids);
} catch (Exception e) {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("questEditorInvalidNPC"));
final LinkedList<String> npcs = context.getSessionData(CK.C_WHILE_RIDING_NPC) != null
? (LinkedList<String>) context.getSessionData(CK.C_WHILE_RIDING_NPC) : new LinkedList<>();
for (final String s : input.split(" ")) {
try {
final UUID uuid = UUID.fromString(s);
if (plugin.getDependencies().getNPCEntity(uuid) != null && npcs != null) {
npcs.add(uuid.toString());
} else {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorInvalidNPC")
.replace("<input>", s));
return new ConditionNpcsPrompt(context);
}
} catch (final IllegalArgumentException e) {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorNotListOfUniqueIds")
.replace("<data>", input));
return new ConditionNpcsPrompt(context);
}
} catch (final NumberFormatException e) {
context.getForWhom().sendRawMessage(ChatColor.RED
+ Lang.get("reqNotANumber").replace("<input>", input));
return new ConditionNpcsPrompt(context);
}
context.setSessionData(CK.C_WHILE_RIDING_NPC, npcs);
}
if (context.getForWhom() instanceof Player) {
final Set<UUID> selectingNpcs = plugin.getQuestFactory().getSelectingNpcs();

3
core/src/main/java/me/blackvein/quests/convo/quests/main/QuestMainPrompt.java
View File

@ -504,7 +504,8 @@ public class QuestMainPrompt extends QuestsEditorNumericPrompt {
try {
final UUID uuid = UUID.fromString(input);
if (plugin.getDependencies().getNPCEntity(uuid) == null) {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("questEditorInvalidNPC"));
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorInvalidNPC")
.replace("<input>", input));
return new QuestNPCStartPrompt(context);
}
context.setSessionData(CK.Q_START_NPC, uuid.toString());

13
core/src/main/java/me/blackvein/quests/convo/quests/objectives/QuestNpcsPrompt.java
View File

@ -449,10 +449,9 @@ public class QuestNpcsPrompt extends QuestsEditorNumericPrompt {
return null;
}
if (!input.equalsIgnoreCase(Lang.get("cmdCancel"))) {
final String[] args = input.split(" ");
final LinkedList<String> npcs = context.getSessionData(pref + CK.S_DELIVERY_NPCS) != null
? (LinkedList<String>) context.getSessionData(pref + CK.S_DELIVERY_NPCS) : new LinkedList<>();
for (final String s : args) {
for (final String s : input.split(" ")) {
try {
final UUID uuid = UUID.fromString(s);
if (plugin.getDependencies().getNPCEntity(uuid) != null && npcs != null) {
@ -464,7 +463,7 @@ public class QuestNpcsPrompt extends QuestsEditorNumericPrompt {
}
} catch (final IllegalArgumentException e) {
context.getForWhom().sendRawMessage(ChatColor.RED + Lang.get("stageEditorNotListOfUniqueIds")
.replace("<data>", s));
.replace("<data>", input));
return new QuestNpcDeliveryNpcsPrompt(context);
}
}
@ -479,9 +478,11 @@ public class QuestNpcsPrompt extends QuestsEditorNumericPrompt {
}
context.setSessionData(pref + CK.S_DELIVERY_MESSAGES, messages);
}
final Set<UUID> selectingNpcs = plugin.getQuestFactory().getSelectingNpcs();
selectingNpcs.remove(((Player) context.getForWhom()).getUniqueId());
plugin.getQuestFactory().setSelectingNpcs(selectingNpcs);
if (context.getForWhom() instanceof Player) {
final Set<UUID> selectingNpcs = plugin.getQuestFactory().getSelectingNpcs();
selectingNpcs.remove(((Player) context.getForWhom()).getUniqueId());
plugin.getQuestFactory().setSelectingNpcs(selectingNpcs);
}
return new QuestNpcsDeliveryListPrompt(context);
}
}

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

@ -93,7 +93,6 @@ questDeleted: "Quest deleted! Quest and action data has been reloaded."
questEditorNameExists: "A quest with that name already exists!"
questEditorBeingEdited: "Something with that name is already being modified!"
questEditorInvalidQuestName: "Name may not contain periods or commas!"
questEditorInvalidNPC: "No NPC exists with that ID!"
questEditorNoStartBlockSelected: "You must select a block first."
questEditorPositiveAmount: "Amount must be a positive number."
questEditorQuestAsRequirement1: "The following quests have"