bungee stuff and event stuff, with sync of both versions

Author: HMJosh

dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>me.Joshb</groupId>
   <artifactId>DiscordBotAPI</artifactId>
-  <version>1.0.5</version>
+  <version>1.0.6</version>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <resources>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>me.Joshb</groupId>
     <artifactId>DiscordBotAPI</artifactId>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
 
     <build>
         <sourceDirectory>src/main/java</sourceDirectory>

src/main/java/me/joshb/discordbotapi/bungee/DiscordBotAPI.java

@@ -19,6 +19,8 @@ public class DiscordBotAPI extends Plugin {
 
     public static DiscordBotAPI plugin;
 
+    public DiscordMessageReceived discordMessageReceived = new DiscordMessageReceived();
+
     public void onEnable(){
         plugin = this;
 
@@ -35,7 +37,7 @@ public void onEnable(){
         cm.initializeSubCommands();
         ProxyServer.getInstance().getPluginManager().registerCommand(this, cm);
 
-        JDABuilder builder = JDABuilder.create(me.joshb.discordbotapi.server.config.Config.getInstance().getConfig().getString("Bot.Token"),
+        JDABuilder builder = JDABuilder.create(Config.getInstance().getConfig().getString("Bot.Token"),
                 GatewayIntent.GUILD_MEMBERS,
                 GatewayIntent.GUILD_MESSAGE_REACTIONS,
                 GatewayIntent.DIRECT_MESSAGES,
@@ -46,15 +48,39 @@ public void onEnable(){
         } catch (LoginException e) {
             getLogger().severe("Plugin Disabled. The bot token is invalid. Reason: " + e.getMessage());
         }
-        jda.addEventListener(new DiscordMessageReceived());
+        registerEvent(this, discordMessageReceived);
     }
 
     public void onDisable(){
         if(jda != null){
+            unRegisterEvent(this, discordMessageReceived);
             jda.shutdown();
         }
     }
 
+    public void registerEvent(Plugin p, Object listenerClass) {
+        if(p != this){
+            getLogger().info("Registering Listener from " + p.getDescription().getName() + " - " + listenerClass.getClass().getName());
+        }
+        try {
+            jda.addEventListener(listenerClass);
+        } catch (Exception e) {
+            getLogger().severe("Could not register listener from " + p.getDescription().getName() + " - " + e.getMessage());
+        }
+    }
+
+    public void unRegisterEvent(Plugin p, Object listenerClass) {
+        if(p != this){
+            getLogger().info("Unregistering Listener from " + p.getDescription().getName() + " - " + listenerClass.getClass().getName());
+        }
+        try {
+            jda.removeEventListener(listenerClass);
+        } catch (Exception e) {
+            getLogger().severe("Could not unregister listener from " + p.getDescription().getName() + " - " + e.getMessage());
+        }
+    }
+
+
     public static JDA getJDA(){
         return jda;
     }

src/main/java/me/joshb/discordbotapi/server/DiscordBotAPI.java

@@ -20,6 +20,8 @@ public class DiscordBotAPI extends JavaPlugin {
 
     public static DiscordBotAPI plugin;
 
+    public DiscordMessageReceived discordMessageReceived = new DiscordMessageReceived();
+
     public void onEnable() {
         plugin = this;
 
@@ -49,11 +51,12 @@ public void onEnable() {
             getLogger().severe("Plugin Disabled. The bot token is invalid. Reason: " + e.getMessage());
             Bukkit.getPluginManager().disablePlugin(this);
         }
-        jda.addEventListener(new DiscordMessageReceived());
+        registerEvent(this, discordMessageReceived);
     }
 
     public void onDisable() {
         if (jda != null) {
+            unRegisterEvent(this, discordMessageReceived);
             jda.shutdown();
         }
     }
@@ -63,7 +66,9 @@ public static JDA getJDA() {
     }
 
     public void registerEvent(Plugin p, Object listenerClass) {
-        getLogger().info("Registering Listener from " + p.getName() + " - " + listenerClass.getClass().getName());
+        if(p != this){
+            getLogger().info("Registering Listener from " + p.getName() + " - " + listenerClass.getClass().getName());
+        }
         try {
             jda.addEventListener(listenerClass);
         } catch (Exception e) {
@@ -72,7 +77,9 @@ public void registerEvent(Plugin p, Object listenerClass) {
     }
 
     public void unRegisterEvent(Plugin p, Object listenerClass) {
-        getLogger().info("Unregistering Listener from " + p.getName() + " - " + listenerClass.getClass().getName());
+        if(p != this){
+            getLogger().info("Unregistering Listener from " + p.getName() + " - " + listenerClass.getClass().getName());
+        }
         try {
             jda.removeEventListener(listenerClass);
         } catch (Exception e) {

target/classes/plugin.yml

@@ -1,5 +1,5 @@
 name: DiscordBotAPI
-version: 1.0.5
+version: 1.0.6
 main: me.joshb.discordbotapi.server.DiscordBotAPI
 author: Joshb_
 commands:

target/maven-archiver/pom.properties

@@ -1,5 +1,5 @@
 #Generated by Maven
-#Mon Dec 14 22:55:18 EST 2020
-version=1.0.5
+#Thu Dec 17 17:40:09 EST 2020
+version=1.0.6
 groupId=me.Joshb
 artifactId=DiscordBotAPI