Added option to disable plugin messaging

Author: jamezrin

Main Plugin/pom.xml

@@ -11,7 +11,7 @@
 
     <name>PlayerBalancer Plugin</name>
     <artifactId>playerbalancer-plugin</artifactId>
-    <version>2.1.2.0</version>
+    <version>2.1.2.1</version>
 
     <build>
         <finalName>PlayerBalancer</finalName>

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java

@@ -11,6 +11,7 @@
 import com.jaimemartz.playerbalancer.manager.PlayerLocker;
 import com.jaimemartz.playerbalancer.ping.StatusManager;
 import com.jaimemartz.playerbalancer.section.SectionManager;
+import com.jaimemartz.playerbalancer.services.MessagingService;
 import com.jaimemartz.playerbalancer.settings.SettingsHolder;
 import net.md_5.bungee.api.plugin.Command;
 import net.md_5.bungee.api.plugin.Listener;
@@ -37,7 +38,8 @@ public class PlayerBalancer extends Plugin {
     private ConfigurationLoader<CommentedConfigurationNode> loader;
     private FallbackService fallbackService;
     private Command mainCommand, manageCommand;
-    private Listener connectListener, kickListener, messageListener, reloadListener;
+    private MessagingService messagingService;
+    private Listener connectListener, kickListener, reloadListener;
 
     @Override
     public void onEnable() {
@@ -101,6 +103,7 @@ private void enable() {
                 sectionManager.load();
 
                 statusManager = new StatusManager(this);
+
                 if (settings.getServerCheckerProps().isEnabled()) {
                     statusManager.start();
                 }
@@ -111,21 +114,21 @@ private void enable() {
                     getProxy().getPluginManager().registerCommand(this, fallbackService);
                 }
 
-                getProxy().getPluginManager().registerListener(this, fallbackService);
-
                 connectListener = new ServerConnectListener(this);
                 getProxy().getPluginManager().registerListener(this, connectListener);
 
-                messageListener = new PluginMessageListener(this);
-                getProxy().getPluginManager().registerListener(this, messageListener);
+                if (settings.getGeneralProps().isPluginMessaging()) {
+                    getProxy().registerChannel("PlayerBalancer");
+                    messagingService = new MessagingService(this);
+                    getProxy().getPluginManager().registerListener(this, fallbackService);
+                    getProxy().getPluginManager().registerListener(this, messagingService);
+                }
 
                 manageCommand = new ManageCommand(this);
                 getProxy().getPluginManager().registerCommand(this, manageCommand);
 
                 getProxy().getPluginManager().registerListener(this, new PlayerDisconnectListener(this));
 
-                getProxy().registerChannel("PlayerBalancer");
-
                 PasteHelper.reset();
 
                 if (settings.getKickHandlerProps().isEnabled()) {
@@ -180,8 +183,11 @@ private void disable() {
             getProxy().getPluginManager().unregisterListener(connectListener);
             connectListener = null;
 
-            getProxy().getPluginManager().unregisterListener(messageListener);
-            messageListener = null;
+            if (settings.getGeneralProps().isPluginMessaging()) {
+                getProxy().unregisterChannel("PlayerBalancer");
+                getProxy().getPluginManager().unregisterListener(messagingService);
+                messagingService = null;
+            }
 
             getProxy().getPluginManager().unregisterCommand(manageCommand);
             manageCommand = null;

…cer/listeners/PluginMessageListener.java …rbalancer/services/MessagingService.javaMain Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java renamed to Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/MessagingService.java Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java renamed to Main Plugin/src/main/java/com/jaimemartz/playerbalancer/services/MessagingService.java

@@ -1,12 +1,13 @@
-package com.jaimemartz.playerbalancer.listeners;
+package com.jaimemartz.playerbalancer.services;
 
 import com.google.common.io.ByteArrayDataInput;
 import com.google.common.io.ByteStreams;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSerializer;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.section.ServerSection;
-import com.jaimemartz.playerbalancer.utils.ServerInfoAdapter;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.connection.Server;
@@ -17,18 +18,16 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.Collection;
-import java.util.stream.Collectors;
 
-public class PluginMessageListener implements Listener {
+public class MessagingService implements Listener {
     private final PlayerBalancer plugin;
     private final Gson gson;
 
-    public PluginMessageListener(PlayerBalancer plugin) {
+    public MessagingService(PlayerBalancer plugin) {
         this.plugin = plugin;
         GsonBuilder builder = new GsonBuilder();
 
+        //Only serialize the name of ServerInfo
         builder.registerTypeAdapter(ServerInfo.class, (JsonSerializer<ServerInfo>) (server, type, context) ->
                 context.serialize(server.getName())
         );
@@ -168,3 +167,4 @@ public void onPluginMessage(PluginMessageEvent event) {
         }
     }
 }
+

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/GeneralProps.java

@@ -17,6 +17,9 @@ public class GeneralProps {
     @Setting(value = "redis-bungee")
     private boolean redisBungee;
 
+    @Setting(value = "plugin-messaging")
+    private boolean pluginMessaging;
+
     @Setting
     private String version;
 
@@ -52,6 +55,14 @@ public void setRedisBungee(boolean redisBungee) {
         this.redisBungee = redisBungee;
     }
 
+    public boolean isPluginMessaging() {
+        return pluginMessaging;
+    }
+
+    public void setPluginMessaging(boolean pluginMessaging) {
+        this.pluginMessaging = pluginMessaging;
+    }
+
     public String getVersion() {
         return version;
     }
@@ -67,6 +78,7 @@ public String toString() {
                 ", silent=" + silent +
                 ", autoReload=" + autoReload +
                 ", redisBungee=" + redisBungee +
+                ", pluginMessaging=" + pluginMessaging +
                 ", version='" + version + '\'' +
                 '}';
     }

Main Plugin/src/main/resources/default.conf

@@ -17,6 +17,10 @@ general {
   # When true, this plugin will print less messages when loading
   silent=false
 
+  # When true, spigot plugins will be able to contact with this plugin
+  # Do not disable if you are using the addon!
+  plugin-messaging=true
+
   # Do not modify this
   version="${project.version}"
 }