fix: fixed conflicts & updated things broken by changes in JDA

feat: Added support for new select menu types

Author: seailz

src/main/java/com/seailz/jdaframework/DiscordBot.java

@@ -15,9 +15,11 @@
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
 import net.dv8tion.jda.api.hooks.EventListener;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu;
 
 import javax.security.auth.login.LoginException;
 import java.util.HashMap;
@@ -37,7 +39,7 @@ public class DiscordBot {
     private static HashMap<String, Consumer<ButtonInteractionEvent>> buttonRegistry;
 
     @Getter
-    private static HashMap<String, Consumer<SelectMenuInteractionEvent>> selectRegistry;
+    private static HashMap<String, Consumer<GenericSelectMenuInteractionEvent>> selectRegistry;
 
     private String token;
     private JDA jda;

src/main/java/com/seailz/jdaframework/modals/Modal.java

@@ -7,7 +7,7 @@
 import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.interactions.modals.ModalMapping;
 
@@ -72,7 +72,7 @@ public void open(Member member, SlashCommandInteractionEvent interaction) {
      * @param member The member to show the modal to
      * @param interaction The interaction to reply to
      */
-    public void open(Member member, SelectMenuInteractionEvent interaction) {
+    public void open(Member member, GenericSelectMenuInteractionEvent interaction) {
         ModalManager.open(this, member, interaction);
     }
 

src/main/java/com/seailz/jdaframework/modals/controller/ModalManager.java

@@ -5,7 +5,7 @@
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
 import net.dv8tion.jda.api.interactions.Interaction;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
@@ -36,7 +36,7 @@ public static void open(Modal modal, Member member, Interaction interaction) {
             components.add(component.apply(member));
         });
 
-        net.dv8tion.jda.api.interactions.components.Modal.Builder jdaModal = net.dv8tion.jda.api.interactions.components.Modal.create(
+        net.dv8tion.jda.api.interactions.modals.Modal.Builder jdaModal = net.dv8tion.jda.api.interactions.modals.Modal.create(
                 modal.getId(), modal.getTitle()
         );
 
@@ -50,8 +50,8 @@ public static void open(Modal modal, Member member, Interaction interaction) {
         } else if (interaction instanceof ButtonInteractionEvent) {
             ButtonInteractionEvent e = (ButtonInteractionEvent) interaction;
             e.replyModal(jdaModal.build()).queue();
-        } else if (interaction instanceof SelectMenuInteractionEvent) {
-            SelectMenuInteractionEvent e = (SelectMenuInteractionEvent) interaction;
+        } else if (interaction instanceof GenericSelectMenuInteractionEvent) {
+            GenericSelectMenuInteractionEvent e = (GenericSelectMenuInteractionEvent) interaction;
             e.replyModal(jdaModal.build()).queue();
         } else
             throw new IllegalStateException("Interaction is not a SlashCommandInteractionEvent, SelectMenuInteractionEvent or ButtonInteractionEvent");

src/main/java/com/seailz/jdaframework/select/SelectMenuListener.java

@@ -1,13 +1,13 @@
 package com.seailz.jdaframework.select;
 
 import com.seailz.jdaframework.DiscordBot;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import org.jetbrains.annotations.NotNull;
 
 public class SelectMenuListener extends ListenerAdapter {
     @Override
-    public void onSelectMenuInteraction(@NotNull SelectMenuInteractionEvent event) {
+    public void onGenericSelectMenuInteraction(@NotNull GenericSelectMenuInteractionEvent event) {
         if (DiscordBot.getSelectRegistry().containsKey(event.getSelectMenu().getId())) {
             DiscordBot.getSelectRegistry().get(event.getSelectMenu().getId()).accept(event);
         }

src/main/java/com/seailz/jdaframework/select/SelectMenuManager.java

@@ -1,7 +1,7 @@
 package com.seailz.jdaframework.select;
 
 import com.seailz.jdaframework.DiscordBot;
-import net.dv8tion.jda.api.events.interaction.component.SelectMenuInteractionEvent;
+import net.dv8tion.jda.api.events.interaction.component.GenericSelectMenuInteractionEvent;
 
 import java.util.function.Consumer;
 
@@ -12,7 +12,7 @@ public class SelectMenuManager {
      * @param id The id of the select menu
      * @param onClick The action to perform when the select menu is interacted with
      */
-    public static void listen(String id, Consumer<SelectMenuInteractionEvent> onClick) {
+    public static void listen(String id, Consumer<GenericSelectMenuInteractionEvent> onClick) {
         DiscordBot.getSelectRegistry().put(id, onClick);
     }