Restructured some classes, progress for custom commands

jamezrin · jamezrin · commit c582c05eaad6 · 2018-01-05T15:48:24.000+01:00
diff --git a/Main Plugin/pom.xml b/Main Plugin/pom.xml
@@ -11,7 +11,7 @@
 
     <name>PlayerBalancer Plugin</name>
     <artifactId>playerbalancer-plugin</artifactId>
-    <version>2.1.4.4</version>
+    <version>2.1.5</version>
 
     <build>
         <finalName>PlayerBalancer</finalName>
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
@@ -26,6 +26,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.file.Files;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -149,11 +150,11 @@ private void execStart() {
 
                 statusManager = new StatusManager(this);
 
-                if (settings.getServerCheckerProps().isEnabled()) {
+                if (settings.getFeaturesProps().getServerCheckerProps().isEnabled()) {
                     statusManager.start();
                 }
 
-                if (settings.getFallbackCommandProps().isEnabled()) {
+                if (settings.getFeaturesProps().getFallbackCommandProps().isEnabled()) {
                     fallbackCommand = new FallbackCommand(this);
                     getProxy().getPluginManager().registerCommand(this, fallbackCommand);
                 }
@@ -175,13 +176,30 @@ private void execStart() {
 
                 getProxy().getPluginManager().registerListener(this, new PlayerDisconnectListener(this));
 
-                PasteHelper.reset();
-
-                if (settings.getKickHandlerProps().isEnabled()) {
+                if (settings.getFeaturesProps().getKickHandlerProps().isEnabled()) {
                     kickListener = new ServerKickListener(this);
                     getProxy().getPluginManager().registerListener(this, kickListener);
                 }
 
+                getProxy().getScheduler().schedule(this, () -> {
+                    if (settings.getFeaturesProps().getCustomFindCommandProps().isEnabled()) {
+                        Plugin plugin = getProxy().getPluginManager().getPlugin("cmd_find");
+                        if (plugin != null) {
+                            getProxy().getPluginManager().unregisterCommands(plugin);
+                            getLogger().info("Unregistered commands of the plugin: " + plugin.getDescription().getName());
+                        }
+                    }
+
+                    if (settings.getFeaturesProps().getCustomListCommandProps().isEnabled()) {
+                        Plugin plugin = getProxy().getPluginManager().getPlugin("cmd_list");
+                        if (plugin != null) {
+                            getProxy().getPluginManager().unregisterCommands(plugin);
+                            getLogger().info("Unregistered commands of the plugin: " + plugin.getDescription().getName());
+                        }
+                    }
+                }, 1L, TimeUnit.SECONDS);
+
+                PasteHelper.reset();
                 getLogger().info("The plugin has finished loading without any problems");
             } else {
                 getLogger().warning("-----------------------------------------------------");
@@ -213,20 +231,20 @@ private void execStop() {
                 }
             }
 
-            if (settings.getServerCheckerProps().isEnabled()) {
+            if (settings.getFeaturesProps().getServerCheckerProps().isEnabled()) {
                 if (statusManager != null) {
                     statusManager.stop();
                 }
             }
 
-            if (settings.getFallbackCommandProps().isEnabled()) {
+            if (settings.getFeaturesProps().getFallbackCommandProps().isEnabled()) {
                 if (fallbackCommand != null) {
                     getProxy().getPluginManager().unregisterCommand(fallbackCommand);
                     fallbackCommand = null;
                 }
             }
 
-            if (settings.getKickHandlerProps().isEnabled()) {
+            if (settings.getFeaturesProps().getKickHandlerProps().isEnabled()) {
                 if (kickListener != null) {
                     getProxy().getPluginManager().unregisterListener(kickListener);
                     kickListener = null;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/FallbackCommand.java
@@ -25,7 +25,7 @@ public class FallbackCommand extends Command {
      * Constructor for `fallback-command`
      */
     public FallbackCommand(PlayerBalancer plugin) {
-        this(plugin, plugin.getSettings().getFallbackCommandProps().getCommand());
+        this(plugin, plugin.getSettings().getFeaturesProps().getFallbackCommandProps().getCommand());
     }
 
     /**
@@ -34,7 +34,7 @@ public FallbackCommand(PlayerBalancer plugin) {
     public FallbackCommand(PlayerBalancer plugin, CommandProps commandProps) {
         super(commandProps.getName(), commandProps.getPermission(), commandProps.getAliasesArray());
         this.messages = plugin.getSettings().getMessagesProps();
-        this.props = plugin.getSettings().getFallbackCommandProps();
+        this.props = plugin.getSettings().getFeaturesProps().getFallbackCommandProps();
         this.plugin = plugin;
     }
 
@@ -103,7 +103,7 @@ public ServerSection getSection(ProxiedPlayer player) {
 
             return target;
         } else {
-            if (plugin.getSettings().getBalancerProps().isDefaultPrincipal()) {
+            if (plugin.getSettings().getFeaturesProps().getBalancerProps().isDefaultPrincipal()) {
                 return plugin.getSectionManager().getPrincipal();
             } else {
                 MessageUtils.send(player, messages.getUnavailableServerMessage());
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/custom/CustomFindCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/custom/CustomFindCommand.java
@@ -0,0 +1,33 @@
+package com.jaimemartz.playerbalancer.commands.custom;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.settings.props.features.CustomFindCommandProps;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.plugin.Command;
+
+public class CustomFindCommand extends Command {
+    private final PlayerBalancer plugin;
+    private final CustomFindCommandProps props;
+
+    public CustomFindCommand(PlayerBalancer plugin) {
+        this(plugin, plugin.getSettings().getFeaturesProps().getCustomFindCommandProps());
+    }
+
+    private CustomFindCommand(PlayerBalancer plugin, CustomFindCommandProps props) {
+        super(
+                props.getCommand().getName(),
+                props.getCommand().getPermission(),
+                props.getCommand().getAliasesArray()
+        );
+
+        this.plugin = plugin;
+        this.props = props;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        sender.sendMessage(new ComponentBuilder("Not implemented yet.").color(ChatColor.RED).create());
+    }
+}
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/custom/CustomListCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/custom/CustomListCommand.java
@@ -0,0 +1,33 @@
+package com.jaimemartz.playerbalancer.commands.custom;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.settings.props.features.CustomListCommandProps;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.plugin.Command;
+
+public class CustomListCommand extends Command {
+    private final PlayerBalancer plugin;
+    private final CustomListCommandProps props;
+
+    public CustomListCommand(PlayerBalancer plugin) {
+        this(plugin, plugin.getSettings().getFeaturesProps().getCustomListCommandProps());
+    }
+
+    private CustomListCommand(PlayerBalancer plugin, CustomListCommandProps props) {
+        super(
+                props.getCommand().getName(),
+                props.getCommand().getPermission(),
+                props.getCommand().getAliasesArray()
+        );
+
+        this.plugin = plugin;
+        this.props = props;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        sender.sendMessage(new ComponentBuilder("Not implemented yet.").color(ChatColor.RED).create());
+    }
+}
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/custom/CustomServerCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/custom/CustomServerCommand.java
@@ -0,0 +1,33 @@
+package com.jaimemartz.playerbalancer.commands.custom;
+
+import com.jaimemartz.playerbalancer.PlayerBalancer;
+import com.jaimemartz.playerbalancer.settings.props.features.CustomServerCommandProps;
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.CommandSender;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.plugin.Command;
+
+public class CustomServerCommand extends Command {
+    private final PlayerBalancer plugin;
+    private final CustomServerCommandProps props;
+
+    public CustomServerCommand(PlayerBalancer plugin) {
+        this(plugin, plugin.getSettings().getFeaturesProps().getCustomServerCommandProps());
+    }
+
+    private CustomServerCommand(PlayerBalancer plugin, CustomServerCommandProps props) {
+        super(
+                props.getCommand().getName(),
+                props.getCommand().getPermission(),
+                props.getCommand().getAliasesArray()
+        );
+
+        this.plugin = plugin;
+        this.props = props;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        sender.sendMessage(new ComponentBuilder("Not implemented yet.").color(ChatColor.RED).create());
+    }
+}
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java
@@ -79,7 +79,7 @@ private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, Prov
             }
         }
 
-        int intents = plugin.getSettings().getServerCheckerProps().getAttempts();
+        int intents = plugin.getSettings().getFeaturesProps().getServerCheckerProps().getAttempts();
         for (int intent = 1; intent <= intents; intent++) {
             if (servers.size() == 0) return null;
 
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerKickListener.java
@@ -26,7 +26,7 @@ public class ServerKickListener implements Listener {
     private final PlayerBalancer plugin;
 
     public ServerKickListener(PlayerBalancer plugin) {
-        this.props = plugin.getSettings().getKickHandlerProps();
+        this.props = plugin.getSettings().getFeaturesProps().getKickHandlerProps();
         this.messages = plugin.getSettings().getMessagesProps();
         this.plugin = plugin;
     }
@@ -126,7 +126,7 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo from) {
 
             return target;
         } else {
-            if (plugin.getSettings().getBalancerProps().isDefaultPrincipal()) {
+            if (plugin.getSettings().getFeaturesProps().getBalancerProps().isDefaultPrincipal()) {
                 return plugin.getSectionManager().getPrincipal();
             } else {
                 MessageUtils.send(player, messages.getUnavailableServerMessage());
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/PingTactic.java
@@ -18,7 +18,7 @@ public void ping(ServerInfo server, Callback<ServerStatus> callback, PlayerBalan
                 try {
                     StatusResponse response = utility.ping(
                             server.getAddress(),
-                            plugin.getSettings().getServerCheckerProps().getTimeout());
+                            plugin.getSettings().getFeaturesProps().getServerCheckerProps().getTimeout());
                     callback.done(new ServerStatus(
                             response.getDescription().toLegacyText(),
                             response.getPlayers().getOnline(),
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/ping/StatusManager.java
@@ -29,7 +29,7 @@ public class StatusManager implements Listener {
     private final Map<ServerInfo, Boolean> overriders = new HashMap<>();
 
     public StatusManager(PlayerBalancer plugin) {
-        this.props = plugin.getSettings().getServerCheckerProps();
+        this.props = plugin.getSettings().getFeaturesProps().getServerCheckerProps();
         this.plugin = plugin;
     }
 
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/section/SectionManager.java
@@ -26,7 +26,7 @@ public class SectionManager {
     private static final Map<String, Stage> stages = Collections.synchronizedMap(new LinkedHashMap<>());
 
     public SectionManager(PlayerBalancer plugin) {
-        this.props = plugin.getSettings().getBalancerProps();
+        this.props = plugin.getSettings().getFeaturesProps().getBalancerProps();
         this.plugin = plugin;
     }
 
@@ -160,16 +160,16 @@ public void execute(String sectionName, SectionProps sectionProps, ServerSection
             stage.execute();
         });
 
-        if (plugin.getSettings().getServerRefreshProps().isEnabled()) {
+        if (plugin.getSettings().getFeaturesProps().getServerRefreshProps().isEnabled()) {
             plugin.getLogger().info("Starting automatic server refresh task");
             refreshTask = plugin.getProxy().getScheduler().schedule(plugin, () -> {
                 props.getSectionProps().forEach((name, props) -> {
                     ServerSection section = sections.get(name);
                     calculateServers(section);
                 });
             },
-                    plugin.getSettings().getServerRefreshProps().getDelay(),
-                    plugin.getSettings().getServerRefreshProps().getInterval(),
+                    plugin.getSettings().getFeaturesProps().getServerRefreshProps().getDelay(),
+                    plugin.getSettings().getFeaturesProps().getServerRefreshProps().getInterval(),
                     TimeUnit.MILLISECONDS
             );
         }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/SettingsHolder.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/SettingsHolder.java
@@ -3,11 +3,12 @@
 import com.jaimemartz.playerbalancer.settings.props.FeaturesProps;
 import com.jaimemartz.playerbalancer.settings.props.GeneralProps;
 import com.jaimemartz.playerbalancer.settings.props.MessagesProps;
-import com.jaimemartz.playerbalancer.settings.props.features.*;
+import lombok.Data;
 import ninja.leaping.configurate.objectmapping.Setting;
 import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
 
 @ConfigSerializable
+@Data
 public class SettingsHolder {
     @Setting(value = "general")
     private GeneralProps generalProps;
@@ -17,77 +18,4 @@ public class SettingsHolder {
 
     @Setting(value = "features")
     private FeaturesProps featuresProps;
-
-    public GeneralProps getGeneralProps() {
-        return generalProps;
-    }
-
-    public void setGeneralProps(GeneralProps generalProps) {
-        this.generalProps = generalProps;
-    }
-
-    public MessagesProps getMessagesProps() {
-        return messagesProps;
-    }
-
-    public void setMessagesProps(MessagesProps messagesProps) {
-        this.messagesProps = messagesProps;
-    }
-
-    public FeaturesProps getFeaturesProps() {
-        return featuresProps;
-    }
-
-    public void setFeaturesProps(FeaturesProps featuresProps) {
-        this.featuresProps = featuresProps;
-    }
-
-    public BalancerProps getBalancerProps() {
-        return featuresProps.getBalancerProps();
-    }
-
-    public void setBalancerProps(BalancerProps balancerProps) {
-        featuresProps.setBalancerProps(balancerProps);
-    }
-
-    public FallbackCommandProps getFallbackCommandProps() {
-        return featuresProps.getFallbackCommandProps();
-    }
-
-    public void setFallbackCommandProps(FallbackCommandProps fallbackCommandProps) {
-        featuresProps.setFallbackCommandProps(fallbackCommandProps);
-    }
-
-    public ServerCheckerProps getServerCheckerProps() {
-        return featuresProps.getServerCheckerProps();
-    }
-
-    public void setServerCheckerProps(ServerCheckerProps serverCheckerProps) {
-        featuresProps.setServerCheckerProps(serverCheckerProps);
-    }
-
-    public KickHandlerProps getKickHandlerProps() {
-        return featuresProps.getKickHandlerProps();
-    }
-
-    public void setKickHandlerProps(KickHandlerProps kickHandlerProps) {
-        featuresProps.setKickHandlerProps(kickHandlerProps);
-    }
-
-    public ServerRefreshProps getServerRefreshProps() {
-        return featuresProps.getServerRefreshProps();
-    }
-
-    public void setKickHandlerProps(ServerRefreshProps serverRefreshProps) {
-        featuresProps.setServerRefreshProps(serverRefreshProps);
-    }
-
-    @Override
-    public String toString() {
-        return "SettingsHolder{" +
-                "generalProps=" + generalProps +
-                ", messagesProps=" + messagesProps +
-                ", featuresProps=" + featuresProps +
-                '}';
-    }
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/FeaturesProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/FeaturesProps.java
@@ -22,4 +22,13 @@ public class FeaturesProps {
 
     @Setting(value = "server-refresh")
     private ServerRefreshProps serverRefreshProps;
+
+    @Setting(value = "custom-find-command")
+    private CustomFindCommandProps customFindCommandProps;
+
+    @Setting(value = "custom-list-command")
+    private CustomListCommandProps customListCommandProps;
+
+    @Setting(value = "custom-server-command")
+    private CustomServerCommandProps customServerCommandProps;
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomFindCommandProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomFindCommandProps.java
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomFindProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomFindProps.java
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomListCommandProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomListCommandProps.java
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomListProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomListProps.java
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomServerCommandProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/CustomServerCommandProps.java
diff --git a/Main Plugin/src/main/resources/default.conf b/Main Plugin/src/main/resources/default.conf

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, Prov`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- int intents = plugin.getSettings().getServerCheckerProps().getAttempts();`
	`82`	`+ int intents = plugin.getSettings().getFeaturesProps().getServerCheckerProps().getAttempts();`
`83`	`83`	`for (int intent = 1; intent <= intents; intent++) {`
`84`	`84`	`if (servers.size() == 0) return null;`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public class StatusManager implements Listener {`
`29`	`29`	`private final Map<ServerInfo, Boolean> overriders = new HashMap<>();`
`30`	`30`
`31`	`31`	`public StatusManager(PlayerBalancer plugin) {`
`32`		`- this.props = plugin.getSettings().getServerCheckerProps();`
	`32`	`+ this.props = plugin.getSettings().getFeaturesProps().getServerCheckerProps();`
`33`	`33`	`this.plugin = plugin;`
`34`	`34`	`}`
`35`	`35`