lolcat/minecraft-pe-0.6.1
1
0
Fork 0
mirror of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git synced 2026-04-04 06:23:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

FEAT: server-side commands

Browse Source
This commit is contained in:
Kolyah35
2026-04-04 01:13:56 +03:00
parent 4dc7055d9d
commit 4023d70687
13 changed files with 83 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/gui/screens/ConsoleScreen.cpp
View File

@@ -66,7 +66,11 @@ void ConsoleScreen::execute()
if (_input[0] == '/') {
// Command
_input = Util::stringTrim(_input.substr(1));
minecraft->commandManager().execute(*minecraft, *minecraft->player, _input);
std::istringstream iss(minecraft->commandManager().execute(*minecraft, *minecraft->player, _input));
for (std::string line; std::getline(iss, line); ) {
minecraft->gui.addMessage(line);
}
} else {
// @ai @rewrite
if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
@@ -75,7 +79,7 @@ void ConsoleScreen::execute()
ChatPacket chatPkt(_input);
minecraft->raknetInstance->send(chatPkt);
} else {
minecraft->gui.addMessage(_input);
minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
}
}

4
src/commands/Command.hpp
View File

@@ -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) {}

28
src/commands/CommandHelp.cpp
View File

@@ -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>";
}

4
src/commands/CommandHelp.hpp
View File

@@ -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);
};

14
src/commands/CommandKick.cpp
View File

@@ -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>";
}

4
src/commands/CommandKick.hpp
View File

@@ -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);
};

8
src/commands/CommandManager.cpp
View File

@@ -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) {

2
src/commands/CommandManager.hpp
View File

@@ -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);

14
src/commands/CommandOp.cpp
View File

@@ -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>";
}

4
src/commands/CommandOp.hpp
View File

@@ -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);
};

6
src/network/ClientSideNetworkHandler.cpp
View File

@@ -949,7 +949,11 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
void ClientSideNetworkHandler::handle( const RakNet::RakNetGUID& source, ChatPacket* packet )
{
#ifndef STANDALONE_SERVER
minecraft->gui.displayClientMessage(packet->message);
// minecraft->gui.displayClientMessage(packet->message);
std::istringstream iss(packet->message);
for (std::string line; std::getline(iss, line); ) {
minecraft->gui.addMessage(line);
}
#endif
}

21
src/network/ServerSideNetworkHandler.cpp
View File

@@ -5,6 +5,7 @@
#include "../world/entity/player/Inventory.h"
#include "../world/Container.h"
#include "../world/inventory/BaseContainerMenu.h"
#include "network/packet/ChatPacket.h"
#include "network/packet/ContainerSetSlotPacket.h"
#include "network/packet/LoginStatusPacket.h"
#include "network/packet/MovePlayerPacket.h"
@@ -24,6 +25,7 @@
#include "../raknet/PacketPriority.h"
#include "platform/log.h"
#include "util/Mth.h"
#include "util/StringUtils.h"
#include "world/item/ItemInstance.h"
#include "world/level/storage/LevelStorage.h"
#include "world/phys/Vec3.h"
@@ -154,7 +156,18 @@ void ServerSideNetworkHandler::displayGameMessage(const std::string& message)
void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPacket* packet)
{
displayGameMessage(packet->message);
auto player = getPlayer(source);
if (player == nullptr) return; // TODO maybe kick?
if (packet->message[0] == '/') {
// This is a command
ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1))));
return sendPrivate(resp, source);
}
displayGameMessage("<" + player->name + "> " + packet->message);
}
void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -1020,3 +1033,9 @@ Player* ServerSideNetworkHandler::getPlayer( const RakNet::RakNetGUID& source )
if (source == level->players[i]->owner) return level->players[i];
return NULL;
}
void ServerSideNetworkHandler::sendPrivate(Packet& packet, const RakNet::RakNetGUID& source) {
RakNet::BitStream bitStream;
packet.write(&bitStream);
rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
}

6
src/network/ServerSideNetworkHandler.h
View File

@@ -71,6 +71,12 @@ private:
* @brief Send packet to all players
*/
void redistributePacket(Packet* packet, const RakNet::RakNetGUID& fromPlayer);
/**
* @brief Send packer private with GUID
*/
void sendPrivate(Packet& packet, const RakNet::RakNetGUID& source);
Player* getPlayer(const RakNet::RakNetGUID& source);
Minecraft* minecraft;