1

CMakeLists.txt

@@ -3,10 +3,9 @@ project(MinecraftPE)
 
 include(cmake/CPM.cmake)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
-
 include(cmake/EnumOption.cmake)
 
 if(EMSCRIPTEN)
@@ -16,9 +15,7 @@ endif()
 
 enum_option(PLATFORM "Desktop;Web" "Platform to build for.")
 
-if(NOT EMSCRIPTEN)
-    find_package(Threads REQUIRED)
-endif()
+find_package(Threads REQUIRED)
 find_package(OpenSSL)
 
 if (${PLATFORM} STREQUAL "Desktop")
@@ -36,9 +33,11 @@ if (${PLATFORM} STREQUAL "Desktop")
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
         include_directories(misc/windows)
         set(EXTRA_LIBS ws2_32 winhttp)
+        add_definitions(-DLUA_DL_DLL=1)
     elseif(UNIX)
         find_library(pthread NAMES pthread)
         set(EXTRA_LIBS pthread m)
+        add_definitions(-DLUA_USE_DLOPEN=1)
     endif()
 
 elseif (${PLATFORM} STREQUAL "Web")
@@ -97,6 +96,46 @@ else()
             "GLFW_BUILD_TESTS OFF"
             "GLFW_BUILD_DOCS OFF"
     )
+
+    CPMAddPackage("gh:halx99/sol2#support-lua-5.5")
+    CPMAddPackage("gh:lua/lua#master")
+
+    add_library(
+        lua STATIC
+        ${lua_SOURCE_DIR}/lapi.c
+        ${lua_SOURCE_DIR}/lauxlib.c
+        ${lua_SOURCE_DIR}/lbaselib.c
+        ${lua_SOURCE_DIR}/lcode.c
+        ${lua_SOURCE_DIR}/lcorolib.c
+        ${lua_SOURCE_DIR}/lctype.c
+        ${lua_SOURCE_DIR}/ldblib.c
+        ${lua_SOURCE_DIR}/ldebug.c
+        ${lua_SOURCE_DIR}/ldo.c
+        ${lua_SOURCE_DIR}/ldump.c
+        ${lua_SOURCE_DIR}/lfunc.c
+        ${lua_SOURCE_DIR}/lgc.c
+        ${lua_SOURCE_DIR}/linit.c
+        ${lua_SOURCE_DIR}/liolib.c
+        ${lua_SOURCE_DIR}/llex.c
+        ${lua_SOURCE_DIR}/lmathlib.c
+        ${lua_SOURCE_DIR}/lmem.c
+        ${lua_SOURCE_DIR}/loadlib.c
+        ${lua_SOURCE_DIR}/lobject.c
+        ${lua_SOURCE_DIR}/lopcodes.c
+        ${lua_SOURCE_DIR}/loslib.c
+        ${lua_SOURCE_DIR}/lparser.c
+        ${lua_SOURCE_DIR}/lstate.c
+        ${lua_SOURCE_DIR}/lstring.c
+        ${lua_SOURCE_DIR}/lstrlib.c
+        ${lua_SOURCE_DIR}/ltable.c
+        ${lua_SOURCE_DIR}/ltablib.c
+        ${lua_SOURCE_DIR}/ltm.c
+        ${lua_SOURCE_DIR}/lua.c
+        ${lua_SOURCE_DIR}/lundump.c
+        ${lua_SOURCE_DIR}/lutf8lib.c
+        ${lua_SOURCE_DIR}/lvm.c
+        ${lua_SOURCE_DIR}/lzio.c
+    )
 endif()
 
 CPMAddPackage(
@@ -217,6 +256,8 @@ file(GLOB SERVER_SOURCES
 
     "src/world/phys/HitResult.cpp"
     "src/commands/*.cpp"
+
+    "src/plugins/*.cpp"
 ) 
 
 file(GLOB CLIENT_SOURCES 
@@ -302,6 +343,8 @@ file(GLOB CLIENT_SOURCES
     "src/main.cpp"
 
     "src/commands/*.cpp"
+    "src/plugins/*.cpp"
+
 )
 
 if (${PLATFORM} STREQUAL "Desktop")
@@ -310,21 +353,20 @@ endif()
 
 # Server
 add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
-
+set_target_properties("${PROJECT_NAME}-server" PROPERTIES ENABLE_EXPORTS TRUE)
 target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
 
 target_include_directories("${PROJECT_NAME}-server" PUBLIC 
     "${CMAKE_SOURCE_DIR}/src/"
+    "${lua_SOURCE_DIR}/"
+
     "project/lib_projects/raknet/jni/RaknetSources"
 )
 
-target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS})
+target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS} lua sol2::sol2)
 
 add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
-
-if(WIN32) 
-    target_sources(${PROJECT_NAME} PRIVATE data/images/pe.rc)
-endif()
+set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE)
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
 
@@ -334,6 +376,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     "${openal_SOURCE_DIR}/include"
     "${glfw_SOURCE_DIR}/include"
     "lib/include"
+    "${lua_SOURCE_DIR}/"
+
 )
 
 if(${PLATFORM} MATCHES "Web")
@@ -381,7 +425,7 @@ endif()
 
 # Client
 target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
-target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})
+target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS} lua sol2::sol2)
 
 if (OpenSSL_FOUND)
     target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)

README.md

@@ -1,6 +1,6 @@
 # MinecraftPE
 > [!Warning]
-> [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).
+> 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).
 
 > [!Important]
 > We have a discord server, where you can report bugs or send feedback https://discord.gg/c58YesBxve
@@ -9,20 +9,23 @@ 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.
 
-# 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>
+# 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
 
 # Build
 
@@ -76,14 +79,8 @@ 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):
 
-```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:
+3. Run the build script:
 
 ```powershell
 # Full build (NDK + Java + APK + install)
@@ -157,6 +154,7 @@ sdkmanager "build-tools;android-36" --sdk_root="%LocalAppData%\Android\Sdk"
 
    ```bash
    35.0.0
+   33.0.2
    ```
 
 6. Download **Android NDK r14b**:  
@@ -202,7 +200,7 @@ sdkmanager "build-tools;android-36" --sdk_root="%LocalAppData%\Android\Sdk"
    ```
 ## 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

data/images/pe.rc

@@ -1 +0,0 @@
-IDI_ICON1 ICON "pe.ico"

data/lang/en_US.lang

@@ -1020,5 +1020,5 @@ desc.netherbrickitem=Used to form blocks of Nether bricks.
 desc.netherquartz=Quartz from the Nether, used to create Blocks of Quartz.
 desc.quartzblock=Decorative block, used to create other kinds of Quartz blocks.
 desc.stonecutter=For crafting stoneblocks.
-desc.seeds_melon=Allows for more melons.
+desc.seedsmelon=Allows for more melons.
 desc.tile.melon=Can be cut up and eaten.

project/android/assets/lang/en_US.lang

@@ -965,5 +965,5 @@ desc.netherbrickitem=Used to form blocks of Nether bricks.
 desc.netherquartz=Quartz from the Nether, used to create Blocks of Quartz.
 desc.quartzblock=Decorative block, used to create other kinds of Quartz blocks.
 desc.stonecutter=For crafting stoneblocks.
-desc.seeds_melon=Allows for more melons.
+desc.seedsmelon=Allows for more melons.
 desc.tile.melon=Can be cut up and eaten.

project/iosproj/minecraftpe.xcodeproj/project.pbxproj

@@ -47,8 +47,6 @@
 		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 */; };
@@ -1181,19 +1179,8 @@
 		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 */; };
-		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 */; };
+		BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
+		BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -1261,7 +1248,6 @@
 		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>"; };
@@ -2482,19 +2468,7 @@
 		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>"; };
-		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>"; };
+		BEEF202614CFF670005F0001 /* Lighting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lighting.cpp; path = Lighting.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -4345,19 +4319,6 @@
 		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 */,
@@ -5490,19 +5451,6 @@
 			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 */,

project/lib_projects/raknet/jni/RaknetSources/Rand.cpp

@@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 	// so-- that's why the only change I made is to restrict to odd seeds.
 	//
 
-	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	register int j;
+	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	int j;
 
 	for ( left = 0, *s++ = x, j = N; --j;
 		*s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 
 unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
 {
-	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	register int j;
+	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	int j;
 
 	if ( left < -1 )
 		seedMT( 4357U );

src/SharedConstants.cpp

@@ -4,11 +4,12 @@ namespace Common {
 
 std::string getGameVersionString(const std::string& versionSuffix /* = "" */)
 {
-	std::string result = std::string("v0.1.0 (forked from v0.6.1 alpha)") + versionSuffix;
+	std::string result = std::string("v0.6.1") + versionSuffix;
 	// append 64-bit port marker only on Android 64‑bit targets
 	#if defined(ANDROID) && (defined(__aarch64__) || defined(__x86_64__))
-		result += " (64-bit)";
+		result += " (64-bit port)";
 	#endif
+	result += " alpha";
 	return result;
 }
 

src/client/Minecraft.cpp

@@ -287,13 +287,9 @@ 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;
-#if defined(STANDALONE_SERVER) || defined(PLATFORM_WEB)
+#ifdef STANDALONE_SERVER
 		const bool threadedLevelCreation = false;
 #else
 		const bool threadedLevelCreation = true;
@@ -516,7 +512,7 @@ void Minecraft::tick(int nTick, int maxTick) {
 	if (missTime > 0) missTime--;
 #ifndef STANDALONE_SERVER
 	if (!screen && player) {
-		if (player->hasDied()) {
+		if (player->health <= 0) {
 			setScreen(new DeathScreen());
 		}
 	}
@@ -1214,6 +1210,8 @@ void Minecraft::init()
 	checkGlError("Init complete");
 #endif
 
+	PluginsManager::get().init(*this);
+	
 	options.load();
 
 	setIsCreativeMode(false); // false means it's Survival Mode

src/client/Minecraft.h

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

src/client/Options.cpp

@@ -65,13 +65,17 @@ OptionBool useVignette("useVignette", true);
 OptionBool useTouchscreen("useTouchscreen", true);
 
 OptionBool serverVisible("servervisible", true);
-OptionBool foliageTint("foliagetint", false);
+
+OptionBool foliageTint("foliagetint", true);
+
 OptionInt fogType("fogType", 0, 0, 2);
 
 OptionBool javaHud("javaHud", false);
 
 OptionBool betaSky("betaSky", false);
+
 OptionBool tintedSide("tintedSide", false);
+
 OptionBool blockOutline("blockOutline", false);
 
 OptionBool restoredAnims("restoredAnims", true);
@@ -196,13 +200,16 @@ void Options::initTable() {
 	m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
 	m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
 	m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
+
 	// more options yay
 	m_options[OPTIONS_FOG_TYPE] = &fogType;
 
 	m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;
 
 	m_options[OPTIONS_BETA_SKY] = &betaSky;
+
 	m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
+
 	m_options[OPTIONS_JAVA_HUD] = &javaHud;
 
 	m_options[OPTIONS_AUTOJUMP] = &autoJump;

src/client/Options.h

@@ -89,7 +89,7 @@ enum OptionId {
 
     OPTIONS_RPI_CURSOR,
 	OPTIONS_FOLIAGE_TINT,
-    OPTIONS_FOG_TYPE,
+	OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
 	OPTIONS_TINTED_SIDE,

src/client/gui/components/GuiElementContainer.cpp

@@ -35,17 +35,6 @@ 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);

src/client/gui/components/GuiElementContainer.h

@@ -5,17 +5,16 @@
 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);
-	bool containsPointInChildren(int x, int y) const;
-
-	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);
+
+	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 );

src/client/gui/components/OptionsGroup.cpp

@@ -1,219 +1,115 @@
-#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();
-}
+#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();
+}

src/client/gui/components/OptionsGroup.h

@@ -1,49 +1,32 @@
-#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__*/
+#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__*/

src/client/gui/components/ScrollingPane.cpp

@@ -204,23 +204,22 @@ void ScrollingPane::render( int xm, int ym, float alpha ) {
 
 	const float bxx = bbox.x - (fpx /*+ dx*alpha*/) + (nw.xf - nw.x);
 	const float byy = bbox.y - (fpy /*+ dy*alpha*/) + (nw.yf - nw.y);
-	for (int y = nw.y; y <= se.y; ++y) {
-		for (int x = nw.x; x <= se.x; ++x) {
-			int id = y * columns + x;
-			if (y <0 || id < 0 || id >= numItems) continue; // @todo: break rather
-			if (isNotSet(SF_WrapX) && (x < 0 || x >= columns)) continue; // @todo: break rather
-			GridItem item; //@todo: v- Does not support SF_Wrapping
-			item.id = id;
-			item.xf  = bxx + x * itemBbox.w;
-			item.yf  = byy + y * itemBbox.h;
-			item.x = (int)item.xf;
-			item.y = (int)item.yf;
-			//LOGI("i: %d (%.1f, %.1f)\t", id, item.xf, item.yf);
-			if (isSet(SF_MultiSelect)) item.selected = selected[id];
-			else item.selected = (id == selectedId);
+	for (int y = nw.y; y <= se.y; ++y)
+	for (int x = nw.x; x <= se.x; ++x) {
+		int id = y * columns + x;
+		if (y <0 || id < 0 || id >= numItems) continue; // @todo: break rather
+		if (isNotSet(SF_WrapX) && (x < 0 || x >= columns)) continue; // @todo: break rather
+		GridItem item; //@todo: v- Does not support SF_Wrapping
+		item.id = id;
+		item.xf  = bxx + x * itemBbox.w;
+		item.yf  = byy + y * itemBbox.h;
+		item.x = (int)item.xf;
+		item.y = (int)item.yf;
+		//LOGI("i: %d (%.1f, %.1f)\t", id, item.xf, item.yf);
+		if (isSet(SF_MultiSelect)) item.selected = selected[id];
+		else item.selected = (id == selectedId);
 
-			itemsToRender.push_back(item);
-		}
+		itemsToRender.push_back(item);
 	}
 	renderBatch(itemsToRender, alpha);
 

src/client/gui/screens/ChestScreen.cpp

@@ -329,10 +329,7 @@ bool ChestScreen::handleAddItem(FillingContainer* from, FillingContainer* to, in
 		added = (takenItem.count != wantedCount);
 
 		if (added) {
-			if (!minecraft->isCreativeMode()) {
-				item->count -= (wantedCount - takenItem.count);
-			}
-			
+			item->count -= (wantedCount - takenItem.count);
 			std::vector<int> changed;
 			std::vector<const ItemInstance*> items = getItems(toPane);
 			differ.getDiff(items, changed);

src/client/gui/screens/ConsoleScreen.cpp

@@ -6,7 +6,7 @@
 #include "../../../world/level/Level.h"
 #include "../../../network/RakNetInstance.h"
 #include "../../../network/ServerSideNetworkHandler.h"
-#include "../../../network/packet/MessagePacket.h"
+#include "../../../network/packet/ChatPacket.h"
 #include "../../../platform/log.h"
 #include "util/StringUtils.h"
 
@@ -63,28 +63,25 @@ void ConsoleScreen::execute()
         return minecraft->setScreen(NULL);
     }
 
-    if (minecraft->netCallback && !minecraft->raknetInstance->isServer()) {
-        MessagePacket packet(_input.c_str());
-        minecraft->raknetInstance->send(&packet);
-    } else if (_input[0] == '/') {
-        _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);
+    // 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 {
+        // @ai @rewrite
+        if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
+            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(_input);
+        } else if (minecraft->netCallback) {
+            ChatPacket chatPkt(_input);
+            minecraft->raknetInstance->send(chatPkt);
+        } else {
+            minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
         }
-    }
-    else {
-        if (minecraft->raknetInstance->isServer()) {
-            MessagePacket packet(_input.c_str());
-            minecraft->raknetInstance->send(&packet);
-        }
-
-        minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
-    }
+    // }
 
     minecraft->setScreen(NULL);
 }

src/client/gui/screens/DeathScreen.cpp

@@ -72,7 +72,7 @@ void DeathScreen::render( int xm, int ym, float a )
 if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
 	glPushMatrix2();
 	glScalef2(2, 2, 2);
-	drawCenteredString(font, I18n::get("deathScreen.title.hardcore"), width / 4, height / 8, 0xffffff);
+	drawCenteredString(font, "Game over!", width / 2 / 2, height / 8, 0xffffff);
 	glPopMatrix2();
 	std::stringstream ss;
 	ss << "Score: &e" << minecraft->player->getScore();
@@ -80,7 +80,7 @@ if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
 } else {
 	glPushMatrix2();
 	glScalef2(2, 2, 2);
-	drawCenteredString(font, I18n::get("deathScreen.title"), width / 4, height / 8, 0xffffff);
+	drawCenteredString(font, "You died!", width / 2 / 2, height / 8, 0xffffff);
 	glPopMatrix2();
 }
 

src/client/gui/screens/FurnaceScreen.cpp

@@ -500,8 +500,6 @@ ItemInstance FurnaceScreen::moveOver(const ItemInstance* item, int maxCount) {
 		setIfNotSet(doRecreatePane, newSize != oldSize);
 		return removed;
 	}
-	
-
 	return ItemInstance();
 }
 

src/client/gui/screens/OptionsScreen.cpp

@@ -121,7 +121,6 @@ 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();
 		}
@@ -238,10 +237,8 @@ void OptionsScreen::generateOptionScreens() {
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
 		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
-#ifndef __APPLE__
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
 		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
-#endif
 		.addOptionItem(OPTIONS_JAVA_HUD, minecraft)
 		.addOptionItem(OPTIONS_FOG_TYPE, minecraft)
 		.addOptionItem(OPTIONS_BETA_SKY, minecraft)
@@ -264,12 +261,6 @@ 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);

src/client/gui/screens/OptionsScreen.h

@@ -27,7 +27,6 @@ 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);
 	

src/client/gui/screens/SimpleChooseLevelScreen.cpp

@@ -8,14 +8,13 @@
 #include "../../../platform/time.h"
 #include "../../../platform/input/Keyboard.h"
 #include "../../../platform/log.h"
-#include <locale/I18n.h>
 
 SimpleChooseLevelScreen::SimpleChooseLevelScreen(const std::string& levelName)
-:   bHeader(nullptr),
-    bGamemode(nullptr),
-    bCheats(nullptr),
-    bBack(nullptr),
-    bCreate(nullptr),
+:   bHeader(0),
+    bGamemode(0),
+    bCheats(0),
+    bBack(0),
+    bCreate(0),
     levelName(levelName),
     hasChosen(false),
     gamemode(GameType::Survival),
@@ -43,10 +42,10 @@ void SimpleChooseLevelScreen::init()
     // first") when the name already existed.
     ChooseLevelScreen::init();
 
-    tLevelName.text = I18n::get("selectWorld.newWorld");
+    tLevelName.text = "New world";
 
     // header + close button
-    bHeader = new Touch::THeader(0, I18n::get("selectWorld.create"));
+    bHeader = new Touch::THeader(0, "Create World");
     // create the back/X button as ImageButton like CreditsScreen
     bBack = new ImageButton(2, "");
     {
@@ -57,14 +56,14 @@ void SimpleChooseLevelScreen::init()
         def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
         bBack->setImageDef(def, true);
     }
-    if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) != 2) {
-        bGamemode = new Touch::TButton(1, I18n::get("selectWorld.gameMode.survival"));
+    if (/* minecraft->useTouchscreen() */ true) {
+        bGamemode = new Touch::TButton(1, "Survival mode");
         bCheats  = new Touch::TButton(4, "Cheats: Off");
-        bCreate  = new Touch::TButton(3, I18n::get("selectWorld.create"));
+        bCreate  = new Touch::TButton(3, "Create");
     } else {
-        bGamemode = new Button(1, I18n::get("selectWorld.gameMode.survival"));
+        bGamemode = new Button(1, "Survival mode");
         bCheats  = new Button(4, "Cheats: Off");
-        bCreate  = new Button(3, I18n::get("Create"));
+        bCreate  = new Button(3, "Create");
     }
 
     buttons.push_back(bHeader);

src/client/model/HumanoidModel.cpp

@@ -21,9 +21,6 @@ HumanoidModel::HumanoidModel( float g /*= 0*/, float yOffset /*= 0*/, int texW /
 	texWidth = texW;
 	texHeight = texH;
 
-	// texWidth = 64;
-	// texHeight = 32;
-
 	head.setModel(this);
 	hair.setModel(this);
 	body.setModel(this);

src/client/player/LocalPlayer.cpp

@@ -554,9 +554,9 @@ void LocalPlayer::aiStep() {
 
 	//if (onGround && abilities.flying)
 	//	abilities.flying = false;
-	yBobO = yBob;
-	xBobO = xBob;
-	xBob += (xRot - xBob) * 0.5;
+	yBobO = yBob;
+	xBobO = xBob;
+	xBob += (xRot - xBob) * 0.5;
 	yBob += (yRot - yBob) * 0.5;
 
 	if (interpolateOnly())
@@ -774,19 +774,22 @@ void LocalPlayer::startCrafting(int x, int y, int z, int tableSize) {
 
 void LocalPlayer::startStonecutting(int x, int y, int z) {
 #ifndef STANDALONE_SERVER
-	minecraft->setScreen( new StonecutterScreen() );
+	if (!minecraft->isCreativeMode())
+		minecraft->setScreen( new StonecutterScreen() );
 #endif
 }
 
 void LocalPlayer::openFurnace( FurnaceTileEntity* e ) {
 #ifndef STANDALONE_SERVER
-	minecraft->setScreen( new FurnaceScreen(this, e) );
+	if (!minecraft->isCreativeMode())
+		minecraft->setScreen( new FurnaceScreen(this, e) );
 #endif
 }
 
 void LocalPlayer::openContainer( ChestTileEntity* container ) {
 #ifndef STANDALONE_SERVER
-	minecraft->setScreen( new ChestScreen(this, container) );
+	if (!minecraft->isCreativeMode())
+		minecraft->setScreen( new ChestScreen(this, container) );
 #endif
 }
 

src/client/player/LocalPlayer.h

@@ -23,7 +23,7 @@ public:
 
 	void tick();
 
-	float yBob, xBob;	// shredder added from b1.8/4j for the hand swaying animation
+	float yBob, xBob;	// shredder added from b1.8/4j for the hand swaying animation
 	float yBobO, xBobO; // shredder added from b1.8/4j for the hand swaying animation
 
     void move(float xa, float ya, float za);

src/client/renderer/GameRenderer.cpp

@@ -440,7 +440,7 @@ float GameRenderer::getFov(float a, bool applyEffects) {
 		fov *= this->oFov + (this->fov - this->oFov) * a;
 
 	if (player->isUnderLiquid(Material::water)) fov = 60;
-	if (player->hasDied()) {
+	if (player->health <= 0) {
 		float duration = player->deathTime + a;
 
 		fov /= ((1 - 500 / (duration + 500)) * 2.0f + 1);
@@ -537,7 +537,7 @@ void GameRenderer::bobHurt(float a) {
 
 	float hurt = player->hurtTime - a;
 
-	if (player->hasDied()) {
+	if (player->health <= 0) {
 		float duration = player->deathTime + a;
 		glRotatef2(40 - (40 * 200) / (duration + 200), 0, 0, 1);
 	}

src/client/renderer/ItemInHandRenderer.cpp

@@ -291,13 +291,14 @@ void ItemInHandRenderer::render( float a )
 	Lighting::turnOn(mc);
 	glPopMatrix2();
 
-	if (localPlayer) { // shredder added, basically does the hand swaying animation from b1.8 
-        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
-        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
-		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
-		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
-        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
-        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
+	 if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
+	{
+        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
+        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
+		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
+		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
+        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
+        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
     }
 
 	float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
@@ -424,8 +425,6 @@ void ItemInHandRenderer::render( float a )
 
 		EntityRenderer* er = EntityRenderDispatcher::getInstance()->getRenderer(mc->player);
 		HumanoidMobRenderer* playerRenderer = (HumanoidMobRenderer*) er;
-		EntityRenderDispatcher::getInstance()->setModernSkin((Entity*)(player));
-
 		float ss = 1;
 		glScalef2(ss, ss, ss);
 		playerRenderer->renderHand();

src/client/renderer/LevelRenderer.cpp

@@ -185,14 +185,11 @@ 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);
 
 

src/client/renderer/entity/EntityRenderDispatcher.cpp

@@ -137,11 +137,6 @@ void EntityRenderDispatcher::render( Entity* entity, float x, float y, float z,
 	}
 }
 
-void EntityRenderDispatcher::setModernSkin(Entity* player) {
-	PlayerRenderer* rend = (PlayerRenderer*)(getRenderer(player));
-	rend->setModernSkin((Mob*)player);
-}
-
 EntityRenderer* EntityRenderDispatcher::getRenderer( Entity* entity )
 {
 	EntityRendererId rendererId = entity->entityRendererId;

src/client/renderer/entity/EntityRenderDispatcher.h

@@ -45,8 +45,6 @@ public:
     Font* getFont();
 
 	void onGraphicsReset();
-
-	void setModernSkin(Entity* player);
 private:
 	void assign(EntityRendererId id, EntityRenderer* renderer);
 public:

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,7 +298,6 @@ 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);
@@ -316,7 +315,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.f, 1.f, 1.f, (float) a);
+	//	t.color(1, 1, 1, (float) a);
 	glColor4f2(1, 1, 1, (float) a);
 
 	float x0 = xt + tt->xx0 + xo;

src/client/renderer/entity/ItemRenderer.cpp

@@ -189,9 +189,9 @@ void ItemRenderer::renderGuiItem(Font* font, Textures* textures, const ItemInsta
 			//							it we're batching for saving the
 			//							buffer, this will fail miserably
 			t.endOverrideAndDraw();
-			// glDisable2(GL_TEXTURE_2D);
-			// fillRect(t, x, y, w, h, 0xff0000);
-			// glEnable2(GL_TEXTURE_2D);
+			glDisable2(GL_TEXTURE_2D);
+			fillRect(t, x, y, w, h, 0xff0000);
+			glEnable2(GL_TEXTURE_2D);
 			renderGuiItemCorrect(font, textures, item, int(x), int(y));
 			t.beginOverride();
 		}

src/client/renderer/entity/PlayerRenderer.cpp

@@ -70,18 +70,13 @@ void PlayerRenderer::renderName( Mob* mob, float x, float y, float z ){
 	}
 }
 
-// @note fix player skin system
-void PlayerRenderer::setModernSkin(Mob* mob) {
+void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot, float a) {
+	Mob* mob = (Mob*) mob_;
 	HumanoidModel* desired = isModernPlayerSkin(mob) ? playerModel64 : playerModel32;
 	if (model != desired || humanoidModel != desired) {
 		model = desired;
 		humanoidModel = desired;
 	}
-}
-
-void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot, float a) {
-	Mob* mob = (Mob*) mob_;
-	setModernSkin(mob);
 	/* LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", 
 		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
 		humanoidModel->texWidth, humanoidModel->texHeight,

src/client/renderer/entity/PlayerRenderer.h

@@ -19,8 +19,6 @@ public:
 
 	virtual void renderName(Mob* mob, float x, float y, float z);
 	virtual void onGraphicsReset();
-
-	void setModernSkin(Mob* mob);
 private:
 	HumanoidModel* playerModel32;
 	HumanoidModel* playerModel64;

src/commands/Command.hpp

@@ -2,12 +2,18 @@
 #include <string>
 #include <vector>
 
+enum CommandFlags {
+    COMMAND_FLAG_SINGLEPLAYER_ONLY = (1 << 1),
+    COMMAND_FLAG_NO_ARGS = (1 << 2),
+};
+
 class Minecraft;
 class Player;
 
 class Command {
 public:
     const std::string& getName() { return m_name; }
+    const CommandFlags getFlags() { return m_flags; }
 
     bool isPlayerOp(Minecraft& mc, Player& player);
 
@@ -15,7 +21,8 @@ public:
     virtual std::string help(Minecraft& mc) = 0;
 
 protected:
-    Command(const std::string& name) : m_name(name) {}
+    Command(const std::string& name, CommandFlags flags = (CommandFlags)0) : m_name(name), m_flags(flags) {}
 
     const std::string m_name;
+    const CommandFlags m_flags;
 };

src/commands/CommandBan.cpp

@@ -5,6 +5,7 @@
 #include "world/level/Level.h"
 #include <algorithm>
 #include <client/Minecraft.h>
+#include <network/packet/LoginStatusPacket.h>
 
 CommandBan::CommandBan() : Command("ban") {}
 
@@ -20,30 +21,26 @@ std::string CommandBan::execute(Minecraft& mc, Player& player, const std::vector
     std::string nicknameLower = args[0];
     std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
 
-    auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [args, nicknameLower] (auto& it) -> bool {
+    auto it = std::find_if(mc.level->players.begin(), mc.level->players.end(), [nicknameLower] (auto& it) -> bool {
         std::string lower = it->name;
         std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
 
         return lower == nicknameLower;
     });
 
-    if (*it == (Player*)mc.player) {
-        return "ban: you can't ban urself lol";
-    }
-    
     if (it != mc.level->players.end()) {
-        mc.level->removePlayer(*it);
-        (*it)->remove();
-        mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true);
+        if (*it == (Player*)mc.player) {
+            return "banip: you can't ban urself lol";
+        }
     } else {
-        for (auto& banned : mc.level->bannedPlayers) {
+        for (auto& banned : mc.level->bannedPpl) {
             if (nicknameLower == banned) {
-                return args[0] + "already banned!";
+                return args[0] + " already banned!";
             }
         }
     }
 
-    mc.level->bannedPlayers.insert(nicknameLower);
+    mc.level->bannedPpl.insert(nicknameLower);
     return "ban: successfully banned player " + args[0];
 }
 

src/commands/CommandBanIp.cpp

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

src/commands/CommandGimmieItems.cpp

@@ -1,33 +0,0 @@
-#include "CommandGimmieItems.hpp"
-#include <client/Minecraft.h>
-#include <world/level/Level.h>
-#include <world/item/DyePowderItem.h>
-
-CommandGimmieItems::CommandGimmieItems() : Command("gimmieitems") {}
-
-std::string CommandGimmieItems::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
-    if (mc.level != nullptr) {
-        if (mc.level->getLevelData()->getAllowCheats()) {
-            player.inventory->add(new ItemInstance(Item::ironIngot, 64));
-            player.inventory->add(new ItemInstance(Item::ironIngot, 34));
-            player.inventory->add(new ItemInstance(Tile::stonecutterBench));
-            player.inventory->add(new ItemInstance(Tile::workBench));
-            player.inventory->add(new ItemInstance(Tile::furnace));
-            player.inventory->add(new ItemInstance(Tile::wood, 54));
-            player.inventory->add(new ItemInstance(Item::stick, 14));
-            player.inventory->add(new ItemInstance(Item::coal, 31));
-            player.inventory->add(new ItemInstance(Tile::sand, 6));
-            player.inventory->add(new ItemInstance(Item::dye_powder, 23, DyePowderItem::PURPLE));
-            
-            return "Grant debug items. Have fun!";
-        } else {
-            return "Cheats are not allowed!";
-        }
-    }
-
-    return "World not loaded";
-}
-
-std::string CommandGimmieItems::help(Minecraft& mc) {
-    return "Usage: /gimmieitems";
-}

src/commands/CommandKick.cpp

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

src/commands/CommandManager.cpp

@@ -8,7 +8,8 @@
 #include "commands/CommandKick.hpp"
 #include "commands/CommandOp.hpp"
 #include "commands/CommandBan.hpp"
-#include "commands/CommandGimmieItems.hpp"
+#include "commands/CommandBanIp.hpp"
+#include "commands/CommandPardon.hpp"
 #include "network/packet/ChatPacket.h"
 #include "network/RakNetInstance.h"
 #include "world/level/Level.h"
@@ -22,7 +23,8 @@ void CommandManager::registerAllCommands() {
     m_commands.push_back(new CommandKick());
     m_commands.push_back(new CommandOp());
     m_commands.push_back(new CommandBan());
-    // m_commands.push_back(new CommandGimmieItems());
+    m_commands.push_back(new CommandBanIp());
+    m_commands.push_back(new CommandPardon());
 }
 
 std::vector<std::string> CommandManager::getListAllCommands() {
@@ -53,8 +55,15 @@ std::string CommandManager::execute(Minecraft& mc, Player& player, const std::st
 
     std::string tok;
     while (ss >> tok) args.push_back(tok);
+    
+    if (!mc.level->isClientSide || (*it)->getFlags() & CommandFlags::COMMAND_FLAG_SINGLEPLAYER_ONLY) {
+        return (*it)->execute(mc, player, args);
+    } else {
+        ChatPacket packet("/" + input);
+        mc.raknetInstance->send(packet);
+    }
 
-    return (*it)->execute(mc, player, args);
+    return "";
 }
 
 Command* CommandManager::getCommand(const std::string& name) {

src/commands/CommandPardon.cpp

@@ -0,0 +1,40 @@
+#include "CommandPardon.hpp"
+#include "commands/Command.hpp"
+#include "network/RakNetInstance.h"
+#include "raknet/RakPeerInterface.h"
+#include "world/level/Level.h"
+#include <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

@@ -0,0 +1,9 @@
+#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,15 +15,16 @@
 #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(g_app != 0) {
+	if (signum == 2 || signum == 3) { // SIGINT ||  SIGQUIT
+		if (g_app != 0) {
 			g_app->quit();
 		} else {
 			exit(g_exitCode);
@@ -64,7 +65,6 @@ std::string findStringInConfig(std::string line, std::string config) {
     return valueStr;
 }
 
-
 int main(int numArguments, char* pszArgs[]) {	
 	std::ifstream serverProperties("server.properties");
 
@@ -148,7 +148,7 @@ int main(int numArguments, char* pszArgs[]) {
 	}
 
 	printf("Level Name: %s\n", levelName.c_str());
-
+	
 	AppContext appContext;
 	appContext.platform = new AppPlatform();
 	App* app = new MAIN_CLASS();
@@ -162,6 +162,7 @@ int main(int numArguments, char* pszArgs[]) {
 	float startTime = getTimeS();
 	((MAIN_CLASS*)g_app)->selectLevel(levelDir, levelName, settings);
 	((MAIN_CLASS*)g_app)->hostMultiplayer(port);
+	PluginsManager::get().loadPlugins();
 
 	// Reading ops
 	std::ifstream ops("ops.txt");
@@ -190,13 +191,31 @@ int main(int numArguments, char* pszArgs[]) {
         
         while (std::getline(banned, line)) {
 			if (!line.empty()) {
-            	((MAIN_CLASS*)g_app)->level->bannedPlayers.insert(line);
+            	((MAIN_CLASS*)g_app)->level->bannedPpl.insert(line);
 			}
         }
 	} else {
-		std::ofstream bannedPlayers("banned-players.txt");
+		std::ofstream bannedPpl("banned-players.txt");
 
-		if (!bannedPlayers.is_open()) {
+		if (!bannedPpl.is_open()) {
+			throw std::runtime_error("Cannot create banned players list.");
+		}
+	}
+
+	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.");
 		}
 	}
@@ -204,6 +223,7 @@ int main(int numArguments, char* pszArgs[]) {
 	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();
@@ -225,14 +245,27 @@ int main(int numArguments, char* pszArgs[]) {
 	std::ofstream bannedWrite("banned-players.txt"); 
 
 	if (bannedWrite.is_open()) {
-		for (auto& banned : ((MAIN_CLASS*)g_app)->level->bannedPlayers) {
+		for (auto& banned : ((MAIN_CLASS*)g_app)->level->bannedPpl) {
 			bannedWrite << banned << std::endl;
 		}
 		bannedWrite.close();
 	} 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;

src/network/ClientSideNetworkHandler.cpp

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

src/network/RakNetInstance.cpp

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

src/network/ServerSideNetworkHandler.cpp

@@ -39,6 +39,8 @@
 #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__)
 
@@ -160,16 +162,29 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MessageP
 	auto player = getPlayer(source);
 
 	if (player == nullptr) return; // @todo maybe kick?
-	std::string msg = packet->message.C_String();
+	
+	auto msg = std::string(packet->message.C_String());
 
-	if (msg[0] == '/') {
-		// This is a command
+	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));
 
-		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(msg.substr(1))));
-		return sendPrivate(resp, source);
+			if (PluginsManager::get().emitCommands(cmd, source)) {
+				ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd));
+				return sendPrivate(resp, source);	
+			} else {
+				return;
+			}
+		}
+
+		displayGameMessage("<" + player->name + "> " + msg);
 	}
-
-	displayGameMessage("<" + player->name + "> " + msg);
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPacket* packet)
@@ -178,14 +193,26 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPack
 
 	if (player == nullptr) return; // @todo maybe kick?
 	
-	if (packet->message[0] == '/') {
-		// This is a command
+	MessageEvent event;
+	event.m_decline = false;
+	
+	PluginsManager::get().emit("Message", LuaPlayer(source), packet->message, event);
+	
+	if (!event.m_decline) {
+		if (packet->message[0] == '/') {
+			// This is a command
+			auto cmd = Util::stringTrim(packet->message.substr(1));
 
-		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1))));
-		return sendPrivate(resp, source);
+			if (PluginsManager::get().emitCommands(cmd, source)) {
+				ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, cmd));
+				return sendPrivate(resp, source);	
+			} else {
+				return;
+			}
+		}
+
+		displayGameMessage("<" + player->name + "> " + packet->message);
 	}
-
-	displayGameMessage("<" + player->name + "> " + packet->message);
 }
 
 void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -205,6 +232,7 @@ void ServerSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 
 		if (player->owner == guid)
 		{
+			PluginsManager::get().emit("PlayerDisconnect", LuaPlayer(guid));
 			minecraft->level->getLevelStorage()->savePlayer(*player);
 
 			std::string message = player->name;
@@ -243,7 +271,10 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	std::string nicknameLower = packet->clientName.C_String();
 	std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
 
-	printf("%s lower \n", nicknameLower.c_str());
+	RakNet::SystemAddress sysAddress = rakPeer->GetSystemAddressFromGuid(source);
+    char clientIp[32];
+    sysAddress.ToString(false, clientIp);
+
 	for (int i = 0; i < level->players.size(); i++) {
 		ServerPlayer* player = (ServerPlayer*) level->players.at(i);
 
@@ -257,13 +288,20 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 		}
 	}
 	
-	for (auto& banned : level->bannedPlayers) {
+	for (auto& banned : level->bannedPpl) {
 		if (nicknameLower == banned) {
 			loginStatus = packet->newProto ? LoginStatus::Failed_Banned : LoginStatus::Failed_ClientOld;
 			break;
 		}
 	}
 
+	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);
@@ -323,8 +361,6 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ReadyPac
 
 	if (packet->type == ReadyPacket::READY_REQUESTEDCHUNKS)
 		onReady_RequestedChunks(source);
-
-	LOGI("Ready player two ready ready player two!!\n ");
 }
 
 void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID& source)
@@ -369,7 +405,6 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID
 #else
 	LOGW("%s joined the game\n", newPlayer->name.c_str());
 #endif
-
 	// Send all Entities to the new player
 	for (unsigned int i = 0; i < level->entities.size(); ++i) {
 		Entity* e = level->entities[i];
@@ -425,6 +460,8 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID
 	bitStream.Reset();
 	AddPlayerPacket(newPlayer).write(&bitStream);
 	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, true);
+
+	PluginsManager::get().emit("PlayerJoin", LuaPlayer(source));
 }
 
 //
@@ -468,17 +505,23 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 		//     	return raknetInstance->send(refuse);
 		// 	}
 		// }
+		
+		PluginsManager::get().emit(
+			"PlayerMovement", 
+			LuaPlayer(source), 
+			packet->x, packet->y, packet->z, packet->yRot, packet->xRot, // newPos
+			player->x, player->y, player->z, player->yRot, player->xRot // oldPos
+		);
 
 		entity->xd = entity->yd = entity->zd = 0;	
 		entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
 		
 		// broadcast this packet to other clients
 		redistributePacket(packet, source);
-	
 	}
 }
 
-void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBlockPacket* packet){
+void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBlockPacket* packet) {
 	if (!level) return;
 
 	Player* player = getPlayer(source);
@@ -516,6 +559,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBl
 			
 
 		oldTile->destroy(level, x, y, z, data);
+		// 		RemoveEntityPacket packet(e->entityId);
+		// redistributePacket(&packet, rakPeer->GetMyGUID());
 	}
 
 	LOGI("Remove block [%i, %i, %i]\n", packet->x, packet->y, packet->z);

src/network/ServerSideNetworkHandler.h

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

src/network/command/CommandServer.cpp

@@ -92,7 +92,7 @@ static std::string ToStringOk(const T& a, const T& b, const T& c) {
 	std::stringstream ss;
 	ss << a << "," << b << "," << c << "\n";
 	return ss.str();
-}		
+}
 
 static bool inRange(int c, int lowInclusive, int highInclusive) {
 	return c >= lowInclusive && c <= highInclusive;

src/platform/audio/SoundSystemAL.cpp

@@ -10,10 +10,13 @@
 static const char* errIdString = 0;
 
 void checkError() {
-    ALenum err = alGetError();
-    if(err == AL_NO_ERROR) return;
 
-    LOGI("### SoundSystemAL error: %d ####: %s\n", err, errIdString==0?"(none)":errIdString);
+    while (1) {
+        ALenum err = alGetError();
+        if(err == AL_NO_ERROR) return;
+
+        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);

src/plugins/LuaPlayer.hpp

@@ -0,0 +1,160 @@
+#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

@@ -0,0 +1,11 @@
+#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

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

src/plugins/MessageEvent.hpp

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

src/plugins/PluginsManager.cpp

@@ -0,0 +1,103 @@
+#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

@@ -0,0 +1,56 @@
+#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.
 	//
 
-	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	register int j;
+	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	int j;
 
 	for ( left = 0, *s++ = x, j = N; --j;
 		*s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 
 unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
 {
-	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	register int j;
+	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	int j;
 
 	if ( left < -1 )
 		seedMT( 4357U );

src/world/entity/Mob.cpp

@@ -224,7 +224,7 @@ void Mob::baseTick()
 	if (hurtTime > 0) hurtTime--;
 	if (invulnerableTime > 0) invulnerableTime--;
 
-	if (this->hasDied()) {
+	if (health <= 0) {
 	    deathTime++;
 	    if (deathTime > SharedConstants::TicksPerSecond) {
 	        beforeRemove();
@@ -437,8 +437,7 @@ void Mob::setSize( float w, float h )
 
 void Mob::heal( int heal )
 {
-	if (this->hasDied()) return;
-
+	if (health <= 0) return;
 	health += heal;
 	if (health > 20) health = 20;
 	invulnerableTime = invulnerableDuration / 2;
@@ -448,8 +447,7 @@ bool Mob::hurt( Entity* source, int dmg )
 {
 	if (level->isClientSide) return false;
 	noActionTime = 0;
-
-	if (this->hasDied()) return false;
+	if (health <= 0) return false;
 
 	this->walkAnimSpeed = 1.5f;
 
@@ -487,7 +485,7 @@ bool Mob::hurt( Entity* source, int dmg )
 		}
 	}
 
-	if (this->hasDied()) {
+	if (health <= 0) {
 		if (sound) level->playSound(this, getDeathSound(), getSoundVolume(), getVoicePitch());
 		die(source);
 	} else {
@@ -894,7 +892,7 @@ void Mob::newServerAiStep() {
 
 bool Mob::isImmobile()
 {
-	return this->hasDied();
+	return health <= 0;
 }
 
 void Mob::jumpFromGround()

src/world/entity/Mob.h

@@ -127,8 +127,6 @@ public:
 	virtual ItemInstance* getCarriedItem() {return NULL;}
 	virtual int getUseItemDuration() {return 0;}
 	virtual void swing();
-
-	inline bool hasDied() { return health <= 0; }
 protected:
 	virtual void causeFallDamage(float distance);
 

src/world/entity/player/Player.cpp

@@ -390,7 +390,7 @@ void Player::travel(float xa, float ya) {
 
 /*protected*/
 bool Player::isImmobile() {
-    return hasDied() || isSleeping();
+    return health <= 0 || isSleeping();
 }
 
 /*protected*/
@@ -447,8 +447,8 @@ void Player::aiStep() {
     float tBob = (float) Mth::sqrt(xd * xd + zd * zd);
     float tTilt = (float) Mth::atan(-yd * 0.2f) * 15.f;
     if (tBob > 0.1f) tBob = 0.1f;
-    if (!onGround || hasDied()) tBob = 0;
-    if (onGround || hasDied()) tTilt = 0;
+    if (!onGround || health <= 0) tBob = 0;
+    if (onGround || health <= 0) tTilt = 0;
     bob += (tBob - bob) * 0.4f;
     tilt += (tTilt - tilt) * 0.8f;
 
@@ -518,6 +518,14 @@ bool Player::isCreativeModeAllowed() {
     return true;
 }
 
+//void Player::drop() {
+//    //drop(inventory.removeItem(inventory.selected, 1), false);
+//}
+
+void Player::drop(ItemInstance* item) {
+    drop(item, false);
+}
+
 void Player::drop(ItemInstance* item, bool randomly) {
     if (item == NULL || item->isNull())
         return;
@@ -551,6 +559,11 @@ void Player::drop(ItemInstance* item, bool randomly) {
         thrownItem->zd += Mth::sin(dir) * pow;
     }
 
+    reallyDrop(thrownItem);
+}
+
+/*protected*/
+void Player::reallyDrop(ItemEntity* thrownItem) {
     level->addEntity(thrownItem);
 }
 
@@ -667,7 +680,7 @@ bool Player::hurt(Entity* source, int dmg) {
 	if (abilities.invulnerable) return false;
 
 	noActionTime = 0;
-    if (hasDied()) return false;
+    if (health <= 0) return false;
 	if(isSleeping() && !level->isClientSide) {
 		stopSleepInBed(true, true, false);
 	}

src/world/entity/player/Player.h

@@ -91,7 +91,10 @@ public:
 	void handleEntityEvent(char id);
 
 	virtual void take(Entity* e, int orgCount);
-	virtual void drop(ItemInstance* item, bool randomly = false);
+	//void drop();
+	virtual void drop(ItemInstance* item);
+	virtual void drop(ItemInstance* item, bool randomly);
+	void reallyDrop(ItemEntity* thrownItem);
 
     bool canDestroy(Tile* tile);
 	float getDestroySpeed(Tile* tile);

src/world/item/Item.cpp

@@ -274,7 +274,7 @@ void Item::initItems() {
 	//Item::diode = (new TilePlanterItem(100, Tile::diode_off))->setIcon(6, 5)->setCategory(ItemCategory::Mechanisms)->setDescriptionId("diode");
 	Item::shears = (ShearsItem*)(new ShearsItem(103))->setIcon(13, 5)->setCategory(ItemCategory::Tools)->setDescriptionId("shears");
 	Item::melon = (new FoodItem(104, 2, false))->setIcon(13, 6)->setCategory(ItemCategory::FoodArmor)->setDescriptionId("melon");
-	Item::seeds_melon = (new SeedItem(106, Tile::melonStem->id, Tile::farmland->id))->setIcon(14, 3)->setCategory(ItemCategory::FoodArmor)->setDescriptionId("seeds_melon");
+	Item::seeds_melon = (new SeedItem(106, Tile::melonStem->id, Tile::farmland->id))->setIcon(14, 3)->setCategory(ItemCategory::FoodArmor)->setDescriptionId("seedsMelon");
 	Item::beef_raw = (new FoodItem(107, 3, /*FoodConstants.FOOD_SATURATION_LOW,*/ true))->setIcon(9, 6)->setCategory(ItemCategory::FoodArmor)->setDescriptionId("beefRaw");
 	Item::beef_cooked = (new FoodItem(108, 8, /*FoodConstants.FOOD_SATURATION_GOOD,*/ true))->setIcon(10, 6)->setCategory(ItemCategory::FoodArmor)->setDescriptionId("beefCooked");
 	Item::chicken_raw = (new FoodItem(109, 2, /*FoodConstants.FOOD_SATURATION_LOW,*/ true))->setIcon(9, 7)->setCategory(ItemCategory::FoodArmor)->setDescriptionId("chickenRaw");

src/world/item/TileItem.h

@@ -4,6 +4,8 @@
 //package net.minecraft.world.item;
 
 #include <string>
+#include <plugins/PluginsManager.hpp>
+#include <plugins/LuaPlayer.hpp>
 
 #include "Item.h"
 #include "ItemInstance.h"
@@ -61,7 +63,7 @@ public:
             if (level->setTileAndData(x, y, z, tileId, data)) {
                 Tile::tiles[tileId]->setPlacedBy(level, x, y, z, player);
                 level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, tile->soundType->getStepSound(), (tile->soundType->getVolume() + 1) / 2, tile->soundType->getPitch() * 0.8f);
-                printf("%f %f %f \n", player->x, player->y, player->z);
+                PluginsManager::get().emit("PlayerPlaceBlock", LuaPlayer(player->owner), x, y, z, face, tileId, instance->getAuxValue());
 /*
 				PlaceBlockPacket packet(player->entityId, x, y, z, face, tileId, instance->getAuxValue());
 				//LOGI("Place block at @ %d, %d, %d\n", x, y, z);

src/world/level/Level.h

@@ -312,7 +312,8 @@ public:
 	Random random;
 
 	std::set<std::string> ops;
-	std::set<std::string> bannedPlayers;
+	std::set<std::string> bannedPpl;
+	std::set<std::string> bannedIps;
 protected:
 	bool isFindingSpawn;
 

src/world/level/tile/TallGrass.cpp

@@ -43,10 +43,8 @@ int TallGrass::getColor( int auxData ) {
 int TallGrass::getColor( LevelSource* level, int x, int y, int z ) {
 	int d = level->getData(x, y, z);
 	if (d == DEAD_SHRUB); //return 0xffffff; // i removed this to make it accurate to beta 1.6.6 instead of early java release versions
-
-	level->getBiomeSource()->getBiomeBlock(x, z, 1, 1);
 	float temp = level->getBiomeSource()->temperatures[0]; // shredder added
-	float rain = level->getBiomeSource()->downfalls != nullptr ? level->getBiomeSource()->downfalls[0] : 0; // shredder added
+	float rain = level->getBiomeSource()->downfalls[0]; // shredder added
 	if (!GrassColor::useTint && d == DEAD_SHRUB){
 		return 0xffffff;
 	}