Update README.md

CMakeLists.txt

@@ -3,9 +3,10 @@ project(MinecraftPE)
 
 include(cmake/CPM.cmake)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
+
 include(cmake/EnumOption.cmake)
 
 if(EMSCRIPTEN)
@@ -33,11 +34,9 @@ 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")
@@ -96,46 +95,6 @@ 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(
@@ -256,8 +215,6 @@ file(GLOB SERVER_SOURCES
 
     "src/world/phys/HitResult.cpp"
     "src/commands/*.cpp"
-
-    "src/plugins/*.cpp"
 ) 
 
 file(GLOB CLIENT_SOURCES 
@@ -343,8 +300,6 @@ file(GLOB CLIENT_SOURCES
     "src/main.cpp"
 
     "src/commands/*.cpp"
-    "src/plugins/*.cpp"
-
 )
 
 if (${PLATFORM} STREQUAL "Desktop")
@@ -353,20 +308,17 @@ 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} lua sol2::sol2)
+target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS})
 
 add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
-set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE)
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
 
@@ -376,8 +328,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     "${openal_SOURCE_DIR}/include"
     "${glfw_SOURCE_DIR}/include"
     "lib/include"
-    "${lua_SOURCE_DIR}/"
-
 )
 
 if(${PLATFORM} MATCHES "Web")
@@ -425,7 +375,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} lua sol2::sol2)
+target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})
 
 if (OpenSSL_FOUND)
     target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)

README.md

@@ -1,6 +1,6 @@
 # MinecraftPE
 > [!Warning]
-> Github repository **isnt main**. All issues and pull requests should be send in [Gitea Repository](https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1).
+> [Github repository](https://github.com/Minecraft-PE-0-6-1/minecraft-pe-0.6.1-on-all) **isnt main**. All issues and pull requests should be send in [Gitea Repository](https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1).
 
 > [!Important]
 > We have a discord server, where you can report bugs or send feedback https://discord.gg/c58YesBxve
@@ -9,23 +9,20 @@ Source code for **Minecraft Pocket Edition 0.6.1 alpha** with various fixes and
 
 This project aims to preserve and improve this early version of Minecraft PE.
 
-# TODO / Roadmap
+# Features
-- [x] Add platform GLFW
+- Support for modern IOS and Android, Linux, Web
-- [x] Compile for Linux
+- Improved Dedicated Server (Windows build, anticheat, commands, etc)
-- [x] Compile for android aarch64
+- Features from Beta version of Minecraft (Grass tint, Beta sky, Smooth lighting, etc) and other tweaks
-    - [x] Touch control improvements
+
-    - [ ] Screen fixes
+# Screenshots
-- [ ] Rewrite platform logic
+<p align="center">
-- [x] Fix sound
+
-- [x] Do a server connection GUI
+<img width="49%" alt="menu" src="https://sffempire.ru/mcpe-screenshots/menu.png" />
-- [ ] Controller support
+<img width="49%" alt="settings" src="https://sffempire.ru/mcpe-screenshots/settings.png" />
-- [x] Minecraft server hosting
+<img width="49%" alt="worlds" src="https://sffempire.ru/mcpe-screenshots/worlds.png" />
-- [x] Screen fixess
+<img width="49%" alt="gameplay" src="https://sffempire.ru/mcpe-screenshots/gameplay.png" />
-- [x] Fix fog
+
-- [x] Add sprinting
+</p>
-- [x] Chat (semi working) and commands
-- [x] Implementing options
-- [x] Better F3
 
 # Build
 
@@ -79,8 +76,14 @@ cmake --build .
    ```
    C:\android-ndk-r14b
    ```
+3. Install **Build tools 35** with [SDKManager](https://dl.google.com/android/repository/commandlinetools-win-15859902_latest.zip) (build-tools should be in AppData):
 
-3. Run the build script:
+```powershell
+sdkmanager "build-tools;35.0.0" --sdk_root="%LocalAppData%\Android\Sdk"
+sdkmanager "build-tools;android-36" --sdk_root="%LocalAppData%\Android\Sdk"
+```
+
+4. Run the build script:
 
 ```powershell
 # Full build (NDK + Java + APK + install)
@@ -154,7 +157,6 @@ cmake --build .
 
    ```bash
    35.0.0
-   33.0.2
    ```
 
 6. Download **Android NDK r14b**:  
@@ -200,7 +202,7 @@ cmake --build .
    ```
 ## iOS
 ### Xcode
-> [Note!]
+> [!Note]
 > There's a precompiled IPA artifact in the GitHub mirror under Actions for those who either don't have Macs or don't want to build themself. But if you want to build youself, you'll need a Mac with Xcode. Download Xcode from the Mac App Store.
 
 ### 1. Clone

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.
 	//
 
-	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	int j;
+	register 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 )
 {
-	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	int j;
+	register int j;
 
 	if ( left < -1 )
 		seedMT( 4357U );

src/client/Minecraft.cpp

@@ -287,7 +287,11 @@ 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;
@@ -1210,8 +1214,6 @@ void Minecraft::init()
 	checkGlError("Init complete");
 #endif
 
-	PluginsManager::get().init(*this);
-	
 	options.load();
 
 	setIsCreativeMode(false); // false means it's Survival Mode

src/client/Minecraft.h

@@ -3,8 +3,6 @@
 
 #include "Options.h"
 #include "commands/CommandManager.hpp"
-#include <plugins/PluginsManager.hpp>
-
 #ifndef STANDALONE_SERVER
 #include "MouseHandler.h"
 #include "gui/Gui.h"

src/client/gui/screens/ConsoleScreen.cpp

@@ -63,15 +63,15 @@ void ConsoleScreen::execute()
         return minecraft->setScreen(NULL);
     }
 
-    // if (_input[0] == '/') {
+    if (_input[0] == '/') {
-    //     // Command
+        // Command
-    //     _input = Util::stringTrim(_input.substr(1));
+        _input = Util::stringTrim(_input.substr(1));
         
-    //     std::istringstream iss(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); ) {
+        for (std::string line; std::getline(iss, line); ) {
-    //         minecraft->gui.addMessage(line);
+            minecraft->gui.addMessage(line);
-    //     }
+        }
-    // } else {
+    } else {
         // @ai @rewrite
         if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
             static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(_input);
@@ -81,7 +81,7 @@ void ConsoleScreen::execute()
         } else {
             minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
         }
-    // }
+    }
 
     minecraft->setScreen(NULL);
 }

src/client/renderer/entity/EntityRenderer.cpp

@@ -257,7 +257,7 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 	//Textures* textures = entityRenderDispatcher->textures;
 	//textures->bind(textures->loadTexture("%clamp%/environment/shadow.png"));
 	Textures* textures = entityRenderDispatcher->textures;
-	textures->loadAndBindTexture("/misc/shadow.png"); 
+	textures->loadAndBindTexture("misc/shadow.png"); 
     
     
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -298,6 +298,7 @@ void EntityRenderer::renderShadow(Entity* e, float x, float y, float z, float po
 			tt.draw();
 
 			glColor4f2(1, 1, 1, 1);
+			// tt.color(1.f, 1.f, 1.f, 1.f);
 			glDisable2(GL_BLEND);
 			glDepthMask(true);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@@ -315,7 +316,7 @@ void EntityRenderer::renderTileShadow(Tile* tt, float x, float y, float z, int x
 	float a = ((pow - (y - (yt + yo)) / 2) * 0.5f) * getLevel()->getBrightness(xt, yt, zt);
 	if (a < 0) return;
 	if (a > 1) a = 1;
-	//	t.color(1, 1, 1, (float) a);
+	// t.color(1.f, 1.f, 1.f, (float) a);
 	glColor4f2(1, 1, 1, (float) a);
 
 	float x0 = xt + tt->xx0 + xo;

src/commands/CommandBan.cpp

@@ -5,7 +5,6 @@
 #include "world/level/Level.h"
 #include <algorithm>
 #include <client/Minecraft.h>
-#include <network/packet/LoginStatusPacket.h>
 
 CommandBan::CommandBan() : Command("ban") {}
 
@@ -21,21 +20,25 @@ 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(), [nicknameLower] (auto& it) -> bool {
+    auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [args, nicknameLower] (auto& it) -> bool {
         std::string lower = it->name;
         std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
         return lower == nicknameLower;
     });
 
-    if (it != mc.level->players.end()) {
     if (*it == (Player*)mc.player) {
-            return "banip: you can't ban urself lol";
+        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);
     } else {
         for (auto& banned : mc.level->bannedPpl) {
             if (nicknameLower == banned) {
-                return args[0] + " already banned!";
+                return args[0] + "already banned!";
             }
         }
     }

src/commands/CommandBanIp.cpp

@@ -1,65 +0,0 @@
-#include "CommandBanIp.hpp"
-#include "commands/Command.hpp"
-#include "network/RakNetInstance.h"
-#include "raknet/RakPeerInterface.h"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-
-CommandBanIp::CommandBanIp() : Command("banip") {}
-
-std::string CommandBanIp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& 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 <player>";
-}

src/commands/CommandBanIp.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandBanIp : public Command {
-public:
-    CommandBanIp();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/commands/CommandKick.cpp

@@ -35,11 +35,9 @@ std::string CommandKick::execute(Minecraft& mc, Player& player, const std::vecto
         return "kick: you can't kick urself lol";
     }
 
-    auto sourceId = (*it)->owner;
+    mc.level->removePlayer(*it);
-
+    (*it)->remove();
-    (*it)->reallyRemoveIfPlayer = true;
+    mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true);
-    mc.level->removeEntity((*it));
-    mc.raknetInstance->getPeer()->CloseConnection(sourceId, true);
     return "kick: successfully kicked player " + args[0];
 }
 

src/commands/CommandManager.cpp

@@ -8,8 +8,6 @@
 #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"
@@ -23,8 +21,6 @@ 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<std::string> CommandManager::getListAllCommands() {

src/commands/CommandPardon.cpp

@@ -1,40 +0,0 @@
-#include "CommandPardon.hpp"
-#include "commands/Command.hpp"
-#include "network/RakNetInstance.h"
-#include "raknet/RakPeerInterface.h"
-#include "world/level/Level.h"
-#include <algorithm>
-#include <client/Minecraft.h>
-
-CommandPardon::CommandPardon() : Command("pardon") {}
-
-std::string CommandPardon::execute(Minecraft& mc, Player& player, const std::vector<std::string>& 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 <player>";
-}

src/commands/CommandPardon.hpp

@@ -1,9 +0,0 @@
-#include "Command.hpp"
-
-class CommandPardon : public Command {
-public:
-    CommandPardon();
-
-    std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args);
-    std::string help(Minecraft& mc);
-};

src/main_dedicated.cpp

@@ -15,16 +15,15 @@
 #include "platform/time.h"
 #include "SharedConstants.h"
 #include "world/level/LevelConstants.h"
-#include <plugins/PluginsManager.hpp>
 
 #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 (signum == 2 || signum == 3) { // SIGINT ||  SIGQUIT
+		if(g_app != 0) {
-		if (g_app != 0) {
 			g_app->quit();
 		} else {
 			exit(g_exitCode);
@@ -65,6 +64,7 @@ std::string findStringInConfig(std::string line, std::string config) {
     return valueStr;
 }
 
+
 int main(int numArguments, char* pszArgs[]) {	
 	std::ifstream serverProperties("server.properties");
 
@@ -162,7 +162,6 @@ 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");
@@ -202,28 +201,9 @@ 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();
@@ -253,19 +233,6 @@ int main(int numArguments, char* pszArgs[]) {
 		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;

src/network/ClientSideNetworkHandler.cpp

@@ -448,7 +448,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItem
 
 	LOGI("TakeItemPacket\n");
 
-	ItemInstance* item = new ItemInstance();
+	ItemInstance* item;
 
 	item->count = packet->count;
 	item->id = packet->itemId;

src/network/RakNetInstance.cpp

@@ -173,7 +173,6 @@ bool RakNetInstance::isMyLocalGuid(const RakNet::RakNetGUID& guid)
 void RakNetInstance::runEvents(NetEventCallback* callback)
 {
 	RakNet::Packet* currentEvent;
-	bool disconnect = false;
 
 	while ((currentEvent = rakPeer->Receive()) != NULL)
 	{
@@ -201,7 +200,6 @@ void RakNetInstance::runEvents(NetEventCallback* callback)
 				case ID_DISCONNECTION_NOTIFICATION:
 				case ID_CONNECTION_LOST:
 					callback->onDisconnect(currentEvent->guid);
-					disconnect = true;
 					break;
 				case ID_UNCONNECTED_PONG:
 					{
@@ -235,9 +233,8 @@ void RakNetInstance::runEvents(NetEventCallback* callback)
 				}
 			}
 		}
-		if (!disconnect) {
+
 		rakPeer->DeallocatePacket(currentEvent);
-		}
 		//delete activeBitStream;
 	}
 

src/network/ServerSideNetworkHandler.cpp

@@ -39,8 +39,6 @@
 #endif
 #include "../server/ServerPlayer.h"
 #include "../world/entity/item/FallingTile.h"
-#include <plugins/LuaPlayer.hpp>
-#include <plugins/MessageEvent.hpp>
 
 #define TIMES(x) for(int itc ## __LINE__ = 0; itc ## __LINE__ < x; ++ itc ## __LINE__)
 
@@ -157,62 +155,20 @@ 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?
 	
-	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));
 
-			if (PluginsManager::get().emitCommands(cmd, source)) {
+		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1))));
-				ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd));
 		return sendPrivate(resp, source);
-			} else {
-				return;
-			}
 	}
 
 	displayGameMessage("<" + player->name + "> " + packet->message);
-	}
 }
 
 void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -232,7 +188,6 @@ 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;
@@ -271,10 +226,7 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	std::string nicknameLower = packet->clientName.C_String();
 	std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
 
-	RakNet::SystemAddress sysAddress = rakPeer->GetSystemAddressFromGuid(source);
+	printf("%s lower \n", nicknameLower.c_str());
-    char clientIp[32];
-    sysAddress.ToString(false, clientIp);
-
 	for (int i = 0; i < level->players.size(); i++) {
 		ServerPlayer* player = (ServerPlayer*) level->players.at(i);
 
@@ -295,13 +247,6 @@ 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);
@@ -361,6 +306,8 @@ 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)
@@ -405,6 +352,7 @@ 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];
@@ -460,8 +408,6 @@ 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));
 }
 
 //
@@ -506,22 +452,16 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 		// 	}
 		// }
 
-		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);
@@ -559,8 +499,6 @@ 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);

src/network/ServerSideNetworkHandler.h

@@ -58,7 +58,6 @@ 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; }
@@ -67,7 +66,7 @@ public:
 	Player* popPendingPlayer(const RakNet::RakNetGUID& source);
 
 	void displayGameMessage(const std::string& message);
-
+private:
 	/**
 	 * @brief Send packet to all players
 	 */
@@ -80,8 +79,6 @@ public:
 
 	Player* getPlayer(const RakNet::RakNetGUID& source);
 
-private:
-
 	Minecraft*					minecraft;
 	Level*						level;
 	IRakNetInstance*			raknetInstance;

src/plugins/LuaPlayer.hpp

@@ -1,160 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <raknet/RakNetTypes.h>
-#include <plugins/PluginsManager.hpp>
-#include <network/ServerSideNetworkHandler.h>
-#include <world/entity/player/Player.h>
-#include <client/Minecraft.h>
-#include <network/packet/ChatPacket.h>
-#include <network/packet/MovePlayerPacket.h>
-#include <network/packet/RemoveItemPacket.h>
-#include <network/packet/SetHealthPacket.h>
-#include <network/packet/TakeItemPacket.h>
-#include <world/entity/player/Inventory.h>
-
-// 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<float, float, float, float, float> 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<int, int, int> 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;
-};

src/plugins/LuaServer.cpp

@@ -1,11 +0,0 @@
-#include <plugins/LuaServer.hpp>
-#include <plugins/PluginsManager.hpp>
-#include <network/ServerSideNetworkHandler.h>
-#include <client/Minecraft.h>
-
-void LuaServer::sendServerMessage(std::string msg)  {
-    auto mc = PluginsManager::get().getMinecraft();
-    ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) mc->netCallback;
-
-    ss->displayGameMessage(msg);
-}

src/plugins/LuaServer.hpp

@@ -1,7 +0,0 @@
-#pragma once
-#include <string>
-
-class LuaServer {
-public:
-    void sendServerMessage(std::string msg);
-};

src/plugins/MessageEvent.hpp

@@ -1,9 +0,0 @@
-#pragma once
-
-class MessageEvent {
-public:
-    bool m_decline;
-
-    void setDecline(bool decline) { m_decline = decline; }
-private:
-};

src/plugins/PluginsManager.cpp

@@ -1,103 +0,0 @@
-#include <plugins/PluginsManager.hpp>
-#include <plugins/LuaPlayer.hpp>
-#include <plugins/LuaServer.hpp>
-
-#include <client/Minecraft.h>
-#include <filesystem>
-#include "MessageEvent.hpp"
-
-namespace fs = std::filesystem;
-
-int PluginsManager::emitCommands(std::string command, const RakNet::RakNetGUID& source) {
-    std::vector<std::string> 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<LuaServer>(
-        "Server",
-        "sendMessage", &LuaServer::sendServerMessage
-    );
-
-    m_lua.new_usertype<LuaPlayer>(
-        "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>(
-        "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);
-    }
-}

src/plugins/PluginsManager.hpp

@@ -1,56 +0,0 @@
-#pragma once
-#include <unordered_map>
-#include <sol/sol.hpp>
-#include <vector>
-#include <iostream>
-#include <plugins/LuaServer.hpp>
-#include <raknet/RakNetTypes.h>
-
-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<typename... Args>
-    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>(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<std::string, std::vector<sol::function>> m_callbacks;
-    std::unordered_map<std::string, std::vector<sol::function>> m_luaCommands;
-
-    LuaServer  m_srv;
-    sol::state m_lua;
-    Minecraft* m_minecraft;
-};

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.
 	//
 
-	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	int j;
+	register 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 )
 {
-	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	int j;
+	register int j;
 
 	if ( left < -1 )
 		seedMT( 4357U );

src/world/item/TileItem.h

@@ -4,8 +4,6 @@
 //package net.minecraft.world.item;
 
 #include <string>
-#include <plugins/PluginsManager.hpp>
-#include <plugins/LuaPlayer.hpp>
 
 #include "Item.h"
 #include "ItemInstance.h"
@@ -63,7 +61,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);
-                PluginsManager::get().emit("PlayerPlaceBlock", LuaPlayer(player->owner), x, y, z, face, tileId, instance->getAuxValue());
+                printf("%f %f %f \n", player->x, player->y, player->z);
 /*
 				PlaceBlockPacket packet(player->entityId, x, y, z, face, tileId, instance->getAuxValue());
 				//LOGI("Place block at @ %d, %d, %d\n", x, y, z);

src/world/level/Level.h

@@ -313,7 +313,6 @@ public:
 
 	std::set<std::string> ops;
 	std::set<std::string> bannedPpl;
-	std::set<std::string> bannedIps;
 protected:
 	bool isFindingSpawn;