bigjango13/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Pull Requests Activity

Server Changes

Browse Source
This commit is contained in:
TheBrokenRail 2024-09-21 01:46:52 -04:00
parent 9bb6b86c73
commit e2c82071c7
3 changed files with 168 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mods/include/mods/server/server_properties.h
View File

@ -3,6 +3,20 @@
#include <string> #include <string>
#include <istream> #include <istream>
#include <map> #include <map>
#include <vector>
struct ServerProperty {
static std::vector<const ServerProperty *> all;
const char *const key;
const char *const def;
const char *const comment;
ServerProperty(const char *const key_, const char *const def_, const char *const comment_):
key(key_),
def(def_),
comment(comment_) {
all.push_back(this);
}
};
class ServerProperties { class ServerProperties {
std::map<std::string, std::string> properties; std::map<std::string, std::string> properties;
@ -10,7 +24,7 @@ class ServerProperties {
public: public:
void load(std::istream &stream); void load(std::istream &stream);
[[nodiscard]] std::string get_string(const std::string &name, const std::string &def) const; [[nodiscard]] std::string get_string(const ServerProperty &property) const;
[[nodiscard]] int get_int(const std::string &name, const std::string &def) const; [[nodiscard]] int get_int(const ServerProperty &property) const;
[[nodiscard]] bool get_bool(const std::string &name, const std::string &def) const; [[nodiscard]] bool get_bool(const ServerProperty &property) const;
}; };

241
mods/src/server/server.cpp
View File

@ -35,22 +35,24 @@ ServerProperties &get_server_properties() {
} }
// Default Server Properties // Default Server Properties
#define DEFAULT_MOTD "Minecraft Server" namespace ServerPropertyTypes {
#define DEFAULT_SHOW_MINECON_BADGE "false" static ServerProperty message_of_the_day("motd", "Minecraft Server", "Message Of The Day");
#define DEFAULT_GAME_MODE "0" static ServerProperty show_minecon_badge("show-minecon-badge", "false", "Show The MineCon Badge Next To MOTD In Server List");
#define DEFAULT_PORT "19132" static ServerProperty game_mode("game-mode", "0", "Game Mode (0 = Survival, 1 = Creative)");
#define DEFAULT_SEED "" static ServerProperty port("port", "19132", "Port");
#define DEFAULT_FORCE_MOB_SPAWNING "false" static ServerProperty seed("seed", "", "World Seed (Blank = Random Seed)");
#define DEFAULT_PEACEFUL_MODE "false" static ServerProperty force_mob_spawning("force-mob-spawning", "false", "Force Mob Spawning (false = Disabled, true = Enabled)");
#define DEFAULT_WORLD_NAME "world" static ServerProperty peaceful_mode("peaceful-mode", "false", "Peaceful Mode (false = Disabled, true = Enabled)");
#define DEFAULT_MAX_PLAYERS "4" static ServerProperty world_name("world-name", "world", "World To Select");
#define DEFAULT_WHITELIST "false" static ServerProperty max_players("max-players", "4", "Maximum Player Count");
#define DEFAULT_DEATH_MESSAGES "true" static ServerProperty enable_whitelist("whitelist", "false", "Enable Whitelist");
#define DEFAULT_GENERATE_CAVES "true" static ServerProperty enable_death_messages("death-messages", "true", "Enable Death Messages");
static ServerProperty enable_cave_generation("generate-caves", "true", "Generate Caves");
}
// Get World Name // Get World Name
static std::string get_world_name() { static std::string get_world_name() {
const std::string name = get_server_properties().get_string("world-name", DEFAULT_WORLD_NAME); const std::string name = get_server_properties().get_string(ServerPropertyTypes::world_name);
char *safe_name_c = to_cp437(name.c_str()); char *safe_name_c = to_cp437(name.c_str());
std::string safe_name = safe_name_c; std::string safe_name = safe_name_c;
free(safe_name_c); free(safe_name_c);
@ -67,12 +69,12 @@ static void start_world(Minecraft *minecraft) {
// Peaceful Mode // Peaceful Mode
Options *options = &minecraft->options; Options *options = &minecraft->options;
options->game_difficulty = get_server_properties().get_bool("peaceful-mode", DEFAULT_PEACEFUL_MODE) ? 0 : 2; options->game_difficulty = get_server_properties().get_bool(ServerPropertyTypes::peaceful_mode) ? 0 : 2;
// Specify Level Settings // Specify Level Settings
LevelSettings settings; LevelSettings settings;
settings.game_type = get_server_properties().get_int("game-mode", DEFAULT_GAME_MODE); settings.game_type = get_server_properties().get_int(ServerPropertyTypes::game_mode);
const std::string seed_str = get_server_properties().get_string("seed", DEFAULT_SEED); const std::string seed_str = get_server_properties().get_string(ServerPropertyTypes::seed);
const int32_t seed = get_seed_from_string(seed_str); const int32_t seed = get_seed_from_string(seed_str);
settings.seed = seed; settings.seed = seed;
@ -82,7 +84,7 @@ static void start_world(Minecraft *minecraft) {
// Don't Open Port When Using --only-generate // Don't Open Port When Using --only-generate
if (!only_generate) { if (!only_generate) {
// Open Port // Open Port
const int port = get_server_properties().get_int("port", DEFAULT_PORT); const int port = get_server_properties().get_int(ServerPropertyTypes::port);
INFO("Listening On: %i", port); INFO("Listening On: %i", port);
minecraft->hostMultiplayer(port); minecraft->hostMultiplayer(port);
} }
@ -96,7 +98,7 @@ static void start_world(Minecraft *minecraft) {
// Check If Running In Whitelist Mode // Check If Running In Whitelist Mode
static bool is_whitelist() { static bool is_whitelist() {
return get_server_properties().get_bool("whitelist", DEFAULT_WHITELIST); return get_server_properties().get_bool(ServerPropertyTypes::enable_whitelist);
} }
// Get Path Of Blacklist (Or Whitelist) File // Get Path Of Blacklist (Or Whitelist) File
static std::string get_blacklist_file() { static std::string get_blacklist_file() {
@ -269,6 +271,30 @@ static void handle_server_stop(Minecraft *minecraft) {
} }
// Handle Commands // Handle Commands
struct Command {
const std::string name;
const std::string comment;
const std::function<void(const std::string &)> callback;
[[nodiscard]] bool has_args() const {
return name[name.length() - 1] == ' ';
}
[[nodiscard]] std::string get_lhs_help() const {
std::string out;
out.append(4, ' ');
out += name;
if (has_args()) {
out += "<Arguments>";
}
return out;
}
[[nodiscard]] std::string get_full_help(const int max_lhs_length) const {
std::string out = get_lhs_help();
out.append(max_lhs_length - out.length(), ' ');
out += " - ";
out += comment;
return out;
}
};
static void handle_commands(Minecraft *minecraft) { static void handle_commands(Minecraft *minecraft) {
// Check If Level Is Generated // Check If Level Is Generated
if (minecraft->isLevelGenerated() && stdin_line_ready) { if (minecraft->isLevelGenerated() && stdin_line_ready) {
@ -279,57 +305,96 @@ static void handle_commands(Minecraft *minecraft) {
// Command Ready; Run It // Command Ready; Run It
ServerSideNetworkHandler *server_side_network_handler = get_server_side_network_handler(minecraft); ServerSideNetworkHandler *server_side_network_handler = get_server_side_network_handler(minecraft);
if (server_side_network_handler != nullptr) { if (server_side_network_handler != nullptr) {
static std::string ban_command("ban "); // Generate Command List
static std::string say_command("say "); std::vector<Command> commands;
static std::string kill_command("kill "); if (!is_whitelist()) {
static std::string list_command("list"); commands.push_back({
static std::string reload_command("reload"); .name = "ban ",
static std::string tps_command("tps"); .comment = "IP-Ban All Players With Specified Username",
static std::string stop_command("stop"); .callback = [&minecraft](const std::string &cmd) {
static std::string help_command("help"); find_players(minecraft, cmd, ban_callback, false);
if (!is_whitelist() && data.rfind(ban_command, 0) == 0) { }
// IP-Ban Target Username });
const std::string ban_username = data.substr(ban_command.length()); }
find_players(minecraft, ban_username, ban_callback, false); commands.push_back({
} else if (data == reload_command) { .name = "reload",
INFO("Reloading %s", is_whitelist() ? "Whitelist" : "Blacklist"); .comment = std::string("Reload The ") + (is_whitelist() ? "Whitelist" : "Blacklist"),
is_ip_in_blacklist(nullptr); .callback = [](__attribute__((unused)) const std::string &cmd) {
} else if (data.rfind(kill_command, 0) == 0) { INFO("Reloading %s", is_whitelist() ? "Whitelist" : "Blacklist");
// Kill Target Username is_ip_in_blacklist(nullptr);
const std::string kill_username = data.substr(kill_command.length());
find_players(minecraft, kill_username, kill_callback, false);
} else if (data.rfind(say_command, 0) == 0) {
// Format Message
const std::string message = "[Server] " + data.substr(say_command.length());
char *safe_message = to_cp437(message.c_str());
std::string cpp_string = safe_message;
// Post Message To Chat
server_side_network_handler->displayGameMessage(cpp_string);
// Free
free(safe_message);
} else if (data == list_command) {
// List Players
INFO("All Players:");
find_players(minecraft, "", list_callback, true);
} else if (data == tps_command) {
// Print TPS
INFO("TPS: %f", tps);
} else if (data == stop_command) {
// Stop Server
compat_request_exit();
} else if (data == help_command) {
INFO("All Commands:");
if (!is_whitelist()) {
INFO(" ban <Username> - IP-Ban All Players With Specifed Username");
} }
INFO(" reload - Reload The %s", is_whitelist() ? "Whitelist" : "Blacklist"); });
INFO(" kill <Username> - Kill All Players With Specifed Username"); commands.push_back({
INFO(" say <Message> - Print Specified Message To Chat"); .name = "kill ",
INFO(" list - List All Players"); .comment = "Kill All Players With Specified Username",
INFO(" tps - Print TPS"); .callback = [&minecraft](const std::string &cmd) {
INFO(" stop - Stop Server"); find_players(minecraft, cmd, kill_callback, false);
INFO(" help - Print This Message"); }
} else { });
commands.push_back({
.name = "say ",
.comment = "Print Specified Message To Chat",
.callback = [&server_side_network_handler](const std::string &cmd) {
// Format Message
const std::string message = "[Server] " + cmd;
char *safe_message = to_cp437(message.c_str());
std::string cpp_string = safe_message;
// Post Message To Chat
server_side_network_handler->displayGameMessage(cpp_string);
// Free
free(safe_message);
}
});
commands.push_back({
.name = "list",
.comment = "List All Players",
.callback = [&minecraft](__attribute__((unused)) const std::string &cmd) {
INFO("All Players:");
find_players(minecraft, "", list_callback, true);
}
});
commands.push_back({
.name = "tps",
.comment = "Print TPS",
.callback = [](__attribute__((unused)) const std::string &cmd) {
INFO("TPS: %f", tps);
}
});
commands.push_back({
.name = "stop",
.comment = "Stop Server",
.callback = [](__attribute__((unused)) const std::string &cmd) {
compat_request_exit();
}
});
commands.push_back({
.name = "help",
.comment = "Print This Message",
.callback = [&commands](__attribute__((unused)) const std::string &cmd) {
INFO("All Commands:");
int max_lhs_length = 0;
for (Command command : commands) {
const int lhs_length = command.get_lhs_help().length();
if (lhs_length > max_lhs_length) {
max_lhs_length = lhs_length;
}
}
for (Command command : commands) {
INFO("%s", command.get_full_help(max_lhs_length).c_str());
}
}
});
// Run
bool success = false;
for (Command command : commands) {
const bool valid = command.has_args() ? data.rfind(command.name, 0) == 0 : data == command.name;
if (valid) {
command.callback(data.substr(command.name.length()));
success = true;
break;
}
}
if (!success) {
INFO("Invalid Command: %s", data.c_str()); INFO("Invalid Command: %s", data.c_str());
} }
} }
@ -431,7 +496,7 @@ static Player *ServerSideNetworkHandler_onReady_ClientGeneration_ServerSideNetwo
// Get MOTD // Get MOTD
static std::string get_motd() { static std::string get_motd() {
std::string motd(get_server_properties().get_string("motd", DEFAULT_MOTD)); std::string motd(get_server_properties().get_string(ServerPropertyTypes::message_of_the_day));
return motd; return motd;
} }
@ -443,13 +508,13 @@ static const char *get_features() {
loaded_features = true; loaded_features = true;
features.clear(); features.clear();
if (get_server_properties().get_bool("force-mob-spawning", DEFAULT_FORCE_MOB_SPAWNING)) { if (get_server_properties().get_bool(ServerPropertyTypes::force_mob_spawning)) {
features += "Force Mob Spawning|"; features += "Force Mob Spawning|";
} }
if (get_server_properties().get_bool("death-messages", DEFAULT_DEATH_MESSAGES)) { if (get_server_properties().get_bool(ServerPropertyTypes::enable_death_messages)) {
features += "Implement Death Messages|"; features += "Implement Death Messages|";
} }
if (get_server_properties().get_bool("generate-caves", DEFAULT_GENERATE_CAVES)) { if (get_server_properties().get_bool(ServerPropertyTypes::enable_cave_generation)) {
features += "Generate Caves|"; features += "Generate Caves|";
} }
} }
@ -458,7 +523,7 @@ static const char *get_features() {
// Get Max Players // Get Max Players
static unsigned char get_max_players() { static unsigned char get_max_players() {
int val = get_server_properties().get_int("max-players", DEFAULT_MAX_PLAYERS); int val = get_server_properties().get_int(ServerPropertyTypes::max_players);
if (val < 0) { if (val < 0) {
val = 0; val = 0;
} }
@ -479,30 +544,10 @@ static void server_init() {
if (!properties_file.good()) { if (!properties_file.good()) {
// Write Defaults // Write Defaults
std::ofstream properties_file_output(file); std::ofstream properties_file_output(file);
properties_file_output << "# Message Of The Day\n"; for (const ServerProperty *property : ServerProperty::all) {
properties_file_output << "motd=" DEFAULT_MOTD "\n"; properties_file_output << "# " << property->comment << '\n';
properties_file_output << "# Show The MineCon Badge Next To MOTD In Server List\n"; properties_file_output << property->key << '=' << property->def << '\n';
properties_file_output << "show-minecon-badge=" DEFAULT_SHOW_MINECON_BADGE "\n"; }
properties_file_output << "# Game Mode (0 = Survival, 1 = Creative)\n";
properties_file_output << "game-mode=" DEFAULT_GAME_MODE "\n";
properties_file_output << "# Port\n";
properties_file_output << "port=" DEFAULT_PORT "\n";
properties_file_output << "# World Seed (Blank = Random Seed)\n";
properties_file_output << "seed=" DEFAULT_SEED "\n";
properties_file_output << "# Force Mob Spawning (false = Disabled, true = Enabled)\n";
properties_file_output << "force-mob-spawning=" DEFAULT_FORCE_MOB_SPAWNING "\n";
properties_file_output << "# Peaceful Mode (false = Disabled, true = Enabled)\n";
properties_file_output << "peaceful-mode=" DEFAULT_PEACEFUL_MODE "\n";
properties_file_output << "# World To Select\n";
properties_file_output << "world-name=" DEFAULT_WORLD_NAME "\n";
properties_file_output << "# Maximum Player Count\n";
properties_file_output << "max-players=" DEFAULT_MAX_PLAYERS "\n";
properties_file_output << "# Enable Whitelist\n";
properties_file_output << "whitelist=" DEFAULT_WHITELIST "\n";
properties_file_output << "# Enable Death Messages\n";
properties_file_output << "death-messages=" DEFAULT_DEATH_MESSAGES "\n";
properties_file_output << "# Generate Caves\n";
properties_file_output << "generate-caves=" DEFAULT_GENERATE_CAVES "\n";
properties_file_output.close(); properties_file_output.close();
// Re-Open File // Re-Open File
properties_file = std::ifstream(file); properties_file = std::ifstream(file);
@ -544,7 +589,7 @@ static void server_init() {
overwrite_calls(RakNet_RakPeer_IsBanned, RakNet_RakPeer_IsBanned_injection); overwrite_calls(RakNet_RakPeer_IsBanned, RakNet_RakPeer_IsBanned_injection);
// Show The MineCon Icon Next To MOTD In Server List // Show The MineCon Icon Next To MOTD In Server List
if (get_server_properties().get_bool("show-minecon-badge", DEFAULT_SHOW_MINECON_BADGE)) { if (get_server_properties().get_bool(ServerPropertyTypes::show_minecon_badge)) {
unsigned char minecon_badge_patch[4] = {0x04, 0x1a, 0x9f, 0xe5}; // "ldr r1, [0x741f0]" unsigned char minecon_badge_patch[4] = {0x04, 0x1a, 0x9f, 0xe5}; // "ldr r1, [0x741f0]"
patch((void *) 0x737e4, minecon_badge_patch); patch((void *) 0x737e4, minecon_badge_patch);
} }

18
mods/src/server/server_properties.cpp
View File

@ -1,5 +1,7 @@
#include <mods/server/server_properties.h> #include <mods/server/server_properties.h>
std::vector<const ServerProperty *> ServerProperty::all;
static bool is_true(std::string const& val) { static bool is_true(std::string const& val) {
return (val == "true" || val == "yes" || val == "1"); return (val == "true" || val == "yes" || val == "1");
} }
@ -20,18 +22,14 @@ void ServerProperties::load(std::istream &stream) {
} }
} }
std::string ServerProperties::get_string(const std::string &name, const std::string &def) const { std::string ServerProperties::get_string(const ServerProperty &property) const {
return properties.contains(name) ? properties.at(name) : def; return properties.contains(property.key) ? properties.at(property.key) : property.def;
} }
int ServerProperties::get_int(const std::string &name, const std::string &def) const { int ServerProperties::get_int(const ServerProperty &property) const {
return properties.contains(name) ? std::stoi(properties.at(name)) : std::stoi(def); return std::stoi(get_string(property));
} }
bool ServerProperties::get_bool(const std::string &name, const std::string &def) const { bool ServerProperties::get_bool(const ServerProperty &property) const {
if (properties.contains(name)) { return is_true(get_string(property));
const std::string &val = properties.at(name);
return is_true(val);
}
return is_true(def);
} }