Updated to use latest version of JDA

Author: Tokeiito

.gitignore

@@ -89,3 +89,9 @@ gradle-app.setting
 
 # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
 # gradle/wrapper/gradle-wrapper.properties
+/bin/
+
+## Eclipse
+.classpath
+.project
+.settings/

build.gradle

@@ -1,14 +1,10 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
-    }
+plugins {
+  id "com.github.johnrengelman.shadow" version "7.1.2"
+  id "eclipse"
 }
 
 apply plugin: 'java'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'com.github.johnrengelman.shadow'
 
 group = 'org.nyxcode.wurm'
@@ -22,20 +18,20 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
-    maven { url "http://jcenter.bintray.com" }
+    maven { url "https://jcenter.bintray.com" }
     maven { url "https://dl.bdew.net/agorepo/" }
-    maven { url "http://repo.maven.apache.org/maven2" }
+    maven { url "https://repo.maven.apache.org/maven2" }
     maven { url 'https://jitpack.io' }
 }
 
 dependencies {
-    compile 'net.dv8tion:JDA:3.3.1_289'
-    compile 'org.gotti.wurmunlimited:server-modlauncher:0.40'
-    compile 'com.github.Sindusk:sindusklibrary:v2.1'
+    implementation("net.dv8tion:JDA:5.0.0-alpha.20")
+    implementation('org.gotti.wurmunlimited:server-modlauncher:0.40')
+    implementation('com.github.Sindusk:sindusklibrary:v2.1')
 }
 
 jar {
-    version = null
+    archiveVersion = null
 }
 
 shadowJar {
@@ -57,5 +53,5 @@ task dist(type: Zip) {
         from fileTree(dir: 'mods', include: '*')
     })
 
-    archiveName "${project.name}-${project.version}.zip"
+    archiveFileName = provider { "${project.name}-${project.version}.zip"}
 }

src/main/java/org/nyxcode/wurm/discordrelay/DiscordRelay.java

@@ -13,19 +13,18 @@
 import javassist.bytecode.Descriptor;
 import mod.sin.lib.Prop;
 import mod.sin.lib.Util;
-import net.dv8tion.jda.core.AccountType;
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.JDABuilder;
-import net.dv8tion.jda.core.MessageBuilder;
-import net.dv8tion.jda.core.entities.ChannelType;
-import net.dv8tion.jda.core.entities.Game;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.core.exceptions.RateLimitedException;
-import net.dv8tion.jda.core.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Activity;
+import net.dv8tion.jda.api.entities.Activity.ActivityType;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder;
+
 import org.gotti.wurmunlimited.modloader.classhooks.HookManager;
 import org.gotti.wurmunlimited.modloader.interfaces.*;
 
-import javax.security.auth.login.LoginException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -42,7 +41,6 @@ public class DiscordRelay extends ListenerAdapter implements WurmServerMod, PreI
     protected static JDA jda;
     protected static String botToken = "";
     protected static String serverName = "";
-    //private String wurmBotName;
     protected static boolean useUnderscore = false;
     protected static boolean showConnectedPlayers = true;
     protected static int connectedPlayerUpdateInterval = 120;
@@ -61,11 +59,16 @@ public void preInit() {
         ClassPool classPool = HookManager.getInstance().getClassPool();
         Class<DiscordRelay> thisClass = DiscordRelay.class;
 
+        //jda = new JDABuilder(AccountType.BOT).setToken(botToken).addEventListener(this).buildBlocking();
+        jda = JDABuilder.createDefault(botToken).addEventListeners(this).build();
         try {
-            jda = new JDABuilder(AccountType.BOT).setToken(botToken).addEventListener(this).buildBlocking();
-        } catch (LoginException | RateLimitedException | InterruptedException e) {
-            e.printStackTrace();
-        }
+			jda.awaitReady();
+		} catch (InterruptedException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+			logger.info("Unable to wait untill JDA is ready.");
+		}
+
 
         // - Send rumour messages to discord - //
         try {
@@ -122,15 +125,16 @@ public void configure(Properties properties) {
 
     private static final DateFormat df = new SimpleDateFormat("HH:mm:ss");
     public static void sendToDiscord(String channel, String message, boolean includeMap){
-        MessageBuilder builder = new MessageBuilder();
+        MessageCreateBuilder builder = new MessageCreateBuilder();
+        
         message = "[" + df.format(new Date(System.currentTimeMillis())) + "] "+message; // Add timestamp
         if(includeMap) {
             message = message + " (" + Servers.localServer.mapname + ")";
         }
 
-        builder.append(message);
+        builder.addContent(message);
         try {
-            jda.getGuildsByName(serverName, true).get(0).getTextChannelsByName(channel, true).get(0).sendMessage(builder.build()).queue();
+            jda.getTextChannelsByName(channel, true).get(0).sendMessage(builder.build()).queue();
         }catch(Exception e){
             e.printStackTrace();
             logger.info("Discord Relay failure: #"+channel+" - "+message);
@@ -146,16 +150,13 @@ public MessagePolicy onKingdomMessage(Message message) {
             }
         }else if(window.startsWith("GL-")){
             byte kingdomId = message.getSender().getKingdomId();
-            //Kingdom kingdom = Kingdoms.getKingdom(kingdomId);
+
             String kingdomName = discordifyName("GL-"+Kingdoms.getChatNameFor(kingdomId));
             sendToDiscord(kingdomName, message.getMessage(), false);
-	        /*MessageBuilder builder = new MessageBuilder();
 
-	        builder.append(message.getMessage());
-	        jda.getGuildsByName(serverName, true).get(0).getTextChannelsByName(kingdomName, true).get(0).sendMessage(builder.build()).queue();*/
         }else{
             byte kingdomId = message.getSender().getKingdomId();
-            //Kingdom kingdom = Kingdoms.getKingdom(kingdomId);
+
             String kingdomName = discordifyName(Kingdoms.getChatNameFor(kingdomId));
             sendToDiscord(kingdomName, message.getMessage(), false);
         }
@@ -208,7 +209,6 @@ public void sendToGlobalKingdomChat(final String channel, final String message)
             }
         }
         if (kingdomId != -1) {
-            //long wurmId = -10;
 
             String window = "";
             if(global){
@@ -238,21 +238,22 @@ public MessagePolicy onAllianceMessage(PvPAlliance alliance, Message message) {
     public void onMessageReceived(MessageReceivedEvent event) {
         super.onMessageReceived(event);
         if (event.isFromType(ChannelType.TEXT) && !event.getAuthor().isBot()) {
-            String name = event.getTextChannel().getName();
+        	
+            String name = event.getChannel().getName();
             if(name.contains("trade")){
                 if(enableTrade) {
-                    sendToTradeChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
+                    sendToTradeChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContentDisplay());
                 }
             } else if (name.contains(discordifyName("ca-help"))){
                 if (enableCAHELP) {
-                    sendToHelpChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
+                    sendToHelpChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContentDisplay());
                 }
             } else if (name.contains("mgmt")){
                 if (enableMGMT) {
-                    sendToMGMTChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
+                    sendToMGMTChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContentDisplay());
                 }
             } else {
-                sendToGlobalKingdomChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
+                sendToGlobalKingdomChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContentDisplay());
             }
         }
     }
@@ -295,13 +296,14 @@ public boolean onPlayerMessage(Communicator var1, String var2) {
 
     protected static long lastPolledPlayers = 0;
     protected static long pollPlayerInterval = TimeConstants.SECOND_MILLIS*120;
+    
     @Override
     public void onServerPoll() {
         if(showConnectedPlayers) {
             if(System.currentTimeMillis() > lastPolledPlayers + pollPlayerInterval) {
                 if (Servers.localServer.LOGINSERVER) {
                     try {
-                        jda.getPresence().setGame(Game.of(Players.getInstance().getNumberOfPlayers() + " online!"));
+                        jda.getPresence().setActivity(Activity.of(ActivityType.PLAYING, Players.getInstance().getNumberOfPlayers() + " online!"));
                     }catch(Exception e){
                         //e.printStackTrace();
                         //logger.info("Failed to update player count.");