From c5c7bafa8f3be68f2beb9f065790e75655393cfe Mon Sep 17 00:00:00 2001 From: PikaMug <2267126+PikaMug@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:03:24 -0500 Subject: [PATCH] Update for latest Conversations --- core/pom.xml | 2 +- .../main/java/me/pikamug/quests/BukkitQuestsPlugin.java | 4 +++- .../me/pikamug/quests/convo/misc/QuestAcceptPrompt.java | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index fae7d22c3..ee09efea3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -181,7 +181,7 @@ com.github.Browsit ConversationAPI - 67983728aa + 158a0ee8e3 me.pikamug.quests diff --git a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java index 3d599a722..7a36f1910 100644 --- a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java +++ b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java @@ -55,6 +55,8 @@ import net.kyori.adventure.platform.bukkit.BukkitAudiences; import org.apache.logging.log4j.LogManager; import org.browsit.conversations.api.Conversations; import org.browsit.conversations.bukkit.BukkitConversationsForwarder; +import org.browsit.conversations.impl.provider.AdventureConversationsProvider; +import org.browsit.libs.kyori.adventure.platform.AudienceProvider; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -125,7 +127,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests { @Override public void onEnable() { /*----> WARNING: ORDER OF STEPS MATTERS <----*/ - Conversations.init(BukkitAudiences.create(this)); + Conversations.init(AdventureConversationsProvider.create((AudienceProvider) BukkitAudiences.create(this))); new BukkitConversationsForwarder().register(this); // 1 - Trigger server to initialize Legacy Material Support diff --git a/core/src/main/java/me/pikamug/quests/convo/misc/QuestAcceptPrompt.java b/core/src/main/java/me/pikamug/quests/convo/misc/QuestAcceptPrompt.java index 58914c112..110d4c84b 100644 --- a/core/src/main/java/me/pikamug/quests/convo/misc/QuestAcceptPrompt.java +++ b/core/src/main/java/me/pikamug/quests/convo/misc/QuestAcceptPrompt.java @@ -5,6 +5,7 @@ import me.pikamug.quests.player.Quester; import me.pikamug.quests.util.BukkitLang; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; +import org.browsit.conversations.api.Conversations; import org.browsit.conversations.api.action.Prompt; import org.browsit.conversations.api.data.Conversation; import org.bukkit.Bukkit; @@ -127,9 +128,9 @@ public class QuestAcceptPrompt { } public void start() { - new Conversation(uuid) - .prompt(new Prompt(getPromptText(uuid)) + Conversations.create(uuid) + .prompt(getPromptText(uuid), String.class, prompt -> prompt .fetch((input, sender) -> acceptInput(uuid, input))) - .run(); + .start(); } }