FEAT: server-side commands

src/commands/Command.hpp

@@ -17,8 +17,8 @@ public:
 
     bool isPlayerOp(Minecraft& mc, Player& player);
 
-    virtual void execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) = 0;
-    virtual void printHelp(Minecraft& mc) = 0;
+    virtual std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) = 0;
+    virtual std::string help(Minecraft& mc) = 0;
 
 protected:
     Command(const std::string& name, CommandFlags flags = (CommandFlags)0) : m_name(name), m_flags(flags) {}

src/commands/CommandHelp.cpp

@@ -2,26 +2,34 @@
 #include "commands/Command.hpp"
 #include "CommandManager.hpp"
 #include <client/Minecraft.h>
+#include <sstream>
 
 CommandHelp::CommandHelp() : Command("help") {}
 
-void CommandHelp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
+std::string CommandHelp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
     if (args.empty()) {
         auto cmds = mc.commandManager().getListAllCommands();
 
-        mc.addMessage("Usage: /help <command>");
-        mc.addMessage("List of all commands:");
+        std::ostringstream output;
+
+        output << "List of all commands:" << std::endl;
         
         for (auto& cmd : cmds) {
-            mc.addMessage(" - " + cmd);
+            output << " - " + cmd << std::endl;;
         }
-    } else {
-        Command* cmd = mc.commandManager().getCommand(args[0]);
 
-        if (cmd != nullptr) {
-            cmd->printHelp(mc);
-        }
+        return output.str();
     }
+
+    Command* cmd = mc.commandManager().getCommand(args[0]);
+
+    if (cmd != nullptr) {
+        return cmd->help(mc);
+    }
+
+    return "help: command " + args[0] + " not found";
 }
 
-void CommandHelp::printHelp(Minecraft& mc) {}
+std::string CommandHelp::help(Minecraft& mc) {
+    return "Usage: /help <command>";
+}

src/commands/CommandHelp.hpp

@@ -4,6 +4,6 @@ class CommandHelp : public Command {
 public:
     CommandHelp();
 
-    void execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    void printHelp(Minecraft& mc);
+    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
+    std::string help(Minecraft& mc);
 };

src/commands/CommandKick.cpp

@@ -9,13 +9,13 @@
 
 CommandKick::CommandKick() : Command("kick") {}
 
-void CommandKick::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
+std::string CommandKick::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
     if (!isPlayerOp(mc, player)) {
-        return mc.addMessage("You aren't enough priveleged to run this command");
+        return "You aren't enough priveleged to run this command";
     }
     
     if (args.empty()) {
-        return printHelp(mc);
+        return help(mc);
     }
 
     auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [args] (auto& it) -> bool {
@@ -23,11 +23,11 @@ void CommandKick::execute(Minecraft& mc, Player& player, const std::vector<std::
     });
 
     if (it == mc.level->players.end()) {
-        return mc.addMessage("kick: can't find player with name " + args[0]);
+        return "kick: can't find player with name " + args[0];
     }
 
     if (*it == (Player*)mc.player) {
-        return mc.addMessage("kick: you can't kick urself lol");
+        return "kick: you can't kick urself lol";
     }
 
     mc.level->removePlayer(*it);
@@ -36,6 +36,6 @@ void CommandKick::execute(Minecraft& mc, Player& player, const std::vector<std::
     mc.addMessage("kick: successfully kicked player " + args[0]);
 }
 
-void CommandKick::printHelp(Minecraft& mc) {
-    mc.addMessage("Usage: /kick <player>");
+std::string CommandKick::help(Minecraft& mc) {
+    return "Usage: /kick <player>";
 }

src/commands/CommandKick.hpp

@@ -4,6 +4,6 @@ class CommandKick : public Command {
 public:
     CommandKick();
 
-    void execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    void printHelp(Minecraft& mc);
+    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
+    std::string help(Minecraft& mc);
 };

src/commands/CommandManager.cpp

@@ -33,7 +33,7 @@ std::vector<std::string> CommandManager::getListAllCommands() {
     return ret;
 }
 
-void CommandManager::execute(Minecraft& mc, Player& player, const std::string& input) {
+std::string CommandManager::execute(Minecraft& mc, Player& player, const std::string& input) {
     std::istringstream ss(input);
     std::string cmd;
 
@@ -44,7 +44,7 @@ void CommandManager::execute(Minecraft& mc, Player& player, const std::string& i
     });
 
     if (it == m_commands.end()) {
-        return mc.addMessage("Command /" + cmd + " not found");
+        return "Command /" + cmd + " not found";
     }
 
     std::vector<std::string> args;
@@ -53,11 +53,13 @@ void CommandManager::execute(Minecraft& mc, Player& player, const std::string& i
     while (ss >> tok) args.push_back(tok);
     
     if (!mc.level->isClientSide || (*it)->getFlags() & CommandFlags::COMMAND_FLAG_SINGLEPLAYER_ONLY) {
-        (*it)->execute(mc, player, args);
+        return (*it)->execute(mc, player, args);
     } else {
         ChatPacket packet("/" + input);
         mc.raknetInstance->send(packet);
     }
+
+    return "";
 }
 
 Command* CommandManager::getCommand(const std::string& name) {

src/commands/CommandManager.hpp

@@ -10,7 +10,7 @@ public:
 
     std::vector<std::string> getListAllCommands();
 
-    void execute(Minecraft& mc, Player& player, const std::string& input);
+    std::string execute(Minecraft& mc, Player& player, const std::string& input);
 
     Command* getCommand(const std::string& name);
 

src/commands/CommandOp.cpp

@@ -9,13 +9,13 @@
 
 CommandOp::CommandOp() : Command("op") {}
 
-void CommandOp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
+std::string CommandOp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
     if (!isPlayerOp(mc, player)) {
-        return mc.addMessage("You aren't enough priveleged to run this command");
+        return "You aren't enough priveleged to run this command";
     }
     
     if (args.empty()) {
-        return printHelp(mc);
+        return help(mc);
     }
 
     auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [args] (auto& it) -> bool {
@@ -23,13 +23,13 @@ void CommandOp::execute(Minecraft& mc, Player& player, const std::vector<std::st
     });
 
     if (mc.level->ops.find(args[0]) != mc.level->ops.end()) {
-        return mc.addMessage("op: player " + args[0] + " already opped");
+        return "op: player " + args[0] + " already opped";
     }
 
     mc.level->ops.emplace((*it)->name);
-    mc.addMessage("op: successfully opped player " + args[0]);
+    return "op: successfully opped player " + args[0];
 }
 
-void CommandOp::printHelp(Minecraft& mc) {
-    mc.addMessage("Usage: /op <player>");
+std::string CommandOp::help(Minecraft& mc) {
+    return "Usage: /op <player>";
 }

src/commands/CommandOp.hpp

@@ -4,6 +4,6 @@ class CommandOp : public Command {
 public:
     CommandOp();
 
-    void execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    void printHelp(Minecraft& mc);
+    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
+    std::string help(Minecraft& mc);
 };