Upgraded JDA version to 4.2 + updated files accordingly

thibautbessone · Nov 21, 2020 · 6b27347 · 6b27347
1 parent 42c2d3d
commit 6b27347
Show file tree

Hide file tree

Showing 61 changed files with 225 additions and 204 deletions.
diff --git a/BlueBot.iml b/BlueBot.iml
@@ -15,27 +15,33 @@
     <orderEntry type="library" name="lavaplayer-1.2.42" level="project" />
     <orderEntry type="library" name="slf4j-simple-1.7.25" level="project" />
     <orderEntry type="library" name="slf4j-api-1.7.25" level="project" />
-    <orderEntry type="library" name="Maven: net.dv8tion:JDA:3.6.0_358" level="project" />
+    <orderEntry type="library" name="log4j-api-2.13.0" level="project" />
+    <orderEntry type="library" name="Maven: net.dv8tion:JDA:4.2.0_168" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:16.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
+    <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.9" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.13.0" level="project" />
+    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.17.2" level="project" />
+    <orderEntry type="library" name="Maven: club.minnced:opus-java-api:1.0.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
+    <orderEntry type="library" name="Maven: club.minnced:opus-java-natives:1.0.4" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" />
-    <orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: net.java.dev.jna:jna:4.4.0" level="project" />
-    <orderEntry type="library" name="Maven: com.neovisionaries:nv-websocket-client:2.2" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:3.8.1" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:1.13.0" level="project" />
-    <orderEntry type="library" name="Maven: com.sedmelluq:lavaplayer:1.2.42" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.sedmelluq:lavaplayer-common:1.0.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-codec:commons-codec:1.9" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-io:commons-io:2.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.5" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jsoup:jsoup:1.10.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: net.iharder:base64:2.3.9" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.1" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.1" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="Maven: com.sedmelluq:lavaplayer:1.3.61" level="project" />
+    <orderEntry type="library" name="Maven: com.sedmelluq:lava-common:1.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.sedmelluq:lavaplayer-natives:1.3.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.10" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.12" level="project" />
+    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:2.6" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.12.1" level="project" />
+    <orderEntry type="library" name="Maven: net.iharder:base64:2.3.9" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.12" level="project" />
   </component>
 </module>
diff --git a/pom.xml b/pom.xml
@@ -24,14 +24,14 @@
         <repository>
             <id>central</id>
             <name>bintray</name>
-            <url>http://jcenter.bintray.com</url>
+            <url>https://jcenter.bintray.com</url>
         </repository>
     </repositories>
     <dependencies>
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>3.8.3_464</version>
+            <version>4.2.0_168</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>com.sedmelluq</groupId>
             <artifactId>lavaplayer</artifactId>
-            <version>1.2.42</version>
+            <version>1.3.61</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>

diff --git a/src/main/java/bluebot/MainBot.java b/src/main/java/bluebot/MainBot.java
@@ -1,22 +1,30 @@
 package bluebot;
 
 import bluebot.commands.fun.*;
-import bluebot.commands.fun.quickreactions.*;
+import bluebot.commands.fun.quickreactions.IDGFCommand;
+import bluebot.commands.fun.quickreactions.KappaCommand;
+import bluebot.commands.fun.quickreactions.NopeCommand;
+import bluebot.commands.fun.quickreactions.WatCommand;
 import bluebot.commands.misc.*;
 import bluebot.commands.moderation.*;
-import bluebot.commands.owner.*;
+import bluebot.commands.owner.AnnouncementCommand;
+import bluebot.commands.owner.SetGameCommand;
+import bluebot.commands.owner.SetOnlineStateCommand;
+import bluebot.commands.owner.ShutDownCommand;
 import bluebot.commands.utility.*;
-import bluebot.utils.*;
+import bluebot.utils.Command;
+import bluebot.utils.CommandParser;
+import bluebot.utils.LoadingProperties;
+import bluebot.utils.SaveThread;
 import bluebot.utils.listeners.*;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
 import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
-import net.dv8tion.jda.core.AccountType;
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.JDABuilder;
-import net.dv8tion.jda.core.entities.Game;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Activity;
 import org.apache.log4j.Logger;
 
 import javax.security.auth.login.LoginException;
@@ -142,25 +150,24 @@ public MainBot() {
             playerManager = new DefaultAudioPlayerManager();
             AudioSourceManagers.registerLocalSource(playerManager);
 
-            JDABuilder shardBuilder = new JDABuilder(AccountType.BOT).setToken(config.getBotToken())
-                    .addEventListener(new TwitchListener())
+            JDABuilder shardBuilder = JDABuilder.createDefault(config.getBotToken())
+                    .addEventListeners(new TwitchListener())
                     //.addListener(new CleverbotListener())
-                    .addEventListener(new BadWordsListener())
-                    .addEventListener(new UserJoinLeaveListener())
-                    .addEventListener(new GuildsListener())
-                    .addEventListener(new BannedServersListener())
-                    .addEventListener(new MessageReceivedListener())
-                    .addEventListener(new EmptyVCListener());
+                    .addEventListeners(new BadWordsListener())
+                    .addEventListeners(new UserJoinLeaveListener())
+                    .addEventListeners(new GuildsListener())
+                    .addEventListeners(new BannedServersListener())
+                    .addEventListeners(new MessageReceivedListener())
+                    .addEventListeners(new EmptyVCListener());
 
             for(int i = 0; i < shardsNumber; i++){ // first id = 0
-                jdaList.add(shardBuilder.useSharding(i, shardsNumber).setBulkDeleteSplittingEnabled(false).buildBlocking());
-                jdaList.get(i).getPresence().setGame(Game.playing("Bot starting ..."));
+                jdaList.add(shardBuilder.useSharding(i, shardsNumber).setBulkDeleteSplittingEnabled(false).build().awaitReady());
+                jdaList.get(i).getPresence().setActivity(Activity.playing("Bot starting ..."));
             }
-            //LogSystem.run();
 
             botOwner = config.getBotOwner();
             for(JDA shard : jdaList) {
-                shard.getPresence().setGame(Game.playing(config.getBotActivity()));
+                shard.getPresence().setActivity(Activity.playing(config.getBotActivity()));
             }
             //System.out.println("Current activity " + jdaList.getPresence().getGame());
 

diff --git a/src/main/java/bluebot/UI/UIController.java b/src/main/java/bluebot/UI/UIController.java
@@ -2,7 +2,7 @@
 
 import bluebot.MainBot;
 import javafx.event.ActionEvent;
-import net.dv8tion.jda.core.JDA;
+import net.dv8tion.jda.api.JDA;
 import org.apache.log4j.Logger;
 
 import java.awt.*;

diff --git a/src/main/java/bluebot/commands/fun/CatCommand.java b/src/main/java/bluebot/commands/fun/CatCommand.java
@@ -1,10 +1,10 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
 import org.json.JSONException;
 import org.json.JSONObject;
 

diff --git a/src/main/java/bluebot/commands/fun/CyanideHapinessCommand.java b/src/main/java/bluebot/commands/fun/CyanideHapinessCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.util.Random;
 

diff --git a/src/main/java/bluebot/commands/fun/DogCommand.java b/src/main/java/bluebot/commands/fun/DogCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

diff --git a/src/main/java/bluebot/commands/fun/GifCommand.java b/src/main/java/bluebot/commands/fun/GifCommand.java
@@ -1,10 +1,10 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
 import org.json.JSONArray;
 import org.json.JSONObject;
 

diff --git a/src/main/java/bluebot/commands/fun/RateCommand.java b/src/main/java/bluebot/commands/fun/RateCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.util.Random;
 

diff --git a/src/main/java/bluebot/commands/fun/XKCDCommand.java b/src/main/java/bluebot/commands/fun/XKCDCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

diff --git a/src/main/java/bluebot/commands/fun/YoMommaJokeCommand.java b/src/main/java/bluebot/commands/fun/YoMommaJokeCommand.java
@@ -1,11 +1,11 @@
 package bluebot.commands.fun;
 
 import bluebot.utils.Command;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import net.dv8tion.jda.core.entities.User;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
 import org.json.JSONObject;
 
 import java.io.IOException;

diff --git a/src/main/java/bluebot/commands/fun/quickreactions/IDGFCommand.java b/src/main/java/bluebot/commands/fun/quickreactions/IDGFCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun.quickreactions;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 /**
  * @file NopeCommand.java

diff --git a/src/main/java/bluebot/commands/fun/quickreactions/KappaCommand.java b/src/main/java/bluebot/commands/fun/quickreactions/KappaCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun.quickreactions;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 /**
  * @file KappaCommand.java

diff --git a/src/main/java/bluebot/commands/fun/quickreactions/NopeCommand.java b/src/main/java/bluebot/commands/fun/quickreactions/NopeCommand.java
@@ -1,7 +1,8 @@
 package bluebot.commands.fun.quickreactions;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+
 
 /**
  * @file NopeCommand.java

diff --git a/src/main/java/bluebot/commands/fun/quickreactions/WatCommand.java b/src/main/java/bluebot/commands/fun/quickreactions/WatCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.fun.quickreactions;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 /**
  * @file WatCommand.java

diff --git a/src/main/java/bluebot/commands/misc/CallCommand.java b/src/main/java/bluebot/commands/misc/CallCommand.java
@@ -1,8 +1,8 @@
 package bluebot.commands.misc;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.entities.User;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 /**
  * @file CallCommand.java

diff --git a/src/main/java/bluebot/commands/misc/CustomEmbedCommand.java b/src/main/java/bluebot/commands/misc/CustomEmbedCommand.java
@@ -2,10 +2,10 @@
 
 import bluebot.MainBot;
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.Permission;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.core.utils.PermissionUtil;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.internal.utils.PermissionUtil;
 
 import java.awt.*;
 import java.util.regex.Matcher;
@@ -29,7 +29,7 @@ public class CustomEmbedCommand implements Command {
     public boolean called(String[] args, MessageReceivedEvent event) {
         if(args.length == 0 || args[0].equals("help")) {return false;}
         else {
-            if(PermissionUtil.checkPermission(event.getTextChannel(), event.getMember(), Permission.MESSAGE_MANAGE)) {
+            if(PermissionUtil.checkPermission(event.getTextChannel(), event.getMessage().getMember(), Permission.MESSAGE_MANAGE)) {
                 return true;
             } else {
                 event.getTextChannel().sendMessage(event.getAuthor().getAsMention() + ", you don't have the permission to do that.").queue();

diff --git a/src/main/java/bluebot/commands/misc/GitHubCommand.java b/src/main/java/bluebot/commands/misc/GitHubCommand.java
@@ -2,8 +2,8 @@
 
 import bluebot.MainBot;
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;

diff --git a/src/main/java/bluebot/commands/misc/InfoCommand.java b/src/main/java/bluebot/commands/misc/InfoCommand.java
@@ -2,9 +2,9 @@
 
 import bluebot.MainBot;
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.awt.*;
 import java.lang.management.ManagementFactory;
@@ -44,7 +44,7 @@ public void action(String[] args, MessageReceivedEvent event) {
         for(JDA shard : MainBot.getJdaList()) {
             voiceChannelNumber += shard.getVoiceChannels().size();
         }
-        String game = event.getJDA().getPresence().getGame().getName();
+        String game = event.getJDA().getPresence().getActivity().getName();
 
         //Taken from Almighty Alpaca
         //https://github.com/Java-Discord-Bot-System/Plugin-Uptime/blob/master/src/main/java/com/almightyalpaca/discord/bot/plugin/uptime/UptimePlugin.java#L28-L42

diff --git a/src/main/java/bluebot/commands/misc/InviteCommand.java b/src/main/java/bluebot/commands/misc/InviteCommand.java
@@ -1,7 +1,7 @@
 package bluebot.commands.misc;
 
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 /**
  * @file InviteCommand.java

diff --git a/src/main/java/bluebot/commands/misc/MultiPollCommand.java b/src/main/java/bluebot/commands/misc/MultiPollCommand.java
@@ -2,9 +2,9 @@
 
 import bluebot.MainBot;
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.awt.*;
 import java.util.ArrayList;

diff --git a/src/main/java/bluebot/commands/misc/PlaySoundCommand.java b/src/main/java/bluebot/commands/misc/PlaySoundCommand.java
@@ -8,9 +8,9 @@
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.core.managers.AudioManager;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.managers.AudioManager;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -102,7 +102,7 @@ public void action(String[] args, MessageReceivedEvent event) {
                 e.printStackTrace();
             }
         } else {
-            VoiceChannel targetChannel = event.getMember().getVoiceState().getChannel();
+            VoiceChannel targetChannel =  event.getMessage().getMember().getVoiceState().getChannel();
             if (targetChannel == null) {
                 event.getTextChannel().sendMessage("Please join a voice channel first.").queue();
             } else {

diff --git a/src/main/java/bluebot/commands/misc/QuickPollCommand.java b/src/main/java/bluebot/commands/misc/QuickPollCommand.java
@@ -2,9 +2,9 @@
 
 import bluebot.MainBot;
 import bluebot.utils.Command;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.awt.*;
 import java.util.List;