diff --git a/core/pom.xml b/core/pom.xml
index ee09efea3..9411c53fe 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -179,9 +179,9 @@
2.17.1
- com.github.Browsit
- ConversationAPI
- 158a0ee8e3
+ com.github.Browsit.ConversationAPI
+ conversation-bukkit
+ f5e587e641
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 7a36f1910..8ce02572f 100644
--- a/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
+++ b/core/src/main/java/me/pikamug/quests/BukkitQuestsPlugin.java
@@ -51,12 +51,10 @@ import me.pikamug.quests.tasks.BukkitNpcEffectThread;
import me.pikamug.quests.tasks.BukkitPlayerMoveThread;
import me.pikamug.quests.util.BukkitLang;
import me.pikamug.quests.util.BukkitUpdateChecker;
-import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import org.apache.logging.log4j.LogManager;
import org.browsit.conversations.api.Conversations;
+import org.browsit.conversations.bukkit.BukkitConversations;
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;
@@ -127,7 +125,7 @@ public class BukkitQuestsPlugin extends JavaPlugin implements Quests {
@Override
public void onEnable() {
/*----> WARNING: ORDER OF STEPS MATTERS <----*/
- Conversations.init(AdventureConversationsProvider.create((AudienceProvider) BukkitAudiences.create(this)));
+ BukkitConversations.init(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 110d4c84b..14709b471 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
@@ -6,8 +6,6 @@ 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;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
@@ -112,24 +110,22 @@ public class QuestAcceptPrompt {
} else {
quester.takeQuest(plugin.getQuestById(questIdToTake), false);
}
- return;
} else if (input.equalsIgnoreCase("2") || input.equalsIgnoreCase("n")
|| input.equalsIgnoreCase(BukkitLang.get("noWord"))
|| input.equalsIgnoreCase(BukkitLang.get(player, "noWord"))) {
BukkitLang.send(player, ChatColor.YELLOW + BukkitLang.get("cancelled"));
- return;
} else {
final String msg = BukkitLang.get(player, "questInvalidChoice")
.replace("", BukkitLang.get(player, "yesWord"))
.replace("", BukkitLang.get(player, "noWord"));
BukkitLang.send(player, ChatColor.RED + msg);
- return;
}
}
public void start() {
Conversations.create(uuid)
.prompt(getPromptText(uuid), String.class, prompt -> prompt
+ .converter(String::valueOf)
.fetch((input, sender) -> acceptInput(uuid, input)))
.start();
}