Merge pull request 'Add icon for win32' (#18 ) from yefeng/minecraft-pe-0.6.1:main into main

Reviewed-on: #18
FIX: OpenAL error loop
2026-07-20 21:41:45 +02:00 · 2026-07-20 22:25:18 +03:00 · 2026-07-20 21:14:57 +02:00 · 2026-07-20 21:13:41 +02:00 · 2026-07-20 22:11:41 +03:00 · 2026-07-20 20:05:29 +03:00
41 changed files with 462 additions and 885 deletions
--- a/CMakeLists.txt
+++ b/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)
@@ -30,14 +31,13 @@ if (${PLATFORM} STREQUAL "Desktop")
    endif()

    if (WIN32)
+        target_sources(MinecraftPE PRIVATE data/images/pe.rc)
        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 +96,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 +216,6 @@ file(GLOB SERVER_SOURCES

    "src/world/phys/HitResult.cpp"
    "src/commands/*.cpp"
-
-    "src/plugins/*.cpp"
 ) 

 file(GLOB CLIENT_SOURCES 
@@ -343,8 +301,6 @@ file(GLOB CLIENT_SOURCES
    "src/main.cpp"

    "src/commands/*.cpp"
-    "src/plugins/*.cpp"
-
 )

 if (${PLATFORM} STREQUAL "Desktop")
@@ -353,20 +309,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 +329,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 +376,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)
--- a/README.md
+++ b/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
- [x] Add platform GLFW
- [x] Compile for Linux
- [x] Compile for android aarch64
-    - [x] Touch control improvements
-    - [ ] Screen fixes
- [ ] Rewrite platform logic
- [x] Fix sound
- [x] Do a server connection GUI
- [ ] Controller support
- [x] Minecraft server hosting
- [x] Screen fixess
- [x] Fix fog
- [x] Add sprinting
- [x] Chat (semi working) and commands
- [x] Implementing options
- [x] Better F3
+# Features
+- Support for modern IOS and Android, Linux, Web
+- Improved Dedicated Server (Windows build, anticheat, commands, etc)
+- Features from Beta version of Minecraft (Grass tint, Beta sky, Smooth lighting, etc) and other tweaks
+
+# Screenshots
+<p align="center">
+
+<img width="49%" alt="menu" src="https://sffempire.ru/mcpe-screenshots/menu.png" />
+<img width="49%" alt="settings" src="https://sffempire.ru/mcpe-screenshots/settings.png" />
+<img width="49%" alt="worlds" src="https://sffempire.ru/mcpe-screenshots/worlds.png" />
+<img width="49%" alt="gameplay" src="https://sffempire.ru/mcpe-screenshots/gameplay.png" />
+
+</p>

 # 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
--- a/data/images/pe.ico
+++ b/data/images/pe.ico
--- a/data/images/pe.rc
+++ b/data/images/pe.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON "pe.ico"
--- a/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
+++ b/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
@@ -47,6 +47,8 @@
 		9D293CE816071C08000305C8 /* CreateNewWorld_iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */; };
 		9D293CEB160720D6000305C8 /* worldname_iphone5_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */; };
 		9D293CEC160720D6000305C8 /* worldname_iphone5_3.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */; };
+		BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
+		BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
 		D506D3E2161288BD0099FA65 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */; };
 		D51DC73614581D4E00E3D761 /* itemframe.png in Resources */ = {isa = PBXBuildFile; fileRef = D51DC73514581D4E00E3D761 /* itemframe.png */; };
 		D51DC74314592B8B00E3D761 /* PVRTexture.m in Sources */ = {isa = PBXBuildFile; fileRef = D51DC74214592B8A00E3D761 /* PVRTexture.m */; };
@@ -1179,8 +1181,19 @@
 		F99F0FAD2F8436CE00F2B29A /* FoliageColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */; };
 		F99F0FAF2F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
 		F99F0FB02F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
-		BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
-		BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
+		F9E5A772300E7A8700164066 /* LevelConstants.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A771300E7A8700164066 /* LevelConstants.cpp */; };
+		F9E5A775300E7AB700164066 /* CommandManager.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A773300E7AB700164066 /* CommandManager.hpp */; };
+		F9E5A776300E7AB700164066 /* CommandManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A774300E7AB700164066 /* CommandManager.cpp */; };
+		F9E5A779300E7AD500164066 /* CommandBan.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A777300E7AD500164066 /* CommandBan.cpp */; };
+		F9E5A77A300E7AD500164066 /* CommandBan.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A778300E7AD500164066 /* CommandBan.hpp */; };
+		F9E5A77D300E7AF400164066 /* CommandHelp.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A77B300E7AF400164066 /* CommandHelp.hpp */; };
+		F9E5A77E300E7AF400164066 /* CommandHelp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A77C300E7AF400164066 /* CommandHelp.cpp */; };
+		F9E5A783300E7B0B00164066 /* CommandKick.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A77F300E7B0A00164066 /* CommandKick.hpp */; };
+		F9E5A784300E7B0B00164066 /* CommandOp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A780300E7B0A00164066 /* CommandOp.cpp */; };
+		F9E5A785300E7B0B00164066 /* CommandKick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A781300E7B0B00164066 /* CommandKick.cpp */; };
+		F9E5A786300E7B0B00164066 /* CommandOp.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A782300E7B0B00164066 /* CommandOp.hpp */; };
+		F9E5A789300E7B3400164066 /* Command.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A787300E7B3400164066 /* Command.cpp */; };
+		F9E5A78A300E7B3400164066 /* Command.hpp in Sources */ = {isa = PBXBuildFile; fileRef = F9E5A788300E7B3400164066 /* Command.hpp */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
@@ -1248,6 +1261,7 @@
 		9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CreateNewWorld_iphone.xib; path = minecraftpe/dialogs/CreateNewWorld_iphone.xib; sourceTree = "<group>"; };
 		9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = worldname_iphone5_3.png; sourceTree = "<group>"; };
 		9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+		BEEF202614CFF670005F0001 /* Lighting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Lighting.cpp; sourceTree = "<group>"; };
 		D51A8B01146A200000E5D720 /* minecraftpedemo-info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "minecraftpedemo-info.plist"; sourceTree = "<group>"; };
 		D51DC73514581D4E00E3D761 /* itemframe.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = itemframe.png; sourceTree = "<group>"; };
 		D51DC74114592B8A00E3D761 /* PVRTexture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRTexture.h; sourceTree = "<group>"; };
@@ -2468,7 +2482,19 @@
 		F99F0FA82F84369F00F2B29A /* GrassColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GrassColor.cpp; sourceTree = "<group>"; };
 		F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FoliageColor.cpp; sourceTree = "<group>"; };
 		F99F0FAE2F8436EB00F2B29A /* Color.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
-		BEEF202614CFF670005F0001 /* Lighting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lighting.cpp; path = Lighting.cpp; sourceTree = "<group>"; };
+		F9E5A771300E7A8700164066 /* LevelConstants.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = LevelConstants.cpp; path = ../../src/world/level/LevelConstants.cpp; sourceTree = "<group>"; };
+		F9E5A773300E7AB700164066 /* CommandManager.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandManager.hpp; path = ../../src/commands/CommandManager.hpp; sourceTree = "<group>"; };
+		F9E5A774300E7AB700164066 /* CommandManager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandManager.cpp; path = ../../src/commands/CommandManager.cpp; sourceTree = "<group>"; };
+		F9E5A777300E7AD500164066 /* CommandBan.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandBan.cpp; path = ../../src/commands/CommandBan.cpp; sourceTree = "<group>"; };
+		F9E5A778300E7AD500164066 /* CommandBan.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandBan.hpp; path = ../../src/commands/CommandBan.hpp; sourceTree = "<group>"; };
+		F9E5A77B300E7AF400164066 /* CommandHelp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandHelp.hpp; path = ../../src/commands/CommandHelp.hpp; sourceTree = "<group>"; };
+		F9E5A77C300E7AF400164066 /* CommandHelp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandHelp.cpp; path = ../../src/commands/CommandHelp.cpp; sourceTree = "<group>"; };
+		F9E5A77F300E7B0A00164066 /* CommandKick.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandKick.hpp; path = ../../src/commands/CommandKick.hpp; sourceTree = "<group>"; };
+		F9E5A780300E7B0A00164066 /* CommandOp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandOp.cpp; path = ../../src/commands/CommandOp.cpp; sourceTree = "<group>"; };
+		F9E5A781300E7B0B00164066 /* CommandKick.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CommandKick.cpp; path = ../../src/commands/CommandKick.cpp; sourceTree = "<group>"; };
+		F9E5A782300E7B0B00164066 /* CommandOp.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = CommandOp.hpp; path = ../../src/commands/CommandOp.hpp; sourceTree = "<group>"; };
+		F9E5A787300E7B3400164066 /* Command.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Command.cpp; path = ../../src/commands/Command.cpp; sourceTree = "<group>"; };
+		F9E5A788300E7B3400164066 /* Command.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = Command.hpp; path = ../../src/commands/Command.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -4319,6 +4345,19 @@
 		D5CF9C37144C225000E4244F = {
 			isa = PBXGroup;
 			children = (
+				F9E5A788300E7B3400164066 /* Command.hpp */,
+				F9E5A787300E7B3400164066 /* Command.cpp */,
+				F9E5A77F300E7B0A00164066 /* CommandKick.hpp */,
+				F9E5A781300E7B0B00164066 /* CommandKick.cpp */,
+				F9E5A782300E7B0B00164066 /* CommandOp.hpp */,
+				F9E5A780300E7B0A00164066 /* CommandOp.cpp */,
+				F9E5A77B300E7AF400164066 /* CommandHelp.hpp */,
+				F9E5A77C300E7AF400164066 /* CommandHelp.cpp */,
+				F9E5A778300E7AD500164066 /* CommandBan.hpp */,
+				F9E5A777300E7AD500164066 /* CommandBan.cpp */,
+				F9E5A773300E7AB700164066 /* CommandManager.hpp */,
+				F9E5A774300E7AB700164066 /* CommandManager.cpp */,
+				F9E5A771300E7A8700164066 /* LevelConstants.cpp */,
 				F99D344D2F7372A100DC153E /* Launch Screen.storyboard */,
 				D5E1BA9A1451C8A0007DCC4F /* Default@2x.png */,
 				9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */,
@@ -5451,6 +5490,19 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F9E5A789300E7B3400164066 /* Command.cpp in Sources */,
+				F9E5A78A300E7B3400164066 /* Command.hpp in Sources */,
+				F9E5A783300E7B0B00164066 /* CommandKick.hpp in Sources */,
+				F9E5A784300E7B0B00164066 /* CommandOp.cpp in Sources */,
+				F9E5A785300E7B0B00164066 /* CommandKick.cpp in Sources */,
+				F9E5A786300E7B0B00164066 /* CommandOp.hpp in Sources */,
+				F9E5A77D300E7AF400164066 /* CommandHelp.hpp in Sources */,
+				F9E5A77E300E7AF400164066 /* CommandHelp.cpp in Sources */,
+				F9E5A779300E7AD500164066 /* CommandBan.cpp in Sources */,
+				F9E5A77A300E7AD500164066 /* CommandBan.hpp in Sources */,
+				F9E5A775300E7AB700164066 /* CommandManager.hpp in Sources */,
+				F9E5A776300E7AB700164066 /* CommandManager.cpp in Sources */,
+				F9E5A772300E7A8700164066 /* LevelConstants.cpp in Sources */,
 				F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */,
 				D5CF9C57144C225000E4244F /* main.mm in Sources */,
 				D5CF9C5B144C225000E4244F /* minecraftpeAppDelegate.mm in Sources */,
--- 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.
 	//

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

 	if ( left < -1 )
 		seedMT( 4357U );
--- a/src/client/Minecraft.cpp
+++ b/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
--- a/src/client/Minecraft.h
+++ b/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"
--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -65,17 +65,17 @@ OptionBool useVignette("useVignette", true);
 OptionBool useTouchscreen("useTouchscreen", true);

 OptionBool serverVisible("servervisible", true);
-
+#ifndef __APPLE__
 OptionBool foliageTint("foliagetint", true);
-
+#endif
 OptionInt fogType("fogType", 0, 0, 2);

 OptionBool javaHud("javaHud", false);

 OptionBool betaSky("betaSky", false);
-
+#ifndef __APPLE__
 OptionBool tintedSide("tintedSide", false);
-
+#endif
 OptionBool blockOutline("blockOutline", false);

 OptionBool restoredAnims("restoredAnims", true);
@@ -199,17 +199,18 @@ void Options::initTable() {
 	m_options[OPTIONS_BAR_ON_TOP] = &barOnTop;
 	m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
 	m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
+#ifndef __APPLE__
 	m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
-
+#endif
 	// more options yay
 	m_options[OPTIONS_FOG_TYPE] = &fogType;

 	m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;

 	m_options[OPTIONS_BETA_SKY] = &betaSky;
-
+#ifndef __APPLE__
 	m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
-
+#endif
 	m_options[OPTIONS_JAVA_HUD] = &javaHud;

 	m_options[OPTIONS_AUTOJUMP] = &autoJump;
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -88,11 +88,15 @@ enum OptionId {
    OPTIONS_LAST_IP,

    OPTIONS_RPI_CURSOR,
+#ifndef __APPLE__
 	OPTIONS_FOLIAGE_TINT,
-	OPTIONS_FOG_TYPE,
+#endif
+    OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
+#ifndef __APPLE__
 	OPTIONS_TINTED_SIDE,
+#endif
 	OPTIONS_BETA_SKY,
 	OPTIONS_BEAUTIFUL_SKY,
 	OPTIONS_VIGNETTE,
--- a/src/client/gui/components/GuiElementContainer.cpp
+++ b/src/client/gui/components/GuiElementContainer.cpp
@@ -35,6 +35,17 @@ void GuiElementContainer::removeChild( GuiElement* element ) {
 		children.erase(it);
 }

+bool GuiElementContainer::containsPointInChildren(int x, int y) const {
+	for (auto it = children.begin(); it != children.end(); ++it) {
+		GuiElement* child = *it;
+		if (child == NULL || !child->visible) continue;
+		if (child->pointInside(x, y)) return true;
+		const GuiElementContainer* container = dynamic_cast<const GuiElementContainer*>(child);
+		if (container != NULL && container->containsPointInChildren(x, y)) return true;
+	}
+	return false;
+}
+
 void GuiElementContainer::tick( Minecraft* minecraft ) {
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->tick(minecraft);
--- a/src/client/gui/components/GuiElementContainer.h
+++ b/src/client/gui/components/GuiElementContainer.h
@@ -5,16 +5,17 @@
 class Tesselator;
 class Minecraft;

-class GuiElementContainer : public GuiElement {
-public:
-	GuiElementContainer(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
-    virtual ~GuiElementContainer();
-    virtual void render(Minecraft* minecraft, int xm, int ym);
-	virtual void setupPositions();
-	virtual void addChild(GuiElement* element);
-	virtual void removeChild(GuiElement* element);
-
-	virtual void tick( Minecraft* minecraft );
+class GuiElementContainer : public GuiElement {
+public:
+	GuiElementContainer(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
+    virtual ~GuiElementContainer();
+    virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void setupPositions();
+	virtual void addChild(GuiElement* element);
+	virtual void removeChild(GuiElement* element);
+	bool containsPointInChildren(int x, int y) const;
+
+	virtual void tick( Minecraft* minecraft );

 	virtual void mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum );
 	virtual void mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum );
--- a/src/client/gui/components/OptionsGroup.cpp
+++ b/src/client/gui/components/OptionsGroup.cpp
@@ -1,115 +1,219 @@
-#include "OptionsGroup.h"
-#include "../../Minecraft.h"
-#include "ImageButton.h"
-#include "OptionsItem.h"
-#include "Slider.h"
-#include "../../../locale/I18n.h"
-#include "TextOption.h"
-#include "KeyOption.h"
-
-OptionsGroup::OptionsGroup( std::string labelID )  {
-	label = I18n::get(labelID);
-}
-
-void OptionsGroup::setupPositions() {
-	// First we write the header and then we add the items
-	int curY = y + 18;
-	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
-		(*it)->width = width - 5;
-		
-		(*it)->y = curY;
-		(*it)->x = x + 10;
-		(*it)->setupPositions();
-		curY += (*it)->height + 3;
-	}
-	height = curY;
-}
-
-void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
-	float padX = 10.0f;
-	float padY = 5.0f;
-	
-	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
-
-	super::render(minecraft, xm, ym);
-}
-
-OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
-	auto option = minecraft->options.getOpt(optId);
-
-	if (option == nullptr) return *this;
-
-	// TODO: do a options key class to check it faster via dynamic_cast
-	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
-	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
-	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
-	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
-	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
-
-	return *this;
-}
-
-// TODO: wrap this copypaste shit into templates
-
-void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
-	ImageDef def;
-
-	def.setSrc(IntRectangle(160, 206, 39, 20));
-	def.name = "gui/touchgui.png";
-	def.width = 39 * 0.7f;
-	def.height = 20 * 0.7f;
-	
-	OptionButton* element = new OptionButton(optId);
-	element->setImageDef(def, true);
-	element->updateImage(&minecraft->options);
-	
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
-	Slider* element = new SliderFloat(minecraft, optId);
-	element->width = 100;
-	element->height = 20;
-
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
-	Slider* element = new SliderInt(minecraft, optId);
-	element->width = 100;
-	element->height = 20;
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
-	TextBox* element = new TextOption(minecraft, optId);
-	element->width = 100;
-	element->height = 20;
-
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
-
-void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
-	KeyOption* element = new KeyOption(minecraft, optId);
-	element->width = 50;
-	element->height = 20;
-
-	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
-	addChild(item);
-	setupPositions();
-}
+#include "OptionsGroup.h"
+#include "../../Minecraft.h"
+#include "ImageButton.h"
+#include "OptionsItem.h"
+#include "Slider.h"
+#include "../../../locale/I18n.h"
+#include "TextOption.h"
+#include "KeyOption.h"
+#include <algorithm>
+#include "../Gui.h"
+#include "../Screen.h"
+#include "../../../platform/input/Mouse.h"
+#include "../../../util/Mth.h"
+
+OptionsGroup::OptionsGroup( std::string labelID ) {
+	label = I18n::get(labelID);
+}
+
+void OptionsGroup::setupPositions() {
+	const int labelHeight = 18;
+	const int bottomPadding = 36;
+	const float requestedScroll = scrollOffsetY;
+	const int scrollOffset = (int)requestedScroll;
+	int curY = y + labelHeight - scrollOffset;
+	const int contentStartY = y + labelHeight;
+
+	// First we write the header and then we add the items
+	for(auto it = children.begin(); it != children.end(); ++it) {
+		(*it)->width = width - 5;
+		
+		(*it)->y = curY;
+		(*it)->x = x + 10;
+		(*it)->setupPositions();
+		curY += (*it)->height + 3;
+	}
+	curY += bottomPadding;
+	contentHeight = std::max(0, curY - contentStartY + scrollOffset);
+	maxScrollOffsetY = std::max(0, contentHeight - (height - labelHeight));
+	const float clampedScroll = Mth::clamp(requestedScroll, 0.0f, maxScrollOffsetY);
+	if (clampedScroll != requestedScroll) {
+		scrollOffsetY = clampedScroll;
+		setupPositions();
+	}
+}
+
+void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
+	float padX = 10.0f;
+	float padY = 5.0f;
+	const int labelHeight = 18;
+	
+	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
+
+	glEnable2(GL_SCISSOR_TEST);
+	glScissor(
+		Gui::GuiScale * x,
+		minecraft->height - Gui::GuiScale * (y + height),
+		Gui::GuiScale * width,
+		Gui::GuiScale * (height - labelHeight)
+	);
+
+	super::render(minecraft, xm, ym);
+	glDisable2(GL_SCISSOR_TEST);
+}
+
+void OptionsGroup::tick(Minecraft* minecraft) {
+	int xm = Mouse::getX();
+	int ym = Mouse::getY();
+	if (minecraft->screen != NULL) {
+		minecraft->screen->toGUICoordinate(xm, ym);
+	}
+
+	bool leftDown = Mouse::isButtonDown(MouseAction::ACTION_LEFT);
+
+	if (trackingScrollGesture && leftDown) {
+		int dy = ym - lastDragY;
+		int dx = xm - dragStartX;
+		if (!scrollingGesture) {
+			int totalDx = xm - dragStartX;
+			int totalDy = ym - dragStartY;
+			if (std::abs(totalDx) >= ScrollStartThreshold || std::abs(totalDy) >= ScrollStartThreshold) {
+				if (std::abs(totalDy) >= std::abs(totalDx)) {
+					scrollingGesture = true;
+				} else if (!touchDispatched) {
+					super::mouseClicked(minecraft, touchStartX, touchStartY, MouseAction::ACTION_LEFT);
+					touchDispatched = true;
+				}
+			}
+		}
+		if (scrollingGesture && dy != 0) {
+			scrollByPixels((float)dy);
+		}
+		lastDragY = ym;
+	}
+	super::tick(minecraft);
+}
+
+void OptionsGroup::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	touchDispatched = false;
+
+	if (buttonNum == MouseAction::ACTION_LEFT && pointInside(x, y)) {
+		trackingScrollGesture = true;
+		dragStartX = x;
+		dragStartY = y;
+		lastDragY = y;
+		touchStartX = x;
+		touchStartY = y;
+		return;
+	}
+
+	super::mouseClicked(minecraft, x, y, buttonNum);
+}
+
+void OptionsGroup::mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum) {
+	bool wasScrolling = scrollingGesture;
+	bool wasTracking = trackingScrollGesture;
+	trackingScrollGesture = false;
+	scrollingGesture = false;
+	if (buttonNum == MouseAction::ACTION_LEFT && wasTracking && !touchDispatched && pointInside(touchStartX, touchStartY)) {
+		super::mouseClicked(minecraft, touchStartX, touchStartY, buttonNum);
+		touchDispatched = true;
+	}
+
+	if (!wasScrolling) {
+		super::mouseReleased(minecraft, x, y, buttonNum);
+	}
+}
+
+void OptionsGroup::scrollByPixels(float deltaY) {
+	if (deltaY == 0.0f || maxScrollOffsetY <= 0.0f) return;
+
+	scrollOffsetY = Mth::clamp(scrollOffsetY - deltaY, 0.0f, maxScrollOffsetY);
+	setupPositions();
+}
+
+bool OptionsGroup::isScrollingGestureActive() const {
+	return trackingScrollGesture || scrollingGesture;
+}
+
+OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
+	auto option = minecraft->options.getOpt(optId);
+
+	if (option == nullptr) return *this;
+
+	// TODO: do a options key class to check it faster via dynamic_cast
+	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
+	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
+	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
+	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
+	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
+
+	return *this;
+}
+
+// TODO: wrap this copypaste shit into templates
+
+void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
+	ImageDef def;
+
+	def.setSrc(IntRectangle(160, 206, 39, 20));
+	def.name = "gui/touchgui.png";
+	def.width = 39 * 0.7f;
+	def.height = 20 * 0.7f;
+	
+	OptionButton* element = new OptionButton(optId);
+	element->setImageDef(def, true);
+	element->updateImage(&minecraft->options);
+	
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderFloat(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderInt(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
+	TextBox* element = new TextOption(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
+	KeyOption* element = new KeyOption(minecraft, optId);
+	element->width = 50;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
--- a/src/client/gui/components/OptionsGroup.h
+++ b/src/client/gui/components/OptionsGroup.h
@@ -1,32 +1,49 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
-
-//package net.minecraft.client.gui;
-
-#include <string>
-#include "GuiElementContainer.h"
-#include "ScrollingPane.h"
-#include "../../Options.h"
-
-class Font;
-class Minecraft;
-
-class OptionsGroup: public GuiElementContainer {
-	typedef GuiElementContainer super;
-public:
-	OptionsGroup(std::string labelID);
-	virtual void setupPositions();
-	virtual void render(Minecraft* minecraft, int xm, int ym);
-	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
-protected:
-
-	void createToggle(OptionId optId, Minecraft* minecraft);
-	void createProgressSlider(OptionId optId, Minecraft* minecraft);
-	void createStepSlider(OptionId optId, Minecraft* minecraft);
-	void createTextbox(OptionId optId, Minecraft* minecraft);
-	void createKey(OptionId optId, Minecraft* minecraft);
-
-	std::string label;
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/
+#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
+#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__
+
+//package net.minecraft.client.gui;
+
+#include <string>
+#include "GuiElementContainer.h"
+#include "ScrollingPane.h"
+#include "../../Options.h"
+
+class Font;
+class Minecraft;
+
+class OptionsGroup: public GuiElementContainer {
+	typedef GuiElementContainer super;
+public:
+	OptionsGroup(std::string labelID);
+	virtual void setupPositions();
+	virtual void render(Minecraft* minecraft, int xm, int ym);
+	virtual void tick(Minecraft* minecraft);
+	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum);
+	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
+	void scrollByPixels(float deltaY);
+	bool isScrollingGestureActive() const;
+protected:
+
+	void createToggle(OptionId optId, Minecraft* minecraft);
+	void createProgressSlider(OptionId optId, Minecraft* minecraft);
+	void createStepSlider(OptionId optId, Minecraft* minecraft);
+	void createTextbox(OptionId optId, Minecraft* minecraft);
+	void createKey(OptionId optId, Minecraft* minecraft);
+
+	std::string label;
+	int contentHeight = 0;
+	float scrollOffsetY = 0.f;
+	float maxScrollOffsetY = 0.f;
+	bool trackingScrollGesture = false;
+	bool scrollingGesture = false;
+	bool touchDispatched = false;
+	int dragStartX = 0;
+	int dragStartY = 0;
+	int lastDragY = 0;
+	int touchStartX = 0;
+	int touchStartY = 0;
+	static const int ScrollStartThreshold = 5;
+};
+
+#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsGroup_H__*/
--- 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<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(_input);
@@ -81,7 +81,7 @@ void ConsoleScreen::execute()
        } else {
            minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
        }
-    // }
+    }

    minecraft->setScreen(NULL);
 }
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -121,6 +121,7 @@ void OptionsScreen::setupPositions() {
 			(*it)->x = categoryButtons[0]->width;
 			(*it)->y = bHeader->height;
 			(*it)->width = width - categoryButtons[0]->width;
+			(*it)->height = height - bHeader->height;

 			(*it)->setupPositions();
 		}
@@ -261,6 +262,12 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 	super::mouseReleased(x, y, buttonNum);
 }

+void OptionsScreen::mouseWheel(int dx, int dy, int xm, int ym) {
+	if (currentOptionsGroup != NULL && currentOptionsGroup->pointInside(xm, ym) && dy != 0) {
+		currentOptionsGroup->scrollByPixels((float)dy * 18.0f);
+	}
+}
+
 void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);
--- a/src/client/gui/screens/OptionsScreen.h
+++ b/src/client/gui/screens/OptionsScreen.h
@@ -27,6 +27,7 @@ public:

 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void mouseWheel(int dx, int dy, int xm, int ym);
 	virtual void keyPressed(int eventKey);
 	virtual void charPressed(char inputChar);
 	
--- a/src/client/renderer/LevelRenderer.cpp
+++ b/src/client/renderer/LevelRenderer.cpp
@@ -185,11 +185,14 @@ void LevelRenderer::allChanged()

 	lastFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);

+#ifndef __APPLE__
 	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
+	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
+#else 
+	bool tint = false, sideTint = false;
+#endif
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
-
-	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
 	TileRenderer::setUseTint(sideTint);


--- a/src/client/renderer/entity/EntityRenderer.cpp
+++ b/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;
--- a/src/commands/CommandBan.cpp
+++ b/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 == (Player*)mc.player) {
+        return "ban: you can't ban urself lol";
+    }
+    
    if (it != mc.level->players.end()) {
-        if (*it == (Player*)mc.player) {
-            return "banip: you can't ban urself lol";
-        }
+        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!";
            }
        }
    }
--- a/src/commands/CommandBanIp.cpp
+++ b/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>";
-}
--- a/src/commands/CommandBanIp.hpp
+++ b/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);
-};
--- a/src/commands/CommandKick.cpp
+++ b/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;
-
-    (*it)->reallyRemoveIfPlayer = true;
-    mc.level->removeEntity((*it));
-    mc.raknetInstance->getPeer()->CloseConnection(sourceId, true);
+    mc.level->removePlayer(*it);
+    (*it)->remove();
+    mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true);
    return "kick: successfully kicked player " + args[0];
 }

--- a/src/commands/CommandManager.cpp
+++ b/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() {
--- a/src/commands/CommandPardon.cpp
+++ b/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>";
-}
--- a/src/commands/CommandPardon.hpp
+++ b/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);
-};
--- a/src/main_dedicated.cpp
+++ b/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");

@@ -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,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();
@@ -252,20 +232,7 @@ 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;
--- 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 = new ItemInstance();
+	ItemInstance* item;

 	item->count = packet->count;
 	item->id = packet->itemId;
--- a/src/network/RakNetInstance.cpp
+++ b/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);
-		}
+
+		rakPeer->DeallocatePacket(currentEvent);
 		//delete activeBitStream;
 	}

--- a/src/network/ServerSideNetworkHandler.cpp
+++ b/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 (packet->message[0] == '/') {
+		// This is a command

-			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);
+		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1))));
+		return sendPrivate(resp, source);
 	}
+
+	displayGameMessage("<" + player->name + "> " + packet->message);
 }

 void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -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);
-    char clientIp[32];
-    sysAddress.ToString(false, clientIp);
-
+	printf("%s lower \n", nicknameLower.c_str());
 	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));
 }

 //
@@ -505,23 +451,17 @@ 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);
@@ -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);
--- a/src/network/ServerSideNetworkHandler.h
+++ b/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
 	 */
@@ -79,8 +78,6 @@ public:
 	void sendPrivate(Packet& packet, const RakNet::RakNetGUID& source);

 	Player* getPlayer(const RakNet::RakNetGUID& source);
-	
-private:

 	Minecraft*					minecraft;
 	Level*						level;
--- a/src/platform/audio/SoundSystemAL.cpp
+++ b/src/platform/audio/SoundSystemAL.cpp
@@ -10,13 +10,10 @@
 static const char* errIdString = 0;

 void checkError() {
+    ALenum err = alGetError();
+    if(err == AL_NO_ERROR) return;

-    while (1) {
-        ALenum err = alGetError();
-        if(err == AL_NO_ERROR) return;
-
-        LOGI("### SoundSystemAL error: %d ####: %s\n", err, errIdString==0?"(none)":errIdString);
-    }
+    LOGI("### SoundSystemAL error: %d ####: %s\n", err, errIdString==0?"(none)":errIdString);
 }

 //typedef ALvoid	AL_APIENTRY	(*alBufferDataStaticProcPtr) (const ALint bid, ALenum format, ALvoid *data, ALsizei size, ALsizei freq);
--- a/src/plugins/LuaPlayer.hpp
+++ b/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;
-};
--- a/src/plugins/LuaServer.cpp
+++ b/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);
-}
--- a/src/plugins/LuaServer.hpp
+++ b/src/plugins/LuaServer.hpp
@@ -1,7 +0,0 @@
-#pragma once
-#include <string>
-
-class LuaServer {
-public:
-    void sendServerMessage(std::string msg);
-};
--- a/src/plugins/MessageEvent.hpp
+++ b/src/plugins/MessageEvent.hpp
@@ -1,9 +0,0 @@
-#pragma once
-
-class MessageEvent {
-public:
-    bool m_decline;
-
-    void setDecline(bool decline) { m_decline = decline; }
-private:
-};
--- a/src/plugins/PluginsManager.cpp
+++ b/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);
-    }
-}
--- a/src/plugins/PluginsManager.hpp
+++ b/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;
-};
--- 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.
 	//

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

 	if ( left < -1 )
 		seedMT( 4357U );
--- a/src/world/item/TileItem.h
+++ b/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);
--- a/src/world/level/Level.h
+++ b/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;
Author	SHA1	Message	Date
Nikolai Nevzorov	3b82c519d0	Merge pull request 'Add icon for win32' (#18 ) from yefeng/minecraft-pe-0.6.1:main into main Reviewed-on: #18	2026-07-20 21:41:45 +02:00
Kolyah35	002bb40aae	FIX: OpenAL error loop	2026-07-20 22:25:18 +03:00
Nikolai Nevzorov	6f4a07a306	Merge pull request 'Style changes' (#27 ) from Dram27-fix-settings-scrolling into main Reviewed-on: #27	2026-07-20 21:14:57 +02:00
Nikolai Nevzorov	d5a3871f56	Merge pull request 'fix-settings-scrolling' (#24 ) from Dram27/minecraft-pe-0.6.1:fix-settings-scrolling into main Reviewed-on: #24	2026-07-20 21:13:41 +02:00
Kolyah35	0c32f620af	Sorry, apple users, I'm temporary removing foliage tinting	2026-07-20 22:11:41 +03:00
Kolyah35	93bf97a15e	Style changes	2026-07-20 20:05:29 +03:00
deepfriedwaffles	0ee809daf1	Added new sources to xcodeproj so it can compile again pull request opened and merged by me [obama giving medal to himself gif]	2026-07-20 18:12:11 +02:00
deepfriedwaffles	a048a51300	Added new sources to xcodeproj so it can compile again	2026-07-20 11:53:20 -04:00
InviseDivine	365d8a10da	Update README.md	2026-07-20 17:25:02 +02:00
Nikolai Nevzorov	3940c9ce1b	Update README.MD	2026-07-20 16:22:56 +02:00
InviseDivine	156849eeb6	Update README.md	2026-07-20 15:56:21 +02:00
InviseDivine	6a8b192024	Update README.md	2026-07-20 15:45:27 +02:00
Kolyah35	ce8ca15c56	FIX: android entity shadows	2026-07-20 15:37:19 +03:00
Dram27	b3561e773d	Fix to prevent text overlap in options list during scroll	2026-04-26 16:12:56 +02:00
Dram27	162ec7adfa	Fix bottom settings overlapping with Credits button	2026-04-26 16:00:44 +02:00
Dram27	4cfaa43d77	Added scroll with wheel on PC and touch scroll on Android/IOS	2026-04-26 15:47:52 +02:00
yefengeeeeeeeeeee	f1e8932fbd	Add icon for win32	2026-03-28 18:12:34 +08:00