feat: update to JDA 6.0

Author: RedVortexDev

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    implementation ("net.dv8tion:JDA:5.0.0-beta.20") {
+    implementation ("net.dv8tion:JDA:6.1.0") {
         exclude(module = "opus-java")
     }
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/codeblock/AbstractSingleQueryCommand.java

@@ -12,11 +12,11 @@
 import com.diamondfire.helpbot.df.codeinfo.viewables.BasicReaction;
 import com.diamondfire.helpbot.sys.interaction.button.ButtonHandler;
 import com.diamondfire.helpbot.util.*;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 
 import java.util.*;
 import java.util.function.BiConsumer;
@@ -50,19 +50,19 @@ public static void sendMultipleMessage(List<CodeObject> actions, GuildMessageCha
                 Button button = Button.secondary(reaction.getKey().toString(), reaction.getValue().getName());
 
                 buttons.add(button.withEmoji(Emoji.fromCustom(reaction.getKey().getEmote())));
-                buttonMap.put(button.getId(), reaction.getValue());
+                buttonMap.put(button.getCustomId(), reaction.getValue());
             }
         } else {
             for (CodeObject data : actions) {
                 long emoji = data.getEnum().getEmoji();
                 Button button = Button.secondary(String.valueOf(data.getEnum().getEmoji()), data.getName());
 
                 buttons.add(button.withEmoji(HelpBotInstance.getJda().getEmojiById(emoji)));
-                buttonMap.put(button.getId(), data);
+                buttonMap.put(button.getCustomId(), data);
             }
         }
 
-        channel.sendMessageEmbeds(preset.getEmbed().build()).setActionRow(buttons).queue((message) -> {
+        channel.sendMessageEmbeds(preset.getEmbed().build()).setComponents(ActionRow.of(buttons)).queue((message) -> {
             ButtonHandler.addListener(userToWait, message, (event) -> {
                 message.delete().queue();
 

src/main/java/com/diamondfire/helpbot/bot/command/impl/other/fun/NbsCommand.java

@@ -63,7 +63,7 @@ public void run(CommandEvent event) {
         File file = new File("input.nbs");
 
 
-        attachment.downloadToFile(file).thenAccept(downloadedFile -> {
+        attachment.getProxy().downloadToFile(file).thenAccept(downloadedFile -> {
             try {
                 byte[] b64 = new NBSToTemplate(NBSDecoder.parse(file)).convert();
                 File templateOutputfile = File.createTempFile("nbs_output", ".txt");

src/main/java/com/diamondfire/helpbot/sys/interaction/button/ButtonHandler.java

@@ -19,7 +19,7 @@ public static void addListener(long user, Message message, Consumer<ButtonIntera
         BUTTON_CONSUMERS.put(message.getIdLong(), new ButtonListener(user, consumer), () -> {
             HelpBotInstance.getJda()
                     .getTextChannelById(message.getChannel().getIdLong()).retrieveMessageById(message.getIdLong())
-                    .flatMap((msg) -> persistent, (msg) -> message.editMessage(MessageEditData.fromMessage(message)).setActionRow(Collections.emptyList()))
+                    .flatMap((msg) -> persistent, (msg) -> message.editMessage(MessageEditData.fromMessage(message)).setComponents(Collections.emptyList()))
                     .queue();
         }, persistent);
     }

src/main/java/com/diamondfire/helpbot/sys/multiselector/MultiSelector.java

@@ -3,9 +3,9 @@
 import com.diamondfire.helpbot.sys.interaction.button.ButtonHandler;
 import com.diamondfire.helpbot.util.Util;
 import net.dv8tion.jda.api.*;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
-import net.dv8tion.jda.api.interactions.components.ItemComponent;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 
 import java.util.*;
 
@@ -39,11 +39,11 @@ public void send(JDA jda) {
                 button = button.withEmoji(Emoji.fromUnicode(page.getCustomEmote()));
             }
 
-            pageMap.put(button.getId(), page);
+            pageMap.put(button.getCustomId(), page);
             buttons.add(button);
         }
 
-        jda.getTextChannelById(channel).sendMessageEmbeds(pages[0].getPage().build()).setActionRow(buttons).queue((message) -> {
+        jda.getTextChannelById(channel).sendMessageEmbeds(pages[0].getPage().build()).setComponents(ActionRow.of(buttons)).queue((message) -> {
             ButtonHandler.addListener(user, message, event -> {
                 event.deferEdit().queue();
                 message.editMessageEmbeds(pageMap.get(event.getComponentId()).getPage().build()).setComponents(message.getComponents()).queue();

src/main/java/com/diamondfire/helpbot/sys/rolereact/RoleReactListener.java

@@ -2,11 +2,11 @@
 
 import com.diamondfire.helpbot.bot.HelpBotInstance;
 import com.diamondfire.helpbot.util.*;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.*;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
-import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.interactions.components.buttons.*;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyCallbackAction;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ public RoleReactListener() {
                 Button button = Button.secondary(role.name(), role.getOverride() == null ? StringUtil.smartCaps(role.name().replace('_', ' ')) : role.getOverride());
 
                 buttons.add(button.withEmoji(Emoji.fromUnicode(emoji)));
-                roleMap.put(button.getId(), role.getRoleID());
+                roleMap.put(button.getCustomId(), role.getRoleID());
             }
 
             msg.editMessage("__**Reaction Roles**__ \nClick to add/remove roles from yourself")

src/main/java/com/diamondfire/helpbot/util/Util.java

@@ -11,11 +11,11 @@
 import com.google.gson.JsonParser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.components.actionrow.ActionRow;
+import net.dv8tion.jda.api.components.buttons.Button;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.interactions.components.ActionRow;
-import net.dv8tion.jda.api.interactions.components.buttons.Button;
 
 import java.io.BufferedReader;
 import java.io.File;