diff --git a/jda/pom.xml b/jda/pom.xml index 1a80e91a..b74f2530 100644 --- a/jda/pom.xml +++ b/jda/pom.xml @@ -57,7 +57,7 @@ net.dv8tion JDA - 3.8.1_450 + 4.2.0_168 provided diff --git a/jda/src/main/java/co/aikar/commands/CommandConfig.java b/jda/src/main/java/co/aikar/commands/CommandConfig.java index 96261f26..382cf636 100644 --- a/jda/src/main/java/co/aikar/commands/CommandConfig.java +++ b/jda/src/main/java/co/aikar/commands/CommandConfig.java @@ -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; diff --git a/jda/src/main/java/co/aikar/commands/CommandConfigProvider.java b/jda/src/main/java/co/aikar/commands/CommandConfigProvider.java index 3271134b..9a1702c9 100644 --- a/jda/src/main/java/co/aikar/commands/CommandConfigProvider.java +++ b/jda/src/main/java/co/aikar/commands/CommandConfigProvider.java @@ -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); diff --git a/jda/src/main/java/co/aikar/commands/JDACommandContexts.java b/jda/src/main/java/co/aikar/commands/JDACommandContexts.java index f109b9ab..677f8e04 100644 --- a/jda/src/main/java/co/aikar/commands/JDACommandContexts.java +++ b/jda/src/main/java/co/aikar/commands/JDACommandContexts.java @@ -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; diff --git a/jda/src/main/java/co/aikar/commands/JDACommandEvent.java b/jda/src/main/java/co/aikar/commands/JDACommandEvent.java index dfe9548f..65bb5ed8 100644 --- a/jda/src/main/java/co/aikar/commands/JDACommandEvent.java +++ b/jda/src/main/java/co/aikar/commands/JDACommandEvent.java @@ -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; diff --git a/jda/src/main/java/co/aikar/commands/JDACommandManager.java b/jda/src/main/java/co/aikar/commands/JDACommandManager.java index 4ba652fc..8b89162a 100644 --- a/jda/src/main/java/co/aikar/commands/JDACommandManager.java +++ b/jda/src/main/java/co/aikar/commands/JDACommandManager.java @@ -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(); } diff --git a/jda/src/main/java/co/aikar/commands/JDACommandPermissionResolver.java b/jda/src/main/java/co/aikar/commands/JDACommandPermissionResolver.java index f3be73c1..1d0bb439 100644 --- a/jda/src/main/java/co/aikar/commands/JDACommandPermissionResolver.java +++ b/jda/src/main/java/co/aikar/commands/JDACommandPermissionResolver.java @@ -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; diff --git a/jda/src/main/java/co/aikar/commands/JDAListener.java b/jda/src/main/java/co/aikar/commands/JDAListener.java index 20e7d9f2..92f2a9c3 100644 --- a/jda/src/main/java/co/aikar/commands/JDAListener.java +++ b/jda/src/main/java/co/aikar/commands/JDAListener.java @@ -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 { diff --git a/jda/src/main/java/co/aikar/commands/JDAOptions.java b/jda/src/main/java/co/aikar/commands/JDAOptions.java index 7283ff48..f54083ae 100644 --- a/jda/src/main/java/co/aikar/commands/JDAOptions.java +++ b/jda/src/main/java/co/aikar/commands/JDAOptions.java @@ -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 {