ee

TODO: fix many crashes...

.github/workflows/build.yml

@@ -18,8 +18,8 @@ permissions:
 
 jobs:
   build-windows:
-    name: Windows Build
-    runs-on: ubuntu-latest
+    name: Build Windows
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
       - name: Setup caches
         uses: ./.github/actions/setup-cache
         with:
-          host: win
+          host: linux
           target: win
       
       - name: Setup Ninja
@@ -35,74 +35,28 @@ jobs:
         with:
           host: linux
 
-      - name: Download xwin
-        uses: robinraju/release-downloader@v1.10
-        with:
-          repository: Jake-Shadle/xwin
-          latest: true
-          fileName: 'xwin-*-x86_64-unknown-linux-musl.tar.gz'
-          tarBall: false
-          zipBall: false
-          out-file-path: "epic-xwin"
-        
-      - name: Prepare xwin
+      - name: Download llvm-mingw
         run: |
-          tar -xzf epic-xwin/xwin-*-x86_64-unknown-linux-musl.tar.gz -C epic-xwin
-          mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
-          ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license list
-      
-      # this caches '.xwin-cache/**/*' but that's actually only gonna
-      # contain the manifest cuz we only ran `xwin list` so far
-      - name: Setup xwin Cache
-        id: xwin-cache
-        uses: actions/cache@v4
-        with:
-          path: .xwin-cache
-          key: xwin-win-v1-${{ hashFiles('.xwin-cache/**/*') }}
-
-      - name: Download Windows headers
-        run: ./xwin --arch x86_64 --sdk-version 10.0.22621 --accept-license splat --include-debug-libs
-        if: steps.xwin-cache.outputs.cache-hit != 'true'
-
-
-      - name: Download clang-msvc-sdk toolchain
-        uses: actions/checkout@v4
-        with:
-          repository: 'geode-sdk/clang-msvc-sdk'
-          path: toolchain
-          submodules: recursive
-
-      - name: Install Clang
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y wget lsb-release software-properties-common gnupg
-
-          wget https://apt.llvm.org/llvm.sh
-          chmod +x llvm.sh
-          sudo ./llvm.sh 21 all
-
-      - name: Add LLVM 21 to path
-        run: echo "/usr/lib/llvm-21/bin" >> $GITHUB_PATH
-
-      - name: Verify LLVM
-        run: |
-          which clang-cl
-          which lld-link
-          clang-cl --version
-          lld-link --version
-
+          curl -L https://github.com/mstorsjo/llvm-mingw/releases/download/20260311/llvm-mingw-20260311-msvcrt-ubuntu-22.04-x86_64.tar.xz -o llvm-mingw.tar.xz
+          tar -xf llvm-mingw.tar.xz
+          mv llvm-mingw-* llvm-mingw
+    
       - name: Create Build Environment
         # Some projects don't allow in-source building, so create a separate build directory
         # We'll use this as our working directory for all subsequent commands
         run: cmake -E make_directory ${{github.workspace}}/build
-      
+
       - name: Configure CMake
         working-directory: ${{github.workspace}}/build
-        run: cmake ${{github.workspace}} -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN -DCMAKE_CXX_SCAN_FOR_MODULES=OFF -G Ninja
-        env:
-          SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat
-          TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-cl-msvc.cmake
-          HOST_ARCH: x86_64
+        run: |
+          cmake $GITHUB_WORKSPACE \
+            -G Ninja \
+            -DCMAKE_SYSTEM_NAME=Windows \
+            -DCMAKE_C_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang \
+            -DCMAKE_CXX_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang++ \
+            -DCMAKE_RC_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-windres \
+            -DALSOFT_BACKEND_PIPEWIRE=OFF \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
       - name: Build
         working-directory: ${{github.workspace}}/build
@@ -113,14 +67,13 @@ jobs:
         with:
           name: mcpe-windows
           path: |
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/MinecraftPE.exe
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/glfw3.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/libpng16.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/OpenAL32.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/z.dll
+            ${{github.workspace}}/build/MinecraftPE.exe
+            ${{github.workspace}}/build/libpng16.dll
+            ${{github.workspace}}/build/OpenAL32.dll
+            ${{github.workspace}}/build/libz.dll
 
   build-linux:
-    name: Linux Build
+    name: Build Linux
     runs-on: ubuntu-latest
 
     steps:
@@ -166,7 +119,7 @@ jobs:
             ${{github.workspace}}/build/MinecraftPE-server
 
   build-android: # pray to god
-    name: Build Android APK (${{ matrix.abi }})
+    name: Build Android (${{ matrix.abi }})
     runs-on: ubuntu-latest
 
     strategy:
@@ -261,10 +214,59 @@ jobs:
           name: minecraftpe-apk-${{ matrix.abi }}
           path: ${{ github.workspace }}/build-apk/minecraftpe-*-debug.apk
 
+  build-web:
+    name: Build Web
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup caches
+        uses: ./.github/actions/setup-cache
+        with:
+          host: linux
+          target: linux
+    
+      - name: Setup Ninja
+        uses: ./.github/actions/setup-ninja
+        with:
+          host: linux
+
+      - name: Setup emsdk
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: 5.0.3
+          actions-cache-folder: 'emsdk-cache'
+
+      - name: Create Build Environment
+        # Some projects don't allow in-source building, so create a separate build directory
+        # We'll use this as our working directory for all subsequent commands
+        run: cmake -E make_directory ${{github.workspace}}/build
+
+      - name: Configure CMake
+        # Use a bash shell so we can use the same syntax for environment variable
+        # access regardless of the host operating system
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G Ninja -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/emsdk-cache/emsdk-main/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
+      
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: mcpe-web
+          path: |
+            ${{github.workspace}}/build/MinecraftPE.js
+            ${{github.workspace}}/build/MinecraftPE.wasm
+            ${{github.workspace}}/build/MinecraftPE.data
+
   publish:
     name: Publish
     runs-on: ubuntu-latest
-    needs: [ build-windows, build-linux, build-android ]
+    needs: [ build-windows, build-linux, build-android, build-web ]
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout
@@ -282,13 +284,13 @@ jobs:
       - name: Zip Windows Artifacts
         uses: vimtor/action-zip@v1.2
         with:
-          files: data mcpe-windows/MinecraftPE.exe mcpe-windows/glfw3.dll mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/z.dll
+          files: mcpe-windows/MinecraftPE.exe mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/libz.dll
           dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
 
       - name: Zip Linux Artifacts
         uses: vimtor/action-zip@v1.2
         with:
-          files: data mcpe-linux/MinecraftPE
+          files: mcpe-linux/MinecraftPE
           dest: minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
 
       - name: Zip Linux Server Artifacts
@@ -309,6 +311,19 @@ jobs:
           files: minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk
           dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
 
+      - name: Zip Web Artifact
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-web/MinecraftPE.js mcpe-web/MinecraftPE.wasm mcpe-web/MinecraftPE.data misc/web/index.html
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
+
+      - name: Zip Data
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: data
+          recursive: false
+          dest: data.zip
+
       - name: Update Development Release
         uses: andelf/nightly-release@main
         env:
@@ -319,8 +334,10 @@ jobs:
           body: |
             MinecraftPE development release for commit ${{ github.sha }}.
           files: |
+            ./data.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
             ./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
             ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
-            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
+            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
+            ./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip

CMakeLists.txt

@@ -7,10 +7,6 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
 
-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
-endif()
-
 include(cmake/EnumOption.cmake)
 
 if(EMSCRIPTEN)
@@ -26,9 +22,18 @@ find_package(OpenSSL)
 if (${PLATFORM} STREQUAL "Desktop")
     set(PLATFORM_CPP "PLATFORM_DESKTOP")
 
+    if (MINGW)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
+    endif()
+
     if (WIN32)
         add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-        set(EXTRA_LIBS ws2_32)
+        include_directories(misc/windows)
+        set(EXTRA_LIBS ws2_32 winhttp)
     elseif(UNIX)
         find_library(pthread NAMES pthread)
         set(EXTRA_LIBS pthread m)
@@ -51,6 +56,7 @@ if(${PLATFORM} MATCHES "Web")
 
     add_library(png INTERFACE IMPORTED)
     set_target_properties(png PROPERTIES
+        INTERFACE_COMPILE_OPTIONS "-sUSE_LIBPNG=1" 
         INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1"
     )
 
@@ -101,9 +107,10 @@ CPMAddPackage(
         "ALSOFT_UTILS OFF"
         "LIBTYPE ${AL_LIBTYPE}"
         "ALSOFT_ENABLE_MODULES OFF"
+        "ALSOFT_STATIC_STDCXX ON"
+        "ALSOFT_STATIC_LIBGCC ON"
 )
 
-# TODO: Clear this paths with *
 file(GLOB SERVER_SOURCES
     "project/lib_projects/raknet/jni/RaknetSources/*.cpp"
     "src/NinecraftApp.cpp"
@@ -204,6 +211,7 @@ file(GLOB SERVER_SOURCES
     "src/world/level/tile/entity/*.cpp"
 
     "src/world/phys/HitResult.cpp"
+    "src/commands/*.cpp"
 ) 
 
 file(GLOB CLIENT_SOURCES 
@@ -285,6 +293,8 @@ file(GLOB CLIENT_SOURCES
 
     "src/AppPlatform_glfw.cpp"
     "src/main.cpp"
+
+    "src/commands/*.cpp"
 )
 
 if (${PLATFORM} STREQUAL "Desktop")
@@ -320,11 +330,11 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 if(${PLATFORM} MATCHES "Web")
     set(CMAKE_CXX_STANDARD 11)
     # uuuh i hate it
-    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sSHARED_MEMORY=1")
+    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sUSE_LIBPNG=1 -sSHARED_MEMORY=1")
     
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_FLAGS}")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data -sPROXY_TO_PTHREAD")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data")
 
     target_compile_options(${PROJECT_NAME} PUBLIC
         "-Os"

data/lang/en_US.lang

@@ -153,7 +153,7 @@ options.group.tweaks=Tweaks
 options.allowSprint=Allow sprint
 options.barOnTop=HUD above inventory
 options.rpiCursor=Show Raspberry PI cursor
-options.autojump=Auto Jump
+options.autoJump=Auto Jump
 options.thirdperson=Third Person
 options.servervisible=Server Visible
 options.sensitivity=Sensitivity

misc/web/index.html

@@ -1,143 +1,46 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Emscripten-Generated Code</title>
-    <style>
-      .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
-      textarea.emscripten { font-family: monospace; width: 80%; }
-      div.emscripten { text-align: center; }
-      div.emscripten_border { border: 1px solid black; }
-      /* the canvas *must not* have any border or padding, or mouse coords will be wrong */
-      canvas.emscripten { border: 0px none; background-color: black; }
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>MCPE 0.6.1</title>
+  <style>
+    html, body {
+      margin: 0;
+      padding: 0;
+      height: 100%;
+      background: black;
+      overflow: hidden;
+    }
 
-      .spinner {
-        height: 50px;
-        width: 50px;
-        margin: 0px auto;
-        -webkit-animation: rotation .8s linear infinite;
-        -moz-animation: rotation .8s linear infinite;
-        -o-animation: rotation .8s linear infinite;
-        animation: rotation 0.8s linear infinite;
-        border-left: 10px solid rgb(0,150,240);
-        border-right: 10px solid rgb(0,150,240);
-        border-bottom: 10px solid rgb(0,150,240);
-        border-top: 10px solid rgb(100,0,200);
-        border-radius: 100%;
-        background-color: rgb(200,100,250);
-      }
-      @-webkit-keyframes rotation {
-        from {-webkit-transform: rotate(0deg);}
-        to {-webkit-transform: rotate(360deg);}
-      }
-      @-moz-keyframes rotation {
-        from {-moz-transform: rotate(0deg);}
-        to {-moz-transform: rotate(360deg);}
-      }
-      @-o-keyframes rotation {
-        from {-o-transform: rotate(0deg);}
-        to {-o-transform: rotate(360deg);}
-      }
-      @keyframes rotation {
-        from {transform: rotate(0deg);}
-        to {transform: rotate(360deg);}
-      }
+    #canvas {
+      width: 100vw;
+      height: 100vh;
+      display: block;
+    }
+  </style>
+</head>
+<body>
 
-    </style>
-  </head>
-  <body>
-    <hr/>
-    <figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure>
-    <div class="emscripten" id="status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="progress" hidden=1></progress>
-    </div>
-    <div class="emscripten_border">
-      <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
-    </div>
-    <hr/>
-    <div class="emscripten">
-      <input type="checkbox" id="resize">Resize canvas
-      <input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
-      &nbsp;&nbsp;&nbsp;
-      <input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked,
-                                                                                document.getElementById('resize').checked)">
-    </div>
+<canvas id="canvas"></canvas>
 
-    <hr/>
-    <textarea class="emscripten" id="output" rows="8"></textarea>
-    <hr>
-    <script type='text/javascript'>
-      var statusElement = document.getElementById('status');
-      var progressElement = document.getElementById('progress');
-      var spinnerElement = document.getElementById('spinner');
-      var canvasElement = document.getElementById('canvas');
-      var outputElement = document.getElementById('output');
-      if (outputElement) outputElement.value = ''; // clear browser cache
+<script>
+  var Module = {
+    canvas: document.getElementById('canvas'),
+    onRuntimeInitialized: function () { resizeCanvas() }
+  };
 
-      // As a default initial behavior, pop up an alert when webgl context is lost. To make your
-      // application robust, you may want to override this behavior before shipping!
-      // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
-      canvasElement.addEventListener("webglcontextlost", (e) => {
-        alert('WebGL context lost. You will need to reload the page.');
-        e.preventDefault();
-      }, false);
+  function resizeCanvas() {
+    const canvas = Module.canvas;
+    canvas.width = window.innerWidth;
+    canvas.height = window.innerHeight;
+  }
 
-      function setStatus(text) {
-        if (!setStatus.last) setStatus.last = { time: Date.now(), text: '' };
-        if (text === setStatus.last.text) return;
-        var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-        var now = Date.now();
-        if (m && now - setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
-        setStatus.last.time = now;
-        setStatus.last.text = text;
-        if (m) {
-          text = m[1];
-          progressElement.value = parseInt(m[2])*100;
-          progressElement.max = parseInt(m[4])*100;
-          progressElement.hidden = false;
-          spinnerElement.hidden = false;
-        } else {
-          progressElement.value = null;
-          progressElement.max = null;
-          progressElement.hidden = true;
-          if (!text) spinnerElement.hidden = true;
-        }
-        statusElement.innerHTML = text;
-      }
+  window.addEventListener('resize', resizeCanvas);
+  window.addEventListener('onunload', () => {
+    FS.syncfs(true, function (err) { console.log('Sync FS failed: ' + err) });
+  })
+</script>
 
-      var Module = {
-        print(...args) {
-          // These replacements are necessary if you render to raw HTML
-          //text = text.replace(/&/g, "&amp;");
-          //text = text.replace(/</g, "&lt;");
-          //text = text.replace(/>/g, "&gt;");
-          //text = text.replace('\n', '<br>', 'g');
-          console.log(...args);
-          if (outputElement) {
-            var text = args.join(' ');
-            outputElement.value += text + "\n";
-            outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
-          }
-        },
-        canvas: canvasElement,
-        setStatus: setStatus,
-        totalDependencies: 0,
-        monitorRunDependencies(left) {
-          this.totalDependencies = Math.max(this.totalDependencies, left);
-          setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
-        }
-      };
-      setStatus('Downloading...');
-      window.onerror = () => {
-        setStatus('Exception thrown, see JavaScript console');
-        spinnerElement.style.display = 'none';
-        setStatus = (text) => {
-          if (text) console.error('[post-exception status] ' + text);
-        };
-      };
-    </script>
-    <script src="MinecraftPE.js"></script>
-  </body>
+<script src="MinecraftPE.js"></script>
+</body>
 </html>

project/android/jni/Android.mk

@@ -109,6 +109,7 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/renderer/Textures.cpp \
 ../../../src/client/renderer/TileRenderer.cpp \
 ../../../src/client/renderer/gles.cpp \
+../../../src/world/level/LevelConstants.cpp \
 ../../../src/client/renderer/culling/Frustum.cpp \
 ../../../src/client/renderer/entity/ArrowRenderer.cpp \
 ../../../src/client/renderer/entity/ChickenRenderer.cpp \
@@ -139,6 +140,12 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/network/Packet.cpp \
 ../../../src/network/RakNetInstance.cpp \
 ../../../src/network/ServerSideNetworkHandler.cpp \
+../../../src/commands/Command.cpp \
+../../../src/commands/CommandHelp.cpp \
+../../../src/commands/CommandKick.cpp \
+../../../src/commands/CommandBan.cpp \
+../../../src/commands/CommandManager.cpp \
+../../../src/commands/CommandOp.cpp \
 ../../../src/server/ServerLevel.cpp \
 ../../../src/server/ServerPlayer.cpp \
 ../../../src/util/DataIO.cpp \

project/android_java/jni/Android.mk

@@ -228,6 +228,7 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/tile/entity/TileEntity.cpp \
 ../../../src/world/level/tile/entity/FurnaceTileEntity.cpp \
 ../../../src/world/phys/HitResult.cpp
+../../../src/world/level/LevelConstants.cpp
 
 LOCAL_CFLAGS := -Wno-psabi $(LOCAL_CFLAGS)
 

project/lib_projects/raknet/jni/RaknetSources/WindowsIncludes.h

@@ -1,8 +1,8 @@
 #if defined(X360__) 
 #elif defined (_WIN32)
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>
 
 // Must always include Winsock2.h before windows.h
 // or else:

src/AppPlatform_glfw.h

@@ -20,6 +20,10 @@
 #include <shellapi.h>
 #endif
 
+#ifdef __EMSCRIPTEN__
+	#include <emscripten/html5.h>
+#endif
+
 static void png_funcReadFile(png_structp pngPtr, png_bytep data, png_size_t length) {
 	((std::istream*)png_get_io_ptr(pngPtr))->read((char*)data, length);
 }
@@ -102,14 +106,33 @@ public:
 		return std::string(mbstr);
 	}
 
-	virtual int getScreenWidth() override { return 854; };
-	virtual int getScreenHeight() override { return 480; };
+	virtual int getScreenWidth() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return w;
+		#endif
+
+		return 854; 
+	};
+
+	virtual int getScreenHeight() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return h;
+		#endif
+
+		return 480; 
+	};
 
 	virtual float getPixelsPerMillimeter() override;
 
-	virtual bool supportsTouchscreen() override { return true; }
+	virtual bool supportsTouchscreen() override { return false; /* glfw supports only mouse and keyboard */ }
 
-	virtual void hideCursor(bool hide) {
+	virtual void hideCursor(bool hide) override {
 		int isHide = hide ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_HIDDEN;
 		glfwSetInputMode(window, GLFW_CURSOR, isHide);
 	}
@@ -120,6 +143,8 @@ public:
 #elif __linux__
 		std::string command = "xdg-open " + url;
 		system(command.c_str());
+#elif __EMSCRIPTEN__
+		emscripten_run_script(std::string("window.open('" + url + "', '_blank')").c_str());
 #endif
 	}
 

src/client/Minecraft.cpp

@@ -1,6 +1,8 @@
 #include "Minecraft.h"
+#include "Options.h"
 #include "client/Options.h"
 #include "client/player/input/IBuildInput.h"
+#include "commands/CommandManager.hpp"
 #include "platform/input/Keyboard.h"
 #include "world/item/Item.h"
 #include "world/item/ItemInstance.h"
@@ -174,7 +176,8 @@ Minecraft::Minecraft() :
 	_powerVr(false),
 	commandPort(4711),
 	reserved_d1(0),reserved_d2(0),
-	reserved_f1(0),reserved_f2(0), options(this)
+	reserved_f1(0),reserved_f2(0), options(this),
+	m_commandManager()
 {
 //#ifdef ANDROID
 
@@ -274,6 +277,11 @@ void Minecraft::setLevel(Level* level, const std::string& message /* ="" */, Loc
 			}
 		}
 		this->level = level;
+		// So uhhh
+		std::string op = options.getStringValue(OPTIONS_USERNAME);
+    	std::transform(op.begin(), op.end(), op.begin(), ::tolower);
+
+		level->ops.emplace(op);
 		_hasSignaledGeneratingLevelFinished = false;
 #ifdef STANDALONE_SERVER
 		const bool threadedLevelCreation = false;
@@ -357,10 +365,10 @@ void Minecraft::prepareLevel(const std::string& title) {
 	if (!level->isNew())
 		level->setUpdateLights(false);
 
-	int Max = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
+	int Max = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
 	int pp = 0;
-	for (int x = 8; x < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); x += CHUNK_WIDTH) {
-        for (int z = 8; z < (CHUNK_CACHE_WIDTH * CHUNK_WIDTH); z += CHUNK_WIDTH) {
+	for (int x = 8; x < (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH); x += LevelConstants::CHUNK_WIDTH) {
+        for (int z = 8; z < (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH); z += LevelConstants::CHUNK_WIDTH) {
             progressStagePercentage = 100 * pp++ / Max;
             //printf("level generation progress %d\n", progressStagePercentage);
 			B.start();
@@ -377,9 +385,9 @@ void Minecraft::prepareLevel(const std::string& title) {
 	level->setUpdateLights(true);
 
 	C.start();
-	for (int x = 0; x < CHUNK_CACHE_WIDTH; x++)
+	for (int x = 0; x < LevelConstants::CHUNK_CACHE_WIDTH; x++)
 	{
-		for (int z = 0; z < CHUNK_CACHE_WIDTH; z++)
+		for (int z = 0; z < LevelConstants::CHUNK_CACHE_WIDTH; z++)
 		{
 			LevelChunk* chunk = level->getChunk(x, z);
 			if (chunk && !chunk->createdFromSave)
@@ -552,7 +560,7 @@ void Minecraft::tick(int nTick, int maxTick) {
 			level->tickEntities();
 			level->tick();
 #ifndef STANDALONE_SERVER
-			TIMER_POP_PUSH("animateTick");
+			TIMER_POP_PUSH("animateTick");	
 			if (player) {
 				level->animateTick(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
 			}
@@ -640,13 +648,11 @@ void Minecraft::tickInput() {
 
 		const MouseAction& e = Mouse::getEvent();
 
-#ifdef RPI // If clicked when not having focus, get focus @keyboard
-		if (!mouseGrabbed) {
+		if (!useTouchscreen() && !mouseGrabbed) {
 			if (!screen && e.data == MouseAction::DATA_DOWN) {
 				grabMouse();
 			}
 		}
-#endif
 
 		if (allowGuiClicks && e.action == MouseAction::ACTION_LEFT && e.data == MouseAction::DATA_DOWN) {
 			gui.handleClick(MouseAction::ACTION_LEFT, Mouse::getX(), Mouse::getY());
@@ -660,9 +666,7 @@ void Minecraft::tickInput() {
 				Inventory* v = player->inventory;
 
 				int numSlots = gui.getNumSlots();
-#ifndef PLATFORM_DESKTOP
-				numSlots--;
-#endif
+				if (!useTouchscreen()) numSlots--;
 
 				int slot = (v->selected - e.dy + numSlots) % numSlots;
 				v->selectSlot(slot);
@@ -691,155 +695,162 @@ void Minecraft::tickInput() {
 		if (isPressed) {
 			gui.handleKeyPressed(key);
 
-			#if defined(WIN32) || defined(RPI) || defined (PLATFORM_DESKTOP)//|| defined(_DEBUG) || defined(DEBUG)
-				if (key >= '0' && key <= '9') {
-					int digit = key - '0';
-					int slot = digit - 1;
+			if (key >= '0' && key <= '9') {
+				int digit = key - '0';
+				int slot = digit - 1;
 
-					if (slot >= 0 && slot < gui.getNumSlots())
-						player->inventory->selectSlot(slot);
+				if (slot >= 0 && slot < gui.getNumSlots())
+					player->inventory->selectSlot(slot);
 
-					#if defined(WIN32)
-						if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
-							// Set adventure settings here!
-							AdventureSettingsPacket p(level->adventureSettings);
-							p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
-							p.fillIn(level->adventureSettings);
-							raknetInstance->send(p);
-						}
-						if (digit == 0) {
-							Pos pos((int)player->x, (int)player->y-1, (int)player->z);
-							SetSpawnPositionPacket p(pos);
-							raknetInstance->send(p);
-						}
-					#endif
-				}
-			#endif
-			#if defined(PLATFORM_DESKTOP)
-				if (key == Keyboard::KEY_LEFT_CTRL) {
-					player->setSprinting(true);
+				#if defined(WIN32)
+					if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
+						// Set adventure settings here!
+						AdventureSettingsPacket p(level->adventureSettings);
+						p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
+						p.fillIn(level->adventureSettings);
+						raknetInstance->send(p);
+					}
+					if (digit == 0) {
+						Pos pos((int)player->x, (int)player->y-1, (int)player->z);
+						SetSpawnPositionPacket p(pos);
+						raknetInstance->send(p);
+					}
+				#endif
+			}
+
+			if (key == Keyboard::KEY_LEFT_CTRL) {
+				player->setSprinting(true);
+			}
+
+			if (key == Keyboard::KEY_E) {
+				screenChooser.setScreen(SCREEN_BLOCKSELECTION);
+			}
+
+			if (!screen && key == Keyboard::KEY_T && level) {
+				setScreen(new ConsoleScreen());
+			}
+
+			if (key == Keyboard::KEY_F3) {
+				options.toggle(OPTIONS_RENDER_DEBUG);
+			}
+			
+			// TODO: replace it with client /give command :face_vomiting:
+			// if (key == Keyboard::KEY_F4) {
+			// 	player->inventory->add(new ItemInstance(Tile::redBrick));
+			// 	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));
+
+			// }
+
+			if (key == Keyboard::KEY_F5) {
+				options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+				/*
+				ImprovedNoise noise;
+				for (int i = 0; i < 16; ++i)
+					printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
+				*/
+			}
+
+			if (!screen && key == Keyboard::KEY_O || key == 250) {
+				releaseMouse();
+			}
+
+			if (key == Keyboard::KEY_F) {
+				int dst = options.getIntValue(OPTIONS_VIEW_DISTANCE);
+				options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
+			}
+			#ifdef CHEATS
+				if (key == Keyboard::KEY_U) {
+					onGraphicsReset();
+					player->heal(100);
 				}
 
-				if (key == Keyboard::KEY_E) {
-					screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-				}
+				if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
+					setIsCreativeMode(!isCreativeMode());
 
-				if (!screen && key == Keyboard::KEY_T && level) {
-					setScreen(new ConsoleScreen());
-				}
+				if (key == Keyboard::KEY_P) // Step forward in time
+					level->setTime( level->getTime() + 1000);
 
-				if (key == Keyboard::KEY_F3) {
-					options.toggle(OPTIONS_RENDER_DEBUG);
-				}
-	
-				if (key == Keyboard::KEY_F5) {
-					options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+				if (key == Keyboard::KEY_G) {
+					setScreen(new ArmorScreen());
 					/*
-					ImprovedNoise noise;
-					for (int i = 0; i < 16; ++i)
-						printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
+					std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
+					LOGI("boxes: %d\n", (int)boxs.size());
 					*/
 				}
 
-				if (!screen && key == Keyboard::KEY_O || key == 250) {
-					releaseMouse();
+				if (key == Keyboard::KEY_Y) {
+					textures->reloadAll();
+					player->hurtTo(2);
+				}
+				if (key == Keyboard::KEY_Z || key == 108) {
+					for (int i = 0; i < 1; ++i) {
+						Mob* mob = NULL;
+						int forceId = 0;//MobTypes::Sheep;
+
+						int types[] = {
+							MobTypes::Sheep,
+							MobTypes::Pig,
+							MobTypes::Chicken,
+							MobTypes::Cow,
+						};
+
+						int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
+						mob = MobFactory::CreateMob(mobType, level);
+
+						//((Animal*)mob)->setAge(-1000);
+						float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
+						float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
+						if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
+							delete mob;
+					}
 				}
 
-				if (key == Keyboard::KEY_F) {
-					int dst = options.getIntValue(OPTIONS_VIEW_DISTANCE);
-					options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
+				if (key == Keyboard::KEY_X) {
+					const EntityList& entities = level->getAllEntities();
+					for (int i = entities.size()-1; i >= 0; --i) {
+						Entity* e = entities[i];
+						if (!e->isPlayer())
+							level->removeEntity(e);
+					}
 				}
-				#ifdef CHEATS
-					if (key == Keyboard::KEY_U) {
-						onGraphicsReset();
-						player->heal(100);
+
+				if (key == Keyboard::KEY_C /*|| key == 4*/) {
+					player->inventory->clearInventoryWithDefault();
+					// @todo: Add saving here for benchmarking
+				}
+				if (key == Keyboard::KEY_H) {
+					setScreen( new PrerenderTilesScreen() );
+				}
+
+				if (key == Keyboard::KEY_O) {
+					for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
+						if (player->inventory->getItem(i))
+							player->inventory->dropSlot(i, false);
+				}
+				if (key == Keyboard::KEY_M) {
+					Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
+					options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
+						Difficulty::NORMAL : Difficulty::PEACEFUL);
+					//setIsCreativeMode( !isCreativeMode() );
+				}
+
+				if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+					if (key >= '0' && key <= '9') {
+						_perfRenderer->debugFpsMeterKeyPress(key - '0');
 					}
-
-					if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
-						setIsCreativeMode(!isCreativeMode());
-
-					if (key == Keyboard::KEY_P) // Step forward in time
-						level->setTime( level->getTime() + 1000);
-
-					if (key == Keyboard::KEY_G) {
-						setScreen(new ArmorScreen());
-						/*
-						std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
-						LOGI("boxes: %d\n", (int)boxs.size());
-						*/
-					}
-
-					if (key == Keyboard::KEY_Y) {
-						textures->reloadAll();
-						player->hurtTo(2);
-					}
-					if (key == Keyboard::KEY_Z || key == 108) {
-						for (int i = 0; i < 1; ++i) {
-							Mob* mob = NULL;
-							int forceId = 0;//MobTypes::Sheep;
-
-							int types[] = {
-								MobTypes::Sheep,
-								MobTypes::Pig,
-								MobTypes::Chicken,
-								MobTypes::Cow,
-							};
-
-							int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
-							mob = MobFactory::CreateMob(mobType, level);
-
-							//((Animal*)mob)->setAge(-1000);
-							float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
-							float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
-							if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
-								delete mob;
-						}
-					}
-
-					if (key == Keyboard::KEY_X) {
-						const EntityList& entities = level->getAllEntities();
-						for (int i = entities.size()-1; i >= 0; --i) {
-							Entity* e = entities[i];
-							if (!e->isPlayer())
-								level->removeEntity(e);
-						}
-					}
-
-					if (key == Keyboard::KEY_C /*|| key == 4*/) {
-						player->inventory->clearInventoryWithDefault();
-						// @todo: Add saving here for benchmarking
-					}
-					if (key == Keyboard::KEY_H) {
-						setScreen( new PrerenderTilesScreen() );
-					}
-
-					if (key == Keyboard::KEY_O) {
-						for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
-							if (player->inventory->getItem(i))
-								player->inventory->dropSlot(i, false);
-					}
-					if (key == Keyboard::KEY_M) {
-						Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
-						options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
-							Difficulty::NORMAL : Difficulty::PEACEFUL);
-						//setIsCreativeMode( !isCreativeMode() );
-					}
-
-					if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-						if (key >= '0' && key <= '9') {
-							_perfRenderer->debugFpsMeterKeyPress(key - '0');
-						}
-					}
-				#endif
+				}
 			#endif
 
-			#ifndef PLATFORM_DESKTOP
-				if (key == 82)
-					pauseGame(false);
-			#else
-				if (key == Keyboard::KEY_ESCAPE)
-					pauseGame(false);
-			#endif
+			if (key == Keyboard::KEY_ESCAPE)
+				pauseGame(false);
 
 			#ifndef OPENGL_ES
 				if (key == Keyboard::KEY_P) {
@@ -866,11 +877,18 @@ void Minecraft::tickInput() {
 		gameMode->stopDestroyBlock();
 	}
 
+	if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
+		gameMode->releaseUsingItem(player);
+	}
+
 	if (useTouchscreen()) {
 		// Touch: gesture recognizer classifies the action type (turn/destroy/build)
 		BuildActionIntention bai;
+
 		if (inputHolder && inputHolder->getBuildInput()->tickBuild(player, &bai)) {
 			handleBuildAction(&bai);
+		} else {
+			gameMode->stopDestroyBlock();
 		}
 	} else {
 		// Desktop: left mouse = destroy/attack
@@ -1112,7 +1130,7 @@ bool Minecraft::useTouchscreen() {
 #ifdef RPI
 	return false;
 #endif
-	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) || !_supportsNonTouchscreen;
+	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) && !_supportsNonTouchscreen;
 }
 bool Minecraft::supportNonTouchScreen() {
 	return _supportsNonTouchscreen;
@@ -1228,7 +1246,6 @@ void Minecraft::reloadOptions() {
 	if ((wasTouchscreen != useTouchscreen()) || (inputHolder == 0))
 		_reloadInput();
 
-	// TODO:
 	// user->name = options.username;
 
 	LOGI("Reloading-options\n");
@@ -1242,11 +1259,7 @@ void Minecraft::_reloadInput() {
 #ifndef STANDALONE_SERVER
 	delete inputHolder;
 
-#ifdef PLATFORM_DESKTOP
-	const bool useTouchHolder = false;
-#else
 	const bool useTouchHolder = useTouchscreen();
-#endif
 	if (useTouchHolder) {
 		inputHolder = new TouchInputHolder(this, &options);
 	} else {
@@ -1312,12 +1325,9 @@ bool Minecraft::joinMultiplayerFromString( const std::string& server )
 	} else {
 		ip = server;
 	}
-
-	printf("%s \n", port.c_str());
 	
 	if (isLookingForMultiplayer && netCallback) {
 		isLookingForMultiplayer = false;
-		printf("test");
 		int portNum = atoi(port.c_str());
 		return raknetInstance->connect(ip.c_str(), portNum);
 	}
@@ -1571,6 +1581,8 @@ void Minecraft::optionUpdated(OptionId option, bool value ) {
 	if(netCallback != NULL && option == OPTIONS_SERVER_VISIBLE) {
 		ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) netCallback;
 		ss->allowIncomingConnections(value);
+	} else if (option == OPTIONS_USE_TOUCHSCREEN) {
+		_reloadInput();
 	}
 }
 
@@ -1589,3 +1601,11 @@ void Minecraft::optionUpdated(OptionId option, int value ) {
         setSize(width, height);
     }
 }
+
+void Minecraft::addMessage(const std::string& msg) {
+#ifndef STANDALONE_SERVER
+	gui.addMessage(msg);
+#else 
+	LOGI("%s \n", msg.c_str());
+#endif
+}

src/client/Minecraft.h

@@ -2,6 +2,7 @@
 #define NET_MINECRAFT_CLIENT__Minecraft_H__
 
 #include "Options.h"
+#include "commands/CommandManager.hpp"
 #ifndef STANDALONE_SERVER
 #include "MouseHandler.h"
 #include "gui/Gui.h"
@@ -109,6 +110,8 @@ public:
 
 	bool isLevelGenerated();
 
+	void handleMouseDown(int button, bool down);
+	
     void audioEngineOn();
     void audioEngineOff();
     
@@ -118,11 +121,17 @@ public:
 	void optionUpdated(OptionId option, bool value);
 	void optionUpdated(OptionId option, float value);
 	void optionUpdated(OptionId option, int value);
+
+	int getTicks() { return ticks; }
+
+	void addMessage(const std::string& msg);
 #ifdef __APPLE__
     bool _isSuperFast;
     bool isSuperFast() { return _isSuperFast; }
 #endif
 
+	CommandManager& commandManager() { return m_commandManager; }
+
 protected:
 	void _levelGenerated();
 
@@ -195,7 +204,8 @@ public:
 	std::string externalCacheStoragePath;
 protected:
 	Timer timer;
-    // @note @attn @warn: this is dangerous as fuck!
+
+	// @note @attn @warn: this is dangerous as fuck!
 	volatile bool isGeneratingLevel;
 	bool _hasSignaledGeneratingLevelFinished;
 
@@ -222,6 +232,8 @@ private:
 
 	PerfRenderer* _perfRenderer;
 	CommandServer* _commandServer;
+
+	CommandManager m_commandManager;
 };
 
 #endif /*NET_MINECRAFT_CLIENT__Minecraft_H__*/

src/client/MouseHandler.cpp

@@ -5,7 +5,7 @@
 #include <SDL/SDL.h>
 #endif
 
-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 #include <GLFW/glfw3.h>
 #endif
 
@@ -34,7 +34,7 @@ void MouseHandler::grab() {
 	SDL_ShowCursor(0);
 #endif
 
-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_DISABLED);
 #endif
 }
@@ -46,7 +46,7 @@ void MouseHandler::release() {
 	SDL_ShowCursor(1);
 #endif
 
-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
 #endif
 }

src/client/OptionsFile.cpp

@@ -4,10 +4,11 @@
 #include <errno.h>
 #include <platform/log.h>
 
-#if !defined(_WIN32)
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+#if defined(_WIN32)
+    #include <direct.h>
+#else
+    #include <sys/stat.h>
+    #include <sys/types.h>
 #endif
 
 OptionsFile::OptionsFile() {
@@ -15,6 +16,8 @@ OptionsFile::OptionsFile() {
 	settingsPath = "./Documents/options.txt";
 #elif defined(ANDROID)
 	settingsPath = "options.txt";
+#elif defined(__EMSCRIPTEN__)
+    settingsPath = "/games/com.mojang/options.txt";
 #else
 	settingsPath = "options.txt";
 #endif
@@ -27,39 +30,44 @@ void OptionsFile::setOptionsPath(const std::string& path) {
 std::string OptionsFile::getOptionsPath() const {
 	return settingsPath;
 }
-
 void OptionsFile::save(const StringVector& settings) {
-	FILE* pFile = fopen(settingsPath.c_str(), "w");
-	if(pFile != NULL) {
-		for(StringVector::const_iterator it = settings.begin(); it != settings.end(); ++it) {
-			fprintf(pFile, "%s\n", it->c_str());
-		}
-		fclose(pFile);
-	} else {
-		if (errno != ENOENT)
-			LOGI("OptionsFile::save failed to open '%s' for writing: %s", settingsPath.c_str(), strerror(errno));
+    FILE* pFile = fopen(settingsPath.c_str(), "w");
 
-		// Ensure parent directory exists for safekeeping if path contains directories
-		std::string dir = settingsPath;
-		size_t fpos = dir.find_last_of("/\\");
-		if (fpos != std::string::npos) {
-			dir.resize(fpos);
-			struct stat st;
-			if (stat(dir.c_str(), &st) != 0) {
-				// attempt recursive mkdir
-				std::string toCreate;
-				for (size_t i = 0; i <= dir.size(); ++i) {
-					if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
-						if (!toCreate.empty()) {
-							mkdir(toCreate.c_str(), 0755);
-						}
-					}
-					if (i < dir.size())
-						toCreate.push_back(dir[i]);
-				}
-			}
-		}
-	}
+    if (!pFile && errno == ENOENT) {
+        std::string dir = settingsPath;
+        size_t fpos = dir.find_last_of("/\\");
+        if (fpos != std::string::npos) {
+            dir.resize(fpos);
+
+            std::string toCreate;
+            for (size_t i = 0; i <= dir.size(); ++i) {
+                if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
+                    if (!toCreate.empty()) {
+#if defined(_WIN32)
+                        _mkdir(toCreate.c_str());
+#else
+                        mkdir(toCreate.c_str(), 0755);
+#endif
+                    }
+                }
+                if (i < dir.size())
+                    toCreate.push_back(dir[i]);
+            }
+        }
+
+        pFile = fopen(settingsPath.c_str(), "w");
+    }
+
+    if (!pFile) {
+        LOGI("OptionsFile::save failed: %s", strerror(errno));
+        return;
+    }
+
+    for (const auto& s : settings) {
+        fprintf(pFile, "%s\n", s.c_str());
+    }
+
+    fclose(pFile);
 }
 
 

src/client/gamemode/CreativeMode.cpp

@@ -1,69 +1,56 @@
-#include "CreativeMode.h"
-#include "../Minecraft.h"
-#ifndef STANDALONE_SERVER
-#include "../particle/ParticleEngine.h"
-#endif
-#include "../player/LocalPlayer.h"
-#ifndef STANDALONE_SERVER
-#include "../renderer/LevelRenderer.h"
-#include "../sound/SoundEngine.h"
-#endif
-#include "../../world/level/Level.h"
-//#include "../../network/Packet.h"
-#include "../../network/packet/RemoveBlockPacket.h"
-#include "../../world/entity/player/Abilities.h"
-
-static const int DestructionTickDelay = 5;
-
-CreativeMode::CreativeMode(Minecraft* minecraft)
-: 	super(minecraft)
-{
-}
-
-void CreativeMode::startDestroyBlock(int x, int y, int z, int face) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
-
-	creativeDestroyBlock(x, y, z, face);
-	destroyDelay = DestructionTickDelay;
-}
-
-void CreativeMode::creativeDestroyBlock(int x, int y, int z, int face) {
-	minecraft->level->extinguishFire(x, y, z, face);
-	destroyBlock(x, y, z, face);
-}
-
-void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
-	destroyDelay--;
-	if (destroyDelay <= 0) {
-		destroyDelay = DestructionTickDelay;
-		creativeDestroyBlock(x, y, z, face);
-	}
-}
-
-void CreativeMode::stopDestroyBlock() {
-	destroyDelay = 0;
-}
-
-void CreativeMode::initAbilities( Abilities& abilities ) {
-	abilities.mayfly = true;
-	abilities.instabuild = true;
-	abilities.invulnerable = true;
-}
-
-bool CreativeMode::isCreativeType() {
-	return true;
-}
-
-void CreativeMode::releaseUsingItem( Player* player ) {
-	if(player->getCarriedItem() != NULL) {
-		int oldItemId = player->getCarriedItem()->id;
-		int oldAux = player->getAuxData();
-		super::releaseUsingItem(player);
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
-			player->getCarriedItem()->setAuxValue(oldAux);
-		}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}
+#include "CreativeMode.h"
+#include "../Minecraft.h"
+#ifndef STANDALONE_SERVER
+#include "../particle/ParticleEngine.h"
+#endif
+#include "../player/LocalPlayer.h"
+#ifndef STANDALONE_SERVER
+#include "../renderer/LevelRenderer.h"
+#include "../sound/SoundEngine.h"
+#endif
+#include "../../world/level/Level.h"
+//#include "../../network/Packet.h"
+#include "../../network/packet/RemoveBlockPacket.h"
+#include "../../world/entity/player/Abilities.h"
+
+static const int DestructionTickDelay = 5;
+
+CreativeMode::CreativeMode(Minecraft* minecraft)
+: 	super(minecraft)
+{
+}
+
+void CreativeMode::startDestroyBlock(int x, int y, int z, int face) {
+	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
+		return;
+
+	creativeDestroyBlock(x, y, z, face);
+	destroyDelay = DestructionTickDelay;
+}
+
+void CreativeMode::creativeDestroyBlock(int x, int y, int z, int face) {
+	minecraft->level->extinguishFire(x, y, z, face);
+	destroyBlock(x, y, z, face);
+}
+
+void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
+	destroyDelay--;
+	if (destroyDelay <= 0) {
+		destroyDelay = DestructionTickDelay;
+		creativeDestroyBlock(x, y, z, face);
+	}
+}
+
+void CreativeMode::stopDestroyBlock() {
+	destroyDelay = 0;
+}
+
+void CreativeMode::initAbilities( Abilities& abilities ) {
+	abilities.mayfly = true;
+	abilities.instabuild = true;
+	abilities.invulnerable = true;
+}
+
+bool CreativeMode::isCreativeType() {
+	return true;
+}

src/client/gamemode/CreativeMode.h

@@ -1,27 +1,26 @@
-#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
-#define NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
-
-//package net.minecraft.client.gamemode;
-
-#include "GameMode.h"
-
-class CreativeMode: public GameMode
-{
-	typedef GameMode super;
-public:
-    CreativeMode(Minecraft* minecraft);
-
-    void startDestroyBlock(int x, int y, int z, int face);
-    void continueDestroyBlock(int x, int y, int z, int face);
-    void stopDestroyBlock();
-
-	bool isCreativeType();
-
-	void initAbilities(Abilities& abilities);
-
-	void releaseUsingItem(Player* player);
-private:
-	void creativeDestroyBlock(int x, int y, int z, int face);
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__*/
+#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
+#define NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__
+
+//package net.minecraft.client.gamemode;
+
+#include "GameMode.h"
+
+class CreativeMode: public GameMode
+{
+	typedef GameMode super;
+public:
+    CreativeMode(Minecraft* minecraft);
+
+    void startDestroyBlock(int x, int y, int z, int face);
+    void continueDestroyBlock(int x, int y, int z, int face);
+    void stopDestroyBlock();
+
+	bool isCreativeType();
+
+	void initAbilities(Abilities& abilities);
+
+private:
+	void creativeDestroyBlock(int x, int y, int z, int face);
+};
+
+#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreativeMode_H__*/

src/client/gamemode/CreatorMode.cpp

@@ -1,115 +1,102 @@
-#include "CreatorMode.h"
-#include "../Minecraft.h"
-#include "../particle/ParticleEngine.h"
-#include "../player/LocalPlayer.h"
-#include "../renderer/LevelRenderer.h"
-#include "../sound/SoundEngine.h"
-#include "../../world/level/Level.h"
-//#include "../../network/Packet.h"
-#include "../../network/packet/RemoveBlockPacket.h"
-#include "../../world/entity/player/Abilities.h"
-
-static const int DestructionTickDelay = 5;
-
-class Creator: public ICreator {
-	//virtual void getEvents();
-
-public:
-	Creator(/*int eventLifeTime*/)
-	:	_tileEvents(32),
-		_tickId(0)
-	{
-	}
-
-	void setTick(int tick) {
-		_tickId = tick;
-	}
-
-	EventList<TileEvent>& getTileEvents() { return _tileEvents; }
-
-	void addevent_blockUse(int entityId, int x, int y, int z, int face) {
-		TileEvent t = {
-			entityId,
-			x,y,z,
-			face
-		};
-		_tileEvents.add(t, _tickId);
-	}
-
-private:
-	EventList<TileEvent> _tileEvents;
-	int _tickId;
-};
-
-CreatorMode::CreatorMode(Minecraft* minecraft)
-:	super(minecraft)
-{
-	_creator = new Creator();
-}
-
-CreatorMode::~CreatorMode() {
-	delete _creator;
-}
-
-void CreatorMode::startDestroyBlock(int x, int y, int z, int face) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
-
-	CreatorDestroyBlock(x, y, z, face);
-	destroyDelay = DestructionTickDelay;
-}
-
-void CreatorMode::CreatorDestroyBlock(int x, int y, int z, int face) {
-	minecraft->level->extinguishFire(x, y, z, face);
-	destroyBlock(x, y, z, face);
-}
-
-void CreatorMode::continueDestroyBlock(int x, int y, int z, int face) {
-	destroyDelay--;
-	if (destroyDelay <= 0) {
-		destroyDelay = DestructionTickDelay;
-		CreatorDestroyBlock(x, y, z, face);
-	}
-}
-
-bool CreatorMode::useItemOn( Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit ) {
-	if (item && item->id == ((Item*)Item::sword_iron)->id)
-		_creator->addevent_blockUse(player->entityId, x, y, z, face);
-	return super::useItemOn(player, level, item, x, y, z, face, hit);
-}
-
-void CreatorMode::stopDestroyBlock() {
-	destroyDelay = 0;
-}
-
-void CreatorMode::initAbilities( Abilities& abilities ) {
-	abilities.mayfly = true;
-	abilities.instabuild = true;
-	abilities.invulnerable = true;
-}
-
-bool CreatorMode::isCreativeType() {
-	return true;
-}
-
-void CreatorMode::releaseUsingItem( Player* player ) {
-	if(player->getCarriedItem() != NULL) {
-		int oldItemId = player->getCarriedItem()->id;
-		int oldAux = player->getAuxData();
-		super::releaseUsingItem(player);
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
-			player->getCarriedItem()->setAuxValue(oldAux);
-		}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}
-
-ICreator* CreatorMode::getCreator() {
-	return _creator;
-}
-
-void CreatorMode::tick() {
-	_creator->setTick(minecraft->level->getTime());
-	super::tick();
-}
+#include "CreatorMode.h"
+#include "../Minecraft.h"
+#include "../particle/ParticleEngine.h"
+#include "../player/LocalPlayer.h"
+#include "../renderer/LevelRenderer.h"
+#include "../sound/SoundEngine.h"
+#include "../../world/level/Level.h"
+//#include "../../network/Packet.h"
+#include "../../network/packet/RemoveBlockPacket.h"
+#include "../../world/entity/player/Abilities.h"
+
+static const int DestructionTickDelay = 5;
+
+class Creator: public ICreator {
+	//virtual void getEvents();
+
+public:
+	Creator(/*int eventLifeTime*/)
+	:	_tileEvents(32),
+		_tickId(0)
+	{
+	}
+
+	void setTick(int tick) {
+		_tickId = tick;
+	}
+
+	EventList<TileEvent>& getTileEvents() { return _tileEvents; }
+
+	void addevent_blockUse(int entityId, int x, int y, int z, int face) {
+		TileEvent t = {
+			entityId,
+			x,y,z,
+			face
+		};
+		_tileEvents.add(t, _tickId);
+	}
+
+private:
+	EventList<TileEvent> _tileEvents;
+	int _tickId;
+};
+
+CreatorMode::CreatorMode(Minecraft* minecraft)
+:	super(minecraft)
+{
+	_creator = new Creator();
+}
+
+CreatorMode::~CreatorMode() {
+	delete _creator;
+}
+
+void CreatorMode::startDestroyBlock(int x, int y, int z, int face) {
+	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
+		return;
+
+	CreatorDestroyBlock(x, y, z, face);
+	destroyDelay = DestructionTickDelay;
+}
+
+void CreatorMode::CreatorDestroyBlock(int x, int y, int z, int face) {
+	minecraft->level->extinguishFire(x, y, z, face);
+	destroyBlock(x, y, z, face);
+}
+
+void CreatorMode::continueDestroyBlock(int x, int y, int z, int face) {
+	destroyDelay--;
+	if (destroyDelay <= 0) {
+		destroyDelay = DestructionTickDelay;
+		CreatorDestroyBlock(x, y, z, face);
+	}
+}
+
+bool CreatorMode::useItemOn( Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit ) {
+	if (item && item->id == ((Item*)Item::sword_iron)->id)
+		_creator->addevent_blockUse(player->entityId, x, y, z, face);
+	return super::useItemOn(player, level, item, x, y, z, face, hit);
+}
+
+void CreatorMode::stopDestroyBlock() {
+	destroyDelay = 0;
+}
+
+void CreatorMode::initAbilities( Abilities& abilities ) {
+	abilities.mayfly = true;
+	abilities.instabuild = true;
+	abilities.invulnerable = true;
+}
+
+bool CreatorMode::isCreativeType() {
+	return true;
+}
+
+ICreator* CreatorMode::getCreator() {
+	return _creator;
+}
+
+void CreatorMode::tick() {
+	_creator->setTick(minecraft->level->getTime());
+	super::tick();
+}

src/client/gamemode/CreatorMode.h

@@ -1,61 +1,61 @@
-#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
-#define NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
-
-//package net.minecraft.client.gamemode;
-
-#include "GameMode.h"
-#include "../../world/PosTranslator.h"
-
-class ICreator {
-public:
-	virtual ~ICreator() {}
-
-	struct TileEvent {
-		int entityId;
-		int x, y, z;
-		int face;
-
-		void write(std::stringstream& ss, IPosTranslator& t) const {
-			int xx = x, yy = y, zz = z;
-			t.to(xx, yy, zz);
-			ss << xx << "," << yy << "," << zz << "," << face << "," << entityId;
-		}
-	};
-
-	template <class T>
-	class EventList {
-	public:
-		EventList(int size) {
-			_events.reserve(size);
-			_maxSize = (int)size;
-			clear();
-		}
-		void clear() {
-			_index = -1;
-			_size = 0;
-		}
-		void add(const T& item, int tick) {
-			if (_size < _maxSize) {
-				_events.push_back(Item());
-				++_size;
-			}
-			Item& e = _events[_nextIndex()];
-			e.item = item;
-			e.timestamp = tick;
-		}
-		int size() const {
-			return _size;
-		}
-
-		const T& operator[](int i) const {
-			return _events[_getIndex(i)].item;
-		}
-
-		T& operator[](int i) {
-			return _events[_getIndex(i)].item;
-		}
-
-		void write(std::stringstream& ss, IPosTranslator& t, int minTimetamp) const {
+#ifndef NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
+#define NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__
+
+//package net.minecraft.client.gamemode;
+
+#include "GameMode.h"
+#include "../../world/PosTranslator.h"
+
+class ICreator {
+public:
+	virtual ~ICreator() {}
+
+	struct TileEvent {
+		int entityId;
+		int x, y, z;
+		int face;
+
+		void write(std::stringstream& ss, IPosTranslator& t) const {
+			int xx = x, yy = y, zz = z;
+			t.to(xx, yy, zz);
+			ss << xx << "," << yy << "," << zz << "," << face << "," << entityId;
+		}
+	};
+
+	template <class T>
+	class EventList {
+	public:
+		EventList(int size) {
+			_events.reserve(size);
+			_maxSize = (int)size;
+			clear();
+		}
+		void clear() {
+			_index = -1;
+			_size = 0;
+		}
+		void add(const T& item, int tick) {
+			if (_size < _maxSize) {
+				_events.push_back(Item());
+				++_size;
+			}
+			Item& e = _events[_nextIndex()];
+			e.item = item;
+			e.timestamp = tick;
+		}
+		int size() const {
+			return _size;
+		}
+
+		const T& operator[](int i) const {
+			return _events[_getIndex(i)].item;
+		}
+
+		T& operator[](int i) {
+			return _events[_getIndex(i)].item;
+		}
+
+		void write(std::stringstream& ss, IPosTranslator& t, int minTimetamp) const {
 			int i = _getFirstNewerIndex(minTimetamp);
 			if (i < 0)
 				return;
@@ -66,63 +66,62 @@ public:
 				ss << "|";
 				if (++i == _size) i = 0;
 			}
-		}
-
-	private:
-		int _getIndex(int i) const { return (1 + _index + i) % _size; }
-		int _nextIndex() {
-			if (++_index == _size) _index = 0;
-			return _index;
-		}
-
-		int _getFirstNewerIndex(int timestamp) const {
-			for (int i = _index + 1, j = 0; j < _size; ++i, ++j) {
-				if (i == _size) i = 0;
-				if (_events[i].timestamp >= timestamp) return i;
-			}
-			return -1;
-		}
-		struct Item {
-			int timestamp;
-			T item;
-		};
-
-		int _index;
-		int _size;
-		int _maxSize;
-		std::vector<Item> _events;
-	};
-
-	virtual EventList<TileEvent>& getTileEvents() = 0;
-};
-
-class Creator;
-
-class CreatorMode: public GameMode
-{
-	typedef GameMode super;
-public:
-    CreatorMode(Minecraft* minecraft);
-	~CreatorMode();
-
-    void startDestroyBlock(int x, int y, int z, int face);
-    void continueDestroyBlock(int x, int y, int z, int face);
-    void stopDestroyBlock();
-
-	bool useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit);
-
-	void tick();
-	ICreator* getCreator();
-
-	bool isCreativeType();
-
-	void initAbilities(Abilities& abilities);
-
-	void releaseUsingItem(Player* player);
-private:
-	void CreatorDestroyBlock(int x, int y, int z, int face);
-
-	Creator* _creator;
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__*/
+		}
+
+	private:
+		int _getIndex(int i) const { return (1 + _index + i) % _size; }
+		int _nextIndex() {
+			if (++_index == _size) _index = 0;
+			return _index;
+		}
+
+		int _getFirstNewerIndex(int timestamp) const {
+			for (int i = _index + 1, j = 0; j < _size; ++i, ++j) {
+				if (i == _size) i = 0;
+				if (_events[i].timestamp >= timestamp) return i;
+			}
+			return -1;
+		}
+		struct Item {
+			int timestamp;
+			T item;
+		};
+
+		int _index;
+		int _size;
+		int _maxSize;
+		std::vector<Item> _events;
+	};
+
+	virtual EventList<TileEvent>& getTileEvents() = 0;
+};
+
+class Creator;
+
+class CreatorMode: public GameMode
+{
+	typedef GameMode super;
+public:
+    CreatorMode(Minecraft* minecraft);
+	~CreatorMode();
+
+    void startDestroyBlock(int x, int y, int z, int face);
+    void continueDestroyBlock(int x, int y, int z, int face);
+    void stopDestroyBlock();
+
+	bool useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit);
+
+	void tick();
+	ICreator* getCreator();
+
+	bool isCreativeType();
+
+	void initAbilities(Abilities& abilities);
+
+private:
+	void CreatorDestroyBlock(int x, int y, int z, int face);
+
+	Creator* _creator;
+};
+
+#endif /*NET_MINECRAFT_CLIENT_GAMEMODE__CreatorMode_H__*/

src/client/gamemode/GameMode.cpp

@@ -1,174 +1,174 @@
-#include "GameMode.h"
-#include "../Minecraft.h"
-#include "../../network/packet/UseItemPacket.h"
-#include "../../network/packet/PlayerActionPacket.h"
-#include "../../world/level/Level.h"
-#include "../../world/item/ItemInstance.h"
-#include "../player/LocalPlayer.h"
-#include "client/Options.h"
-#ifndef STANDALONE_SERVER
-#include "../sound/SoundEngine.h"
-#include "../particle/ParticleEngine.h"
-#endif
-#include "../../network/RakNetInstance.h"
-#include "../../network/packet/RemoveBlockPacket.h"
-#ifndef STANDALONE_SERVER
-#include "../renderer/LevelRenderer.h"
-#endif
-#include "../../world/level/material/Material.h"
-
-GameMode::GameMode( Minecraft* minecraft)
-:	minecraft(minecraft),
-	destroyProgress(0),
-	oDestroyProgress(0),
-	destroyTicks(0),
-	destroyDelay(0)
-{
-}
-
-/*virtual*/
-Player* GameMode::createPlayer(Level* level) {
-    return new LocalPlayer(minecraft, level, minecraft->options.getStringValue(OPTIONS_USERNAME), level->dimension->id, isCreativeType());
-}
-
-/*virtual*/
-void GameMode::interact(Player* player, Entity* entity) {
-    player->interact(entity);
-}
-
-/*virtual*/
-void GameMode::attack(Player* player, Entity* entity) {
-	if (minecraft->level->adventureSettings.noPvP && entity->isPlayer())
-		return;
-	if (minecraft->level->adventureSettings.noPvM && entity->isMob())
-		return;
-    player->attack(entity);
-}
-
-/* virtual */
-void GameMode::startDestroyBlock( int x, int y, int z, int face ) {
-	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
-		return;
-	destroyBlock(x, y, z, face);
-}
-
-/*virtual*/
-bool GameMode::destroyBlock(int x, int y, int z, int face) {
-    Level* level = minecraft->level;
-    Tile* oldTile = Tile::tiles[level->getTile(x, y, z)];
-	if (!oldTile)
-		return false;
-
-    if (level->adventureSettings.immutableWorld) {
-        if (oldTile != (Tile*)Tile::leaves
-         && oldTile->material != Material::plant) {
-             return false;
-        }
-    }
-#ifndef STANDALONE_SERVER
-	minecraft->particleEngine->destroy(x, y, z);
-#endif
-	int data = level->getData(x, y, z);
-    bool changed = level->setTile(x, y, z, 0);
-    if (changed) {
-#ifndef STANDALONE_SERVER
-        minecraft->soundEngine->play(oldTile->soundType->getBreakSound(), x + 0.5f, y + 0.5f, z + 0.5f, (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
-#endif
-        oldTile->destroy(level, x, y, z, data);
-		if (minecraft->options.getBooleanValue(OPTIONS_DESTROY_VIBRATION)) minecraft->platform()->vibrate(24);
-
-		if (minecraft->isOnline()) {
-			RemoveBlockPacket packet(minecraft->player, x, y, z);
-			minecraft->raknetInstance->send(packet);
-		}
-	}
-    return changed;
-}
-/*virtual*/
-bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit) {
-	float clickX = hit.x - x;
-	float clickY = hit.y - y;
-	float clickZ = hit.z - z;
-	item = player->inventory->getSelected();
-	if(level->isClientSide) {
-		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
-		minecraft->raknetInstance->send(packet);
-	}
-    int t = level->getTile(x, y, z);
-	if (t == Tile::invisible_bedrock->id) return false;
-    if (t > 0 && Tile::tiles[t]->use(level, x, y, z, player))
-		return true;
-
-	if (item == NULL) return false;
-	if(isCreativeType()) {
-		int aux = item->getAuxValue();
-		int count = item->count;
-		bool success = item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
-		item->setAuxValue(aux);
-		item->count = count;
-		return success;
-	} else {
-		return item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
-	}
-}
-
-bool GameMode::useItem( Player* player, Level* level, ItemInstance* item ) {
-	int oldCount = item->count;
-
-	ItemInstance* itemInstance = item->use(level, player);
-	if(level->isClientSide) {
-		UseItemPacket packet(item, player->entityId, player->aimDirection);
-		minecraft->raknetInstance->send(packet);
-	}
-	if (itemInstance != item || (itemInstance != NULL && itemInstance->count != oldCount)) {
-	    //player.inventory.items[player.inventory.selected] = itemInstance;
-	    //if (itemInstance.count == 0) {
-	    //    player.inventory.items[player.inventory.selected] = NULL;
-	    //}
-	    return true;
-	}
-	return false;
-}
-
-ItemInstance* GameMode::handleInventoryMouseClick( int containerId, int slotNum, int buttonNum, Player* player ) {
-	//return player.containerMenu.clicked(slotNum, buttonNum, player);
-	return NULL;
-}
-
-void GameMode::handleCloseInventory( int containerId, Player* player ) {
-	//player.containerMenu.removed(player);
-	//player.containerMenu = player.inventoryMenu;
-}
-
-float GameMode::getPickRange() {
-	return 5.0f;
-}
-
-void GameMode::initPlayer( Player* player ) {
-	initAbilities(player->abilities);
-}
-
-void GameMode::releaseUsingItem(Player* player){
-	if(minecraft->level->isClientSide) {
-		PlayerActionPacket packet(PlayerActionPacket::RELEASE_USE_ITEM,  0, 0, 0, 0, player->entityId);
-		minecraft->raknetInstance->send(packet);
-	}
-	player->releaseUsingItem();
-}
-
-void GameMode::tick() {
-	oDestroyProgress = destroyProgress;
-}
-
-void GameMode::render( float a ) {
-#ifndef STANDALONE_SERVER
-	if (destroyProgress <= 0) {
-		minecraft->gui.progress = 0;
-		minecraft->levelRenderer->destroyProgress = 0;
-	} else {
-		float dp = oDestroyProgress + (destroyProgress - oDestroyProgress) * a;
-		minecraft->gui.progress = dp;
-		minecraft->levelRenderer->destroyProgress = dp;
-	}
-#endif
-}
+#include "GameMode.h"
+#include "../Minecraft.h"
+#include "../../network/packet/UseItemPacket.h"
+#include "../../network/packet/PlayerActionPacket.h"
+#include "../../world/level/Level.h"
+#include "../../world/item/ItemInstance.h"
+#include "../player/LocalPlayer.h"
+#include "client/Options.h"
+#ifndef STANDALONE_SERVER
+#include "../sound/SoundEngine.h"
+#include "../particle/ParticleEngine.h"
+#endif
+#include "../../network/RakNetInstance.h"
+#include "../../network/packet/RemoveBlockPacket.h"
+#ifndef STANDALONE_SERVER
+#include "../renderer/LevelRenderer.h"
+#endif
+#include "../../world/level/material/Material.h"
+
+GameMode::GameMode( Minecraft* minecraft)
+:	minecraft(minecraft),
+	destroyProgress(0),
+	oDestroyProgress(0),
+	destroyTicks(0),
+	destroyDelay(0)
+{
+}
+
+/*virtual*/
+Player* GameMode::createPlayer(Level* level) {
+    return new LocalPlayer(minecraft, level, minecraft->options.getStringValue(OPTIONS_USERNAME), level->dimension->id, isCreativeType());
+}
+
+/*virtual*/
+void GameMode::interact(Player* player, Entity* entity) {
+    player->interact(entity);
+}
+
+/*virtual*/
+void GameMode::attack(Player* player, Entity* entity) {
+	if (minecraft->level->adventureSettings.noPvP && entity->isPlayer())
+		return;
+	if (minecraft->level->adventureSettings.noPvM && entity->isMob())
+		return;
+    player->attack(entity);
+}
+
+/* virtual */
+void GameMode::startDestroyBlock( int x, int y, int z, int face ) {
+	if(minecraft->player->getCarriedItem() != NULL && minecraft->player->getCarriedItem()->id == Item::bow->id)
+		return;
+	destroyBlock(x, y, z, face);
+}
+
+/*virtual*/
+bool GameMode::destroyBlock(int x, int y, int z, int face) {
+    Level* level = minecraft->level;
+    Tile* oldTile = Tile::tiles[level->getTile(x, y, z)];
+	if (!oldTile)
+		return false;
+
+    if (level->adventureSettings.immutableWorld) {
+        if (oldTile != (Tile*)Tile::leaves
+         && oldTile->material != Material::plant) {
+             return false;
+        }
+    }
+#ifndef STANDALONE_SERVER
+	minecraft->particleEngine->destroy(x, y, z);
+#endif
+	int data = level->getData(x, y, z);
+    bool changed = level->setTile(x, y, z, 0);
+    if (changed) {
+#ifndef STANDALONE_SERVER
+        minecraft->soundEngine->play(oldTile->soundType->getBreakSound(), x + 0.5f, y + 0.5f, z + 0.5f, (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
+#endif
+        oldTile->destroy(level, x, y, z, data);
+		if (minecraft->options.getBooleanValue(OPTIONS_DESTROY_VIBRATION)) minecraft->platform()->vibrate(24);
+
+		if (minecraft->isOnline()) {
+			RemoveBlockPacket packet(minecraft->player, x, y, z);
+			minecraft->raknetInstance->send(packet);
+		}
+	}
+    return changed;
+}
+/*virtual*/
+bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x, int y, int z, int face, const Vec3& hit) {
+	float clickX = hit.x - x;
+	float clickY = hit.y - y;
+	float clickZ = hit.z - z;
+	if (level->isClientSide) {
+		item = player->inventory->getSelected();
+		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
+		minecraft->raknetInstance->send(packet);
+	}
+    int t = level->getTile(x, y, z);
+	if (t == Tile::invisible_bedrock->id) return false;
+    if (t > 0 && Tile::tiles[t]->use(level, x, y, z, player))
+		return true;
+
+	if (item == NULL) return false;
+	if(isCreativeType()) {
+		int aux = item->getAuxValue();
+		int count = item->count;
+		bool success = item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
+		item->setAuxValue(aux);
+		item->count = count;
+		return success;
+	} else {
+		return item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
+	}
+}
+
+bool GameMode::useItem( Player* player, Level* level, ItemInstance* item ) {
+	int oldCount = item->count;
+
+	ItemInstance* itemInstance = item->use(level, player);
+	if(level->isClientSide) {
+		UseItemPacket packet(item, player->entityId, player->aimDirection);
+		minecraft->raknetInstance->send(packet);
+	}
+	if (itemInstance != item || (itemInstance != NULL && itemInstance->count != oldCount)) {
+	    //player.inventory.items[player.inventory.selected] = itemInstance;
+	    //if (itemInstance.count == 0) {
+	    //    player.inventory.items[player.inventory.selected] = NULL;
+	    //}
+	    return true;
+	}
+	return false;
+}
+
+ItemInstance* GameMode::handleInventoryMouseClick( int containerId, int slotNum, int buttonNum, Player* player ) {
+	//return player.containerMenu.clicked(slotNum, buttonNum, player);
+	return NULL;
+}
+
+void GameMode::handleCloseInventory( int containerId, Player* player ) {
+	//player.containerMenu.removed(player);
+	//player.containerMenu = player.inventoryMenu;
+}
+
+float GameMode::getPickRange() {
+	return 5.0f;
+}
+
+void GameMode::initPlayer( Player* player ) {
+	initAbilities(player->abilities);
+}
+
+void GameMode::releaseUsingItem(Player* player){
+	if (minecraft->level->isClientSide && player->isUsingItem()) {
+		PlayerActionPacket packet(PlayerActionPacket::RELEASE_USE_ITEM,  0, 0, 0, 0, player->entityId);
+		minecraft->raknetInstance->send(packet);
+	}
+	player->releaseUsingItem();
+}
+
+void GameMode::tick() {
+	oDestroyProgress = destroyProgress;
+}
+
+void GameMode::render( float a ) {
+#ifndef STANDALONE_SERVER
+	if (destroyProgress <= 0) {
+		minecraft->gui.progress = 0;
+		minecraft->levelRenderer->destroyProgress = 0;
+	} else {
+		float dp = oDestroyProgress + (destroyProgress - oDestroyProgress) * a;
+		minecraft->gui.progress = dp;
+		minecraft->levelRenderer->destroyProgress = dp;
+	}
+#endif
+}

src/client/gamemode/SurvivalMode.cpp

@@ -68,6 +68,7 @@ bool SurvivalMode::destroyBlock( int x, int y, int z, int face ) {
 			minecraft->player->inventory->clearSlot(minecraft->player->inventory->selected);
 		}
 	}
+	
 	if (changed && couldDestroy) {
 		ItemInstance instance(t, 1, data);
 		Tile::tiles[t]->playerDestroy(minecraft->level, minecraft->player, x, y, z, data);

src/client/gui/Font.cpp

@@ -186,7 +186,7 @@ void Font::draw( const std::string& str, float x, float y, int color, bool darke
 	glPushMatrix2();
 	glTranslatef2((GLfloat)x, (GLfloat)y, 0.0f);
 	for (unsigned int i = 0; i < str.length(); i++) {
-		while (str.length() > i + 1 && str[i] == '§') {
+		while (str.length() > i + 1 && str[i] == '\xa7') {
 			int cc = hex.find((char)tolower(str[i + 1]));
 			if (cc < 0 || cc > 15) cc = 15;
 			lists[index++] = listPos + 256 + cc + (darken ? 16 : 0);
@@ -235,7 +235,7 @@ int Font::width( const std::string& str )
 	int len = 0;
 
 	for (unsigned int i = 0; i < str.length(); i++) {
-		if (str[i] == '§') {
+		if (str[i] == '\xa7') {
 			i++;
 		} else {
 			//int ch = SharedConstants.acceptableLetters.indexOf(str.charAt(i));
@@ -274,7 +274,7 @@ std::string Font::sanitize( const std::string& str )
 	int j = 0;
 
 	for (unsigned int i = 0; i < str.length(); i++) {
-		if (str[i] == '§') {
+		if (str[i] == '\xa7') {
 			i++;
 			//} else if (SharedConstants.acceptableLetters.indexOf(str.charAt(i)) >= 0) {
 		} else {

src/client/gui/Gui.cpp

@@ -51,7 +51,8 @@ Gui::Gui(Minecraft* minecraft)
 	_currentDropTicks(-1),
 	_currentDropSlot(-1),
 	MAX_MESSAGE_WIDTH(240),
-	itemNameOverlayTime(2)
+	itemNameOverlayTime(2),
+	_openInventorySlot(minecraft->useTouchscreen())
 {
 	glGenBuffers2(1, &_inventoryRc.vboId);
 	glGenBuffers2(1, &rcFeedbackInner.vboId);
@@ -75,11 +76,8 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	//minecraft->gameRenderer->setupGuiScreen();
 	Font* font = minecraft->font;
 
-#ifdef PLATFORM_DESKTOP
-	const bool isTouchInterface = false;
-#else
 	const bool isTouchInterface = minecraft->useTouchscreen();
-#endif
+	
 	const int screenWidth = (int)(minecraft->width * InvGuiScale);
 	const int screenHeight = (int)(minecraft->height * InvGuiScale);
 	blitOffset = -90;
@@ -206,16 +204,10 @@ void Gui::handleClick(int button, int x, int y) {
 	if (button != MouseAction::ACTION_LEFT)	return;
 
 	int slot = getSlotIdAt(x, y);
-	if (slot != -1)
-	{
-#ifndef PLATFORM_DESKTOP
-		if (slot == (getNumSlots()-1))
-		{
+	if (slot != -1) {
+		if (_openInventorySlot && slot == (getNumSlots()-1)) {
 			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-		}
-		else
-#endif
-		{
+		} else {
 			minecraft->player->inventory->selectSlot(slot);
 			itemNameOverlayTime = 0;
 		}
@@ -349,7 +341,7 @@ void Gui::setNowPlaying(const std::string& string) {
 void Gui::displayClientMessage(const std::string& messageId) {
 	//Language language = Language.getInstance();
 	//std::string languageString = language.getElement(messageId);
-	addMessage(std::string("Client message: ") + messageId);
+	addMessage(messageId);
 }
 
 void Gui::renderVignette(float br, int w, int h) {
@@ -537,11 +529,7 @@ void Gui::tickItemDrop()
 	static bool isCurrentlyActive = false;
 	isCurrentlyActive = false;
 
-	int slots = getNumSlots();
-
-#ifndef PLATFORM_DESKTOP
-	slots--;
-#endif
+	int slots = getNumSlots() - _openInventorySlot;
 
 	if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
 		int slot = getSlotIdAt(Mouse::getX(), Mouse::getY());
@@ -742,7 +730,6 @@ void Gui::renderDebugInfo() {
 
 	// Position
 	float px = p->x, py = p->y - p->heightOffset, pz = p->z;
-	posTranslator.to(px, py, pz);
 	int bx = (int)floorf(px), by = (int)floorf(py), bz = (int)floorf(pz);
 	int cx = bx >> 4, cz = bz >> 4;
 
@@ -1083,13 +1070,7 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 
 	float x = baseItemX;
 
-	int slots = getNumSlots();
-
-	// TODO: if using touchscreen
-
-#ifndef PLATFORM_DESKTOP
-	slots--;
-#endif
+	int slots = getNumSlots() - _openInventorySlot;
 
 	for (int i = 0; i < slots; i++) {
 		renderSlot(i, (int)x, ySlot, a);
@@ -1097,9 +1078,10 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	}
 	_inventoryNeedsUpdate = false;
 
-#ifndef PLATFORM_DESKTOP
-	blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
-#endif
+
+	if (_openInventorySlot) {
+		blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
+	}
 
 	minecraft->textures->loadAndBindTexture("gui/gui_blocks.png");
 	t.endOverrideAndDraw();

src/client/gui/Gui.h

@@ -127,6 +127,8 @@ private:
 	static const float DropTicks;
 	float  _currentDropTicks;
 	int    _currentDropSlot;
+
+	bool   _openInventorySlot;
 };
 
 #endif /*NET_MINECRAFT_CLIENT_GUI__Gui_H__*/

src/client/gui/Screen.cpp

@@ -177,9 +177,11 @@ void Screen::keyPressed( int eventKey )
 		textbox->keyPressed(minecraft, eventKey);
 	}
 
+#ifdef TABBING
 	if (minecraft->useTouchscreen())
 		return;
 
+
 	// "Tabbing" the buttons (walking with keys)
 	const int tabButtonCount = tabButtons.size();
 	if (!tabButtonCount)
@@ -199,6 +201,7 @@ void Screen::keyPressed( int eventKey )
 	}
 
 	updateTabButtonSelection();
+#endif
 }
 
 void Screen::charPressed(char inputChar) {
@@ -209,11 +212,13 @@ void Screen::charPressed(char inputChar) {
 
 void Screen::updateTabButtonSelection()
 {
+#ifdef TABBING
 	if (minecraft->useTouchscreen())
 		return;
 
 	for (unsigned int i = 0; i < tabButtons.size(); ++i)
 		tabButtons[i]->selected = (i == tabButtonIndex);
+#endif
 }
 
 void Screen::mouseClicked( int x, int y, int buttonNum )

src/client/gui/components/Button.cpp

@@ -95,7 +95,7 @@ void Button::renderBg( Minecraft* minecraft, int xm, int ym )
 }
 
 bool Button::hovered(Minecraft* minecraft, int xm , int ym) {
-	return minecraft->useTouchscreen()? (_currentlyDown && isInside(xm, ym)) : false;
+	return minecraft->useTouchscreen()? (_currentlyDown && isInside(xm, ym)) : isInside(xm, ym);
 }
 
 bool Button::isInside( int xm, int ym ) {
@@ -143,7 +143,8 @@ TButton::TButton( int id, int x, int y, int w, int h, const std::string& msg )
 
 void TButton::renderBg( Minecraft* minecraft, int xm, int ym )
 {
-	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
+	// bool hovered = active && (_currentlyDown && isInside(xm, ym));
 
 	minecraft->textures->loadAndBindTexture("gui/touchgui.png");
 

src/client/gui/components/ImageButton.cpp

@@ -42,7 +42,7 @@ void ImageButton::render(Minecraft* minecraft, int xm, int ym) {
 	//minecraft->textures->loadAndBindTexture("gui/gui.png");
 	glColor4f2(1, 1, 1, 1);
 
-	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
 	bool IsSecondImage = isSecondImage(hovered);
 
 	//printf("ButtonId: %d - Hovered? %d (cause: %d, %d, %d, %d, <> %d, %d)\n", id, hovered, x, y, x+w, y+h, xm, ym);

src/client/gui/components/LargeImageButton.cpp

@@ -33,7 +33,7 @@ void LargeImageButton::render(Minecraft* minecraft, int xm, int ym) {
 
 	//minecraft->textures->loadAndBindTexture("gui/gui.png");
 	glColor4f2(1, 1, 1, 1);
-	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
 
 	//printf("ButtonId: %d - Hovered? %d (cause: %d, %d, %d, %d, <> %d, %d)\n", id, hovered, x, y, x+w, y+h, xm, ym);
 	//int yImage = getYImage(hovered || selected);

src/client/gui/components/ScrollingPane.cpp

@@ -20,6 +20,9 @@ static const float kMinimumTrackingForDrag = 5;
 static const float kMinIndicatorLength = 34.0f / 3;
 static const float PKScrollIndicatorEndSize = 3;
 static const float PKScrollIndicatorThickness = 7.0f /3;
+static const float kWheelOverscrollMax = 80.0f;
+static const float kWheelOverscrollDamping = 0.6f;
+static const float kWheelOverscrollRestoreAlpha = 0.18f;
 
 ScrollingPane::ScrollingPane(
 		int optionFlags,
@@ -70,13 +73,19 @@ ScrollingPane::ScrollingPane(
 	}
 	//LOGI("%d, %d :: %d\n", bbox.w, itemBbox.w, this->columns);
 
-	rows = 1 + (numItems-1) / this->columns,
+	rows = 1 + (numItems-1) / this->columns;
 
 	/*
 	if (columns * itemBbox.w <= bbox.w) flags |= SF_LockX;
 	if (rows    * itemBbox.h <= bbox.h) flags |= SF_LockY;
 	*/
 
+	// initialize content bounds immediately
+	adjustContentSize();
+	minPoint.set((float)(this->size.w - this->adjustedContentSize.w), (float)(this->size.h - this->adjustedContentSize.h), 0);
+	this->snapContentOffsetToBounds(false);
+
+
 	dragDeltas.reserve(128);
 
 	te_moved = 0;
@@ -114,6 +123,34 @@ void ScrollingPane::tick() {
 		updateScrollFade(vScroll);
 		updateScrollFade(hScroll);
 	}
+
+	if (isNotSet(SF_HardLimits) && !Mouse::isButtonDown(MouseAction::ACTION_LEFT) && !dragging && !tracking && !decelerating) {
+		float targetX = _contentOffset.x;
+		float targetY = _contentOffset.y;
+		bool corrected = false;
+
+		if (targetX > 0.0f) {
+			targetX = Mth::lerp(targetX, 0.0f, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		} else if (targetX < minPoint.x) {
+			targetX = Mth::lerp(targetX, minPoint.x, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		}
+
+		if (targetY > 0.0f) {
+			targetY = Mth::lerp(targetY, 0.0f, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		} else if (targetY < minPoint.y) {
+			targetY = Mth::lerp(targetY, minPoint.y, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		}
+
+		if (corrected) {
+			if (Mth::abs(targetX - _contentOffset.x) < 0.25f) targetX = (targetX > 0.0f ? 0.0f : (targetX < minPoint.x ? minPoint.x : targetX));
+			if (Mth::abs(targetY - _contentOffset.y) < 0.25f) targetY = (targetY > 0.0f ? 0.0f : (targetY < minPoint.y ? minPoint.y : targetY));
+			setContentOffset(Vec3(targetX, targetY, 0));
+		}
+	}
 }
 
 bool ScrollingPane::getGridItemFor_slow(int itemIndex, GridItem& out) {
@@ -549,11 +586,39 @@ void ScrollingPane::stepThroughDecelerationAnimation(bool noAnimation) {
 }
 
 void ScrollingPane::scrollBy(float dx, float dy) {
-	// adjust the translation offsets fpx/fpy by the requested amount
-	float nfpx = fpx + dx;
-	float nfpy = fpy + dy;
-	// convert back to content offset (fpx = -contentOffset.x)
-	setContentOffset(Vec3(-nfpx, -nfpy, 0));
+	// compute target content offset from wheel delta (in screen-space w/ opposite sign)
+	float targetX = _contentOffset.x - dx;
+	float targetY = _contentOffset.y - dy;
+
+	if (isSet(SF_LockX)) targetX = _contentOffset.x;
+	if (isSet(SF_LockY)) targetY = _contentOffset.y;
+
+	if (isSet(SF_HardLimits)) {
+		targetX = Mth::clamp(targetX, minPoint.x, 0.0f);
+		targetY = Mth::clamp(targetY, minPoint.y, 0.0f);
+	} else {
+		if (targetX > 0.0f) {
+			float overshoot = targetX;
+			overshoot = Mth::Min(overshoot, kWheelOverscrollMax);
+			targetX = overshoot * kWheelOverscrollDamping;
+		} else if (targetX < minPoint.x) {
+			float overshoot = targetX - minPoint.x;
+			overshoot = Mth::Max(overshoot, -kWheelOverscrollMax);
+			targetX = minPoint.x + overshoot * kWheelOverscrollDamping;
+		}
+
+		if (targetY > 0.0f) {
+			float overshoot = targetY;
+			overshoot = Mth::Min(overshoot, kWheelOverscrollMax);
+			targetY = overshoot * kWheelOverscrollDamping;
+		} else if (targetY < minPoint.y) {
+			float overshoot = targetY - minPoint.y;
+			overshoot = Mth::Max(overshoot, -kWheelOverscrollMax);
+			targetY = minPoint.y + overshoot * kWheelOverscrollDamping;
+		}
+	}
+
+	setContentOffset(Vec3(targetX, targetY, 0));
 }
 
 void ScrollingPane::setContentOffset(float x, float y) {

src/client/gui/screens/ConfirmScreen.cpp

@@ -31,7 +31,7 @@ ConfirmScreen::~ConfirmScreen() {
 
 void ConfirmScreen::init()
 {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		yesButton = new Touch::TButton(0, 0, 0, yesButtonText),
 		noButton  = new Touch::TButton(1, 0, 0, noButtonText);
 	} else {

src/client/gui/screens/ConsoleScreen.cpp

@@ -8,6 +8,7 @@
 #include "../../../network/ServerSideNetworkHandler.h"
 #include "../../../network/packet/ChatPacket.h"
 #include "../../../platform/log.h"
+#include "util/StringUtils.h"
 
 #include <sstream>
 #include <cstdlib>
@@ -54,141 +55,37 @@ void ConsoleScreen::charPressed(char inputChar)
         _input += inputChar;
 }
 
-// ---------------------------------------------------------------------------
-// execute: run _input as a command, print result, close screen
-// ---------------------------------------------------------------------------
 void ConsoleScreen::execute()
 {
+    if (!minecraft->level) return;
+
     if (_input.empty()) {
-        minecraft->setScreen(NULL);
-        return;
+        return minecraft->setScreen(NULL);
     }
 
     if (_input[0] == '/') {
         // Command
-        std::string result = processCommand(_input);
-        if (!result.empty())
-            minecraft->gui.addMessage(result);
+        _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 {
-        // Chat message: <name> message
-        std::string msg = std::string("<") + minecraft->player->name + "> " + _input;
+        // @ai @rewrite
         if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
-            // Hosting a LAN game: displayGameMessage shows locally + broadcasts MessagePacket to clients
-            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(msg);
+            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(_input);
         } else if (minecraft->netCallback) {
-            // Connected client: send ChatPacket to server; server echoes it back as MessagePacket
-            ChatPacket chatPkt(msg);
+            ChatPacket chatPkt(_input);
             minecraft->raknetInstance->send(chatPkt);
         } else {
-            // Singleplayer: show locally only
-            minecraft->gui.addMessage(msg);
+            minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
         }
     }
 
     minecraft->setScreen(NULL);
 }
 
-// ---------------------------------------------------------------------------
-// processCommand
-// ---------------------------------------------------------------------------
-static std::string trim(const std::string& s) {
-    size_t a = s.find_first_not_of(" \t");
-    if (a == std::string::npos) return "";
-    size_t b = s.find_last_not_of(" \t");
-    return s.substr(a, b - a + 1);
-}
-
-std::string ConsoleScreen::processCommand(const std::string& raw)
-{
-    // strip leading '/'
-    std::string line = raw;
-    if (!line.empty() && line[0] == '/') line = line.substr(1);
-    line = trim(line);
-
-    // tokenise
-    std::vector<std::string> args;
-    {
-        std::istringstream ss(line);
-        std::string tok;
-        while (ss >> tok) args.push_back(tok);
-    }
-
-    if (args.empty()) return "";
-
-    Level* level = minecraft->level;
-    if (!level) return "No level loaded.";
-
-    // -----------------------------------------------------------------------
-    // /time ...
-    // -----------------------------------------------------------------------
-    if (args[0] == "time") {
-        if (args.size() < 2)
-            return "Usage: /time <add|set|query> ...";
-
-        const std::string& sub = args[1];
-
-        // -- time add <value> -----------------------------------------------
-        if (sub == "add") {
-            if (args.size() < 3) return "Usage: /time add <value>";
-            long delta = std::atol(args[2].c_str());
-            long newTime = level->getTime() + delta;
-            level->setTime(newTime);
-            std::ostringstream out;
-            out << "Set the time to " << (newTime % Level::TICKS_PER_DAY);
-            return out.str();
-        }
-
-        // -- time set <value|day|night|noon|midnight> -----------------------
-        if (sub == "set") {
-            if (args.size() < 3) return "Usage: /time set <value|day|night|noon|midnight>";
-            const std::string& val = args[2];
-
-            long t = -1;
-            if      (val == "day")      t = 1000;
-            else if (val == "noon")     t = 6000;
-            else if (val == "night")    t = 13000;
-            else if (val == "midnight") t = 18000;
-            else {
-                // numeric — accept positive integers only
-                bool numeric = true;
-                for (char c : val)
-                    if (!std::isdigit((unsigned char)c)) { numeric = false; break; }
-                if (!numeric) return std::string("Unknown value: ") + val;
-                t = std::atol(val.c_str());
-            }
-
-            // Preserve the total day count so only the time-of-day changes
-            long dayCount = level->getTime() / Level::TICKS_PER_DAY;
-            long newTime  = dayCount * Level::TICKS_PER_DAY + (t % Level::TICKS_PER_DAY);
-            level->setTime(newTime);
-            std::ostringstream out;
-            out << "Set the time to " << t;
-            return out.str();
-        }
-
-        // -- time query <daytime|gametime|day> ------------------------------
-        if (sub == "query") {
-            if (args.size() < 3) return "Usage: /time query <daytime|gametime|day>";
-            const std::string& what = args[2];
-
-            long total   = level->getTime();
-            long daytime = total % Level::TICKS_PER_DAY;
-            long day     = total / Level::TICKS_PER_DAY;
-
-            std::ostringstream out;
-            if      (what == "daytime")  { out << "The time of day is " << daytime; }
-            else if (what == "gametime") { out << "The game time is "   << total;   }
-            else if (what == "day")      { out << "The day is "         << day;     }
-            else return std::string("Unknown query: ") + what;
-            return out.str();
-        }
-
-        return "Unknown sub-command. Usage: /time <add|set|query> ...";
-    }
-
-    return std::string("Unknown command: /") + args[0];
-}
-
 // ---------------------------------------------------------------------------
 // render
 // ---------------------------------------------------------------------------

src/client/gui/screens/ConsoleScreen.h

@@ -25,7 +25,6 @@ public:
 
 private:
     void execute();
-    std::string processCommand(const std::string& cmd);
 
     std::string _input;
     int         _cursorBlink; // tick counter for cursor blink

src/client/gui/screens/CreditsScreen.cpp

@@ -28,6 +28,7 @@ void CreditsScreen::init() {
     buttons.push_back(bHeader);
     buttons.push_back(btnBack);
 
+    // TODO: rewrite it
     // prepare text lines
     _lines.clear();
     _lines.push_back("Minecraft: Pocket Edition");
@@ -39,6 +40,7 @@ void CreditsScreen::init() {
     _lines.push_back("Kolyah35");
     _lines.push_back("karson");
     _lines.push_back("deepfriedwaffles");
+    _lines.push_back("EpikIzCool");
     _lines.push_back("");
     // avoid color tags around the URL so it isn't mangled by the parser please
     _lines.push_back("Join our Discord server: https://discord.gg/c58YesBxve");

src/client/gui/screens/DeathScreen.cpp

@@ -23,7 +23,7 @@ DeathScreen::~DeathScreen()
 
 void DeathScreen::init()
 {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bRespawn = new Touch::TButton(1, "Respawn!");
 		bTitle = new Touch::TButton(2, "Main menu");
 	} else {

src/client/gui/screens/DisconnectionScreen.h

@@ -21,7 +21,7 @@ public:
 	}
 
 	void init() {
-		if (minecraft->useTouchscreen())
+		if (/* minecraft->useTouchscreen() */ true)
 			_back = new Touch::TButton(1, "Ok");
 		else
 			_back = new Button(1, "Ok");

src/client/gui/screens/InBedScreen.cpp

@@ -17,7 +17,7 @@ InBedScreen::~InBedScreen() {
 }
 
 void InBedScreen::init() {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bWakeUp = new Touch::TButton(1, "Leave Bed");
 	} else {
 		bWakeUp = new Button(1, "Leave Bed");

src/client/gui/screens/OptionsScreen.cpp

@@ -19,7 +19,6 @@ OptionsScreen::OptionsScreen()
 }
 
 OptionsScreen::~OptionsScreen() {
-
 	if (btnClose != NULL) {
 		delete btnClose;
 		btnClose = NULL;
@@ -53,7 +52,6 @@ OptionsScreen::~OptionsScreen() {
 }
 
 void OptionsScreen::init() {
-
 	bHeader = new Touch::THeader(0, "Options");
 
 	btnClose = new ImageButton(1, "");
@@ -89,7 +87,6 @@ void OptionsScreen::init() {
 }
 
 void OptionsScreen::setupPositions() {
-
 	int buttonHeight = btnClose->height;
 
 	btnClose->x = width - btnClose->width;
@@ -134,7 +131,6 @@ void OptionsScreen::setupPositions() {
 
 
 void OptionsScreen::render(int xm, int ym, float a) {
-
 	renderBackground();
 
 	int xmm = xm * width / minecraft->width;
@@ -150,10 +146,13 @@ void OptionsScreen::removed() {
 }
 
 void OptionsScreen::buttonClicked(Button* button) {
-
 	if (button == btnClose) {
 		minecraft->options.save();
-		minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
+		if (minecraft->screen != NULL) {
+			minecraft->setScreen(NULL);
+		} else {
+			minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
+		}
 	}
 	else if (button->id > 1 && button->id < 7) {
 		int categoryButton = button->id - categoryButtons[0]->id;
@@ -165,7 +164,6 @@ void OptionsScreen::buttonClicked(Button* button) {
 }
 
 void OptionsScreen::selectCategory(int index) {
-
 	int currentIndex = 0;
 
 	for (std::vector<Touch::TButton*>::iterator it = categoryButtons.begin(); it != categoryButtons.end(); ++it) {
@@ -209,7 +207,8 @@ void OptionsScreen::generateOptionScreens() {
 
 	// // Controls Pane
 	optionPanes[2]->addOptionItem(OPTIONS_INVERT_Y_MOUSE, minecraft)
-		.addOptionItem(OPTIONS_USE_TOUCHSCREEN, minecraft);
+		.addOptionItem(OPTIONS_USE_TOUCHSCREEN, minecraft)
+		.addOptionItem(OPTIONS_AUTOJUMP, minecraft);
 
 	for (int i = OPTIONS_KEY_FORWARD; i <= OPTIONS_KEY_USE; i++) {
 		optionPanes[2]->addOptionItem((OptionId)i, minecraft);
@@ -230,7 +229,6 @@ void OptionsScreen::generateOptionScreens() {
 }
 
 void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {
-
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->mouseClicked(minecraft, x, y, buttonNum);
 
@@ -238,7 +236,6 @@ void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {
 }
 
 void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
-
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->mouseReleased(minecraft, x, y, buttonNum);
 

src/client/gui/screens/PauseScreen.cpp

@@ -5,12 +5,16 @@
 #include "../../../util/Mth.h"
 #include "../../../network/RakNetInstance.h"
 #include "../../../network/ServerSideNetworkHandler.h"
+#include "client/Options.h"
+#include "client/gui/components/Button.h"
+#include "client/gui/screens/OptionsScreen.h"
 
 PauseScreen::PauseScreen(bool wasBackPaused)
 :	saveStep(0),
 	visibleTime(0),
 	bContinue(0),
 	bQuit(0),
+	bOptions(0),
 	bQuitAndSaveLocally(0),
 	bServerVisibility(0),
 //	bThirdPerson(0),
@@ -39,18 +43,21 @@ PauseScreen::~PauseScreen() {
 	delete bQuit;
 	delete bQuitAndSaveLocally;
 	delete bServerVisibility;
+	delete bOptions;
 //	delete bThirdPerson;
 }
 
 void PauseScreen::init() {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bContinue = new Touch::TButton(1, "Back to game");
+		bOptions = new Touch::TButton(5, "Options");
 		bQuit = new Touch::TButton(2, "Quit to title");
 		bQuitAndSaveLocally = new Touch::TButton(3, "Quit and copy map");
 		bServerVisibility = new Touch::TButton(4, "");
 //		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
 	} else {
 		bContinue = new Button(1, "Back to game");
+		bOptions = new Button(5, "Options");
 		bQuit = new Button(2, "Quit to title");
 		bQuitAndSaveLocally = new Button(3, "Quit and copy map");
 		bServerVisibility = new Button(4, "");
@@ -59,7 +66,7 @@ void PauseScreen::init() {
 
 	buttons.push_back(bContinue);
 	buttons.push_back(bQuit);
-
+	buttons.push_back(bOptions);
 	// bSound.updateImage(&minecraft->options);
 	bThirdPerson.updateImage(&minecraft->options);
 	bHideGui.updateImage(&minecraft->options);
@@ -99,21 +106,24 @@ void PauseScreen::setupPositions() {
     saveStep = 0;
 	int yBase = 16;
 
-	bContinue->width = bQuit->width = /*bThirdPerson->w =*/ 160;
+	bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
 	bQuitAndSaveLocally->width = bServerVisibility->width = 160;
 
 	bContinue->x = (width - bContinue->width) / 2;
 	bContinue->y = yBase + 32 * 1;
 
+	bOptions->x = (width - bOptions->width) / 2;
+	bOptions->y = yBase + 32 * 2;
+
 	bQuit->x = (width - bQuit->width) / 2;
-	bQuit->y = yBase + 32 * 2;
+	bQuit->y = yBase + 32 * 3;
 
 #if APPLE_DEMO_PROMOTION
     bQuit->y += 16;
 #endif
     
 	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 3;
+	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
 
 	// bSound.y = bThirdPerson.y = 8;
 	// bSound.x = 4;
@@ -157,7 +167,9 @@ void PauseScreen::buttonClicked(Button* button) {
 	if (button->id == bQuitAndSaveLocally->id) {
 		minecraft->leaveGame(true);
 	}
-
+	if (button->id == bOptions->id) {
+		minecraft->setScreen(new OptionsScreen());
+	}
 	if (button->id == bServerVisibility->id) {
 		if (minecraft->raknetInstance && minecraft->netCallback && minecraft->raknetInstance->isServer()) {
 			ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) minecraft->netCallback;

src/client/gui/screens/PauseScreen.h

@@ -33,7 +33,9 @@ private:
 	Button* bQuit;
 	Button* bQuitAndSaveLocally;
 	Button* bServerVisibility;
-//	Button* bThirdPerson;
+	Button* bOptions;
+
+	//	Button* bThirdPerson;
 
 	// OptionButton bSound;
 	OptionButton bThirdPerson;

src/client/gui/screens/ProgressScreen.h

@@ -11,6 +11,8 @@ public:
 	void render(int xm, int ym, float a);
 	bool isInGameScreen();
 
+	virtual void keyPressed(int eventKey) {}
+
 	void tick();
 private:
 	int ticks;

src/client/gui/screens/ScreenChooser.cpp

@@ -21,7 +21,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 	Screen* screen = NULL;
 
 	// :sob:
-	if (_mc->useTouchscreen()) {
+	if (/* _mc->useTouchscreen() */ true) {
 		switch (id) {
 		case SCREEN_STARTMENU:	     screen = new Touch::StartMenuScreen();	break;
 		case SCREEN_SELECTWORLD:     screen = new Touch::SelectWorldScreen();break;

src/client/gui/screens/SimpleChooseLevelScreen.cpp

@@ -56,7 +56,7 @@ void SimpleChooseLevelScreen::init()
         def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
         bBack->setImageDef(def, true);
     }
-    if (minecraft->useTouchscreen()) {
+    if (/* minecraft->useTouchscreen() */ true) {
         bGamemode = new Touch::TButton(1, "Survival mode");
         bCheats  = new Touch::TButton(4, "Cheats: Off");
         bCreate  = new Touch::TButton(3, "Create");

src/client/gui/screens/crafting/PaneCraftingScreen.cpp

@@ -16,7 +16,12 @@
 #include "../../../../world/level/Level.h"
 #include "../../../../world/item/DyePowderItem.h"
 #include "../../../../world/item/crafting/Recipe.h"
+#include "network/RakNetInstance.h"
+#include "network/packet/WantCreatePacket.h"
 #include "platform/input/Keyboard.h"
+#include <cstdint>
+#include <iostream>
+#include <string>
 
 static NinePatchLayer* guiPaneFrame = NULL;
 
@@ -41,7 +46,7 @@ public:
 		//fill(x+1, y+1, x+w-1, y+h-1, 0xff999999);
 		
 		bool hovered = active && (minecraft->useTouchscreen()?
-			(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+			(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
 
 		if (hovered || *selectedPtr == this)
 			statePressed->draw(Tesselator::instance, (float)x, (float)y);
@@ -193,6 +198,26 @@ void PaneCraftingScreen::setupPositions() {
 }
 
 void PaneCraftingScreen::tick() {
+	if (minecraft->isOnline()) {
+		// TODO: Make better algorithm
+		static std::map<uint8_t, uint16_t> oldMap = {};
+		std::map<uint8_t, uint16_t> newMap = {};
+
+		for (int i = Inventory::MAX_SELECTION_SIZE; i < minecraft->player->inventory->getContainerSize(); ++i) {
+			auto itm = minecraft->player->inventory->getItem(i);
+
+			if (itm != NULL) {
+				newMap[itm->id] += itm->count;
+			}
+		}
+
+		if (oldMap != newMap) {
+			oldMap = newMap;
+			newMap = {};
+			recheckRecipes();
+		}
+	}
+
 	if (pane) pane->tick();
 }
 
@@ -439,25 +464,29 @@ void PaneCraftingScreen::craftSelectedItem()
 	ItemInstance resultItem = currentItem->item;
 
 	if (minecraft->player) {
+		if (minecraft->isOnline()) {
+			WantCreatePacket packet(minecraft->player->entityId, resultItem.count, resultItem.getAuxValue(), resultItem.id);
+			minecraft->raknetInstance->send(packet);
+		}
 		// Remove all items required for the recipe and ...
 		for (unsigned int i = 0; i < currentItem->neededItems.size(); ++i) {
 			CItem::ReqItem& req = currentItem->neededItems[i];
 
-            // If the recipe allows any aux-value as ingredients, first deplete
-            // aux == 0 from inventory. Since I'm not sure if this always is
-            // correct, let's only do it for ingredient sandstone for now.
-            ItemInstance toRemove = req.item;
+			// If the recipe allows any aux-value as ingredients, first deplete
+			// aux == 0 from inventory. Since I'm not sure if this always is
+			// correct, let's only do it for ingredient sandstone for now.
+			ItemInstance toRemove = req.item;
 
-            if (Tile::sandStone->id == req.item.id
-             && Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
-                 toRemove.setAuxValue(0);
-                 toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
-                 toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
-            }
+			if (Tile::sandStone->id == req.item.id
+			&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
+				toRemove.setAuxValue(0);
+				toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
+				toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
+			}
 
-            if (toRemove.count > 0) {
-                minecraft->player->inventory->removeResource(toRemove);
-            }
+			if (toRemove.count > 0) {
+				minecraft->player->inventory->removeResource(toRemove);
+			}
 		}
 		// ... add the new one! (in this order, to fill empty slots better)
 		// if it doesn't fit, throw it on the ground!
@@ -547,7 +576,7 @@ void CraftButton::renderBg(Minecraft* minecraft, int xm, int ym) {
 	//fill(x+1, y+1, x+w-1, y+h-1, 0xff999999);
 
 	bool hovered = active && (minecraft->useTouchscreen()?
-		(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+		(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
 
 	if (hovered || selected)
 		bgSelected->draw(Tesselator::instance, (float)x, (float)y);

src/client/gui/screens/touch/TouchIngameBlockSelectionScreen.cpp

@@ -1,291 +1,293 @@
-#include "TouchIngameBlockSelectionScreen.h"
-#include "../crafting/WorkbenchScreen.h"
-#include "../../Screen.h"
-#include "../../components/ImageButton.h"
-#include "../../components/InventoryPane.h"
-#include "../../../gamemode/GameMode.h"
-#include "../../../renderer/TileRenderer.h"
-#include "../../../player/LocalPlayer.h"
-#include "../../../renderer/gles.h"
-#include "../../../renderer/entity/ItemRenderer.h"
-#include "../../../renderer/Tesselator.h"
-#include "../../../renderer/Textures.h"
-#include "../../../Minecraft.h"
-#include "../../../sound/SoundEngine.h"
-#include "../../../../world/entity/player/Inventory.h"
-#include "../../../../platform/input/Mouse.h"
-#include "../../../../util/Mth.h"
-#include "../../../../world/item/ItemInstance.h"
-#include "../../../../world/entity/player/Player.h"
-#include "../../../../world/item/crafting/Recipe.h"
-#include "../../../player/input/touchscreen/TouchAreaModel.h"
-#include "../ArmorScreen.h"
-
-namespace Touch {
-
-#if defined(__APPLE__)
-    static const std::string demoVersionString("Not available in the Lite version");
-#else
-    static const std::string demoVersionString("Not available in the demo version");
-#endif
-
-#ifdef __APPLE__
-    static const float BorderPixels = 4;
-    #ifdef DEMO_MODE
-        static const float BlockPixels = 22;
-    #else
-        static const float BlockPixels = 22;
-    #endif
-#else
-    static const float BorderPixels = 4;
-    static const float BlockPixels = 24;
-#endif
-
-static const int ItemSize = (int)(BlockPixels + 2*BorderPixels);
-
-static const int Bx = 10; // Border Frame width
-static const int By = 6; // Border Frame height
-    
-//
-// Block selection screen
-//
-IngameBlockSelectionScreen::IngameBlockSelectionScreen() 
-:	selectedItem(0),
-	_blockList(NULL),
-	_pendingClose(false),
-	bArmor  (4, "Armor"),
-	bDone   (3, ""),
-	//bDone   (3, "Done"),
-	bMenu   (2, "Menu"),
-	bCraft  (1, "Craft"),
-	bHeader (0, "Select blocks")
-{
-}
-
-IngameBlockSelectionScreen::~IngameBlockSelectionScreen()
-{
-	delete _blockList;
-}
-
-void IngameBlockSelectionScreen::init()
-{
-	Inventory* inventory = minecraft->player->inventory;
-
-	//const int itemWidth = 2 * BorderPixels + 
-
-	int maxWidth = width - Bx - Bx;
-	InventoryColumns = maxWidth / ItemSize;
-	const int realWidth = InventoryColumns * ItemSize;
-	const int realBx = (width - realWidth) / 2;
-
-	IntRectangle rect(realBx,
-#ifdef __APPLE__
-		24 + By - ((width==240)?1:0), realWidth, ((width==240)?1:0) + height-By-By-20-24);
-#else
-		24 + By, realWidth, height-By-By-20-24);
-#endif
-
-	_blockList = new InventoryPane(this, minecraft, rect, width, BorderPixels, inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE, ItemSize, (int)BorderPixels);
-	_blockList->fillMarginX = realBx;
-
-	//for (int i = 0; i < inventory->getContainerSize(); ++i)
-		//LOGI("> %d - %s\n", i, inventory->getItem(i)? inventory->getItem(i)->getDescriptionId().c_str() : "<-->\n");
-
-	InventorySize = inventory->getContainerSize();
-	InventoryRows = 1 + (InventorySize-1) / InventoryColumns;
-
-    //
-    // Buttons
-    //
-	ImageDef def;
-	def.name = "gui/spritesheet.png";
-	def.x = 0;
-	def.y = 1;
-	def.width = def.height = 18;
-	def.setSrc(IntRectangle(60, 0, 18, 18));
-	bDone.setImageDef(def, true);
-    bDone.width = bDone.height = 19;
-
-	bDone.scaleWhenPressed = false;
-
-	buttons.push_back(&bHeader);
-	buttons.push_back(&bDone);
-	if (!minecraft->isCreativeMode()) {
-		buttons.push_back(&bCraft);
-		buttons.push_back(&bArmor);
-	}
-}
-
-void IngameBlockSelectionScreen::setupPositions() {
-	bHeader.y = bDone.y = bCraft.y = 0;
-	bDone.x   = width -  bDone.width;
-	bCraft.x  = 0;//width - bDone.w - bCraft.w;
-	bCraft.width = bArmor.width = 48;
-	bArmor.x = bCraft.width;
-
-	if (minecraft->isCreativeMode()) {
-		bHeader.x = 0;
-		bHeader.width = width;// -  bDone.w;
-		bHeader.xText = width/2; // Center of the screen
-	} else {
-		bHeader.x = bCraft.width + bArmor.width;
-		bHeader.width = width - bCraft.width - bArmor.width;// -  bDone.w;
-		bHeader.xText = bHeader.x + (bHeader.width - bDone.width) /2;
-	}
-
-	clippingArea.x = 0;
-	clippingArea.w = minecraft->width;
-	clippingArea.y = 0;
-	clippingArea.h = (int)(Gui::GuiScale * 24);
-}
-
-void IngameBlockSelectionScreen::removed()
-{
-	minecraft->gui.inventoryUpdated();
-}
-
-int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
-    // @todo: Number of columns
-	return width / 2 - InventoryColumns * 10 + slotX * 20 + 2;
-}
-
-int IngameBlockSelectionScreen::getSlotPosY(int slotY) {
-	return height - 16 - 3 - 22 * 2 - 22 * slotY;
-}
-
-int IngameBlockSelectionScreen::getSlotHeight() {
-	// same as non-touch implementation
-	return 22;
-}
-
-void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum) {
-	_pendingClose = _blockList->_clickArea->isInside((float)x, (float)y);
-	if (!_pendingClose)
-		super::mouseClicked(x, y, buttonNum);
-}
-
-void IngameBlockSelectionScreen::mouseReleased(int x, int y, int buttonNum) {
-	if (_pendingClose && _blockList->_clickArea->isInside((float)x, (float)y))
-		minecraft->setScreen(NULL);
-	else
-		super::mouseReleased(x, y, buttonNum);
-}
-
-void IngameBlockSelectionScreen::mouseWheel(int dx, int dy, int xm, int ym)
-{
-	if (dy == 0) return;
-	if (_blockList) {
-		float amount = -dy * getSlotHeight();
-		_blockList->scrollBy(0, amount);
-	}
-	int cols = InventoryColumns;
-	int maxIndex = InventorySize - 1;
-	int idx = selectedItem;
-	if (dy > 0) {
-		if (idx >= cols) idx -= cols;
-	} else {
-		if (idx + cols <= maxIndex) idx += cols;
-	}
-	selectedItem = idx;
-}
-
-bool IngameBlockSelectionScreen::addItem(const InventoryPane* pane, int itemId)
-{
-	Inventory* inventory = minecraft->player->inventory;
-	itemId += Inventory::MAX_SELECTION_SIZE;
-
-	if (!inventory->getItem(itemId))
-		return false;
-
-	inventory->moveToSelectionSlot(0, itemId, true);
-
-	inventory->selectSlot(0);
-#ifdef __APPLE__
-	minecraft->soundEngine->playUI("random.pop", 0.3f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
-#else
-    minecraft->soundEngine->playUI("random.pop2", 1.0f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
-#endif
-
-	// Flash the selected gui item
-	minecraft->gui.flashSlot(inventory->selected);
-    return true;
-}
-
-void IngameBlockSelectionScreen::tick()
-{
-	_blockList->tick();
-	super::tick();
-}
-
-void IngameBlockSelectionScreen::render( int xm, int ym, float a )
-{
-	glDisable2(GL_DEPTH_TEST);
-	glEnable2(GL_BLEND);
-
-	Screen::render(xm, ym, a);
-	_blockList->render(xm, ym, a);
-
-	// render frame
-	IntRectangle& bbox = _blockList->rect;
-	Tesselator::instance.colorABGR(0xffffffff);
-	minecraft->textures->loadAndBindTexture("gui/itemframe.png");
-	glEnable2(GL_BLEND);
-	glColor4f2(1, 1, 1, 1);
-	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	blit(0, bbox.y-By, 0, 0, width, bbox.h+By+By, 215, 256); // why bbox.h + 1*B?
-	glDisable2(GL_BLEND);
-
-	glEnable2(GL_DEPTH_TEST);
-}
-
-void IngameBlockSelectionScreen::renderDemoOverlay() {
-#ifdef DEMO_MODE
-	fill(	getSlotPosX(0) - 3, getSlotPosY(1) - 3,
-			getSlotPosX(9) - 3, getSlotPosY(-1) - 3, 0xa0 << 24);
-
-	const int centerX = (getSlotPosX(4) + getSlotPosX(5)) / 2;
-	const int centerY = (getSlotPosY(0) + getSlotPosY(1)) / 2 + 5;
-	drawCenteredString(minecraft->font, demoVersionString, centerX, centerY, 0xffffffff);
-#endif /*DEMO_MODE*/
-}
-
-void IngameBlockSelectionScreen::buttonClicked(Button* button) {
-	if (button->id == bDone.id)
-		minecraft->setScreen(NULL);
-
-    if (button->id == bMenu.id)
-        minecraft->screenChooser.setScreen(SCREEN_PAUSE);
-
-	if (button->id == bCraft.id)
-		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
-
-	if (button == &bArmor)
-		minecraft->setScreen(new ArmorScreen());
-}
-
-bool IngameBlockSelectionScreen::isAllowed( int slot )
-{
-	if (slot < 0 || slot >= minecraft->player->inventory->getContainerSize())
-		return false;
-
-#ifdef DEMO_MODE
-	if (slot >= (minecraft->isCreativeMode()? 28 : 27)) return false;
-#endif
-	return true;
-}
-
-bool IngameBlockSelectionScreen::hasClippingArea( IntRectangle& out )
-{
-	out = clippingArea;
-	return true;
-}
-
-std::vector<const ItemInstance*> IngameBlockSelectionScreen::getItems( const InventoryPane* forPane )
-{
-	std::vector<const ItemInstance*> out;
-	for (int i = Inventory::MAX_SELECTION_SIZE; i < minecraft->player->inventory->getContainerSize(); ++i)
-		out.push_back(minecraft->player->inventory->getItem(i));
-	return out;
-}
-
-}
+#include "TouchIngameBlockSelectionScreen.h"
+#include "../crafting/WorkbenchScreen.h"
+#include "../../Screen.h"
+#include "../../components/ImageButton.h"
+#include "../../components/InventoryPane.h"
+#include "../../../gamemode/GameMode.h"
+#include "../../../renderer/TileRenderer.h"
+#include "../../../player/LocalPlayer.h"
+#include "../../../renderer/gles.h"
+#include "../../../renderer/entity/ItemRenderer.h"
+#include "../../../renderer/Tesselator.h"
+#include "../../../renderer/Textures.h"
+#include "../../../Minecraft.h"
+#include "../../../sound/SoundEngine.h"
+#include "../../../../world/entity/player/Inventory.h"
+#include "../../../../platform/input/Mouse.h"
+#include "../../../../util/Mth.h"
+#include "../../../../world/item/ItemInstance.h"
+#include "../../../../world/entity/player/Player.h"
+#include "../../../../world/item/crafting/Recipe.h"
+#include "../../../player/input/touchscreen/TouchAreaModel.h"
+#include "../ArmorScreen.h"
+
+namespace Touch {
+
+#if defined(__APPLE__)
+    static const std::string demoVersionString("Not available in the Lite version");
+#else
+    static const std::string demoVersionString("Not available in the demo version");
+#endif
+
+#ifdef __APPLE__
+    static const float BorderPixels = 4;
+    #ifdef DEMO_MODE
+        static const float BlockPixels = 22;
+    #else
+        static const float BlockPixels = 22;
+    #endif
+#else
+    static const float BorderPixels = 4;
+    static const float BlockPixels = 24;
+#endif
+
+static const int ItemSize = (int)(BlockPixels + 2*BorderPixels);
+
+static const int Bx = 10; // Border Frame width
+static const int By = 6; // Border Frame height
+    
+//
+// Block selection screen
+//
+IngameBlockSelectionScreen::IngameBlockSelectionScreen() 
+:	selectedItem(0),
+	_blockList(NULL),
+	_pendingClose(false),
+	bArmor  (4, "Armor"),
+	bDone   (3, ""),
+	//bDone   (3, "Done"),
+	bMenu   (2, "Menu"),
+	bCraft  (1, "Craft"),
+	bHeader (0, "Select blocks")
+{
+}
+
+IngameBlockSelectionScreen::~IngameBlockSelectionScreen()
+{
+	delete _blockList;
+}
+
+void IngameBlockSelectionScreen::init()
+{
+	Inventory* inventory = minecraft->player->inventory;
+
+	//const int itemWidth = 2 * BorderPixels + 
+
+	int maxWidth = width - Bx - Bx;
+	InventoryColumns = maxWidth / ItemSize;
+	const int realWidth = InventoryColumns * ItemSize;
+	const int realBx = (width - realWidth) / 2;
+
+	IntRectangle rect(realBx,
+#ifdef __APPLE__
+		24 + By - ((width==240)?1:0), realWidth, ((width==240)?1:0) + height-By-By-20-24);
+#else
+		24 + By, realWidth, height-By-By-20-24);
+#endif
+
+	_blockList = new InventoryPane(this, minecraft, rect, width, BorderPixels, inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE, ItemSize, (int)BorderPixels);
+	_blockList->fillMarginX = realBx;
+
+	//for (int i = 0; i < inventory->getContainerSize(); ++i)
+		//LOGI("> %d - %s\n", i, inventory->getItem(i)? inventory->getItem(i)->getDescriptionId().c_str() : "<-->\n");
+
+	// Grid indices are 0..N-1 for main inventory only; slots 0..MAX_SELECTION_SIZE-1 are hotbar links.
+	InventorySize = inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE;
+	InventoryRows = 1 + (InventorySize-1) / InventoryColumns;
+
+    //
+    // Buttons
+    //
+	ImageDef def;
+	def.name = "gui/spritesheet.png";
+	def.x = 0;
+	def.y = 1;
+	def.width = def.height = 18;
+	def.setSrc(IntRectangle(60, 0, 18, 18));
+	bDone.setImageDef(def, true);
+    bDone.width = bDone.height = 19;
+
+	bDone.scaleWhenPressed = false;
+
+	buttons.push_back(&bHeader);
+	buttons.push_back(&bDone);
+	if (!minecraft->isCreativeMode()) {
+		buttons.push_back(&bCraft);
+		buttons.push_back(&bArmor);
+	}
+}
+
+void IngameBlockSelectionScreen::setupPositions() {
+	bHeader.y = bDone.y = bCraft.y = 0;
+	bDone.x   = width -  bDone.width;
+	bCraft.x  = 0;//width - bDone.w - bCraft.w;
+	bCraft.width = bArmor.width = 48;
+	bArmor.x = bCraft.width;
+
+	if (minecraft->isCreativeMode()) {
+		bHeader.x = 0;
+		bHeader.width = width;// -  bDone.w;
+		bHeader.xText = width/2; // Center of the screen
+	} else {
+		bHeader.x = bCraft.width + bArmor.width;
+		bHeader.width = width - bCraft.width - bArmor.width;// -  bDone.w;
+		bHeader.xText = bHeader.x + (bHeader.width - bDone.width) /2;
+	}
+
+	clippingArea.x = 0;
+	clippingArea.w = minecraft->width;
+	clippingArea.y = 0;
+	clippingArea.h = (int)(Gui::GuiScale * 24);
+}
+
+void IngameBlockSelectionScreen::removed()
+{
+	minecraft->gui.inventoryUpdated();
+}
+
+int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
+    // @todo: Number of columns
+	return width / 2 - InventoryColumns * 10 + slotX * 20 + 2;
+}
+
+int IngameBlockSelectionScreen::getSlotPosY(int slotY) {
+	return height - 16 - 3 - 22 * 2 - 22 * slotY;
+}
+
+int IngameBlockSelectionScreen::getSlotHeight() {
+	// same as non-touch implementation
+	return 22;
+}
+
+void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum) {
+	_pendingClose = _blockList->_clickArea->isInside((float)x, (float)y);
+	if (!_pendingClose)
+		super::mouseClicked(x, y, buttonNum);
+}
+
+void IngameBlockSelectionScreen::mouseReleased(int x, int y, int buttonNum) {
+	if (_pendingClose && _blockList->_clickArea->isInside((float)x, (float)y))
+		minecraft->setScreen(NULL);
+	else
+		super::mouseReleased(x, y, buttonNum);
+}
+
+void IngameBlockSelectionScreen::mouseWheel(int dx, int dy, int xm, int ym)
+{
+	if (dy == 0) return;
+	if (_blockList) {
+		float amount = -dy * getSlotHeight();
+		_blockList->scrollBy(0, amount);
+	}
+	int cols = InventoryColumns;
+	int maxIndex = InventorySize - 1;
+	int idx = selectedItem;
+	if (dy > 0) {
+		if (idx >= cols) idx -= cols;
+	} else {
+		if (idx + cols <= maxIndex) idx += cols;
+	}
+	selectedItem = idx;
+}
+
+bool IngameBlockSelectionScreen::addItem(const InventoryPane* pane, int itemId)
+{
+	Inventory* inventory = minecraft->player->inventory;
+	itemId += Inventory::MAX_SELECTION_SIZE;
+
+	if (!inventory->getItem(itemId))
+		return false;
+
+	inventory->moveToSelectionSlot(0, itemId, true);
+
+	inventory->selectSlot(0);
+#ifdef __APPLE__
+	minecraft->soundEngine->playUI("random.pop", 0.3f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
+#else
+    minecraft->soundEngine->playUI("random.pop2", 1.0f, 0.3f);//1.0f + 0.2f*(Mth::random()-Mth::random()));
+#endif
+
+	// Flash the selected gui item
+	minecraft->gui.flashSlot(inventory->selected);
+    return true;
+}
+
+void IngameBlockSelectionScreen::tick()
+{
+	_blockList->tick();
+	super::tick();
+}
+
+void IngameBlockSelectionScreen::render( int xm, int ym, float a )
+{
+	glDisable2(GL_DEPTH_TEST);
+	glEnable2(GL_BLEND);
+
+	Screen::render(xm, ym, a);
+	_blockList->render(xm, ym, a);
+
+	// render frame
+	IntRectangle& bbox = _blockList->rect;
+	Tesselator::instance.colorABGR(0xffffffff);
+	minecraft->textures->loadAndBindTexture("gui/itemframe.png");
+	glEnable2(GL_BLEND);
+	glColor4f2(1, 1, 1, 1);
+	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	blit(0, bbox.y-By, 0, 0, width, bbox.h+By+By, 215, 256); // why bbox.h + 1*B?
+	glDisable2(GL_BLEND);
+
+	glEnable2(GL_DEPTH_TEST);
+}
+
+void IngameBlockSelectionScreen::renderDemoOverlay() {
+#ifdef DEMO_MODE
+	fill(	getSlotPosX(0) - 3, getSlotPosY(1) - 3,
+			getSlotPosX(9) - 3, getSlotPosY(-1) - 3, 0xa0 << 24);
+
+	const int centerX = (getSlotPosX(4) + getSlotPosX(5)) / 2;
+	const int centerY = (getSlotPosY(0) + getSlotPosY(1)) / 2 + 5;
+	drawCenteredString(minecraft->font, demoVersionString, centerX, centerY, 0xffffffff);
+#endif /*DEMO_MODE*/
+}
+
+void IngameBlockSelectionScreen::buttonClicked(Button* button) {
+	if (button->id == bDone.id)
+		minecraft->setScreen(NULL);
+
+    if (button->id == bMenu.id)
+        minecraft->screenChooser.setScreen(SCREEN_PAUSE);
+
+	if (button->id == bCraft.id)
+		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
+
+	if (button == &bArmor)
+		minecraft->setScreen(new ArmorScreen());
+}
+
+bool IngameBlockSelectionScreen::isAllowed( int slot )
+{
+	const int gridCount = minecraft->player->inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE;
+	if (slot < 0 || slot >= gridCount)
+		return false;
+
+#ifdef DEMO_MODE
+	if (slot >= (minecraft->isCreativeMode()? 28 : 27)) return false;
+#endif
+	return true;
+}
+
+bool IngameBlockSelectionScreen::hasClippingArea( IntRectangle& out )
+{
+	out = clippingArea;
+	return true;
+}
+
+std::vector<const ItemInstance*> IngameBlockSelectionScreen::getItems( const InventoryPane* forPane )
+{
+	std::vector<const ItemInstance*> out;
+	for (int i = Inventory::MAX_SELECTION_SIZE; i < minecraft->player->inventory->getContainerSize(); ++i)
+		out.push_back(minecraft->player->inventory->getItem(i));
+	return out;
+}
+
+}

src/client/player/LocalPlayer.cpp

@@ -28,6 +28,7 @@
 
 #if defined(_WIN32)
 #include <direct.h>
+#include <sys/stat.h>
 #else
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -387,6 +388,12 @@ void LocalPlayer::calculateFlight(float xa, float ya, float za) {
     ya = 0;
     za = za * flySpeed;
 
+    if (sprinting) {
+        float sprintBoost = getWalkingSpeedModifier(); // 1.3x
+        xa *= sprintBoost;
+        za *= sprintBoost;
+    }
+
 #ifdef ANDROID
     if (Keyboard::isKeyDown(103)) ya = .2f * flySpeed;
     if (Keyboard::isKeyDown(102)) ya = -.2f * flySpeed;
@@ -449,7 +456,7 @@ void LocalPlayer::tick() {
 		{
 			sentInventoryItemId   = newItemId;
 			sentInventoryItemData = newItemData;
-			PlayerEquipmentPacket packet(entityId, newItemId, newItemData);
+			PlayerEquipmentPacket packet(entityId, newItemId, newItemData, inventory->selected, inventory->getSlot(newItemId, newItemData));
 			minecraft->raknetInstance->send(packet);
 		}
 	}
@@ -505,7 +512,7 @@ void LocalPlayer::aiStep() {
 		if (sprintDoubleTapTimer > 0) sprintDoubleTapTimer--;
 		prevForwardHeld = forwardHeld;
 	}
-	if (input->sneaking || abilities.flying)
+	if (input->sneaking)
 		sprinting = false;
 
     if (input->sneaking) {

src/client/player/input/KeyboardInput.cpp

@@ -50,10 +50,8 @@ void KeyboardInput::tick( Player* player )
 		ya *= 0.3f;
 	}
 
-	#if defined(RPI) || defined(PLATFORM_DESKTOP)
-		wantUp = jumping;
-		wantDown = sneaking;
-	#endif
+	wantUp = jumping;
+	wantDown = sneaking;
 
 	if (keys[KEY_CRAFT])
 		player->startCrafting((int)player->x, (int)player->y, (int)player->z, Recipe::SIZE_2X2);

src/client/player/input/touchscreen/TouchscreenInput.cpp

@@ -164,7 +164,7 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
 
     float maxPixels = _minecraft->pixelCalc.millimetersToPixels(10);
     // float btnSize = Mth::Min(18 * Gui::GuiScale, maxPixels);
-	float btnSize = pc.millimetersToPixels(50);
+	float btnSize = pc.millimetersToPixels(18 * Gui::GuiScale);
 	_model.addArea(AREA_PAUSE, aPause = new RectangleArea(w - 4 - btnSize, 4, w - 4, 4 + btnSize));
 	_model.addArea(AREA_CHAT,  aChat  = new RectangleArea(w - 8 - btnSize * 2, 4, w - 8 - btnSize, 4 + btnSize));
 
@@ -320,6 +320,7 @@ void TouchscreenInput_TestFps::tick( Player* player )
 			if (Multitouch::isReleased(p)) {
                 _minecraft->soundEngine->playUI("random.click", 1, 1);
 				_minecraft->screenChooser.setScreen(SCREEN_CONSOLE);
+				_minecraft->platform()->showKeyboard();
             }
 		}
 

src/client/renderer/GameRenderer.cpp

@@ -153,7 +153,7 @@ void GameRenderer::render(float a) {
 
 	int xMouse = (int)(Mouse::getX() * Gui::InvGuiScale);
 	int yMouse = (int)(Mouse::getY() * Gui::InvGuiScale);
-#ifndef PLATFORM_DESKTOP
+
     if (mc->useTouchscreen()) {
 		const int pid = Multitouch::getFirstActivePointerIdExThisUpdate();
 		if (pid >= 0) {
@@ -164,7 +164,6 @@ void GameRenderer::render(float a) {
 			yMouse = -9999;
 		}
 	}
-#endif
 	TIMER_POP();
 
 	bool hasClearedColorBuffer = false;
@@ -361,9 +360,9 @@ void GameRenderer::renderLevel(float a) {
 			if (mc->hitResult.isHit() && !cameraEntity->isUnderLiquid(Material::water)) {
 				TIMER_POP_PUSH("select");
 				Player* player = (Player*) cameraEntity;
-				if (mc->useTouchscreen()) {
+				// if (mc->useTouchscreen()) {
 					levelRenderer->renderHitSelect(player, mc->hitResult, 0, NULL, a); //player.inventory->getSelected(), a);
-				}
+				// }
 				levelRenderer->renderHit(player, mc->hitResult, 0, NULL, a);//player->inventory.getSelected(), a);
 			}
 		}
@@ -657,11 +656,9 @@ void GameRenderer::pick(float a) {
 
     float range = mc->gameMode->getPickRange();
     bool isPicking = true;
-#ifndef PLATFORM_DESKTOP
-    bool freeform = mc->useTouchscreen()  && !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
-#else 
-    bool freeform = false;
-#endif
+
+    bool freeform = mc->useTouchscreen(); //&& !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
+    
     if (freeform) {
         isPicking = updateFreeformPickDirection(a, pickDirection);
     } else {

src/client/renderer/LevelRenderer.cpp

@@ -65,7 +65,7 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	destroyProgress(0)
 {
 #ifdef OPENGL_ES
-	int maxChunksWidth = 2 * LEVEL_WIDTH / CHUNK_SIZE + 1;
+	int maxChunksWidth = 2 * LevelConstants::LEVEL_WIDTH / CHUNK_SIZE + 1;
 	numListsOrBuffers = maxChunksWidth * maxChunksWidth * (128/CHUNK_SIZE) * 3;
 	chunkBuffers = new GLuint[numListsOrBuffers];
 	glGenBuffers2(numListsOrBuffers, chunkBuffers);

src/client/renderer/entity/PlayerRenderer.cpp

@@ -17,8 +17,8 @@ PlayerRenderer::PlayerRenderer( HumanoidModel* humanoidModel, float shadow )
 :	super(humanoidModel, shadow),
 	playerModel64(humanoidModel),
 	playerModel32(new HumanoidModel(0, 0, 64, 32)),
-	armorParts1(new HumanoidModel(1.0f, 0, 64, 64)),
-	armorParts2(new HumanoidModel(0.5f, 0, 64, 64))
+	armorParts1(new HumanoidModel(1.0f, 0, 64, 32)),
+	armorParts2(new HumanoidModel(0.5f, 0, 64, 32))
 {
 	// default to legacy skin path until we know the exact texture size
 	model = playerModel32;
@@ -77,10 +77,10 @@ void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot,
 		model = desired;
 		humanoidModel = desired;
 	}
-	// LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", 
-	// 	((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
-	// 	humanoidModel->texWidth, humanoidModel->texHeight,
-	// 	(desired == playerModel64 ? "64" : "32"));
+	/* LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", 
+		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
+		humanoidModel->texWidth, humanoidModel->texHeight,
+		(desired == playerModel64 ? "64" : "32")); */
 	HumanoidMobRenderer::render(mob_, x, y, z, rot, a);
 }
 

src/client/renderer/gles.h

@@ -31,7 +31,7 @@
 // #else
 //     // Uglyness to fix redeclaration issues
 //     #ifdef WIN32
-// 	   #include <WinSock2.h>
+// 	   #include <winsock2.h>
 // 	   #include <Windows.h>
 // 	#endif
 // 	#include <gl/glew.h>

src/commands/Command.cpp

@@ -0,0 +1,10 @@
+#include "Command.hpp"
+#include "world/level/Level.h"
+#include <client/Minecraft.h>
+
+bool Command::isPlayerOp(Minecraft& mc, Player& player) {
+    std::string nicknameLower = player.name;
+    std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
+
+    return mc.level->ops.find(nicknameLower) != mc.level->ops.end();
+}

src/commands/Command.hpp

@@ -0,0 +1,28 @@
+#pragma once
+#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);
+
+    virtual std::string execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) = 0;
+    virtual std::string help(Minecraft& mc) = 0;
+
+protected:
+    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

@@ -0,0 +1,52 @@
+#include "CommandBan.hpp"
+#include "commands/Command.hpp"
+#include "network/RakNetInstance.h"
+#include "raknet/RakPeerInterface.h"
+#include "world/level/Level.h"
+#include <algorithm>
+#include <client/Minecraft.h>
+
+CommandBan::CommandBan() : Command("ban") {}
+
+std::string CommandBan::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(), [args, nicknameLower] (auto& it) -> bool {
+        std::string lower = it->name;
+        std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
+
+        return lower == nicknameLower;
+    });
+
+    if (*it == (Player*)mc.player) {
+        return "ban: you can't ban urself lol";
+    }
+    
+    if (it != mc.level->players.end()) {
+        mc.level->removePlayer(*it);
+        (*it)->remove();
+        mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true);
+    } else {
+        for (auto& banned : mc.level->bannedPpl) {
+            if (nicknameLower == banned) {
+                return args[0] + "already banned!";
+            }
+        }
+    }
+
+    mc.level->bannedPpl.insert(nicknameLower);
+    return "ban: successfully banned player " + args[0];
+}
+
+std::string CommandBan::help(Minecraft& mc) {
+    return "Usage: /ban <player>";
+}

src/commands/CommandBan.hpp

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

src/commands/CommandHelp.cpp

@@ -0,0 +1,35 @@
+#include "CommandHelp.hpp"
+#include "commands/Command.hpp"
+#include "CommandManager.hpp"
+#include <client/Minecraft.h>
+#include <sstream>
+
+CommandHelp::CommandHelp() : Command("help") {}
+
+std::string CommandHelp::execute(Minecraft& mc, Player& player, const std::vector<std::string>& args) {
+    if (args.empty()) {
+        auto cmds = mc.commandManager().getListAllCommands();
+
+        std::ostringstream output;
+
+        output << "List of all commands:" << std::endl;
+        
+        for (auto& cmd : cmds) {
+            output << " - " + cmd << std::endl;;
+        }
+
+        return output.str();
+    }
+
+    Command* cmd = mc.commandManager().getCommand(args[0]);
+
+    if (cmd != nullptr) {
+        return cmd->help(mc);
+    }
+
+    return "help: command " + args[0] + " not found";
+}
+
+std::string CommandHelp::help(Minecraft& mc) {
+    return "Usage: /help <command>";
+}

src/commands/CommandHelp.hpp

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

src/commands/CommandKick.cpp

@@ -0,0 +1,46 @@
+#include "CommandKick.hpp"
+#include "commands/Command.hpp"
+#include "network/RakNetInstance.h"
+#include "raknet/RakPeerInterface.h"
+#include "world/level/Level.h"
+#include <algorithm>
+#include <client/Minecraft.h>
+
+CommandKick::CommandKick() : Command("kick") {}
+
+std::string CommandKick::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(), [args, nicknameLower] (auto& it) -> bool {
+        std::string lower = it->name;
+        std::transform(lower.begin(), lower.end(), lower.begin(), ::tolower);
+
+        return lower == nicknameLower;
+    });
+
+    if (it == mc.level->players.end()) {
+        return "kick: can't find player with name " + args[0];
+    }
+
+    if (*it == (Player*)mc.player) {
+        return "kick: you can't kick urself lol";
+    }
+
+    mc.level->removePlayer(*it);
+    (*it)->remove();
+    mc.raknetInstance->getPeer()->CloseConnection((*it)->owner, true);
+    return "kick: successfully kicked player " + args[0];
+}
+
+std::string CommandKick::help(Minecraft& mc) {
+    return "Usage: /kick <player>";
+}

src/commands/CommandKick.hpp

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

src/commands/CommandManager.cpp

@@ -0,0 +1,75 @@
+#include "CommandManager.hpp"
+#include <algorithm>
+#include <string>
+#include <vector>
+#include "client/Minecraft.h"
+#include "commands/Command.hpp"
+#include "commands/CommandHelp.hpp"
+#include "commands/CommandKick.hpp"
+#include "commands/CommandOp.hpp"
+#include "commands/CommandBan.hpp"
+#include "network/packet/ChatPacket.h"
+#include "network/RakNetInstance.h"
+#include "world/level/Level.h"
+
+CommandManager::CommandManager() {
+    registerAllCommands();
+}
+
+void CommandManager::registerAllCommands() {
+    m_commands.push_back(new CommandHelp());
+    m_commands.push_back(new CommandKick());
+    m_commands.push_back(new CommandOp());
+    m_commands.push_back(new CommandBan());
+}
+
+std::vector<std::string> CommandManager::getListAllCommands() {
+    std::vector<std::string> ret;
+
+    for (auto& cmd : m_commands) {
+        ret.push_back(cmd->getName());
+    }
+
+    return ret;
+}
+
+std::string CommandManager::execute(Minecraft& mc, Player& player, const std::string& input) {
+    std::istringstream ss(input);
+    std::string cmd;
+
+    ss >> cmd;
+
+    auto it = std::find_if(m_commands.begin(), m_commands.end(), [cmd](auto& it) -> bool {
+        return it->getName() == cmd;
+    });
+
+    if (it == m_commands.end()) {
+        return "Command /" + cmd + " not found";
+    }
+
+    std::vector<std::string> args;
+
+    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 "";
+}
+
+Command* CommandManager::getCommand(const std::string& name) {
+    auto it = std::find_if(m_commands.begin(), m_commands.end(), [name](auto& it) -> bool {
+        return it->getName() == name;
+    });
+
+    if (it == m_commands.end()) {
+        return *it;
+    }
+
+    return nullptr;
+}

src/commands/CommandManager.hpp

@@ -0,0 +1,21 @@
+#pragma once
+#include <string>
+#include <vector>
+
+#include "Command.hpp"
+
+class CommandManager {
+public:
+    CommandManager();
+
+    std::vector<std::string> getListAllCommands();
+
+    std::string execute(Minecraft& mc, Player& player, const std::string& input);
+
+    Command* getCommand(const std::string& name);
+
+private:
+    void registerAllCommands();
+    
+    std::vector<Command*> m_commands;
+};

src/commands/CommandOp.cpp

@@ -0,0 +1,31 @@
+#include "CommandOp.hpp"
+#include "commands/Command.hpp"
+#include "world/level/Level.h"
+#include <algorithm>
+#include <client/Minecraft.h>
+
+CommandOp::CommandOp() : Command("op") {}
+
+std::string CommandOp::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->ops.find(nicknameLower) != mc.level->ops.end()) {
+        return "op: player " + args[0] + " already opped";
+    }
+
+    mc.level->ops.emplace(nicknameLower);
+    return "op: successfully opped player " + args[0];
+}
+
+std::string CommandOp::help(Minecraft& mc) {
+    return "Usage: /op <player>";
+}

src/commands/CommandOp.hpp

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

src/main_dedicated.cpp

@@ -1,3 +1,4 @@
+#include <fstream>
 #include <iostream>
 #include "NinecraftApp.h"
 #include "AppPlatform.h"
@@ -11,6 +12,7 @@
 #include "server/ArgumentsSettings.h"
 #include "platform/time.h"
 #include "SharedConstants.h"
+#include "world/level/LevelConstants.h"
 
 #define MAIN_CLASS NinecraftApp
 static App* g_app = 0;
@@ -27,36 +29,175 @@ void signal_callback_handler(int signum) {
 	}
 }
 
-int main(int numArguments, char* pszArgs[]) {
-	ArgumentsSettings aSettings(numArguments, pszArgs);
-	if(aSettings.getShowHelp()) {
-		ArgumentsSettings defaultSettings(0, NULL);
-		printf("Minecraft Pockect Edition Server %s\n", Common::getGameVersionString("").c_str());
-		printf("-------------------------------------------------------\n");
-		printf("--cachepath - Path to where the server can store temp stuff (not sure if this is used) [default: \"%s\"]\n", defaultSettings.getCachePath().c_str());
-		printf("--externalpath - The path to the place where the server should store the levels. [default: \"%s\"]\n", defaultSettings.getExternalPath().c_str());
-		printf("--levelname - The name of the server [default: \"%s\"]\n", defaultSettings.getLevelName().c_str());
-		printf("--leveldir - The name of the server [default: \"%s\"]\n", defaultSettings.getLevelDir().c_str());
-		printf("--help - Shows this message.\n");
-		printf("--port - The port to run the server on. [default: %d]\n", defaultSettings.getPort());
-		printf("--serverkey - The key that the server should use for API calls. [default: \"%s\"]\n", defaultSettings.getServerKey().c_str());
-		printf("-------------------------------------------------------\n");
-		return 0;
+std::string findStringInConfig(std::string line, std::string config) {
+    auto valuePos = config.find(line);
+
+    if (line.empty()) {
+        throw std::runtime_error("Key cannot be empty");
+    }
+
+    if (valuePos == std::string::npos) {
+        throw std::runtime_error("Cannot find value");
+    }
+ 
+    std::string valueStr = "";
+
+    valuePos += 1 + line.size();
+
+    while (true) {
+        auto sym = config.at(valuePos);
+
+        if (sym == '\n') {
+            break;
+        }
+
+        if (valuePos == config.size()) {
+            throw std::runtime_error("Cannot find end of the line");
+        }
+
+        valueStr += sym;
+        valuePos++;
+    }
+
+    return valueStr;
+}
+
+
+int main(int numArguments, char* pszArgs[]) {	
+	std::ifstream serverProperties("server.properties");
+
+	int port = 0;
+	int gamemode = 0;
+	int worldSize = 0;
+
+	std::string levelDir = "";
+	std::string cachePath = "";
+	std::string externalPath = "";
+	std::string levelName = "";
+
+	if (serverProperties.is_open()) {
+		std::string propString;
+        std::string line;
+        
+        while (std::getline(serverProperties, line)) {
+            propString += line;
+			propString += "\n";
+        }
+
+        if (propString.empty()) {
+            throw std::runtime_error("Config cannot be empty");
+        }
+
+		port = std::stoi(findStringInConfig("port", propString));
+		worldSize = std::stoi(findStringInConfig("world-size", propString));
+
+		if (worldSize < 16 || worldSize > 32) {
+			throw std::runtime_error("Incorrect world size.");
+		}
+
+		LevelConstants::CHUNK_CACHE_WIDTH = worldSize;
+		LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
+		LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
+		
+		cachePath = findStringInConfig("level-cachepath", propString);
+		externalPath = findStringInConfig("level-externalpath", propString);
+		levelName = findStringInConfig("level-name", propString);
+		levelDir = findStringInConfig("level-dir", propString);
+
+		std::string gamemodeStr = findStringInConfig("gamemode", propString);
+
+		if (gamemodeStr == "survival") {
+			gamemode = GameType::Survival;
+		} else if (gamemodeStr == "creative") {
+			gamemode = GameType::Creative;
+		} else {
+			gamemode = GameType::Survival;
+		}
+		
+		printf("%d %s %s %d %d\n", port, cachePath.c_str(), externalPath.c_str(), gamemode, LevelConstants::CHUNK_CACHE_WIDTH);
+	} else {
+		std::ofstream defaultProperties("server.properties");
+
+		if (defaultProperties.is_open()) {
+			ArgumentsSettings defaultSettings(0, NULL);
+
+			std::stringstream buffer;
+			
+			buffer << "// MCPE Server properties" << std::endl;
+			buffer << "port=" << defaultSettings.getPort() << std::endl;
+			buffer << "level-dir=" << defaultSettings.getLevelDir() << std::endl;
+			buffer << "level-cachepath=" << defaultSettings.getCachePath() << std::endl;
+			buffer << "level-externalpath=" << defaultSettings.getExternalPath() << std::endl;
+			buffer << "gamemode=survival" << std::endl;
+			buffer << "level-name=" << defaultSettings.getLevelName() << std::endl;
+			buffer << "world-size=16" << std::endl;
+
+			defaultProperties << buffer.str();
+
+			printf("%s \n", buffer.str().c_str());
+
+			printf("Edit a config file first!\n");
+
+			defaultProperties.close();
+			exit(0);
+		} else {
+			throw std::runtime_error("Cannot create default config.");
+		}
 	}
-	printf("Level Name: %s\n", aSettings.getLevelName().c_str());
+
+	printf("Level Name: %s\n", levelName.c_str());
+
 	AppContext appContext;
 	appContext.platform = new AppPlatform();
 	App* app = new MAIN_CLASS();
 	signal(SIGINT, signal_callback_handler);
 	g_app = app;
-	((MAIN_CLASS*)g_app)->externalStoragePath = aSettings.getExternalPath();
-	((MAIN_CLASS*)g_app)->externalCacheStoragePath = aSettings.getCachePath();
+	((MAIN_CLASS*)g_app)->externalStoragePath = externalPath;
+	((MAIN_CLASS*)g_app)->externalCacheStoragePath = cachePath;
 
 	g_app->init(appContext);
-	LevelSettings settings(getEpochTimeS(), GameType::Creative);
+	LevelSettings settings(getEpochTimeS(), gamemode);
 	float startTime = getTimeS();
-	((MAIN_CLASS*)g_app)->selectLevel(aSettings.getLevelDir(), aSettings.getLevelName(),  settings);
-	((MAIN_CLASS*)g_app)->hostMultiplayer(aSettings.getPort());
+	((MAIN_CLASS*)g_app)->selectLevel(levelDir, levelName, settings);
+	((MAIN_CLASS*)g_app)->hostMultiplayer(port);
+
+	// Reading ops
+	std::ifstream ops("ops.txt");
+
+	if (ops.is_open()) {
+        std::string line;
+        
+        while (std::getline(ops, line)) {
+			if (!line.empty()) {
+            	((MAIN_CLASS*)g_app)->level->ops.insert(line);
+			}
+        }
+	} else {
+		std::ofstream opsDefault("ops.txt");
+
+		if (!opsDefault.is_open()) {
+			throw std::runtime_error("Cannot create ops list.");
+		}
+	}
+
+	// Reading banned ppl
+	std::ifstream banned("banned-players.txt");
+
+	if (banned.is_open()) {
+        std::string line;
+        
+        while (std::getline(banned, line)) {
+			if (!line.empty()) {
+            	((MAIN_CLASS*)g_app)->level->bannedPpl.insert(line);
+			}
+        }
+	} else {
+		std::ofstream bannedPpl("banned-players.txt");
+
+		if (!bannedPpl.is_open()) {
+			throw std::runtime_error("Cannot create banned players list.");
+		}
+	}
 
 	std::cout << "Level has been generated in " << getTimeS() - startTime << std::endl;
 	((MAIN_CLASS*)g_app)->level->saveLevelData();
@@ -67,7 +208,31 @@ int main(int numArguments, char* pszArgs[]) {
 		//pthread_yield();
 		sleepMs(20);
 	}
+	
+	std::ofstream opsWrite("ops.txt"); 
+
+	if (opsWrite.is_open()) {
+		for (auto& op : ((MAIN_CLASS*)g_app)->level->ops) {
+			opsWrite << op << std::endl;
+		}
+		opsWrite.close();
+	} else {
+		throw std::runtime_error("Cannot open ops list.");
+	}
+
+	std::ofstream bannedWrite("banned-players.txt"); 
+
+	if (bannedWrite.is_open()) {
+		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.");
+	}
+	
 	((MAIN_CLASS*)g_app)->level->saveLevelData();
+
 	delete app;
 	appContext.platform->finish();
 	delete appContext.platform;

src/main_glfw.h

@@ -139,12 +139,14 @@ int main(void) {
 #ifndef STANDALONE_SERVER
 	// Platform init.
 	appContext.platform = new AppPlatform_glfw();
-#if defined(DEBUG) && defined(__EMSCRIPTEN__)
-	EM_ASM({
-		console.log(FS.readdir("/"));
-		console.log(FS.readdir("/data"));
-		console.log(FS.readdir("/data/images"));
-	});
+#if defined(__EMSCRIPTEN__)
+	EM_ASM(
+		FS.mkdir('/games');
+		FS.mkdir('/games/com.mojang');
+        FS.mkdir('/games/com.mojang/minecraftWorlds');
+        FS.mount(IDBFS, {}, '/games');
+        FS.syncfs(true, function (err) {});
+    );
 #endif
 
 	glfwSetErrorCallback(error_callback);
@@ -205,16 +207,16 @@ int main(void) {
 
 	delete app;
 
-	appContext.platform->finish();
-	
-	delete appContext.platform;
-	
 #ifndef STANDALONE_SERVER
 	// Exit.
 	glfwDestroyWindow(platform->window);
 	glfwTerminate();
 #endif
 
+	appContext.platform->finish();
+	
+	delete appContext.platform;
+
 	return 0;
 }
 

src/main_win32.h

@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <windowsx.h>
 
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <process.h>
 #include "SharedConstants.h"
 

src/network/ClientSideNetworkHandler.cpp

@@ -1,6 +1,7 @@
 
 #include "ClientSideNetworkHandler.h"
 #include "client/Options.h"
+#include "network/packet/LoginStatusPacket.h"
 #include "packet/PacketInclude.h"
 #include "RakNetInstance.h"
 #include "../world/level/chunk/ChunkSource.h"
@@ -10,6 +11,9 @@
 #include "../world/entity/player/Inventory.h"
 #include "../client/Minecraft.h"
 #include "../client/gamemode/GameMode.h"
+#include "world/item/ItemInstance.h"
+#include "world/level/LevelConstants.h"
+#include <cstddef>
 #ifndef STANDALONE_SERVER
 #include "../client/gui/screens/DisconnectionScreen.h"
 #endif
@@ -42,6 +46,9 @@ ClientSideNetworkHandler::ClientSideNetworkHandler(Minecraft* minecraft, IRakNet
 	requestNextChunkPosition(0),
     requestNextChunkIndex(0)
 {
+	NumRequestChunks = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
+	requestNextChunkIndexList.resize(NumRequestChunks);
+	chunksLoaded.resize(NumRequestChunks);
 	rakPeer = raknetInstance->getPeer();
 }
 
@@ -59,7 +66,7 @@ void ClientSideNetworkHandler::requestNextChunk()
 
         //LOGI("requesting chunks @ (%d, %d)\n", chunk.x, chunk.y);
         
-		//raknetInstance->send(new RequestChunkPacket(requestNextChunkPosition % CHUNK_CACHE_WIDTH, requestNextChunkPosition / CHUNK_CACHE_WIDTH));
+		//raknetInstance->send(new RequestChunkPacket(requestNextChunkPosition % LevelConstants::CHUNK_CACHE_WIDTH, requestNextChunkPosition / LevelConstants::CHUNK_CACHE_WIDTH));
 		requestNextChunkIndex++;
         requestNextChunkPosition++;
 	}
@@ -67,16 +74,16 @@ void ClientSideNetworkHandler::requestNextChunk()
 
 bool ClientSideNetworkHandler::areAllChunksLoaded()
 {
-	return (requestNextChunkPosition >= (CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH));
+	return (requestNextChunkPosition >= (LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH));
 }
 
 bool ClientSideNetworkHandler::isChunkLoaded(int x, int z)
 {
-	if (x < 0 || x >= CHUNK_CACHE_WIDTH || z < 0 || z >= CHUNK_CACHE_WIDTH) {
+	if (x < 0 || x >= LevelConstants::CHUNK_CACHE_WIDTH || z < 0 || z >= LevelConstants::CHUNK_CACHE_WIDTH) {
 		LOGE("Error: Tried to request chunk (%d, %d)\n", x, z);
 		return true;
 	}
-	return chunksLoaded[x * CHUNK_CACHE_WIDTH + z];
+	return chunksLoaded[x * LevelConstants::CHUNK_CACHE_WIDTH + z];
 	//return areAllChunksLoaded();
 }
 
@@ -86,7 +93,7 @@ void ClientSideNetworkHandler::onConnect(const RakNet::RakNetGUID& hostGuid)
 	serverGuid = hostGuid;
 
 	clearChunksLoaded();
-	LoginPacket packet(minecraft->options.getStringValue(OPTIONS_USERNAME).c_str(), SharedConstants::NetworkProtocolVersion);
+	LoginPacket packet(minecraft->options.getStringValue(OPTIONS_USERNAME).c_str(), SharedConstants::NetworkProtocolVersion, true);
 	raknetInstance->send(packet);
 }
 
@@ -97,6 +104,11 @@ void ClientSideNetworkHandler::onUnableToConnect()
 
 void ClientSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 {
+	LevelConstants::CHUNK_CACHE_WIDTH = 16;
+	LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
+	LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
+	
+	// TODO: Good disconnecting
 	LOGI("onDisconnect\n");
 	if (level)
 	{
@@ -109,6 +121,7 @@ void ClientSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 			}
 		}
 	}
+	minecraft->setLevel(NULL);
 #ifndef STANDALONE_SERVER
 	minecraft->gui.addMessage("Disconnected from server");
 #endif
@@ -130,6 +143,18 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginSta
 		LOGI("Disconnect! Server is outdated!\n");
 #ifndef STANDALONE_SERVER
 		minecraft->setScreen(new DisconnectionScreen("Could not connect: Outdated server!"));
+#endif
+	}
+	if (packet->status == LoginStatus::Failed_TakenNickname) {
+		LOGI("Disconnect! Nickname is taken!\n");
+#ifndef STANDALONE_SERVER
+		minecraft->setScreen(new DisconnectionScreen("Could not connect: Nickname is taken!"));
+#endif
+	}
+	if (packet->status == LoginStatus::Failed_Banned) {
+		LOGI("Disconnect! You're banned from this server!\n");
+#ifndef STANDALONE_SERVER
+		minecraft->setScreen(new DisconnectionScreen("Could not connect: You're banned from this server!"));
 #endif
 	}
 }
@@ -146,6 +171,19 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, StartGam
 	}
 #endif
 
+	// @todo @note i think its trash
+	// we can put it directly to selectLevel?
+	if (packet->chunkCacheWidth != 0) {
+		printf("lol \n");		
+		LevelConstants::CHUNK_CACHE_WIDTH = packet->chunkCacheWidth;
+		LevelConstants::LEVEL_WIDTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_WIDTH;
+		LevelConstants::LEVEL_DEPTH = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_DEPTH;
+		
+	}
+	NumRequestChunks = LevelConstants::CHUNK_CACHE_WIDTH * LevelConstants::CHUNK_CACHE_WIDTH;
+	requestNextChunkIndexList.resize(NumRequestChunks);
+	chunksLoaded.resize(NumRequestChunks);
+
 	const std::string& levelId = LevelStorageSource::TempLevelId;
 	LevelStorageSource* storageSource = minecraft->getLevelSource();
 	storageSource->deleteLevel(levelId);
@@ -324,7 +362,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveEn
 	if (!level) return;
 
 	Entity* entity = level->getEntity(packet->entityId);
-	LOGI("RemoveEntityPacket %p %p, %d\n", entity, minecraft->player, entity?(int)(entity->isPlayer()): -1);
+	// LOGI("RemoveEntityPacket %p %p, %d\n", entity, minecraft->player, entity?(int)(entity->isPlayer()): -1);
 	if (!entity) return;
 
 	level->removeEntity(entity);
@@ -344,6 +382,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AddItemE
 }
 
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItemEntityPacket* packet) {
+	printf("TakeItemEntityPacket \n");
 	if (!level) return;
 
 	Entity* e = level->getEntity(packet->itemId);
@@ -386,6 +425,54 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlay
 	}
 }
 
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, SendInventoryPacket* packet) {
+	if (!level) return;
+
+	if (packet->entityId == minecraft->player->entityId) {
+		auto items = packet->items;
+		
+		minecraft->player->inventory->replace(items);
+
+		for (int i = 0; i < packet->linkedSlot.size(); i++) {
+			minecraft->player->inventory->linkSlot(i, packet->linkedSlot[i].inventorySlot, true);
+			LOGI("%i -> %i\n", packet->linkedSlot[i].inventorySlot, i);
+		}
+	}
+}
+
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet) {
+	if (!level) return;
+
+	LOGI("TakeItemPacket\n");
+
+	ItemInstance* item;
+
+	item->count = packet->count;
+	item->id = packet->itemId;
+	item->setAuxValue(packet->auxValue);
+
+	// if (minecraft->player->entityId == packet->playerId) {
+	if (!minecraft->player->inventory->add(item)) {
+		minecraft->player->drop(new ItemInstance(*item), false);
+	}
+	// }
+}
+
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet) {
+	// Idk how it works...
+	if (!level) return;
+
+	ItemInstance item;
+
+	item.count = packet->count;
+	item.id = packet->itemId;
+	item.setAuxValue(packet->auxValue);
+
+	// if (minecraft->player->entityId == packet->playerId) {
+	minecraft->player->inventory->removeResource(item);
+	// }
+}
+
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MoveEntityPacket* packet)
 {
 	if (!level)
@@ -475,19 +562,19 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 	//unsigned char* blockIds = chunk->getBlockData();
 	DataLayer& blockData = chunk->data;
 
-	const int setSize = LEVEL_HEIGHT / 8;
-	const int setShift = 4; // power of LEVEL_HEIGHT / 8
+	const int setSize = LevelConstants::LEVEL_HEIGHT / 8;
+	const int setShift = 4; // power of LevelConstants::LEVEL_HEIGHT / 8
 
 	bool recalcHeight = false;
 
-	int x0 = 16, x1 = 0, z0 = 16, z1 = 0, y0 = LEVEL_HEIGHT, y1 = 0;
+	int x0 = 16, x1 = 0, z0 = 16, z1 = 0, y0 = LevelConstants::LEVEL_HEIGHT, y1 = 0;
 	int rx = packet->x << 4;
 	int rz = packet->z << 4;
 
-	unsigned char readBlockBuffer[setSize];
-	unsigned char readDataBuffer[setSize / 2];
+	unsigned char* readBlockBuffer = new unsigned char[setSize];
+	unsigned char* readDataBuffer = new unsigned char[setSize / 2];
 
-	for (int i = 0; i < CHUNK_COLUMNS; i++)
+	for (int i = 0; i < LevelConstants::CHUNK_COLUMNS; i++)
 	{
 		unsigned char updateBits = 0;
 		packet->chunkData.Read(updateBits);
@@ -496,8 +583,8 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 		{
 			recalcHeight = true;
 
-			int colX = (i % CHUNK_WIDTH);
-			int colZ = (i / CHUNK_WIDTH);
+			int colX = (i % LevelConstants::CHUNK_WIDTH);
+			int colZ = (i / LevelConstants::CHUNK_WIDTH);
 			int colDataPosition = colX << 11 | colZ << 7;
 
 			for (int set = 0; set < 8; set++)
@@ -531,30 +618,33 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 				{
 					y0 = ((1 << set) << setShift);
 				}
-				if (((1 << set) << setShift) + (LEVEL_HEIGHT / 8) - 1 > y1)
+				if (((1 << set) << setShift) + (LevelConstants::LEVEL_HEIGHT / 8) - 1 > y1)
 				{
-					y1 = ((1 << set) << setShift) + (LEVEL_HEIGHT / 8) - 1;
+					y1 = ((1 << set) << setShift) + (LevelConstants::LEVEL_HEIGHT / 8) - 1;
 				}
 			}
-			if ((i % CHUNK_WIDTH) < x0)
+			if ((i % LevelConstants::CHUNK_WIDTH) < x0)
 			{
-				x0 = (i % CHUNK_WIDTH);
+				x0 = (i % LevelConstants::CHUNK_WIDTH);
 			}
-			if ((i % CHUNK_WIDTH) > x1)
+			if ((i % LevelConstants::CHUNK_WIDTH) > x1)
 			{
-				x1 = (i % CHUNK_WIDTH);
+				x1 = (i % LevelConstants::CHUNK_WIDTH);
 			}
-			if ((i / CHUNK_WIDTH) < z0)
+			if ((i / LevelConstants::CHUNK_WIDTH) < z0)
 			{
-				z0 = (i / CHUNK_WIDTH);
+				z0 = (i / LevelConstants::CHUNK_WIDTH);
 			}
-			if ((i / CHUNK_WIDTH) > z1)
+			if ((i / LevelConstants::CHUNK_WIDTH) > z1)
 			{
-				z1 = (i / CHUNK_WIDTH);
+				z1 = (i / LevelConstants::CHUNK_WIDTH);
 			}
 		}
 	}
 
+	delete[] readBlockBuffer;
+	delete[] readDataBuffer;
+
  	if (recalcHeight)
  	{
 // 		chunk->recalcHeightmap();
@@ -579,7 +669,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChunkDat
 	//chunk->terrainPopulated = true;
 	chunk->unsaved = false;
 
-	chunksLoaded[packet->x * CHUNK_CACHE_WIDTH + packet->z] = true;
+	chunksLoaded[packet->x * LevelConstants::CHUNK_CACHE_WIDTH + packet->z] = true;
 
 	if (areAllChunksLoaded())
 	{
@@ -627,18 +717,18 @@ void ClientSideNetworkHandler::arrangeRequestChunkOrder() {
 	clearChunksLoaded();
 
     // Default sort is around center of the world
-    int cx = CHUNK_CACHE_WIDTH / 2;
-    int cz = CHUNK_CACHE_WIDTH / 2;
+    int cx = LevelConstants::CHUNK_CACHE_WIDTH / 2;
+    int cz = LevelConstants::CHUNK_CACHE_WIDTH / 2;
 
     // If player exists, let's sort around him
     Player* p = minecraft? minecraft->player : NULL;
     if (p) {
-        cx = Mth::floor(p->x / (float)CHUNK_WIDTH);
-        cz = Mth::floor(p->z / (float)CHUNK_DEPTH);
+        cx = Mth::floor(p->x / (float)LevelConstants::CHUNK_WIDTH);
+        cz = Mth::floor(p->z / (float)LevelConstants::CHUNK_DEPTH);
     }
 
     _ChunkSorter sorter(cx, cz);
-    std::sort(requestNextChunkIndexList, requestNextChunkIndexList + NumRequestChunks, sorter);
+    std::sort(requestNextChunkIndexList.begin(), requestNextChunkIndexList.end(), sorter);
 }
 
 void ClientSideNetworkHandler::levelGenerated(Level* level)
@@ -782,6 +872,10 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AnimateP
 	}
 }
 
+void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet)
+{
+}
+
 void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemPacket* packet)
 {
 }
@@ -791,6 +885,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, SetHealt
 	if (!level || !minecraft->player)
 		return;
 
+	printf("SetHealthPacket \n");
 	minecraft->player->hurtTo(packet->health);
 }
 
@@ -886,7 +981,11 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 void ClientSideNetworkHandler::handle( const RakNet::RakNetGUID& source, ChatPacket* packet )
 {
 #ifndef STANDALONE_SERVER
-	minecraft->gui.displayClientMessage(packet->message);
+	// minecraft->gui.displayClientMessage(packet->message);
+	std::istringstream iss(packet->message);
+	for (std::string line; std::getline(iss, line); ) {
+		minecraft->gui.addMessage(line);
+	}
 #endif
 }
 
@@ -919,8 +1018,8 @@ void ClientSideNetworkHandler::clearChunksLoaded()
 {
 	// Init the chunk positions
 	for (int i = 0; i < NumRequestChunks; ++i) {
-		requestNextChunkIndexList[i].x = i/CHUNK_WIDTH;
-		requestNextChunkIndexList[i].y = i%CHUNK_WIDTH;
+		requestNextChunkIndexList[i].x = i / LevelConstants::CHUNK_WIDTH;
+		requestNextChunkIndexList[i].y = i % LevelConstants::CHUNK_WIDTH;
 		chunksLoaded[i] = false;
 	}
 }

src/network/ClientSideNetworkHandler.h

@@ -77,6 +77,11 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, AdventureSettingsPacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet);
+	virtual void handle(const RakNet::RakNetGUID& source, SendInventoryPacket* packet);
+
 private:
 
 	void requestNextChunk();
@@ -97,11 +102,11 @@ private:
 	BlockUpdateList	bufferedBlockUpdates;
 	int	requestNextChunkPosition;
 
-    static const int NumRequestChunks = CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH;
+    int NumRequestChunks;
     
     int requestNextChunkIndex;
-    IntPair requestNextChunkIndexList[NumRequestChunks];
-	bool chunksLoaded[NumRequestChunks];
+    std::vector<IntPair> requestNextChunkIndexList;
+	std::vector<bool> chunksLoaded;
 };
 
 #endif

src/network/NATPunchHandler.cpp

@@ -1,33 +0,0 @@
-#include "NATPunchHandler.h"
-#include "../raknet/TCPInterface.h"
-#include "../raknet/HTTPConnection.h"
-#include "PHPDirectoryServer2.h"
-
-using namespace RakNet;
-NATPuchHandler::NATPuchHandler() {
-	tcpInterface = new TCPInterface;
-}
-NATPuchHandler::~NATPuchHandler() {
-	delete tcpInterface;
-}
-
-void NATPuchHandler::initialize() {
-	tcpInterface->Start(0, 64);
-}
-
-void NATPuchHandler::registerToGameList(const RakNet::RakString& serverName, int port) {
-	HTTPConnection httpConnection;
-	httpConnection.Init(tcpInterface, "johanbernhardsson.se");
-	PHPDirectoryServer2 directoryServer;
-	directoryServer.Init(&httpConnection, "/DirectoryServer.php");
-	directoryServer.UploadTable("", serverName, port, true);
-}
-
-void NATPuchHandler::removeFromGameList() {
-
-}
-
-void NATPuchHandler::close() {
-
-}
-

src/network/NATPunchHandler.h

@@ -1,24 +0,0 @@
-#ifndef _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_
-#define _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_
-#include "../raknet/TCPInterface.h"
-#include "../raknet/RakString.h"
-class NATPuchHandler {
-public:
-	enum NATPuchHandlerStatus {
-		NATPuchInitilized = 0,
-		NATPuchFetchingServerList = 1,
-		NATPuchConnecting = 2,
-		NATPuchConnected = 3,
-		NATPuchDissconnected = 4
-	};
-	NATPuchHandler();
-	~NATPuchHandler();
-	void initialize();
-	void registerToGameList(const RakNet::RakString& serverName, int port);
-	void removeFromGameList();
-	void close();
-private:
-	RakNet::TCPInterface *tcpInterface;
-};
-
-#endif /* _MINECRAFT_NETWORK_NATPUNCHHANDLER_H_ */

src/network/NetEventCallback.h

@@ -18,6 +18,8 @@ class RemovePlayerPacket;
 class RemoveEntityPacket;
 class MoveEntityPacket;
 //class TeleportEntityPacket;
+class RemoveItemPacket;
+class TakeItemPacket;
 class MovePlayerPacket;
 class PlaceBlockPacket;
 class RemoveBlockPacket;
@@ -48,6 +50,7 @@ class ContainerClosePacket;
 class ContainerSetSlotPacket;
 class ContainerSetDataPacket;
 class ContainerSetContentPacket;
+class WantCreatePacket;
 class ChatPacket;
 class SignUpdatePacket;
 class Minecraft;
@@ -119,6 +122,9 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet) {}
 	virtual void handle(const RakNet::RakNetGUID& source, AdventureSettingsPacket* packet) {}
 	virtual void handle(const RakNet::RakNetGUID& source, AnimatePacket* packet) {}
+	virtual void handle(const RakNet::RakNetGUID& source, RemoveItemPacket* packet) {}
+	virtual void handle(const RakNet::RakNetGUID& source, TakeItemPacket* packet) {}
+	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet) {}
 
 	//
 	// Common implementation for Client and Server

src/network/Packet.cpp

@@ -2,6 +2,7 @@
 #include "Packet.h"
 #include "../world/level/chunk/LevelChunk.h"
 
+#include "network/packet/TakeItemPacket.h"
 #include "packet/PacketInclude.h"
 
 Packet::Packet()
@@ -41,10 +42,16 @@ Packet* MinecraftPackets::createPacket(int id)
 	case PACKET_ADDITEMENTITY:
 		packet = new AddItemEntityPacket();
 		break;
+	case PACKET_REMOVEITEM:
+		packet = new RemoveItemPacket();
+		break;
+	case PACKET_TAKEITEM:
+		packet = new TakeItemPacket();
+		break;
 	case PACKET_TAKEITEMENTITY:
 		packet = new TakeItemEntityPacket();
 		break;
-	case PACKET_ADDMOB:
+	case PACKET_ADDMOB:	
 		packet = new AddMobPacket();
 		break;
 	case PACKET_ADDPLAYER:
@@ -68,6 +75,9 @@ Packet* MinecraftPackets::createPacket(int id)
 	case PACKET_RESPAWN:
 		packet = new RespawnPacket();
 		break;
+	case PACKET_WANTCREATEITEM:
+		packet = new WantCreatePacket();
+		break;
 	case PACKET_REMOVEENTITY:
 		packet = new RemoveEntityPacket();
 		break;

src/network/Packet.h

@@ -33,7 +33,10 @@ enum MinecraftPacketIds
 	PACKET_REMOVEENTITY,
 	PACKET_ADDITEMENTITY,
 	PACKET_TAKEITEMENTITY,
-
+	PACKET_TAKEITEM,
+	PACKET_REMOVEITEM,
+	PACKET_WANTCREATEITEM,
+	
 	PACKET_MOVEENTITY,
 	PACKET_MOVEENTITY_POS,
 	PACKET_MOVEENTITY_ROT,

src/network/ServerSideNetworkHandler.cpp

@@ -5,6 +5,16 @@
 #include "../world/entity/player/Inventory.h"
 #include "../world/Container.h"
 #include "../world/inventory/BaseContainerMenu.h"
+#include "network/packet/ChatPacket.h"
+#include "network/packet/ContainerSetSlotPacket.h"
+#include "network/packet/LoginStatusPacket.h"
+#include "network/packet/MovePlayerPacket.h"
+#include "network/packet/RemoveBlockPacket.h"
+#include "network/packet/SendInventoryPacket.h"
+#include "network/packet/UpdateBlockPacket.h"
+#include "network/packet/RemoveItemPacket.h"
+#include "network/packet/TakeItemPacket.h"
+#include "network/packet/WantCreatePacket.h"
 #include "packet/PacketInclude.h"
 
 #include "RakNetInstance.h"
@@ -13,6 +23,17 @@
 #include "../client/gamemode/GameMode.h"
 #include "../raknet/RakPeerInterface.h"
 #include "../raknet/PacketPriority.h"
+#include "platform/log.h"
+#include "util/Mth.h"
+#include "util/StringUtils.h"
+#include "world/item/ItemInstance.h"
+#include "world/level/LevelConstants.h"
+#include "world/level/storage/LevelStorage.h"
+#include "world/phys/Vec3.h"
+#include "world/item/crafting/Recipe.h"
+#include "world/item/crafting/Recipes.h"
+#include <cstddef>
+#include <cstdio>
 #ifndef STANDALONE_SERVER
 #include "../client/sound/SoundEngine.h"
 #endif
@@ -53,11 +74,11 @@ void ServerSideNetworkHandler::tileChanged(int x, int y, int z)
 
 Packet* ServerSideNetworkHandler::getAddPacketFromEntity( Entity* entity ) {
 	if (entity->isMob() && !entity->isPlayer()) { //@fix: This code is duplicated. See if it can be unified.
-		if (minecraft->player) {
+		// if (minecraft->player) {
 			// I guess this should always be true, but it crashed somewhere in this
 			// function once and I only see this one as a potential problem
 			return new AddMobPacket((Mob*)entity);
-		}
+		// }
 	}
 	else if (entity->isPlayer()) {
 
@@ -136,7 +157,18 @@ void ServerSideNetworkHandler::displayGameMessage(const std::string& message)
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ChatPacket* packet)
 {
-	displayGameMessage(packet->message);
+	auto player = getPlayer(source);
+
+	if (player == nullptr) return; // @todo maybe kick?
+	
+	if (packet->message[0] == '/') {
+		// This is a command
+
+		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(packet->message.substr(1))));
+		return sendPrivate(resp, source);
+	}
+
+	displayGameMessage("<" + player->name + "> " + packet->message);
 }
 
 void ServerSideNetworkHandler::onNewClient(const RakNet::RakNetGUID& clientGuid)
@@ -156,6 +188,8 @@ void ServerSideNetworkHandler::onDisconnect(const RakNet::RakNetGUID& guid)
 
 		if (player->owner == guid)
 		{
+			minecraft->level->getLevelStorage()->savePlayer(*player);
+
 			std::string message = player->name;
 			message += " disconnected from the game";
 			displayGameMessage(message);
@@ -179,15 +213,39 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	if (!_allowIncoming) return;
 
 	LOGI("LoginPacket\n");
-
+	
 	int loginStatus = LoginStatus::Success;
 	//
 	// Bad/incompatible client version
 	//
 	bool oldClient = packet->clientNetworkVersion < SharedConstants::NetworkProtocolLowestSupportedVersion;
 	bool oldServer = packet->clientNetworkLowestSupportedVersion > SharedConstants::NetworkProtocolVersion;
-	if (oldClient || oldServer)
-		loginStatus = oldClient? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
+	if (oldClient || oldServer || !packet->newProto)
+		loginStatus = oldClient || !packet->newProto? LoginStatus::Failed_ClientOld : LoginStatus::Failed_ServerOld;
+
+	std::string nicknameLower = packet->clientName.C_String();
+	std::transform(nicknameLower.begin(), nicknameLower.end(), nicknameLower.begin(), ::tolower);
+
+	printf("%s lower \n", nicknameLower.c_str());
+	for (int i = 0; i < level->players.size(); i++) {
+		ServerPlayer* player = (ServerPlayer*) level->players.at(i);
+
+		std::string clientLower = player->name;
+		std::transform(clientLower.begin(), clientLower.end(), clientLower.begin(), ::tolower);
+
+		// @todo to lower case
+		if (nicknameLower == clientLower) {
+			loginStatus = packet->newProto ? LoginStatus::Failed_TakenNickname : LoginStatus::Failed_ClientOld;
+			break;
+		}
+	}
+	
+	for (auto& banned : level->bannedPpl) {
+		if (nicknameLower == banned) {
+			loginStatus = packet->newProto ? LoginStatus::Failed_Banned : LoginStatus::Failed_ClientOld;
+			break;
+		}
+	}
 
 	RakNet::BitStream bitStream;
 	LoginStatusPacket(loginStatus).write(&bitStream);
@@ -199,13 +257,16 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
 	//
 	// Valid client version
 	//
-	Player* newPlayer = new ServerPlayer(minecraft, level);
-
+	
+	Player* newPlayer = new ServerPlayer(minecraft, level, packet->newProto);
+	
 	minecraft->gameMode->initAbilities(newPlayer->abilities);
 	newPlayer->owner = source;
 	newPlayer->name = packet->clientName.C_String();
 	_pendingPlayers.push_back(newPlayer);
 
+	LOGI("Adding new player... isCreative: %i\n", minecraft->isCreativeMode());
+
 	// Reset the player so he doesn't spawn inside blocks
 	while (newPlayer->y > 0) {
 		newPlayer->setPos(newPlayer->x, newPlayer->y, newPlayer->z);
@@ -228,7 +289,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, LoginPac
             level->getLevelData()->getGeneratorVersion(),
             gameType,
             newPlayer->entityId,
-            newPlayer->x, newPlayer->y - newPlayer->heightOffset, newPlayer->z
+            newPlayer->x, newPlayer->y - newPlayer->heightOffset, newPlayer->z,
+			LevelConstants::CHUNK_CACHE_WIDTH
         ).write(&bitStream);
 
         rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
@@ -244,6 +306,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ReadyPac
 
 	if (packet->type == ReadyPacket::READY_REQUESTEDCHUNKS)
 		onReady_RequestedChunks(source);
+
+	LOGI("Ready player two ready ready player two!!\n ");
 }
 
 void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID& source)
@@ -301,6 +365,36 @@ void ServerSideNetworkHandler::onReady_ClientGeneration(const RakNet::RakNetGUID
 		}
 	}
 
+	if (!minecraft->level->getLevelStorage()->loadPlayer(*newPlayer)) {
+		LOGW("Failed to load %s data\n", newPlayer->name.c_str());
+	}
+
+	// Credits to EpikIzCool
+	bitStream.Reset();
+	MovePlayerPacket mv(newPlayer->entityId, newPlayer->x, newPlayer->y - newPlayer->heightOffset,
+		newPlayer->z, newPlayer->xRot, newPlayer->yRot);
+	mv.write(&bitStream);
+
+	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
+	
+	bitStream.Reset();
+	SetHealthPacket hp(newPlayer->health);
+	hp.write(&bitStream);
+	
+	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
+	
+	if (newPlayer->hasRespawnPosition()) {
+		bitStream.Reset();
+		SetSpawnPositionPacket sp(newPlayer->getRespawnPosition());
+		sp.write(&bitStream);
+		rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
+	}
+
+	bitStream.Reset();
+	SendInventoryPacket(newPlayer, false).write(&bitStream);
+	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
+
+
 	// Additional packets
 	// * set spawn
 	/*
@@ -338,15 +432,32 @@ void ServerSideNetworkHandler::onReady_RequestedChunks(const RakNet::RakNetGUID&
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MovePlayerPacket* packet)
 {
 	if (!level) return;
-
+	
 	//LOGI("MovePlayerPacket\n");
-	if (Entity* entity = level->getEntity(packet->entityId))
-	{
-		entity->xd = entity->yd = entity->zd = 0;
-		entity->lerpTo(packet->x, packet->y, packet->z, packet->yRot, packet->xRot, 3);
+	if (Entity* entity = level->getEntity(packet->entityId)) {
+		ServerPlayer* player = (ServerPlayer*) getPlayer(source);
 
+		int timeElapsed = minecraft->getTicks() - player->getLastMoveTicks();
+
+		if (timeElapsed > 0) {
+			float dist = player->distanceTo(packet->x, player->y, packet->z);
+			float speed = dist / (minecraft->getTicks() - player->getLastMoveTicks());
+			player->setLastMoveTicks(minecraft->getTicks());
+
+			float maxSpeed = (minecraft->isCreativeMode()) ? 1.65f : 1.f;
+
+			if (speed > maxSpeed) {
+				MovePlayerPacket refuse(player->entityId, player->x, player->y, player->z, player->xRot, player->yRot);
+		    	return raknetInstance->send(refuse);
+			}
+		}
+
+		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);
+	
 	}
 }
 
@@ -368,12 +479,29 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RemoveBl
 	if (oldTile != NULL && changed) {
 		level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, oldTile->soundType->getBreakSound(), (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
 
-		if (minecraft->gameMode->isSurvivalType() && player->canDestroy(oldTile))
-			//oldTile->spawnResources(level, x, y, z, data, 1); //@todo
+		if (minecraft->gameMode->isSurvivalType() && player->canDestroy(oldTile)) {
+			// From SurvivalMode.cpp
+			// Why tf i have to copy this shit from SurvivalMode class
+			// Why SurvivalMode class locked to LOCAL MINECRAFT PLAYER :sob: :sob: :sob: :sob: :sob: :sob: :sob: :sob:
+			// @fix @warn @ahtung @alert
+			ItemInstance* item = player->inventory->getSelected();
+			if (item != NULL) {
+				item->mineBlock(oldTile->id, x, y, z);
+				if (item->count == 0) {
+					//item->snap(minecraft->player);
+					player->inventory->clearSlot(player->inventory->selected);
+				}
+			}
+
+			// oldTile->spawnResources(level, x, y, z, data, 1); //@todo
 			oldTile->playerDestroy(level, player, x, y, z, data);
+		}
+			
 
 		oldTile->destroy(level, x, y, z, data);
 	}
+
+	LOGI("Remove block [%i, %i, %i]\n", packet->x, packet->y, packet->z);
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RequestChunkPacket* packet)
@@ -403,6 +531,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, RequestC
             raknetInstance->send(source, p);
         }
     }
+
+	// LOGI("Requested chunk [%i, %i]\n", packet->x, packet->z);
 }
 
 void ServerSideNetworkHandler::levelGenerated( Level* level )
@@ -429,23 +559,31 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, PlayerEq
 	if (!player) return;
 	if (rakPeer->GetMyGUID() == player->owner) return;
 
+	LOGI("Equip item: id %i aux %i\n", packet->itemId, packet->itemAuxValue);
+
 	// override the player's inventory
-	//int slot = player->inventory->getSlot(packet->itemId, packet->itemAuxValue);
-	int slot = Inventory::MAX_SELECTION_SIZE;
-	if (slot >= 0) {
-		if (packet->itemId == 0) {
-			player->inventory->clearSlot(slot);
-		} else {
-			// @note: 128 is an ugly hack for depletable items.
-			// @todo: fix
-			ItemInstance newItem(packet->itemId, 128, packet->itemAuxValue);
-			player->inventory->replaceSlot(slot, &newItem);
-		}
-		player->inventory->moveToSelectedSlot(slot, true);
-		redistributePacket(packet, source);
-	} else {
-		LOGW("Warning: Remote player doesn't have his thing, Odd!\n");
+	int slot = player->inventory->getSlot(packet->itemId, packet->itemAuxValue);
+
+	if (slot >= 0 && slot != packet->inventorySlot && packet->itemId != 0) {
+		LOGW("PlayerEquipmentPacket: Item in player inventory but slots doesn't match!");
+		packet->inventorySlot = slot;
 	}
+
+	if (slot < 0 && packet->itemId != 0) {
+		LOGW("PlayerEquipmentPacket: Remote player doesn't have his thing (or crafted it)!\n");
+
+		SendInventoryPacket newInventory (player, false);
+		raknetInstance->send(newInventory);
+
+		return;
+	}
+
+	player->inventory->selectSlot(packet->selectedSlot);
+	player->inventory->linkSlot(packet->selectedSlot, packet->inventorySlot, true);
+
+	player->inventory->print();
+
+	redistributePacket(packet, source);
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, PlayerArmorEquipmentPacket* packet) {
@@ -455,6 +593,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, PlayerAr
     if (!player) return;
     if (rakPeer->GetMyGUID() == player->owner) return;
 
+	// LOGI("Equip armor: %i %i %i %i\n", packet->head, packet->torso, packet->legs, packet->feet);
+
     packet->fillIn(player);
     redistributePacket(packet, source);
 }
@@ -466,6 +606,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Interact
 	Entity* entity = level->getEntity(packet->targetId);
 	if (src && entity && src->isPlayer())
 	{
+		LOGI("Interact: source %i target %i\n", packet->sourceId, packet->targetId);
+
 		Player* player = (Player*) src;
 		if (InteractPacket::Attack == packet->action) {
 			player->swing();
@@ -506,12 +648,73 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, AnimateP
 	}
 	redistributePacket(packet, source);
 }
+void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet) {
+	LOGI("WantCreatePacket\n");
+	Entity* entity = level->getEntity(packet->playerId);
+
+	if (entity && entity->isPlayer()) {
+		Player* p = (Player*)entity;
+		
+		auto playerInv = p->inventory;
+		
+		ItemInstance wantCreate;
+
+		wantCreate.id = packet->itemId;
+		wantCreate.count = packet->count;
+		wantCreate.setAuxValue(packet->auxValue);
+
+		Recipe* recipe = Recipes::getInstance()->getRecipeFor(wantCreate);
+
+		std::vector<ItemInstance> items = recipe->getItemPack().getItemInstances();
+
+		std::vector<int> checkForExists = {};
+
+		for (int i = Inventory::MAX_SELECTION_SIZE; i < p->inventory->getContainerSize(); ++i) {
+			auto itm = p->inventory->getItem(i);
+
+			if (itm != NULL) {
+				for (int y = 0; y < items.size(); y++) {
+					auto itmRecipe = items.at(y);
+
+					if (itmRecipe.id == itm->id && itm->count >= itmRecipe.count) {
+						checkForExists.push_back(itm->id);
+					}
+				}
+			}
+		}
+		
+		if (checkForExists.empty()) {
+			return;
+		}
+		
+		for (int i = 0; i < items.size(); i++) {
+			auto item = items.at(i);
+			
+    		auto it = std::find(checkForExists.begin(), checkForExists.end(), item.id);
+
+			if (it == checkForExists.end() && checkForExists.size() > 1) {
+				return;
+			}
+		}
+
+		// for (int i = 0; i < items.size(); i++) {
+		// 	RemoveItemPacket removePacket(packet->playerId, items.at(i).count, items.at(i).getAuxValue(), items.at(i).id);
+		// 	raknetInstance->send(source, removePacket);
+
+		// 	p->inventory->removeResource(ItemInstance(items.at(i).id, items.at(i).count, items.at(i).getAuxValue()));
+		// }
+		// TakeItemPacket itemAdd(p->entityId, wantCreate.count, wantCreate.getAuxValue(), wantCreate.id);
+		// raknetInstance->send(source, itemAdd);
+
+		p->inventory->add(new ItemInstance(wantCreate.id, wantCreate.count, wantCreate.getAuxValue()));
+	}
+}
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemPacket* packet)
 {
 	if (!level) return;
 
-	LOGI("UseItemPacket\n");
+	LOGI("UseItemPacket: id %i data %i\n", packet->itemId, packet->itemData);
 	Entity* entity = level->getEntity(packet->entityId);
 	if (entity && entity->isPlayer()) {
 		Player* player = (Player*) entity;
@@ -522,7 +725,30 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 		if (t && t->use(level, x, y, z, player)) return;
 		if (packet->item.isNull()) return;
 
-		ItemInstance* item = &packet->item;
+		ItemInstance* packetItem = &packet->item;
+
+		int slot = player->inventory->getSlot(packet->itemId, packet->itemData);
+
+		if (slot < 0) {
+			LOGW("UseItemPacket: Player doesn't have this item!\n");
+
+			auto pos = Vec3(packet->x, packet->y, packet->z);
+
+			if (ItemInstance::isBlock(packetItem)) {
+				LOGI("UseItemPacket: This is even block!!!\n");
+
+				pos.x += packet->clickX;
+				pos.y += packet->clickY;
+				pos.z += packet->clickZ;
+			}
+
+			UpdateBlockPacket refuse(pos.x, pos.y, pos.z, level->getTile(pos.x, pos.y, pos.z), level->getData(pos.x, pos.y, pos.z));
+			raknetInstance->send(refuse);
+
+			return;
+		}
+
+		ItemInstance* item = player->inventory->getItem(slot);
 
 		if(packet->face == 255) {
             // Special case: x,y,z means direction-of-action
@@ -533,6 +759,10 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 			minecraft->gameMode->useItemOn(player, level, item, packet->x, packet->y, packet->z, packet->face,
 				Vec3(packet->clickX + packet->x, packet->clickY + packet->y, packet->clickZ + packet->z));
 		}
+
+		if (item && item->count <= 0) {
+			player->inventory->clearSlot(slot);
+		}
 		
 		//LOGW("Use Item not working! Out of synch?\n");
 
@@ -544,6 +774,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, UseItemP
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, EntityEventPacket* packet) {
 	if (!level) return;
 
+	LOGI("EntityEventPacket: id %i\n", packet->eventId);
+
 	if (Entity* e = level->getEntity(packet->entityId))
 		e->handleEntityEvent(packet->eventId);
 }
@@ -577,6 +809,11 @@ void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, SendInv
 {
 	if (!level) return;
 
+	LOGI("SendInventoryPacket:\n");
+	for (int i = 0; i < packet->numItems; i++) {
+		LOGI("\t %i: %s (%i)\n", i, packet->items.at(i).getName().c_str(), packet->items.at(i).count);
+	}
+
 	Entity* entity = level->getEntity(packet->entityId);
 	if (entity && entity->isPlayer()) {
 		Player* p = (Player*)entity;
@@ -592,15 +829,27 @@ void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, DropIte
 {
 	if (!level) return;
 
+	LOGI("DropItemPacket\n");
+
 	Entity* entity = level->getEntity(packet->entityId);
 	if (entity && entity->isPlayer()) {
 		Player* p = (Player*)entity;
-		p->drop(new ItemInstance(packet->item), packet->dropType != 0);
+		// p->drop(new ItemInstance(packet->item), packet->dropType != 0);
+
+		int slot = p->inventory->getSlot(packet->item.id, packet->item.getAuxValue());
+
+		if (slot < 0) {
+			LOGW("DropItemPacket: player doesn't have these items!\n");
+			return;
+		}
+
+		p->inventory->dropSlot(slot, false, packet->dropType != 0);
 	}
 }
 
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet) {
 	if (!level) return;
+	LOGI("ContainerClosePacket\n");
 
 	Player* p = findPlayer(level, &source);
 	if (!p) return;
@@ -612,6 +861,16 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, ContainerSetSlotPacket* packet) {
 	if (!level) return;
 
+	const char* type = "unknown";
+
+	switch (packet->setType) {
+		case ContainerSetSlotPacket::SETTYPE_ADD: type = "add"; break;
+		case ContainerSetSlotPacket::SETTYPE_SET: type = "set"; break;
+		case ContainerSetSlotPacket::SETTYPE_TAKE: type = "take"; break;
+	};
+
+	LOGI("ContainerSetSlot: slot %i item %s type %s\n", packet->slot, packet->item.getName().c_str(), type);
+
 	Player* p = findPlayer(level, &source);
 	if (!p) return;
 
@@ -619,11 +878,79 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 		LOGW("User has no container!\n");
 		return;
 	}
-	if (p->containerMenu->containerId != packet->containerId)
-	{
+
+	if (p->containerMenu->containerId != packet->containerId) {
 		LOGW("Wrong container id: %d vs %d\n", p->containerMenu->containerId, packet->containerId);
 		return;
 	}
+
+	if (packet->item.count > 64) {
+		LOGW("ContainerSetSlotPacket: player tried to put more than 64");
+		return;
+	}
+
+	auto contItems = p->containerMenu->getItems();
+
+	// find same item in player inventory (used not in all cases)
+	int invSlot = p->inventory->getSlot(packet->item.id, packet->item.getAuxValue());
+	auto invItem = p->inventory->getItem(invSlot);
+
+	if (contItems.at(packet->slot).id == 0 && packet->item.id != 0) {
+		LOGI("ContainerSetSlotPacket: player tried to put items to slot %i\n", packet->slot);
+
+		if (invSlot < 0) {
+			LOGW("ContainerSetSlotPacket: player doesn't have this item\n");
+			return;
+		}
+
+		if (invItem->count < packet->item.count) {
+			LOGW("ContainerSetSlotPacket: player tried to put more than he have\n");
+			packet->item.count = invItem->count;
+		}
+
+		invItem->count -= packet->item.count;
+
+		if (invItem->count <= 0) {
+			p->inventory->removeItem(invItem);
+		}
+	} else if(contItems.at(packet->slot).id == packet->item.id) {
+		int deltaItem = packet->item.count - contItems.at(packet->slot).count;
+
+		if (deltaItem > 0) {
+			LOGI("ContainerSetSlotPacket: player tried to add %i items to slot %i\n", deltaItem, packet->slot);
+
+			auto invItem = p->inventory->getItem(invSlot);
+
+			if (invSlot < 0) {
+				LOGW("ContainerSetSlotPacket: player doesn't have this item\n");
+				return;
+			}
+
+			if (invItem->count < deltaItem) {
+				LOGW("ContainerSetSlotPacket: player tried to put more than he have");
+				packet->item.count -= (deltaItem - invItem->count);
+				deltaItem = invItem->count;
+			}
+
+			invItem->count -= deltaItem;
+
+			if (invItem->count <= 0) {
+				p->inventory->removeItem(invItem);
+			}
+		} else if (deltaItem < 0) {
+			LOGW("ContainerSetSlotPacket: player tried to take %i items from slot %i\n", -deltaItem, packet->slot);
+			p->inventory->add(new ItemInstance(packet->item.getItem(), -deltaItem, contItems.at(packet->slot).getAuxValue()));
+		}
+	} else if(contItems.at(packet->slot).id && !packet->item.id) {
+		LOGI("ContainerSetSlotPacket: player tried to take all items from slot %i\n", packet->slot);
+		packet->item.count = 0;
+		packet->item.setAuxValue(0);
+
+		p->inventory->add(new ItemInstance(contItems.at(packet->slot).getItem(), contItems.at(packet->slot).count, contItems.at(packet->slot).getAuxValue()));
+	} else {
+		LOGW("ContainerSetSlotPacket: illegal container operation in slot %i\n", packet->slot);
+		return;
+	}
 	
 	if (ContainerType::FURNACE == p->containerMenu->containerType) {
 		//LOGI("Server:Setting slot %d: %s\n", packet->slot, packet->item.toString().c_str());
@@ -635,6 +962,8 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, Containe
 		p->containerMenu->setSlot(packet->slot, &packet->item);
 		//p->containerMenu->setSlot(packet->slot, packet->item.isNull()? NULL : &packet->item);
 	}
+
+	p->inventory->print();
 }
 
 void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, SetHealthPacket* packet )
@@ -657,6 +986,8 @@ void ServerSideNetworkHandler::handle( const RakNet::RakNetGUID& source, SignUpd
 	if (!level)
 		return;
 
+		LOGI("SignUpdate: [%i, %i, %i]\n", packet->x, packet->y, packet->z);
+
 	TileEntity* te = level->getTileEntity(packet->x, packet->y, packet->z);
 	if (TileEntity::isType(te, TileEntityType::Sign)) {
 		SignTileEntity* ste = (SignTileEntity*) te;
@@ -713,3 +1044,9 @@ Player* ServerSideNetworkHandler::getPlayer( const RakNet::RakNetGUID& source )
         if (source == level->players[i]->owner) return level->players[i];
     return NULL;
 }
+
+void ServerSideNetworkHandler::sendPrivate(Packet& packet, const RakNet::RakNetGUID& source) {
+	RakNet::BitStream bitStream;
+	packet.write(&bitStream);
+	rakPeer->Send(&bitStream, HIGH_PRIORITY, RELIABLE_ORDERED, 0, source, false);
+}

src/network/ServerSideNetworkHandler.h

@@ -58,7 +58,8 @@ public:
 	virtual void handle(const RakNet::RakNetGUID& source, ContainerClosePacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, SignUpdatePacket* packet);
 	virtual void handle(const RakNet::RakNetGUID& source, ChatPacket* packet);
-
+	virtual void handle(const RakNet::RakNetGUID& source, WantCreatePacket* packet);
+	
 	bool allowsIncomingConnections() { return _allowIncoming; }
 	void allowIncomingConnections(bool doAllow);
 
@@ -70,6 +71,12 @@ private:
 	 * @brief Send packet to all players
 	 */
 	void redistributePacket(Packet* packet, const RakNet::RakNetGUID& fromPlayer);
+
+	/**
+	 * @brief Send packer private with GUID
+	 */
+	void sendPrivate(Packet& packet, const RakNet::RakNetGUID& source);
+
 	Player* getPlayer(const RakNet::RakNetGUID& source);
 
 	Minecraft*					minecraft;

src/network/command/CommandServer.cpp

@@ -236,9 +236,9 @@ std::string CommandServer::parse(ConnectedClient& client, const std::string& s)
 		if (x0 < 0) x0 = 0;
 		if (y0 < 0) y0 = 0;
 		if (z0 < 0) z0 = 0;
-		if (x1 >= LEVEL_WIDTH ) x1 = LEVEL_WIDTH  - 1;
-		if (y1 >= LEVEL_HEIGHT) y1 = LEVEL_HEIGHT - 1;
-		if (z1 >= LEVEL_DEPTH ) z1 = LEVEL_DEPTH  - 1;
+		if (x1 >= LevelConstants::LEVEL_WIDTH ) x1 = LevelConstants::LEVEL_WIDTH  - 1;
+		if (y1 >= LevelConstants::LEVEL_HEIGHT) y1 = LevelConstants::LEVEL_HEIGHT - 1;
+		if (z1 >= LevelConstants::LEVEL_DEPTH ) z1 = LevelConstants::LEVEL_DEPTH  - 1;
 
 		for (int y = y0; y <= y1; ++y)
 		for (int z = z0; z <= z1; ++z)
@@ -456,7 +456,7 @@ std::string CommandServer::parse(ConnectedClient& client, const std::string& s)
 			sw.start();
 
 			// Save a cuboid around the player
-			const int CSize = CHUNK_CACHE_WIDTH;
+			const int CSize = LevelConstants::CHUNK_CACHE_WIDTH;
 			int cx = (int)e->x / CSize;
 			int cz = (int)e->z / CSize;
 
@@ -504,7 +504,7 @@ bool CommandServer::handleCheckpoint(bool doRestore ) {
 	const int cz = restorePos.z;
 	const int y0 = restorePos.y;
 	const int y1 = y0 + RestoreHeight;
-	const int CSize = CHUNK_CACHE_WIDTH;
+	const int CSize = LevelConstants::CHUNK_CACHE_WIDTH;
 	const int numChunkBytes = RestoreHeight * CSize * CSize * 20 / 8;
 
 	if (!restoreBuffer) {

src/network/command/CommandServer.h

@@ -5,7 +5,7 @@
 #include <vector>
 
 #ifdef WIN32
-	#include <WinSock2.h>
+	#include <winsock2.h>
 #else
 	#include <sys/socket.h>
 	#include <netinet/in.h>

src/network/packet/ChunkDataPacket.h

@@ -33,18 +33,18 @@ public:
 		unsigned char* blockIds = chunk->getBlockData();
 		DataLayer& blockData = chunk->data;
 
-		const int setSize = LEVEL_HEIGHT / 8;
-		const int setShift = 4; // power of LEVEL_HEIGHT / 8
+		const int setSize = LevelConstants::LEVEL_HEIGHT / 8;
+		const int setShift = 4; // power of LevelConstants::LEVEL_HEIGHT / 8
 
 		chunkData.Reset();
-		for (int i = 0; i < CHUNK_COLUMNS; i++)
+		for (int i = 0; i < LevelConstants::CHUNK_COLUMNS; i++)
 		{
 			unsigned char updateBits = chunk->updateMap[i];
 			chunkData.Write(updateBits);
 
 			if (updateBits > 0)
 			{
-				int colDataPosition = (i % CHUNK_WIDTH) << 11 | (i / CHUNK_WIDTH) << 7;
+				int colDataPosition = (i % LevelConstants::CHUNK_WIDTH) << 11 | (i / LevelConstants::CHUNK_WIDTH) << 7;
 
 				for (int set = 0; set < 8; set++)
 				{

src/network/packet/LoginPacket.h

@@ -9,17 +9,20 @@ public:
 	RakNet::RakString clientName;
 	int clientNetworkVersion;
 	int clientNetworkLowestSupportedVersion;
+	bool newProto;
 
 	LoginPacket()
 	:	clientNetworkVersion(-1),
-		clientNetworkLowestSupportedVersion(-1)
+		clientNetworkLowestSupportedVersion(-1),
+		newProto(false)
 	{
 	}
 
-	LoginPacket(const RakNet::RakString& clientName, int clientVersion)
+	LoginPacket(const RakNet::RakString& clientName, int clientVersion, bool newProto)
 	:	clientName(clientName),
 		clientNetworkVersion(clientVersion),
-		clientNetworkLowestSupportedVersion(clientVersion)
+		clientNetworkLowestSupportedVersion(clientVersion),
+		newProto(newProto)
 	{
 	}
 
@@ -29,6 +32,7 @@ public:
 		bitStream->Write(clientName);
 		bitStream->Write(clientNetworkVersion);
 		bitStream->Write(clientNetworkLowestSupportedVersion);
+		bitStream->Write(newProto);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -39,6 +43,11 @@ public:
 		if (bitStream->GetNumberOfUnreadBits() > 0) {
 			bitStream->Read(clientNetworkVersion);
 			bitStream->Read(clientNetworkLowestSupportedVersion);
+			
+			// Checking for new proto
+			if (bitStream->GetNumberOfUnreadBits() > 0) {
+				bitStream->Read(newProto);
+			}
 		}
 	}
 

src/network/packet/LoginStatusPacket.h

@@ -3,10 +3,13 @@
 
 #include "../Packet.h"
 
+// wtf why not enum
 namespace LoginStatus {
 	const int Success = 0;
 	const int Failed_ClientOld = 1;
 	const int Failed_ServerOld = 2;
+	const int Failed_TakenNickname = 3;
+	const int Failed_Banned = 4;
 }
 
 class LoginStatusPacket : public Packet {

src/network/packet/PacketInclude.h

@@ -50,5 +50,7 @@
 #include "TileEventPacket.h"
 #include "UpdateBlockPacket.h"
 #include "UseItemPacket.h"
-
+#include "RemoveItemPacket.h"
+#include "WantCreatePacket.h"
+#include "TakeItemPacket.h"
 #endif /*NET_MINECRAFT_NETWORK_PACKET__PacketInclude_H__*/

src/network/packet/PlayerEquipmentPacket.h

@@ -9,15 +9,19 @@ public:
 	int entityId;
 	unsigned short itemId;
 	unsigned short itemAuxValue;
+	unsigned char selectedSlot;
+	unsigned char inventorySlot;
 
 	PlayerEquipmentPacket()
 	{
 	}
 
-	PlayerEquipmentPacket(int entityId, int itemId, int data)
+	PlayerEquipmentPacket(int entityId, int itemId, int data, int selSlot, int invSlot)
 	:	entityId(entityId),
 		itemId(itemId),
-		itemAuxValue(data)
+		itemAuxValue(data),
+		selectedSlot(selSlot),
+		inventorySlot(invSlot)
 	{
 	}
 
@@ -28,6 +32,8 @@ public:
 		bitStream->Write(entityId);
 		bitStream->Write(itemId);
 		bitStream->Write(itemAuxValue);
+		bitStream->Write(selectedSlot);
+		bitStream->Write(inventorySlot);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -35,6 +41,8 @@ public:
 		bitStream->Read(entityId);
 		bitStream->Read(itemId);
 		bitStream->Read(itemAuxValue);
+		bitStream->Read(selectedSlot);
+		bitStream->Read(inventorySlot);
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)

src/network/packet/RemoveItemPacket.h

@@ -0,0 +1,54 @@
+#ifndef NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__
+#define NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__
+
+//package net.minecraft.network.packet;
+
+#include "../Packet.h"
+
+class RemoveItemPacket: public Packet
+{
+public:
+    RemoveItemPacket() {
+    }
+
+    RemoveItemPacket(int playerId, int count, int auxValue, int itemId)
+	:
+		playerId(playerId),
+        count(count),
+		auxValue(auxValue),
+		itemId(itemId)
+	{
+    }
+
+	void write(RakNet::BitStream* bitStream)
+	{
+		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_REMOVEITEM));
+		bitStream->Write(itemId);
+		bitStream->Write(count);
+		bitStream->Write(auxValue);
+
+		bitStream->Write(playerId);
+	}
+
+	void read(RakNet::BitStream* bitStream)
+	{
+        bitStream->Read(itemId);
+        bitStream->Read(count);
+        bitStream->Read(auxValue);
+
+		bitStream->Read(playerId);
+	}
+
+	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
+	{
+		callback->handle(source, (RemoveItemPacket*)this);
+	}
+    
+    int playerId;
+
+    int itemId;
+	int count;
+	int auxValue;
+};
+
+#endif /*NET_MINECRAFT_NETWORK_PACKET__RemoveItemPacket_H__*/

src/network/packet/SendInventoryPacket.h

@@ -2,13 +2,14 @@
 #define NET_MINECRAFT_NETWORK_PACKET__SendInventoryPacket_H__
 
 #include "../Packet.h"
+#include "world/entity/player/Inventory.h"
+#include "world/inventory/FillingContainer.h"
+#include <array>
 
 class SendInventoryPacket: public Packet
 {
 public:
-	SendInventoryPacket()
-	{
-	}
+	SendInventoryPacket() {}
 
 	SendInventoryPacket(Player* player, bool dropItems)
 	:	entityId(player->entityId),
@@ -21,10 +22,15 @@ public:
 			ItemInstance* item = inv->getItem(i);
 			items.push_back(item? *item : ItemInstance());
         }
+
         for (int i = 0; i < NumArmorItems; ++i) {
             ItemInstance* item = player->getArmor(i);
             items.push_back(item? *item : ItemInstance());
         }
+
+		for (int i = 0; i < inv->numLinkedSlots; ++i) {
+            linkedSlot[i] = inv->linkedSlots[i];
+        }
 	}
 
 	void write(RakNet::BitStream* bitStream)
@@ -39,6 +45,13 @@ public:
         // Armor
         for (int i = 0; i < NumArmorItems; ++i)
             PacketUtil::writeItemInstance(items[i + numItems], bitStream);
+
+		int lSlots = Inventory::MAX_SELECTION_SIZE;
+
+		// Linked slots
+		bitStream->Write(lSlots);
+		for (int i = 0; i < lSlots; ++i)
+            bitStream->Write(linkedSlot[i]);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -50,6 +63,12 @@ public:
         // Inventory, Armor
 		for (int i = 0; i < numItems + NumArmorItems; ++i)
 			items.push_back(PacketUtil::readItemInstance(bitStream));
+
+		// Linked slots
+		int lSlots = 0;
+		bitStream->Read(lSlots);
+		for (int i = 0; i < lSlots; ++i)
+            bitStream->Read(linkedSlot[i]);
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
@@ -62,6 +81,8 @@ public:
 	short numItems;
 	unsigned char extra;
 
+	std::array<FillingContainer::LinkedSlot, Inventory::MAX_SELECTION_SIZE> linkedSlot;
+
 	static const int ExtraDrop = 1;
     static const int NumArmorItems = 4;
 };

src/network/packet/StartGamePacket.h

@@ -2,6 +2,7 @@
 #define NET_MINECRAFT_NETWORK_PACKET__StartGamePacket_H__
 
 #include "../Packet.h"
+#include "world/level/LevelConstants.h"
 #include <cstdint>
 
 class StartGamePacket : public Packet
@@ -14,18 +15,20 @@ public:
 	int entityId;
 	float x, y, z;
 
+	int chunkCacheWidth = 0;
 	StartGamePacket()
 	{
 	}
 
-	StartGamePacket(long seed, int levelGeneratorVersion, int gameType, int entityId, float x, float y, float z)
+	StartGamePacket(long seed, int levelGeneratorVersion, int gameType, int entityId, float x, float y, float z, int chunkCacheWidth)
 	:	levelSeed((int32_t)seed),
 		levelGeneratorVersion(levelGeneratorVersion),
 		gameType(gameType),
 		entityId(entityId),
 		x(x),
 		y(y),
-		z(z)
+		z(z),
+		chunkCacheWidth(chunkCacheWidth)
 	{
 	}
 
@@ -40,6 +43,7 @@ public:
 		bitStream->Write(x);
 		bitStream->Write(y);
 		bitStream->Write(z);
+		bitStream->Write(LevelConstants::CHUNK_CACHE_WIDTH);
 	}
 
 	void read(RakNet::BitStream* bitStream)
@@ -51,6 +55,10 @@ public:
 		bitStream->Read(x);
 		bitStream->Read(y);
 		bitStream->Read(z);
+
+		if (bitStream->GetNumberOfUnreadBits() > 0) {
+			bitStream->Read(chunkCacheWidth);
+		}
 	}
 
 	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)

src/network/packet/TakeItemPacket.h

@@ -0,0 +1,54 @@
+#ifndef NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__
+#define NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__
+
+//package net.minecraft.network.packet;
+
+#include "../Packet.h"
+
+class TakeItemPacket: public Packet
+{
+public:
+    TakeItemPacket() {
+    }
+
+    TakeItemPacket(int playerId, int count, int auxValue, int itemId)
+	:
+		playerId(playerId),
+        count(count),
+		auxValue(auxValue),
+		itemId(itemId)
+	{
+    }
+
+	void write(RakNet::BitStream* bitStream)
+	{
+		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_TAKEITEM));
+		bitStream->Write(itemId);
+		bitStream->Write(count);
+		bitStream->Write(auxValue);
+
+		bitStream->Write(playerId);
+	}
+
+	void read(RakNet::BitStream* bitStream)
+	{
+        bitStream->Read(itemId);
+        bitStream->Read(count);
+        bitStream->Read(auxValue);
+
+		bitStream->Read(playerId);
+	}
+
+	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
+	{
+		callback->handle(source, (TakeItemPacket*)this);
+	}
+    
+    int playerId;
+
+    int itemId;
+	int count;
+	int auxValue;
+};
+
+#endif /*NET_MINECRAFT_NETWORK_PACKET__TakeItemPacket_H__*/

src/network/packet/WantCreatePacket.h

@@ -0,0 +1,54 @@
+#ifndef NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__
+#define NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__
+
+//package net.minecraft.network.packet;
+
+#include "../Packet.h"
+
+class WantCreatePacket: public Packet
+{
+public:
+    WantCreatePacket() {
+    }
+
+    WantCreatePacket(int playerId, int count, int auxValue, int itemId)
+	:
+		playerId(playerId),
+        count(count),
+		auxValue(auxValue),
+		itemId(itemId)
+	{
+    }
+
+	void write(RakNet::BitStream* bitStream)
+	{
+		bitStream->Write((RakNet::MessageID)(ID_USER_PACKET_ENUM + PACKET_WANTCREATEITEM));
+		bitStream->Write(itemId);
+		bitStream->Write(count);
+		bitStream->Write(auxValue);
+
+		bitStream->Write(playerId);
+	}
+
+	void read(RakNet::BitStream* bitStream)
+	{
+        bitStream->Read(itemId);
+        bitStream->Read(count);
+        bitStream->Read(auxValue);
+
+		bitStream->Read(playerId);
+	}
+
+	void handle(const RakNet::RakNetGUID& source, NetEventCallback* callback)
+	{
+		callback->handle(source, (WantCreatePacket*)this);
+	}
+    
+    int playerId;
+
+    int itemId;
+	int count;
+	int auxValue;
+};
+
+#endif /*NET_MINECRAFT_NETWORK_PACKET__WantCreatePacket_H__*/

src/raknet/GetTime.cpp

@@ -140,7 +140,9 @@ RakNet::TimeUS GetTimeUS_Windows( void )
 #if _MSC_VER >= 1400 && defined (_M_X64)
 		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
 #else
+#ifndef __MINGW32__
 		GetProcessAffinityMask(mProc, &mProcMask, &mSysMask);
+#endif
 #endif
 		mThread = GetCurrentThread();
 

src/raknet/WindowsIncludes.h

@@ -1,8 +1,8 @@
 #if defined(X360__) 
 #elif defined (_WIN32)
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>
 
 // Must always include Winsock2.h before windows.h
 // or else:

src/server/ArgumentsSettings.cpp

@@ -17,6 +17,11 @@ ArgumentsSettings::ArgumentsSettings(int numArguments, char** arguments)
 				levelName = std::string(arguments[a+1]);
 				a++; // Skip the next argument since it's part of this one.
 			}
+		} else if(strcmp(arguments[a], "--gamemode") == 0) {
+			if(a + 1 < numArguments) {
+				gamemode = std::string(arguments[a+1]);
+				a++; // Skip the next argument since it's part of this one.
+			}
 		} else if(strcmp(arguments[a], "--leveldir") == 0) {
 			if(a + 1 < numArguments) {
 				levelDir = std::string(arguments[a+1]);
@@ -51,6 +56,9 @@ std::string ArgumentsSettings::getServerKey() {
 std::string ArgumentsSettings::getCachePath() {
 	return cachePath;
 }
+std::string ArgumentsSettings::getGamemode() {
+	return gamemode;
+}
 std::string ArgumentsSettings::getLevelDir() {
 	return levelDir;
 }

src/server/ArgumentsSettings.h

@@ -4,20 +4,27 @@
 class ArgumentsSettings {
 public:
 	ArgumentsSettings(int numArguments, char** arguments);
+
 	std::string getExternalPath();
 	std::string getLevelName();
 	std::string getServerKey();
 	std::string getCachePath();
 	std::string getLevelDir();
+	std::string getGamemode();
+
 	bool getShowHelp();
+
 	int getPort();
 private:
 	std::string cachePath;
 	std::string externalPath;
 	std::string levelName;
+	std::string gamemode;
 	std::string levelDir;
 	std::string serverKey;
+
 	bool showHelp;
+	
 	int port;
 };
 

src/server/ServerLevel.cpp

@@ -12,16 +12,19 @@ ServerLevel::ServerLevel(LevelStorage* levelStorage, const std::string& levelNam
 void ServerLevel::updateSleepingPlayerList() {
 	bool allPlayersWasSleeping = allPlayersAreSleeping;
 	allPlayersAreSleeping = !players.empty();
-	for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
+	
+	for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
 		Player* player = *it;
-		if(!player->isSleeping()) {
+		
+		if (!player->isSleeping()) {
 			allPlayersAreSleeping = false;
 			break;
 		}
 	}
-	if(!allPlayersWasSleeping && allPlayersAreSleeping) {
+	if (!allPlayersWasSleeping && allPlayersAreSleeping) {
 		levelEvent(NULL, LevelEvent::ALL_PLAYERS_SLEEPING, 0, 0, 0, 0);
-		for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
+		
+		for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
 			(*it)->setAllPlayersSleeping();
 		}
 	}
@@ -29,23 +32,26 @@ void ServerLevel::updateSleepingPlayerList() {
 
 void ServerLevel::awakenAllPlayers() {
 	allPlayersAreSleeping = false;
-	for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
+	
+	for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
 		Player* player = *it;
-		if(player->isSleeping()) {
+		
+		if (player->isSleeping()) {
 			player->stopSleepInBed(false, false, true);
 			player->health = Player::MAX_HEALTH;
 			player->lastHealth = Player::MAX_HEALTH; 
 		}
 	}
+	
 	SetHealthPacket packet(Player::MAX_HEALTH);
 	raknetInstance->send(packet);
 }
 
 bool ServerLevel::allPlayersSleeping() {
-	if(allPlayersAreSleeping && !isClientSide) {
+	if (allPlayersAreSleeping && !isClientSide) {
 		// all players are sleeping, but have they slept long enough?
-		for(PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
-			if(!(*it)->isSleepingLongEnough()) {
+		for (PlayerList::iterator it = players.begin(); it != players.end(); ++it) {
+			if (!(*it)->isSleepingLongEnough()) {
 				return false;
 			}
 		}
@@ -55,13 +61,17 @@ bool ServerLevel::allPlayersSleeping() {
 	return false;
 }
 
-void ServerLevel::tick(){
+void ServerLevel::tick() {
 	super::tick();
-	if(allPlayersSleeping()) {
+
+	if (allPlayersSleeping()) {
 		long newTime = levelData.getTime() + TICKS_PER_DAY;
+		
 		levelData.setTime(newTime - (newTime % TICKS_PER_DAY));
+		
 		SetTimePacket packet(levelData.getTime());
 		raknetInstance->send(packet);
+		
 		awakenAllPlayers();
 	}
 }

src/server/ServerPlayer.cpp

@@ -19,14 +19,17 @@
 #include "../network/packet/AnimatePacket.h"
 #include "../world/level/tile/entity/ChestTileEntity.h"
 #include "../network/packet/HurtArmorPacket.h"
+#include "network/packet/SendInventoryPacket.h"
+#include "world/entity/player/Inventory.h"
 
-ServerPlayer::ServerPlayer( Minecraft* minecraft, Level* level )
+ServerPlayer::ServerPlayer( Minecraft* minecraft, Level* level, bool proto)
 :   super(level, minecraft->isCreativeMode()),
 	_mc(minecraft),
 	_prevHealth(-999),
-	_containerCounter(0)
+	_containerCounter(0),
+	isNewProto(proto)
 {
-	hasFakeInventory = true;
+	// hasFakeInventory = true;
 	footSize = 0;
 }
 
@@ -67,7 +70,16 @@ void ServerPlayer::tick() {
 
 void ServerPlayer::take( Entity* e, int orgCount ) {
 	TakeItemEntityPacket packet(e->entityId, entityId);
+	// SendInventoryPacket packet(this, false);
 	_mc->raknetInstance->send(packet);
+	printf("TakeItemEntityPacket \n");
+
+	LOGI("Inventory:\n");
+	for (int i = 0; i < inventory->numLinkedSlots; i++) {
+		auto item = inventory->getItem(i);
+		if (item)
+			LOGI("\t %i: %s (%i)\n", i, item->getName().c_str(), item->count);
+	}
 
 	super::take(e, orgCount);
 }
@@ -118,20 +130,20 @@ bool ServerPlayer::hasResource( int id ) {
 void ServerPlayer::setContainerData( BaseContainerMenu* menu, int id, int value ) {
 	ContainerSetDataPacket p(menu->containerId, id, value);
 	_mc->raknetInstance->send(owner, p);
-	//LOGI("Setting container data for id %d: %d\n", id, value);
+	LOGI("Setting container data for id %d: %d\n", id, value);
 }
 
 void ServerPlayer::slotChanged( BaseContainerMenu* menu, int slot, const ItemInstance& item, bool isResultSlot ) {
 	if (isResultSlot) return;
 	ContainerSetSlotPacket p(menu->containerId, slot, item);
 	_mc->raknetInstance->send(owner, p);
-	//LOGI("Slot %d changed\n", slot);
+	LOGI("Slot %d changed\n", slot);
 }
 
 void ServerPlayer::refreshContainer( BaseContainerMenu* menu, const std::vector<ItemInstance>& items ) {
 	ContainerSetContentPacket p(menu->containerId, menu->getItems());
 	_mc->raknetInstance->send(owner, p);
-	//LOGI("Refreshing container with %d items\n", items.size());
+	LOGI("Refreshing container with %zu items\n", items.size());
 }
 
 void ServerPlayer::nextContainerCounter() {
@@ -163,3 +175,12 @@ void ServerPlayer::displayClientMessage( const std::string& messageId ) {
 	ChatPacket package(messageId);
 	_mc->raknetInstance->send(owner, package);
 }
+
+void ServerPlayer::causeFallDamage(float distance) {
+	int dmg = (int) ceil((distance - 3));
+	if (dmg > 0) {
+		SetHealthPacket packet(SetHealthPacket::HEALTH_MODIFY_OFFSET + dmg);
+		_mc->raknetInstance->send(owner, packet);
+	}
+	super::causeFallDamage(distance);
+}

src/server/ServerPlayer.h

@@ -15,7 +15,7 @@ class ServerPlayer: public Player,
 {
     typedef Player super;
 public:
-    ServerPlayer(Minecraft* minecraft, Level* level);
+    ServerPlayer(Minecraft* minecraft, Level* level, bool proto);
 
 	~ServerPlayer();
 
@@ -43,6 +43,17 @@ public:
 	virtual void stopSleepInBed(bool forcefulWakeUp, bool updateLevelList, bool saveRespawnPoint);
 
 	void completeUsingItem();
+	
+	void setLastMoveTicks(int lastMoveTicks) { this->lastMoveTicks = lastMoveTicks; }
+	int getLastMoveTicks() { return lastMoveTicks; }
+
+	void setTicksInAir(int ticksInAir) { this->ticksInAir = ticksInAir; }
+	int getTicksInAir() { return ticksInAir; }
+
+	void setNewProto(bool proto) { isNewProto = proto; }
+	bool getProto() { return isNewProto; }
+
+	virtual void causeFallDamage(float distance);
 private:
 	void nextContainerCounter();
 	void setContainerMenu( BaseContainerMenu* menu );
@@ -50,6 +61,11 @@ private:
 	Minecraft* _mc;
     int _prevHealth;
 	int _containerCounter;
+
+	int lastMoveTicks = 0;
+	int ticksInAir = 0;
+
+	bool isNewProto = false;
 };
 
 #endif /*ServerPlayer_H__*/

src/world/entity/Entity.cpp

@@ -871,8 +871,8 @@ bool Entity::load( CompoundTag* tag )
 
     // Add a small padding if standing next to the world edges
     const float padding = bbWidth * 0.5f + 0.001f;
-    xx = Mth::clamp(xx, padding, (float)LEVEL_WIDTH - padding);
-    zz = Mth::clamp(zz, padding, (float)LEVEL_DEPTH - padding);
+    xx = Mth::clamp(xx, padding, (float)LevelConstants::LEVEL_WIDTH - padding);
+    zz = Mth::clamp(zz, padding, (float)LevelConstants::LEVEL_DEPTH - padding);
 
     xo = xOld = x = xx;
     yo = yOld = y = yy;

src/world/entity/Entity.h

@@ -129,6 +129,7 @@ public:
 	virtual bool isHangingEntity();
 
 	virtual int getAuxData();
+	virtual void checkFallDamage(float ya, bool onGround);
 
 protected:
 	virtual void setRot(float yRot, float xRot);
@@ -137,7 +138,6 @@ protected:
 	virtual void resetPos(bool clearMore);
 	virtual void outOfWorld();
 
-	virtual void checkFallDamage(float ya, bool onGround);
 	virtual void causeFallDamage(float fallDamage2);
 	virtual void markHurt();
 

src/world/entity/Mob.cpp

@@ -729,7 +729,6 @@ bool Mob::isWaterMob()
 void Mob::aiStep()
 {
 	//@todo? 30 lines of code here in java version
-
 	TIMER_PUSH("ai");
 	if (isImmobile()) {
 		jumping = false;

src/world/entity/Mob.h

@@ -223,6 +223,9 @@ protected:
 	double xc, yc, zc;
 
 public:
+	void setxxa(float xxa) { this->xxa = xxa; }
+	void setyya(float yya) { this->yya = yya; }
+
 	// Cape position accessors (for renderers)
 	double getCapeX() const { return xCape; }
 	double getCapeY() const { return yCape; }

src/world/entity/player/Inventory.cpp

@@ -357,3 +357,12 @@ bool Inventory::removeItem( const ItemInstance* samePtr ) {
 	}
 	return false;
 }
+
+void Inventory::print() {
+	LOGI("%s's Inventory:\n", player->name.c_str());
+
+	for (int i = 0; i < numTotalSlots; i++) {
+		auto item = getItem(i);
+		if (item) LOGI("\t %i: %s (%i) %s\n", i, item->getName().c_str(), item->count, (player->inventory->getLinked(i))? "(Linked)" : "");
+	}
+}

src/world/entity/player/Inventory.h

@@ -45,6 +45,8 @@ public:
 	int				getAttackDamage(Entity* entity);
 	float			getDestroySpeed(Tile* tile);
 	bool			canDestroy(Tile* tile);
+
+	void print();
 private:
 	void			setupDefault();
 public:

src/world/inventory/FillingContainer.cpp

@@ -141,6 +141,11 @@ bool FillingContainer::add( ItemInstance* item )
 	//	// silently destroy the item when having a full inventory
 	//	item->count = 0;
 	//	return true;
+
+		LOGI("Inventory:\n");
+		for (int i = 0; i < numTotalSlots; i++) {
+			LOGI("\t %i: %s (%i)\n", i, items.at(i)->getName().c_str(), items.at(i)->count);
+		}
 	}
 
 	return false;

src/world/item/ItemInstance.cpp

@@ -290,3 +290,7 @@ bool ItemInstance::isArmorItem( const ItemInstance* instance ) {
 
 	return item->isArmor();
 }
+
+bool ItemInstance::isBlock(const ItemInstance* instance) {
+    return instance->id < 256;
+}

src/world/item/ItemInstance.h

@@ -81,6 +81,8 @@ public:
 
 	static bool isArmorItem(const ItemInstance* instance);
 
+    static bool isBlock(const ItemInstance* instance);
+
     /**
      * Checks if this item is the same item as the other one, disregarding the
      * 'count' value.