diff --git a/core/src/main/java/me/blackvein/quests/convo/misc/NpcOfferQuestPrompt.java b/core/src/main/java/me/blackvein/quests/convo/misc/NpcOfferQuestPrompt.java index 5cff1205a..908647969 100644 --- a/core/src/main/java/me/blackvein/quests/convo/misc/NpcOfferQuestPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/misc/NpcOfferQuestPrompt.java @@ -162,7 +162,7 @@ public class NpcOfferQuestPrompt extends MiscStringPrompt { for (int i = 1; i <= size + 1; i++) { final TextComponent choice = new TextComponent("\n" + getNumberColor(context, i) + ChatColor.BOLD + i + ". " + ChatColor.RESET + getSelectionText(context, i)); - choice.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, String.valueOf(i))); + choice.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + String.valueOf(i))); if (plugin.getSettings().canShowQuestReqs() && i <= size) { choice.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder(quests.get(i - 1).getDescription()).create())); diff --git a/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java b/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java index 9e08e17f9..6bff55283 100644 --- a/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/misc/QuestAbandonPrompt.java @@ -80,11 +80,11 @@ public class QuestAbandonPrompt extends MiscStringPrompt { final TextComponent component = new TextComponent(""); component.addExtra(ChatColor.YELLOW + getQueryText(context) + " " + ChatColor.GREEN); final TextComponent yes = new TextComponent(getSelectionText(context, 1)); - yes.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Lang.get("yesWord"))); + yes.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + Lang.get("yesWord"))); component.addExtra(yes); component.addExtra(ChatColor.RESET + " / "); final TextComponent no = new TextComponent(getSelectionText(context, 2)); - no.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, Lang.get("noWord"))); + no.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + Lang.get("noWord"))); component.addExtra(no); ((Player)context.getForWhom()).spigot().sendMessage(component); diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java index 510fdf1ce..b41c2de0c 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/requirements/RequirementsPrompt.java @@ -1497,7 +1497,7 @@ public class RequirementsPrompt extends QuestsEditorNumericPrompt { for (final String name : plugin.getCustomRequirements().stream().map(CustomRequirement::getModuleName) .collect(Collectors.toCollection(TreeSet::new))) { final TextComponent click = new TextComponent(ChatColor.DARK_PURPLE + " - " + name + "\n"); - click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, name)); + click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + name)); line.addExtra(click); } } @@ -1605,7 +1605,7 @@ public class RequirementsPrompt extends QuestsEditorNumericPrompt { if (co.getModuleName().equals(moduleName)) { final TextComponent click = new TextComponent(ChatColor.DARK_PURPLE + " - " + co.getName() + "\n"); - click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, co.getName())); + click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + co.getName())); line.addExtra(click); } } diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java index 0437fd8ed..1c6ec3fc2 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/rewards/RewardsPrompt.java @@ -1730,7 +1730,7 @@ public class RewardsPrompt extends QuestsEditorNumericPrompt { for (final String name : plugin.getCustomRewards().stream().map(CustomReward::getModuleName) .collect(Collectors.toCollection(TreeSet::new))) { final TextComponent click = new TextComponent(ChatColor.DARK_PURPLE + " - " + name + "\n"); - click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, name)); + click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + name)); line.addExtra(click); } } @@ -1838,7 +1838,7 @@ public class RewardsPrompt extends QuestsEditorNumericPrompt { if (co.getModuleName().equals(moduleName)) { final TextComponent click = new TextComponent(ChatColor.DARK_PURPLE + " - " + co.getName() + "\n"); - click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, co.getName())); + click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + co.getName())); line.addExtra(click); } } diff --git a/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java b/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java index 52bbf861b..e0fa80b6f 100644 --- a/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java +++ b/core/src/main/java/me/blackvein/quests/convo/quests/stages/StageMainPrompt.java @@ -2426,7 +2426,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { for (final String name : plugin.getCustomObjectives().stream().map(ICustomObjective::getModuleName) .collect(Collectors.toCollection(TreeSet::new))) { final TextComponent click = new TextComponent(ChatColor.DARK_PURPLE + " - " + name + "\n"); - click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, name)); + click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + name)); line.addExtra(click); } } @@ -2535,7 +2535,7 @@ public class StageMainPrompt extends QuestsEditorNumericPrompt { if (co.getModuleName().equals(moduleName)) { final TextComponent click = new TextComponent(ChatColor.DARK_PURPLE + " - " + co.getName() + "\n"); - click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, co.getName())); + click.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/quests choice " + co.getName())); line.addExtra(click); } } diff --git a/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java b/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java index e830231e0..f82951f90 100644 --- a/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java +++ b/core/src/main/java/me/blackvein/quests/logging/QuestsLog4JFilter.java @@ -43,6 +43,10 @@ public class QuestsLog4JFilter extends AbstractFilter { if (message.contains("quests-hikari - Shutdown")) { return Result.DENY; } + // Command for 1.19+ clickable text spam + if (message.contains("quests choice")) { + return Result.DENY; + } // Paper outputs errors when dependencies for module events are missing return (message.contains("Plugin Quests") && message.contains("failed to register events")) ? Result.DENY : Result.NEUTRAL;