diff options
Diffstat (limited to 'bukkit/src/main/java')
| -rw-r--r-- | bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java | 4 | ||||
| -rw-r--r-- | bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java index acd01743..d81e6373 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/config/BukkitQuestsLoader.java @@ -550,14 +550,12 @@ public class BukkitQuestsLoader implements QuestsLoader { questsLogger.info(questItemRegistry.getAllItems().size() + " quest items have been registered."); } - private static final Pattern taskPlaceholderPattern = Pattern.compile("\\{([^}]+):(progress|complete|id)}"); - private void findInvalidTaskReferences(Quest quest, String s, List<ConfigProblem> configProblems, String location) { findInvalidTaskReferences(quest, s, configProblems, location, false); } private void findInvalidTaskReferences(Quest quest, String s, List<ConfigProblem> configProblems, String location, boolean allowByThis) { - Matcher matcher = taskPlaceholderPattern.matcher(s); + Matcher matcher = QItemStack.TASK_PLACEHOLDER_PATTERN.matcher(s); while (matcher.find()) { String taskIdPart = matcher.group(1); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java index e5455312..8c7d5793 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/itemstack/QItemStack.java @@ -132,14 +132,14 @@ public class QItemStack { return is; } - private static final Pattern taskPlaceholderPattern = Pattern.compile("\\{([^}]+):(progress|complete|id)}"); + public static final Pattern TASK_PLACEHOLDER_PATTERN = Pattern.compile("\\{([^}]+):(progress|goal|complete|id)}"); public static String processPlaceholders(String s, QuestProgress questProgress) { return processPlaceholders(s, questProgress, null); } public static String processPlaceholders(String s, QuestProgress questProgress, TaskProgress taskProgress) { - Matcher matcher = taskPlaceholderPattern.matcher(s); + Matcher matcher = TASK_PLACEHOLDER_PATTERN.matcher(s); while (matcher.find()) { TaskProgress matchedTaskProgress; @@ -173,6 +173,8 @@ public class QItemStack { } } + // TODO add goal + // completion placeholders case "complete" -> { boolean completed = matchedTaskProgress.isCompleted(); @@ -193,7 +195,7 @@ public class QItemStack { // update the matcher only if something needs to be replaced if (replacement != null) { s = s.substring(0, matcher.start()) + replacement + s.substring(matcher.end()); - matcher = taskPlaceholderPattern.matcher(s); + matcher = TASK_PLACEHOLDER_PATTERN.matcher(s); } } |
