diff options
3 files changed, 38 insertions, 16 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java index 8b36d01f..93aad6b2 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/element/QuestMenuElement.java @@ -85,6 +85,7 @@ public class QuestMenuElement extends MenuElement { } } placeholders.put("{quest}", Chat.legacyStrip(qItemStack.getName())); + placeholders.put("{questcolored}", qItemStack.getName()); placeholders.put("{questid}", quest.getId()); if (quests.size() > 1 && plugin.getConfig().getBoolean("options.gui-truncate-requirements", true)) { placeholders.put("{requirements}", quests.get(0) + Messages.UI_PLACEHOLDERS_TRUNCATED.getMessageLegacyColor().replace("{amount}", String.valueOf(quests.size() - 1))); @@ -98,6 +99,7 @@ public class QuestMenuElement extends MenuElement { } } else if (status == QuestStartResult.QUEST_ALREADY_COMPLETED) { placeholders.put("{quest}", Chat.legacyStrip(qItemStack.getName())); + placeholders.put("{questcolored}", qItemStack.getName()); placeholders.put("{questid}", quest.getId()); if (plugin.getQItemStackRegistry().hasQuestCompletedItemStack(quest)) { display = plugin.getQItemStackRegistry().getQuestCompletedItemStack(quest); @@ -106,6 +108,7 @@ public class QuestMenuElement extends MenuElement { } } else if (status == QuestStartResult.QUEST_NO_PERMISSION) { placeholders.put("{quest}", Chat.legacyStrip(qItemStack.getName())); + placeholders.put("{questcolored}", qItemStack.getName()); placeholders.put("{questid}", quest.getId()); if (plugin.getQItemStackRegistry().hasQuestPermissionItemStack(quest)) { display = plugin.getQItemStackRegistry().getQuestPermissionItemStack(quest); @@ -115,6 +118,7 @@ public class QuestMenuElement extends MenuElement { } else if (cooldown > 0) { placeholders.put("{time}", FormatUtils.time(TimeUnit.SECONDS.convert(cooldown, TimeUnit.MILLISECONDS))); placeholders.put("{quest}", Chat.legacyStrip(qItemStack.getName())); + placeholders.put("{questcolored}", qItemStack.getName()); placeholders.put("{questid}", quest.getId()); if (plugin.getQItemStackRegistry().hasQuestCooldownItemStack(quest)) { display = plugin.getQItemStackRegistry().getQuestCooldownItemStack(quest); diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java index 5c0356c3..d0fffa3d 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/questcontroller/NormalQuestController.java @@ -112,16 +112,17 @@ public class NormalQuestController implements QuestController { questProgress.setCompleted(false); if (player != null) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(quest); - String displayName = Chat.legacyStrip(qItemStack.getName()); - String questStartMessage = Messages.QUEST_START.getMessage().replace("{quest}", displayName); + String displayName = qItemStack.getName(); + String displayNameStripped = Chat.legacyStrip(displayName); + String questStartMessage = Messages.QUEST_START.getMessage().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName); // PlayerStartQuestEvent -- start PlayerStartQuestEvent questStartEvent = new PlayerStartQuestEvent(player, qPlayer, questProgress, questStartMessage); Bukkit.getPluginManager().callEvent(questStartEvent); // PlayerStartQuestEvent -- end Messages.send(questStartEvent.getQuestStartMessage(), player); if (config.getBoolean("options.titles-enabled")) { - plugin.getTitleHandle().sendTitle(player, Messages.TITLE_QUEST_START_TITLE.getMessageLegacyColor().replace("{quest}", displayName), - Messages.TITLE_QUEST_START_SUBTITLE.getMessageLegacyColor().replace("{quest}", displayName)); + plugin.getTitleHandle().sendTitle(player, Messages.TITLE_QUEST_START_TITLE.getMessageLegacyColor().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName), + Messages.TITLE_QUEST_START_SUBTITLE.getMessageLegacyColor().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName)); } for (String s : quest.getStartCommands()) { s = s.replace("{player}", player.getName()); @@ -222,8 +223,9 @@ public class NormalQuestController implements QuestController { Player player = Bukkit.getPlayer(qPlayer.getPlayerUUID()); if (player != null) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(quest); - String displayName = Chat.legacyStrip(qItemStack.getName()); - String questFinishMessage = Messages.QUEST_COMPLETE.getMessage().replace("{quest}", displayName); + String displayName = qItemStack.getName(); + String displayNameStripped = Chat.legacyStrip(displayName); + String questFinishMessage = Messages.QUEST_COMPLETE.getMessage().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName); // PlayerFinishQuestEvent -- start PlayerFinishQuestEvent questFinishEvent = new PlayerFinishQuestEvent(player, qPlayer, questProgress, questFinishMessage); Bukkit.getPluginManager().callEvent(questFinishEvent); @@ -240,8 +242,8 @@ public class NormalQuestController implements QuestController { }); Messages.send(questFinishEvent.getQuestFinishMessage(), player); if (config.getBoolean("options.titles-enabled")) { - plugin.getTitleHandle().sendTitle(player, Messages.TITLE_QUEST_COMPLETE_TITLE.getMessageLegacyColor().replace("{quest}", displayName), - Messages.TITLE_QUEST_COMPLETE_SUBTITLE.getMessageLegacyColor().replace("{quest}", displayName)); + plugin.getTitleHandle().sendTitle(player, Messages.TITLE_QUEST_COMPLETE_TITLE.getMessageLegacyColor().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName), + Messages.TITLE_QUEST_COMPLETE_SUBTITLE.getMessageLegacyColor().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName)); } for (String s : quest.getRewardString()) { if (plugin.getConfig().getBoolean("options.quests-use-placeholderapi")) { @@ -287,8 +289,9 @@ public class NormalQuestController implements QuestController { resetQuest(questProgress); if (player != null) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(quest); - String displayName = Chat.legacyStrip(qItemStack.getName()); - String questCancelMessage = Messages.QUEST_CANCEL.getMessage().replace("{quest}", displayName); + String displayName = qItemStack.getName(); + String displayNameStripped = Chat.legacyStrip(displayName); + String questCancelMessage = Messages.QUEST_CANCEL.getMessage().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName); // PlayerCancelQuestEvent -- start PlayerCancelQuestEvent questCancelEvent = new PlayerCancelQuestEvent(player, qPlayer, questProgress, questCancelMessage); Bukkit.getPluginManager().callEvent(questCancelEvent); @@ -328,8 +331,9 @@ public class NormalQuestController implements QuestController { resetQuest(questProgress); if (player != null) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(quest); - String displayName = Chat.legacyStrip(qItemStack.getName()); - String questExpireMessage = Messages.QUEST_EXPIRE.getMessage().replace("{quest}", displayName); + String displayName = qItemStack.getName(); + String displayNameStripped = Chat.legacyStrip(displayName); + String questExpireMessage = Messages.QUEST_EXPIRE.getMessage().replace("{quest}", displayNameStripped).replace("{questcolored}", displayName); // PlayerCancelQuestEvent -- start PlayerExpireQuestEvent questCancelEvent = new PlayerExpireQuestEvent(player, qPlayer, questProgress, questExpireMessage); Bukkit.getPluginManager().callEvent(questCancelEvent); @@ -370,17 +374,19 @@ public class NormalQuestController implements QuestController { Quest currentTrackedQuest; if (currentTrackedQuestId != null && (currentTrackedQuest = plugin.getQuestManager().getQuestById(currentTrackedQuestId)) != null) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(currentTrackedQuest); - String displayName = Chat.legacyStrip(qItemStack.getName()); - Messages.QUEST_TRACK_STOP.send(player, "{quest}", displayName); + String displayName = qItemStack.getName(); + String displayNameStripped = Chat.legacyStrip(displayName); + Messages.QUEST_TRACK_STOP.send(player, "{quest}", displayNameStripped, "{questcolored}", displayName); } } } else if (qPlayer.hasStartedQuest(quest)) { QItemStack qItemStack = plugin.getQItemStackRegistry().getQuestItemStack(quest); - String displayName = Chat.legacyStrip(qItemStack.getName()); + String displayName = qItemStack.getName(); + String displayNameStripped = Chat.legacyStrip(displayName); qPlayer.getPlayerPreferences().setTrackedQuestId(quest.getId()); if (player != null) { Bukkit.getPluginManager().callEvent(new PlayerStartTrackQuestEvent(player, qPlayer)); - Messages.QUEST_TRACK.send(player, "{quest}", displayName); + Messages.QUEST_TRACK.send(player, "{quest}", displayNameStripped, "{questcolored}", displayName); } } } diff --git a/docs/configuration/gui-configuration.md b/docs/configuration/gui-configuration.md index da3efc13..989810f0 100644 --- a/docs/configuration/gui-configuration.md +++ b/docs/configuration/gui-configuration.md @@ -123,6 +123,9 @@ gui: The `{quest}` variable represents the quest [display name](creating-a-quest#name), with its formatting stripped. +The `{questcolored}` variable represents the quest [display +name](creating-a-quest#name), with its formatting left as is. + The `{questid}` variable represents the quest ID. The `{requirements}` variable represents the display names of the quests @@ -153,6 +156,9 @@ gui: The `{quest}` variable represents the quest [display name](creating-a-quest#name), with its formatting stripped. +The `{questcolored}` variable represents the quest [display +name](creating-a-quest#name), with its formatting left as is. + The `{questid}` variable represents the quest ID. ## Quest cooldown display @@ -178,6 +184,9 @@ gui: The `{quest}` variable represents the quest [display name](creating-a-quest#name), with its formatting stripped. +The `{questcolored}` variable represents the quest [display +name](creating-a-quest#name), with its formatting left as is. + The `{questid}` variable represents the quest ID. The `{time}` variable represents the formatted time remaining until the @@ -206,6 +215,9 @@ gui: The `{quest}` variable represents the quest [display name](creating-a-quest#name), with its formatting stripped. +The `{questcolored}` variable represents the quest [display +name](creating-a-quest#name), with its formatting left as is. + The `{questid}` variable represents the quest ID. ## No started quests |