Added aliases, permission router, and progress for custom commands

jamezrin · jamezrin · commit f3c10291b8f3 · 2018-01-07T19:52:47.000+01:00
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/PlayerBalancer.java
@@ -1,14 +1,12 @@
 package com.jaimemartz.playerbalancer;
 
 import com.google.common.reflect.TypeToken;
-import com.jaimemartz.playerbalancer.commands.FallbackCommand;
-import com.jaimemartz.playerbalancer.commands.MainCommand;
-import com.jaimemartz.playerbalancer.commands.ManageCommand;
+import com.jaimemartz.playerbalancer.commands.*;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
+import com.jaimemartz.playerbalancer.helper.NetworkManager;
+import com.jaimemartz.playerbalancer.helper.PasteHelper;
+import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import com.jaimemartz.playerbalancer.listeners.*;
-import com.jaimemartz.playerbalancer.manager.NetworkManager;
-import com.jaimemartz.playerbalancer.manager.PasteHelper;
-import com.jaimemartz.playerbalancer.manager.PlayerLocker;
 import com.jaimemartz.playerbalancer.ping.StatusManager;
 import com.jaimemartz.playerbalancer.section.SectionManager;
 import com.jaimemartz.playerbalancer.settings.SettingsHolder;
@@ -41,7 +39,7 @@ public class PlayerBalancer extends Plugin {
     private final StringBuilder logsBuilder = new StringBuilder();
 
     private FallbackCommand fallbackCommand;
-    private Command mainCommand, manageCommand;
+    private Command mainCommand, manageCommand, findCommand, listCommand, serverCommand;
     private Listener connectListener, kickListener, reloadListener, pluginMessageListener;
 
     @Override
@@ -181,23 +179,27 @@ private void execStart() {
                     getProxy().getPluginManager().registerListener(this, kickListener);
                 }
 
+                //After the modules have loaded (hopefully?)
                 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());
-                        }
+                        tryUnregisterCommands("cmd_find");
+                        findCommand = new CustomFindCommand(this);
+                        getProxy().getPluginManager().registerCommand(this, findCommand);
                     }
 
                     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());
-                        }
+                        tryUnregisterCommands("cmd_list");
+                        listCommand = new CustomListCommand(this);
+                        getProxy().getPluginManager().registerCommand(this, listCommand);
                     }
-                }, 1L, TimeUnit.SECONDS);
+
+                    if (settings.getFeaturesProps().getCustomServerCommandProps().isEnabled()) {
+                        tryUnregisterCommands("cmd_server");
+                        serverCommand = new CustomServerCommand(this);
+                        getProxy().getPluginManager().registerCommand(this, serverCommand);
+                    }
+
+                }, 5L, TimeUnit.SECONDS);
 
                 PasteHelper.reset();
                 getLogger().info("The plugin has finished loading without any problems");
@@ -214,6 +216,16 @@ private void execStart() {
         }
     }
 
+    private void tryUnregisterCommands(String pluginName) {
+        Plugin plugin = getProxy().getPluginManager().getPlugin(pluginName);
+        if (plugin != null) {
+            getProxy().getPluginManager().unregisterCommands(plugin);
+            getLogger().info("Unregistered all commands of the plugin: " + pluginName);
+        } else {
+            getLogger().warning("Could not find the plugin: " + pluginName);
+        }
+    }
+
     private void execStop() {
         if (mainCommand != null) {
             getProxy().getPluginManager().unregisterCommand(mainCommand);
@@ -269,6 +281,27 @@ private void execStop() {
                 manageCommand = null;
             }
 
+            if (settings.getFeaturesProps().getCustomFindCommandProps().isEnabled()) {
+                if (findCommand != null) {
+                    getProxy().getPluginManager().unregisterCommand(findCommand);
+                    findCommand = null;
+                }
+            }
+
+            if (settings.getFeaturesProps().getCustomListCommandProps().isEnabled()) {
+                if (listCommand != null) {
+                    getProxy().getPluginManager().unregisterCommand(listCommand);
+                    listCommand = null;
+                }
+            }
+
+            if (settings.getFeaturesProps().getCustomServerCommandProps().isEnabled()) {
+                if (serverCommand != null) {
+                    getProxy().getPluginManager().unregisterCommand(serverCommand);
+                    serverCommand = null;
+                }
+            }
+
             if (sectionManager != null) {
                 sectionManager.flush();
             }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/CustomFindCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/CustomFindCommand.java
@@ -1,4 +1,4 @@
-package com.jaimemartz.playerbalancer.commands.custom;
+package com.jaimemartz.playerbalancer.commands;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.settings.props.features.CustomFindCommandProps;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/CustomListCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/CustomListCommand.java
@@ -1,4 +1,4 @@
-package com.jaimemartz.playerbalancer.commands.custom;
+package com.jaimemartz.playerbalancer.commands;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.settings.props.features.CustomListCommandProps;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/CustomServerCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/CustomServerCommand.java
@@ -1,4 +1,4 @@
-package com.jaimemartz.playerbalancer.commands.custom;
+package com.jaimemartz.playerbalancer.commands;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.settings.props.features.CustomServerCommandProps;
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
@@ -87,8 +87,16 @@ public ServerSection getSection(ProxiedPlayer player) {
                 return null;
             }
 
-            ServerSection target = plugin.getSectionManager().getBind(props.getRules(), current)
-                    .orElse(current.getParent());
+            ServerSection target = current.getParent();
+
+            String bindName = props.getRules().get(current.getName());
+            if (bindName != null) {
+                ServerSection bind = plugin.getSectionManager().getByName(bindName);
+                if (bind != null) {
+                    target = bind;
+                }
+            }
+
             if (target == null) {
                 MessageUtils.send(player, messages.getUnavailableServerMessage());
                 return null;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/MainCommand.java
@@ -2,7 +2,7 @@
 
 import com.google.common.base.Strings;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.manager.PasteHelper;
+import com.jaimemartz.playerbalancer.helper.PasteHelper;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.ClickEvent;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/commands/ManageCommand.java
@@ -109,6 +109,13 @@ public void execute(CommandSender sender, String[] args) {
                                             .create());
                                 }
 
+                                sender.sendMessage(new ComponentBuilder("Alias: ")
+                                        .color(ChatColor.GRAY)
+                                        .append(String.valueOf(section.getProps().getAlias()))
+                                        .color(ChatColor.AQUA)
+                                        .create()
+                                );
+
                                 sender.sendMessage(new ComponentBuilder("Position: ")
                                         .color(ChatColor.GRAY)
                                         .append(String.valueOf(section.getPosition()))
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
@@ -1,7 +1,7 @@
 package com.jaimemartz.playerbalancer.connection;
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
-import com.jaimemartz.playerbalancer.manager.PlayerLocker;
+import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import com.jaimemartz.playerbalancer.section.ServerSection;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.Callback;
@@ -26,6 +26,7 @@ public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ProviderTyp
 
         MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectingMessage(),
                 (str) -> str.replace("{section}", section.getName())
+                        .replace("{alias}", section.getProps().getAlias())
         );
 
         //Prevents removing servers from the section
@@ -46,6 +47,8 @@ public ConnectionIntent(PlayerBalancer plugin, ProxiedPlayer player, ProviderTyp
                     if (response) { //only if the connect has been executed correctly
                         MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectedMessage(),
                                 (str) -> str.replace("{server}", target.getName())
+                                        .replace("{section}", section.getName())
+                                        .replace("{alias}", section.getProps().getAlias())
                         );
                     }
                 });
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/NetworkManager.java
@@ -1,4 +1,4 @@
-package com.jaimemartz.playerbalancer.manager;
+package com.jaimemartz.playerbalancer.helper;
 
 import com.imaginarycode.minecraft.redisbungee.RedisBungee;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java
@@ -1,4 +1,4 @@
-package com.jaimemartz.playerbalancer.manager;
+package com.jaimemartz.playerbalancer.helper;
 
 import com.google.common.io.CharStreams;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PlayerLocker.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PlayerLocker.java
@@ -1,4 +1,4 @@
-package com.jaimemartz.playerbalancer.manager;
+package com.jaimemartz.playerbalancer.helper;
 
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PlayerDisconnectListener.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PlayerDisconnectListener.java
@@ -2,7 +2,7 @@
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
-import com.jaimemartz.playerbalancer.manager.PlayerLocker;
+import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PlayerDisconnectEvent;
 import net.md_5.bungee.api.plugin.Listener;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/PluginMessageListener.java
@@ -7,7 +7,7 @@
 import com.google.gson.JsonSerializer;
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
-import com.jaimemartz.playerbalancer.manager.PlayerLocker;
+import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import com.jaimemartz.playerbalancer.ping.ServerStatus;
 import com.jaimemartz.playerbalancer.section.ServerSection;
 import net.md_5.bungee.api.config.ServerInfo;
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/listeners/ServerConnectListener.java
@@ -3,8 +3,9 @@
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
 import com.jaimemartz.playerbalancer.connection.ServerAssignRegistry;
-import com.jaimemartz.playerbalancer.manager.PlayerLocker;
+import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import com.jaimemartz.playerbalancer.section.ServerSection;
+import com.jaimemartz.playerbalancer.settings.props.features.PermissionRouterProps;
 import com.jaimemartz.playerbalancer.utils.MessageUtils;
 import net.md_5.bungee.api.Callback;
 import net.md_5.bungee.api.config.ServerInfo;
@@ -14,18 +15,27 @@
 import net.md_5.bungee.event.EventHandler;
 import net.md_5.bungee.event.EventPriority;
 
+import java.util.Optional;
+
 public class ServerConnectListener implements Listener {
     private final PlayerBalancer plugin;
 
+    private final PermissionRouterProps permissionRouterProps;
+
     public ServerConnectListener(PlayerBalancer plugin) {
         this.plugin = plugin;
+
+        this.permissionRouterProps = plugin.getSettings().getFeaturesProps().getPermissionRouterProps();
     }
 
     @EventHandler(priority = EventPriority.HIGHEST)
     public void onConnect(ServerConnectEvent event) {
         ProxiedPlayer player = event.getPlayer();
         ServerInfo target = event.getTarget();
 
+        if (PlayerLocker.isLocked(player))
+            return;
+
         ServerSection section = getSection(player, target);
 
         if (section == null)
@@ -53,8 +63,14 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo target) {
         ServerSection section = plugin.getSectionManager().getByServer(target);
 
         if (section != null) {
-            if (PlayerLocker.isLocked(player)) {
-                return null;
+            if (permissionRouterProps.isEnabled()) {
+                Optional<String> bindName = permissionRouterProps.getRouteBind(player, section);
+                if (bindName.isPresent()) {
+                    ServerSection bind = plugin.getSectionManager().getByName(bindName.get());
+                    if (bind != null) {
+                        return bind;
+                    }
+                }
             }
 
             //Checks only for servers (not the section server)
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
@@ -2,7 +2,7 @@
 
 import com.jaimemartz.playerbalancer.PlayerBalancer;
 import com.jaimemartz.playerbalancer.connection.ConnectionIntent;
-import com.jaimemartz.playerbalancer.manager.PlayerLocker;
+import com.jaimemartz.playerbalancer.helper.PlayerLocker;
 import com.jaimemartz.playerbalancer.section.ServerSection;
 import com.jaimemartz.playerbalancer.settings.props.MessagesProps;
 import com.jaimemartz.playerbalancer.settings.props.features.KickHandlerProps;
@@ -111,8 +111,16 @@ private ServerSection getSection(ProxiedPlayer player, ServerInfo from) {
         }
 
         if (current != null) {
-            ServerSection target = plugin.getSectionManager().getBind(props.getRules(), current)
-                    .orElse(current.getParent());
+            ServerSection target = current.getParent();
+
+            String bindName = props.getRules().get(current.getName());
+            if (bindName != null) {
+                ServerSection bind = plugin.getSectionManager().getByName(bindName);
+                if (bind != null) {
+                    target = bind;
+                }
+            }
+
             if (target == null) {
                 MessageUtils.send(player, messages.getUnavailableServerMessage());
                 return null;
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
@@ -349,12 +349,6 @@ public boolean isReiterative(ServerSection section) {
         return reiterativeSections.contains(section.getName());
     }
 
-    public Optional<ServerSection> getBind(Map<String, String> rules, ServerSection section) {
-        String bind = rules.get(section.getName());
-        ServerSection res = this.getByName(bind);
-        return Optional.ofNullable(res);
-    }
-
     public Map<String, ServerSection> getSections() {
         return sections;
     }
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
@@ -31,4 +31,7 @@ public class FeaturesProps {
 
     @Setting(value = "custom-server-command")
     private CustomServerCommandProps customServerCommandProps;
+
+    @Setting(value = "permission-router")
+    private PermissionRouterProps permissionRouterProps;
 }
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/PermissionRouterProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/features/PermissionRouterProps.java
@@ -0,0 +1,34 @@
+package com.jaimemartz.playerbalancer.settings.props.features;
+
+import com.jaimemartz.playerbalancer.section.ServerSection;
+import lombok.Data;
+import net.md_5.bungee.api.connection.ProxiedPlayer;
+import ninja.leaping.configurate.objectmapping.Setting;
+import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
+
+import java.util.Map;
+import java.util.Optional;
+
+@ConfigSerializable
+@Data
+public class PermissionRouterProps {
+    @Setting
+    private boolean enabled;
+
+    @Setting
+    private Map<String, Map<String, String>> rules;
+
+    public Optional<String> getRouteBind(ProxiedPlayer player, ServerSection section) {
+        Map<String, String> routes = rules.get(section.getName());
+
+        if (routes != null) {
+            for (Map.Entry<String, String> route : routes.entrySet()) {
+                if (player.hasPermission(route.getKey())) {
+                    return Optional.of(route.getValue());
+                }
+            }
+        }
+
+        return Optional.empty();
+    }
+}
diff --git a/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/shared/SectionProps.java b/Main Plugin/src/main/java/com/jaimemartz/playerbalancer/settings/props/shared/SectionProps.java
@@ -13,6 +13,9 @@ public class SectionProps {
     @Setting
     private ProviderType provider;
 
+    @Setting
+    private String alias;
+
     @Setting(value = "parent")
     private String parentName;
 
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
`@@ -1,4 +1,4 @@`
`1`		`-package com.jaimemartz.playerbalancer.commands.custom;`
	`1`	`+package com.jaimemartz.playerbalancer.commands;`
`2`	`2`
`3`	`3`	`import com.jaimemartz.playerbalancer.PlayerBalancer;`
`4`	`4`	`import com.jaimemartz.playerbalancer.settings.props.features.CustomFindCommandProps;`