From 4e47e9a13360c69a2de1f2558ed2ee362826a56d Mon Sep 17 00:00:00 2001 From: Chew Date: Mon, 21 Jul 2025 00:53:08 -0500 Subject: [PATCH 1/2] fix components v2 again --- build.gradle | 2 +- .../menu/ButtonEmbedPaginator.java | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index a2f92b24..93633fb7 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ allprojects { version = versionInfo.values().join('.') ext { - jdaVersion = '5.3.0' + jdaVersion = '6.0.0-rc.1' slf4jVersion = '1.7.36' okhttpVersion = '4.9.3' findbugsVersion = '3.0.2' diff --git a/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonEmbedPaginator.java b/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonEmbedPaginator.java index e70e5d5d..8395feed 100644 --- a/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonEmbedPaginator.java +++ b/menu/src/main/java/com/jagrosh/jdautilities/menu/ButtonEmbedPaginator.java @@ -17,6 +17,9 @@ import com.jagrosh.jdautilities.commons.waiter.EventWaiter; import net.dv8tion.jda.api.EmbedBuilder; +import net.dv8tion.jda.api.components.actionrow.ActionRow; +import net.dv8tion.jda.api.components.buttons.Button; +import net.dv8tion.jda.api.components.buttons.ButtonStyle; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.entities.Role; @@ -25,8 +28,6 @@ import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; import net.dv8tion.jda.api.interactions.InteractionHook; -import net.dv8tion.jda.api.interactions.components.buttons.Button; -import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; import net.dv8tion.jda.api.requests.RestAction; import net.dv8tion.jda.api.utils.messages.MessageCreateData; import net.dv8tion.jda.api.utils.messages.MessageEditBuilder; @@ -169,19 +170,20 @@ else if (pageNum > embeds.size()) private void initialize(RestAction action, int pageNum) { action.queue(m -> { if (embeds.size() > 1) { - List