diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ec4358..74229f9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,10 +3,9 @@ project(MinecraftPE) include(cmake/CPM.cmake) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_POLICY_VERSION_MINIMUM 3.10) - include(cmake/EnumOption.cmake) if(EMSCRIPTEN) @@ -34,9 +33,11 @@ if (${PLATFORM} STREQUAL "Desktop") add_definitions(-D_CRT_SECURE_NO_WARNINGS) include_directories(misc/windows) set(EXTRA_LIBS ws2_32 winhttp) + add_definitions(-DLUA_DL_DLL=1) elseif(UNIX) find_library(pthread NAMES pthread) set(EXTRA_LIBS pthread m) + add_definitions(-DLUA_USE_DLOPEN=1) endif() elseif (${PLATFORM} STREQUAL "Web") @@ -95,6 +96,46 @@ else() "GLFW_BUILD_TESTS OFF" "GLFW_BUILD_DOCS OFF" ) + + CPMAddPackage("gh:halx99/sol2#support-lua-5.5") + CPMAddPackage("gh:lua/lua#master") + + add_library( + lua STATIC + ${lua_SOURCE_DIR}/lapi.c + ${lua_SOURCE_DIR}/lauxlib.c + ${lua_SOURCE_DIR}/lbaselib.c + ${lua_SOURCE_DIR}/lcode.c + ${lua_SOURCE_DIR}/lcorolib.c + ${lua_SOURCE_DIR}/lctype.c + ${lua_SOURCE_DIR}/ldblib.c + ${lua_SOURCE_DIR}/ldebug.c + ${lua_SOURCE_DIR}/ldo.c + ${lua_SOURCE_DIR}/ldump.c + ${lua_SOURCE_DIR}/lfunc.c + ${lua_SOURCE_DIR}/lgc.c + ${lua_SOURCE_DIR}/linit.c + ${lua_SOURCE_DIR}/liolib.c + ${lua_SOURCE_DIR}/llex.c + ${lua_SOURCE_DIR}/lmathlib.c + ${lua_SOURCE_DIR}/lmem.c + ${lua_SOURCE_DIR}/loadlib.c + ${lua_SOURCE_DIR}/lobject.c + ${lua_SOURCE_DIR}/lopcodes.c + ${lua_SOURCE_DIR}/loslib.c + ${lua_SOURCE_DIR}/lparser.c + ${lua_SOURCE_DIR}/lstate.c + ${lua_SOURCE_DIR}/lstring.c + ${lua_SOURCE_DIR}/lstrlib.c + ${lua_SOURCE_DIR}/ltable.c + ${lua_SOURCE_DIR}/ltablib.c + ${lua_SOURCE_DIR}/ltm.c + ${lua_SOURCE_DIR}/lua.c + ${lua_SOURCE_DIR}/lundump.c + ${lua_SOURCE_DIR}/lutf8lib.c + ${lua_SOURCE_DIR}/lvm.c + ${lua_SOURCE_DIR}/lzio.c + ) endif() CPMAddPackage( @@ -215,6 +256,8 @@ file(GLOB SERVER_SOURCES "src/world/phys/HitResult.cpp" "src/commands/*.cpp" + + "src/plugins/*.cpp" ) file(GLOB CLIENT_SOURCES @@ -300,6 +343,8 @@ file(GLOB CLIENT_SOURCES "src/main.cpp" "src/commands/*.cpp" + "src/plugins/*.cpp" + ) if (${PLATFORM} STREQUAL "Desktop") @@ -308,17 +353,20 @@ endif() # Server add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES}) - +set_target_properties("${PROJECT_NAME}-server" PROPERTIES ENABLE_EXPORTS TRUE) target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER") target_include_directories("${PROJECT_NAME}-server" PUBLIC "${CMAKE_SOURCE_DIR}/src/" + "${lua_SOURCE_DIR}/" + "project/lib_projects/raknet/jni/RaknetSources" ) -target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS}) +target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS} lua sol2::sol2) add_executable(${PROJECT_NAME} ${CLIENT_SOURCES}) +set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE) target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP}) @@ -328,6 +376,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC "${openal_SOURCE_DIR}/include" "${glfw_SOURCE_DIR}/include" "lib/include" + "${lua_SOURCE_DIR}/" + ) if(${PLATFORM} MATCHES "Web") @@ -375,7 +425,7 @@ endif() # Client target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM}) -target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS}) +target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS} lua sol2::sol2) if (OpenSSL_FOUND) target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto) diff --git a/project/lib_projects/raknet/jni/RaknetSources/Rand.cpp b/project/lib_projects/raknet/jni/RaknetSources/Rand.cpp index c3d8413..b01d1c6 100755 --- a/project/lib_projects/raknet/jni/RaknetSources/Rand.cpp +++ b/project/lib_projects/raknet/jni/RaknetSources/Rand.cpp @@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l // so-- that's why the only change I made is to restrict to odd seeds. // - register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state; - register int j; + unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state; + int j; for ( left = 0, *s++ = x, j = N; --j; *s++ = ( x *= 69069U ) & 0xFFFFFFFFU ) @@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left ) { - register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1; - register int j; + unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1; + int j; if ( left < -1 ) seedMT( 4357U ); diff --git a/src/client/Minecraft.cpp b/src/client/Minecraft.cpp index 8c90b6f..5a236f7 100755 --- a/src/client/Minecraft.cpp +++ b/src/client/Minecraft.cpp @@ -287,11 +287,7 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc } } this->level = level; - // So uhhh - std::string op = options.getStringValue(OPTIONS_USERNAME); - std::transform(op.begin(), op.end(), op.begin(), ::tolower); - level->ops.emplace(op); _hasSignaledGeneratingLevelFinished = false; #ifdef STANDALONE_SERVER const bool threadedLevelCreation = false; @@ -1214,6 +1210,8 @@ void Minecraft::init() checkGlError("Init complete"); #endif + PluginsManager::get().init(*this); + options.load(); setIsCreativeMode(false); // false means it's Survival Mode diff --git a/src/client/Minecraft.h b/src/client/Minecraft.h index f1d966f..ffd1973 100755 --- a/src/client/Minecraft.h +++ b/src/client/Minecraft.h @@ -3,6 +3,8 @@ #include "Options.h" #include "commands/CommandManager.hpp" +#include + #ifndef STANDALONE_SERVER #include "MouseHandler.h" #include "gui/Gui.h" diff --git a/src/client/gui/screens/ConsoleScreen.cpp b/src/client/gui/screens/ConsoleScreen.cpp index 42f47ee..70ab2b8 100644 --- a/src/client/gui/screens/ConsoleScreen.cpp +++ b/src/client/gui/screens/ConsoleScreen.cpp @@ -63,15 +63,15 @@ void ConsoleScreen::execute() return minecraft->setScreen(NULL); } - if (_input[0] == '/') { - // Command - _input = Util::stringTrim(_input.substr(1)); + // if (_input[0] == '/') { + // // Command + // _input = Util::stringTrim(_input.substr(1)); - std::istringstream iss(minecraft->commandManager().execute(*minecraft, *minecraft->player, _input)); - for (std::string line; std::getline(iss, line); ) { - minecraft->gui.addMessage(line); - } - } else { + // 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()) { static_cast(minecraft->netCallback)->displayGameMessage(_input); @@ -81,7 +81,7 @@ void ConsoleScreen::execute() } else { minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input); } - } + // } minecraft->setScreen(NULL); } diff --git a/src/commands/CommandBan.cpp b/src/commands/CommandBan.cpp index 0373d5b..1ed80bb 100644 --- a/src/commands/CommandBan.cpp +++ b/src/commands/CommandBan.cpp @@ -5,6 +5,7 @@ #include "world/level/Level.h" #include #include +#include CommandBan::CommandBan() : Command("ban") {} @@ -20,25 +21,21 @@ std::string CommandBan::execute(Minecraft& mc, Player& player, const std::vector std::string nicknameLower = args[0]; std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower); - auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [args, nicknameLower] (auto& it) -> bool { + auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [nicknameLower] (auto& it) -> bool { std::string lower = it->name; std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower); return lower == nicknameLower; }); - if (*it == (Player*)mc.player) { - return "ban: you can't ban urself lol"; - } - if (it != mc.level->players.end()) { - mc.level->removePlayer(*it); - (*it)->remove(); - mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true); + if (*it == (Player*)mc.player) { + return "banip: you can't ban urself lol"; + } } else { for (auto& banned : mc.level->bannedPpl) { if (nicknameLower == banned) { - return args[0] + "already banned!"; + return args[0] + " already banned!"; } } } diff --git a/src/commands/CommandBanIp.cpp b/src/commands/CommandBanIp.cpp new file mode 100644 index 0000000..a829c01 --- /dev/null +++ b/src/commands/CommandBanIp.cpp @@ -0,0 +1,65 @@ +#include "CommandBanIp.hpp" +#include "commands/Command.hpp" +#include "network/RakNetInstance.h" +#include "raknet/RakPeerInterface.h" +#include "world/level/Level.h" +#include +#include + +CommandBanIp::CommandBanIp() : Command("banip") {} + +std::string CommandBanIp::execute(Minecraft& mc, Player& player, const std::vector& args) { + if (!isPlayerOp(mc, player)) { + return "You aren't enough priveleged to run this command"; + } + + if (args.empty()) { + return help(mc); + } + + std::string nicknameLower = args[0]; + std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower); + + auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [nicknameLower] (auto& it) -> bool { + std::string lower = it->name; + std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower); + + return lower == nicknameLower; + }); + + std::string clientIp; + + if (it != mc.level->players.end()) { + if (*it == (Player*)mc.player) { + return "banip: you can't ban urself lol"; + } + + RakNet::SystemAddress sysAddress = mc.raknetInstance->getPeer()->GetSystemAddressFromGuid((*it)->owner); + + char ip[32]; + sysAddress.ToString(false, ip); + + clientIp = ip; + + auto sourceId = (*it)->owner; + + (*it)->reallyRemoveIfPlayer = true; + mc.level->removeEntity((*it)); + mc.raknetInstance->getPeer()->CloseConnection(sourceId, true); + } else { + for (auto& banned : mc.level->bannedIps) { + if (clientIp == banned) { + return args[0] + " already banned!"; + } + } + + clientIp = args[0]; + } + + mc.level->bannedIps.insert(clientIp); + return "banip: successfully banned player by ip " + args[0]; +} + +std::string CommandBanIp::help(Minecraft& mc) { + return "Usage: /banip "; +} \ No newline at end of file diff --git a/src/commands/CommandBanIp.hpp b/src/commands/CommandBanIp.hpp new file mode 100644 index 0000000..2115357 --- /dev/null +++ b/src/commands/CommandBanIp.hpp @@ -0,0 +1,9 @@ +#include "Command.hpp" + +class CommandBanIp : public Command { +public: + CommandBanIp(); + + std::string execute(Minecraft& mc, Player& player, const std::vector& args); + std::string help(Minecraft& mc); +}; \ No newline at end of file diff --git a/src/commands/CommandKick.cpp b/src/commands/CommandKick.cpp index b876d9a..52dbe23 100644 --- a/src/commands/CommandKick.cpp +++ b/src/commands/CommandKick.cpp @@ -35,9 +35,11 @@ std::string CommandKick::execute(Minecraft& mc, Player& player, const std::vecto return "kick: you can't kick urself lol"; } - mc.level->removePlayer(*it); - (*it)->remove(); - mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true); + auto sourceId = (*it)->owner; + + (*it)->reallyRemoveIfPlayer = true; + mc.level->removeEntity((*it)); + mc.raknetInstance->getPeer()->CloseConnection(sourceId, true); return "kick: successfully kicked player " + args[0]; } diff --git a/src/commands/CommandManager.cpp b/src/commands/CommandManager.cpp index fbb9324..1e619d7 100644 --- a/src/commands/CommandManager.cpp +++ b/src/commands/CommandManager.cpp @@ -8,6 +8,8 @@ #include "commands/CommandKick.hpp" #include "commands/CommandOp.hpp" #include "commands/CommandBan.hpp" +#include "commands/CommandBanIp.hpp" +#include "commands/CommandPardon.hpp" #include "network/packet/ChatPacket.h" #include "network/RakNetInstance.h" #include "world/level/Level.h" @@ -21,6 +23,8 @@ void CommandManager::registerAllCommands() { m_commands.push_back(new CommandKick()); m_commands.push_back(new CommandOp()); m_commands.push_back(new CommandBan()); + m_commands.push_back(new CommandBanIp()); + m_commands.push_back(new CommandPardon()); } std::vector CommandManager::getListAllCommands() { diff --git a/src/commands/CommandPardon.cpp b/src/commands/CommandPardon.cpp new file mode 100644 index 0000000..a6ea269 --- /dev/null +++ b/src/commands/CommandPardon.cpp @@ -0,0 +1,40 @@ +#include "CommandPardon.hpp" +#include "commands/Command.hpp" +#include "network/RakNetInstance.h" +#include "raknet/RakPeerInterface.h" +#include "world/level/Level.h" +#include +#include + +CommandPardon::CommandPardon() : Command("pardon") {} + +std::string CommandPardon::execute(Minecraft& mc, Player& player, const std::vector& args) { + if (!isPlayerOp(mc, player)) { + return "You aren't enough priveleged to run this command"; + } + + if (args.empty()) { + return help(mc); + } + + std::string nicknameLower = args[0]; + std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower); + + if (mc.level->bannedPpl.find(nicknameLower) != mc.level->bannedPpl.end()) { + mc.level->bannedPpl.erase(nicknameLower); + + return "pardon: successfully unbanned player " + args[0]; + } + + if (mc.level->bannedIps.find(nicknameLower) != mc.level->bannedIps.end()) { + mc.level->bannedIps.erase(nicknameLower); + + return "pardon: successfully unbanned ip " + args[0]; + } + + return "Player/Ip doesnt banned"; +} + +std::string CommandPardon::help(Minecraft& mc) { + return "Usage: /pardon "; +} \ No newline at end of file diff --git a/src/commands/CommandPardon.hpp b/src/commands/CommandPardon.hpp new file mode 100644 index 0000000..ee08fbc --- /dev/null +++ b/src/commands/CommandPardon.hpp @@ -0,0 +1,9 @@ +#include "Command.hpp" + +class CommandPardon : public Command { +public: + CommandPardon(); + + std::string execute(Minecraft& mc, Player& player, const std::vector& args); + std::string help(Minecraft& mc); +}; \ No newline at end of file diff --git a/src/main_dedicated.cpp b/src/main_dedicated.cpp index fcf14ce..deab4e7 100755 --- a/src/main_dedicated.cpp +++ b/src/main_dedicated.cpp @@ -15,15 +15,16 @@ #include "platform/time.h" #include "SharedConstants.h" #include "world/level/LevelConstants.h" +#include #define MAIN_CLASS NinecraftApp static App* g_app = 0; static int g_exitCode = 0; void signal_callback_handler(int signum) { std::cout << "Signum caught: " << signum << std::endl; - if(signum == 2 || signum == 3){ // SIGINT || SIGQUIT - if(g_app != 0) { + if (signum == 2 || signum == 3) { // SIGINT || SIGQUIT + if (g_app != 0) { g_app->quit(); } else { exit(g_exitCode); @@ -64,7 +65,6 @@ std::string findStringInConfig(std::string line, std::string config) { return valueStr; } - int main(int numArguments, char* pszArgs[]) { std::ifstream serverProperties("server.properties"); @@ -148,7 +148,7 @@ int main(int numArguments, char* pszArgs[]) { } printf("Level Name: %s\n", levelName.c_str()); - + AppContext appContext; appContext.platform = new AppPlatform(); App* app = new MAIN_CLASS(); @@ -162,6 +162,7 @@ int main(int numArguments, char* pszArgs[]) { float startTime = getTimeS(); ((MAIN_CLASS*)g_app)->selectLevel(levelDir, levelName, settings); ((MAIN_CLASS*)g_app)->hostMultiplayer(port); + PluginsManager::get().loadPlugins(); // Reading ops std::ifstream ops("ops.txt"); @@ -201,9 +202,28 @@ int main(int numArguments, char* pszArgs[]) { } } + std::ifstream bannedIps("banned-ips.txt"); + + if (bannedIps.is_open()) { + std::string line; + + while (std::getline(bannedIps, line)) { + if (!line.empty()) { + ((MAIN_CLASS*)g_app)->level->bannedIps.insert(line); + } + } + } else { + std::ofstream bannedIp("banned-ips.txt"); + + if (!bannedIp.is_open()) { + throw std::runtime_error("Cannot create banned players list."); + } + } + std::cout << "Level has been generated in " << getTimeS() - startTime << std::endl; ((MAIN_CLASS*)g_app)->level->saveLevelData(); std::cout << "Level has been saved!" << std::endl; + PluginsManager::get().emit("ServerLoaded"); while(!app->wantToQuit()) { app->update(); @@ -232,7 +252,20 @@ int main(int numArguments, char* pszArgs[]) { } else { throw std::runtime_error("Cannot open banned players list."); } - + + std::ofstream bannedIpsWrite("banned-ips.txt"); + + if (bannedIpsWrite.is_open()) { + for (auto& banned : ((MAIN_CLASS*)g_app)->level->bannedIps) { + bannedIpsWrite << banned << std::endl; + } + bannedIpsWrite.close(); + } else { + throw std::runtime_error("Cannot open banned players list."); + } + + PluginsManager::get().emit("ServerShutdown"); + ((MAIN_CLASS*)g_app)->level->saveLevelData(); delete app; diff --git a/src/network/ClientSideNetworkHandler.cpp b/src/network/ClientSideNetworkHandler.cpp index 022b35f..e2b8150 100755 --- a/src/network/ClientSideNetworkHandler.cpp +++ b/src/network/ClientSideNetworkHandler.cpp @@ -448,7 +448,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItem LOGI("TakeItemPacket\n"); - ItemInstance* item; + ItemInstance* item = new ItemInstance(); item->count = packet->count; item->id = packet->itemId; diff --git a/src/network/RakNetInstance.cpp b/src/network/RakNetInstance.cpp index 75a2814..f4d0d6f 100755 --- a/src/network/RakNetInstance.cpp +++ b/src/network/RakNetInstance.cpp @@ -173,6 +173,7 @@ bool RakNetInstance::isMyLocalGuid(const RakNet::RakNetGUID& guid) void RakNetInstance::runEvents(NetEventCallback* callback) { RakNet::Packet* currentEvent; + bool disconnect = false; while ((currentEvent = rakPeer->Receive()) != NULL) { @@ -200,6 +201,7 @@ void RakNetInstance::runEvents(NetEventCallback* callback) case ID_DISCONNECTION_NOTIFICATION: case ID_CONNECTION_LOST: callback->onDisconnect(currentEvent->guid); + disconnect = true; break; case ID_UNCONNECTED_PONG: { @@ -233,8 +235,9 @@ void RakNetInstance::runEvents(NetEventCallback* callback) } } } - - rakPeer->DeallocatePacket(currentEvent); + if (!disconnect) { + rakPeer->DeallocatePacket(currentEvent); + } //delete activeBitStream; } diff --git a/src/network/ServerSideNetworkHandler.cpp b/src/network/ServerSideNetworkHandler.cpp index 474d9ad..62cb4e5 100755 --- a/src/network/ServerSideNetworkHandler.cpp +++ b/src/network/ServerSideNetworkHandler.cpp @@ -39,6 +39,8 @@ #endif #include "../server/ServerPlayer.h" #include "../world/entity/item/FallingTile.h" +#include +#include #define TIMES(x) for(int itc ## __LINE__ = 0; itc ## __LINE__ < x; ++ itc ## __LINE__) @@ -155,20 +157,62 @@ void ServerSideNetworkHandler::displayGameMessage(const std::string& message) raknetInstance->send(packet); } +void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MessagePacket* packet) +{ + auto player = getPlayer(source); + + if (player == nullptr) return; // @todo maybe kick? + + auto msg = std::string(packet->message.C_String()); + + MessageEvent event; + event.m_decline = false; + + PluginsManager::get().emit("Message", LuaPlayer(source), msg, event); + + if (!event.m_decline) { + if (packet->message[0] == '/') { + // This is a command + auto cmd = Util::stringTrim(msg.substr(1)); + + if (PluginsManager::get().emitCommands(cmd, source)) { + ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd)); + return sendPrivate(resp, source); + } else { + return; + } + } + + displayGameMessage("<" + player->name + "> " + msg); + } +} + void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPacket* packet) { auto player = getPlayer(source); if (player == nullptr) return; // @todo maybe kick? - if (packet->message[0] == '/') { - // This is a command + MessageEvent event; + event.m_decline = false; + + PluginsManager::get().emit("Message", LuaPlayer(source), packet->message, event); + + if (!event.m_decline) { + if (packet->message[0] == '/') { + // This is a command + auto cmd = Util::stringTrim(packet->message.substr(1)); - ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1)))); - return sendPrivate(resp, source); + if (PluginsManager::get().emitCommands(cmd, source)) { + ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd)); + return sendPrivate(resp, source); + } else { + return; + } + } + + displayGameMessage("<" + player->name + "> " + packet->message); } - - displayGameMessage("<" + player->name + "> " + packet->message); } void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid) @@ -188,6 +232,7 @@ void ServerSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid) if (player->owner == guid) { + PluginsManager::get().emit("PlayerDisconnect", LuaPlayer(guid)); minecraft->level->getLevelStorage()->savePlayer(*player); std::string message = player->name; @@ -226,7 +271,10 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac std::string nicknameLower = packet->clientName.C_String(); std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower); - printf("%s lower \n", nicknameLower.c_str()); + RakNet::SystemAddress sysAddress = rakPeer->GetSystemAddressFromGuid(source); + char clientIp[32]; + sysAddress.ToString(false, clientIp); + for (int i = 0; i < level->players.size(); i++) { ServerPlayer* player = (ServerPlayer*) level->players.at(i); @@ -247,6 +295,13 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac } } + for (auto& banned : level->bannedIps) { + if (clientIp == banned) { + loginStatus = packet->newProto ? LoginStatus::Failed_Banned : LoginStatus::Failed_ClientOld; + break; + } + } + RakNet::BitStream bitStream; LoginStatusPacket(loginStatus).write(&bitStream); rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false); @@ -306,8 +361,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ReadyPac if (packet->type == ReadyPacket::READY_REQUESTEDCHUNKS) onReady_RequestedChunks(source); - - LOGI("Ready player two ready ready player two!!\n "); } void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID& source) @@ -352,7 +405,6 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID #else LOGW("%s joined the game\n", newPlayer->name.c_str()); #endif - // Send all Entities to the new player for (unsigned int i = 0; i < level->entities.size(); ++i) { Entity* e = level->entities[i]; @@ -408,6 +460,8 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID bitStream.Reset(); AddPlayerPacket(newPlayer).write(&bitStream); rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, true); + + PluginsManager::get().emit("PlayerJoin", LuaPlayer(source)); } // @@ -451,17 +505,23 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay // return raknetInstance->send(refuse); // } // } + + PluginsManager::get().emit( + "PlayerMovement", + LuaPlayer(source), + packet->x, packet->y, packet->z, packet->yRot, packet->xRot, // newPos + player->x, player->y, player->z, player->yRot, player->xRot // oldPos + ); entity->xd = entity->yd = entity->zd = 0; entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3); // broadcast this packet to other clients redistributePacket(packet, source); - } } -void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBlockPacket* packet){ +void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBlockPacket* packet) { if (!level) return; Player* player = getPlayer(source); @@ -499,6 +559,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBl oldTile->destroy(level, x, y, z, data); + // RemoveEntityPacket packet(e->entityId); + // redistributePacket(&packet, rakPeer->GetMyGUID()); } LOGI("Remove block [%i, %i, %i]\n", packet->x, packet->y, packet->z); diff --git a/src/network/ServerSideNetworkHandler.h b/src/network/ServerSideNetworkHandler.h index 1e9585d..a23cb13 100755 --- a/src/network/ServerSideNetworkHandler.h +++ b/src/network/ServerSideNetworkHandler.h @@ -58,6 +58,7 @@ public: virtual void handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet); virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet); virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet); + virtual void handle(const RakNet::RakNetGUID& source, MessagePacket* packet); virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet); bool allowsIncomingConnections() { return _allowIncoming; } @@ -66,7 +67,7 @@ public: Player* popPendingPlayer(const RakNet::RakNetGUID& source); void displayGameMessage(const std::string& message); -private: + /** * @brief Send packet to all players */ @@ -78,6 +79,8 @@ private: void sendPrivate(Packet& packet, const RakNet::RakNetGUID& source); Player* getPlayer(const RakNet::RakNetGUID& source); + +private: Minecraft* minecraft; Level* level; diff --git a/src/plugins/LuaPlayer.hpp b/src/plugins/LuaPlayer.hpp new file mode 100644 index 0000000..79e4869 --- /dev/null +++ b/src/plugins/LuaPlayer.hpp @@ -0,0 +1,160 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// TODO: Optimize includes +class LuaPlayer { +public: + LuaPlayer(const RakNet::RakNetGUID source) : m_source(source) {} + + Player* getPlayer() { + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + auto plr = ss->getPlayer(m_source); + + return plr; + } + + std::string getNickname() { + auto plr = getPlayer(); + if (plr != nullptr) return plr->name; + + return ""; + } + + std::tuple getPos() { + auto plr = getPlayer(); + if (plr != nullptr) return {plr->x, plr->y, plr->z, plr->yRot, plr->xRot}; + + return {0, 0, 0, 0, 0}; + } + + void setPos(float x, float y, float z, float yRot, float xRot) { + auto plr = getPlayer(); + if (plr == nullptr) return; + + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + + + // plr->x = x; + // plr->y = y; + // plr->z = z; + // plr->yRot = yRot; + // plr->xRot = xRot; + plr->xd = plr->yd = plr->zd = 0; + plr->lerpTo(x, y, z, yRot, xRot, 3); + + MovePlayerPacket move(plr->entityId, x, y, z, yRot, xRot); + + ss->sendPrivate(move, m_source); + } + + void sendMessage(std::string msg) { + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + ChatPacket packet(msg); + + ss->sendPrivate(packet, m_source); + } + + void addItem(int id, int count, int auxValue) { + auto plr = getPlayer(); + if (plr == nullptr) return; + + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + auto item = new ItemInstance(id, count, auxValue); + + if (!plr->inventory->add(item)) { + plr->inventory->add(item); + } + + TakeItemPacket itemAdd(plr->entityId, count, auxValue, id); + ss->sendPrivate(itemAdd, m_source); + } + + std::tuple getItem(int index) { + auto plr = getPlayer(); + if (plr == nullptr) return {0, 0, 0}; + + auto item = plr->inventory->getItem(index); + + if (item != nullptr) { + return {item->id, item->count, item->getAuxValue()}; + } else { + return {0, 0, 0}; + } + } + + void clearInventory() { + auto plr = getPlayer(); + if (plr == nullptr) return; + + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + + for (int i = Inventory::MAX_SELECTION_SIZE; i < plr->inventory->getContainerSize(); i++) { + auto itm = plr->inventory->getItem(i); + + if (itm != NULL) { + printf("remove %d \n", plr->inventory->removeResource(ItemInstance(itm->id, itm->count, itm->getAuxValue()))); + RemoveItemPacket itemAdd(plr->entityId, itm->count, itm->getAuxValue(), itm->id); + ss->sendPrivate(itemAdd, m_source); + } + } + + } + + sol::table getInventory() { + auto plr = getPlayer(); + if (plr == nullptr) return {}; + + sol::table inv = PluginsManager::get().getLua().create_table(); + + for (int i = Inventory::MAX_SELECTION_SIZE; i < plr->inventory->getContainerSize(); i++) { + auto itm = plr->inventory->getItem(i); + + if (itm != NULL) { + inv[i - 8] = {itm->id, itm->count, itm->getAuxValue()}; + } else { + inv[i - 8] = sol::lua_nil; + } + } + + return inv; + } + + int getHp() { + auto plr = getPlayer(); + if (plr == nullptr) return -1; + + return plr->health; + } + + void setHp(int hp) { + auto plr = getPlayer(); + if (plr == nullptr) return; + + plr->health = hp; + + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + + SetHealthPacket hpPacket(plr->health); + ss->sendPrivate(hpPacket, m_source); + } +private: + const RakNet::RakNetGUID m_source; +}; \ No newline at end of file diff --git a/src/plugins/LuaServer.cpp b/src/plugins/LuaServer.cpp new file mode 100644 index 0000000..5e189fd --- /dev/null +++ b/src/plugins/LuaServer.cpp @@ -0,0 +1,11 @@ +#include +#include +#include +#include + +void LuaServer::sendServerMessage(std::string msg) { + auto mc = PluginsManager::get().getMinecraft(); + ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback; + + ss->displayGameMessage(msg); +} \ No newline at end of file diff --git a/src/plugins/LuaServer.hpp b/src/plugins/LuaServer.hpp new file mode 100644 index 0000000..47fd9d4 --- /dev/null +++ b/src/plugins/LuaServer.hpp @@ -0,0 +1,7 @@ +#pragma once +#include + +class LuaServer { +public: + void sendServerMessage(std::string msg); +}; \ No newline at end of file diff --git a/src/plugins/MessageEvent.hpp b/src/plugins/MessageEvent.hpp new file mode 100644 index 0000000..b0c1731 --- /dev/null +++ b/src/plugins/MessageEvent.hpp @@ -0,0 +1,9 @@ +#pragma once + +class MessageEvent { +public: + bool m_decline; + + void setDecline(bool decline) { m_decline = decline; } +private: +}; \ No newline at end of file diff --git a/src/plugins/PluginsManager.cpp b/src/plugins/PluginsManager.cpp new file mode 100644 index 0000000..93cc24c --- /dev/null +++ b/src/plugins/PluginsManager.cpp @@ -0,0 +1,103 @@ +#include +#include +#include + +#include +#include +#include "MessageEvent.hpp" + +namespace fs = std::filesystem; + +int PluginsManager::emitCommands(std::string command, const RakNet::RakNetGUID& source) { + std::vector args; + std::string cmd; + + int i = 0; + std::string word; + std::stringstream ss(command); + + while (ss >> word) { + if (i == 0) { + cmd = word; + } else { + args.push_back(word); + } + + i++; + } + + auto it = m_luaCommands.find(cmd); + + if (it == m_luaCommands.end()) return 1; + + for (auto& callback : it->second) { + sol::protected_function_result result = callback(LuaPlayer(source), sol::as_table(args)); + + if (!result.valid()) { + sol::error err = result; + std::cout << err.what() << std::endl; + } + } + + return 0; +} + +void PluginsManager::init(Minecraft& minecraft) { + m_lua.open_libraries(sol::lib::base, sol::lib::package, sol::lib::string, sol::lib::math, sol::lib::table, sol::lib::io); + registerTypes(); + + m_minecraft = &minecraft; +} + +void PluginsManager::registerTypes() { + // @note you cant just do that, because lua doesnt have access to the class in this case + // m_lua.set_function("subscribe", &PluginsManager::subscribe); + + m_lua.set_function("subscribe", [this](std::string event, sol::protected_function func) { + m_callbacks[event].push_back(func); + }); + + m_lua.set_function("addCommand", [this](std::string commandName, sol::function func) { + m_luaCommands[commandName].push_back(func); + }); + + m_lua.new_usertype( + "Server", + "sendMessage", &LuaServer::sendServerMessage + ); + + m_lua.new_usertype( + "Player", + "getNickname", &LuaPlayer::getNickname, + "getPos", &LuaPlayer::getPos, + "setPos", &LuaPlayer::setPos, + "sendMessage", &LuaPlayer::sendMessage, + "getInventory", &LuaPlayer::getInventory, + "addItem", &LuaPlayer::addItem, + "getItem", &LuaPlayer::getItem, + "clearInventory", &LuaPlayer::clearInventory, + "getHp", &LuaPlayer::getHp, + "setHp", &LuaPlayer::setHp + ); + + m_lua.new_usertype( + "MessageEvent", + "setDecline", &MessageEvent::setDecline + ); + + m_lua["Server"] = &m_srv; +} + +void PluginsManager::loadPlugins() { + std::string path = "plugins/"; + + if (fs::exists(path)) { + for (const auto& entry : fs::directory_iterator(path)) { + if (!fs::is_directory(entry.path().string())) { + m_lua.script_file(entry.path().string()); + } + } + } else { + std::filesystem::create_directory(path); + } +} \ No newline at end of file diff --git a/src/plugins/PluginsManager.hpp b/src/plugins/PluginsManager.hpp new file mode 100644 index 0000000..271d01f --- /dev/null +++ b/src/plugins/PluginsManager.hpp @@ -0,0 +1,56 @@ +#pragma once +#include +#include +#include +#include +#include +#include + +class Minecraft; + +class PluginsManager { +public: + static inline PluginsManager& get() { + static PluginsManager inst; + return inst; + } + + void init(Minecraft& minecraft); + + void registerTypes(); + + void loadPlugins(); + + sol::state& getLua() { return m_lua; } + + // @ai @note maybe we should rewrite it... + // problem that i dont know how to pass args in sol::function dynamically + // so i used ai + // sry :( + template + void emit(std::string event, Args&&... args) { + auto it = m_callbacks.find(event); + + if (it == m_callbacks.end()) return; + + for (auto& callback : it->second) { + sol::protected_function_result result = callback(std::forward(args)...); + + if (!result.valid()) { + sol::error err = result; + std::cout << err.what() << std::endl; + } + } + } + + int emitCommands(std::string command, const RakNet::RakNetGUID& source); + + Minecraft* getMinecraft() { return m_minecraft; } +private: + std::unordered_map> m_callbacks; + std::unordered_map> m_luaCommands; + + LuaServer m_srv; + sol::state m_lua; + Minecraft* m_minecraft; +}; \ No newline at end of file diff --git a/src/raknet/Rand.cpp b/src/raknet/Rand.cpp index c3d8413..b01d1c6 100755 --- a/src/raknet/Rand.cpp +++ b/src/raknet/Rand.cpp @@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l // so-- that's why the only change I made is to restrict to odd seeds. // - register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state; - register int j; + unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state; + int j; for ( left = 0, *s++ = x, j = N; --j; *s++ = ( x *= 69069U ) & 0xFFFFFFFFU ) @@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left ) { - register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1; - register int j; + unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1; + int j; if ( left < -1 ) seedMT( 4357U ); diff --git a/src/world/item/TileItem.h b/src/world/item/TileItem.h index 08bd1d0..dc46029 100755 --- a/src/world/item/TileItem.h +++ b/src/world/item/TileItem.h @@ -4,6 +4,8 @@ //package net.minecraft.world.item; #include +#include +#include #include "Item.h" #include "ItemInstance.h" @@ -61,7 +63,7 @@ public: if (level->setTileAndData(x, y, z, tileId, data)) { Tile::tiles[tileId]->setPlacedBy(level, x, y, z, player); level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, tile->soundType->getStepSound(), (tile->soundType->getVolume() + 1) / 2, tile->soundType->getPitch() * 0.8f); - printf("%f %f %f \n", player->x, player->y, player->z); + PluginsManager::get().emit("PlayerPlaceBlock", LuaPlayer(player->owner), x, y, z, face, tileId, instance->getAuxValue()); /* PlaceBlockPacket packet(player->entityId, x, y, z, face, tileId, instance->getAuxValue()); //LOGI("Place block at @ %d, %d, %d\n", x, y, z); diff --git a/src/world/level/Level.h b/src/world/level/Level.h index 17c1d48..254dce6 100755 --- a/src/world/level/Level.h +++ b/src/world/level/Level.h @@ -313,6 +313,7 @@ public: std::set ops; std::set bannedPpl; + std::set bannedIps; protected: bool isFindingSpawn;