Add Geyser reload command and commands for platforms (Closes #141)

connector/src/main/java/org/geysermc/connector/GeyserConnector.java

@@ -68,9 +68,6 @@ public class GeyserConnector {
     private RemoteServer remoteServer;
     private AuthType authType;
 
-    private IGeyserLogger logger;
-    private IGeyserConfiguration config;
-
     private GeyserCommandMap commandMap;
 
     private boolean shuttingDown = false;
@@ -80,15 +77,20 @@ public class GeyserConnector {
 
     private BedrockServer bedrockServer;
     private PlatformType platformType;
+    private IGeyserBootstrap bootstrap;
 
     private Metrics metrics;
 
-    private GeyserConnector(PlatformType platformType, IGeyserConfiguration config, IGeyserLogger logger) {
+    private GeyserConnector(PlatformType platformType, IGeyserBootstrap bootstrap) {
         long startupTime = System.currentTimeMillis();
 
         instance = this;
 
-        this.logger = logger;
+        this.bootstrap = bootstrap;
+
+        IGeyserLogger logger = bootstrap.getGeyserLogger();
+        IGeyserConfiguration config = bootstrap.getGeyserConfig();
+
         this.platformType = platformType;
 
         logger.info("******************************************");
@@ -97,7 +99,6 @@ public class GeyserConnector {
         logger.info("");
         logger.info("******************************************");
 
-        this.config = config;
         this.generalThreadPool = Executors.newScheduledThreadPool(config.getGeneralThreadPool());
 
         logger.setDebug(config.isDebugMode());
@@ -137,11 +138,16 @@ public class GeyserConnector {
     }
 
     public void shutdown() {
-        logger.info("Shutting down Geyser.");
+        bootstrap.getGeyserLogger().info("Shutting down Geyser.");
         shuttingDown = true;
 
         generalThreadPool.shutdown();
         bedrockServer.close();
+        players.clear();
+        remoteServer = null;
+        authType = null;
+        commandMap.getCommands().clear();
+        commandMap = null;
     }
 
     public void addPlayer(GeyserSession player) {
@@ -157,11 +163,20 @@ public class GeyserConnector {
     }
 
     public static GeyserConnector start(PlatformType platformType, IGeyserBootstrap bootstrap) {
-        return new GeyserConnector(platformType, bootstrap.getGeyserConfig(), bootstrap.getGeyserLogger());
+        return new GeyserConnector(platformType, bootstrap);
     }
 
-    public static void stop() {
-        instance.shutdown();
+    public void reload() {
+        shutdown();
+        bootstrap.onEnable();
+    }
+
+    public IGeyserLogger getLogger() {
+        return bootstrap.getGeyserLogger();
+    }
+
+    public IGeyserConfiguration getConfig() {
+        return bootstrap.getGeyserConfig();
     }
 
     public static GeyserConnector getInstance() {

connector/src/main/java/org/geysermc/connector/command/GeyserCommand.java

@@ -25,33 +25,23 @@
 
 package org.geysermc.connector.command;
 
-import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
 import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @Getter
-@Setter
+@RequiredArgsConstructor
 public abstract class GeyserCommand {
 
-    private String name;
-    private String description;
-
-    @Setter(AccessLevel.NONE)
-    private GeyserCommandMap commandMap;
+    protected final String name;
+    protected final String description;
+    protected final String permission;
 
+    @Setter
     private List<String> aliases = new ArrayList<>();
 
-    public GeyserCommand(String name) {
-        this(name,  "A geyser command.");
-    }
-
-    public GeyserCommand(String name, String description) {
-        this.name = name;
-        this.description = description;
-    }
-
     public abstract void execute(CommandSender sender, String[] args);
-}
+}

connector/src/main/java/org/geysermc/connector/command/GeyserCommandMap.java

@@ -25,8 +25,10 @@
 
 package org.geysermc.connector.command;
 
+import lombok.Getter;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.defaults.HelpCommand;
+import org.geysermc.connector.command.defaults.ReloadCommand;
 import org.geysermc.connector.command.defaults.StopCommand;
 
 import java.util.Collections;
@@ -35,37 +37,35 @@ import java.util.Map;
 
 public class GeyserCommandMap {
 
-    private final Map<String, GeyserCommand> commandMap = Collections.synchronizedMap(new HashMap<>());
+    @Getter
+    private final Map<String, GeyserCommand> commands = Collections.synchronizedMap(new HashMap<>());
+
     private GeyserConnector connector;
 
     public GeyserCommandMap(GeyserConnector connector) {
         this.connector = connector;
 
-        registerDefaults();
-    }
-
-    public void registerDefaults() {
-        registerCommand(new HelpCommand(connector, "help", "Shows help for all registered commands."));
-        registerCommand(new StopCommand(connector, "stop", "Shut down Geyser."));
+        registerCommand(new HelpCommand(connector, "help", "Shows help for all registered commands.", "geyser.command.help"));
+        registerCommand(new ReloadCommand(connector, "reload", "Reloads the Geyser configurations. Kicks all players when used!", "geyser.command.reload"));
+        registerCommand(new StopCommand(connector, "stop", "Shuts down Geyser.", "geyser.command.stop"));
     }
 
     public void registerCommand(GeyserCommand command) {
-        commandMap.put(command.getName(), command);
+        commands.put(command.getName(), command);
         connector.getLogger().debug("Registered command " + command.getName());
 
         if (command.getAliases().isEmpty())
             return;
 
         for (String alias : command.getAliases())
-            commandMap.put(alias, command);
+            commands.put(alias, command);
     }
 
     public void runCommand(CommandSender sender, String command) {
         if (!command.startsWith("geyser "))
             return;
 
-        command = command.trim();
-        command = command.replace("geyser ", "");
+        command = command.trim().replace("geyser ", "");
         String label;
         String[] args;
 
@@ -78,7 +78,7 @@ public class GeyserCommandMap {
             args = argLine.contains(" ") ? argLine.split(" ") : new String[] { argLine };
         }
 
-        GeyserCommand cmd = commandMap.get(label);
+        GeyserCommand cmd = commands.get(label);
         if (cmd == null) {
             connector.getLogger().error("Invalid Command! Try /geyser help for a list of commands.");
             return;
@@ -86,8 +86,4 @@ public class GeyserCommandMap {
 
         cmd.execute(sender, args);
     }
-
-    public Map<String, GeyserCommand> getCommands() {
-        return commandMap;
-    }
 }

connector/src/main/java/org/geysermc/connector/command/defaults/HelpCommand.java

@@ -30,14 +30,17 @@ import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.CommandSender;
 import org.geysermc.connector.command.GeyserCommand;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class HelpCommand extends GeyserCommand {
 
     public GeyserConnector connector;
 
-    public HelpCommand(GeyserConnector connector, String name, String description) {
-        super(name, description);
+    public HelpCommand(GeyserConnector connector, String name, String description, String permission) {
+        super(name, description, permission);
         this.connector = connector;
 
         this.setAliases(Collections.singletonList("?"));
@@ -47,12 +50,7 @@ public class HelpCommand extends GeyserCommand {
     public void execute(CommandSender sender, String[] args) {
         sender.sendMessage("---- Showing Help For: Geyser (Page 1/1) ----");
         Map<String, GeyserCommand> cmds = connector.getCommandMap().getCommands();
-
-        List<String> commands = new ArrayList<>(cmds.keySet());
-        Collections.sort(commands);
-
-        for (String cmd : commands) {
-            sender.sendMessage(ChatColor.YELLOW + "/geyser " + cmd + ChatColor.WHITE + ": " + cmds.get(cmd).getDescription());
-        }
+        List<String> commands = connector.getCommandMap().getCommands().keySet().stream().sorted().collect(Collectors.toList());
+        commands.forEach(cmd -> sender.sendMessage(ChatColor.YELLOW + "/geyser " + cmd + ChatColor.WHITE + ": " + cmds.get(cmd).getDescription()));
     }
 }

connector/src/main/java/org/geysermc/connector/command/defaults/ReloadCommand.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.connector.command.defaults;
+
+import org.geysermc.common.ChatColor;
+import org.geysermc.common.PlatformType;
+import org.geysermc.connector.GeyserConnector;
+import org.geysermc.connector.command.CommandSender;
+import org.geysermc.connector.command.GeyserCommand;
+import org.geysermc.connector.network.session.GeyserSession;
+
+public class ReloadCommand extends GeyserCommand {
+
+    private GeyserConnector connector;
+
+    public ReloadCommand(GeyserConnector connector, String name, String description, String permission) {
+        super(name, description, permission);
+        this.connector = connector;
+    }
+
+    @Override
+    public void execute(CommandSender sender, String[] args) {
+        if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
+            return;
+        }
+        sender.sendMessage(ChatColor.YELLOW + "Reloading Geyser configurations... all connected bedrock clients will be kicked.");
+        for (GeyserSession session : connector.getPlayers().values()) {
+            session.getUpstream().disconnect("Geyser has been reloaded... sorry for the inconvenience!");
+        }
+        connector.reload();
+    }
+}

connector/src/main/java/org/geysermc/connector/command/defaults/StopCommand.java

@@ -25,6 +25,7 @@
 
 package org.geysermc.connector.command.defaults;
 
+import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.CommandSender;
 import org.geysermc.connector.command.GeyserCommand;
@@ -33,10 +34,10 @@ import java.util.Collections;
 
 public class StopCommand extends GeyserCommand {
 
-    public GeyserConnector connector;
+    private GeyserConnector connector;
 
-    public StopCommand(GeyserConnector connector, String name, String description) {
-        super(name, description);
+    public StopCommand(GeyserConnector connector, String name, String description, String permission) {
+        super(name, description, permission);
         this.connector = connector;
 
         this.setAliases(Collections.singletonList("shutdown"));
@@ -44,9 +45,9 @@ public class StopCommand extends GeyserCommand {
 
     @Override
     public void execute(CommandSender sender, String[] args) {
-        if (!sender.isConsole())
+        if (!sender.isConsole() && connector.getPlatformType() == PlatformType.STANDALONE) {
             return;
-
+        }
         connector.shutdown();
     }
 }

connector/src/main/java/org/geysermc/connector/network/translators/bedrock/BedrockCommandRequestTranslator.java

@@ -28,6 +28,7 @@ package org.geysermc.connector.network.translators.bedrock;
 import com.github.steveice10.mc.protocol.packet.ingame.client.ClientChatPacket;
 import com.nukkitx.protocol.bedrock.packet.CommandRequestPacket;
 
+import org.geysermc.common.PlatformType;
 import org.geysermc.connector.GeyserConnector;
 import org.geysermc.connector.command.GeyserCommandMap;
 import org.geysermc.connector.network.session.GeyserSession;
@@ -39,7 +40,7 @@ public class BedrockCommandRequestTranslator extends PacketTranslator<CommandReq
     public void translate(CommandRequestPacket packet, GeyserSession session) {
         String command = packet.getCommand().replace("/", "");
         GeyserCommandMap commandMap = GeyserConnector.getInstance().getCommandMap();
-        if (command.startsWith("geyser ") && commandMap.getCommands().containsKey(command.split(" ")[1])) {
+        if (session.getConnector().getPlatformType() == PlatformType.STANDALONE && command.startsWith("geyser ") && commandMap.getCommands().containsKey(command.split(" ")[1])) {
             commandMap.runCommand(session, command);
         } else {
             ClientChatPacket chatPacket = new ClientChatPacket(packet.getCommand());