Update pause and chat button textures

Increase size of pause and chat buttons
2026-03-20 23:04:34 +02:00 · 2026-03-20 23:03:43 +02:00
248 changed files with 5431 additions and 13446 deletions
--- a/.github/actions/setup-ninja/action.yml
+++ b/.github/actions/setup-ninja/action.yml
@@ -1,17 +0,0 @@
 name: Setup Ninja
 description: Sets up Ninja
 inputs:
  host:
    description: 'Host platform: win, mac or linux'
    required: true
 runs:
  using: "composite"
  steps:
  - name: Setup
    shell: bash
    run: |
      curl -L https://github.com/ninja-build/ninja/releases/latest/download/ninja-${{ inputs.host }}.zip -o ninja.zip
      7z x ninja.zip -o"$GITHUB_WORKSPACE/ninja"
      echo "$GITHUB_WORKSPACE/ninja" >> $GITHUB_PATH
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,8 @@ permissions:
 jobs:
  build-windows:
-    name: Build Windows
+    name: Windows Build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
@@ -27,19 +27,59 @@ jobs:
      - name: Setup caches
        uses: ./.github/actions/setup-cache
        with:
-          host: linux
+          host: win
          target: win
-      - name: Setup Ninja
+      - name: Download xwin
-        uses: ./.github/actions/setup-ninja
+        uses: robinraju/release-downloader@v1.10
        with:
-          host: linux
+          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: Download llvm-mingw
+      - name: Prepare xwin
        run: |
-          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 -xzf epic-xwin/xwin-*-x86_64-unknown-linux-musl.tar.gz -C epic-xwin
-          tar -xf llvm-mingw.tar.xz
+          mv epic-xwin/xwin-*-x86_64-unknown-linux-musl/xwin ./xwin
-          mv llvm-mingw-* llvm-mingw
+          ./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 clang-msvc-sdk toolchain
        uses: actions/checkout@v4
        with:
          repository: 'Nemirtingas/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
      - name: Create Build Environment
        # Some projects don't allow in-source building, so create a separate build directory
@@ -48,59 +88,29 @@ jobs:
      - name: Configure CMake
        working-directory: ${{github.workspace}}/build
-        run: |
+        run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-          cmake $GITHUB_WORKSPACE \
+        env:
-            -G Ninja \
+          SPLAT_DIR: ${{ github.workspace }}/.xwin-cache/splat
-            -DCMAKE_SYSTEM_NAME=Windows \
+          TOOLCHAIN: ${{ github.workspace }}/toolchain/clang-cl-msvc.cmake
-            -DCMAKE_C_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang \
+          HOST_ARCH: x86_64
            -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
-        run: |
+        run: cmake --build . --config $env:BUILD_TYPE --target MinecraftPE --parallel
          cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
          cmake --build . --config $BUILD_TYPE --target MinecraftPE-server --parallel
      - name: Upload Artifact
        uses: actions/upload-artifact@v4
        with:
          name: mcpe-windows
          path: |
-            ${{github.workspace}}/build/MinecraftPE-server.exe
+            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/MinecraftPE.exe
-            ${{github.workspace}}/build/MinecraftPE.exe
+            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/glfw3.dll
-            ${{github.workspace}}/build/libpng16.dll
+            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/libpng16.dll
-            ${{github.workspace}}/build/OpenAL32.dll
+            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/OpenAL32.dll
-            ${{github.workspace}}/build/libz.dll
+            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/z.dll
  build-ios:
  # credit to pengubow from deepfriedwaffles repo
    name: Build iOS
    runs-on: macos-latest
    steps:
      - name: Checkout
        uses: actions/checkout@main
      - name: Build
        run: |
          cd project/iosproj
          xcodebuild -scheme minecraftpe -derivedDataPath build -destination 'generic/platform=iOS' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
          mkdir -p Payload
          cp -R build/Build/Products/Debug-iphoneos/minecraftpe.app Payload/
          zip -r minecraftpe.ipa Payload
          rm -rf Payload
      - name: Upload artifact
        uses: actions/upload-artifact@main
        with:
          name: minecraftpe-ios
          path: project/iosproj/minecraftpe.ipa
  build-linux:
-    name: Build Linux
+    name: Linux Build
    runs-on: ubuntu-latest
    steps:
@@ -146,7 +156,7 @@ jobs:
            ${{github.workspace}}/build/MinecraftPE-server
  build-android: # pray to god
-    name: Build Android (${{ matrix.abi }})
+    name: Build Android APK (${{ matrix.abi }})
    runs-on: ubuntu-latest
    strategy:
@@ -219,6 +229,16 @@ jobs:
          distribution: temurin
          java-version: 25
      - name: Validate environment
        run: |
          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
          echo "ANDROID_NDK_PATH=$ANDROID_NDK_PATH"
          echo "JAVA_HOME=$JAVA_HOME"
          echo "MATRIX_ABI=$MATRIX_ABI"
          $ANDROID_SDK_ROOT/platform-tools/adb version || true
          java -version
          javac -version
      - name: Run Android build script
        run: |
          chmod +x ./build.sh
@@ -231,59 +251,11 @@ 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-ios, build-linux, build-android, build-web ]
+    needs: [ build-windows, build-linux, build-android ]
    if: github.ref == 'refs/heads/main'
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -300,44 +272,32 @@ jobs:
      - name: Zip Windows Artifacts
        uses: vimtor/action-zip@v1.2
        with:
-          files: mcpe-windows/MinecraftPE.exe mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/libz.dll
+          files: data mcpe-windows/MinecraftPE.exe mcpe-windows/glfw3.dll mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/z.dll
          dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
      - name: Zip Windows Server Artifacts
        uses: vimtor/action-zip@v1.2
        with:
          files: mcpe-windows/MinecraftPE-server.exe
          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}-windows.zip
      - name: Zip Linux Artifacts
        uses: vimtor/action-zip@v1.2
        with:
-          files: mcpe-linux/MinecraftPE
+          files: data mcpe-linux/MinecraftPE
          dest: minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
      - name: Zip Linux Server Artifacts
        uses: vimtor/action-zip@v1.2
        with:
          files: mcpe-linux/MinecraftPE-server
-          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}-linux.zip
+          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
-      - name: Rename Android Artifacts
+      - name: Zip Android arm64-v8a Artifact
        run: |
          mv minecraftpe-apk-arm64-v8a/minecraftpe-v8a-debug.apk minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.apk
          mv minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.apk
      - 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
+          files: minecraftpe-apk-arm64-v8a/minecraftpe-v8a-debug.apk
-          dest: minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
-      - name: Zip Data
+      - name: Zip Android armeabi-v7a Artifact
        uses: vimtor/action-zip@v1.2
        with:
-          files: data
+          files: minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk
-          recursive: false
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
          dest: data.zip
      - name: Update Development Release
        uses: andelf/nightly-release@main
@@ -349,14 +309,8 @@ jobs:
          body: |
            MinecraftPE development release for commit ${{ github.sha }}.
          files: |
            ./data.zip
            ./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
            ./minecraftpe-server-${{ steps.ref.outputs.hash }}-windows.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
-            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.apk
+            ./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.apk
            ./minecraftpe-server-${{ steps.ref.outputs.hash }}-linux.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,14 @@ project(MinecraftPE)
 include(cmake/CPM.cmake)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
 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)
@@ -21,23 +26,12 @@ 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)
-        include_directories(misc/windows)
+        set(EXTRA_LIBS ws2_32)
        set(EXTRA_LIBS ws2_32 winhttp)
        add_definitions(-DLUA_DL_DLL=1)
    elseif(UNIX)
        find_library(pthread NAMES pthread)
        set(EXTRA_LIBS pthread m)
        add_definitions(-DLUA_USE_DLOPEN=1)
    endif()
 elseif (${PLATFORM} STREQUAL "Web")
@@ -57,7 +51,6 @@ 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"
    )
@@ -96,46 +89,6 @@ else()
            "GLFW_BUILD_TESTS OFF"
            "GLFW_BUILD_DOCS OFF"
    )
    CPMAddPackage("gh:halx99/sol2#support-lua-5.5")
    CPMAddPackage("gh:lua/lua#master")
    add_library(
        lua STATIC
        ${lua_SOURCE_DIR}/lapi.c
        ${lua_SOURCE_DIR}/lauxlib.c
        ${lua_SOURCE_DIR}/lbaselib.c
        ${lua_SOURCE_DIR}/lcode.c
        ${lua_SOURCE_DIR}/lcorolib.c
        ${lua_SOURCE_DIR}/lctype.c
        ${lua_SOURCE_DIR}/ldblib.c
        ${lua_SOURCE_DIR}/ldebug.c
        ${lua_SOURCE_DIR}/ldo.c
        ${lua_SOURCE_DIR}/ldump.c
        ${lua_SOURCE_DIR}/lfunc.c
        ${lua_SOURCE_DIR}/lgc.c
        ${lua_SOURCE_DIR}/linit.c
        ${lua_SOURCE_DIR}/liolib.c
        ${lua_SOURCE_DIR}/llex.c
        ${lua_SOURCE_DIR}/lmathlib.c
        ${lua_SOURCE_DIR}/lmem.c
        ${lua_SOURCE_DIR}/loadlib.c
        ${lua_SOURCE_DIR}/lobject.c
        ${lua_SOURCE_DIR}/lopcodes.c
        ${lua_SOURCE_DIR}/loslib.c
        ${lua_SOURCE_DIR}/lparser.c
        ${lua_SOURCE_DIR}/lstate.c
        ${lua_SOURCE_DIR}/lstring.c
        ${lua_SOURCE_DIR}/lstrlib.c
        ${lua_SOURCE_DIR}/ltable.c
        ${lua_SOURCE_DIR}/ltablib.c
        ${lua_SOURCE_DIR}/ltm.c
        ${lua_SOURCE_DIR}/lua.c
        ${lua_SOURCE_DIR}/lundump.c
        ${lua_SOURCE_DIR}/lutf8lib.c
        ${lua_SOURCE_DIR}/lvm.c
        ${lua_SOURCE_DIR}/lzio.c
    )
 endif()
 CPMAddPackage(
@@ -147,11 +100,9 @@ CPMAddPackage(
        "ALSOFT_TESTS OFF"
        "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"
@@ -190,6 +141,7 @@ file(GLOB SERVER_SOURCES
    "src/platform/CThread.cpp"
    "src/platform/HttpClient.cpp"
    "src/platform/PngLoader.cpp"
    "src/platform/time.cpp"
    "src/platform/input/Controller.cpp"
@@ -205,7 +157,6 @@ file(GLOB SERVER_SOURCES
    "src/util/Mth.cpp"
    "src/util/PerfTimer.cpp"
    "src/util/StringUtils.cpp"
    "src/util/Color.cpp"
    "src/world/Direction.cpp"
@@ -239,9 +190,6 @@ file(GLOB SERVER_SOURCES
    "src/world/level/dimension/Dimension.cpp"
    "src/world/level/dimension/FoliageColor.cpp"
    "src/world/level/GrassColor.cpp"
    "src/world/level/levelgen/*.cpp"
    "src/world/level/levelgen/feature/Feature.cpp"
    "src/world/level/levelgen/synth/*.cpp"
@@ -255,9 +203,6 @@ file(GLOB SERVER_SOURCES
    "src/world/level/tile/entity/*.cpp"
    "src/world/phys/HitResult.cpp"
    "src/commands/*.cpp"
    "src/plugins/*.cpp"
 ) 
 file(GLOB CLIENT_SOURCES 
@@ -304,8 +249,6 @@ file(GLOB CLIENT_SOURCES
    "src/util/**.cpp"
    "src/util/Color.cpp"
    "src/world/*.cpp"
    "src/world/phys/*.cpp"
    "src/world/entity/*.cpp"
@@ -341,10 +284,6 @@ file(GLOB CLIENT_SOURCES
    "src/AppPlatform_glfw.cpp"
    "src/main.cpp"
    "src/commands/*.cpp"
    "src/plugins/*.cpp"
 )
 if (${PLATFORM} STREQUAL "Desktop")
@@ -352,21 +291,20 @@ if (${PLATFORM} STREQUAL "Desktop")
 endif()
 # Server
-add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
+if(UNIX)
-set_target_properties("${PROJECT_NAME}-server" PROPERTIES ENABLE_EXPORTS TRUE)
+    add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
 target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
-target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
    "${CMAKE_SOURCE_DIR}/src/"
    "${lua_SOURCE_DIR}/"
-    "project/lib_projects/raknet/jni/RaknetSources"
+    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
-)
+        "${CMAKE_SOURCE_DIR}/src/"
        "project/lib_projects/raknet/jni/RaknetSources"
    )
-target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBS} lua sol2::sol2)
+    target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
 endif()
 add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
 set_target_properties(${PROJECT_NAME} PROPERTIES ENABLE_EXPORTS TRUE)
 target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
@@ -376,18 +314,16 @@ target_include_directories(${PROJECT_NAME} PUBLIC
    "${openal_SOURCE_DIR}/include"
    "${glfw_SOURCE_DIR}/include"
    "lib/include"
    "${lua_SOURCE_DIR}/"
 )
 if(${PLATFORM} MATCHES "Web")
    set(CMAKE_CXX_STANDARD 11)
    # uuuh i hate it
-    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sUSE_LIBPNG=1 -sSHARED_MEMORY=1")
+    set(EM_FLAGS "-pthread -sUSE_PTHREADS=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")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data -sPROXY_TO_PTHREAD")
    target_compile_options(${PROJECT_NAME} PUBLIC
        "-Os"
@@ -425,7 +361,7 @@ endif()
 # Client
 target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
-target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS} lua sol2::sol2)
+target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})
 if (OpenSSL_FOUND)
    target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ cmake --build .
   $HOME/Android/Sdk/cmdline-tools/bin/sdkmanager
   ```
-   > [!Note] 
+   > [!NOTE] 
   > `sdkmanager` expects the SDK to include a `cmdline-tools/latest/` folder.
   > If you only have `cmdline-tools/bin`, create the required layout:
   >
@@ -134,7 +134,7 @@ cmake --build .
   sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0"
   ```
-   > [!Note]
+   > [!NOTE]
   > if you want build.sh to always find the SDK,
   > Set ANDROID_SDK_ROOT in your shell config (~/.bashrc / ~/.profile / ~/.config/fish/config.fish), for example:
   >
@@ -162,14 +162,14 @@ cmake --build .
 7. Extract the archive to `/home/username/`, so that the final directory path is `/home/username/android-ndk-r14b/` 
-   > [!Warning]
+   > [!WARNING]
   > Make sure you don’t end up with a nested folder like `/home/username/android-ndk-r14b/android-ndk-r14b/`.
 8. Re run `build.sh`
 ## Web
 1. Download and install **emsdk**: https://emscripten.org/docs/getting_started/downloads.html
-   > [!Note]
+   > [!NOTE]
   > On arch linux you can use AUR:
   > `yay -Sy emsdk`
@@ -179,7 +179,7 @@ cmake --build .
   cmake .. -B . -G Ninja "-DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
   cmake --build . --target MinecraftPE
   ```
-   > [!Note]
+   > [!NOTE]
   > If you are using VSCode with CMake plugin, you can add Emscripten kit
   > 1. Press Ctrl + Shift + P
   > 2. Type `CMake: Edit User-Local CMake Kits` and hit Enter
@@ -198,38 +198,3 @@ cmake --build .
   ```
   emrun --port 8080 .
   ```
 ## iOS
 ### Xcode
 > [Note!]
 > There's a precompiled IPA artifact in the GitHub mirror under Actions for those who either don't have Macs or don't want to build themself. But if you want to build youself, you'll need a Mac with Xcode. Download Xcode from the Mac App Store.
 ### 1. Clone
 Open your terminal and clone the repository
 ```bash
 git clone https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git
 cd minecraft-pe-0.6.1
 ```
 You can also build from the ios-support branch by checking out to it
 ```
 git checkout ios-support
 ```
 ### 2. Open in Xcode
 The project file is in `minecraft-pe-0.6.1/project/iosproj/minecraftpe.xcodeproj`. Open it.
 ### 3. Configure Code Signing
 Before you can deploy to an iPhone, you must sign the app with your own Apple Developer account:
 1. Select the **minecraftpe** project in the left sidebar.
 2. Go to **Signing & Capabilities**.
 3. Change the **Bundle Identifier** to something unique (e.g., `com.yourname.mcpe`).
 4. Select your **Team** from the dropdown menu.
 ### 4. Build and Run
 1. Connect your iPhone via USB or LAN.
 2. Select your device from the run destination menu at the top of Xcode.
 3. Press **Cmd + R** (or the Play button).
 4. **Note:** If you encounter a "Developer Mode" or "Untrusted Developer" error on your phone, go to **Settings > General > VPN & Device Management** to trust your certificate.
--- a/data/images/gui/gui.png
+++ b/data/images/gui/gui.png
--- a/data/images/misc/foliagecolor.png
+++ b/data/images/misc/foliagecolor.png
--- a/data/images/misc/grasscolor.png
+++ b/data/images/misc/grasscolor.png
--- a/data/images/misc/shadow.png
+++ b/data/images/misc/shadow.png
--- a/data/images/misc/vignette.png
+++ b/data/images/misc/vignette.png
--- a/data/images/misc/water.png
+++ b/data/images/misc/water.png
--- a/data/images/terrain/moon.png
+++ b/data/images/terrain/moon.png
--- a/data/images/terrain/sun.png
+++ b/data/images/terrain/sun.png
--- a/data/lang/en_US.lang
+++ b/data/lang/en_US.lang
@@ -153,33 +153,7 @@ options.group.tweaks=Tweaks
 options.allowSprint=Allow sprint
 options.barOnTop=HUD above inventory
 options.rpiCursor=Show Raspberry PI cursor
-options.foliagetint=Foliage Tinting
+options.autojump=Auto Jump
 options.javaHud=Beta Java hotbar tweaks
 options.blockOutline=Block Outline Selection
 options.fogType=Fog/Sky Color
 options.fogType.vanilla=Vanilla
 options.fogType.java=Beta Java
 options.fogType.unused=Unused
 options.debugStyle=Debug Menu Style
 options.debugStyle.javaBeta=Java Beta
 options.debugStyle.custom=Custom
 options.beautifulSky=Beautiful Skies
 options.useVignette=Vignette Overlay
 options.tintedSide=Tint Grass Sides
 options.betaSky=Java Beta Sky
 options.restoredAnims=Restored Animations
 options.normalLighting=Java Beta/Normals Shading
 options.isJoyTouchArea=Use Split Controls
 options.autoJump=Auto Jump
 options.thirdperson=Third Person
 options.servervisible=Server Visible
 options.sensitivity=Sensitivity
@@ -208,10 +182,9 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.medium=Medium
+options.guiScale.normal=Normal
 options.guiScale.large=Large
 options.guiScale.larger=Larger
 options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended
@@ -229,12 +202,6 @@ options.fancyGraphics=Fancy graphics
 options.renderDebug=Debug render
 options.anaglyph3d=3D anaglyph
 options.windowScale =Window Scaling
 options.menuStyle =Menu Style 
 options.menuStyle.pocket =Pocket Edition
 options.menuStyle.xperia =Xperia/Pi
 options.menuStyle.java =Java Beta
 performance.max=Max FPS
 performance.balanced=Balanced
--- a/misc/web/index.html
+++ b/misc/web/index.html
@@ -1,46 +1,143 @@
-<!DOCTYPE html>
+<!doctype html>
-<html lang="en">
+<html lang="en-us">
-<head>
+  <head>
-  <meta charset="UTF-8">
+    <meta charset="utf-8">
-  <title>MCPE 0.6.1</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <style>
+    <title>Emscripten-Generated Code</title>
-    html, body {
+    <style>
-      margin: 0;
+      .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
-      padding: 0;
+      textarea.emscripten { font-family: monospace; width: 80%; }
-      height: 100%;
+      div.emscripten { text-align: center; }
-      background: black;
+      div.emscripten_border { border: 1px solid black; }
-      overflow: hidden;
+      /* the canvas *must not* have any border or padding, or mouse coords will be wrong */
-    }
+      canvas.emscripten { border: 0px none; background-color: black; }
-    #canvas {
+      .spinner {
-      width: 100vw;
+        height: 50px;
-      height: 100vh;
+        width: 50px;
-      display: block;
+        margin: 0px auto;
-    }
+        -webkit-animation: rotation .8s linear infinite;
-  </style>
+        -moz-animation: rotation .8s linear infinite;
-</head>
+        -o-animation: rotation .8s linear infinite;
-<body>
+        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 id="canvas"></canvas>
+    </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>
-<script>
+    <hr/>
-  var Module = {
+    <textarea class="emscripten" id="output" rows="8"></textarea>
-    canvas: document.getElementById('canvas'),
+    <hr>
-    onRuntimeInitialized: function () { resizeCanvas() }
+    <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
-  function resizeCanvas() {
+      // As a default initial behavior, pop up an alert when webgl context is lost. To make your
-    const canvas = Module.canvas;
+      // application robust, you may want to override this behavior before shipping!
-    canvas.width = window.innerWidth;
+      // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
-    canvas.height = window.innerHeight;
+      canvasElement.addEventListener("webglcontextlost", (e) => {
-  }
+        alert('WebGL context lost. You will need to reload the page.');
        e.preventDefault();
      }, false);
-  window.addEventListener('resize', resizeCanvas);
+      function setStatus(text) {
-  window.addEventListener('onunload', () => {
+        if (!setStatus.last) setStatus.last = { time: Date.now(), text: '' };
-    FS.syncfs(true, function (err) { console.log('Sync FS failed: ' + err) });
+        if (text === setStatus.last.text) return;
-  })
+        var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-</script>
+        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;
      }
-<script src="MinecraftPE.js"></script>
+      var Module = {
-</body>
+        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>
 </html>
--- a/project/android/assets/lang/en_US.lang
+++ b/project/android/assets/lang/en_US.lang
@@ -168,10 +168,9 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.medium=Medium
+options.guiScale.normal=Normal
 options.guiScale.large=Large
 options.guiScale.larger=Larger
 options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended
--- a/project/android/jni/Android.mk
+++ b/project/android/jni/Android.mk
@@ -98,7 +98,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/player/RemotePlayer.cpp \
 ../../../src/client/player/input/KeyboardInput.cpp \
 ../../../src/client/player/input/touchscreen/TouchscreenInput.cpp \
 ../../../src/client/renderer/Lighting.cpp \
 ../../../src/client/renderer/Chunk.cpp \
 ../../../src/client/renderer/EntityTileRenderer.cpp \
 ../../../src/client/renderer/GameRenderer.cpp \
@@ -110,7 +109,6 @@ 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 \
@@ -141,12 +139,6 @@ 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 \
@@ -154,7 +146,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/util/StringUtils.cpp \
 ../../../src/util/PerfTimer.cpp \
 ../../../src/util/PerfRenderer.cpp \
 ../../../src/util/Color.cpp \
 ../../../src/world/Direction.cpp \
 ../../../src/world/entity/AgableMob.cpp \
 ../../../src/world/entity/Entity.cpp \
@@ -218,8 +209,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/MobSpawner.cpp \
 ../../../src/world/level/Region.cpp \
 ../../../src/world/level/TickNextTickData.cpp \
 ../../../src/world/level/FoliageColor.cpp \
 ../../../src/world/level/GrassColor.cpp \
 ../../../src/world/level/biome/Biome.cpp \
 ../../../src/world/level/biome/BiomeSource.cpp \
 ../../../src/world/level/chunk/LevelChunk.cpp \
--- a/project/android_java/assets/lang/en_US.lang
+++ b/project/android_java/assets/lang/en_US.lang
@@ -168,10 +168,8 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.medium=Medium
+options.guiScale.normal=Normal
 options.guiScale.large=Large
 options.guiScale.larger=Larger
 options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended
--- a/project/android_java/jni/Android.mk
+++ b/project/android_java/jni/Android.mk
@@ -75,7 +75,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/player/RemotePlayer.cpp \
 ../../../src/client/player/input/KeyboardInput.cpp \
 ../../../src/client/player/input/touchscreen/TouchscreenInput.cpp \
 ../../../src/client/renderer/Lighting.cpp \
 ../../../src/client/renderer/Chunk.cpp \
 ../../../src/client/renderer/EntityTileRenderer.cpp \
 ../../../src/client/renderer/GameRenderer.cpp \
@@ -123,7 +122,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/util/StringUtils.cpp \
 ../../../src/util/PerfTimer.cpp \
 ../../../src/util/PerfRenderer.cpp \
 ../../../src/util/Color.cpp \
 ../../../src/world/Direction.cpp \
 ../../../src/world/entity/AgableMob.cpp \
 ../../../src/world/entity/Entity.cpp \
@@ -185,8 +183,6 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/MobSpawner.cpp \
 ../../../src/world/level/Region.cpp \
 ../../../src/world/level/TickNextTickData.cpp \
 ../../../src/world/level/FoliageColor.cpp \
 ../../../src/world/level/GrassColor.cpp \
 ../../../src/world/level/biome/Biome.cpp \
 ../../../src/world/level/biome/BiomeSource.cpp \
 ../../../src/world/level/chunk/LevelChunk.cpp \
@@ -232,7 +228,6 @@ 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)
--- a/project/android_java/res/raw/burp1.ogg
+++ b/project/android_java/res/raw/burp1.ogg
--- a/project/android_java/src/com/mojang/minecraftpe/sound/SoundPlayer.java
+++ b/project/android_java/src/com/mojang/minecraftpe/sound/SoundPlayer.java
@@ -129,7 +129,6 @@ public class SoundPlayer
 			new SoundId(R.raw.eat1, "random.eat"),
 			new SoundId(R.raw.eat2, "random.eat"),
 			new SoundId(R.raw.eat3, "random.eat"),
 			new SoundId(R.raw.burp1, "random.burp"),
 			new SoundId(R.raw.fuse, "random.fuse"),
 			new SoundId(R.raw.zpig1, "mob.zombiepig.zpig"),
--- a/project/iosproj/Launch
+++ b/project/iosproj/Launch
@@ -1,48 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
    <dependencies>
        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
    </dependencies>
    <scenes>
        <!--View Controller-->
        <scene sceneID="EHf-IW-A2E">
            <objects>
                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
                                <rect key="frame" x="0.0" y="626.5" width="375" height="20.5"/>
                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="minecraftpe" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <nil key="highlightedColor"/>
                            </label>
                        </subviews>
                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <constraints>
                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
                        </constraints>
                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
                    </view>
                </viewController>
                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
            </objects>
            <point key="canvasLocation" x="53" y="375"/>
        </scene>
    </scenes>
 </document>
--- a/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
+++ b/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
@@ -41,6 +41,7 @@
 		042A91AE16B17517007ABBC6 /* GuiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A316B17517007ABBC6 /* GuiElement.cpp */; };
 		042A91AF16B17517007ABBC6 /* NinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A516B17517007ABBC6 /* NinePatch.cpp */; };
 		042A91B016B17517007ABBC6 /* OptionsGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A716B17517007ABBC6 /* OptionsGroup.cpp */; };
 		042A91B116B17517007ABBC6 /* OptionsPane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A916B17517007ABBC6 /* OptionsPane.cpp */; };
 		042A91B216B17517007ABBC6 /* TextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91AB16B17517007ABBC6 /* TextBox.cpp */; };
 		044129071682FF9600B70EE6 /* MouseHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 044129061682FF9600B70EE6 /* MouseHandler.cpp */; };
 		9D293CE716071C08000305C8 /* CreateNewWorld_iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */; };
@@ -1146,41 +1147,6 @@
 		D5F3B7DD14548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7C814548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib */; };
 		D5F3B7DE14548E7900D25470 /* IASKSpecifierValuesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7C914548E7900D25470 /* IASKSpecifierValuesView.xib */; };
 		D5F3B7E51454930400D25470 /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7E41454930400D25470 /* InAppSettings.bundle */; };
 		F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */ = {isa = PBXBuildFile; fileRef = 042A91AC16B17517007ABBC6 /* TextBox.h */; };
 		F99D341F2F736AA100DC153E /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D341E2F736AA100DC153E /* HttpClient.cpp */; };
 		F99D34202F736AA100DC153E /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D341E2F736AA100DC153E /* HttpClient.cpp */; };
 		F99D34232F736AD400DC153E /* TextOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34222F736AD400DC153E /* TextOption.cpp */; };
 		F99D34242F736AD400DC153E /* TextOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34222F736AD400DC153E /* TextOption.cpp */; };
 		F99D34272F736AFB00DC153E /* OptionsFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34262F736AFB00DC153E /* OptionsFile.cpp */; };
 		F99D34282F736AFB00DC153E /* OptionsFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34262F736AFB00DC153E /* OptionsFile.cpp */; };
 		F99D342B2F736B6F00DC153E /* OptionsItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342A2F736B6F00DC153E /* OptionsItem.cpp */; };
 		F99D342C2F736B6F00DC153E /* OptionsItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342A2F736B6F00DC153E /* OptionsItem.cpp */; };
 		F99D342F2F736BAD00DC153E /* ConsoleScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */; };
 		F99D34302F736BAD00DC153E /* ConsoleScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */; };
 		F99D34332F736BDA00DC153E /* CreditsScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34322F736BDA00DC153E /* CreditsScreen.cpp */; };
 		F99D34342F736BDA00DC153E /* CreditsScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34322F736BDA00DC153E /* CreditsScreen.cpp */; };
 		F99D34372F736C1000DC153E /* JoinByIPScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */; };
 		F99D34382F736C1000DC153E /* JoinByIPScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */; };
 		F99D343B2F736C3B00DC153E /* UsernameScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */; };
 		F99D343C2F736C3B00DC153E /* UsernameScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */; };
 		F99D343F2F736C8400DC153E /* GuiElementContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */; };
 		F99D34402F736C8400DC153E /* GuiElementContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */; };
 		F99D34432F736F9400DC153E /* Option.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34422F736F9400DC153E /* Option.cpp */; };
 		F99D34442F736F9400DC153E /* Option.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34422F736F9400DC153E /* Option.cpp */; };
 		F99D34472F736FE800DC153E /* KeyOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34462F736FE800DC153E /* KeyOption.cpp */; };
 		F99D34482F736FE800DC153E /* KeyOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34462F736FE800DC153E /* KeyOption.cpp */; };
 		F99D344B2F7370CF00DC153E /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D344A2F7370CF00DC153E /* Slider.cpp */; };
 		F99D344C2F7370CF00DC153E /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D344A2F7370CF00DC153E /* Slider.cpp */; };
 		F99D344E2F7372A100DC153E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F99D344D2F7372A100DC153E /* Launch Screen.storyboard */; };
 		F99D344F2F7372A100DC153E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F99D344D2F7372A100DC153E /* Launch Screen.storyboard */; };
 		F99F0FA92F84369F00F2B29A /* GrassColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FA82F84369F00F2B29A /* GrassColor.cpp */; };
 		F99F0FAA2F84369F00F2B29A /* GrassColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FA82F84369F00F2B29A /* GrassColor.cpp */; };
 		F99F0FAC2F8436CE00F2B29A /* FoliageColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */; };
 		F99F0FAD2F8436CE00F2B29A /* FoliageColor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */; };
 		F99F0FAF2F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
 		F99F0FB02F8436EB00F2B29A /* Color.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99F0FAE2F8436EB00F2B29A /* Color.cpp */; };
 		BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
 		BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BEEF202614CFF670005F0001 /* Lighting.cpp */; };
 /* End PBXBuildFile section */
 /* Begin PBXFileReference section */
@@ -1242,8 +1208,10 @@
 		042A91A616B17517007ABBC6 /* NinePatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NinePatch.h; sourceTree = "<group>"; };
 		042A91A716B17517007ABBC6 /* OptionsGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionsGroup.cpp; sourceTree = "<group>"; };
 		042A91A816B17517007ABBC6 /* OptionsGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsGroup.h; sourceTree = "<group>"; };
 		042A91A916B17517007ABBC6 /* OptionsPane.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionsPane.cpp; sourceTree = "<group>"; };
 		042A91AA16B17517007ABBC6 /* OptionsPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsPane.h; sourceTree = "<group>"; };
 		042A91AB16B17517007ABBC6 /* TextBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextBox.cpp; sourceTree = "<group>"; };
-		042A91AC16B17517007ABBC6 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextBox.h; path = ../../src/client/gui/components/TextBox.h; sourceTree = SOURCE_ROOT; };
+		042A91AC16B17517007ABBC6 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBox.h; sourceTree = "<group>"; };
 		044129061682FF9600B70EE6 /* MouseHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseHandler.cpp; sourceTree = "<group>"; };
 		9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CreateNewWorld_iphone.xib; path = minecraftpe/dialogs/CreateNewWorld_iphone.xib; sourceTree = "<group>"; };
 		9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = worldname_iphone5_3.png; sourceTree = "<group>"; };
@@ -2049,7 +2017,7 @@
 		D5B50D6914CFF66F005F7284 /* Multitouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Multitouch.h; sourceTree = "<group>"; };
 		D5B50D6A14CFF66F005F7284 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
 		D5B50D6B14CFF66F005F7284 /* time.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time.cpp; sourceTree = "<group>"; };
-		D5B50D6C14CFF66F005F7284 /* time.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = time.h; sourceTree = "<group>"; };
+		D5B50D6C14CFF66F005F7284 /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time.h; sourceTree = "<group>"; };
 		D5B50E5614CFF66F005F7284 /* SharedConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedConstants.h; sourceTree = "<group>"; };
 		D5B50E5714CFF66F005F7284 /* terrain_4444.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terrain_4444.h; sourceTree = "<group>"; };
 		D5B50E5814CFF66F005F7284 /* terrain_5551.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terrain_5551.h; sourceTree = "<group>"; };
@@ -2440,35 +2408,6 @@
 		D5F3B7C814548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IASKPSToggleSwitchSpecifierViewCell.xib; sourceTree = "<group>"; };
 		D5F3B7C914548E7900D25470 /* IASKSpecifierValuesView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IASKSpecifierValuesView.xib; sourceTree = "<group>"; };
 		D5F3B7E41454930400D25470 /* InAppSettings.bundle */ = {isa = PBXFileReference; explicitFileType = "wrapper.installer-pkg"; path = InAppSettings.bundle; sourceTree = "<group>"; };
 		F99D341D2F736AA100DC153E /* HttpClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HttpClient.h; path = ../../src/platform/HttpClient.h; sourceTree = "<group>"; };
 		F99D341E2F736AA100DC153E /* HttpClient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HttpClient.cpp; path = ../../src/platform/HttpClient.cpp; sourceTree = "<group>"; };
 		F99D34212F736AD400DC153E /* TextOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TextOption.h; path = ../../src/client/gui/components/TextOption.h; sourceTree = "<group>"; };
 		F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; sourceTree = "<unknown>"; };
 		F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; };
 		F99D34262F736AFB00DC153E /* OptionsFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsFile.cpp; path = ../../src/client/OptionsFile.cpp; sourceTree = "<group>"; };
 		F99D34292F736B6F00DC153E /* OptionsItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsItem.h; path = ../../src/client/gui/components/OptionsItem.h; sourceTree = "<group>"; };
 		F99D342A2F736B6F00DC153E /* OptionsItem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsItem.cpp; path = ../../src/client/gui/components/OptionsItem.cpp; sourceTree = "<group>"; };
 		F99D342D2F736BAD00DC153E /* ConsoleScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ConsoleScreen.h; path = ../../src/client/gui/screens/ConsoleScreen.h; sourceTree = "<group>"; };
 		F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ConsoleScreen.cpp; path = ../../src/client/gui/screens/ConsoleScreen.cpp; sourceTree = "<group>"; };
 		F99D34312F736BDA00DC153E /* CreditsScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CreditsScreen.h; path = ../../src/client/gui/screens/CreditsScreen.h; sourceTree = "<group>"; };
 		F99D34322F736BDA00DC153E /* CreditsScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CreditsScreen.cpp; path = ../../src/client/gui/screens/CreditsScreen.cpp; sourceTree = "<group>"; };
 		F99D34352F736C1000DC153E /* JoinByIPScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JoinByIPScreen.h; path = ../../src/client/gui/screens/JoinByIPScreen.h; sourceTree = "<group>"; };
 		F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = JoinByIPScreen.cpp; path = ../../src/client/gui/screens/JoinByIPScreen.cpp; sourceTree = "<group>"; };
 		F99D34392F736C3B00DC153E /* UsernameScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = UsernameScreen.h; path = ../../src/client/gui/screens/UsernameScreen.h; sourceTree = "<group>"; };
 		F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UsernameScreen.cpp; path = ../../src/client/gui/screens/UsernameScreen.cpp; sourceTree = "<group>"; };
 		F99D343D2F736C8400DC153E /* GuiElementContainer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GuiElementContainer.h; path = ../../src/client/gui/components/GuiElementContainer.h; sourceTree = "<group>"; };
 		F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = GuiElementContainer.cpp; path = ../../src/client/gui/components/GuiElementContainer.cpp; sourceTree = "<group>"; };
 		F99D34412F736F9400DC153E /* Option.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Option.h; path = ../../src/client/Option.h; sourceTree = "<group>"; };
 		F99D34422F736F9400DC153E /* Option.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Option.cpp; path = ../../src/client/Option.cpp; sourceTree = "<group>"; };
 		F99D34452F736FE800DC153E /* KeyOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KeyOption.h; path = ../../src/client/gui/components/KeyOption.h; sourceTree = "<group>"; };
 		F99D34462F736FE800DC153E /* KeyOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyOption.cpp; path = ../../src/client/gui/components/KeyOption.cpp; sourceTree = "<group>"; };
 		F99D34492F7370CF00DC153E /* Slider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Slider.h; path = ../../src/client/gui/components/Slider.h; sourceTree = "<group>"; };
 		F99D344A2F7370CF00DC153E /* Slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Slider.cpp; path = ../../src/client/gui/components/Slider.cpp; sourceTree = "<group>"; };
 		F99D344D2F7372A100DC153E /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		F99F0FA82F84369F00F2B29A /* GrassColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = GrassColor.cpp; sourceTree = "<group>"; };
 		F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FoliageColor.cpp; sourceTree = "<group>"; };
 		F99F0FAE2F8436EB00F2B29A /* Color.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Color.cpp; sourceTree = "<group>"; };
 		BEEF202614CFF670005F0001 /* Lighting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Lighting.cpp; path = Lighting.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -3287,6 +3226,8 @@
 				042A91A616B17517007ABBC6 /* NinePatch.h */,
 				042A91A716B17517007ABBC6 /* OptionsGroup.cpp */,
 				042A91A816B17517007ABBC6 /* OptionsGroup.h */,
 				042A91A916B17517007ABBC6 /* OptionsPane.cpp */,
 				042A91AA16B17517007ABBC6 /* OptionsPane.h */,
 				042A91AB16B17517007ABBC6 /* TextBox.cpp */,
 				042A91AC16B17517007ABBC6 /* TextBox.h */,
 				D5B50C2814CFF66F005F7284 /* Button.cpp */,
@@ -3536,7 +3477,6 @@
 				D5B50CF114CFF66F005F7284 /* TileRenderer.cpp */,
 				D5B50CF214CFF66F005F7284 /* TileRenderer.h */,
 				D5B50CF314CFF66F005F7284 /* VertecDecl.h */,
 				BEEF202614CFF670005F0001 /* Lighting.cpp */,
 			);
 			path = renderer;
 			sourceTree = "<group>";
@@ -3774,7 +3714,6 @@
 				D5B50E6914CFF66F005F7284 /* StringUtils.cpp */,
 				D5B50E6A14CFF66F005F7284 /* StringUtils.h */,
 				D5B50E6B14CFF66F005F7284 /* WeighedRandom.h */,
 				F99F0FAE2F8436EB00F2B29A /* Color.cpp */,
 			);
 			path = util;
 			sourceTree = "<group>";
@@ -4039,8 +3978,6 @@
 				D5B50F3714CFF66F005F7284 /* TickNextTickData.h */,
 				D5B50F3814CFF66F005F7284 /* tile */,
 				D5B50F6814CFF66F005F7284 /* TilePos.h */,
 				F99F0FA82F84369F00F2B29A /* GrassColor.cpp */,
 				F99F0FAB2F8436CE00F2B29A /* FoliageColor.cpp */,
 			);
 			path = level;
 			sourceTree = "<group>";
@@ -4319,7 +4256,6 @@
 		D5CF9C37144C225000E4244F = {
 			isa = PBXGroup;
 			children = (
 				F99D344D2F7372A100DC153E /* Launch Screen.storyboard */,
 				D5E1BA9A1451C8A0007DCC4F /* Default@2x.png */,
 				9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */,
 				D5F07744145EF79B00EC30FB /* Default-Landscape~ipad.png */,
@@ -4331,30 +4267,6 @@
 				D5CF9C45144C225000E4244F /* Frameworks */,
 				D5CF9C43144C225000E4244F /* Products */,
 				D5B50C1614CFF66F005F7284 /* src */,
 				F99D341D2F736AA100DC153E /* HttpClient.h */,
 				F99D341E2F736AA100DC153E /* HttpClient.cpp */,
 				F99D34212F736AD400DC153E /* TextOption.h */,
 				F99D34222F736AD400DC153E /* TextOption.cpp */,
 				F99D34252F736AFB00DC153E /* OptionsFile.h */,
 				F99D34262F736AFB00DC153E /* OptionsFile.cpp */,
 				F99D34292F736B6F00DC153E /* OptionsItem.h */,
 				F99D342A2F736B6F00DC153E /* OptionsItem.cpp */,
 				F99D342D2F736BAD00DC153E /* ConsoleScreen.h */,
 				F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */,
 				F99D34312F736BDA00DC153E /* CreditsScreen.h */,
 				F99D34322F736BDA00DC153E /* CreditsScreen.cpp */,
 				F99D34352F736C1000DC153E /* JoinByIPScreen.h */,
 				F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */,
 				F99D34392F736C3B00DC153E /* UsernameScreen.h */,
 				F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */,
 				F99D343D2F736C8400DC153E /* GuiElementContainer.h */,
 				F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */,
 				F99D34412F736F9400DC153E /* Option.h */,
 				F99D34422F736F9400DC153E /* Option.cpp */,
 				F99D34452F736FE800DC153E /* KeyOption.h */,
 				F99D34462F736FE800DC153E /* KeyOption.cpp */,
 				F99D34492F7370CF00DC153E /* Slider.h */,
 				F99D344A2F7370CF00DC153E /* Slider.cpp */,
 			);
 			sourceTree = "<group>";
 		};
@@ -4615,16 +4527,10 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0420;
 				TargetAttributes = {
 					D5CF9C41144C225000E4244F = {
 						DevelopmentTeam = PZUVNW8F2U;
 						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = D5CF9C3C144C225000E4244F /* Build configuration list for PBXProject "minecraftpe" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = en;
+			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -4693,7 +4599,6 @@
 				D5B50A5614CFF492005F7284 /* pig.png in Resources */,
 				D5B50A5814CFF492005F7284 /* sheep_fur.png in Resources */,
 				D5B50A5A14CFF492005F7284 /* sheep.png in Resources */,
 				F99D344F2F7372A100DC153E /* Launch Screen.storyboard in Resources */,
 				D5B50A5C14CFF492005F7284 /* skeleton.png in Resources */,
 				D5B50A5E14CFF492005F7284 /* spider.png in Resources */,
 				D5B50A6014CFF492005F7284 /* zombie.png in Resources */,
@@ -5030,7 +4935,6 @@
 				D5ACF26F15C03DBF00E21C22 /* sand2.m4a in Resources */,
 				D5ACF27115C03DBF00E21C22 /* sand3.m4a in Resources */,
 				D5ACF27315C03DBF00E21C22 /* sand4.m4a in Resources */,
 				F99D344E2F7372A100DC153E /* Launch Screen.storyboard in Resources */,
 				D5ACF27515C03DBF00E21C22 /* snow1.m4a in Resources */,
 				D5ACF27715C03DBF00E21C22 /* snow2.m4a in Resources */,
 				D5ACF27915C03DBF00E21C22 /* snow3.m4a in Resources */,
@@ -5107,22 +5011,18 @@
 				D58BB544146A0B910002C9F5 /* IASKSettingsStore.m in Sources */,
 				D58BB545146A0B910002C9F5 /* IASKSettingsStoreFile.m in Sources */,
 				D58BB546146A0B910002C9F5 /* IASKSettingsStoreUserDefaults.m in Sources */,
 				F99D34232F736AD400DC153E /* TextOption.cpp in Sources */,
 				D58BB547146A0B910002C9F5 /* IASKSpecifier.m in Sources */,
 				D58BB548146A0B910002C9F5 /* IASKPSSliderSpecifierViewCell.m in Sources */,
 				D58BB549146A0B910002C9F5 /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
 				D58BB54A146A0B910002C9F5 /* IASKPSTitleValueSpecifierViewCell.m in Sources */,
 				D58BB54B146A0B910002C9F5 /* IASKPSToggleSwitchSpecifierViewCell.m in Sources */,
 				F99D343B2F736C3B00DC153E /* UsernameScreen.cpp in Sources */,
 				D58BB54C146A0B910002C9F5 /* IASKSlider.m in Sources */,
 				D58BB54D146A0B910002C9F5 /* IASKSwitch.m in Sources */,
 				F99D34302F736BAD00DC153E /* ConsoleScreen.cpp in Sources */,
 				D58BB54E146A0B910002C9F5 /* IASKTextField.m in Sources */,
 				D58BB550146A0B910002C9F5 /* PVRTexture.m in Sources */,
 				D5D43CC9146AF4B4002ED842 /* RenameMPWorldViewController.mm in Sources */,
 				D5B50F7014CFF670005F7284 /* AppPlatform_iOS.mm in Sources */,
 				D5B50F7414CFF670005F7284 /* CreativeMode.cpp in Sources */,
 				F99D34432F736F9400DC153E /* Option.cpp in Sources */,
 				D5B50F7614CFF670005F7284 /* GameMode.cpp in Sources */,
 				D5B50F7814CFF670005F7284 /* Button.cpp in Sources */,
 				D5B50F7A14CFF670005F7284 /* ImageButton.cpp in Sources */,
@@ -5167,7 +5067,6 @@
 				D5B50FC814CFF670005F7284 /* KeyboardInput.cpp in Sources */,
 				D5B50FCA14CFF670005F7284 /* TouchscreenInput.cpp in Sources */,
 				D5B50FCC14CFF670005F7284 /* LocalPlayer.cpp in Sources */,
 				F99D34482F736FE800DC153E /* KeyOption.cpp in Sources */,
 				D5B50FCE14CFF670005F7284 /* Chunk.cpp in Sources */,
 				D5B50FD014CFF670005F7284 /* Frustum.cpp in Sources */,
 				D5B50FD214CFF670005F7284 /* ChickenRenderer.cpp in Sources */,
@@ -5210,7 +5109,6 @@
 				D5B5111014CFF670005F7284 /* Mth.cpp in Sources */,
 				D5B5111214CFF670005F7284 /* PerfRenderer.cpp in Sources */,
 				D5B5111414CFF670005F7284 /* PerfTimer.cpp in Sources */,
 				F99F0FA92F84369F00F2B29A /* GrassColor.cpp in Sources */,
 				D5B5111614CFF670005F7284 /* StringUtils.cpp in Sources */,
 				D5B5111814CFF670005F7284 /* Direction.cpp in Sources */,
 				D5B5111A14CFF670005F7284 /* Animal.cpp in Sources */,
@@ -5227,21 +5125,17 @@
 				D5B5113014CFF670005F7284 /* TripodCamera.cpp in Sources */,
 				D5B5113214CFF670005F7284 /* Mob.cpp in Sources */,
 				D5B5113414CFF670005F7284 /* MobCategory.cpp in Sources */,
 				F99D34282F736AFB00DC153E /* OptionsFile.cpp in Sources */,
 				D5B5113814CFF670005F7284 /* PathFinderMob.cpp in Sources */,
 				D5B5113A14CFF670005F7284 /* Inventory.cpp in Sources */,
 				D5B5113C14CFF670005F7284 /* Player.cpp in Sources */,
 				F99F0FB02F8436EB00F2B29A /* Color.cpp in Sources */,
 				D5B5113E14CFF670005F7284 /* Arrow.cpp in Sources */,
 				D5B5114014CFF670005F7284 /* Recipes.cpp in Sources */,
 				D5B5114214CFF670005F7284 /* ToolRecipes.cpp in Sources */,
 				D5B5114414CFF670005F7284 /* WeaponRecipes.cpp in Sources */,
 				D5B5114614CFF670005F7284 /* HatchetItem.cpp in Sources */,
 				D5B5114814CFF670005F7284 /* Item.cpp in Sources */,
 				F99F0FAC2F8436CE00F2B29A /* FoliageColor.cpp in Sources */,
 				D5B5114A14CFF670005F7284 /* ItemInstance.cpp in Sources */,
 				D5B5114C14CFF670005F7284 /* PickaxeItem.cpp in Sources */,
 				F99D344B2F7370CF00DC153E /* Slider.cpp in Sources */,
 				D5B5114E14CFF670005F7284 /* ShovelItem.cpp in Sources */,
 				D5B5115014CFF670005F7284 /* Biome.cpp in Sources */,
 				D5B5115214CFF670005F7284 /* BiomeSource.cpp in Sources */,
@@ -5292,7 +5186,6 @@
 				D5251DBA1538192700FC82C8 /* CloudServer.cpp in Sources */,
 				D5251DBE1538192700FC82C8 /* CommandParserInterface.cpp in Sources */,
 				D5251DC01538192700FC82C8 /* ConnectionGraph2.cpp in Sources */,
 				F99D34402F736C8400DC153E /* GuiElementContainer.cpp in Sources */,
 				D5251DC21538192700FC82C8 /* ConsoleServer.cpp in Sources */,
 				D5251DC41538192700FC82C8 /* DataCompressor.cpp in Sources */,
 				D5251DC61538192700FC82C8 /* DirectoryDeltaTransfer.cpp in Sources */,
@@ -5317,8 +5210,6 @@
 				D5251DEC1538192700FC82C8 /* HTTPConnection.cpp in Sources */,
 				D5251DEE1538192700FC82C8 /* IncrementalReadInterface.cpp in Sources */,
 				D5251DF01538192700FC82C8 /* Itoa.cpp in Sources */,
 				F99D34202F736AA100DC153E /* HttpClient.cpp in Sources */,
 				F99D34382F736C1000DC153E /* JoinByIPScreen.cpp in Sources */,
 				D5251DF21538192700FC82C8 /* LinuxStrings.cpp in Sources */,
 				D5251DF41538192700FC82C8 /* LocklessTypes.cpp in Sources */,
 				D5251DF61538192700FC82C8 /* LogCommandParser.cpp in Sources */,
@@ -5347,7 +5238,6 @@
 				D5251E2A1538192700FC82C8 /* RakSleep.cpp in Sources */,
 				D5251E2C1538192700FC82C8 /* RakString.cpp in Sources */,
 				D5251E2E1538192700FC82C8 /* RakThread.cpp in Sources */,
 				F99D34332F736BDA00DC153E /* CreditsScreen.cpp in Sources */,
 				D5251E301538192700FC82C8 /* RakWString.cpp in Sources */,
 				D5251E321538192700FC82C8 /* Rand.cpp in Sources */,
 				D5251E341538192700FC82C8 /* rdlmalloc.cpp in Sources */,
@@ -5390,7 +5280,6 @@
 				D5951EEB159349100043A12A /* TileEntity.cpp in Sources */,
 				D5951EEF159349680043A12A /* FurnaceScreen.cpp in Sources */,
 				D5951EF215934A2D0043A12A /* Feature.cpp in Sources */,
 				F99D342C2F736B6F00DC153E /* OptionsItem.cpp in Sources */,
 				D5951EF815934AC50043A12A /* BaseContainerMenu.cpp in Sources */,
 				D5951EFA15934AC50043A12A /* FurnaceMenu.cpp in Sources */,
 				D5D381F315A1A1CF00B6C50E /* FillingContainer.cpp in Sources */,
@@ -5443,7 +5332,6 @@
 				D5D8C4C41639341100FD35F0 /* Motive.cpp in Sources */,
 				D5D8C4C8163934BB00FD35F0 /* HangingEntityItem.cpp in Sources */,
 				D5D8C4CC1639362F00FD35F0 /* NetherReactorPattern.cpp in Sources */,
 				BEEF202614CFF670005F0002 /* Lighting.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5451,10 +5339,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */,
 				D5CF9C57144C225000E4244F /* main.mm in Sources */,
 				D5CF9C5B144C225000E4244F /* minecraftpeAppDelegate.mm in Sources */,
 				F99D343C2F736C3B00DC153E /* UsernameScreen.cpp in Sources */,
 				D5CF9C65144C225000E4244F /* EAGLView.m in Sources */,
 				D5CFA01D144C453900E4244F /* minecraftpeViewController.mm in Sources */,
 				D5A55E4914500EDE00A7571B /* CreateNewWorldViewController.mm in Sources */,
@@ -5468,7 +5354,6 @@
 				D5F3B7D014548E7900D25470 /* IASKSettingsStoreUserDefaults.m in Sources */,
 				D5F3B7D114548E7900D25470 /* IASKSpecifier.m in Sources */,
 				D5F3B7D214548E7900D25470 /* IASKPSSliderSpecifierViewCell.m in Sources */,
 				F99D34472F736FE800DC153E /* KeyOption.cpp in Sources */,
 				D5F3B7D314548E7900D25470 /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
 				D5F3B7D414548E7900D25470 /* IASKPSTitleValueSpecifierViewCell.m in Sources */,
 				D5F3B7D514548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.m in Sources */,
@@ -5548,7 +5433,6 @@
 				D5B5102F14CFF670005F7284 /* main.cpp in Sources */,
 				D5B5103514CFF670005F7284 /* Tag.cpp in Sources */,
 				D5B5103714CFF670005F7284 /* ClientSideNetworkHandler.cpp in Sources */,
 				F99F0FAF2F8436EB00F2B29A /* Color.cpp in Sources */,
 				D5B5103914CFF670005F7284 /* NetEventCallback.cpp in Sources */,
 				D5B5103B14CFF670005F7284 /* Packet.cpp in Sources */,
 				D5B5103D14CFF670005F7284 /* RakNetInstance.cpp in Sources */,
@@ -5569,7 +5453,6 @@
 				D5B5111514CFF670005F7284 /* StringUtils.cpp in Sources */,
 				D5B5111714CFF670005F7284 /* Direction.cpp in Sources */,
 				D5B5111914CFF670005F7284 /* Animal.cpp in Sources */,
 				F99F0FAD2F8436CE00F2B29A /* FoliageColor.cpp in Sources */,
 				D5B5111B14CFF670005F7284 /* Chicken.cpp in Sources */,
 				D5B5111D14CFF670005F7284 /* Cow.cpp in Sources */,
 				D5B5111F14CFF670005F7284 /* Pig.cpp in Sources */,
@@ -5582,13 +5465,11 @@
 				D5B5112D14CFF670005F7284 /* PrimedTnt.cpp in Sources */,
 				D5B5112F14CFF670005F7284 /* TripodCamera.cpp in Sources */,
 				D5B5113114CFF670005F7284 /* Mob.cpp in Sources */,
 				F99D34442F736F9400DC153E /* Option.cpp in Sources */,
 				D5B5113314CFF670005F7284 /* MobCategory.cpp in Sources */,
 				D5B5113714CFF670005F7284 /* PathFinderMob.cpp in Sources */,
 				D5B5113914CFF670005F7284 /* Inventory.cpp in Sources */,
 				D5B5113B14CFF670005F7284 /* Player.cpp in Sources */,
 				D5B5113D14CFF670005F7284 /* Arrow.cpp in Sources */,
 				F99D343F2F736C8400DC153E /* GuiElementContainer.cpp in Sources */,
 				D5B5113F14CFF670005F7284 /* Recipes.cpp in Sources */,
 				D5B5114114CFF670005F7284 /* ToolRecipes.cpp in Sources */,
 				D5B5114314CFF670005F7284 /* WeaponRecipes.cpp in Sources */,
@@ -5620,19 +5501,16 @@
 				D5B5117714CFF670005F7284 /* ExternalFileLevelStorageSource.cpp in Sources */,
 				D5B5117914CFF670005F7284 /* RegionFile.cpp in Sources */,
 				D5B5117B14CFF670005F7284 /* TickNextTickData.cpp in Sources */,
 				F99F0FAA2F84369F00F2B29A /* GrassColor.cpp in Sources */,
 				D5B5117D14CFF670005F7284 /* DoorTile.cpp in Sources */,
 				D5B5118114CFF670005F7284 /* StoneSlabTile.cpp in Sources */,
 				D5B5118314CFF670005F7284 /* Tile.cpp in Sources */,
 				D5B5118514CFF670005F7284 /* HitResult.cpp in Sources */,
 				D5B5118B14D03342005F7284 /* SynchedEntityData.cpp in Sources */,
 				D5B5118E14DEA27F005F7284 /* DeathScreen.cpp in Sources */,
 				F99D34242F736AD400DC153E /* TextOption.cpp in Sources */,
 				D5B5119114DEA2B7005F7284 /* LevelData.cpp in Sources */,
 				D5B5119414DEA2EF005F7284 /* DyePowderItem.cpp in Sources */,
 				D584926D14FD234400741128 /* SharedConstants.cpp in Sources */,
 				D584927314FD236700741128 /* MoveControl.cpp in Sources */,
 				F99D344C2F7370CF00DC153E /* Slider.cpp in Sources */,
 				D584928614FD240D00741128 /* IConfigListener.cpp in Sources */,
 				D584928914FD2FAF00741128 /* Path.cpp in Sources */,
 				D5B86281153810BD00F3238A /* I18n.cpp in Sources */,
@@ -5684,7 +5562,6 @@
 				D5251E011538192700FC82C8 /* NatTypeDetectionServer.cpp in Sources */,
 				D5251E031538192700FC82C8 /* NetworkIDManager.cpp in Sources */,
 				D5251E051538192700FC82C8 /* NetworkIDObject.cpp in Sources */,
 				F99D34372F736C1000DC153E /* JoinByIPScreen.cpp in Sources */,
 				D5251E071538192700FC82C8 /* PacketConsoleLogger.cpp in Sources */,
 				D5251E091538192700FC82C8 /* PacketFileLogger.cpp in Sources */,
 				D5251E0B1538192700FC82C8 /* PacketizedTCP.cpp in Sources */,
@@ -5714,13 +5591,11 @@
 				D5251E411538192700FC82C8 /* SendToThread.cpp in Sources */,
 				D5251E431538192700FC82C8 /* SHA1.cpp in Sources */,
 				D5251E451538192700FC82C8 /* SignaledEvent.cpp in Sources */,
 				F99D34342F736BDA00DC153E /* CreditsScreen.cpp in Sources */,
 				D5251E471538192700FC82C8 /* SimpleMutex.cpp in Sources */,
 				D5251E491538192700FC82C8 /* SocketLayer.cpp in Sources */,
 				D5251E4B1538192700FC82C8 /* StringCompressor.cpp in Sources */,
 				D5251E4D1538192700FC82C8 /* StringTable.cpp in Sources */,
 				D5251E4F1538192700FC82C8 /* SuperFastHash.cpp in Sources */,
 				F99D342B2F736B6F00DC153E /* OptionsItem.cpp in Sources */,
 				D5251E511538192700FC82C8 /* TableSerializer.cpp in Sources */,
 				D5251E531538192700FC82C8 /* TCPInterface.cpp in Sources */,
 				D5251E551538192700FC82C8 /* TeamBalancer.cpp in Sources */,
@@ -5743,7 +5618,6 @@
 				D5951EDD159348C50043A12A /* ItemPane.cpp in Sources */,
 				D5951EE3159349000043A12A /* FurnaceTile.cpp in Sources */,
 				D5951EE8159349100043A12A /* FurnaceTileEntity.cpp in Sources */,
 				F99D342F2F736BAD00DC153E /* ConsoleScreen.cpp in Sources */,
 				D5951EEA159349100043A12A /* TileEntity.cpp in Sources */,
 				D5951EEE159349680043A12A /* FurnaceScreen.cpp in Sources */,
 				D5951EF115934A2D0043A12A /* Feature.cpp in Sources */,
@@ -5780,7 +5654,6 @@
 				D544941E15D13F45005FA9B0 /* PlayerRenderer.cpp in Sources */,
 				D544942215D13F5E005FA9B0 /* RemotePlayer.cpp in Sources */,
 				D5B17ED515E226F50056E751 /* Throwable.cpp in Sources */,
 				F99D341F2F736AA100DC153E /* HttpClient.cpp in Sources */,
 				D5B17ED915E2273F0056E751 /* SurvivalMode.cpp in Sources */,
 				D5B17EDD15E227670056E751 /* TrapDoorTile.cpp in Sources */,
 				D5B17EE115E260910056E751 /* MoveFolder.mm in Sources */,
@@ -5816,7 +5689,6 @@
 				0400453A16A4125C003EB6FA /* FallingTileRenderer.cpp in Sources */,
 				0413970716A82E1E008A9F1A /* ArmorItem.cpp in Sources */,
 				0413970D16A82E6B008A9F1A /* CraftingFilters.cpp in Sources */,
 				F99D34272F736AFB00DC153E /* OptionsFile.cpp in Sources */,
 				0413970E16A82E6B008A9F1A /* StonecutterScreen.cpp in Sources */,
 				0413971116A82E7B008A9F1A /* ArmorScreen.cpp in Sources */,
 				0413971516A82EB9008A9F1A /* ArmorRecipes.cpp in Sources */,
@@ -5825,8 +5697,8 @@
 				042A91AE16B17517007ABBC6 /* GuiElement.cpp in Sources */,
 				042A91AF16B17517007ABBC6 /* NinePatch.cpp in Sources */,
 				042A91B016B17517007ABBC6 /* OptionsGroup.cpp in Sources */,
 				042A91B116B17517007ABBC6 /* OptionsPane.cpp in Sources */,
 				042A91B216B17517007ABBC6 /* TextBox.cpp in Sources */,
 				BEEF202614CFF670005F0003 /* Lighting.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5863,29 +5735,25 @@
 		D50BE20815EE05B8008AA75E /* Ad-Hoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
+				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Mojang AB";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = PUBLISH;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "C93D3524-5C6F-466E-B12B-833663B7EAE0";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
 				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = "Ad-Hoc";
@@ -5897,26 +5765,15 @@
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = (
+				HEADER_SEARCH_PATHS = "";
 					"$(SRCROOT)/../../src",
 					"$(SRCROOT)/../../src/client/gui/components",
 					"$(SRCROOT)/../../src/world",
 					"$(SRCROOT)/../../src/platform/input",
 					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
-				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				VALID_ARCHS = "i386 armv6 armv7";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
 				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = "Ad-Hoc";
@@ -5989,28 +5846,24 @@
 		D5A20ADB146AAD9C00A52FEC /* AppStore */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
+				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Mojang AB";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "64BA8967-1A9A-4980-972C-42E75AD5E023";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
 				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = AppStore;
@@ -6023,19 +5876,11 @@
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = PUBLISH;
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = (
+				HEADER_SEARCH_PATHS = "";
 					"$(SRCROOT)/../../src",
 					"$(SRCROOT)/../../src/client/gui/components",
 					"$(SRCROOT)/../../src/world",
 					"$(SRCROOT)/../../src/platform/input",
 					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DANDROID_PUBLISH",
@@ -6043,10 +5888,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1B194957-98CF-49B7-A0E7-76692B4B722D";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
-				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				VALID_ARCHS = "i386 armv6 armv7";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
 				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = AppStore;
@@ -6079,8 +5922,8 @@
 		D5CF9C6C144C225000E4244F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
+				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -6092,50 +5935,41 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
 				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Debug;
 		};
 		D5CF9C6D144C225000E4244F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
+				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD)";
+				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = PUBLISH;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
 				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -6143,34 +5977,19 @@
 		D5CF9C6F144C225000E4244F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = PZUVNW8F2U;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = (
+				HEADER_SEARCH_PATHS = "";
 					"$(SRCROOT)/../../src",
 					"$(SRCROOT)/../../src/client/gui/components",
 					"$(SRCROOT)/../../src/world",
 					"$(SRCROOT)/../../src/platform/input",
 					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
-				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				VALID_ARCHS = "i386 armv6 armv7";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
 				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -6178,34 +5997,19 @@
 		D5CF9C70144C225000E4244F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = PZUVNW8F2U;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = "";
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = (
+				HEADER_SEARCH_PATHS = "";
 					"$(SRCROOT)/../../src",
 					"$(SRCROOT)/../../src/client/gui/components",
 					"$(SRCROOT)/../../src/world",
 					"$(SRCROOT)/../../src/platform/input",
 					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
 				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
 				IPHONEOS_DEPLOYMENT_TARGET = 12;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos;
+				SDKROOT = iphoneos6.0;
-				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				VALID_ARCHS = "i386 armv6 armv7";
 				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
 				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
--- a/project/iosproj/minecraftpe/minecraftpe-Info.plist
+++ b/project/iosproj/minecraftpe/minecraftpe-Info.plist
@@ -37,7 +37,7 @@
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>com.mojang.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -58,8 +58,6 @@
 	<array>
 		<string>minecraft.ttf</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>Launch Screen</string>
 	<key>UIPrerenderedIcon</key>
 	<true/>
 	<key>UIRequiresPersistentWiFi</key>
--- a/project/lib_projects/raknet/jni/RaknetSources/GetTime.cpp
+++ b/project/lib_projects/raknet/jni/RaknetSources/GetTime.cpp
@@ -140,7 +140,7 @@ RakNet::TimeUS GetTimeUS_Windows( void )
 #if _MSC_VER >= 1400 && defined (_M_X64)
 		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
 #else
-		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
+		GetProcessAffinityMask(mProc, &mProcMask, &mSysMask);
 #endif
 		mThread = GetCurrentThread();
--- a/project/lib_projects/raknet/jni/RaknetSources/Rand.cpp
+++ b/project/lib_projects/raknet/jni/RaknetSources/Rand.cpp
@@ -142,8 +142,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 	// so-- that's why the only change I made is to restrict to odd seeds.
 	//
-	unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
+	register unsigned int x = ( seed | 1U ) & 0xFFFFFFFFU, *s = state;
-	int j;
+	register int j;
 	for ( left = 0, *s++ = x, j = N; --j;
 		*s++ = ( x *= 69069U ) & 0xFFFFFFFFU )
@@ -154,8 +154,8 @@ void seedMT( unsigned int seed, unsigned int *state, unsigned int *&next, int &l
 unsigned int reloadMT( unsigned int *state, unsigned int *&next, int &left )
 {
-	unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
+	register unsigned int * p0 = state, *p2 = state + 2, *pM = state + M, s0, s1;
-	int j;
+	register int j;
 	if ( left < -1 )
 		seedMT( 4357U );
--- a/project/lib_projects/raknet/jni/RaknetSources/WindowsIncludes.h
+++ b/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:
--- a/src/AppPlatform_glfw.h
+++ b/src/AppPlatform_glfw.h
@@ -20,10 +20,6 @@
 #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);
 }
@@ -106,33 +102,14 @@ public:
 		return std::string(mbstr);
 	}
-	virtual int getScreenWidth() override { 
+	virtual int getScreenWidth() override { return 854; };
-		#ifdef __EMSCRIPTEN__
+	virtual int getScreenHeight() override { return 480; };
 			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 false; /* glfw supports only mouse and keyboard */ }
+	virtual bool supportsTouchscreen() override { return true; }
-	virtual void hideCursor(bool hide) override {
+	virtual void hideCursor(bool hide) {
 		int isHide = hide ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_HIDDEN;
 		glfwSetInputMode(window, GLFW_CURSOR, isHide);
 	}
@@ -143,8 +120,6 @@ 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
 	}
--- a/src/AppPlatform_iOS.h
+++ b/src/AppPlatform_iOS.h
@@ -52,10 +52,11 @@ public:
 	virtual StringVector getOptionStrings();
-    virtual bool isPowerVR();
+    virtual bool isPowerVR() { return false; }
    virtual bool isSuperFast();
    virtual void showKeyboard();
    virtual void hideKeyboard();
 	virtual void isPowerVR();
 private:
    std::string _basePath;
--- a/src/AppPlatform_iOS.mm
+++ b/src/AppPlatform_iOS.mm
@@ -275,9 +275,7 @@ void AppPlatform_iOS::hideKeyboard() {
    [_viewController hideKeyboard];
 	super::hideKeyboard();
 }
-
+void AppPlatform_iOS::isPowerVR() {
 // this was originally void but i changed it to bool because void cant return values
 bool AppPlatform_iOS::isPowerVR() {
 	const char* s = (const char*)glGetString(GL_RENDERER);
 	if (!s) return false;
 	return strstr(s, "SGX") != NULL;
--- a/src/NinecraftApp.cpp
+++ b/src/NinecraftApp.cpp
@@ -136,7 +136,7 @@ void NinecraftApp::teardown()
 	Recipes ::teardownRecipes();
 	TileEntity::teardownTileEntities();
 #endif
-#if defined(WIN32) && !defined(STANDALONE_SERVER)
+#ifdef WIN32
 	ItemRenderer::teardown_static();
 	if (EntityTileRenderer::instance != NULL) {
 		delete EntityTileRenderer::instance;
--- a/src/client/KeyMapping.h
+++ b/src/client/KeyMapping.h
@@ -1,21 +0,0 @@
 #ifndef NET_MINECRAFT_CLIENT__KeyMapping_H__
 #define NET_MINECRAFT_CLIENT__KeyMapping_H__
 //package net.minecraft.client;
 #include <string>
 class KeyMapping
 {
 public:
    std::string name;
    int key;
 	KeyMapping() {}
    KeyMapping(const std::string& name_, int key_)
 	:	name(name_),
 		key(key_)
    {}
 };
 #endif /*NET_MINECRAFT_CLIENT__KeyMapping_H__*/
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
--- a/src/client/Minecraft.h
+++ b/src/client/Minecraft.h
@@ -2,9 +2,6 @@
 #define NET_MINECRAFT_CLIENT__Minecraft_H__
 #include "Options.h"
 #include "commands/CommandManager.hpp"
 #include <plugins/PluginsManager.hpp>
 #ifndef STANDALONE_SERVER
 #include "MouseHandler.h"
 #include "gui/Gui.h"
@@ -90,14 +87,6 @@ public:
 	void update();
 	 std::string  gatherStats1();
 	 std::string  gatherStats2();
     std::string  gatherStats4();
     std::string  gatherStats3();
 	void tick(int nTick, int maxTick);
 	void tickInput();
@@ -120,8 +109,6 @@ public:
 	bool isLevelGenerated();
 	void handleMouseDown(int button, bool down);
    void audioEngineOn();
    void audioEngineOff();
@@ -131,17 +118,11 @@ 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();
@@ -214,8 +195,7 @@ 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;
@@ -239,12 +219,9 @@ private:
 	bool _isCreativeMode;
 	//int _respawnPlayerTicks;
 	Player* _pendingRemovePlayer; // @attn @todo @fix: remove this shait and fix the respawn behaviour
    // shit* lmao
 	PerfRenderer* _perfRenderer;
 	CommandServer* _commandServer;
 	CommandManager m_commandManager;
 };
 #endif /*NET_MINECRAFT_CLIENT__Minecraft_H__*/
--- a/src/client/MouseHandler.cpp
+++ b/src/client/MouseHandler.cpp
@@ -5,7 +5,7 @@
 #include <SDL/SDL.h>
 #endif
-#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
+#ifdef PLATFORM_DESKTOP
 #include <GLFW/glfw3.h>
 #endif
@@ -34,7 +34,7 @@ void MouseHandler::grab() {
 	SDL_ShowCursor(0);
 #endif
-#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
+#ifdef PLATFORM_DESKTOP
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_DISABLED);
 #endif
 }
@@ -46,7 +46,7 @@ void MouseHandler::release() {
 	SDL_ShowCursor(1);
 #endif
-#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
+#ifdef PLATFORM_DESKTOP
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
 #endif
 }
--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -54,38 +54,12 @@ OptionBool limitFramerate("limitFramerate", false);
 OptionBool vsync("vsync", true);
 OptionBool fancyGraphics("fancyGraphics", true);
 OptionBool viewBobbing("viewBobbing", true);
-OptionBool ambientOcclusion("ao", true);
+OptionBool ambientOcclusion("ao", false);
 OptionBool useNormalLighting("normalLighting", true);
 OptionBool beautifulSky("beautifulSky", true);
 OptionBool useVignette("useVignette", true);
 OptionBool useTouchscreen("useTouchscreen", true);
 OptionBool serverVisible("servervisible", true);
 OptionBool foliageTint("foliagetint", true);
 OptionInt fogType("fogType", 0, 0, 2);
 OptionBool javaHud("javaHud", false);
 OptionBool betaSky("betaSky", false);
 OptionBool tintedSide("tintedSide", false);
 OptionBool blockOutline("blockOutline", false);
 OptionBool restoredAnims("restoredAnims", true);
 OptionInt debugStyle("debugStyle", 0, 0, 1);
 OptionInt menuStyle("menuStyle",0, 0, 2);
 OptionBool windowScale("windowScale", false);
 OptionInt keyForward("key.forward", Keyboard::KEY_W);
 OptionInt keyLeft("key.left", Keyboard::KEY_A);
 OptionInt keyBack("key.back", Keyboard::KEY_S);
@@ -138,7 +112,6 @@ void Options::initTable() {
    m_options[OPTIONS_GUI_SCALE] = &guiScale;
 	m_options[OPTIONS_WINDOW_SCALE] = &windowScale;
 	m_options[OPTIONS_SKIN] = &skin;
 	m_options[OPTIONS_USERNAME] = &username;
@@ -163,20 +136,8 @@ void Options::initTable() {
    m_options[OPTIONS_USE_TOUCHSCREEN] = &useTouchscreen;
 	m_options[OPTIONS_BLOCK_OUTLINE] = &blockOutline;
 	m_options[OPTIONS_VIGNETTE] = &useVignette;
 	m_options[OPTIONS_BEAUTIFUL_SKY] = &beautifulSky;
 	m_options[OPTIONS_NORMAL_LIGHTING] = &useNormalLighting;
 	m_options[OPTIONS_RESTORED_ANIMS] = &restoredAnims;
    m_options[OPTIONS_SERVER_VISIBLE] = &serverVisible;
 	m_options[OPTIONS_MENU_STYLE] = &menuStyle;
    m_options[OPTIONS_KEY_FORWARD] = &keyForward;
    m_options[OPTIONS_KEY_LEFT] = &keyLeft;
    m_options[OPTIONS_KEY_BACK] = &keyBack;
@@ -199,18 +160,6 @@ void Options::initTable() {
 	m_options[OPTIONS_BAR_ON_TOP] = &barOnTop;
 	m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
 	m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
 	m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
 	// more options yay
 	m_options[OPTIONS_FOG_TYPE] = &fogType;
 	m_options[OPTIONS_DEBUG_STYLE] = &debugStyle;
 	m_options[OPTIONS_BETA_SKY] = &betaSky;
 	m_options[OPTIONS_TINTED_SIDE] = &tintedSide;
 	m_options[OPTIONS_JAVA_HUD] = &javaHud;
 	m_options[OPTIONS_AUTOJUMP] = &autoJump;
 	m_options[OPTIONS_LAST_IP] = &lastIp;
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -37,7 +37,6 @@ enum OptionId {
    OPTIONS_BAR_ON_TOP,
    OPTIONS_ALLOW_SPRINT,
    OPTIONS_AUTOJUMP,
 	OPTIONS_WINDOW_SCALE,
    // Graphics
    OPTIONS_RENDER_DEBUG,
@@ -50,8 +49,6 @@ enum OptionId {
    OPTIONS_LIMIT_FRAMERATE,
    OPTIONS_VSYNC,
    OPTIONS_FANCY_GRAPHICS,
 	OPTIONS_NORMAL_LIGHTING,
    // Cheats / debug
    OPTIONS_FLY_SPEED,
@@ -59,7 +56,6 @@ enum OptionId {
    OPTIONS_IS_FLYING,
    // Control
 	OPTIONS_BLOCK_OUTLINE,
    OPTIONS_USE_MOUSE_FOR_DIGGING,
    OPTIONS_IS_LEFT_HANDED,
    OPTIONS_IS_JOY_TOUCH_AREA,
@@ -88,17 +84,6 @@ enum OptionId {
    OPTIONS_LAST_IP,
    OPTIONS_RPI_CURSOR,
 	OPTIONS_FOLIAGE_TINT,
 	OPTIONS_FOG_TYPE,
 	OPTIONS_JAVA_HUD,
 	OPTIONS_RESTORED_ANIMS,
 	OPTIONS_TINTED_SIDE,
 	OPTIONS_BETA_SKY,
 	OPTIONS_BEAUTIFUL_SKY,
 	OPTIONS_VIGNETTE,
 	OPTIONS_DEBUG_STYLE,
 	OPTIONS_COMPLETE_LIGHTING,
 	OPTIONS_MENU_STYLE,
 	// Should be last!
 	OPTIONS_COUNT
 };
@@ -109,10 +94,6 @@ typedef std::vector<std::string> StringVector;
 class Options
 {
 public:
    // deepfriedwaffles: for iOS, was getting compile errors saying: No member named 'sound' in 'Options' and No member named 'music' in 'Options' so I floated them here. 1.0f means full volume out of the box, but if everything is too loud, you might want to try adjusting this
    float sound = 1.0f;
    float music = 1.0f;
    static bool debugGl;
    Options(Minecraft* minecraft, const std::string& workingDirectory = "") 
--- a/src/client/OptionsFile.cpp
+++ b/src/client/OptionsFile.cpp
@@ -4,11 +4,10 @@
 #include <errno.h>
 #include <platform/log.h>
-#if defined(_WIN32)
+#if !defined(_WIN32)
-    #include <direct.h>
+#include <sys/stat.h>
-#else
+#include <sys/types.h>
-    #include <sys/stat.h>
+#include <unistd.h>
    #include <sys/types.h>
 #endif
 OptionsFile::OptionsFile() {
@@ -16,8 +15,6 @@ 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
@@ -30,44 +27,39 @@ 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");
+	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));
-    if (!pFile && errno == ENOENT) {
+		// Ensure parent directory exists for safekeeping if path contains directories
-        std::string dir = settingsPath;
+		std::string dir = settingsPath;
-        size_t fpos = dir.find_last_of("/\\");
+		size_t fpos = dir.find_last_of("/\\");
-        if (fpos != std::string::npos) {
+		if (fpos != std::string::npos) {
-            dir.resize(fpos);
+			dir.resize(fpos);
-
+			struct stat st;
-            std::string toCreate;
+			if (stat(dir.c_str(), &st) != 0) {
-            for (size_t i = 0; i <= dir.size(); ++i) {
+				// attempt recursive mkdir
-                if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
+				std::string toCreate;
-                    if (!toCreate.empty()) {
+				for (size_t i = 0; i <= dir.size(); ++i) {
-#if defined(_WIN32)
+					if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
-                        _mkdir(toCreate.c_str());
+						if (!toCreate.empty()) {
-#else
+							mkdir(toCreate.c_str(), 0755);
-                        mkdir(toCreate.c_str(), 0755);
+						}
-#endif
+					}
-                    }
+					if (i < dir.size())
-                }
+						toCreate.push_back(dir[i]);
-                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);
 }
--- a/src/client/gamemode/CreativeMode.cpp
+++ b/src/client/gamemode/CreativeMode.cpp
@@ -54,3 +54,16 @@ void CreativeMode::initAbilities( Abilities& abilities ) {
 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);
 	}
 }
--- a/src/client/gamemode/CreativeMode.h
+++ b/src/client/gamemode/CreativeMode.h
@@ -19,6 +19,7 @@ public:
 	void initAbilities(Abilities& abilities);
 	void releaseUsingItem(Player* player);
 private:
 	void creativeDestroyBlock(int x, int y, int z, int face);
 };
--- a/src/client/gamemode/CreatorMode.cpp
+++ b/src/client/gamemode/CreatorMode.cpp
@@ -92,6 +92,19 @@ 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;
 }
--- a/src/client/gamemode/CreatorMode.h
+++ b/src/client/gamemode/CreatorMode.h
@@ -118,6 +118,7 @@ public:
 	void initAbilities(Abilities& abilities);
 	void releaseUsingItem(Player* player);
 private:
 	void CreatorDestroyBlock(int x, int y, int z, int face);
--- a/src/client/gamemode/GameMode.cpp
+++ b/src/client/gamemode/GameMode.cpp
@@ -89,13 +89,9 @@ bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x
 	float clickX = hit.x - x;
 	float clickY = hit.y - y;
 	float clickZ = hit.z - z;
-	if (level->isClientSide) {
+	item = player->inventory->getSelected();
-		LOGI("%f %f %f \n", player->x, player->y, player->z);
+	if(level->isClientSide) {
-
+		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
 		item = player->inventory->getSelected();
 		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ, player->x, player->y, player->z,
 		player->bb.x0, player->bb.y0, player->bb.z0, player->bb.x1, player->bb.y1, player->bb.z1);
 		minecraft->raknetInstance->send(packet);
 	}
    int t = level->getTile(x, y, z);
@@ -104,7 +100,7 @@ bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x
 		return true;
 	if (item == NULL) return false;
-	if (isCreativeType()) {
+	if(isCreativeType()) {
 		int aux = item->getAuxValue();
 		int count = item->count;
 		bool success = item->useOn(player, level, x, y, z, face, clickX, clickY, clickZ);
@@ -121,8 +117,7 @@ bool GameMode::useItem( Player* player, Level* level, ItemInstance* item ) {
 	ItemInstance* itemInstance = item->use(level, player);
 	if(level->isClientSide) {
-		UseItemPacket packet(item, player->entityId, player->aimDirection, player->x, player->y, player->z,
+		UseItemPacket packet(item, player->entityId, player->aimDirection);
 		player->bb.x0, player->bb.y0, player->bb.z0, player->bb.x1, player->bb.y1, player->bb.z1);
 		minecraft->raknetInstance->send(packet);
 	}
 	if (itemInstance != item || (itemInstance != NULL && itemInstance->count != oldCount)) {
@@ -154,7 +149,7 @@ void GameMode::initPlayer( Player* player ) {
 }
 void GameMode::releaseUsingItem(Player* player){
-	if (minecraft->level->isClientSide && player->isUsingItem()) {
+	if(minecraft->level->isClientSide) {
 		PlayerActionPacket packet(PlayerActionPacket::RELEASE_USE_ITEM,  0, 0, 0, 0, player->entityId);
 		minecraft->raknetInstance->send(packet);
 	}
--- a/src/client/gamemode/SurvivalMode.cpp
+++ b/src/client/gamemode/SurvivalMode.cpp
@@ -68,7 +68,6 @@ 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);
--- a/src/client/gui/Font.cpp
+++ b/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] == '\xa7') {
+		while (str.length() > i + 1 && str[i] == '§') {
 			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] == '\xa7') {
+		if (str[i] == '§') {
 			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] == '\xa7') {
+		if (str[i] == '§') {
 			i++;
 			//} else if (SharedConstants.acceptableLetters.indexOf(str.charAt(i)) >= 0) {
 		} else {
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -7,7 +7,6 @@
 #include "screens/ConsoleScreen.h"
 #include "../Minecraft.h"
 #include "../player/LocalPlayer.h"
 #include "../renderer/Chunk.h"
 #include "../renderer/Tesselator.h"
 #include "../renderer/TileRenderer.h"
 #include "../renderer/LevelRenderer.h"
@@ -37,7 +36,7 @@ const float Gui::DropTicks = 40.0f;
 //#include <android/log.h>
 Gui::Gui(Minecraft* minecraft)
-	:	minecraft(minecraft),
+:	minecraft(minecraft),
 	tickCount(0),
 	progress(0),
 	overlayMessageTime(0),
@@ -52,8 +51,7 @@ 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);
@@ -77,8 +75,11 @@ 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;
@@ -87,9 +88,9 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	glColor4f2(1, 1, 1, 1);
 	// H: 4
-	// T: 7
+    // T: 7
-	// L: 6
+    // L: 6
-	// F: 3
+    // F: 3
 	int ySlot = screenHeight - 16 - 3;
 	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
@@ -104,12 +105,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		}
 	}
 	// viginette has been fixed, was due to gl_blend not being enabled, my bad
 	if (minecraft->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && minecraft->options.getBooleanValue(OPTIONS_VIGNETTE)){
 			renderVignette(this->minecraft->player->getBrightness(a), screenWidth, screenHeight);
 		}
 	// shredder end
 	if(minecraft->player->getSleepTimer() > 0) {
 		glDisable(GL_DEPTH_TEST);
 		glDisable(GL_ALPHA_TEST);
@@ -120,41 +115,38 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		glEnable(GL_DEPTH_TEST);
 	}
 	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
-		renderToolBar(a, ySlot, screenWidth);
+	renderToolBar(a, ySlot, screenWidth);
-	//	font->drawShadow("Minecraft - Pocket Edition ", 2, 2, 0xffffffff);
+	glEnable(GL_BLEND);
-//	font->drawShadow("This is a demo, not the finished product", 2, 10 + 2, 0xffffffff);
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
-
+	unsigned int max = 10;
-		glEnable(GL_BLEND);
+	if (isChatting) {
-		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+		int lineHeight = 9;
-		unsigned int max = 10;
+		max = (screenHeight - 48) / lineHeight;
-		if (isChatting) {
+		if (max < 1) max = 1;
-			int lineHeight = 9;
+		int maxScroll = (int)guiMessages.size() - (int)max;
-			max = (screenHeight - 48) / lineHeight;
+		if (maxScroll < 0) maxScroll = 0;
-			if (max < 1) max = 1;
+		if (chatScrollOffset > maxScroll) chatScrollOffset = maxScroll;
-			int maxScroll = (int)guiMessages.size() - (int)max;
+	} else {
-			if (maxScroll < 0) maxScroll = 0;
+		chatScrollOffset = 0;
-			if (chatScrollOffset > maxScroll) chatScrollOffset = maxScroll;
+	}
-		} else {
+	renderChatMessages(screenHeight, max, isChatting, font);
 			chatScrollOffset = 0;
 		}
 		renderChatMessages(screenHeight, max, isChatting, font);
 #if !defined(RPI)
-		renderOnSelectItemNameText(screenWidth, font, ySlot);
+	renderOnSelectItemNameText(screenWidth, font, ySlot);
 #endif
 #if defined(RPI)
-		renderDebugInfo();
+	renderDebugInfo();
 #endif
-		if (Keyboard::isKeyDown(Keyboard::KEY_TAB)) {
+	if (Keyboard::isKeyDown(Keyboard::KEY_TAB)) {
-			renderPlayerList(font, screenWidth, screenHeight);
+		renderPlayerList(font, screenWidth, screenHeight);
 		}
 		if (minecraft->options.getBooleanValue(OPTIONS_RENDER_DEBUG))
 			renderDebugInfo();
 	}
-	glDisable(GL_BLEND);
+	if (minecraft->options.getBooleanValue(OPTIONS_RENDER_DEBUG))
 		renderDebugInfo();
 	}
    glDisable(GL_BLEND);
 	glEnable2(GL_ALPHA_TEST);
 }
@@ -193,7 +185,7 @@ void Gui::getSlotPos(int slot, int& posX, int& posY) {
 	int screenWidth = (int)(minecraft->width * InvGuiScale);
 	int screenHeight = (int)(minecraft->height * InvGuiScale);
 	posX = screenWidth / 2 - getNumSlots() * 10 + slot * 20, 
-		posY = screenHeight - 22;
+	posY = screenHeight - 22;
 }
 RectangleArea Gui::getRectangleArea(int extendSide) {
@@ -214,69 +206,75 @@ void Gui::handleClick(int button, int x, int y) {
 	if (button != MouseAction::ACTION_LEFT)	return;
 	int slot = getSlotIdAt(x, y);
-	if (slot != -1) {
+	if (slot != -1)
-		if (_openInventorySlot && slot == (getNumSlots()-1)) {
+	{
 #ifndef PLATFORM_DESKTOP
 		if (slot == (getNumSlots()-1))
 		{
 			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-		} else {
+		}
 		else
 #endif
 		{
 			minecraft->player->inventory->selectSlot(slot);
 			itemNameOverlayTime = 0;
 		}
 	}
 }
-	void Gui::handleKeyPressed(int key)
+void Gui::handleKeyPressed(int key)
-	{
+{
-		bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
-		if (isChatting) {
+	if (isChatting) {
-			// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
-			if (key == 38) { // VK_UP
+		if (key == 38) { // VK_UP
-				scrollChat(1);
+			scrollChat(1);
-				return;
+			return;
-			} else if (key == 40) { // VK_DOWN
+		} else if (key == 40) { // VK_DOWN
-				scrollChat(-1);
+			scrollChat(-1);
-				return;
+			return;
-			} else if (key == 33) { // VK_PRIOR (Page Up)
+		} else if (key == 33) { // VK_PRIOR (Page Up)
-				// Scroll by a page
+			// Scroll by a page
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
+			int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(maxVisible);
+			scrollChat(maxVisible);
-				return;
+			return;
-			} else if (key == 34) { // VK_NEXT (Page Down)
+		} else if (key == 34) { // VK_NEXT (Page Down)
-				int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
-				int maxVisible = (screenHeight - 48) / 9;
+			int maxVisible = (screenHeight - 48) / 9;
-				scrollChat(-maxVisible);
+			scrollChat(-maxVisible);
-				return;
+			return;
 			}
 		}
 		if (key == Keyboard::KEY_F1) {
 			minecraft->options.toggle(OPTIONS_HIDEGUI);
 		}
 		if (key == 99)
 		{
 			if (minecraft->player->inventory->selected > 0)
 			{
 				minecraft->player->inventory->selected--;
 			}
 		}
 		else if (key == 4)
 		{
 			if (minecraft->player->inventory->selected < (getNumSlots() - 2))
 			{
 				minecraft->player->inventory->selected++;
 			}
 		}
 		else if (key == 100)
 		{
 			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
 		}
 		else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
 		{
 			minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
 		}
 	}
 	if (key == Keyboard::KEY_F1) {
 		minecraft->options.toggle(OPTIONS_HIDEGUI);
 	}
 	if (key == 99)
 	{
 		if (minecraft->player->inventory->selected > 0)
 		{
 			minecraft->player->inventory->selected--;
 		}
 	}
 	else if (key == 4)
 	{
 		if (minecraft->player->inventory->selected < (getNumSlots() - 2))
 		{
 			minecraft->player->inventory->selected++;
 		}
 	}
 	else if (key == 100)
 	{
 		minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
 	}
 	else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
 	{
 		minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
 	}
 }
 void Gui::scrollChat(int delta) {
 	if (delta == 0)
 		return;
@@ -300,11 +298,11 @@ void Gui::tick() {
 	if(itemNameOverlayTime < 2)
 		itemNameOverlayTime += 1.0f / SharedConstants::TicksPerSecond;
 	for (unsigned int i = 0; i < guiMessages.size(); i++) {
-		guiMessages.at(i).ticks++;
+	    guiMessages.at(i).ticks++;
 	}
-	if (!minecraft->isCreativeMode())
+    if (!minecraft->isCreativeMode())
-		tickItemDrop();
+        tickItemDrop();
 }
 void Gui::addMessage(const std::string& _string) {
@@ -351,11 +349,9 @@ 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(messageId);
+	addMessage(std::string("Client message: ") + messageId);
 }
 // @todo - shredder: Function seems to be completely fine and ported over from java beta, but renders opaque??? need to investigate
 void Gui::renderVignette(float br, int w, int h) {
 	br = 1 - br;
 	if (br < 0) br = 0;
@@ -364,13 +360,9 @@ void Gui::renderVignette(float br, int w, int h) {
 	glDisable(GL_DEPTH_TEST);
 	glDepthMask(false);
 	glEnable(GL_BLEND);
 	glBlendFunc2(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
 	glColor4f2(tbr, tbr, tbr, 1);
 	minecraft->textures->loadAndBindTexture("misc/vignette.png");
 	glTexParameteri2(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
 	glTexParameteri2(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	Tesselator& t = Tesselator::instance;
 	t.begin();
@@ -381,7 +373,6 @@ void Gui::renderVignette(float br, int w, int h) {
 	t.draw();
 	glDepthMask(true);
 	glEnable(GL_DEPTH_TEST);
 	glDisable(GL_BLEND);
 	glColor4f2(1, 1, 1, 1);
 	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }
@@ -424,7 +415,7 @@ void Gui::inventoryUpdated() {
 }
 void Gui::onGraphicsReset() {
-	inventoryUpdated();
+    inventoryUpdated();
 }
 void Gui::texturesLoaded( Textures* textures ) {
@@ -546,7 +537,11 @@ void Gui::tickItemDrop()
 	static bool isCurrentlyActive = false;
 	isCurrentlyActive = false;
-	int slots = getNumSlots() - _openInventorySlot;
+	int slots = getNumSlots();
 #ifndef PLATFORM_DESKTOP
 	slots--;
 #endif
 	if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
 		int slot = getSlotIdAt(Mouse::getX(), Mouse::getY());
@@ -602,13 +597,12 @@ void Gui::renderProgressIndicator( const bool isTouchInterface, const int screen
 	bool bowEquipped = currentItem != NULL ? currentItem->getItem() == Item::bow : false;
 	bool itemInUse = currentItem != NULL ? currentItem->getItem() == minecraft->player->getUseItem()->getItem() : false;
 	if ((!isTouchInterface || minecraft->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA) 
-		|| (bowEquipped && itemInUse)) && !minecraft->options.getBooleanValue(OPTIONS_HIDEGUI))
+	|| (bowEquipped && itemInUse)) && !minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
-	{
+		minecraft->textures->loadAndBindTexture("gui/icons.png");
-			minecraft->textures->loadAndBindTexture("gui/icons.png");
+		glEnable(GL_BLEND);
-			glEnable(GL_BLEND);
+		glBlendFunc2(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
-			glBlendFunc2(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
+		blit(screenWidth/2 - 8, screenHeight/2 - 8, 0, 0, 16, 16);
-			blit(screenWidth/2 - 8, screenHeight/2 - 8, 0, 0, 16, 16);
+		glDisable(GL_BLEND);
 			glDisable(GL_BLEND);
 	} else if(!bowEquipped) {
 		const float tprogress = minecraft->gameMode->destroyProgress;
 		const float alpha = Mth::clamp(minecraft->inputHolder->alpha, 0.0f, 1.0f);
@@ -627,7 +621,7 @@ void Gui::renderProgressIndicator( const bool isTouchInterface, const int screen
 			const float x = InvGuiScale * minecraft->inputHolder->mousex;
 			const float y = InvGuiScale * minecraft->inputHolder->mousey;
 			glTranslatef2(x, y, 0);
-			drawArrayVT(rcFeedbackOuter.vboId, rcFeedbackOuter.vertexCount, 36);
+			drawArrayVT(rcFeedbackOuter.vboId, rcFeedbackOuter.vertexCount, 24);
 			glTranslatef2(-x, -y, 0);
 			glEnable2(GL_TEXTURE_2D);
@@ -648,12 +642,12 @@ void Gui::renderProgressIndicator( const bool isTouchInterface, const int screen
 			const float y = InvGuiScale * minecraft->inputHolder->mousey;
 			glPushMatrix2();
 			glTranslatef2(x, y, 0);
-			drawArrayVT(rcFeedbackOuter.vboId, rcFeedbackOuter.vertexCount, 36);
+			drawArrayVT(rcFeedbackOuter.vboId, rcFeedbackOuter.vertexCount, 24);
 			glScalef2(0.5f + progress, 0.5f + progress, 1);
 			//glDisable2(GL_CULL_FACE);
 			glColor4f2(1, 1, 1, 1);
 			glBlendFunc2(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
-			drawArrayVT(rcFeedbackInner.vboId, rcFeedbackInner.vertexCount, 36, GL_TRIANGLE_FAN);
+			drawArrayVT(rcFeedbackInner.vboId, rcFeedbackInner.vertexCount, 24, GL_TRIANGLE_FAN);
 			glPopMatrix2();
 			glDisable(GL_BLEND);
@@ -683,10 +677,10 @@ void Gui::renderHearts() {
 		int ip2 = i + i + 1;
 		if (armor > 0) {
-			int xo = xx + 80 + i * 8 + 4;
+		    int xo = xx + 80 + i * 8 + 4;
-			if (ip2 < armor) blit(xo, yo, 16 + 2 * 9, 9 * 1, 9, 9);
+		    if (ip2 < armor) blit(xo, yo, 16 + 2 * 9, 9 * 1, 9, 9);
-			else if (ip2 == armor) blit(xo, yo, 16 + 4 * 9, 9 * 1, 9, 9);
+		    else if (ip2 == armor) blit(xo, yo, 16 + 4 * 9, 9 * 1, 9, 9);
-			else if (ip2 > armor) blit(xo, yo, 16 + 0 * 9, 9 * 1, 9, 9);
+		    else if (ip2 > armor) blit(xo, yo, 16 + 0 * 9, 9 * 1, 9, 9);
 		}
 		int bg = 0;
@@ -732,20 +726,13 @@ void Gui::onLevelGenerated() {
 void Gui::renderDebugInfo() {
 	// FPS counter (updates once per second)
-	static int fps = 0;
+	static float fps = 0.0f;
-	static int fpsLastTime = 0;
+	static float fpsLastTime = 0.0f;
 	static int   fpsFrames = 0;
 	static int   displayChunkUpdates = 0;
 	float now = getTimeS();
 	fpsFrames++;
-	if (now - fpsLastTime >= 1) {
+	if (now - fpsLastTime >= 1.0f) {
 		fps = fpsFrames / (now - fpsLastTime);
 		displayChunkUpdates = Chunk::updates;
    // 3. RESET the actual game counter to 0 for the next second
 		Chunk::updates = 0;
 		fpsFrames = 0;
 		fpsLastTime = now;
 	}
@@ -755,6 +742,7 @@ 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;
@@ -781,70 +769,7 @@ void Gui::renderDebugInfo() {
 	long day       = worldTime / Level::TICKS_PER_DAY;
 	long seed      = lvl ? lvl->getSeed() : 0;
 	// Block looking at
 	std::string CurrentTile = "Air";
 	if (minecraft->hitResult.type == TILE) {
 		int LookingX = minecraft->hitResult.x;
 		int LookingY = minecraft->hitResult.y;
 		int LookingZ = minecraft->hitResult.z;
 		int tileID = minecraft->level->getTile(LookingX, LookingY, LookingZ);
 		if (tileID > 0 && tileID < 256){
 			Tile* LookingTile = Tile::tiles[tileID];
 			if (LookingTile != NULL) {
 				CurrentTile = LookingTile->getDescriptionId();
 			} else {
 				CurrentTile = "Unknown Tile";
 			}
 		} else {
 			CurrentTile = "Air";
 		}
 	}
 	// Build lines (NULL entry = blank gap)
 	Font* font = minecraft->font;
 	// @todo - add our own debug screen as an option alongside the restored java one, why does renderdebug have to be so jank - shredder
 	// if java beta's restored debug menu is enabled
 	if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 0){
 	char buf[128];
 	sprintf(buf, "Minecraft - Pocket Edition (%d fps, %d chunk updates)", (int)fps, displayChunkUpdates);
 	font->drawShadow(buf, 2, 2, 0xffffff);
 	font->drawShadow(minecraft->gatherStats1(), 2, 12, 0xFFFFFF);
 	font->drawShadow(minecraft->gatherStats2(), 2, 22, 0xFFFFFF);
    font->drawShadow(minecraft->gatherStats3(), 2, 32, 0xFFFFFF);
    font->drawShadow(minecraft->gatherStats4(), 2, 42, 0xFFFFFF);
 	sprintf(buf, "x: %.8f", minecraft->player->x);
 	drawString(font, buf, 2, 64, 0xE0E0E0);
 	sprintf(buf, "y: %.8f", minecraft->player->y);
 	drawString(font, buf, 2, 72, 0xE0E0E0);
 	sprintf(buf, "z: %.8f", minecraft->player->z);
 	drawString(font, buf, 2, 80, 0xE0E0E0);
 	sprintf(buf, "f: %d",Mth::floor(minecraft->player->yRot * 4.0f / 360.0f + 0.5) & 0x3);
 	drawString(font, buf, 2, 88, 0xE0E0E0);
 	sprintf(buf, "Seed: %.ld", lvl->getSeed());
 	drawString(font, buf, 2, 104, 0xE0E0E0);
 	sprintf(buf, "Dimension: %d (%s)", lvl->dimension->id, lvl->dimension->getDimension().c_str());
 	drawString(font, buf, 2, 114, 0xE0E0E0);
 	sprintf(buf, "Biome: %s", biomeName);
 	drawString(font, buf, 2, 124, 0xE0E0E0);
 	sprintf(buf, "Looking at: %s", CurrentTile.c_str());
 		drawString(font, buf, 2, 134, 0xE0E0E0);
 	}
 	else if (minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE) == 1){
 	static char ln[8][96];
 	sprintf(ln[0], "Minecraft PE 0.6.1 alpha (mcpe64)");
 	sprintf(ln[1], "%.1f fps", fps);
@@ -859,7 +784,7 @@ void Gui::renderDebugInfo() {
 	const float LH  = (float)Font::DefaultLineHeight; // 10 font-pixels
 	const float MGN = 2.0f;  // left/top margin in font-pixels
 	const float PAD = 2.0f;  // horizontal padding for background
-//	Font* font = minecraft->font;
+	Font* font = minecraft->font;
 	// 1) Draw semi-transparent background boxes behind each line
 	for (int i = 0; i < N; i++) {
@@ -882,7 +807,6 @@ void Gui::renderDebugInfo() {
 		font->draw(ln[i], MGN, y, col);
 	}
 	t.endOverrideAndDraw();
 	}
 }
 void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {
@@ -998,64 +922,64 @@ void Gui::renderOnSelectItemNameText( const int screenWidth, Font* font, int ySl
 // helper structure used by drawColoredString
 struct ColorSegment {
-	std::string text;
+    std::string text;
-	uint32_t color;
+    uint32_t color;
 };
 // parse [tag] and [/tag] markers; tags may contain a color name (gold, green, etc.)
 static void parseColorTags(const std::string& in, std::vector<ColorSegment>& out) {
-	uint32_t curColor = 0xffffff;
+    uint32_t curColor = 0xffffff;
-	size_t pos = 0;
+    size_t pos = 0;
-	while (pos < in.size()) {
+    while (pos < in.size()) {
-		size_t open = in.find('[', pos);
+        size_t open = in.find('[', pos);
-		if (open == std::string::npos) {
+        if (open == std::string::npos) {
-			out.push_back({in.substr(pos), curColor});
+            out.push_back({in.substr(pos), curColor});
-			break;
+            break;
-		}
+        }
-		if (open > pos) {
+        if (open > pos) {
-			out.push_back({in.substr(pos, open - pos), curColor});
+            out.push_back({in.substr(pos, open - pos), curColor});
-		}
+        }
-		size_t close = in.find(']', open);
+        size_t close = in.find(']', open);
-		if (close == std::string::npos) {
+        if (close == std::string::npos) {
-			out.push_back({in.substr(open), curColor});
+            out.push_back({in.substr(open), curColor});
-			break;
+            break;
-		}
+        }
-		std::string tag = in.substr(open + 1, close - open - 1);
+        std::string tag = in.substr(open + 1, close - open - 1);
-		if (!tag.empty() && tag[0] == '/') {
+        if (!tag.empty() && tag[0] == '/') {
-			curColor = 0xffffff;
+            curColor = 0xffffff;
-		} else {
+        } else {
-			std::string lower;
+            std::string lower;
-			lower.resize(tag.size());
+            lower.resize(tag.size());
-			std::transform(tag.begin(), tag.end(), lower.begin(), ::tolower);
+            std::transform(tag.begin(), tag.end(), lower.begin(), ::tolower);
-			if (lower.find("gold") != std::string::npos) curColor = 0xffd700;
+            if (lower.find("gold") != std::string::npos) curColor = 0xffd700;
-			else if (lower.find("green") != std::string::npos) curColor = 0x00ff00;
+            else if (lower.find("green") != std::string::npos) curColor = 0x00ff00;
-			else if (lower.find("yellow") != std::string::npos) curColor = 0xffff00;
+            else if (lower.find("yellow") != std::string::npos) curColor = 0xffff00;
-			else if (lower.find("red") != std::string::npos) curColor = 0xff0000;
+            else if (lower.find("red") != std::string::npos) curColor = 0xff0000;
-			else if (lower.find("blue") != std::string::npos) curColor = 0x0000ff;
+            else if (lower.find("blue") != std::string::npos) curColor = 0x0000ff;
-		}
+        }
-		pos = close + 1;
+        pos = close + 1;
-	}
+    }
 }
 void Gui::drawColoredString(Font* font, const std::string& text, float x, float y, int alpha) {
-	std::vector<ColorSegment> segs;
+    std::vector<ColorSegment> segs;
-	parseColorTags(text, segs);
+    parseColorTags(text, segs);
-	float cx = x;
+    float cx = x;
-	for (auto &s : segs) {
+    for (auto &s : segs) {
-		int color = s.color + (alpha << 24);
+        int color = s.color + (alpha << 24);
-		font->drawShadow(s.text, cx, y, color);
+        font->drawShadow(s.text, cx, y, color);
-		cx += font->width(s.text);
+        cx += font->width(s.text);
-	}
+    }
 }
 float Gui::getColoredWidth(Font* font, const std::string& text) {
-	std::vector<ColorSegment> segs;
+    std::vector<ColorSegment> segs;
-	parseColorTags(text, segs);
+    parseColorTags(text, segs);
-	float w = 0;
+    float w = 0;
-	for (auto &s : segs) {
+    for (auto &s : segs) {
-		w += font->width(s.text);
+        w += font->width(s.text);
-	}
+    }
-	return w;
+    return w;
 }
 void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isChatting, Font* font ) {
@@ -1099,23 +1023,20 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC
 				glEnable(GL_BLEND);
 				// special-case join/leave announcements
-				int baseColor = 0xffffff;
+			int baseColor = 0xffffff;
-				if (msg.find(" joined the game") != std::string::npos ||
+			if (msg.find(" joined the game") != std::string::npos ||
-					msg.find(" left the game") != std::string::npos) {
+				msg.find(" left the game") != std::string::npos) {
-						baseColor = 0xffff00; // yellow
+				baseColor = 0xffff00; // yellow
-				}
+			}
-				// replace previous logic; allow full colour tags now
+			// replace previous logic; allow full colour tags now
-				Gui::drawColoredString(font, msg, x, y, alpha);
+			Gui::drawColoredString(font, msg, x, y, alpha);
 			}
 		}
 	}
 }
 void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
-	glColor4f2(1, 1, 1, 1);
+	glColor4f2(1, 1, 1, .5);
 	    glEnable(GL_BLEND);
    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	minecraft->textures->loadAndBindTexture("gui/gui.png");
 	Inventory* inventory = minecraft->player->inventory;
@@ -1162,7 +1083,13 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	float x = baseItemX;
-	int slots = getNumSlots() - _openInventorySlot;
+	int slots = getNumSlots();
 	// TODO: if using touchscreen
 #ifndef PLATFORM_DESKTOP
 	slots--;
 #endif
 	for (int i = 0; i < slots; i++) {
 		renderSlot(i, (int)x, ySlot, a);
@@ -1170,10 +1097,9 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	}
 	_inventoryNeedsUpdate = false;
-
+#ifndef PLATFORM_DESKTOP
-	if (_openInventorySlot) {
+	blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
-		blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
+#endif
 	}
 	minecraft->textures->loadAndBindTexture("gui/gui_blocks.png");
 	t.endOverrideAndDraw();
@@ -1196,41 +1122,22 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	// Draw count
 	//Tesselator& t = Tesselator::instance;
-
+	glPushMatrix2();
 	glScalef2(InvGuiScale + InvGuiScale, InvGuiScale + InvGuiScale, 1);
 	const float k = 0.5f * GuiScale;
-	if (minecraft->options.getBooleanValue(OPTIONS_JAVA_HUD)) // if true enables the java beta item count size and color and calls the java items decorations
+
-	{
+	t.beginOverride();
-		t.beginOverride();
+	if (minecraft->gameMode->isSurvivalType()) {
-		if (minecraft->gameMode->isSurvivalType()) {
+		x = baseItemX;
-			x = baseItemX;
+		for (int i = 0; i < slots; i++) {
-			for (int i = 0; i < slots; i++) {
+			ItemInstance* item = minecraft->player->inventory->getItem(i);
-				ItemInstance* item = minecraft->player->inventory->getItem(i);
+			if (item && item->count >= 0)
-				if (item && item->count >= 0)
+				renderSlotText(item, k*x, k*ySlot + 1, true, true);
-					ItemRenderer::renderGuiItemDecorations(minecraft->font, minecraft->textures, minecraft->player->inventory->getItem(i), x, (float)ySlot);
+			x += 20;
 				x += 20;
 			}
 		}
 		minecraft->textures->loadAndBindTexture("font/default8.png");
 		t.endOverrideAndDraw();
 	}
 	else { // otherwise uses the normal pocket edition one
 		glPushMatrix2();
 		glScalef2(InvGuiScale + InvGuiScale, InvGuiScale + InvGuiScale, 1);
 		t.beginOverride();
 		if (minecraft->gameMode->isSurvivalType()) {
 			x = baseItemX;
 			for (int i = 0; i < slots; i++) {
 				ItemInstance* item = minecraft->player->inventory->getItem(i);
 				if (item && item->count >= 0)
 					renderSlotText(item, k*x, k*ySlot, true, true);
 				x += 20;
 			}
 		}
 		minecraft->textures->loadAndBindTexture("font/default8.png");
 		t.endOverrideAndDraw();
 		glPopMatrix2();
 	}
 	minecraft->textures->loadAndBindTexture("font/default8.png");
 	t.endOverrideAndDraw();
 	glPopMatrix2();
 }
--- a/src/client/gui/Gui.h
+++ b/src/client/gui/Gui.h
@@ -127,8 +127,6 @@ private:
 	static const float DropTicks;
 	float  _currentDropTicks;
 	int    _currentDropSlot;
 	bool   _openInventorySlot;
 };
 #endif /*NET_MINECRAFT_CLIENT_GUI__Gui_H__*/
--- a/src/client/gui/Screen.cpp
+++ b/src/client/gui/Screen.cpp
@@ -177,11 +177,9 @@ 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)
@@ -201,7 +199,6 @@ void Screen::keyPressed( int eventKey )
 	}
 	updateTabButtonSelection();
 #endif
 }
 void Screen::charPressed(char inputChar) {
@@ -212,13 +209,11 @@ 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 )
--- a/src/client/gui/components/Button.cpp
+++ b/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)) : isInside(xm, ym);
+	return minecraft->useTouchscreen()? (_currentlyDown && isInside(xm, ym)) : false;
 }
 bool Button::isInside( int xm, int ym ) {
@@ -143,8 +143,7 @@ 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) : isInside(xm, ym));
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
 	// bool hovered = active && (_currentlyDown && isInside(xm, ym));
 	minecraft->textures->loadAndBindTexture("gui/touchgui.png");
--- a/src/client/gui/components/ImageButton.cpp
+++ b/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) : isInside(xm, ym));
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
 	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);
--- a/src/client/gui/components/LargeImageButton.cpp
+++ b/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) : isInside(xm, ym));
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
 	//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);
--- a/src/client/gui/components/OptionsGroup.cpp
+++ b/src/client/gui/components/OptionsGroup.cpp
@@ -65,7 +65,7 @@ void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
 	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	OptionsItem* item = new OptionsItem(itemLabel, element);
 	addChild(item);
 	setupPositions();
@@ -77,7 +77,7 @@ void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
 	element->height = 20;
 	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	OptionsItem* item = new OptionsItem(itemLabel, element);
 	addChild(item);
 	setupPositions();
 }
@@ -87,7 +87,7 @@ void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
 	element->width = 100;
 	element->height = 20;
 	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	OptionsItem* item = new OptionsItem(itemLabel, element);
 	addChild(item);
 	setupPositions();
 }
@@ -98,7 +98,7 @@ void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
 	element->height = 20;
 	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	OptionsItem* item = new OptionsItem(itemLabel, element);
 	addChild(item);
 	setupPositions();
 }
@@ -109,7 +109,7 @@ void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
 	element->height = 20;
 	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
-	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	OptionsItem* item = new OptionsItem(itemLabel, element);
 	addChild(item);
 	setupPositions();
 }
--- a/src/client/gui/components/OptionsItem.cpp
+++ b/src/client/gui/components/OptionsItem.cpp
@@ -1,11 +1,9 @@
 #include "OptionsItem.h"
 #include "../../Minecraft.h"
 #include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
-OptionsItem::OptionsItem( OptionId optionId, std::string label, GuiElement* element )
+OptionsItem::OptionsItem( std::string label, GuiElement* element )
 : GuiElementContainer(false, true, 0, 0, 24, 12),
-  m_optionId(optionId),
+  label(label) {
  m_label(label) {
 	  addChild(element);
 }
@@ -21,64 +19,6 @@ void OptionsItem::setupPositions() {
 void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 	int yOffset = (height - 8) / 2;
-	std::string text = m_label;
+	minecraft->font->draw(label, (float)x, (float)y + yOffset, 0x909090, false);
 	if (m_optionId == OPTIONS_GUI_SCALE) {
 		int value = minecraft->options.getIntValue(OPTIONS_GUI_SCALE);
 		std::string scaleText;
 		switch (value) {
 		case 0: scaleText = I18n::get("options.guiScale.auto"); break;
 		case 1: scaleText = I18n::get("options.guiScale.small"); break;
 		case 2: scaleText = I18n::get("options.guiScale.medium"); break;
 		case 3: scaleText = I18n::get("options.guiScale.large"); break;
 		case 4: scaleText = I18n::get("options.guiScale.larger"); break;
 		case 5: scaleText = I18n::get("options.guiScale.largest"); break;
 		default: scaleText = I18n::get("options.guiScale.auto"); break;
 		}
 		text += ": " + scaleText;
 	}
 	if (m_optionId == OPTIONS_FOG_TYPE) {
 		int value = minecraft->options.getIntValue(OPTIONS_FOG_TYPE);
 		std::string scaleText;
 		switch (value) {
 		case 0: scaleText = I18n::get("options.fogType.vanilla"); break;
 		case 1: scaleText = I18n::get("options.fogType.java"); break;
 		case 2: scaleText = I18n::get("options.fogType.unused"); break;
 		}
 		text += ": " + scaleText;
 	}
 	if (m_optionId == OPTIONS_DEBUG_STYLE) {
 		int value = minecraft->options.getIntValue(OPTIONS_DEBUG_STYLE);
 		std::string scaleText;
 		switch (value) {
 		case 0: scaleText = I18n::get("options.debugStyle.javaBeta"); break;
 		case 1: scaleText = I18n::get("options.debugStyle.custom"); break;
 		case 2: scaleText = I18n::get("options.fogType.unused"); break;
 		}
 		text += ": " + scaleText;
 	}
 	if (m_optionId == OPTIONS_MENU_STYLE) {
 		int value = minecraft->options.getIntValue(OPTIONS_MENU_STYLE);
 		std::string scaleText;
 		switch (value) {
 		case 0: scaleText = I18n::get("options.menuStyle.pocket"); break;
 		case 1: scaleText = I18n::get("options.menuStyle.xperia"); break;
 		case 2: scaleText = I18n::get("options.menuStyle.java"); break;
 		}
 		text += ": " + scaleText;
 	}
 	if (m_optionId == OPTIONS_VIEW_DISTANCE) {
 		int value = minecraft->options.getIntValue(OPTIONS_VIEW_DISTANCE);
 		std::string scaleText;
 		switch (value) {
 		case 0: scaleText = I18n::get("options.renderDistance.far"); break;
 		case 1: scaleText = I18n::get("options.renderDistance.normal"); break;
 		case 2: scaleText = I18n::get("options.renderDistance.short"); break;
 		case 3: scaleText = I18n::get("options.renderDistance.tiny"); break;
 		default: scaleText = "Debug"; break;
 		}
 		text += ": " + scaleText;
 	}
 	minecraft->font->draw(text, (float)x, (float)y + yOffset, 0x909090, false);
 	super::render(minecraft, xm, ym);
 }
--- a/src/client/gui/components/OptionsItem.h
+++ b/src/client/gui/components/OptionsItem.h
@@ -15,13 +15,12 @@ class OptionsItem: public GuiElementContainer
 {
 	typedef GuiElementContainer super;
 public:
-	OptionsItem(OptionId optionId, std::string label, GuiElement* element);
+	OptionsItem(std::string label, GuiElement* element);
 	virtual void render(Minecraft* minecraft, int xm, int ym);
 	void setupPositions();
 private:
-	OptionId m_optionId;
+	std::string label;
 	std::string m_label;
 };
 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__*/
--- a/src/client/gui/components/OptionsPane.cpp
+++ b/src/client/gui/components/OptionsPane.cpp
@@ -1,64 +0,0 @@
 #include "OptionsPane.h"
 #include "OptionsGroup.h"
 #include "OptionsItem.h"
 #include "ImageButton.h"
 #include "Slider.h"
 #include "../../Minecraft.h"
 #include "client/Options.h"
 OptionsPane::OptionsPane() {
 }
 void OptionsPane::setupPositions() {
 	int currentHeight = y + 1;
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it ) {
 		(*it)->width = width;
 		(*it)->y = currentHeight;
 		(*it)->x = x;
 		currentHeight += (*it)->height + 1;
 	}
 	height = currentHeight;
 	super::setupPositions();
 }
 OptionsGroup& OptionsPane::createOptionsGroup( std::string label ) {
 	OptionsGroup* newGroup = new OptionsGroup(label);
 	children.push_back(newGroup);
 	// create and return a new group index
 	return *newGroup;
 }
 void OptionsPane::createToggle( unsigned int group, std::string label, OptionId option ) {
 	if(group > children.size()) return;
 	ImageDef def;
 	def.setSrc(IntRectangle(160, 206, 39, 20));
 	def.name = "gui/touchgui.png";
 	def.width = 39 * 0.7f;
 	def.height = 20 * 0.7f;
 	OptionButton* element = new OptionButton(option);
 	element->setImageDef(def, true);
 	OptionsItem* item = new OptionsItem(option, label, element);
 	((OptionsGroup*)children[group])->addChild(item);
 	setupPositions();
 }
 void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, OptionId option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) {
 	if(group > children.size()) return;
 	Slider* element = new SliderFloat(minecraft, option);
 	element->width = 100;
 	element->height = 20;
 	OptionsItem* item = new OptionsItem(option, label, element);
 	((OptionsGroup*)children[group])->addChild(item);
 	setupPositions();
 }
 void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, OptionId option, const std::vector<int>& stepVec ) {
 	if(group > children.size()) return;
 	Slider* element = new SliderInt(minecraft, option);
 	element->width = 100;
 	element->height = 20;
 	OptionsItem* item = new OptionsItem(option, label, element);
 	((OptionsGroup*)children[group])->addChild(item);
 	setupPositions();
 }
--- a/src/client/gui/components/OptionsPane.h
+++ b/src/client/gui/components/OptionsPane.h
@@ -1,30 +0,0 @@
 #ifndef ITEMPANE_H__
 #define ITEMPANE_H__
 #include <string>
 #include <vector>
 #include "GuiElementContainer.h"
 #include "../../../world/item/ItemInstance.h"
 #include "../../../client/Options.h"
 class Font; 
 class Textures;
 class NinePatchLayer;
 class ItemPane;
 class OptionButton;
 class Button;
 class OptionsGroup;
 class Slider;
 class Minecraft;
 class OptionsPane: public GuiElementContainer
 {
 	typedef GuiElementContainer super;
 public:
 	OptionsPane();
 	OptionsGroup& createOptionsGroup( std::string label );
 	void createToggle( unsigned int group, std::string label, OptionId option );
 	void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, OptionId option, float progressMin=1.0f, float progressMax=1.0f );
 	void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, OptionId option, const std::vector<int>& stepVec );
 	void setupPositions();
 };
 #endif /*ITEMPANE_H__*/
--- a/src/client/gui/components/ScrollingPane.cpp
+++ b/src/client/gui/components/ScrollingPane.cpp
@@ -20,9 +20,6 @@ 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,
@@ -73,19 +70,13 @@ 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;
@@ -123,34 +114,6 @@ 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) {
@@ -586,39 +549,11 @@ void ScrollingPane::stepThroughDecelerationAnimation(bool noAnimation) {
 }
 void ScrollingPane::scrollBy(float dx, float dy) {
-	// compute target content offset from wheel delta (in screen-space w/ opposite sign)
+	// adjust the translation offsets fpx/fpy by the requested amount
-	float targetX = _contentOffset.x - dx;
+	float nfpx = fpx + dx;
-	float targetY = _contentOffset.y - dy;
+	float nfpy = fpy + dy;
-
+	// convert back to content offset (fpx = -contentOffset.x)
-	if (isSet(SF_LockX)) targetX = _contentOffset.x;
+	setContentOffset(Vec3(-nfpx, -nfpy, 0));
 	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) {
--- a/src/client/gui/components/Slider.cpp
+++ b/src/client/gui/components/Slider.cpp
@@ -2,7 +2,6 @@
 #include "../../Minecraft.h"
 #include "../../renderer/Textures.h"
 #include "../Screen.h"
 #include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
 #include <algorithm>
 #include <assert.h>
@@ -22,7 +21,7 @@ void Slider::render( Minecraft* minecraft, int xm, int ym ) {
 	if (m_numSteps > 2) {
 		int stepDistance = barWidth / (m_numSteps-1);
-		for(int a = 0; a < m_numSteps; ++a) {
+		for(int a = 0; a <= m_numSteps; ++a) {
 			int renderSliderStepPosX = xSliderStart + a * stepDistance + 1;
 			fill(renderSliderStepPosX - 1, ySliderStart - 2, renderSliderStepPosX + 1, ySliderEnd + 2, 0xff606060);
 		}
@@ -65,20 +64,15 @@ SliderFloat::SliderFloat(Minecraft* minecraft, OptionId option)
 SliderInt::SliderInt(Minecraft* minecraft, OptionId option) 
 : Slider(option), m_option(dynamic_cast<OptionInt*>(minecraft->options.getOpt(option)))
 {
-	m_numSteps = m_option->getMax() - m_option->getMin() + 1;
+	m_numSteps = m_option->getMax() - m_option->getMin();
 	m_percentage = float(m_option->get() - m_option->getMin()) / (m_numSteps-1);
 }
 void SliderInt::render( Minecraft* minecraft, int xm, int ym ) {
 	Slider::render(minecraft, xm, ym);
 }
 void SliderInt::mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum ) {
 	Slider::mouseReleased(minecraft, x, y, buttonNum);
 	if (pointInside(x, y)) {
-		int curStep = int(m_percentage * (m_numSteps-1) + 0.5f);
+		int curStep = Mth::floor(m_percentage * (m_numSteps-1));
 		curStep = Mth::clamp(curStep + m_option->getMin(), m_option->getMin(), m_option->getMax());
 		m_percentage = float(curStep - m_option->getMin()) / (m_numSteps-1);
 		minecraft->options.set(m_optId, curStep);
--- a/src/client/gui/components/Slider.h
+++ b/src/client/gui/components/Slider.h
@@ -3,6 +3,7 @@
 #include "GuiElement.h"
 #include "../../../client/Options.h"
 #include <client/Option.h>
 class Slider : public GuiElement {
 	typedef GuiElement super;
@@ -37,7 +38,6 @@ class SliderInt : public Slider {
 public:
 	SliderInt(Minecraft* minecraft, OptionId option);
 	virtual void render( Minecraft* minecraft, int xm, int ym ) override;
 	virtual void mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum ) override;
 protected:
--- a/src/client/gui/components/SmallButton.cpp
+++ b/src/client/gui/components/SmallButton.cpp
@@ -1,24 +0,0 @@
 #include "SmallButton.h"
 SmallButton::SmallButton( int id, int x, int y, const std::string& msg )
 :	super(id, x, y, 150, 20, msg),
 	option(NULL)
 {
 }
 SmallButton::SmallButton( int id, int x, int y, int width, int height, const std::string& msg )
 :	super(id, x, y, width, height, msg),
 	option(NULL)
 {
 }
 SmallButton::SmallButton( int id, int x, int y, Option* item, const std::string& msg )
 :	super(id, x, y, 150, 20, msg),
 	option(item)
 {
 }
 Option* SmallButton::getOption()
 {
 	return option;
 }
--- a/src/client/gui/components/SmallButton.h
+++ b/src/client/gui/components/SmallButton.h
@@ -1,23 +0,0 @@
 #ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__
 #define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__
 //package net.minecraft.client.gui;
 #include <string>
 #include "Button.h"
 #include "../../Options.h"
 class SmallButton: public Button
 {
 	typedef Button super;
 public:
    SmallButton(int id, int x, int y, const std::string& msg);
    SmallButton(int id, int x, int y, int width, int height, const std::string& msg);
    SmallButton(int id, int x, int y, Option* item, const std::string& msg);
    Option* getOption();
 private:
 	Option* option;
 };
 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__*/
--- a/src/client/gui/screens/BuyGameScreen.h
+++ b/src/client/gui/screens/BuyGameScreen.h
@@ -1,26 +0,0 @@
 #ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__BuyGameScreen_H__
 #define NET_MINECRAFT_CLIENT_GUI_SCREENS__BuyGameScreen_H__
 #include "../Screen.h"
 #include "../components/Button.h"
 class BuyGameScreen: public Screen
 {
 public:
 	BuyGameScreen() {}
 	virtual ~BuyGameScreen() {}
 	void init();
 	void render(int xm, int ym, float a);
 	void buttonClicked(Button* button) {
 		//if (button->id == bQuit.id)
 	}
 private:
 	//Button bQuit;
 	//Button bBuyGame;
 };
 #endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__BuyGameScreen_H__*/
--- a/src/client/gui/screens/ConfirmScreen.cpp
+++ b/src/client/gui/screens/ConfirmScreen.cpp
@@ -31,7 +31,7 @@ ConfirmScreen::~ConfirmScreen() {
 void ConfirmScreen::init()
 {
-	if (/* minecraft->useTouchscreen() */ true) {
+	if (minecraft->useTouchscreen()) {
 		yesButton = new Touch::TButton(0, 0, 0, yesButtonText),
 		noButton  = new Touch::TButton(1, 0, 0, noButtonText);
 	} else {
--- a/src/client/gui/screens/ConsoleScreen.cpp
+++ b/src/client/gui/screens/ConsoleScreen.cpp
@@ -8,7 +8,6 @@
 #include "../../../network/ServerSideNetworkHandler.h"
 #include "../../../network/packet/ChatPacket.h"
 #include "../../../platform/log.h"
 #include "util/StringUtils.h"
 #include <sstream>
 #include <cstdlib>
@@ -55,37 +54,141 @@ 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()) {
-        return minecraft->setScreen(NULL);
+        minecraft->setScreen(NULL);
        return;
    }
-    // if (_input[0] == '/') {
+    if (_input[0] == '/') {
-    //     // Command
+        // Command
-    //     _input = Util::stringTrim(_input.substr(1));
+        std::string result = processCommand(_input);
-        
+        if (!result.empty())
-    //     std::istringstream iss(minecraft->commandManager().execute(*minecraft, *minecraft->player, _input));
+            minecraft->gui.addMessage(result);
-    //     for (std::string line; std::getline(iss, line); ) {
+    } else {
-    //         minecraft->gui.addMessage(line);
+        // Chat message: <name> message
-    //     }
+        std::string msg = std::string("<") + minecraft->player->name + "> " + _input;
    // } else {
        // @ai @rewrite
        if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
-            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(_input);
+            // Hosting a LAN game: displayGameMessage shows locally + broadcasts MessagePacket to clients
            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(msg);
        } else if (minecraft->netCallback) {
-            ChatPacket chatPkt(_input);
+            // Connected client: send ChatPacket to server; server echoes it back as MessagePacket
            ChatPacket chatPkt(msg);
            minecraft->raknetInstance->send(chatPkt);
        } else {
-            minecraft->gui.addMessage("<" + minecraft->player->name + "> " + _input);
+            // Singleplayer: show locally only
            minecraft->gui.addMessage(msg);
        }
-    // }
+    }
    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
 // ---------------------------------------------------------------------------
--- a/src/client/gui/screens/ConsoleScreen.h
+++ b/src/client/gui/screens/ConsoleScreen.h
@@ -25,6 +25,7 @@ public:
 private:
    void execute();
    std::string processCommand(const std::string& cmd);
    std::string _input;
    int         _cursorBlink; // tick counter for cursor blink
--- a/src/client/gui/screens/CreditsScreen.cpp
+++ b/src/client/gui/screens/CreditsScreen.cpp
@@ -28,7 +28,6 @@ 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");
@@ -40,8 +39,6 @@ void CreditsScreen::init() {
    _lines.push_back("Kolyah35");
    _lines.push_back("karson");
    _lines.push_back("deepfriedwaffles");
    _lines.push_back("EpikIzCool");
 	_lines.push_back("fileshredder");
    _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");
--- a/src/client/gui/screens/DeathScreen.cpp
+++ b/src/client/gui/screens/DeathScreen.cpp
@@ -23,15 +23,12 @@ DeathScreen::~DeathScreen()
 void DeathScreen::init()
 {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (minecraft->useTouchscreen()) {
 		bRespawn = new Touch::TButton(1, "Respawn!");
 		bTitle = new Touch::TButton(2, "Main menu");
-	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
+	} else {
 		bRespawn = new Button(1, "Respawn!");
 		bTitle = new Button(2, "Main menu");
 	} else {
 		bRespawn = new Button(1, 0, 0, 200, 20, "Respawn");
 		bTitle = new Button(2, 0, 0, 200, 20, "Title menu");
 	}
 	buttons.push_back(bRespawn);
 	buttons.push_back(bTitle);
@@ -42,23 +39,13 @@ void DeathScreen::init()
 void DeathScreen::setupPositions()
 {
 if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
    bRespawn->width = 200;
    bTitle->width = 200;
    int centerX = (width / 2) - (bRespawn->width / 2);
    bRespawn->x = centerX;
    bTitle->x = centerX;
    bRespawn->y = (height / 2);
    bTitle->y = bRespawn->y + 24;
 } else {
 	bRespawn->width = bTitle->width = width / 4;
 	bRespawn->y = bTitle->y = height / 2;
 	bRespawn->x = width/2 - bRespawn->width - 10;
 	bTitle->x = width/2 + 10;
-}
+
-//	LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
+	LOGI("xyz: %d, %d (%d, %d)\n", bTitle->x, bTitle->y, width, height);
 }
 void DeathScreen::tick() {
@@ -69,20 +56,10 @@ void DeathScreen::render( int xm, int ym, float a )
 {
 	fillGradient(0, 0, width, height, 0x60500000, 0xa0803030);
 if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
 	glPushMatrix2();
 	glScalef2(2, 2, 2);
 	drawCenteredString(font, "Game over!", width / 2 / 2, height / 8, 0xffffff);
 	glPopMatrix2();
 	std::stringstream ss;
 	ss << "Score: &e" << minecraft->player->getScore();
 	drawCenteredString(font, ss.str(), width / 2, (height / 4) + 32, 0xffffff);
 } else {
 	glPushMatrix2();
 	glScalef2(2, 2, 2);
 	drawCenteredString(font, "You died!", width / 2 / 2, height / 8, 0xffffff);
 	glPopMatrix2();
 }
 	if (_tick >= WAIT_TICKS)
 		Screen::render(xm, ym, a);
--- a/src/client/gui/screens/DisconnectionScreen.h
+++ b/src/client/gui/screens/DisconnectionScreen.h
@@ -21,7 +21,7 @@ public:
 	}
 	void init() {
-		if (/* minecraft->useTouchscreen() */ true)
+		if (minecraft->useTouchscreen())
 			_back = new Touch::TButton(1, "Ok");
 		else
 			_back = new Button(1, "Ok");
--- a/src/client/gui/screens/InBedScreen.cpp
+++ b/src/client/gui/screens/InBedScreen.cpp
@@ -17,7 +17,7 @@ InBedScreen::~InBedScreen() {
 }
 void InBedScreen::init() {
-	if (/* minecraft->useTouchscreen() */ true) {
+	if (minecraft->useTouchscreen()) {
 		bWakeUp = new Touch::TButton(1, "Leave Bed");
 	} else {
 		bWakeUp = new Button(1, "Leave Bed");
--- a/src/client/gui/screens/IngameBlockSelectionScreen.cpp
+++ b/src/client/gui/screens/IngameBlockSelectionScreen.cpp
@@ -1,6 +1,5 @@
 #include "IngameBlockSelectionScreen.h"
 #include "../../renderer/TileRenderer.h"
 #include "../../renderer/Lighting.h"
 #include "../../player/LocalPlayer.h"
 #include "../../renderer/gles.h"
 #include "../../Minecraft.h"
@@ -12,7 +11,6 @@
 #include "../../renderer/Textures.h"
 #include "../../gamemode/GameMode.h"
 #include "ArmorScreen.h"
 #include "crafting/WorkbenchScreen.h"
 #include "../components/Button.h"
 #if defined(__APPLE__)
@@ -28,8 +26,7 @@ IngameBlockSelectionScreen::IngameBlockSelectionScreen()
 	InventoryRows(1),
 	InventoryCols(1),
 	InventorySize(1),
-	bArmor(1, "Armor"),
+	bArmor(1, "Armor")
 	bCrafting(1, "Crafting")
 {
 }
@@ -45,19 +42,6 @@ void IngameBlockSelectionScreen::init()
 							(float)getSlotPosX(InventoryCols) + 4, 
 							(float)getSlotPosY(InventoryRows) + 4);
 	if (!minecraft->isCreativeMode()) {
 		bArmor.width = 42;
 		bCrafting.width = 42;
 		bArmor.x = 0;
 		bArmor.y = height - bArmor.height;
 		bCrafting.x = 0;
 		bCrafting.y = height - bCrafting.height - 30;
 		buttons.push_back(&bArmor);
 		buttons.push_back(&bCrafting);
 	}
 	ItemInstance* selected = inventory->getSelected();
 	if (!selected || selected->isNull()) {
 		selectedItem = 0;
@@ -73,6 +57,13 @@ void IngameBlockSelectionScreen::init()
 	}
 	if (!isAllowed(selectedItem))
 		selectedItem = 0;
 	if (!minecraft->isCreativeMode()) {
 		bArmor.width = 42;
 		bArmor.x = 0;
 		bArmor.y = height - bArmor.height;
 		buttons.push_back(&bArmor);
 	}
 }
 void IngameBlockSelectionScreen::removed()
@@ -89,10 +80,10 @@ void IngameBlockSelectionScreen::renderSlots()
 	blitOffset = -90;
-	glEnable2(GL_RESCALE_NORMAL);
+	//glEnable2(GL_RESCALE_NORMAL);
 	//glPushMatrix2();
 	//glRotatef2(180, 1, 0, 0);
-	Lighting::turnOn(minecraft);
+	//Lighting::turnOn();
 	//glPopMatrix2();
 	minecraft->textures->loadAndBindTexture("gui/gui.png");
@@ -131,8 +122,8 @@ void IngameBlockSelectionScreen::renderSlots()
 	//w.stop();
 	//w.printEvery(1000, "render-blocksel");
-	glDisable2(GL_RESCALE_NORMAL);
+	//glDisable2(GL_RESCALE_NORMAL);
-	Lighting::turnOff();
+	//Lighting::turnOn();
 }
 int IngameBlockSelectionScreen::getSlotPosX(int slotX) {
@@ -257,7 +248,7 @@ void IngameBlockSelectionScreen::mouseClicked(int x, int y, int buttonNum)
 			//minecraft->soundEngine->playUI("random.click", 1, 1);
 		} else {
 			_pendingQuit = !_area.isInside((float)x, (float)y)
-			            && !bArmor.isInside(x, y) && !bCrafting.isInside(x, y);
+			            && !bArmor.isInside(x, y);
 		}
 	}
 	if (!_pendingQuit)
@@ -346,8 +337,5 @@ void IngameBlockSelectionScreen::buttonClicked( Button* button )
 	if (button == &bArmor) {
 		minecraft->setScreen(new ArmorScreen());
 	}
 	if (button == &bCrafting) {
 		minecraft->setScreen(new WorkbenchScreen(Recipe::SIZE_2X2));
 	}
 	super::buttonClicked(button);
 }
--- a/src/client/gui/screens/IngameBlockSelectionScreen.h
+++ b/src/client/gui/screens/IngameBlockSelectionScreen.h
@@ -52,7 +52,6 @@ private:
 	bool _pendingQuit;
 	Button bArmor;
 	Button bCrafting;
 	RectangleArea _area;
 };
--- a/src/client/gui/screens/InvalidLicenseScreen.h
+++ b/src/client/gui/screens/InvalidLicenseScreen.h
@@ -1,107 +0,0 @@
 #ifndef NET_MINECRAFT_CLIENT_GUI_SCREENS__InvalidLicenseScreen_H__
 #define NET_MINECRAFT_CLIENT_GUI_SCREENS__InvalidLicenseScreen_H__
 #include "../Screen.h"
 #include "../components/Button.h"
 #include "../../Minecraft.h"
 #include "../../../LicenseCodes.h"
 class InvalidLicenseScreen: public Screen
 {
 public:
 	InvalidLicenseScreen(int id, bool hasBuyButton)
 	:	_id(id),
 		_hasBuyButton(hasBuyButton),
 		_baseY(0),
 		bOk(0),
 		bBuy(0)
 	{
 	}
 	virtual ~InvalidLicenseScreen() {
 		delete bOk;
 		delete bBuy;
 	}
 	void init() {
 		if (minecraft->useTouchscreen()) {
 			bOk  = new Touch::TButton(1, "Ok");
 			bBuy = new Touch::TButton(2, "Buy");
 		} else {
 			bOk  = new Button(1, "Ok");
 			bBuy = new Button(2, "Buy");
 		}
 		if (_hasBuyButton)
 			bOk->msg = "Quit";
 		if (!LicenseCodes::isOk(_id)) {
 			char buf[20] = {0};
 			sprintf(buf, "%d", _id);
 			desc1 = "License verification failed (error ";
 			desc1 += buf;
 			desc1 += ")";
 			desc2 = "Try again later.";
 			hint =  "You need to be connected to the internet\n";
 			hint += "once while you start the game.";
 		}
 		buttons.push_back(bOk);
 		tabButtons.push_back(bOk);
 		if (_hasBuyButton) {
 			buttons.push_back(bBuy);
 			tabButtons.push_back(bBuy);
 		}
 	}
 	void setupPositions() {
 		_baseY = height/5 + 6;
 		//if (_hasBuyButton)
 		_baseY -= 24;
 		bOk->width = bBuy->width = 200;
 		bOk->x = bBuy->x = (width - bOk->width) / 2;
 		bBuy->y = _baseY + 84;
 		bOk->y = bBuy->y + bBuy->height + 4;
 		if (!_hasBuyButton)
 			bOk->y -= 24;
 	}
 	void tick() {}
 	//void keyPressed(int eventKey) {}
 	void render(int xm, int ym, float a) {
 		renderDirtBackground(0);
 		drawCenteredString(minecraft->font, desc1, width/2, _baseY, 0xffffff);
 		drawCenteredString(minecraft->font, desc2, width/2, _baseY + 24, 0xffffff);
 		drawCenteredString(minecraft->font, hint, width/2, _baseY + 60, 0xffffff);
 		Screen::render(xm, ym, a);
 	}
 	void buttonClicked(Button* button) {
 		if (button->id == bOk->id) {
 			minecraft->quit();
 		}
 		if (button->id == bBuy->id) {
 			minecraft->platform()->buyGame();
 		}
 	};
 private:
 	int _id;
 	std::string desc1;
 	std::string desc2;
 	std::string hint;
 	Button* bOk;
 	Button* bBuy;
 	bool _hasBuyButton;
 	int  _baseY;
 };
 #endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__InvalidLicenseScreen_H__*/
--- a/src/client/gui/screens/JoinByIPScreen.h
+++ b/src/client/gui/screens/JoinByIPScreen.h
@@ -2,8 +2,8 @@
 #include "../Screen.h"
 #include "../components/Button.h"
 #include "../../Minecraft.h"
-#include "../components/ImageButton.h"
+#include "client/gui/components/ImageButton.h"
-#include "../components/TextBox.h"
+#include "client/gui/components/TextBox.h"
 class JoinByIPScreen: public Screen
 {
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -19,6 +19,7 @@ OptionsScreen::OptionsScreen()
 }
 OptionsScreen::~OptionsScreen() {
 	if (btnClose != NULL) {
 		delete btnClose;
 		btnClose = NULL;
@@ -52,6 +53,7 @@ OptionsScreen::~OptionsScreen() {
 }
 void OptionsScreen::init() {
 	bHeader = new Touch::THeader(0, "Options");
 	btnClose = new ImageButton(1, "");
@@ -87,6 +89,7 @@ void OptionsScreen::init() {
 }
 void OptionsScreen::setupPositions() {
 	int buttonHeight = btnClose->height;
 	btnClose->x = width - btnClose->width;
@@ -131,6 +134,7 @@ void OptionsScreen::setupPositions() {
 void OptionsScreen::render(int xm, int ym, float a) {
 	renderBackground();
 	int xmm = xm * width / minecraft->width;
@@ -146,13 +150,10 @@ void OptionsScreen::removed() {
 }
 void OptionsScreen::buttonClicked(Button* button) {
 	if (button == btnClose) {
 		minecraft->options.save();
-		if (minecraft->screen != NULL) {
+		minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
 			minecraft->setScreen(NULL);
 		} else {
 			minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
 		}
 	}
 	else if (button->id > 1 && button->id < 7) {
 		int categoryButton = button->id - categoryButtons[0]->id;
@@ -164,6 +165,7 @@ 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) {
@@ -197,7 +199,6 @@ void OptionsScreen::generateOptionScreens() {
 	optionPanes[1]->addOptionItem(OPTIONS_DIFFICULTY, minecraft)
 		.addOptionItem(OPTIONS_SERVER_VISIBLE, minecraft)
 		.addOptionItem(OPTIONS_THIRD_PERSON_VIEW, minecraft)
 		.addOptionItem(OPTIONS_WINDOW_SCALE, minecraft)
 		.addOptionItem(OPTIONS_GUI_SCALE, minecraft)
 		.addOptionItem(OPTIONS_SENSITIVITY, minecraft)
 		.addOptionItem(OPTIONS_MUSIC_VOLUME, minecraft)
@@ -208,10 +209,7 @@ 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)	
 		.addOptionItem(OPTIONS_BLOCK_OUTLINE, minecraft)
 		.addOptionItem(OPTIONS_IS_JOY_TOUCH_AREA, minecraft);
 	for (int i = OPTIONS_KEY_FORWARD; i <= OPTIONS_KEY_USE; i++) {
 		optionPanes[2]->addOptionItem((OptionId)i, minecraft);
@@ -219,35 +217,20 @@ void OptionsScreen::generateOptionScreens() {
 	// // Graphics Pane
 	optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft)
 		// .addOptionItem(&Option::VIEW_BOBBING, minecraft)
 		// .addOptionItem(&Option::AMBIENT_OCCLUSION, minecraft)
 		// .addOptionItem(&Option::ANAGLYPH, minecraft)
 		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
 		.addOptionItem(OPTIONS_VSYNC, minecraft)
 		.addOptionItem(OPTIONS_VIEW_DISTANCE, minecraft)
 		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
 		.addOptionItem(OPTIONS_ANAGLYPH_3D, minecraft)
 		.addOptionItem(OPTIONS_VIEW_BOBBING, minecraft)
-		.addOptionItem(OPTIONS_AMBIENT_OCCLUSION, minecraft)
+		.addOptionItem(OPTIONS_AMBIENT_OCCLUSION, minecraft);
 		.addOptionItem(OPTIONS_NORMAL_LIGHTING, minecraft)
 		.addOptionItem(OPTIONS_BEAUTIFUL_SKY, minecraft)
 		.addOptionItem(OPTIONS_VIGNETTE, minecraft);
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
 		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
-		.addOptionItem(OPTIONS_MENU_STYLE, minecraft)
+		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft);
 		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft)
 		.addOptionItem(OPTIONS_FOLIAGE_TINT, minecraft)
 		.addOptionItem(OPTIONS_TINTED_SIDE, minecraft)
 		.addOptionItem(OPTIONS_JAVA_HUD, minecraft)
 		.addOptionItem(OPTIONS_FOG_TYPE, minecraft)
 		.addOptionItem(OPTIONS_BETA_SKY, minecraft)
 		.addOptionItem(OPTIONS_RESTORED_ANIMS, minecraft)
 		.addOptionItem(OPTIONS_DEBUG_STYLE, minecraft);
 }
 void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->mouseClicked(minecraft, x, y, buttonNum);
@@ -255,6 +238,7 @@ 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);
--- a/src/client/gui/screens/PauseScreen.cpp
+++ b/src/client/gui/screens/PauseScreen.cpp
@@ -5,23 +5,19 @@
 #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),
+:	saveStep(0),
 	visibleTime(0),
 	bContinue(0),
 	bQuit(0),
 	bOptions(0),
 	bQuitAndSaveLocally(0),
 	bServerVisibility(0),
-	//	bThirdPerson(0),
+//	bThirdPerson(0),
 	wasBackPaused(wasBackPaused),
 	// bSound(OPTIONS_SOUND_VOLUME, 1, 0),
 	bThirdPerson(OPTIONS_THIRD_PERSON_VIEW),
-	bHideGui(OPTIONS_HIDEGUI)
+    bHideGui(OPTIONS_HIDEGUI)
 {
 	ImageDef def;
 	def.setSrc(IntRectangle(160, 144, 39, 31));
@@ -34,7 +30,7 @@ PauseScreen::PauseScreen(bool wasBackPaused)
 	// bSound.setImageDef(def, true);
 	defSrc.y += defSrc.h;
 	bThirdPerson.setImageDef(def, true);
-	bHideGui.setImageDef(def, true);
+    bHideGui.setImageDef(def, true);
 	//void setImageDef(ImageDef& imageDef, bool setButtonSize);
 }
@@ -43,48 +39,38 @@ PauseScreen::~PauseScreen() {
 	delete bQuit;
 	delete bQuitAndSaveLocally;
 	delete bServerVisibility;
-	delete bOptions;
+//	delete bThirdPerson;
 	//	delete bThirdPerson;
 }
 void PauseScreen::init() {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (minecraft->useTouchscreen()) {
 		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");
+//		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
-	} else if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 1) {
+	} 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, "");
-		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
+//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
 	} else {
 		bContinue = new Button(1, 0, 0, 200, 20, "Back to game");
 		bServerVisibility = new Button(4, 0, 0, 200, 20, "");
 		bOptions = new Button(5, 0, 0, 200, 20, "Options...");
 		bQuit = new Button(2, 0, 0, 200, 20, "Save and quit to title");
 		bQuitAndSaveLocally = new Button(3, 0, 0, 200, 20, "Copy and quit map");
 		//		bThirdPerson = new Button(5, "Toggle 3:rd person view");
 	}
 	buttons.push_back(bContinue);
 	buttons.push_back(bQuit);
-	buttons.push_back(bOptions);
+
 	// bSound.updateImage(&minecraft->options);
 	bThirdPerson.updateImage(&minecraft->options);
 	bHideGui.updateImage(&minecraft->options);
 	// buttons.push_back(&bSound);
 	buttons.push_back(&bThirdPerson);
-	//buttons.push_back(&bHideGui);
+    //buttons.push_back(&bHideGui);
 	// If Back wasn't pressed, set up additional items (more than Quit to menu
 	// and Back to game) here
-#if !defined(APPLE_DEMO_PROMOTION) && !defined(RPI)
+    #if !defined(APPLE_DEMO_PROMOTION) && !defined(RPI)
 	if (true || !wasBackPaused) {
 		if (minecraft->raknetInstance) {
 			if (minecraft->raknetInstance->isServer()) {
@@ -92,14 +78,14 @@ void PauseScreen::init() {
 				buttons.push_back(bServerVisibility);
 			}
 			else {
-#if !defined(DEMO_MODE)
+                #if !defined(DEMO_MODE)
-				buttons.push_back(bQuitAndSaveLocally);
+                buttons.push_back(bQuitAndSaveLocally);
-#endif
+				#endif
 			}
 		}
 	}
-#endif
+    #endif
-	//	buttons.push_back(bThirdPerson);
+//	buttons.push_back(bThirdPerson);
 	for (unsigned int i = 0; i < buttons.size(); ++i) {
 		// if (buttons[i] == &bSound) continue;
@@ -110,48 +96,24 @@ void PauseScreen::init() {
 }
 void PauseScreen::setupPositions() {
-	saveStep = 0;
+    saveStep = 0;
 	int yBase = 16;
 	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
 		yBase = 50;
-		bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 200;
+	bContinue->width = bQuit->width = /*bThirdPerson->w =*/ 160;
-		bQuitAndSaveLocally->width = bServerVisibility->width = 200;
+	bQuitAndSaveLocally->width = bServerVisibility->width = 160;
-		bContinue->x = (width - bContinue->width) / 2;
+	bContinue->x = (width - bContinue->width) / 2;
-		bContinue->y = yBase + 24 * 1;
+	bContinue->y = yBase + 32 * 1;
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+	bQuit->x = (width - bQuit->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 24 * 2;
+	bQuit->y = yBase + 32 * 2;
 		bOptions->x = (width - bOptions->width) / 2;
 		bOptions->y = yBase + 24 * 3 + 24;
 		bQuit->x = (width - bQuit->width) / 2;
 		bQuit->y = yBase + 24 * 4 + 24;
 	} else {
 		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 * 3;
 #if APPLE_DEMO_PROMOTION
-		bQuit->y += 16;
+    bQuit->y += 16;
 #endif
-		bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
+	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-		bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;
+	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 3;
 	}
 	// bSound.y = bThirdPerson.y = 8;
 	// bSound.x = 4;
@@ -189,15 +151,13 @@ void PauseScreen::buttonClicked(Button* button) {
 		minecraft->setScreen(NULL);
 		//minecraft->grabMouse();
 	}
-	if (button->id == bQuit->id) {
+    if (button->id == bQuit->id) {
 		minecraft->leaveGame();
-	}
+    }
 	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;
@@ -225,5 +185,5 @@ void PauseScreen::updateServerVisibilityText()
 	ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) minecraft->netCallback;
 	bServerVisibility->msg = ss->allowsIncomingConnections()?
 		"Server is visible"
-		:   "Server is invisible";
+	:   "Server is invisible";
 }
--- a/src/client/gui/screens/PauseScreen.h
+++ b/src/client/gui/screens/PauseScreen.h
@@ -33,9 +33,7 @@ private:
 	Button* bQuit;
 	Button* bQuitAndSaveLocally;
 	Button* bServerVisibility;
-	Button* bOptions;
+//	Button* bThirdPerson;
 	//	Button* bThirdPerson;
 	// OptionButton bSound;
 	OptionButton bThirdPerson;
--- a/src/client/gui/screens/ProgressScreen.h
+++ b/src/client/gui/screens/ProgressScreen.h
@@ -11,8 +11,6 @@ public:
 	void render(int xm, int ym, float a);
 	bool isInGameScreen();
 	virtual void keyPressed(int eventKey) {}
 	void tick();
 private:
 	int ticks;
--- a/src/client/gui/screens/ScreenChooser.cpp
+++ b/src/client/gui/screens/ScreenChooser.cpp
@@ -14,14 +14,14 @@
 #include "../../Minecraft.h"
-#include "UsernameScreen.h"
+#include <client/gui/screens/UsernameScreen.h>
 Screen* ScreenChooser::createScreen( ScreenId id )
 {
 	Screen* screen = NULL;
 	// :sob:
-	if (_mc->options.getIntValue(OPTIONS_MENU_STYLE) == 0) {
+	if (_mc->useTouchscreen()) {
 		switch (id) {
 		case SCREEN_STARTMENU:	     screen = new Touch::StartMenuScreen();	break;
 		case SCREEN_SELECTWORLD:     screen = new Touch::SelectWorldScreen();break;
--- a/src/client/gui/screens/SimpleChooseLevelScreen.cpp
+++ b/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() */ true) {
+    if (minecraft->useTouchscreen()) {
        bGamemode = new Touch::TButton(1, "Survival mode");
        bCheats  = new Touch::TButton(4, "Cheats: Off");
        bCreate  = new Touch::TButton(3, "Create");
--- a/src/client/gui/screens/StartMenuScreen.cpp
+++ b/src/client/gui/screens/StartMenuScreen.cpp
@@ -23,62 +23,49 @@
 // Some kind of default settings, might be overridden in ::init
 StartMenuScreen::StartMenuScreen()
 :	bHost(    2, 0, 0, 160, 24, "Start Game"),
 	bJoin(    3, 0, 0, 160, 24, "Join Game"),
 	bOptions( 4, 0, 0, 160, 24, "Options"),
 	bQuit(    5, "")
 {
 }
 StartMenuScreen::~StartMenuScreen()
 {
 	delete bHost;
 	delete bJoin;
 	delete bOptions;
 	delete bQuit;
 }
 void StartMenuScreen::init()
 {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+	bJoin.active = bHost.active = bOptions.active = true;
 		bHost = new Button(    2, 0, 0, 200, 20, "Singleplayer");
 		bJoin = new Button(    3, 0, 0, 200, 20, "Multiplayer");
 		bOptions = new Button( 4, 0, 0, 200, 20, "Options...");
 		bQuit = new Button( 5, 0, 0, 200, 20, "Ouit Game");
 	} else {
 		bHost = new Button(    2, 0, 0, 160, 24, "Start Game");
 		bJoin = new Button(    3, 0, 0, 160, 24, "Join Game");
 		bOptions = new Button( 4, 0, 0, 160, 24, "Options");
 		bQuit = new Button( 5, 0, 0, 160, 24, "Ouit Game");
 	}
 	bJoin->active = bHost->active = bOptions->active = true;
 	if (minecraft->options.getStringValue(OPTIONS_USERNAME).empty()) {
 		return; // tick() will redirect to UsernameScreen
 	}
-	buttons.push_back(bHost);
+	buttons.push_back(&bHost);
-	buttons.push_back(bJoin);
+	buttons.push_back(&bJoin);
 	//buttons.push_back(&bTest);
 	buttons.push_back(bQuit);
-	tabButtons.push_back(bHost);
+	tabButtons.push_back(&bHost);
-	tabButtons.push_back(bJoin);
+	tabButtons.push_back(&bJoin);
 	tabButtons.push_back(bQuit);
 	#ifndef RPI
-		buttons.push_back(bOptions);
+		buttons.push_back(&bOptions);
-		tabButtons.push_back(bOptions);
+		tabButtons.push_back(&bOptions);
 	#endif
-    //// add quit button (top right X icon) – match OptionsScreen style
+    // add quit button (top right X icon) – match OptionsScreen style
-    //{
+    {
-    //    ImageDef def;
+        ImageDef def;
-    //    def.name = "gui/touchgui.png";
+        def.name = "gui/touchgui.png";
-    //    def.width = 34;
+        def.width = 34;
-    //    def.height = 26;
+        def.height = 26;
-    //    def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
+        def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
-    //    bQuit.setImageDef(def, true);
+        bQuit.setImageDef(def, true);
-    //    bQuit.scaleWhenPressed = false;
+        bQuit.scaleWhenPressed = false;
-    //    buttons.push_back(&bQuit);
+        buttons.push_back(&bQuit);
-    //    // don't include in tab navigation
+        // don't include in tab navigation
-    //}
+    }
 	copyright = "\xffMojang AB";//. Do not distribute!";
@@ -106,30 +93,20 @@ void StartMenuScreen::init()
 }
 void StartMenuScreen::setupPositions() {
-	if (minecraft->options.getIntValue(OPTIONS_MENU_STYLE) == 2){
+	int yBase = height / 2;
 		int yBase = (height / 2) - 20;
-		bHost->y =	 yBase;
+	bHost.y =	 yBase;
-		bJoin->y =	 bHost->y + 24;
+	bJoin.y =	 bHost.y + 24 + 4;
-		bOptions->y = bJoin->y + 24;
+	bOptions.y = bJoin.y + 24 + 4;
 		bQuit->y = bOptions->y + 24;
 	} else {
 		int yBase = height / 2;
 		bHost->y =	 yBase;
 		bJoin->y =	 bHost->y + 24 + 4;
 		bOptions->y = bJoin->y + 24 + 4;
 		bQuit->y = bOptions->y + 24 + 4;
 	}
 	// Center buttons
-	bHost->x = (width - bHost->width) / 2;
+	bHost.x = (width - bHost.width) / 2;
-	bJoin->x = (width - bJoin->width) / 2;
+	bJoin.x = (width - bJoin.width) / 2;
-	bOptions->x = (width - bOptions->width) / 2;
+	bOptions.x = (width - bOptions.width) / 2;
 	bQuit->x = (width - bQuit->width) / 2;
-    //// position quit icon at top-right (use image-defined size)
+    // position quit icon at top-right (use image-defined size)
-    //bQuit.x = width - bQuit.width;
+    bQuit.x = width - bQuit.width;
-    //bQuit.y = 0;
+    bQuit.y = 0;
 }
 void StartMenuScreen::tick() {
@@ -137,7 +114,7 @@ void StartMenuScreen::tick() {
 void StartMenuScreen::buttonClicked(Button* button) {
-	if (button->id == bHost->id)
+	if (button->id == bHost.id)
 	{
        #if defined(DEMO_MODE) || defined(APPLE_DEMO_PROMOTION)
 			minecraft->setScreen( new SimpleChooseLevelScreen("_DemoLevel") );
@@ -145,16 +122,16 @@ void StartMenuScreen::buttonClicked(Button* button) {
 			minecraft->screenChooser.setScreen(SCREEN_SELECTWORLD);
 		#endif
 	}
-	if (button->id == bJoin->id)
+	if (button->id == bJoin.id)
 	{
 		minecraft->locateMultiplayer();
 		minecraft->screenChooser.setScreen(SCREEN_JOINGAME);
 	}
-	if (button->id == bOptions->id)
+	if (button->id == bOptions.id)
 	{
 		minecraft->setScreen(new OptionsScreen());
 	}
-	if (button->id == bQuit->id)
+	if (button == &bQuit)
 	{
 		minecraft->quit();
 	}
--- a/src/client/gui/screens/StartMenuScreen.h
+++ b/src/client/gui/screens/StartMenuScreen.h
@@ -23,10 +23,10 @@ public:
 	bool isInGameScreen();
 private:
-	Button* bHost;
+	Button bHost;
-	Button* bJoin;
+	Button bJoin;
-	Button* bOptions;
+	Button bOptions;
-	Button* bQuit; 
+	ImageButton bQuit; // X button in top-right corner
 	std::string copyright;
 	int copyrightPosX;
--- a/src/client/gui/screens/UsernameScreen.cpp
+++ b/src/client/gui/screens/UsernameScreen.cpp
@@ -35,8 +35,8 @@ void UsernameScreen::setupPositions()
    // Make the done button match the touch-style option tabs
    _btnDone.width  = 66;
    _btnDone.height = 26;
-    _btnDone.x = cx - (_btnDone.width / 2);
+    _btnDone.x = (width - _btnDone.width) / 2;
-    _btnDone.y = cy + 52;
+    _btnDone.y = height / 2 + 52;
    tUsername.width = 120;
    tUsername.height = 20;
--- a/src/client/gui/screens/UsernameScreen.h
+++ b/src/client/gui/screens/UsernameScreen.h
@@ -3,8 +3,7 @@
 #include "../Screen.h"
 #include "../components/Button.h"
-// this is cursed lol
+#include "client/gui/components/TextBox.h"
 #include "../../../client/gui/components/TextBox.h"
 #include <string>
 class UsernameScreen : public Screen
--- a/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
+++ b/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
@@ -16,12 +16,7 @@
 #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;
@@ -46,7 +41,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) : isInside(xm, ym));
+			(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
 		if (hovered || *selectedPtr == this)
 			statePressed->draw(Tesselator::instance, (float)x, (float)y);
@@ -198,26 +193,6 @@ 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();
 }
@@ -464,29 +439,25 @@ 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
+            // If the recipe allows any aux-value as ingredients, first deplete
-			// aux == 0 from inventory. Since I'm not sure if this always is
+            // aux == 0 from inventory. Since I'm not sure if this always is
-			// correct, let's only do it for ingredient sandstone for now.
+            // correct, let's only do it for ingredient sandstone for now.
-			ItemInstance toRemove = req.item;
+            ItemInstance toRemove = req.item;
-			if (Tile::sandStone->id == req.item.id
+            if (Tile::sandStone->id == req.item.id
-			&& Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
+             && Recipe::ANY_AUX_VALUE == req.item.getAuxValue()) {
-				toRemove.setAuxValue(0);
+                 toRemove.setAuxValue(0);
-				toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
+                 toRemove.count = minecraft->player->inventory->removeResource(toRemove, true);
-				toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
+                 toRemove.setAuxValue(Recipe::ANY_AUX_VALUE);
-			}
+            }
-			if (toRemove.count > 0) {
+            if (toRemove.count > 0) {
-				minecraft->player->inventory->removeResource(toRemove);
+                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!
@@ -576,7 +547,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) : isInside(xm, ym));
+		(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
 	if (hovered || selected)
 		bgSelected->draw(Tesselator::instance, (float)x, (float)y);
--- a/src/client/gui/screens/touch/TouchIngameBlockSelectionScreen.cpp
+++ b/src/client/gui/screens/touch/TouchIngameBlockSelectionScreen.cpp
@@ -91,8 +91,7 @@ void IngameBlockSelectionScreen::init()
 	//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();
 	InventorySize = inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE;
 	InventoryRows = 1 + (InventorySize-1) / InventoryColumns;
    //
@@ -266,8 +265,7 @@ void IngameBlockSelectionScreen::buttonClicked(Button* button) {
 bool IngameBlockSelectionScreen::isAllowed( int slot )
 {
-	const int gridCount = minecraft->player->inventory->getContainerSize() - Inventory::MAX_SELECTION_SIZE;
+	if (slot < 0 || slot >= minecraft->player->inventory->getContainerSize())
 	if (slot < 0 || slot >= gridCount)
 		return false;
 #ifdef DEMO_MODE
--- a/src/client/model/HumanoidModel.cpp
+++ b/src/client/model/HumanoidModel.cpp
@@ -40,9 +40,10 @@ HumanoidModel::HumanoidModel( float g /*= 0*/, float yOffset /*= 0*/, int texW /
 	head.addBox(-4, -8, -4, 8, 8, 8, g); // Head
 	head.setPos(0, 0 + yOffset, 0);
-	hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
+	if (modernSkin) {
-	hair.setPos(0, 0 + yOffset, 0);
+		hair.addBox(-4, -8, -4, 8, 8, 8, g + 0.5f); // Outer head layer (hat)
-
+		hair.setPos(0, 0 + yOffset, 0);
 	}
 	body.addBox(-4, 0, -2, 8, 12, 4, g); // Body
 	body.setPos(0, 0 + yOffset, 0);
@@ -98,17 +99,17 @@ void HumanoidModel::render(Entity* e, float time, float r, float bob, float yRot
 	setupAnim(time, r, bob, yRot, xRot, scale);
 	// Sync overlay with head rotation/position
-	
+	if (texWidth == 64 && texHeight == 64) {
-	hair.xRot = head.xRot;
+		hair.xRot = head.xRot;
-	hair.yRot = head.yRot;
+		hair.yRot = head.yRot;
-	hair.zRot = head.zRot;
+		hair.zRot = head.zRot;
-	hair.y = head.y;
+		hair.y = head.y;
-	
+	}
 	head.render(scale);
-	
+	if (texWidth == 64 && texHeight == 64) {
-	hair.render(scale);
+		hair.render(scale);
-	
+	}
 	body.render(scale);
 	arm0.render(scale);
 	arm1.render(scale);
@@ -122,12 +123,12 @@ void HumanoidModel::render( HumanoidModel* model, float scale )
 	head.yRot = model->head.yRot;
 	head.y = model->head.y;
 	head.xRot = model->head.xRot;
-	
+	if (texWidth == 64 && texHeight == 64) {
-	hair.yRot = head.yRot;
+		hair.yRot = head.yRot;
-	hair.xRot = head.xRot;
+		hair.xRot = head.xRot;
-	hair.zRot = head.zRot;
+		hair.zRot = head.zRot;
-	hair.y = head.y;
+		hair.y = head.y;
-	
+	}
 	arm0.xRot = model->arm0.xRot;
 	arm0.zRot = model->arm0.zRot;
@@ -272,7 +273,7 @@ void HumanoidModel::onGraphicsReset()
 	arm1.onGraphicsReset();
 	leg0.onGraphicsReset();
 	leg1.onGraphicsReset();
-	hair.onGraphicsReset();
+	//hair.onGraphicsReset();
 }
 //void renderHair(float scale) {
--- a/src/client/model/geom/ModelPart.cpp
+++ b/src/client/model/geom/ModelPart.cpp
@@ -203,7 +203,7 @@ void ModelPart::compile( float scale )
 void ModelPart::draw()
 {
 #ifdef OPENGL_ES
-	drawArrayVTN_NoState(vboId, cubes.size() * 2 * 3 * 6, 36);
+	drawArrayVT_NoState(vboId, cubes.size() * 2 * 3 * 6, 24);
 #else
 	glCallList(list);
 #endif
--- a/src/client/model/geom/Polygon.cpp
+++ b/src/client/model/geom/Polygon.cpp
@@ -43,18 +43,6 @@ void PolygonQuad::mirror() {
 }
 void PolygonQuad::render(Tesselator& t, float scale, int vboId /* = -1 */) {
 	Vec3 v0 = vertices[0].pos - vertices[1].pos;
 	Vec3 v1 = vertices[2].pos - vertices[1].pos;
 	Vec3 n = v1.cross(v0).normalized();
 	if (_flipNormal == true)
 	{
 		t.normal(-n.x , -n.y , -n.z );
 	}
 	else
 	{
 		t.normal(n.x , n.y , n.z );
 	}
 	for (int i = 0; i < 4; i++) {
 		VertexPT& v = vertices[i];
 		t.vertexUV(v.pos.x * scale, v.pos.y * scale, v.pos.z * scale, v.u, v.v);
--- a/src/client/player/LocalPlayer.cpp
+++ b/src/client/player/LocalPlayer.cpp
@@ -28,7 +28,6 @@
 #if defined(_WIN32)
 #include <direct.h>
 #include <sys/stat.h>
 #else
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -355,11 +354,7 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string&
 	armorTypeHash(0),
 	sprinting(false),
 	sprintDoubleTapTimer(0),
-	prevForwardHeld(false),
+	prevForwardHeld(false)
 	xBob(0.0f),
 	yBob(0.0f),
 	xBobO(0.0f),
 	yBobO(0.0f)
 {
 	this->dimension = dimension;
 	_init();
@@ -392,12 +387,6 @@ 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;
@@ -460,7 +449,7 @@ void LocalPlayer::tick() {
 		{
 			sentInventoryItemId   = newItemId;
 			sentInventoryItemData = newItemData;
-			PlayerEquipmentPacket packet(entityId, newItemId, newItemData, inventory->selected, inventory->getSlot(newItemId, newItemData));
+			PlayerEquipmentPacket packet(entityId, newItemId, newItemData);
 			minecraft->raknetInstance->send(packet);
 		}
 	}
@@ -516,7 +505,7 @@ void LocalPlayer::aiStep() {
 		if (sprintDoubleTapTimer > 0) sprintDoubleTapTimer--;
 		prevForwardHeld = forwardHeld;
 	}
-	if (input->sneaking)
+	if (input->sneaking || abilities.flying)
 		sprinting = false;
    if (input->sneaking) {
@@ -554,10 +543,6 @@ void LocalPlayer::aiStep() {
 	//if (onGround && abilities.flying)
 	//	abilities.flying = false;
 	yBobO = yBob;
 	xBobO = xBob;
 	xBob += (xRot - xBob) * 0.5;
 	yBob += (yRot - yBob) * 0.5;
 	if (interpolateOnly())
 		updateAi();
--- a/src/client/player/LocalPlayer.h
+++ b/src/client/player/LocalPlayer.h
@@ -22,10 +22,6 @@ public:
 	virtual void reset();
 	void tick();
 	float yBob, xBob;	// shredder added from b1.8/4j for the hand swaying animation
 	float yBobO, xBobO; // shredder added from b1.8/4j for the hand swaying animation
    void move(float xa, float ya, float za);
    void aiStep();
--- a/src/client/player/input/KeyboardInput.cpp
+++ b/src/client/player/input/KeyboardInput.cpp
@@ -50,8 +50,10 @@ void KeyboardInput::tick( Player* player )
 		ya *= 0.3f;
 	}
-	wantUp = jumping;
+	#if defined(RPI) || defined(PLATFORM_DESKTOP)
-	wantDown = sneaking;
+		wantUp = jumping;
 		wantDown = sneaking;
 	#endif
 	if (keys[KEY_CRAFT])
 		player->startCrafting((int)player->x, (int)player->y, (int)player->z, Recipe::SIZE_2X2);
--- a/src/client/player/input/touchscreen/TouchscreenInput.cpp
+++ b/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(18 * Gui::GuiScale);
+	float btnSize = pc.millimetersToPixels(100);
 	_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,7 +320,6 @@ 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();
            }
 		}
--- a/src/client/renderer/Chunk.cpp
+++ b/src/client/renderer/Chunk.cpp
@@ -7,10 +7,6 @@
 #include "../../world/level/Region.h"
 #include "../../world/level/chunk/LevelChunk.h"
 #include "../../util/Mth.h"
 #include "../../world/level/biome/BiomeSource.h"
 #include "../../world/level/Level.h"
 //#include "../../platform/time.h"
 /*static*/ int Chunk::updates = 0;
--- a/src/client/renderer/GameRenderer.cpp
+++ b/src/client/renderer/GameRenderer.cpp
--- a/src/client/renderer/ItemInHandRenderer.cpp
+++ b/src/client/renderer/ItemInHandRenderer.cpp
@@ -21,12 +21,11 @@
 #include "../../world/item/BowItem.h"
 #include "../../world/level/tile/LeafTile.h"
 #include "entity/HumanoidMobRenderer.h"
 #include "Lighting.h"
 //static StopwatchHandler handler;
 ItemInHandRenderer::ItemInHandRenderer( Minecraft* mc )
-	:	mc(mc),
+:	mc(mc),
 	lastSlot(-1),
 	height(0),
 	oHeight(0),
@@ -50,47 +49,21 @@ ItemInHandRenderer::ItemInHandRenderer( Minecraft* mc )
 void ItemInHandRenderer::tick()
 {
 	oHeight = height;
-	//item.id = 0;
+	item.id = 0;
 	ItemInstance* itemInHand = mc->player->inventory->getSelected();
-	bool sameItem = (itemInHand && item.id == itemInHand->id && item.getAuxValue() == itemInHand->getAuxValue());
+	if (itemInHand && itemInHand->count > 0) {
-
+		item.id = itemInHand->id;
-
+		item.setAuxValue(itemInHand->getAuxValue());
 	if (mc->options.getBooleanValue(OPTIONS_RESTORED_ANIMS)) // if enabled, restores and fixes item switching animation
 	{
 		if (!itemInHand && item.id == 0) sameItem = true;
 		float max = 0.4f;
 		float tHeight = sameItem ? 1 : 0;
 		float dd = tHeight - height;
 		if (dd < -max) dd = -max;
 		if (dd > max) dd = max;
 		height += dd;
 		if (height < 0.1){
 			if (itemInHand && itemInHand->count > 0) {
 				item.id = itemInHand->id;
 				item.setAuxValue(itemInHand->getAuxValue());
 			} else {
 				item.id = 0;
 			}
 		}
 	} else // otherwise use vanilla broken behaviour where it instantly switches items/blocks
 	{
 		if (itemInHand && itemInHand->count > 0) {
 			item.id = itemInHand->id;
 			item.setAuxValue(itemInHand->getAuxValue());
 		}
 		float max = 0.4f;
 		float tHeight = 1;//matches ? 1 : 0;
 		float dd = tHeight - height;
 		if (dd < -max) dd = -max;
 		if (dd > max) dd = max;
 		height += dd;
 	}
 	float max = 0.4f;
 	float tHeight = 1;//matches ? 1 : 0;
 	float dd = tHeight - height;
 	if (dd < -max) dd = -max;
 	if (dd > max) dd = max;
 	height += dd;
 }
 void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
@@ -166,9 +139,9 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 			float v1 = (vp * 16 + 15.99f) / 256.0f;
 			float r = 1.0f;
-			//			float xo = 0.0f;
+//			float xo = 0.0f;
-			//			float yo = 0.3f;
+//			float yo = 0.3f;
-			/*
+/*
 			//glEnable2(GL_RESCALE_NORMAL);
 			glTranslatef2(-xo, -yo, 0);
 			float s = 1.5f;
@@ -177,28 +150,19 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 			glRotatef2(50, 0, 1, 0);
 			glRotatef2(45 + 290, 0, 0, 1);
 			glTranslatef2(-15 / 16.0f, -1 / 16.0f, 0);
-			*/
+*/
 			float dd = 1 / 16.0f;
 			float col = 1.0f;
 			float br = mc->player->getBrightness(0);
 			t.color(col*br,col*br,col*br,1.0f);
 			t.normal(0.0f, 0.0f, 1.0f);
 			t.vertexUV(0, 0, 0, u0, v1);
 			t.vertexUV(r, 0, 0, u1, v1);
 			t.vertexUV(r, 1, 0, u1, v0);
 			t.vertexUV(0, 1, 0, u0, v0);
 			t.normal(0.0f, 0.0f, -1.0f);
 			t.vertexUV(0, 1, 0 - dd, u0, v0);
 			t.vertexUV(r, 1, 0 - dd, u1, v0);
 			t.vertexUV(r, 0, 0 - dd, u1, v1);
 			t.vertexUV(0, 0, 0 - dd, u0, v1);
 			col = 0.8f;
 			t.color(col*br,col*br,col*br,1.0f);
 			t.normal(-1.0f, 0.0f, 0.0f);
 			for (int i = 0; i < 16; i++) {
 				float p = i / 16.0f;
 				float uu = u0 + (u1 - u0) * p - 0.5f / 256.0f;
@@ -208,7 +172,6 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 				t.vertexUV(xx, 1, 0, uu, v0);
 				t.vertexUV(xx, 1, 0 - dd, uu, v0);
 			}
 			t.normal(1.0f, 0.0f, 0.0f);
 			for (int i = 0; i < 16; i++) {
 				float p = i / 16.0f;
 				float uu = u0 + (u1 - u0) * p - 0.5f / 256.0f;
@@ -218,10 +181,6 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 				t.vertexUV(xx, 0, 0, uu, v1);
 				t.vertexUV(xx, 0, 0 - dd, uu, v1);
 			}
 			col = 0.6f;
 			t.color(col*br,col*br,col*br,1.0f);
 			t.normal(0.0f, 1.0f, 0.0f);
 			for (int i = 0; i < 16; i++) {
 				float p = i / 16.0f;
 				float vv = v1 + (v0 - v1) * p - 0.5f / 256.0f;
@@ -231,7 +190,6 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 				t.vertexUV(r, yy, 0 - dd, u1, vv);
 				t.vertexUV(0, yy, 0 - dd, u0, vv);
 			}
 			t.normal(0.0f, -1.0f, 0.0f);
 			for (int i = 0; i < 16; i++) {
 				float p = i / 16.0f;
 				float vv = v1 + (v0 - v1) * p - 0.5f / 256.0f;
@@ -261,7 +219,7 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 		}
 		mc->textures->loadAndBindTexture(renderObject.texture);
-		drawArrayVTN_NoState(renderObject.chunk.vboId, renderObject.chunk.vertexCount);
+		drawArrayVT_NoState(renderObject.chunk.vboId, renderObject.chunk.vertexCount);
 		if (renderObject.isFlat)
 			glPopMatrix2();
 	}
@@ -269,7 +227,6 @@ void ItemInHandRenderer::renderItem(Mob* mob,  ItemInstance* item )
 	//handler.printEvery(100);
 }
 void ItemInHandRenderer::render( float a )
 {
 	//return;
@@ -280,27 +237,12 @@ void ItemInHandRenderer::render( float a )
 	float h = oHeight + (height - oHeight) * a;
 	Player* player = mc->player;
 	// if (selectedTile==NULL) return;
 	LocalPlayer* localPlayer = (LocalPlayer*)(player);
 	float xr = player->xRotO + (player->xRot - player->xRotO) * a; // shredder added for hand swaying
 	glPushMatrix2();
 	glRotatef2(player->xRotO + (player->xRot - player->xRotO) * a, 1, 0, 0);
 	glRotatef2(player->yRotO + (player->yRot - player->yRotO) * a, 0, 1, 0);
 	glEnable(GL_RESCALE_NORMAL);
 	Lighting::turnOn(mc);
 	glPopMatrix2();
 	 if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
 	{
        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
 		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
 		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
    }
 	float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
 	ItemInstance* item;// = selectedItem;
@@ -351,7 +293,7 @@ void ItemInHandRenderer::render( float a )
 		glTranslatef2(0.7f * d, -0.65f * d - (1 - h) * 0.6f, -0.9f * d);
 		glRotatef2(45, 0, 1, 0);
-		glEnable2(GL_RESCALE_NORMAL);
+		//glEnable2(GL_RESCALE_NORMAL);
 		glRotatef2(-swing3 * 20, 0, 1, 0);
 		glRotatef2(-swing2 * 20, 0, 0, 1);
 		glRotatef2(-swing2 * 80, 1, 0, 0);
@@ -388,9 +330,7 @@ void ItemInHandRenderer::render( float a )
 		}
 		glEnableClientState2(GL_VERTEX_ARRAY);
 		glEnableClientState2(GL_TEXTURE_COORD_ARRAY);
 		glEnableClientState2(GL_NORMAL_ARRAY);
 		renderItem(player, item);
 		glDisableClientState2(GL_NORMAL_ARRAY);
 		glDisableClientState2(GL_VERTEX_ARRAY);
 		glDisableClientState2(GL_TEXTURE_COORD_ARRAY);
 		glPopMatrix2();
@@ -409,8 +349,7 @@ void ItemInHandRenderer::render( float a )
 		glTranslatef2(0.8f * d, -0.75f * d - (1 - h) * 0.6f, -0.9f * d);
 		glRotatef2(45, 0, 1, 0);
-//		glEnable2(GL_RESCALE_NORMAL);
+		//glEnable2(GL_RESCALE_NORMAL);
 		glEnable(GL_NORMALIZE);
 		glRotatef2(swing2 * 70, 0, 1, 0);
 		glRotatef2(-swing3 * 20, 0, 0, 1);
 		// glRotatef2(-swing2 * 80, 1, 0, 0);
@@ -430,8 +369,8 @@ void ItemInHandRenderer::render( float a )
 		playerRenderer->renderHand();
 		glPopMatrix2();
 	}
-	glDisable2(GL_RESCALE_NORMAL);
+	//glDisable2(GL_RESCALE_NORMAL);
-	Lighting::turnOff();
+	//Lighting.turnOff();
 	//w.stop();
 }
@@ -456,10 +395,10 @@ void ItemInHandRenderer::renderScreenEffect( float a )
 		}
 	}
-	     if (mc->player->isUnderLiquid(Material::water)) {
+	//     if (mc->player->isUnderLiquid(Material::water)) {
-			 mc->textures->loadAndBindTexture("misc/water.png");
+	//mc->textures->loadAndBindTexture("misc/water.png");
-	         renderWater(a);
+	//         renderWater(a);
-	     }
+	//     }
 	glEnable2(GL_ALPHA_TEST);
 }
--- a/src/client/renderer/LevelRenderer.cpp
+++ b/src/client/renderer/LevelRenderer.cpp
@@ -25,9 +25,6 @@
 #include "../../client/player/LocalPlayer.h"
 #include "../../world/level/GrassColor.h"
 #include "Lighting.h"
 #ifdef GFX_SMALLER_CHUNKS
 /* static */ const int LevelRenderer::CHUNK_SIZE = 8;
 #else
@@ -35,7 +32,7 @@
 #endif
 LevelRenderer::LevelRenderer( Minecraft* mc)
-	:	mc(mc),
+:	mc(mc),
 	textures(mc->textures),
 	level(NULL),
 	cullStep(0),
@@ -50,7 +47,6 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	xMaxChunk(0), yMaxChunk(0), zMaxChunk(0),
 	lastViewDistance(-1),
 	lastFogType(-1),
 	noEntityRenderFrames(2),
 	totalEntities(0),
@@ -69,7 +65,7 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	destroyProgress(0)
 {
 #ifdef OPENGL_ES
-	int maxChunksWidth = 2 * LevelConstants::LEVEL_WIDTH / CHUNK_SIZE + 1;
+	int maxChunksWidth = 2 * LEVEL_WIDTH / CHUNK_SIZE + 1;
 	numListsOrBuffers = maxChunksWidth * maxChunksWidth * (128/CHUNK_SIZE) * 3;
 	chunkBuffers = new GLuint[numListsOrBuffers];
 	glGenBuffers2(numListsOrBuffers, chunkBuffers);
@@ -77,9 +73,6 @@ LevelRenderer::LevelRenderer( Minecraft* mc)
 	//for (int i = 0; i < numListsOrBuffers; ++i) printf("bufId %d: %d\t", i, chunkBuffers[i]);
 	glGenBuffers2(1, &skyBuffer);
 	glGenBuffers2(1, &voidBuffer);
 	glGenBuffers2(1, &starBuffer);
 	generateStars();
 	generateSky();
 #else
 	int maxChunksWidth = 1024 / CHUNK_SIZE;
@@ -98,8 +91,6 @@ LevelRenderer::~LevelRenderer()
 #ifdef OPENGL_ES
 	glDeleteBuffers(numListsOrBuffers, chunkBuffers);
 	glDeleteBuffers(1, &skyBuffer);
 	glDeleteBuffers(1, &voidBuffer);
 	glDeleteBuffers(1, &starBuffer);
 	delete[] chunkBuffers;
 #else
 	glDeleteLists(numListsOrBuffers, chunkLists);
@@ -127,25 +118,6 @@ void LevelRenderer::generateSky() {
 	}
 	t.end(true, skyBuffer);
 	yy = (float) (-16);
 	t.begin();
 	// pretty much the same thing as the sky one above except uses inverted values to generate the void plane. 
 	voidVertexCount = 0;
 	for (int xx = -s * d; xx <= s * d; xx += s) {
 		for (int zz = -s * d; zz <= s * d; zz += s) {
 			t.vertex((float) xx + 0,  yy, (float) zz + s);
 			t.vertex((float)(xx + s), yy, (float) zz + s);
 			t.vertex((float)(xx + s), yy, (float)(zz + 0));
 			t.vertex((float) xx + 0,  yy, (float)(zz + 0));
 			//LOGI("x, z: %d, %d\n", xx, zz);
 			voidVertexCount += 4;
 		}
 	}
 	t.end(true, voidBuffer);
 	//LOGI("skyvertexcount: %d\n", skyVertexCount);
 	//glEndList();
 }
@@ -183,24 +155,14 @@ void LevelRenderer::allChanged()
 	Tile::leaves_carried->setFancy(fancy);
 	lastViewDistance = mc->options.getIntValue(OPTIONS_VIEW_DISTANCE);
 	lastFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
 	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
 	FoliageColor::setUseTint(tint);
 	GrassColor::setUseTint(tint);
 	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
 	TileRenderer::setUseTint(sideTint);
 	int dist = (512 >> 3) << (3 - lastViewDistance);
 	if (lastViewDistance <= 2 && mc->isPowerVR())
 		dist = (int)((float)dist * 0.8f);
 	LOGI("last: %d, power: %d\n", lastViewDistance, mc->isPowerVR());
-#if defined(RPI)
+	#if defined(RPI)
-	dist *= 0.6f;
+		dist *= 0.6f;
-#endif
+	#endif
 	if (dist > 400) dist = 400;
 	/*
@@ -265,17 +227,17 @@ void LevelRenderer::allChanged()
 void LevelRenderer::deleteChunks()
 {
 	for (int z = 0; z < zChunks; ++z)
-		for (int y = 0; y < yChunks; ++y)
+	for (int y = 0; y < yChunks; ++y)
-			for (int x = 0; x < xChunks; ++x) {
+	for (int x = 0; x < xChunks; ++x) {
-				int c = getLinearCoord(x, y, z);
+		int c = getLinearCoord(x, y, z);
-				delete chunks[c];
+		delete chunks[c];
-			}
+	}
-			delete[] chunks;
+	delete[] chunks;
-			chunks = NULL;
+	chunks = NULL;
-			delete[] sortedChunks;
+	delete[] sortedChunks;
-			sortedChunks = NULL;
+	sortedChunks = NULL;
 }
 void LevelRenderer::resortChunks( int xc, int yc, int zc )
@@ -339,48 +301,6 @@ int LevelRenderer::render( Mob* player, int layer, float alpha )
 		allChanged();
 	}
 	int currentFogType = mc->options.getIntValue(OPTIONS_FOG_TYPE);
 	if (currentFogType != lastFogType) {
 		lastFogType = currentFogType;
 		if (level && level->dimension) {
 			level->dimension->FogType = currentFogType; // use new fog stuff
 		}
 		allChanged(); 
 	}
 	bool SmoothLightState = mc->options.getBooleanValue(OPTIONS_AMBIENT_OCCLUSION);
 	if (SmoothLightState != mc->useAmbientOcclusion){
 		mc->useAmbientOcclusion = SmoothLightState;
 		allChanged();
 	}
 	bool tint = mc->options.getBooleanValue(OPTIONS_FOLIAGE_TINT);
 	if (tint != LastTint) {
 		LastTint = tint;
 		FoliageColor::setUseTint(tint);
 		GrassColor::setUseTint(tint);
 		allChanged(); 
 	}
 	bool sideTint = mc->options.getBooleanValue(OPTIONS_TINTED_SIDE);
 	if (sideTint != LastSideTint) {
 		LastSideTint = sideTint;
 		TileRenderer::setUseTint(sideTint);
 		allChanged(); 
 	}
 	TIMER_PUSH("sortchunks");
 	for (int i = 0; i < 10; i++) {
 		chunkFixOffs = (chunkFixOffs + 1) % chunksLength;
@@ -568,15 +488,15 @@ void LevelRenderer::render(const AABB& b) const
 {
 	Tesselator& t = Tesselator::instance;
-	//	glColor4f2(1, 1, 1, 1);
+	glColor4f2(1, 1, 1, 1);
-	//	textures->loadAndBindTexture("terrain.png"); // uh need to check java - shredder
+	textures->loadAndBindTexture("terrain.png");
 	//t.begin();
-	//	t.color(255, 255, 255, 255); // again not needed, for some reason the vanilla source code tints it... white? maybe this was used for something else in MCPE's dev at one point? - shredder
+	t.color(255, 255, 255, 255);
 	t.offset(((Mob*)mc->player)->getPos(0).negated());
 	//	t.offset(((Mob*)mc->player)->getPos(0).negated()); // why does this even exist normally, it just makes the thing... not render
 	glLineWidth(2.0f); // make it more thick - shredder
 	t.begin(GL_LINE_STRIP);
 	t.vertex(b.x0, b.y0, b.z0);
 	t.vertex(b.x1, b.y0, b.z0);
@@ -649,11 +569,11 @@ int LevelRenderer::renderChunks( int from, int to, int layer, float alpha )
 	for (unsigned int i = 0; i < _renderChunks.size(); ++i) {
 		Chunk* chunk = _renderChunks[i];
-#ifdef USE_VBO
+		#ifdef USE_VBO
-		renderList.addR(chunk->getRenderChunk(layer));
+			renderList.addR(chunk->getRenderChunk(layer));
-#else
+		#else
-		renderList.add(chunk->getList(layer));
+			renderList.add(chunk->getList(layer));
-#endif
+		#endif
 		renderList.next();
 	}
@@ -804,20 +724,20 @@ bool LevelRenderer::updateDirtyChunks( Mob* player, bool force )
 			Chunk* chunk = dirtyChunks[cursor];
 			if (chunk != NULL) {
 				bool remove = false;
-				for (int i = 0; i < count && !remove; i++)
+                for (int i = 0; i < count && !remove; i++)
-					if (chunk == toAdd[i]) {
+                    if (chunk == toAdd[i]) {
-						remove = true;
+                        remove = true;
-					}
+                    }
-					if (!remove) {
+                if (!remove) {
-						//if (chunk == toAdd[0] || chunk == toAdd[1] || chunk == toAdd[2]) {
+				//if (chunk == toAdd[0] || chunk == toAdd[1] || chunk == toAdd[2]) {
-						//	; // this chunk was rendered and should be removed
+				//	; // this chunk was rendered and should be removed
-						//} else {
+				//} else {
-						if (target != cursor) {
+					if (target != cursor) {
-							dirtyChunks[target] = chunk;
+						dirtyChunks[target] = chunk;
 						}
 						target++;
 					}
 					target++;
 				}
 			}
 			cursor++;
 		}
@@ -991,23 +911,23 @@ bool entityRenderPredicate(const Entity* a, const Entity* b) {
 }
 void LevelRenderer::renderEntities(Vec3 cam, Culler* culler, float a) {
-	if (noEntityRenderFrames > 0) {
+    if (noEntityRenderFrames > 0) {
-		noEntityRenderFrames--;
+        noEntityRenderFrames--;
-		return;
+        return;
-	}
+    }
 	TIMER_PUSH("prepare");
-	TileEntityRenderDispatcher::getInstance()->prepare(level, textures, mc->font, mc->cameraTargetPlayer, a);
+    TileEntityRenderDispatcher::getInstance()->prepare(level, textures, mc->font, mc->cameraTargetPlayer, a);
-	EntityRenderDispatcher::getInstance()->prepare(level, mc->font, mc->cameraTargetPlayer, &mc->options, a);
+    EntityRenderDispatcher::getInstance()->prepare(level, mc->font, mc->cameraTargetPlayer, &mc->options, a);
-	totalEntities = 0;
+    totalEntities = 0;
-	renderedEntities = 0;
+    renderedEntities = 0;
-	culledEntities = 0;
+    culledEntities = 0;
 	Entity* player = mc->cameraTargetPlayer;
-	EntityRenderDispatcher::xOff = TileEntityRenderDispatcher::xOff = (player->xOld + (player->x - player->xOld) * a);
+    EntityRenderDispatcher::xOff = TileEntityRenderDispatcher::xOff = (player->xOld + (player->x - player->xOld) * a);
-	EntityRenderDispatcher::yOff = TileEntityRenderDispatcher::yOff = (player->yOld + (player->y - player->yOld) * a);
+    EntityRenderDispatcher::yOff = TileEntityRenderDispatcher::yOff = (player->yOld + (player->y - player->yOld) * a);
-	EntityRenderDispatcher::zOff = TileEntityRenderDispatcher::zOff = (player->zOld + (player->z - player->zOld) * a);
+    EntityRenderDispatcher::zOff = TileEntityRenderDispatcher::zOff = (player->zOld + (player->z - player->zOld) * a);
 	glEnableClientState2(GL_VERTEX_ARRAY);
 	glEnableClientState2(GL_TEXTURE_COORD_ARRAY);
@@ -1046,10 +966,10 @@ void LevelRenderer::renderEntities(Vec3 cam, Culler* culler, float a) {
 		delete[] toRender;
 	}
-	TIMER_POP_PUSH("tileentities");
+    TIMER_POP_PUSH("tileentities");
-	for (unsigned int i = 0; i < level->tileEntities.size(); i++) {
+    for (unsigned int i = 0; i < level->tileEntities.size(); i++) {
-		TileEntityRenderDispatcher::getInstance()->render(level->tileEntities[i], a);
+        TileEntityRenderDispatcher::getInstance()->render(level->tileEntities[i], a);
-	}
+    }
 	glDisableClientState2(GL_VERTEX_ARRAY);
 	glDisableClientState2(GL_TEXTURE_COORD_ARRAY);
@@ -1060,209 +980,50 @@ void LevelRenderer::renderEntities(Vec3 cam, Culler* culler, float a) {
 std::string LevelRenderer::gatherStats1() {
 	std::stringstream ss;
 	ss << "C: " << renderedChunks << "/" << totalChunks << ". F: " << offscreenChunks << ", O: " << occludedChunks << ", E: " << emptyChunks << "\n";
-	return ss.str();
+    return ss.str();
 }
 //
-    std::string LevelRenderer::gatherStats2() {
+//    /*public*/ std::string gatherStats2() {
-		std::stringstream ss;
+//        return "E: " + renderedEntities + "/" + totalEntities + ". B: " + culledEntities + ", I: " + ((totalEntities - culledEntities) - renderedEntities);
-		ss << "E: "<< renderedEntities << "/" << totalEntities << ". B: " << culledEntities << ", I: " << (totalEntities - culledEntities) - renderedEntities <<"\n";
+//    }
        return ss.str();
    }
 //
 //    int[] toRender = new int[50000];
 //    IntBuffer resultBuffer = MemoryTracker.createIntBuffer(64);
   void LevelRenderer::generateStars() {
 	   // ported from java beta again,
 	   // converted the doubles into floats to be consistent, shouldnt affect much - shredder
      Random random = Random(10842L);
      Tesselator& t = Tesselator::instance;
      t.begin();
 	  starVertexCount = 0;
      for (int i = 0; i < 1500; i++) {
         float d = random.nextFloat() * 2.0F - 1.0F;
         float e = random.nextFloat() * 2.0F - 1.0F;
         float f = random.nextFloat() * 2.0F - 1.0F;
         float g = 0.25F + random.nextFloat() * 0.25F;
         float h = d * d + e * e + f * f;
         if (h < 1.0 && h > 0.01) {
            h = 1.0 / Mth::sqrt(h);
            d *= h;
            e *= h;
            f *= h;
            float j = d * 100.0;
            float k = e * 100.0;
            float l = f * 100.0;
            float m = Mth::atan2(d, f);
            float n = Mth::sin(m);
            float o = Mth::cos(m);
            float p = Mth::atan2(Mth::sqrt(d * d + f * f), e);
            float q = Mth::sin(p);
            float r = Mth::cos(p);
            float s = random.nextDouble() * Mth::PI * 2.0;
            float t2 = Mth::sin(s);
            float u = Mth::cos(s);
            for (int v = 0; v < 4; v++) {
               float w = 0.0;
               float x = ((v & 2) - 1) * g;
               float y = ((v + 1 & 2) - 1) * g;
               float aa = x * u - y * t2;
               float ab = y * u + x * t2;
               float ad = aa * q + w * r;
               float ae = w * q - aa * r;
               float af = ae * n - ab * o;
               float ah = ab * n + ae * o;
               t.vertex(j + af, k + ad, l + ah);
            }
 			starVertexCount += 4;
         }
      }
      t.end(true, starBuffer);
   }
 void LevelRenderer::renderSky(float alpha) {
-	if (mc->level->dimension->foggy) return;
+    if (mc->level->dimension->foggy) return;
-	glDisable2(GL_TEXTURE_2D);
+    glDisable2(GL_TEXTURE_2D);
-	Vec3 sc = level->getSkyColor(mc->cameraTargetPlayer, alpha);
+    Vec3 sc = level->getSkyColor(mc->cameraTargetPlayer, alpha);
-	float sr = (float) sc.x;
+    float sr = (float) sc.x;
-	float sg = (float) sc.y;
+    float sg = (float) sc.y;
-	float sb = (float) sc.z;// + 0.5f;
+    float sb = (float) sc.z;// + 0.5f;
-	if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
+    if (mc->options.getBooleanValue(OPTIONS_ANAGLYPH_3D)) {
-		float srr = (sr * 30.0f + sg * 59.0f + sb * 11.0f) / 100.0f;
+        float srr = (sr * 30.0f + sg * 59.0f + sb * 11.0f) / 100.0f;
-		float sgg = (sr * 30.0f + sg * 70.0f) / (100.0f);
+        float sgg = (sr * 30.0f + sg * 70.0f) / (100.0f);
-		float sbb = (sr * 30.0f + sb * 70.0f) / (100.0f);
+        float sbb = (sr * 30.0f + sb * 70.0f) / (100.0f);
-		sr = srr;
+        sr = srr;
-		sg = sgg;
+        sg = sgg;
-		sb = sbb;
+        sb = sbb;
-	}
+    }
-	glColor4f2(sr, sg, Mth::Min(1.0f, sb), 1);
+    glColor4f2(sr, sg, Mth::Min(1.0f, sb), 1);
-	Tesselator& t = Tesselator::instance;
+    //Tesselator& t = Tesselator::instance;
-	// @TODO shredder - should not enable or disable depth mask if using legacy sky because mcpe sky rendering is awful and will render clouds above terrain
+
-	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
+    glEnable2(GL_FOG);
-		glDepthMask(false);
+    glColor4f2(sr, sg, sb, 1.0f);
 	}
 	glEnable2(GL_FOG);
 	glColor4f2(sr, sg, sb, 1.0f);
 #ifdef OPENGL_ES
 	drawArrayVT(skyBuffer, skyVertexCount);
 #endif
-		glDisable(GL_FOG);
+    glEnable2(GL_TEXTURE_2D);
 	glDisable(GL_ALPHA_TEST);
 	// re ported this again from beta 1.6.6, thanks to the mcpe 0.1 decomp team's code for some bit of help about the void layer - shredder 
 	// Sunrise
 	if (mc->options.getBooleanValue(OPTIONS_BEAUTIFUL_SKY)) {
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	Lighting::turnOff();
 	float* c = level->dimension->getSunriseColor(level->getTimeOfDay(alpha), alpha);
 	if (c != nullptr)
 	{
 		glDisable(GL_TEXTURE_2D);
 //		glShadeModel(GL_SMOOTH); //
 		glPushMatrix();
 		glRotatef(90.0f, 1.0f, 0.0f, 0.0f);
 		glRotatef(level->getTimeOfDay(alpha) > 0.5f ? 180 : 0, 0.0f, 0.0f, 1.0f);
 		t.begin(GL_TRIANGLE_FAN);
 		t.color(c[0], c[1], c[2], c[3]);
 		t.vertex(0.0f, 100.0f, 0.0f);
 		t.color(c[0], c[1], c[2], 0.0f);
 		int steps = 16;
 		for (int i = 0; i <= steps; i++)
 		{
 			float a = i * 3.1415927f * 2.0f / steps;
 			float sin = Mth::sin(a);
 			float cos = Mth::cos(a);
 			t.vertex((sin * 120.0f), (cos * 120.0f), (-cos * 40.0f * c[3]));
 		}
 		t.draw();
 		glPopMatrix();
 //		glShadeModel(GL_FLAT); //
 	}
 	// gets the time of day and rotates the sun and moon png based on the time
 	glEnable(GL_TEXTURE_2D);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE);
 	glPushMatrix();
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 	glTranslatef(sc.x, sc.y, sc.z);
 	glRotatef(0.0f, 0.0f, 0.0f, 1.0f);
 	glRotatef(level->getTimeOfDay(alpha) * 360.0f, 1.0f, 0.0f, 0.0f);
 	float ss = 30.0f;
 		textures->loadAndBindTexture("terrain/sun.png");
 		t.begin();
 		t.vertexUV(-ss, 100.0f, -ss, 0.0f, 0.0f);
 		t.vertexUV(ss, 100.0f, -ss, 1.0f, 0.0f);
 		t.vertexUV(ss, 100.0f, ss, 1.0f, 1.0f);
 		t.vertexUV(-ss, 100.0f, ss, 0.0f, 1.0f);
 		t.draw();
 		ss = 20.0f;
 		textures->loadAndBindTexture("terrain/moon.png");
 		t.begin();
 		t.vertexUV(-ss, -100.0f, ss, 1.0f, 1.0f);
 		t.vertexUV(ss, -100.0f, ss, 0.0f, 1.0f);
 		t.vertexUV(ss, -100.0f, -ss, 0.0f, 0.0f);
 		t.vertexUV(-ss, -100.0f, -ss, 1.0f, 0.0f);
 		t.draw();
 	glDisable(GL_TEXTURE_2D);
 	float a = level->getStarBrightness(alpha);
 	if (a > 0.0f)
 	{
 		glColor4f(a, a, a, a);
 		drawArrayVT(starBuffer, starVertexCount);
 	}
 	}
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 	glDisable(GL_BLEND);
 	glEnable(GL_ALPHA_TEST);
 	glEnable(GL_FOG);
 	glPopMatrix();
 	// ported over void plane (the blue bottom plane seen in java) because pocket edition lacks it @TODO test if it's buggy - shredder
 //	glColor3f(sc.x * 0.2f + 0.04f, sc.y * 0.2f + 0.04f, sc.z * 0.6f + 0.1f);
 	glColor4f(sc.x * 0.2f + 0.04f, sc.y * 0.2f + 0.04f, sc.z * 0.6f + 0.1f, 1.0f);
 	glDisable(GL_TEXTURE_2D);
 	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
 		drawArrayVT(voidBuffer, voidVertexCount);
 	}
 	glEnable(GL_TEXTURE_2D);
 	// @TODO shredder - should not enable or disable depth mask if using legacy sky because mcpe sky rendering is awful and will render clouds above terrain
 	if(mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
 		glDepthMask(true);
 	}
 }
 void LevelRenderer::renderClouds( float alpha ) {
 	//if (!mc->level->dimension->isNaturalDimension()) return;
 	if (mc->options.getBooleanValue(OPTIONS_FANCY_GRAPHICS) && mc->options.getBooleanValue(OPTIONS_BETA_SKY)){
 		renderAdvancedClouds(alpha);
 		return;
 	}
 	glEnable2(GL_TEXTURE_2D);
 	glDisable(GL_CULL_FACE);
 	float yOffs = (float) (mc->player->yOld + (mc->player->y - mc->player->yOld) * alpha);
@@ -1311,246 +1072,109 @@ void LevelRenderer::renderClouds( float alpha ) {
 	glEnable(GL_CULL_FACE);
 }
 void LevelRenderer::renderAdvancedClouds(float alpha) {
 	// ported from java beta, tesselation code for the 3d clouds, renders broken if mcpe sky rendering option is used - shredder
 	glDisable(GL_CULL_FACE);
 	float px = mc->player->xOld + (mc->player->x - mc->player->xOld) * alpha;
 	float py = mc->player->yOld + (mc->player->y - mc->player->yOld) * alpha;
 	float pz = mc->player->zOld + (mc->player->z - mc->player->zOld) * alpha;
 	Tesselator& t = Tesselator::instance;
 	float ss = 12.0f; 
 	float h = 4.0f;  
 	float cloudTime = (float)ticks + alpha;
 	float xo = (px + cloudTime * 0.03f) / ss;
 	float zo = pz / ss + 0.33f;
 	float yy = 108.0f - py + 0.33f;
 	int xWraps = Mth::floor(xo / 2048.0);
 	int zWraps = Mth::floor(zo / 2048.0);
 	xo -= xWraps * 2048;
 	zo -= zWraps * 2048;
 	textures->loadAndBindTexture("environment/clouds.png");
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	Vec3 cc = level->getCloudColor(alpha);
 	float cr = cc.x;
 	float cg = cc.y;
 	float cb = cc.z;
 	float uvScale = 1.0f / 256.0f;
 	float uo = (float)Mth::floor(xo) * uvScale;
 	float vo = (float)Mth::floor(zo) * uvScale;
 	float xOffs = (float)(xo - Mth::floor(xo));
 	float zOffs = (float)(zo - Mth::floor(zo));
 	int D = 8;      
 	int radius = 3;  
 	float e = 1.0f / 1024.0f; 
 	glPushMatrix();
 	glScalef(ss, 1.0f, ss);
 	for (int pass = 0; pass < 2; pass++) {
 		if (pass == 0) glColorMask(false, false, false, false);
 		else glColorMask(true, true, true, true);
 		for (int xPos = -radius + 1; xPos <= radius; xPos++) {
 			for (int zPos = -radius + 1; zPos <= radius; zPos++) {
 				t.begin();
 				float xx = (float)(xPos * D);
 				float zz = (float)(zPos * D);
 				float xp = xx - xOffs;
 				float zp = zz - zOffs;
 				if (yy > -h - 1.0f) {
 					t.color(cr * 0.7f, cg * 0.7f, cb * 0.7f, 0.8f);
 					t.normal(0.0f, -1.0f, 0.0f);
 					t.vertexUV(xp + 0, yy + 0, zp + D, (xx + 0) * uvScale + uo, (zz + D) * uvScale + vo);
 					t.vertexUV(xp + D, yy + 0, zp + D, (xx + D) * uvScale + uo, (zz + D) * uvScale + vo);
 					t.vertexUV(xp + D, yy + 0, zp + 0, (xx + D) * uvScale + uo, (zz + 0) * uvScale + vo);
 					t.vertexUV(xp + 0, yy + 0, zp + 0, (xx + 0) * uvScale + uo, (zz + 0) * uvScale + vo);
 				}
 				if (yy <= h + 1.0f) {
 					t.color(cr, cg, cb, 0.8f);
 					t.normal(0.0f, 1.0f, 0.0f);
 					t.vertexUV(xp + 0, yy + h - e, zp + D, (xx + 0) * uvScale + uo, (zz + D) * uvScale + vo);
 					t.vertexUV(xp + D, yy + h - e, zp + D, (xx + D) * uvScale + uo, (zz + D) * uvScale + vo);
 					t.vertexUV(xp + D, yy + h - e, zp + 0, (xx + D) * uvScale + uo, (zz + 0) * uvScale + vo);
 					t.vertexUV(xp + 0, yy + h - e, zp + 0, (xx + 0) * uvScale + uo, (zz + 0) * uvScale + vo);
 				}
 				t.color(cr * 0.9f, cg * 0.9f, cb * 0.9f, 0.8f);
 				if (xPos > -1) {
 					t.normal(-1.0f, 0.0f, 0.0f);
 					for (int i = 0; i < D; i++) {
 						t.vertexUV(xp + i + 0, yy + 0, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
 						t.vertexUV(xp + i + 0, yy + h, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
 						t.vertexUV(xp + i + 0, yy + h, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
 						t.vertexUV(xp + i + 0, yy + 0, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
 					}
 				}
 				if (xPos <= 1) {
 					t.normal(1.0f, 0.0f, 0.0f);
 					for (int i = 0; i < D; i++) {
 						t.vertexUV(xp + i + 1 - e, yy + 0, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
 						t.vertexUV(xp + i + 1 - e, yy + h, zp + D, (xx + i + 0.5f) * uvScale + uo, (zz + D) * uvScale + vo);
 						t.vertexUV(xp + i + 1 - e, yy + h, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
 						t.vertexUV(xp + i + 1 - e, yy + 0, zp + 0, (xx + i + 0.5f) * uvScale + uo, (zz + 0) * uvScale + vo);
 					}
 				}
 				t.color(cr * 0.8f, cg * 0.8f, cb * 0.8f, 0.8f);
 				if (zPos > -1) {
 					t.normal(0.0f, 0.0f, -1.0f);
 					for (int i = 0; i < D; i++) {
 						t.vertexUV(xp + 0, yy + h, zp + i + 0, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 						t.vertexUV(xp + D, yy + h, zp + i + 0, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 						t.vertexUV(xp + D, yy + 0, zp + i + 0, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 						t.vertexUV(xp + 0, yy + 0, zp + i + 0, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 					}
 				}
 				if (zPos <= 1) {
 					t.normal(0.0f, 0.0f, 1.0f);
 					for (int i = 0; i < D; i++) {
 						t.vertexUV(xp + 0, yy + h, zp + i + 1 - e, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 						t.vertexUV(xp + D, yy + h, zp + i + 1 - e, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 						t.vertexUV(xp + D, yy + 0, zp + i + 1 - e, (xx + D) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 						t.vertexUV(xp + 0, yy + 0, zp + i + 1 - e, (xx + 0) * uvScale + uo, (zz + i + 0.5f) * uvScale + vo);
 					}
 				}
 				t.endOverrideAndDraw();
 			}
 		}
 	}
 	glPopMatrix();
 	glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
 	glDisable(GL_BLEND);
 	glEnable(GL_CULL_FACE);
 }
 void LevelRenderer::playSound(const std::string& name, float x, float y, float z, float volume, float pitch) {
 	// @todo: deny sounds here if sound is off (rather than waiting 'til SoundEngine)
 	float dd = 16;
    if (volume > 1) dd *= volume;
-    if (mc->cameraTargetPlayer != NULL && mc->cameraTargetPlayer->distanceToSqr(x, y, z) < dd * dd) {
+    if (mc->cameraTargetPlayer->distanceToSqr(x, y, z) < dd * dd) {
        mc->soundEngine->play(name, x, y, z, volume, pitch);
    }
 }
 void LevelRenderer::addParticle(const std::string& name, float x, float y, float z, float xa, float ya, float za, int data) {
 	if (mc->cameraTargetPlayer != NULL) {
 		float xd = mc->cameraTargetPlayer->x - x;
 		float yd = mc->cameraTargetPlayer->y - y;
 		float zd = mc->cameraTargetPlayer->z - z;
 		float distanceSquared = xd * xd + yd * yd + zd * zd;
-		//Particle* p = NULL;
+	float xd = mc->cameraTargetPlayer->x - x;
-		//if (name == "hugeexplosion") p = new HugeExplosionSeedParticle(level, x, y, z, xa, ya, za);
+    float yd = mc->cameraTargetPlayer->y - y;
-		//else if (name == "largeexplode") p = new HugeExplosionParticle(textures, level, x, y, z, xa, ya, za);
+    float zd = mc->cameraTargetPlayer->z - z;
 	float distanceSquared = xd * xd + yd * yd + zd * zd;
-		//if (p) {
+	//Particle* p = NULL;
-		//	if (distanceSquared < 32 * 32) {
+	//if (name == "hugeexplosion") p = new HugeExplosionSeedParticle(level, x, y, z, xa, ya, za);
-		//		mc->particleEngine->add(p);
+	//else if (name == "largeexplode") p = new HugeExplosionParticle(textures, level, x, y, z, xa, ya, za);
 		//	} else { delete p; }
 		//	return;
 		//}
-		const float particleDistance = 16;
+	//if (p) {
-		if (distanceSquared > particleDistance * particleDistance) return;
+	//	if (distanceSquared < 32 * 32) {
 	//		mc->particleEngine->add(p);
 	//	} else { delete p; }
 	//	return;
 	//}
-		//static Stopwatch sw;
+    const float particleDistance = 16;
-		//sw.start();
+    if (distanceSquared > particleDistance * particleDistance) return;
-		if (name == "bubble") mc->particleEngine->add(new BubbleParticle(level, x, y, z, xa, ya, za));
+	//static Stopwatch sw;
-		else if (name == "crit") mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za));
+	//sw.start();
 		else if (name == "smoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za));
 		//else if (name == "note") mc->particleEngine->add(new NoteParticle(level, x, y, z, xa, ya, za));
 		else if (name == "explode") mc->particleEngine->add(new ExplodeParticle(level, x, y, z, xa, ya, za));
 		else if (name == "flame") mc->particleEngine->add(new FlameParticle(level, x, y, z, xa, ya, za));
 		else if (name == "lava") mc->particleEngine->add(new LavaParticle(level, x, y, z));
 		//else if (name == "splash") mc->particleEngine->add(new SplashParticle(level, x, y, z, xa, ya, za));
 		else if (name == "largesmoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f));
 		else if (name == "reddust") mc->particleEngine->add(new RedDustParticle(level, x, y, z, xa, ya, za));
 		else if (name == "iconcrack") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]));
 		else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
 		//else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
 		//else if (name == "slime") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::slimeBall));
 		//else if (name == "heart") mc->particleEngine->add(new HeartParticle(level, x, y, z, xa, ya, za));
-		//sw.stop();
+    if (name == "bubble") mc->particleEngine->add(new BubbleParticle(level, x, y, z, xa, ya, za));
-		//sw.printEvery(50, "add-particle-string");
+	else if (name == "crit") mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za));
-	}
+	else if (name == "smoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za));
    //else if (name == "note") mc->particleEngine->add(new NoteParticle(level, x, y, z, xa, ya, za));
    else if (name == "explode") mc->particleEngine->add(new ExplodeParticle(level, x, y, z, xa, ya, za));
    else if (name == "flame") mc->particleEngine->add(new FlameParticle(level, x, y, z, xa, ya, za));
    else if (name == "lava") mc->particleEngine->add(new LavaParticle(level, x, y, z));
    //else if (name == "splash") mc->particleEngine->add(new SplashParticle(level, x, y, z, xa, ya, za));
 	else if (name == "largesmoke") mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f));
    else if (name == "reddust") mc->particleEngine->add(new RedDustParticle(level, x, y, z, xa, ya, za));
 	else if (name == "iconcrack") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]));
 	else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
    //else if (name == "snowballpoof") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::snowBall));
    //else if (name == "slime") mc->particleEngine->add(new BreakingItemParticle(level, x, y, z, Item::slimeBall));
    //else if (name == "heart") mc->particleEngine->add(new HeartParticle(level, x, y, z, xa, ya, za));
 	//sw.stop();
 	//sw.printEvery(50, "add-particle-string");
 }
 /*
 void LevelRenderer::addParticle(ParticleType::Id name, float x, float y, float z, float xa, float ya, float za, int data) {
-float xd = mc->cameraTargetPlayer->x - x;
+	float xd = mc->cameraTargetPlayer->x - x;
-float yd = mc->cameraTargetPlayer->y - y;
+	float yd = mc->cameraTargetPlayer->y - y;
-float zd = mc->cameraTargetPlayer->z - z;
+	float zd = mc->cameraTargetPlayer->z - z;
-const float particleDistance = 16;
+	const float particleDistance = 16;
-if (xd * xd + yd * yd + zd * zd > particleDistance * particleDistance) return;
+	if (xd * xd + yd * yd + zd * zd > particleDistance * particleDistance) return;
-//static Stopwatch sw;
+	//static Stopwatch sw;
-//sw.start();
+	//sw.start();
-//Particle* p = NULL;
+	//Particle* p = NULL;
-if (name == ParticleType::bubble)		mc->particleEngine->add( new BubbleParticle(level, x, y, z, xa, ya, za) );
+	if (name == ParticleType::bubble)		mc->particleEngine->add( new BubbleParticle(level, x, y, z, xa, ya, za) );
-else if (name == ParticleType::crit)		mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za) );
+	else if (name == ParticleType::crit)		mc->particleEngine->add(new CritParticle2(level, x, y, z, xa, ya, za) );
-else if (name == ParticleType::smoke)		mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za) );
+	else if (name == ParticleType::smoke)		mc->particleEngine->add(new SmokeParticle(level, x, y, z, xa, ya, za) );
-else if (name == ParticleType::explode)		mc->particleEngine->add( new ExplodeParticle(level, x, y, z, xa, ya, za) );
+	else if (name == ParticleType::explode)		mc->particleEngine->add( new ExplodeParticle(level, x, y, z, xa, ya, za) );
-else if (name == ParticleType::flame)		mc->particleEngine->add( new FlameParticle(level, x, y, z, xa, ya, za) );
+	else if (name == ParticleType::flame)		mc->particleEngine->add( new FlameParticle(level, x, y, z, xa, ya, za) );
-else if (name == ParticleType::lava)		mc->particleEngine->add( new LavaParticle(level, x, y, z) );
+	else if (name == ParticleType::lava)		mc->particleEngine->add( new LavaParticle(level, x, y, z) );
-else if (name == ParticleType::largesmoke)	mc->particleEngine->add( new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f) );
+	else if (name == ParticleType::largesmoke)	mc->particleEngine->add( new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f) );
-else if (name == ParticleType::reddust)		mc->particleEngine->add( new RedDustParticle(level, x, y, z, xa, ya, za) );
+	else if (name == ParticleType::reddust)		mc->particleEngine->add( new RedDustParticle(level, x, y, z, xa, ya, za) );
-else if (name == ParticleType::iconcrack)	mc->particleEngine->add( new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]) );
+	else if (name == ParticleType::iconcrack)	mc->particleEngine->add( new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]) );
-//switch (name) {
+	//switch (name) {
-//	case ParticleType::bubble:		p = new BubbleParticle(level, x, y, z, xa, ya, za); break;
+	//	case ParticleType::bubble:		p = new BubbleParticle(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::crit:		p = new CritParticle2(level, x, y, z, xa, ya, za); break;
+	//	case ParticleType::crit:		p = new CritParticle2(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::smoke:		p = new SmokeParticle(level, x, y, z, xa, ya, za); break;
+	//	case ParticleType::smoke:		p = new SmokeParticle(level, x, y, z, xa, ya, za); break;
-//	//case ParticleType::note: p = new NoteParticle(level, x, y, z, xa, ya, za); break;
+	//	//case ParticleType::note: p = new NoteParticle(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::explode:		p = new ExplodeParticle(level, x, y, z, xa, ya, za); break;
+	//	case ParticleType::explode:		p = new ExplodeParticle(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::flame:		p = new FlameParticle(level, x, y, z, xa, ya, za); break;
+	//	case ParticleType::flame:		p = new FlameParticle(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::lava:		p = new LavaParticle(level, x, y, z); break;
+	//	case ParticleType::lava:		p = new LavaParticle(level, x, y, z); break;
-//	//case ParticleType::splash: p = new SplashParticle(level, x, y, z, xa, ya, za); break;
+	//	//case ParticleType::splash: p = new SplashParticle(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::largesmoke:	p = new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f); break;
+	//	case ParticleType::largesmoke:	p = new SmokeParticle(level, x, y, z, xa, ya, za, 2.5f); break;
-//	case ParticleType::reddust:		p = new RedDustParticle(level, x, y, z, xa, ya, za); break;
+	//	case ParticleType::reddust:		p = new RedDustParticle(level, x, y, z, xa, ya, za); break;
-//	case ParticleType::iconcrack:	p = new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]); break;
+	//	case ParticleType::iconcrack:	p = new BreakingItemParticle(level, x, y, z, xa, ya, za, Item::items[data]); break;
-//	//case ParticleType::snowballpoof: p = new BreakingItemParticle(level, x, y, z, Item::snowBall); break;
+	//	//case ParticleType::snowballpoof: p = new BreakingItemParticle(level, x, y, z, Item::snowBall); break;
-//	//case ParticleType::slime: p = new BreakingItemParticle(level, x, y, z, Item::slimeBall); break;
+	//	//case ParticleType::slime: p = new BreakingItemParticle(level, x, y, z, Item::slimeBall); break;
-//	//case ParticleType::heart: p = new HeartParticle(level, x, y, z, xa, ya, za); break;
+	//	//case ParticleType::heart: p = new HeartParticle(level, x, y, z, xa, ya, za); break;
-//	default:
+	//	default:
-//		LOGW("Couldn't find particle of type: %d\n", name);
+	//		LOGW("Couldn't find particle of type: %d\n", name);
-//		break;
+	//		break;
-//}
+	//}
-//if (p) {
+	//if (p) {
-//	mc->particleEngine->add(p);
+	//	mc->particleEngine->add(p);
-//}
+	//}
-//sw.stop();
+	//sw.stop();
-//sw.printEvery(50, "add-particle-enum");
+	//sw.printEvery(50, "add-particle-enum");
 }
 */
@@ -1610,7 +1234,6 @@ void LevelRenderer::renderHitSelect( Player* player, const HitResult& h, int mod
 void LevelRenderer::onGraphicsReset()
 {
 	generateStars();
 	generateSky();
 	// Get new buffers
@@ -1666,11 +1289,11 @@ void LevelRenderer::takePicture( TripodCamera* cam, Entity* entity )
 void LevelRenderer::levelEvent(Player* player, int type, int x, int y, int z, int data) {
 	switch (type) {    
 	case LevelEvent::SOUND_OPEN_DOOR:
-		if (Mth::random() < 0.5f) {
+        if (Mth::random() < 0.5f) {
-			level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, "random.door_open", 1, level->random.nextFloat() * 0.1f + 0.9f);
+            level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, "random.door_open", 1, level->random.nextFloat() * 0.1f + 0.9f);
-		} else {
+        } else {
-			level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, "random.door_close", 1, level->random.nextFloat() * 0.1f + 0.9f);
+            level->playSound(x + 0.5f, y + 0.5f, z + 0.5f, "random.door_close", 1, level->random.nextFloat() * 0.1f + 0.9f);
-		}
+        }
-		break;
+        break;
 	}
 }
--- a/src/client/renderer/LevelRenderer.h
+++ b/src/client/renderer/LevelRenderer.h
@@ -43,9 +43,7 @@ public:
 	void renderDebug(const AABB& b, float a) const;
 	void renderSky(float alpha);
 	void generateStars();
 	void renderClouds(float alpha);
 	void renderAdvancedClouds(float alpha);
 	void renderEntities(Vec3 cam, Culler* culler, float a);
    void renderSameAsLast(int layer, float alpha);
 	void renderHit(Player* player, const HitResult& h, int mode, /*ItemInstance*/void* inventoryItem, float a);
@@ -69,7 +67,6 @@ public:
 	void levelEvent(Player* source, int type, int x, int y, int z, int data);
 	std::string gatherStats1();
 	std::string gatherStats2();
 	void render(const AABB& b) const;
 	void onGraphicsReset();
@@ -116,12 +113,6 @@ private:
 	bool occlusionCheck;
 	int lastViewDistance;
 	// shredder added again...
 	int lastFogType;
 	bool LastTint;
 	bool LastSideTint;
 	int ticks;
    int starList, skyList, darkList;
@@ -130,12 +121,6 @@ private:
 	GLuint skyBuffer;
 	int skyVertexCount;
 	GLuint voidBuffer;
 	int voidVertexCount;
 	GLuint starBuffer;
 	int starVertexCount;
 //    /*public*/ std::vector<TileEntity*> renderableTileEntities;
    Textures* textures;
 //    /*private*/ TileRenderer tileRenderer;
--- a/src/client/renderer/Lighting.cpp
+++ b/src/client/renderer/Lighting.cpp
@@ -1,49 +0,0 @@
 #include "Lighting.h"
 #include "gles.h"
 #include "../Minecraft.h"
 void Lighting::turnOff() {
    glDisable(GL_LIGHTING);
    glDisable(GL_LIGHT0);
    glDisable(GL_LIGHT1);
    glDisable(GL_COLOR_MATERIAL);
 }
 void Lighting::turnOn(Minecraft* minecraft) {
 	if (!minecraft->options.getBooleanValue(OPTIONS_NORMAL_LIGHTING)){ // if normal lighting is false, then just dont use the lighting system at all like in vanilla - shredder
 	turnOff();
 		return;
 	}
 	glEnable(GL_NORMALIZE);
 	// if normal lighting is true then enable GLES/OpenGL states to setup lighting
    glEnable(GL_LIGHTING);
    glEnable(GL_LIGHT0);
    glEnable(GL_LIGHT1);
    glEnable(GL_COLOR_MATERIAL);
 //   glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
    constexpr float a = 0.4f;
    constexpr float d = 0.6f;
    constexpr float s = 0.0f;
    //Vec3 l = world::phys::Vec3{0.2, 1.0, -0.7}.normalize();
    constexpr float lightmodel_ambient[] = {a, a, a, 1.0f};
    constexpr float diffuse[] = {d, d, d, 1.0f};
    constexpr float ambient[] = {0.0f, 0.0f, 0.0f, 1.0f};
    constexpr float specular[] = {s, s, s, 1.0f};
    constexpr float pos0[] = {(float)(0.16169041989141428), (float)(0.8084520874101966), (float)(-0.5659164515496377), 0.0f};
    glLightfv(GL_LIGHT0, GL_POSITION, pos0);
    glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse);
    glLightfv(GL_LIGHT0, GL_AMBIENT, ambient);
    glLightfv(GL_LIGHT0, GL_SPECULAR, specular);
    constexpr float pos1[] = {(float)(-0.16169041989141428), (float)(0.8084520874101966), (float)(0.5659164515496377), 0.0f};
    glLightfv(GL_LIGHT1, GL_POSITION, pos1);
    glLightfv(GL_LIGHT1, GL_DIFFUSE, diffuse);
    glLightfv(GL_LIGHT1, GL_AMBIENT, ambient);
    glLightfv(GL_LIGHT1, GL_SPECULAR, specular);
    glShadeModel(GL_FLAT);
    glLightModelfv(GL_LIGHT_MODEL_AMBIENT, lightmodel_ambient);
 }
--- a/src/client/renderer/Lighting.h
+++ b/src/client/renderer/Lighting.h
@@ -1,12 +0,0 @@
 #ifndef NET_MINECRAFT_CLIENT_RENDERER__Lighting_H__
 #define NET_MINECRAFT_CLIENT_RENDERER__Lighting_H__
 class Minecraft;
 class Lighting
 {
 public:
 	static void turnOff();
 	static void turnOn(Minecraft* minecraft);
 };
 #endif /*NET_MINECRAFT_CLIENT_RENDERER__Lighting_H__*/
--- a/src/client/renderer/Tesselator.cpp
+++ b/src/client/renderer/Tesselator.cpp
@@ -8,7 +8,7 @@ Tesselator Tesselator::instance(sizeof(GLfloat) * MAX_FLOATS); // max size in by
 const int VertexSizeBytes = sizeof(VERTEX);
 Tesselator::Tesselator( int size )
-	:	size(size),
+:	size(size),
 	vertices(0),
 	u(0), v(0),
 	_color(0),
@@ -20,7 +20,7 @@ Tesselator::Tesselator( int size )
 	_noColor(false),
 	mode(0),
 	xo(0), yo(0), zo(0),
-	_nx(0), _ny(0), _nz(0),
+	_normal(0),
 	_sx(1), _sy(1),
 	tesselating(false),
@@ -112,7 +112,7 @@ RenderChunk Tesselator::end( bool useMine, int bufferId )
 			glEnableClientState2(GL_COLOR_ARRAY);
 		}
 		if (hasNormal) {
-			glNormalPointer(GL_FLOAT, VertexSizeBytes, (GLvoid*) (6 * 4));
+			glNormalPointer(GL_BYTE, VertexSizeBytes, (GLvoid*) (6 * 4));
 			glEnableClientState2(GL_NORMAL_ARRAY);
 		}
 		glVertexPointer2(3, GL_FLOAT, VertexSizeBytes, 0);
@@ -278,11 +278,9 @@ void Tesselator::vertex( float x, float y, float z )
 			if (hasColor) {
 				dst.color = src.color;
 			}
-			if (hasNormal) {
+			//if (hasNormal) {
-				dst.nx = src.nx;
+			//	dst.normal = src.normal;
-				dst.ny = src.ny;
+			//}
 				dst.nz = src.nz;
 			}
 			dst.x = src.x;
 			dst.y = src.y;
@@ -303,11 +301,9 @@ void Tesselator::vertex( float x, float y, float z )
 	if (hasColor) {
 		vertex.color = _color;
 	}
-	if (hasNormal) {
+	//if (hasNormal) {
-		vertex.nx = _nx;
+	//	vertex.normal = _normal;
-		vertex.ny = _ny;
+	//}
 		vertex.nz = _nz;
 	}
 	vertex.x = _sx * (x + xo);
 	vertex.y = _sy * (y + yo);
@@ -336,22 +332,18 @@ void Tesselator::setAccessMode(int mode)
 void Tesselator::normal( float x, float y, float z )
 {
-	//static int _warn_t = 0;
+	static int _warn_t = 0;
-	//if ((++_warn_t & 32767) == 1)
+	if ((++_warn_t & 32767) == 1)
-	//	LOGI("WARNING: Can't use normals (Tesselator::normal)\n");
+		LOGI("WARNING: Can't use normals (Tesselator::normal)\n");
-	//return;
+	return;
 	if (!tesselating) printf("But..");
 	hasNormal = true;
-	//char xx = (char) (x * 128);
+	char xx = (char) (x * 128);
-	//char yy = (char) (y * 127);
+	char yy = (char) (y * 127);
-	//char zz = (char) (z * 127);
+	char zz = (char) (z * 127);
-	//_normal = xx | (yy << 8) | (zz << 16);
+	_normal = xx | (yy << 8) | (zz << 16);
 	// trying a new thing hopefully works
 	this->_nx = x;
 	this->_ny = y;
 	this->_nz = z;
 }
 void Tesselator::offset( float xo, float yo, float zo ) {
@@ -412,10 +404,10 @@ void Tesselator::draw()
 			//glColorPointer2(4, GL_UNSIGNED_BYTE, VertexSizeBytes, (GLvoid*) &_varray->color);
 			glEnableClientState2(GL_COLOR_ARRAY);
 		}
-		if (hasNormal) {
+		//if (hasNormal) {
-			glNormalPointer(GL_FLOAT, VertexSizeBytes, (GLvoid*) (6 * 4));
+		//	glNormalPointer(GL_BYTE, VertexSizeBytes, (GLvoid*) (6 * 4));
-			glEnableClientState2(GL_NORMAL_ARRAY);
+		//	glEnableClientState2(GL_NORMAL_ARRAY);
-		}
+		//}
 		//glVertexPointer2(3, GL_FLOAT, VertexSizeBytes, (GLvoid*)&_varray);
 		glVertexPointer2(3, GL_FLOAT, VertexSizeBytes, 0);
 		glEnableClientState2(GL_VERTEX_ARRAY);
@@ -429,7 +421,7 @@ void Tesselator::draw()
 		glDisableClientState2(GL_VERTEX_ARRAY);
 		if (hasTexture) glDisableClientState2(GL_TEXTURE_COORD_ARRAY);
 		if (hasColor) glDisableClientState2(GL_COLOR_ARRAY);
-		if (hasNormal) glDisableClientState2(GL_NORMAL_ARRAY);
+		//if (hasNormal) glDisableClientState2(GL_NORMAL_ARRAY);
 	}
 	clear();
--- a/src/client/renderer/Tesselator.h
+++ b/src/client/renderer/Tesselator.h
@@ -10,7 +10,7 @@
 extern const int VertexSizeBytes;
-typedef VertexDeclPTCN VERTEX;
+typedef VertexDeclPTC VERTEX;
 typedef std::map<GLuint, GLsizei> IntGLMap;
@@ -98,9 +98,7 @@ private:
 	float xo, yo, zo;
 	float u, v;
 	unsigned int _color;
-//	int _normal; // trying a new thing
+	int _normal;
 	float _nx, _ny, _nz; 
 	float _sx, _sy;
 	bool hasColor;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
TestUser	d5959a277f	Update pause and chat button textures	2026-03-20 23:04:34 +02:00
TestUser	35e42a00e0	Increase size of pause and chat buttons	2026-03-20 23:03:43 +02:00