funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 06:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated JDA support 4.2 (#270)

Browse Source 
Anyone previously using jda3 and needs to stay on it until transition is complete to jda4
switch the following artifacts in your build to the final jda3 builds

acf-core -> acf-corejda3final  0.5.0-SNAPSHOT
acf-jda -> acf-da3final  0.5.0-SNAPSHOT
This commit is contained in:
Glare
2020-09-24 22:13:09 -05:00
committed by GitHub
parent 00618f051b
commit b5cb67fcb3
9 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jda/pom.xml
+1 -1
View File
@@ -57,7 +57,7 @@
<dependency>
<groupId>net.dv8tion</groupId>
<artifactId>JDA</artifactId>
<version>3.8.1_450</version>
<version>4.2.0_168</version>
<scope>provided</scope>
</dependency>
</dependencies>
jda/src/main/java/co/aikar/commands/CommandConfig.java
+1 -1
View File
@@ -1,6 +1,6 @@
package co.aikar.commands;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.jetbrains.annotations.NotNull;
import java.util.List;
jda/src/main/java/co/aikar/commands/CommandConfigProvider.java
+1 -1
View File
@@ -1,6 +1,6 @@
package co.aikar.commands;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
public interface CommandConfigProvider {
CommandConfig provide(MessageReceivedEvent event);
jda/src/main/java/co/aikar/commands/JDACommandContexts.java
+9 -10
View File
@@ -2,17 +2,16 @@ package co.aikar.commands;
import co.aikar.commands.annotation.Author;
import co.aikar.commands.annotation.CrossGuild;
import co.aikar.commands.annotation.Optional;
import co.aikar.commands.annotation.SelfUser;
import net.dv8tion.jda.core.JDA;
import net.dv8tion.jda.core.entities.ChannelType;
import net.dv8tion.jda.core.entities.Guild;
import net.dv8tion.jda.core.entities.Message;
import net.dv8tion.jda.core.entities.MessageChannel;
import net.dv8tion.jda.core.entities.Role;
import net.dv8tion.jda.core.entities.TextChannel;
import net.dv8tion.jda.core.entities.User;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.Guild;
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.TextChannel;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import java.util.List;
jda/src/main/java/co/aikar/commands/JDACommandEvent.java
+3 -3
View File
@@ -1,8 +1,8 @@
package co.aikar.commands;
import net.dv8tion.jda.core.entities.Message;
import net.dv8tion.jda.core.entities.MessageEmbed;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.entities.MessageEmbed;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.jetbrains.annotations.NotNull;
import java.util.UUID;
jda/src/main/java/co/aikar/commands/JDACommandManager.java
+7 -7
View File
@@ -1,17 +1,17 @@
package co.aikar.commands;
import co.aikar.commands.apachecommonslang.ApacheCommonsExceptionUtil;
import net.dv8tion.jda.core.AccountType;
import net.dv8tion.jda.core.JDA;
import net.dv8tion.jda.core.entities.ChannelType;
import net.dv8tion.jda.core.entities.Message;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.AccountType;
import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.entities.Message;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -87,7 +87,7 @@ public class JDACommandManager extends CommandManager<
void initializeBotOwner() {
if (botOwner == 0L) {
if (jda.getAccountType() == AccountType.BOT) {
botOwner = jda.asBot().getApplicationInfo().complete().getOwner().getIdLong();
botOwner = jda.retrieveApplicationInfo().complete().getOwner().getIdLong();
} else {
botOwner = jda.getSelfUser().getIdLong();
}
jda/src/main/java/co/aikar/commands/JDACommandPermissionResolver.java
+1 -1
View File
@@ -1,6 +1,6 @@
package co.aikar.commands;
import net.dv8tion.jda.core.Permission;
import net.dv8tion.jda.api.Permission;
import java.util.HashMap;
import java.util.Locale;
jda/src/main/java/co/aikar/commands/JDAListener.java
+4 -4
View File
@@ -1,9 +1,9 @@
package co.aikar.commands;
import net.dv8tion.jda.core.entities.ChannelType;
import net.dv8tion.jda.core.events.ReadyEvent;
import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
import net.dv8tion.jda.core.hooks.ListenerAdapter;
import net.dv8tion.jda.api.entities.ChannelType;
import net.dv8tion.jda.api.events.ReadyEvent;
import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter;
public class JDAListener extends ListenerAdapter {
jda/src/main/java/co/aikar/commands/JDAOptions.java
+1 -1
View File
@@ -1,6 +1,6 @@
package co.aikar.commands;
import net.dv8tion.jda.core.JDA;
import net.dv8tion.jda.api.JDA;
import org.jetbrains.annotations.NotNull;
public class JDAOptions {