update JDA, new release

Author: danthe1st

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>io.github.jdiscordbots</groupId>
 	<artifactId>command-framework</artifactId>
-	<version>1.1.1</version>
+	<version>1.1.2</version>
 
 	<name>command-framework</name>
 	<description>A command system for JDA that allows to treat slash and text commands the same</description>
@@ -60,7 +60,7 @@
 		<dependency>
 			<groupId>net.dv8tion</groupId>
 			<artifactId>JDA</artifactId>
-			<version>5.0.0-alpha.18</version>
+			<version>5.0.0-beta.23</version>
 		</dependency>
 		<dependency>
 			<groupId>io.github.classgraph</groupId>
@@ -192,7 +192,7 @@
 			<plugin>
 				<groupId>org.sonatype.plugins</groupId>
 				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
+				<version>1.6.13</version>
 				<extensions>true</extensions>
 				<configuration>
 					<serverId>ossrh</serverId>

src/main/java/io/github/jdiscordbots/command_framework/CommandListener.java

@@ -11,10 +11,10 @@
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.session.ReadyEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.commands.Command;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;

src/main/java/io/github/jdiscordbots/command_framework/command/Argument.java

@@ -1,11 +1,11 @@
 package io.github.jdiscordbots.command_framework.command;
 
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.entities.Guild;
 

src/main/java/io/github/jdiscordbots/command_framework/command/CommandEvent.java

@@ -3,6 +3,8 @@
 import io.github.jdiscordbots.command_framework.CommandFramework;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.components.ActionRow;
 import net.dv8tion.jda.api.interactions.components.ItemComponent;
 import net.dv8tion.jda.api.requests.RestAction;

src/main/java/io/github/jdiscordbots/command_framework/command/slash/SlashArgument.java

@@ -1,12 +1,12 @@
 package io.github.jdiscordbots.command_framework.command.slash;
 
 import io.github.jdiscordbots.command_framework.command.Argument;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 

src/main/java/io/github/jdiscordbots/command_framework/command/slash/SlashCommandFrameworkEvent.java

@@ -19,18 +19,18 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.MessageEmbed;
 import net.dv8tion.jda.api.entities.MessageType;
-import net.dv8tion.jda.api.entities.PrivateChannel;
 import net.dv8tion.jda.api.entities.SelfUser;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;
-import net.dv8tion.jda.internal.entities.SystemMessage;
+import net.dv8tion.jda.internal.entities.ReceivedMessage;
 
 /**
  * A {@link CommandEvent} representing an executed slash command.
@@ -196,11 +196,12 @@ public Message getMessage()
 		Message msg = firstMessage.get();
 		if (msg == null)
 		{//getArgs().stream().map(Argument::getAsString).collect(Collectors.joining(" "))
-			return new SystemMessage(getIdLong(), getChannel(), MessageType.SLASH_COMMAND, null,
-					true, false, false,
-					event.getCommandString(), null, getAuthor(), getMember(), null, null,
+			
+			return new ReceivedMessage(getIdLong(), getChannel().getIdLong(), getGuild().getIdLong(), getJDA(), getGuild(), getChannel(), MessageType.SLASH_COMMAND, null,
+					true, 0, false, false,
+					event.getCommandString(), null, getAuthor(), getMember(), null, null, null,
 					null,Collections.emptyList(), Collections.emptyList(),
-					Collections.emptyList(), Collections.emptyList(), 0, event.getChannel().getType().isThread() ? event.getChannel().asThreadChannel() : null);
+					Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), 0, null, event.getChannel().getType().isThread() ? event.getChannel().asThreadChannel() : null, 0);
 		}
 		return msg;
 	}

src/main/java/io/github/jdiscordbots/command_framework/command/text/MessageArgument.java

@@ -7,13 +7,13 @@
 
 import io.github.jdiscordbots.command_framework.command.Argument;
 import net.dv8tion.jda.api.JDA;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.GuildChannel;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
-import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 
 /**

src/main/java/io/github/jdiscordbots/command_framework/command/text/MessageCommandEvent.java

@@ -5,6 +5,8 @@
 import io.github.jdiscordbots.command_framework.command.CommandEvent;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.requests.RestAction;
 import net.dv8tion.jda.api.utils.messages.MessageCreateData;

src/test/java/io/github/jdiscordbots/command_framework/Main.java

@@ -39,9 +39,7 @@ public static void main(String[] args){
 				LOG.error("The file .token is empty.");
 		} catch (FileNotFoundException e) {
 			LOG.error("The file .token does not exist or it is not accessible.", e);
-		} catch (LoginException e) {
-			LOG.error("The login process failed.", e);
-		}
+		} 
 
 	}
 }