Merge remote-tracking branch 'refs/remotes/origin/main'

FIX: Now we're using useTouchsceen() right way!!!!
revert all sht
2026-03-22 02:12:46 +03:00 · 2026-03-22 02:12:04 +03:00 · 2026-03-21 19:19:07 +02:00 · 2026-03-21 19:09:11 +02:00 · 2026-03-21 19:05:00 +02:00 · 2026-03-21 18:54:51 +02:00
69 changed files with 827 additions and 597 deletions
--- a/.github/actions/setup-ninja/action.yml
+++ b/.github/actions/setup-ninja/action.yml
@@ -0,0 +1,17 @@
+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: Windows Build
-    runs-on: windows-latest
+    name: Build Windows
+    runs-on: ubuntu-22.04

    steps:
      - uses: actions/checkout@v4
@@ -27,37 +27,53 @@ jobs:
      - name: Setup caches
        uses: ./.github/actions/setup-cache
        with:
-          host: win
+          host: linux
          target: win
+      
+      - name: Setup Ninja
+        uses: ./.github/actions/setup-ninja
+        with:
+          host: linux

+      - name: Download llvm-mingw
+        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 -xf llvm-mingw.tar.xz
+          mv llvm-mingw-* llvm-mingw
+    
      - name: Create Build Environment
        # Some projects don't allow in-source building, so create a separate build directory
        # We'll use this as our working directory for all subsequent commands
        run: cmake -E make_directory ${{github.workspace}}/build

      - name: Configure CMake
-        shell: powershell
        working-directory: ${{github.workspace}}/build
-        run: cmake $env:GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$env:BUILD_TYPE
+        run: |
+          cmake $GITHUB_WORKSPACE \
+            -G Ninja \
+            -DCMAKE_SYSTEM_NAME=Windows \
+            -DCMAKE_C_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang \
+            -DCMAKE_CXX_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-clang++ \
+            -DCMAKE_RC_COMPILER=$GITHUB_WORKSPACE/llvm-mingw/bin/x86_64-w64-mingw32-windres \
+            -DALSOFT_BACKEND_PIPEWIRE=OFF \
+            -DCMAKE_BUILD_TYPE=$BUILD_TYPE

      - name: Build
        working-directory: ${{github.workspace}}/build
-        shell: powershell
-        run: cmake --build . --config $env:BUILD_TYPE --target MinecraftPE
+        run: cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
      
      - name: Upload Artifact
        uses: actions/upload-artifact@v4
        with:
          name: mcpe-windows
          path: |
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/MinecraftPE.exe
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/glfw3.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/libpng16.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/OpenAL32.dll
-            ${{github.workspace}}/build/${{ env.BUILD_TYPE }}/z.dll
+            ${{github.workspace}}/build/MinecraftPE.exe
+            ${{github.workspace}}/build/libpng16.dll
+            ${{github.workspace}}/build/OpenAL32.dll
+            ${{github.workspace}}/build/libz.dll

  build-linux:
-    name: Linux Build
+    name: Build Linux
    runs-on: ubuntu-latest

    steps:
@@ -90,7 +106,9 @@ jobs:
      - name: Build
        working-directory: ${{github.workspace}}/build
        shell: bash
-        run: cmake --build . --config $BUILD_TYPE
+        run: |
+          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
@@ -101,7 +119,7 @@ jobs:
            ${{github.workspace}}/build/MinecraftPE-server

  build-android: # pray to god
-    name: Build Android APK (${{ matrix.abi }})
+    name: Build Android (${{ matrix.abi }})
    runs-on: ubuntu-latest

    strategy:
@@ -112,11 +130,10 @@ jobs:

    env:
      ANDROID_SDK_ROOT: ${{ github.workspace }}/android-sdk
-      # ANDROID_NDK_PATH: ${{ env.ANDROID_NDK_PATH }}
+      ANDROID_NDK_PATH: ${{ github.workspace }}/android-ndk-r14b
      ANDROID_PLATFORM_API: 36
      ANDROID_BUILD_TOOLS_VERSION: 36.0.0
      ADB: /bin/true
-      # JAVA_HOME: ${{ env.JAVA_HOME }}
      # build.sh reads MATRIX_ABI to decide which ABI to build when no --abi flag is passed
      MATRIX_ABI: ${{ matrix.abi }}

@@ -125,12 +142,14 @@ jobs:
        uses: actions/checkout@v4

      - name: Cache Android command-line tools
+        id: cache-android-tools
        uses: actions/cache@v3
        with:
-          path: ${{ github.workspace }}/android-sdk/cmdline-tools
+          path: ${{ env.ANDROID_SDK_ROOT }}
          key: android-cmdline-tools-v36

      - name: Setup Android command line tools
+        if: steps.cache-android-tools.outputs.cache-hit != 'true'
        run: |
          if [ ! -d "$ANDROID_SDK_ROOT/cmdline-tools/latest" ]; then
            mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools"
@@ -140,19 +159,21 @@ jobs:
          fi
          yes | "$ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager" --sdk_root="$ANDROID_SDK_ROOT" "platform-tools" "platforms;android-${ANDROID_PLATFORM_API}" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}"

+
      - name: Cache Android NDK r14b
+        id: cache-android-ndk
        uses: actions/cache@v3
        with:
          path: ${{ github.workspace }}/android-ndk-r14b
          key: android-ndk-r14b

      - name: Install Android NDK r14b
+        if: steps.cache-android-ndk.outputs.cache-hit != 'true'
        run: |
-          if [ ! -d "$GITHUB_WORKSPACE/android-ndk-r14b" ]; then
+          if [ ! -d "$ANDROID_NDK_PATH" ]; then
            curl -L -o ndk.zip "https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip"
            unzip -q ndk.zip -d "$GITHUB_WORKSPACE"
          fi
-          echo "ANDROID_NDK_PATH=$GITHUB_WORKSPACE/android-ndk-r14b" >> $GITHUB_ENV

      - name: Install system prerequisites
        run: |
@@ -193,10 +214,59 @@ jobs:
          name: minecraftpe-apk-${{ matrix.abi }}
          path: ${{ github.workspace }}/build-apk/minecraftpe-*-debug.apk

+  build-web:
+    name: Build Web
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup caches
+        uses: ./.github/actions/setup-cache
+        with:
+          host: linux
+          target: linux
+    
+      - name: Setup Ninja
+        uses: ./.github/actions/setup-ninja
+        with:
+          host: linux
+
+      - name: Setup emsdk
+        uses: mymindstorm/setup-emsdk@v14
+        with:
+          version: 5.0.3
+          actions-cache-folder: 'emsdk-cache'
+
+      - name: Create Build Environment
+        # Some projects don't allow in-source building, so create a separate build directory
+        # We'll use this as our working directory for all subsequent commands
+        run: cmake -E make_directory ${{github.workspace}}/build
+
+      - name: Configure CMake
+        # Use a bash shell so we can use the same syntax for environment variable
+        # access regardless of the host operating system
+        shell: bash
+        working-directory: ${{github.workspace}}/build
+        run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -G Ninja -DCMAKE_TOOLCHAIN_FILE="$GITHUB_WORKSPACE/emsdk-cache/emsdk-main/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        run: cmake --build . --config $BUILD_TYPE --target MinecraftPE --parallel
+      
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: mcpe-web
+          path: |
+            ${{github.workspace}}/build/MinecraftPE.js
+            ${{github.workspace}}/build/MinecraftPE.wasm
+            ${{github.workspace}}/build/MinecraftPE.data
+
  publish:
    name: Publish
    runs-on: ubuntu-latest
-    needs: [ build-windows, build-linux, build-android ]
+    needs: [ build-windows, build-linux, build-android, build-web ]
    if: github.ref == 'refs/heads/main'
    steps:
      - name: Checkout
@@ -214,13 +284,13 @@ jobs:
      - name: Zip Windows Artifacts
        uses: vimtor/action-zip@v1.2
        with:
-          files: ${{github.workspace}}/data/ mcpe-windows/MinecraftPE.exe mcpe-windows/glfw3.dll mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/z.dll
+          files: mcpe-windows/MinecraftPE.exe mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/libz.dll
          dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip

      - name: Zip Linux Artifacts
        uses: vimtor/action-zip@v1.2
        with:
-          files: ${{github.workspace}}/data/ mcpe-linux/MinecraftPE # ye, you should install libraries by urself :trollface:
+          files: mcpe-linux/MinecraftPE
          dest: minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip

      - name: Zip Linux Server Artifacts
@@ -241,6 +311,19 @@ jobs:
          files: minecraftpe-apk-armeabi-v7a/minecraftpe-v7a-debug.apk
          dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip

+      - name: Zip Web Artifact
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-web/MinecraftPE.js mcpe-web/MinecraftPE.wasm mcpe-web/MinecraftPE.data misc/web/index.html
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
+
+      - name: Zip Data
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: data
+          recursive: false
+          dest: data.zip
+
      - name: Update Development Release
        uses: andelf/nightly-release@main
        env:
@@ -251,8 +334,10 @@ jobs:
          body: |
            MinecraftPE development release for commit ${{ github.sha }}.
          files: |
+            ./data.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
            ./minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
-            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
+            ./minecraftpe-${{ steps.ref.outputs.hash }}-android-armeabi-v7a.zip
+            ./minecraftpe-${{ steps.ref.outputs.hash }}-web.zip
--- a/.gitignore
+++ b/.gitignore
@@ -9,8 +9,6 @@ CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
 Makefile
-*.cmake
-!cmake/CPM.cmake

 # Compiled object files
 *.o
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,12 +7,6 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)

-if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
-endif()
-
-# ## Config options ###
-include(CMakeDependentOption)
 include(cmake/EnumOption.cmake)

 if(EMSCRIPTEN)
@@ -28,9 +22,18 @@ find_package(OpenSSL)
 if (${PLATFORM} STREQUAL "Desktop")
    set(PLATFORM_CPP "PLATFORM_DESKTOP")

+    if (MINGW)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
+    endif()
+
    if (WIN32)
        add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-        set(EXTRA_LIBS ws2_32)
+        include_directories(misc/windows)
+        set(EXTRA_LIBS ws2_32 winhttp)
    elseif(UNIX)
        find_library(pthread NAMES pthread)
        set(EXTRA_LIBS pthread m)
@@ -53,6 +56,7 @@ if(${PLATFORM} MATCHES "Web")

    add_library(png INTERFACE IMPORTED)
    set_target_properties(png PROPERTIES
+        INTERFACE_COMPILE_OPTIONS "-sUSE_LIBPNG=1" 
        INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1"
    )

@@ -102,6 +106,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 *
@@ -321,11 +328,11 @@ target_include_directories(${PROJECT_NAME} PUBLIC
 if(${PLATFORM} MATCHES "Web")
    set(CMAKE_CXX_STANDARD 11)
    # uuuh i hate it
-    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sSHARED_MEMORY=1")
+    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sUSE_LIBPNG=1 -sSHARED_MEMORY=1")
    
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_FLAGS}")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_FLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data -sPROXY_TO_PTHREAD")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data")

    target_compile_options(${PROJECT_NAME} PUBLIC
        "-Os"
@@ -363,7 +370,7 @@ endif()

 # Client
 target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
-target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} alsoft.common OpenAL::OpenAL glfw ${EXTRA_LIBS})
+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
--- a/cmake/EnumOption.cmake
+++ b/cmake/EnumOption.cmake
@@ -0,0 +1,9 @@
+macro(enum_option var values description)
+  set(${var}_VALUES ${values})
+  list(GET ${var}_VALUES 0 default)
+  set(${var} "${default}" CACHE STRING "${description}")
+  set_property(CACHE ${var} PROPERTY STRINGS ${${var}_VALUES})
+  if (NOT ";${${var}_VALUES};" MATCHES ";${${var}};")
+    message(FATAL_ERROR "Unknown value ${${var}}. Only -D${var}=${${var}_VALUES} allowed.")
+  endif()
+endmacro()
--- a/data/images/gui/gui.png
+++ b/data/images/gui/gui.png
--- a/data/lang/en_US.lang
+++ b/data/lang/en_US.lang
@@ -152,7 +152,8 @@ options.group.graphics=Graphics
 options.group.tweaks=Tweaks
 options.allowSprint=Allow sprint
 options.barOnTop=HUD above inventory
-options.autojump=Auto Jump
+options.rpiCursor=Show Raspberry PI cursor
+options.autoJump=Auto Jump
 options.thirdperson=Third Person
 options.servervisible=Server Visible
 options.sensitivity=Sensitivity
@@ -181,9 +182,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 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/misc/web/index.html
+++ b/misc/web/index.html
@@ -1,143 +1,46 @@
-<!doctype html>
-<html lang="en-us">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-    <title>Emscripten-Generated Code</title>
-    <style>
-      .emscripten { padding-right: 0; margin-left: auto; margin-right: auto; display: block; }
-      textarea.emscripten { font-family: monospace; width: 80%; }
-      div.emscripten { text-align: center; }
-      div.emscripten_border { border: 1px solid black; }
-      /* the canvas *must not* have any border or padding, or mouse coords will be wrong */
-      canvas.emscripten { border: 0px none; background-color: black; }
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>MCPE 0.6.1</title>
+  <style>
+    html, body {
+      margin: 0;
+      padding: 0;
+      height: 100%;
+      background: black;
+      overflow: hidden;
+    }

-      .spinner {
-        height: 50px;
-        width: 50px;
-        margin: 0px auto;
-        -webkit-animation: rotation .8s linear infinite;
-        -moz-animation: rotation .8s linear infinite;
-        -o-animation: rotation .8s linear infinite;
-        animation: rotation 0.8s linear infinite;
-        border-left: 10px solid rgb(0,150,240);
-        border-right: 10px solid rgb(0,150,240);
-        border-bottom: 10px solid rgb(0,150,240);
-        border-top: 10px solid rgb(100,0,200);
-        border-radius: 100%;
-        background-color: rgb(200,100,250);
-      }
-      @-webkit-keyframes rotation {
-        from {-webkit-transform: rotate(0deg);}
-        to {-webkit-transform: rotate(360deg);}
-      }
-      @-moz-keyframes rotation {
-        from {-moz-transform: rotate(0deg);}
-        to {-moz-transform: rotate(360deg);}
-      }
-      @-o-keyframes rotation {
-        from {-o-transform: rotate(0deg);}
-        to {-o-transform: rotate(360deg);}
-      }
-      @keyframes rotation {
-        from {transform: rotate(0deg);}
-        to {transform: rotate(360deg);}
-      }
+    #canvas {
+      width: 100vw;
+      height: 100vh;
+      display: block;
+    }
+  </style>
+</head>
+<body>

-    </style>
-  </head>
-  <body>
-    <hr/>
-    <figure style="overflow:visible;" id="spinner"><div class="spinner"></div><center style="margin-top:0.5em"><strong>emscripten</strong></center></figure>
-    <div class="emscripten" id="status">Downloading...</div>
-    <div class="emscripten">
-      <progress value="0" max="100" id="progress" hidden=1></progress>
-    </div>
-    <div class="emscripten_border">
-      <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
-    </div>
-    <hr/>
-    <div class="emscripten">
-      <input type="checkbox" id="resize">Resize canvas
-      <input type="checkbox" id="pointerLock" checked>Lock/hide mouse pointer
-      &nbsp;&nbsp;&nbsp;
-      <input type="button" value="Fullscreen" onclick="Module.requestFullscreen(document.getElementById('pointerLock').checked,
-                                                                                document.getElementById('resize').checked)">
-    </div>
+<canvas id="canvas"></canvas>

-    <hr/>
-    <textarea class="emscripten" id="output" rows="8"></textarea>
-    <hr>
-    <script type='text/javascript'>
-      var statusElement = document.getElementById('status');
-      var progressElement = document.getElementById('progress');
-      var spinnerElement = document.getElementById('spinner');
-      var canvasElement = document.getElementById('canvas');
-      var outputElement = document.getElementById('output');
-      if (outputElement) outputElement.value = ''; // clear browser cache
+<script>
+  var Module = {
+    canvas: document.getElementById('canvas'),
+    onRuntimeInitialized: function () { resizeCanvas() }
+  };

-      // As a default initial behavior, pop up an alert when webgl context is lost. To make your
-      // application robust, you may want to override this behavior before shipping!
-      // See http://www.khronos.org/registry/webgl/specs/latest/1.0/#5.15.2
-      canvasElement.addEventListener("webglcontextlost", (e) => {
-        alert('WebGL context lost. You will need to reload the page.');
-        e.preventDefault();
-      }, false);
+  function resizeCanvas() {
+    const canvas = Module.canvas;
+    canvas.width = window.innerWidth;
+    canvas.height = window.innerHeight;
+  }

-      function setStatus(text) {
-        if (!setStatus.last) setStatus.last = { time: Date.now(), text: '' };
-        if (text === setStatus.last.text) return;
-        var m = text.match(/([^(]+)\((\d+(\.\d+)?)\/(\d+)\)/);
-        var now = Date.now();
-        if (m && now - setStatus.last.time < 30) return; // if this is a progress update, skip it if too soon
-        setStatus.last.time = now;
-        setStatus.last.text = text;
-        if (m) {
-          text = m[1];
-          progressElement.value = parseInt(m[2])*100;
-          progressElement.max = parseInt(m[4])*100;
-          progressElement.hidden = false;
-          spinnerElement.hidden = false;
-        } else {
-          progressElement.value = null;
-          progressElement.max = null;
-          progressElement.hidden = true;
-          if (!text) spinnerElement.hidden = true;
-        }
-        statusElement.innerHTML = text;
-      }
+  window.addEventListener('resize', resizeCanvas);
+  window.addEventListener('onunload', () => {
+    FS.syncfs(true, function (err) { console.log('Sync FS failed: ' + err) });
+  })
+</script>

-      var Module = {
-        print(...args) {
-          // These replacements are necessary if you render to raw HTML
-          //text = text.replace(/&/g, "&amp;");
-          //text = text.replace(/</g, "&lt;");
-          //text = text.replace(/>/g, "&gt;");
-          //text = text.replace('\n', '<br>', 'g');
-          console.log(...args);
-          if (outputElement) {
-            var text = args.join(' ');
-            outputElement.value += text + "\n";
-            outputElement.scrollTop = outputElement.scrollHeight; // focus on bottom
-          }
-        },
-        canvas: canvasElement,
-        setStatus: setStatus,
-        totalDependencies: 0,
-        monitorRunDependencies(left) {
-          this.totalDependencies = Math.max(this.totalDependencies, left);
-          setStatus(left ? 'Preparing... (' + (this.totalDependencies-left) + '/' + this.totalDependencies + ')' : 'All downloads complete.');
-        }
-      };
-      setStatus('Downloading...');
-      window.onerror = () => {
-        setStatus('Exception thrown, see JavaScript console');
-        spinnerElement.style.display = 'none';
-        setStatus = (text) => {
-          if (text) console.error('[post-exception status] ' + text);
-        };
-      };
-    </script>
-    <script src="MinecraftPE.js"></script>
-  </body>
+<script src="MinecraftPE.js"></script>
+</body>
 </html>
--- a/project/android/AndroidManifest.xml
+++ b/project/android/AndroidManifest.xml
@@ -7,7 +7,7 @@

    <!-- This is the platform API where NativeActivity was introduced. -->
    <uses-sdk   android:minSdkVersion="19"
-                android:targetSdkVersion="36" />
+                android:targetSdkVersion="30" />
                
    <!-- uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="true"/ -->

--- a/project/android/assets/lang/en_US.lang
+++ b/project/android/assets/lang/en_US.lang
@@ -168,9 +168,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 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/AndroidManifest.xml
+++ b/project/android_java/AndroidManifest.xml
@@ -6,7 +6,7 @@

    <uses-sdk
        android:minSdkVersion="19"
-        android:targetSdkVersion="36"/>
+        android:targetSdkVersion="30"/>

    <uses-feature
        android:name="android.hardware.touchscreen.multitouch"
--- a/project/android_java/assets/lang/en_US.lang
+++ b/project/android_java/assets/lang/en_US.lang
@@ -168,8 +168,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 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/src/com/mojang/minecraftpe/MainActivity.java
+++ b/project/android_java/src/com/mojang/minecraftpe/MainActivity.java
@@ -59,6 +59,7 @@ public class MainActivity extends Activity {
    private static final int PERMISSION_REQUEST_CODE = 123;

    private GLView _glView;
+    private boolean _nativeInitialized = false;
    public float invScale = 1.0f;// / 1.5f;
    private int _screenWidth = 0;
    private int _screenHeight = 0;
@@ -77,63 +78,48 @@ public class MainActivity extends Activity {
        _screenWidth = Math.max(_dm.widthPixels, _dm.heightPixels);
        _screenHeight = Math.min(_dm.widthPixels, _dm.heightPixels);

-        nativeOnCreate(_screenWidth, _screenHeight);
-
        _glView = new GLView(getApplication(), this);
        //_glView.setEGLConfigChooser(8, 8, 8, 8, 16, 0);
+
        _glView.setEGLConfigChooser(true);
        //_glView
-        
-//        _glView.setEGLConfigChooser(
-//        	new GLSurfaceView.EGLConfigChooser() {
-//			
-//			@Override
-//			public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
-//				// TODO Auto-generated method stub
-//				
-//		        // Specify a configuration for our opengl session 
-//		         // and grab the first configuration that matches is 
-//		         int[] configSpec = { 
-//		                 EGL10.EGL_DEPTH_SIZE,   24, 
-//		                 EGL10.EGL_NONE 
-//		         }; 
-//		         EGLConfig[] configs = new EGLConfig[1]; 
-//		         int[] num_config = new int[1]; 
-//		         egl.eglChooseConfig(display, configSpec, configs, 1, num_config); 
-//		         EGLConfig config = configs[0];
-//		         return config;
-//				
-//				//return null;
-//			}
-//		} );

        _glView.commit();
-    	setContentView(_glView);
-    	
-    	_soundPlayer = new SoundPlayer(this, AudioManager.STREAM_MUSIC);
+        setContentView(_glView);
+
+        _soundPlayer = new SoundPlayer(this, AudioManager.STREAM_MUSIC);

-        // request dangerous permissions at runtime if necessary
        checkAndRequestPermissions();
+        initNative();
    }

-    private void checkAndRequestPermissions() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            boolean needRequest = false;
-            if (checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                needRequest = true;
-            }
-            if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                needRequest = true;
-            }
-            if (needRequest) {
-                requestPermissions(new String[] {
-                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        android.Manifest.permission.READ_EXTERNAL_STORAGE
-                }, PERMISSION_REQUEST_CODE);
-            }
+    private void initNative() {
+        if (_nativeInitialized) {
+            return;
        }
+        _nativeInitialized = true;
+        nativeOnCreate(_screenWidth, _screenHeight);
+    }
+
+    // request dangerous permissions at runtime if necessary
+    private boolean checkAndRequestPermissions() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return true;
+        }
+
+        boolean writeGranted = checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        boolean readGranted = checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+
+        if (writeGranted && readGranted) {
+            return true;
+        }
+
+        requestPermissions(new String[] {
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            android.Manifest.permission.READ_EXTERNAL_STORAGE
+        }, PERMISSION_REQUEST_CODE);
+
+        return false;
    }

    @Override
@@ -146,8 +132,18 @@ public class MainActivity extends Activity {
                    break;
                }
            }
-            if (!granted) {
-                // user denied; you might want to warn or close the app
+            if (granted) {
+                initNative();
+            } else {
+                // We can still run using app-specific external files in scoped-storage,
+                // so allow startup while warning the user.
+                initNative();
+                new AlertDialog.Builder(this)
+                    .setTitle("Storage permission recommended")
+                    .setMessage("MinecraftPE can still run with app-private storage, but public external save/load may require permission.")
+                    .setPositiveButton("OK", null)
+                    .setCancelable(true)
+                    .show();
            }
        }
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
--- 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.h
+++ b/src/AppPlatform.h
@@ -74,6 +74,8 @@ public:
 	virtual TextureData loadTextureFromMemory(const unsigned char* data, size_t size) { return TextureData(); }

    virtual void playSound(const std::string& fn, float volume, float pitch) {}
+	
+	virtual void hideCursor(bool hide) {}

 	virtual void showDialog(int dialogId) {}
    virtual void createUserInput() {}
--- a/src/AppPlatform_glfw.h
+++ b/src/AppPlatform_glfw.h
@@ -20,6 +20,10 @@
 #include <shellapi.h>
 #endif

+#ifdef __EMSCRIPTEN__
+	#include <emscripten/html5.h>
+#endif
+
 static void png_funcReadFile(png_structp pngPtr, png_bytep data, png_size_t length) {
 	((std::istream*)png_get_io_ptr(pngPtr))->read((char*)data, length);
 }
@@ -73,50 +77,20 @@ public:
 								: filename_;
 		std::ifstream source(filename.c_str(), std::ios::binary);

-		if (source) {
-			png_structp pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-			if (!pngPtr)
-				return out;
-
-			png_infop infoPtr = png_create_info_struct(pngPtr);
-
-			if (!infoPtr) {
-				png_destroy_read_struct(&pngPtr, NULL, NULL);
-				return out;
-			}
-
-			// Hack to get around the broken libpng for windows
-			png_set_read_fn(pngPtr,(void*)&source, png_funcReadFile);
-
-			png_read_info(pngPtr, infoPtr);
-
-			// Set up the texdata properties
-			out.w = png_get_image_width(pngPtr, infoPtr);
-			out.h = png_get_image_height(pngPtr, infoPtr);
-
-			png_bytep* rowPtrs = new png_bytep[out.h];
-			out.data = new unsigned char[4 * out.w * out.h];
-			out.memoryHandledExternally = false;
-
-			int rowStrideBytes = 4 * out.w;
-			for (int i = 0; i < out.h; i++) {
-				rowPtrs[i] = (png_bytep)&out.data[i*rowStrideBytes];
-			}
-			png_read_image(pngPtr, rowPtrs);
-
-			// Teardown and return
-			png_destroy_read_struct(&pngPtr, &infoPtr,(png_infopp)0);
-			delete[] (png_bytep)rowPtrs;
-			source.close();
-
-			return out;
-		}
-		else
-		{
+		if (!source) {
 			LOGI("Couldn't find file: %s\n", filename.c_str());
 			return out;
 		}
+
+		std::vector<unsigned char> fileData((std::istreambuf_iterator<char>(source)), std::istreambuf_iterator<char>());
+		source.close();
+
+		if (fileData.empty()) {
+			LOGI("Couldn't read file: %s\n", filename.c_str());
+			return out;
+		}
+
+		return loadTextureFromMemory(fileData.data(), fileData.size());
    }

 	TextureData loadTextureFromMemory(const unsigned char* data, size_t size) override {
@@ -132,12 +106,36 @@ public:
 		return std::string(mbstr);
 	}

-	virtual int getScreenWidth() override { return 854; };
-	virtual int getScreenHeight() override { return 480; };
+	virtual int getScreenWidth() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return w;
+		#endif
+
+		return 854; 
+	};
+
+	virtual int getScreenHeight() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return h;
+		#endif
+
+		return 480; 
+	};

 	virtual float getPixelsPerMillimeter() override;

-	virtual bool supportsTouchscreen() override { return true; }
+	virtual bool supportsTouchscreen() override { return false; /* glfw supports only mouse and keyboard */ }
+
+	virtual void hideCursor(bool hide) override {
+		int isHide = hide ? GLFW_CURSOR_NORMAL : GLFW_CURSOR_HIDDEN;
+		glfwSetInputMode(window, GLFW_CURSOR, isHide);
+	}

 	virtual void openURL(const std::string& url) override {
 #ifdef _WIN32
@@ -145,6 +143,8 @@ public:
 #elif __linux__
 		std::string command = "xdg-open " + url;
 		system(command.c_str());
+#elif __EMSCRIPTEN__
+		emscripten_run_script(std::string("window.open('" + url + "', '_blank')").c_str());
 #endif
 	}

--- a/src/NinecraftApp.cpp
+++ b/src/NinecraftApp.cpp
@@ -99,6 +99,9 @@ void NinecraftApp::init()
 	I18n::loadLanguage(platform(), "en_US");
 #endif

+	if (!externalStoragePath.empty()) {
+		options.setOptionsFilePath(externalStoragePath);
+	}
 	Minecraft::init();

 #if !defined(DEMO_MODE) && !defined(APPLE_DEMO_PROMOTION) && !defined(NO_STORAGE)
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
@@ -1,4 +1,5 @@
 #include "Minecraft.h"
+#include "Options.h"
 #include "client/Options.h"
 #include "client/player/input/IBuildInput.h"
 #include "platform/input/Keyboard.h"
@@ -640,13 +641,11 @@ void Minecraft::tickInput() {

 		const MouseAction& e = Mouse::getEvent();

-#ifdef RPI // If clicked when not having focus, get focus @keyboard
-		if (!mouseGrabbed) {
+		if (!useTouchscreen() && !mouseGrabbed) {
 			if (!screen && e.data == MouseAction::DATA_DOWN) {
 				grabMouse();
 			}
 		}
-#endif

 		if (allowGuiClicks && e.action == MouseAction::ACTION_LEFT && e.data == MouseAction::DATA_DOWN) {
 			gui.handleClick(MouseAction::ACTION_LEFT, Mouse::getX(), Mouse::getY());
@@ -660,9 +659,7 @@ void Minecraft::tickInput() {
 				Inventory* v = player->inventory;

 				int numSlots = gui.getNumSlots();
-#ifndef PLATFORM_DESKTOP
-				numSlots--;
-#endif
+				if (!useTouchscreen()) numSlots--;

 				int slot = (v->selected - e.dy + numSlots) % numSlots;
 				v->selectSlot(slot);
@@ -691,155 +688,147 @@ void Minecraft::tickInput() {
 		if (isPressed) {
 			gui.handleKeyPressed(key);

-			#if defined(WIN32) || defined(RPI) || defined (PLATFORM_DESKTOP)//|| defined(_DEBUG) || defined(DEBUG)
-				if (key >= '0' && key <= '9') {
-					int digit = key - '0';
-					int slot = digit - 1;
+			if (key >= '0' && key <= '9') {
+				int digit = key - '0';
+				int slot = digit - 1;

-					if (slot >= 0 && slot < gui.getNumSlots())
-						player->inventory->selectSlot(slot);
+				if (slot >= 0 && slot < gui.getNumSlots())
+					player->inventory->selectSlot(slot);

-					#if defined(WIN32)
-						if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
-							// Set adventure settings here!
-							AdventureSettingsPacket p(level->adventureSettings);
-							p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
-							p.fillIn(level->adventureSettings);
-							raknetInstance->send(p);
-						}
-						if (digit == 0) {
-							Pos pos((int)player->x, (int)player->y-1, (int)player->z);
-							SetSpawnPositionPacket p(pos);
-							raknetInstance->send(p);
-						}
-					#endif
-				}
-			#endif
-			#if defined(PLATFORM_DESKTOP)
-				if (key == Keyboard::KEY_LEFT_CTRL) {
-					player->setSprinting(true);
+				#if defined(WIN32)
+					if (digit >= 1 && GetAsyncKeyState(VK_CONTROL) < 0) {
+						// Set adventure settings here!
+						AdventureSettingsPacket p(level->adventureSettings);
+						p.toggle((AdventureSettingsPacket::Flags)(1 << slot));
+						p.fillIn(level->adventureSettings);
+						raknetInstance->send(p);
+					}
+					if (digit == 0) {
+						Pos pos((int)player->x, (int)player->y-1, (int)player->z);
+						SetSpawnPositionPacket p(pos);
+						raknetInstance->send(p);
+					}
+				#endif
+			}
+
+			if (key == Keyboard::KEY_LEFT_CTRL) {
+				player->setSprinting(true);
+			}
+
+			if (key == Keyboard::KEY_E) {
+				screenChooser.setScreen(SCREEN_BLOCKSELECTION);
+			}
+
+			if (!screen && key == Keyboard::KEY_T && level) {
+				setScreen(new ConsoleScreen());
+			}
+
+			if (key == Keyboard::KEY_F3) {
+				options.toggle(OPTIONS_RENDER_DEBUG);
+			}
+
+			if (key == Keyboard::KEY_F5) {
+				options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+				/*
+				ImprovedNoise noise;
+				for (int i = 0; i < 16; ++i)
+					printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
+				*/
+			}
+
+			if (!screen && key == Keyboard::KEY_O || key == 250) {
+				releaseMouse();
+			}
+
+			if (key == Keyboard::KEY_F) {
+				int dst = options.getIntValue(OPTIONS_VIEW_DISTANCE);
+				options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
+			}
+			#ifdef CHEATS
+				if (key == Keyboard::KEY_U) {
+					onGraphicsReset();
+					player->heal(100);
 				}

-				if (key == Keyboard::KEY_E) {
-					screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-				}
+				if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
+					setIsCreativeMode(!isCreativeMode());

-				if (!screen && key == Keyboard::KEY_T && level) {
-					setScreen(new ConsoleScreen());
-				}
+				if (key == Keyboard::KEY_P) // Step forward in time
+					level->setTime( level->getTime() + 1000);

-				if (key == Keyboard::KEY_F3) {
-					options.toggle(OPTIONS_RENDER_DEBUG);
-				}
-	
-				if (key == Keyboard::KEY_F5) {
-					options.toggle(OPTIONS_THIRD_PERSON_VIEW);
+				if (key == Keyboard::KEY_G) {
+					setScreen(new ArmorScreen());
 					/*
-					ImprovedNoise noise;
-					for (int i = 0; i < 16; ++i)
-						printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
+					std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
+					LOGI("boxes: %d\n", (int)boxs.size());
 					*/
 				}

-				if (!screen && key == Keyboard::KEY_O || key == 250) {
-					releaseMouse();
+				if (key == Keyboard::KEY_Y) {
+					textures->reloadAll();
+					player->hurtTo(2);
+				}
+				if (key == Keyboard::KEY_Z || key == 108) {
+					for (int i = 0; i < 1; ++i) {
+						Mob* mob = NULL;
+						int forceId = 0;//MobTypes::Sheep;
+
+						int types[] = {
+							MobTypes::Sheep,
+							MobTypes::Pig,
+							MobTypes::Chicken,
+							MobTypes::Cow,
+						};
+
+						int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
+						mob = MobFactory::CreateMob(mobType, level);
+
+						//((Animal*)mob)->setAge(-1000);
+						float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
+						float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
+						if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
+							delete mob;
+					}
 				}

-				if (key == Keyboard::KEY_F) {
-					int dst = options.getIntValue(OPTIONS_VIEW_DISTANCE);
-					options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
+				if (key == Keyboard::KEY_X) {
+					const EntityList& entities = level->getAllEntities();
+					for (int i = entities.size()-1; i >= 0; --i) {
+						Entity* e = entities[i];
+						if (!e->isPlayer())
+							level->removeEntity(e);
+					}
 				}
-				#ifdef CHEATS
-					if (key == Keyboard::KEY_U) {
-						onGraphicsReset();
-						player->heal(100);
+
+				if (key == Keyboard::KEY_C /*|| key == 4*/) {
+					player->inventory->clearInventoryWithDefault();
+					// @todo: Add saving here for benchmarking
+				}
+				if (key == Keyboard::KEY_H) {
+					setScreen( new PrerenderTilesScreen() );
+				}
+
+				if (key == Keyboard::KEY_O) {
+					for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
+						if (player->inventory->getItem(i))
+							player->inventory->dropSlot(i, false);
+				}
+				if (key == Keyboard::KEY_M) {
+					Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
+					options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
+						Difficulty::NORMAL : Difficulty::PEACEFUL);
+					//setIsCreativeMode( !isCreativeMode() );
+				}
+
+				if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+					if (key >= '0' && key <= '9') {
+						_perfRenderer->debugFpsMeterKeyPress(key - '0');
 					}
-
-					if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
-						setIsCreativeMode(!isCreativeMode());
-
-					if (key == Keyboard::KEY_P) // Step forward in time
-						level->setTime( level->getTime() + 1000);
-
-					if (key == Keyboard::KEY_G) {
-						setScreen(new ArmorScreen());
-						/*
-						std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
-						LOGI("boxes: %d\n", (int)boxs.size());
-						*/
-					}
-
-					if (key == Keyboard::KEY_Y) {
-						textures->reloadAll();
-						player->hurtTo(2);
-					}
-					if (key == Keyboard::KEY_Z || key == 108) {
-						for (int i = 0; i < 1; ++i) {
-							Mob* mob = NULL;
-							int forceId = 0;//MobTypes::Sheep;
-
-							int types[] = {
-								MobTypes::Sheep,
-								MobTypes::Pig,
-								MobTypes::Chicken,
-								MobTypes::Cow,
-							};
-
-							int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
-							mob = MobFactory::CreateMob(mobType, level);
-
-							//((Animal*)mob)->setAge(-1000);
-							float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
-							float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
-							if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
-								delete mob;
-						}
-					}
-
-					if (key == Keyboard::KEY_X) {
-						const EntityList& entities = level->getAllEntities();
-						for (int i = entities.size()-1; i >= 0; --i) {
-							Entity* e = entities[i];
-							if (!e->isPlayer())
-								level->removeEntity(e);
-						}
-					}
-
-					if (key == Keyboard::KEY_C /*|| key == 4*/) {
-						player->inventory->clearInventoryWithDefault();
-						// @todo: Add saving here for benchmarking
-					}
-					if (key == Keyboard::KEY_H) {
-						setScreen( new PrerenderTilesScreen() );
-					}
-
-					if (key == Keyboard::KEY_O) {
-						for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
-							if (player->inventory->getItem(i))
-								player->inventory->dropSlot(i, false);
-					}
-					if (key == Keyboard::KEY_M) {
-						Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
-						options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
-							Difficulty::NORMAL : Difficulty::PEACEFUL);
-						//setIsCreativeMode( !isCreativeMode() );
-					}
-
-					if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
-						if (key >= '0' && key <= '9') {
-							_perfRenderer->debugFpsMeterKeyPress(key - '0');
-						}
-					}
-				#endif
+				}
 			#endif

-			#ifndef PLATFORM_DESKTOP
-				if (key == 82)
-					pauseGame(false);
-			#else
-				if (key == Keyboard::KEY_ESCAPE)
-					pauseGame(false);
-			#endif
+			if (key == Keyboard::KEY_ESCAPE)
+				pauseGame(false);

 			#ifndef OPENGL_ES
 				if (key == Keyboard::KEY_P) {
@@ -866,11 +855,18 @@ void Minecraft::tickInput() {
 		gameMode->stopDestroyBlock();
 	}

+	if (!Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
+		gameMode->releaseUsingItem(player);
+	}
+
 	if (useTouchscreen()) {
 		// Touch: gesture recognizer classifies the action type (turn/destroy/build)
 		BuildActionIntention bai;
+
 		if (inputHolder && inputHolder->getBuildInput()->tickBuild(player, &bai)) {
 			handleBuildAction(&bai);
+		} else {
+			gameMode->stopDestroyBlock();
 		}
 	} else {
 		// Desktop: left mouse = destroy/attack
@@ -1112,7 +1108,7 @@ bool Minecraft::useTouchscreen() {
 #ifdef RPI
 	return false;
 #endif
-	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) || !_supportsNonTouchscreen;
+	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) && !_supportsNonTouchscreen;
 }
 bool Minecraft::supportNonTouchScreen() {
 	return _supportsNonTouchscreen;
@@ -1143,6 +1139,8 @@ void Minecraft::init()
 	checkGlError("Init complete");
 #endif

+	options.load();
+
 	setIsCreativeMode(false); // false means it's Survival Mode
 	reloadOptions();
 }
@@ -1158,12 +1156,13 @@ void Minecraft::setSize(int w, int h) {

 	// determine gui scale, optionally overriding auto
 	if (guiScale != 0) {
-		// manual selection: 1->small, 2->normal, 3->large, 4->larger
+		// manual selection: 1->small, 2->medium, 3->large, 4->larger, 5->largest
 		switch (guiScale) {
 		case 1: Gui::GuiScale = 2.0f; break;
 		case 2: Gui::GuiScale = 3.0f; break;
 		case 3: Gui::GuiScale = 4.0f; break;
-		case 4: Gui::GuiScale = 5.0f; break; // bigger than large
+		case 4: Gui::GuiScale = 5.0f; break;
+		case 5: Gui::GuiScale = 6.0f; break;
 		default: Gui::GuiScale = 1.0f; break; // auto
 		}
 	} else {
@@ -1225,7 +1224,6 @@ void Minecraft::reloadOptions() {
 	if ((wasTouchscreen != useTouchscreen()) || (inputHolder == 0))
 		_reloadInput();

-	// TODO:
 	// user->name = options.username;

 	LOGI("Reloading-options\n");
@@ -1239,11 +1237,7 @@ void Minecraft::_reloadInput() {
 #ifndef STANDALONE_SERVER
 	delete inputHolder;

-#ifdef PLATFORM_DESKTOP
-	const bool useTouchHolder = false;
-#else
 	const bool useTouchHolder = useTouchscreen();
-#endif
 	if (useTouchHolder) {
 		inputHolder = new TouchInputHolder(this, &options);
 	} else {
@@ -1568,6 +1562,8 @@ void Minecraft::optionUpdated(OptionId option, bool value ) {
 	if(netCallback != NULL && option == OPTIONS_SERVER_VISIBLE) {
 		ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) netCallback;
 		ss->allowIncomingConnections(value);
+	} else if (option == OPTIONS_USE_TOUCHSCREEN) {
+		_reloadInput();
 	}
 }

--- a/src/client/Minecraft.h
+++ b/src/client/Minecraft.h
@@ -109,6 +109,8 @@ public:

 	bool isLevelGenerated();

+	void handleMouseDown(int button, bool down);
+	
    void audioEngineOn();
    void audioEngineOff();
    
--- a/src/client/MouseHandler.cpp
+++ b/src/client/MouseHandler.cpp
@@ -5,7 +5,7 @@
 #include <SDL/SDL.h>
 #endif

-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 #include <GLFW/glfw3.h>
 #endif

@@ -34,7 +34,7 @@ void MouseHandler::grab() {
 	SDL_ShowCursor(0);
 #endif

-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_DISABLED);
 #endif
 }
@@ -46,7 +46,7 @@ void MouseHandler::release() {
 	SDL_ShowCursor(1);
 #endif

-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
 #endif
 }
--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -20,6 +20,7 @@ OptionBool fixedCamera("fixedCamera", false);
 OptionBool isFlying("isflying", false);
 OptionBool barOnTop("barOnTop", false);
 OptionBool allowSprint("allowSprint", true);
+OptionBool rpiCursor("rpiCursor", false);
 OptionBool autoJump("autoJump", true);


@@ -158,6 +159,7 @@ 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_AUTOJUMP] = &autoJump;
 	m_options[OPTIONS_LAST_IP] = &lastIp;
@@ -283,6 +285,10 @@ void Options::save() {
 	optionsFile.save(stringVec);
 }

+void Options::setOptionsFilePath(const std::string& path) {
+	optionsFile.setOptionsPath(path + "/options.txt");
+}
+
 void Options::notifyOptionUpdate(OptionId key, bool value) {
 	minecraft->optionUpdated(key, value);
 }
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -83,6 +83,7 @@ enum OptionId {
    OPTIONS_FIRST_LAUNCH,
    OPTIONS_LAST_IP,

+    OPTIONS_RPI_CURSOR,
 	// Should be last!
 	OPTIONS_COUNT
 };
@@ -100,15 +101,10 @@ public:
        // elements werent initialized so i was getting a garbage pointer and a crash
        m_options.fill(nullptr);
        initTable();
-		load();
+	    // load() is deferred to init() where path is configured correctly
    }

-	void initTable();
-
-    void set(OptionId key, int value);
-    void set(OptionId key, float value);
-    void set(OptionId key, const std::string& value);
-    void toggle(OptionId key);
+    void initTable();

    int getIntValue(OptionId key) {
        auto option = opt<OptionInt>(key);
@@ -144,6 +140,11 @@ public:

    void load();
    void save();
+    void set(OptionId key, int value);
+    void set(OptionId key, float value);
+    void set(OptionId key, const std::string& value);
+	void setOptionsFilePath(const std::string& path);
+	void toggle(OptionId key);

 	void notifyOptionUpdate(OptionId key, bool value);
 	void notifyOptionUpdate(OptionId key, float value);
--- a/src/client/OptionsFile.cpp
+++ b/src/client/OptionsFile.cpp
@@ -4,28 +4,73 @@
 #include <errno.h>
 #include <platform/log.h>

+#if defined(_WIN32)
+    #include <direct.h>
+#else
+    #include <sys/stat.h>
+    #include <sys/types.h>
+#endif
+
 OptionsFile::OptionsFile() {
 #ifdef __APPLE__
 	settingsPath = "./Documents/options.txt";
 #elif defined(ANDROID)
 	settingsPath = "options.txt";
+#elif defined(__EMSCRIPTEN__)
+    settingsPath = "/games/com.mojang/options.txt";
 #else
 	settingsPath = "options.txt";
 #endif
 }

-void OptionsFile::save(const StringVector& settings) {
-	FILE* pFile = fopen(settingsPath.c_str(), "w");
-	if(pFile != NULL) {
-		for(StringVector::const_iterator it = settings.begin(); it != settings.end(); ++it) {
-			fprintf(pFile, "%s\n", it->c_str());
-		}
-		fclose(pFile);
-	} else {
-		LOGI("OptionsFile::save failed to open '%s' for writing: %s", settingsPath.c_str(), strerror(errno));
-	}
+void OptionsFile::setOptionsPath(const std::string& path) {
+	settingsPath = path;
 }

+std::string OptionsFile::getOptionsPath() const {
+	return settingsPath;
+}
+void OptionsFile::save(const StringVector& settings) {
+    FILE* pFile = fopen(settingsPath.c_str(), "w");
+
+    if (!pFile && errno == ENOENT) {
+        std::string dir = settingsPath;
+        size_t fpos = dir.find_last_of("/\\");
+        if (fpos != std::string::npos) {
+            dir.resize(fpos);
+
+            std::string toCreate;
+            for (size_t i = 0; i <= dir.size(); ++i) {
+                if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
+                    if (!toCreate.empty()) {
+#if defined(_WIN32)
+                        _mkdir(toCreate.c_str());
+#else
+                        mkdir(toCreate.c_str(), 0755);
+#endif
+                    }
+                }
+                if (i < dir.size())
+                    toCreate.push_back(dir[i]);
+            }
+        }
+
+        pFile = fopen(settingsPath.c_str(), "w");
+    }
+
+    if (!pFile) {
+        LOGI("OptionsFile::save failed: %s", strerror(errno));
+        return;
+    }
+
+    for (const auto& s : settings) {
+        fprintf(pFile, "%s\n", s.c_str());
+    }
+
+    fclose(pFile);
+}
+
+
 StringVector OptionsFile::getOptionStrings() {
 	StringVector returnVector;
 	FILE* pFile = fopen(settingsPath.c_str(), "r");
@@ -46,7 +91,8 @@ StringVector OptionsFile::getOptionStrings() {
 		}
 		fclose(pFile);
 	} else {
-		LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
+		if (errno != ENOENT)
+			LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
 	}
 	return returnVector;
 }
--- a/src/client/OptionsFile.h
+++ b/src/client/OptionsFile.h
@@ -11,7 +11,9 @@ public:
 	OptionsFile();
    void save(const StringVector& settings);
 	StringVector getOptionStrings();
-	
+	void setOptionsPath(const std::string& path);
+	std::string getOptionsPath() const;
+
 private:
 	std::string settingsPath;
 };
--- 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] == '§') {
+		while (str.length() > i + 1 && str[i] == '\xa7') {
 			int cc = hex.find((char)tolower(str[i + 1]));
 			if (cc < 0 || cc > 15) cc = 15;
 			lists[index++] = listPos + 256 + cc + (darken ? 16 : 0);
@@ -235,7 +235,7 @@ int Font::width( const std::string& str )
 	int len = 0;

 	for (unsigned int i = 0; i < str.length(); i++) {
-		if (str[i] == '§') {
+		if (str[i] == '\xa7') {
 			i++;
 		} else {
 			//int ch = SharedConstants.acceptableLetters.indexOf(str.charAt(i));
@@ -274,7 +274,7 @@ std::string Font::sanitize( const std::string& str )
 	int j = 0;

 	for (unsigned int i = 0; i < str.length(); i++) {
-		if (str[i] == '§') {
+		if (str[i] == '\xa7') {
 			i++;
 			//} else if (SharedConstants.acceptableLetters.indexOf(str.charAt(i)) >= 0) {
 		} else {
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -51,7 +51,8 @@ Gui::Gui(Minecraft* minecraft)
 	_currentDropTicks(-1),
 	_currentDropSlot(-1),
 	MAX_MESSAGE_WIDTH(240),
-	itemNameOverlayTime(2)
+	itemNameOverlayTime(2),
+	_openInventorySlot(minecraft->useTouchscreen())
 {
 	glGenBuffers2(1, &_inventoryRc.vboId);
 	glGenBuffers2(1, &rcFeedbackInner.vboId);
@@ -75,11 +76,8 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	//minecraft->gameRenderer->setupGuiScreen();
 	Font* font = minecraft->font;

-#ifdef PLATFORM_DESKTOP
-	const bool isTouchInterface = false;
-#else
 	const bool isTouchInterface = minecraft->useTouchscreen();
-#endif
+	
 	const int screenWidth = (int)(minecraft->width * InvGuiScale);
 	const int screenHeight = (int)(minecraft->height * InvGuiScale);
 	blitOffset = -90;
@@ -206,16 +204,10 @@ void Gui::handleClick(int button, int x, int y) {
 	if (button != MouseAction::ACTION_LEFT)	return;

 	int slot = getSlotIdAt(x, y);
-	if (slot != -1)
-	{
-#ifndef PLATFORM_DESKTOP
-		if (slot == (getNumSlots()-1))
-		{
+	if (slot != -1) {
+		if (_openInventorySlot && slot == (getNumSlots()-1)) {
 			minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-		}
-		else
-#endif
-		{
+		} else {
 			minecraft->player->inventory->selectSlot(slot);
 			itemNameOverlayTime = 0;
 		}
@@ -349,7 +341,7 @@ void Gui::setNowPlaying(const std::string& string) {
 void Gui::displayClientMessage(const std::string& messageId) {
 	//Language language = Language.getInstance();
 	//std::string languageString = language.getElement(messageId);
-	addMessage(std::string("Client message: ") + messageId);
+	addMessage(messageId);
 }

 void Gui::renderVignette(float br, int w, int h) {
@@ -537,11 +529,7 @@ void Gui::tickItemDrop()
 	static bool isCurrentlyActive = false;
 	isCurrentlyActive = false;

-	int slots = getNumSlots();
-
-#ifndef PLATFORM_DESKTOP
-	slots--;
-#endif
+	int slots = getNumSlots() - _openInventorySlot;

 	if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
 		int slot = getSlotIdAt(Mouse::getX(), Mouse::getY());
@@ -1083,13 +1071,7 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {

 	float x = baseItemX;

-	int slots = getNumSlots();
-
-	// TODO: if using touchscreen
-
-#ifndef PLATFORM_DESKTOP
-	slots--;
-#endif
+	int slots = getNumSlots() - _openInventorySlot;

 	for (int i = 0; i < slots; i++) {
 		renderSlot(i, (int)x, ySlot, a);
@@ -1097,9 +1079,10 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	}
 	_inventoryNeedsUpdate = false;

-#ifndef PLATFORM_DESKTOP
-	blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
-#endif
+
+	if (_openInventorySlot) {
+		blit(screenWidth / 2 + 10 * getNumSlots() - 20 + 4, ySlot + 6, 242, 252, 14, 4, 14, 4);
+	}

 	minecraft->textures->loadAndBindTexture("gui/gui_blocks.png");
 	t.endOverrideAndDraw();
--- a/src/client/gui/Gui.h
+++ b/src/client/gui/Gui.h
@@ -127,6 +127,8 @@ private:
 	static const float DropTicks;
 	float  _currentDropTicks;
 	int    _currentDropSlot;
+
+	bool   _openInventorySlot;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI__Gui_H__*/
--- a/src/client/gui/Screen.cpp
+++ b/src/client/gui/Screen.cpp
@@ -177,9 +177,11 @@ void Screen::keyPressed( int eventKey )
 		textbox->keyPressed(minecraft, eventKey);
 	}

+#ifdef TABBING
 	if (minecraft->useTouchscreen())
 		return;

+
 	// "Tabbing" the buttons (walking with keys)
 	const int tabButtonCount = tabButtons.size();
 	if (!tabButtonCount)
@@ -199,6 +201,7 @@ void Screen::keyPressed( int eventKey )
 	}

 	updateTabButtonSelection();
+#endif
 }

 void Screen::charPressed(char inputChar) {
@@ -209,11 +212,13 @@ void Screen::charPressed(char inputChar) {

 void Screen::updateTabButtonSelection()
 {
+#ifdef TABBING
 	if (minecraft->useTouchscreen())
 		return;

 	for (unsigned int i = 0; i < tabButtons.size(); ++i)
 		tabButtons[i]->selected = (i == tabButtonIndex);
+#endif
 }

 void Screen::mouseClicked( int x, int y, int buttonNum )
--- 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)) : false;
+	return minecraft->useTouchscreen()? (_currentlyDown && isInside(xm, ym)) : isInside(xm, ym);
 }

 bool Button::isInside( int xm, int ym ) {
@@ -143,7 +143,8 @@ TButton::TButton( int id, int x, int y, int w, int h, const std::string& msg )

 void TButton::renderBg( Minecraft* minecraft, int xm, int ym )
 {
-	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
+	// bool hovered = active && (_currentlyDown && isInside(xm, ym));

 	minecraft->textures->loadAndBindTexture("gui/touchgui.png");

--- 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) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));
 	bool IsSecondImage = isSecondImage(hovered);

 	//printf("ButtonId: %d - Hovered? %d (cause: %d, %d, %d, %d, <> %d, %d)\n", id, hovered, x, y, x+w, y+h, xm, ym);
--- 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) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));

 	//printf("ButtonId: %d - Hovered? %d (cause: %d, %d, %d, %d, <> %d, %d)\n", id, hovered, x, y, x+w, y+h, xm, ym);
 	//int yImage = getYImage(hovered || selected);
--- 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(itemLabel, element);
+	OptionsItem* item = new OptionsItem(optId, 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(itemLabel, element);
+	OptionsItem* item = new OptionsItem(optId, 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(itemLabel, element);
+	OptionsItem* item = new OptionsItem(optId, 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(itemLabel, element);
+	OptionsItem* item = new OptionsItem(optId, 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(itemLabel, element);
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
 	addChild(item);
 	setupPositions();
 }
--- a/src/client/gui/components/OptionsItem.cpp
+++ b/src/client/gui/components/OptionsItem.cpp
@@ -1,9 +1,11 @@
 #include "OptionsItem.h"
 #include "../../Minecraft.h"
+#include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
-OptionsItem::OptionsItem( std::string label, GuiElement* element )
+OptionsItem::OptionsItem( OptionId optionId, std::string label, GuiElement* element )
 : GuiElementContainer(false, true, 0, 0, 24, 12),
-  label(label) {
+  m_optionId(optionId),
+  m_label(label) {
 	  addChild(element);
 }

@@ -19,6 +21,22 @@ void OptionsItem::setupPositions() {

 void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 	int yOffset = (height - 8) / 2;
-	minecraft->font->draw(label, (float)x, (float)y + yOffset, 0x909090, false);
+	std::string text = m_label;
+	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;
+	}
+
+	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,12 +15,13 @@ class OptionsItem: public GuiElementContainer
 {
 	typedef GuiElementContainer super;
 public:
-	OptionsItem(std::string label, GuiElement* element);
+	OptionsItem(OptionId optionId, std::string label, GuiElement* element);
 	virtual void render(Minecraft* minecraft, int xm, int ym);
 	void setupPositions();

 private:
-	std::string label;
+	OptionId m_optionId;
+	std::string m_label;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__*/
--- a/src/client/gui/components/Slider.cpp
+++ b/src/client/gui/components/Slider.cpp
@@ -2,6 +2,7 @@
 #include "../../Minecraft.h"
 #include "../../renderer/Textures.h"
 #include "../Screen.h"
+#include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
 #include <algorithm>
 #include <assert.h>
@@ -21,7 +22,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);
 		}
@@ -64,15 +65,20 @@ 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();
+	m_numSteps = m_option->getMax() - m_option->getMin() + 1;
 	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 = Mth::floor(m_percentage * (m_numSteps-1));
+		int curStep = int(m_percentage * (m_numSteps-1) + 0.5f);
+		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
@@ -38,6 +38,7 @@ 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/screens/ConfirmScreen.cpp
+++ b/src/client/gui/screens/ConfirmScreen.cpp
@@ -31,7 +31,7 @@ ConfirmScreen::~ConfirmScreen() {

 void ConfirmScreen::init()
 {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		yesButton = new Touch::TButton(0, 0, 0, yesButtonText),
 		noButton  = new Touch::TButton(1, 0, 0, noButtonText);
 	} else {
--- a/src/client/gui/screens/ConsoleScreen.cpp
+++ b/src/client/gui/screens/ConsoleScreen.cpp
@@ -216,8 +216,5 @@ void ConsoleScreen::render(int /*xm*/, int /*ym*/, float /*a*/)
        displayed += '_';

    // Placeholder hint when empty
-    if (_input.empty() && (_cursorBlink / 10) % 2 != 0)
-        font->drawShadow("Type a message or /command", (float)(boxX0 + 2), (float)(boxY + 2), 0xff606060);
-    else
-        font->drawShadow(displayed, (float)(boxX0 + 2), (float)(boxY + 2), 0xffffffff);
+    font->drawShadow(displayed, (float)(boxX0 + 2), (float)(boxY + 2), 0xffffffff);
 }
--- a/src/client/gui/screens/DeathScreen.cpp
+++ b/src/client/gui/screens/DeathScreen.cpp
@@ -23,7 +23,7 @@ DeathScreen::~DeathScreen()

 void DeathScreen::init()
 {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bRespawn = new Touch::TButton(1, "Respawn!");
 		bTitle = new Touch::TButton(2, "Main menu");
 	} else {
--- a/src/client/gui/screens/DisconnectionScreen.h
+++ b/src/client/gui/screens/DisconnectionScreen.h
@@ -21,7 +21,7 @@ public:
 	}

 	void init() {
-		if (minecraft->useTouchscreen())
+		if (/* minecraft->useTouchscreen() */ true)
 			_back = new Touch::TButton(1, "Ok");
 		else
 			_back = new Button(1, "Ok");
--- 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()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bWakeUp = new Touch::TButton(1, "Leave Bed");
 	} else {
 		bWakeUp = new Button(1, "Leave Bed");
--- a/src/client/gui/screens/OptionsScreen.cpp
+++ b/src/client/gui/screens/OptionsScreen.cpp
@@ -19,7 +19,6 @@ OptionsScreen::OptionsScreen()
 }

 OptionsScreen::~OptionsScreen() {
-
 	if (btnClose != NULL) {
 		delete btnClose;
 		btnClose = NULL;
@@ -53,7 +52,6 @@ OptionsScreen::~OptionsScreen() {
 }

 void OptionsScreen::init() {
-
 	bHeader = new Touch::THeader(0, "Options");

 	btnClose = new ImageButton(1, "");
@@ -89,7 +87,6 @@ void OptionsScreen::init() {
 }

 void OptionsScreen::setupPositions() {
-
 	int buttonHeight = btnClose->height;

 	btnClose->x = width - btnClose->width;
@@ -134,7 +131,6 @@ void OptionsScreen::setupPositions() {


 void OptionsScreen::render(int xm, int ym, float a) {
-
 	renderBackground();

 	int xmm = xm * width / minecraft->width;
@@ -150,10 +146,13 @@ void OptionsScreen::removed() {
 }

 void OptionsScreen::buttonClicked(Button* button) {
-
 	if (button == btnClose) {
 		minecraft->options.save();
-		minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
+		if (minecraft->screen != NULL) {
+			minecraft->setScreen(NULL);
+		} else {
+			minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
+		}
 	}
 	else if (button->id > 1 && button->id < 7) {
 		int categoryButton = button->id - categoryButtons[0]->id;
@@ -165,7 +164,6 @@ void OptionsScreen::buttonClicked(Button* button) {
 }

 void OptionsScreen::selectCategory(int index) {
-
 	int currentIndex = 0;

 	for (std::vector<Touch::TButton*>::iterator it = categoryButtons.begin(); it != categoryButtons.end(); ++it) {
@@ -209,7 +207,8 @@ void OptionsScreen::generateOptionScreens() {

 	// // Controls Pane
 	optionPanes[2]->addOptionItem(OPTIONS_INVERT_Y_MOUSE, minecraft)
-		.addOptionItem(OPTIONS_USE_TOUCHSCREEN, minecraft);
+		.addOptionItem(OPTIONS_USE_TOUCHSCREEN, minecraft)
+		.addOptionItem(OPTIONS_AUTOJUMP, minecraft);

 	for (int i = OPTIONS_KEY_FORWARD; i <= OPTIONS_KEY_USE; i++) {
 		optionPanes[2]->addOptionItem((OptionId)i, minecraft);
@@ -225,11 +224,11 @@ void OptionsScreen::generateOptionScreens() {
 		.addOptionItem(OPTIONS_AMBIENT_OCCLUSION, minecraft);
 	
 	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
-		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft);
+		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
+		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft);
 }

 void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {
-
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->mouseClicked(minecraft, x, y, buttonNum);

@@ -237,7 +236,6 @@ void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {
 }

 void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
-
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->mouseReleased(minecraft, x, y, buttonNum);

--- a/src/client/gui/screens/PauseScreen.cpp
+++ b/src/client/gui/screens/PauseScreen.cpp
@@ -5,12 +5,16 @@
 #include "../../../util/Mth.h"
 #include "../../../network/RakNetInstance.h"
 #include "../../../network/ServerSideNetworkHandler.h"
+#include "client/Options.h"
+#include "client/gui/components/Button.h"
+#include "client/gui/screens/OptionsScreen.h"

 PauseScreen::PauseScreen(bool wasBackPaused)
 :	saveStep(0),
 	visibleTime(0),
 	bContinue(0),
 	bQuit(0),
+	bOptions(0),
 	bQuitAndSaveLocally(0),
 	bServerVisibility(0),
 //	bThirdPerson(0),
@@ -39,18 +43,21 @@ PauseScreen::~PauseScreen() {
 	delete bQuit;
 	delete bQuitAndSaveLocally;
 	delete bServerVisibility;
+	delete bOptions;
 //	delete bThirdPerson;
 }

 void PauseScreen::init() {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		bContinue = new Touch::TButton(1, "Back to game");
+		bOptions = new Touch::TButton(5, "Options");
 		bQuit = new Touch::TButton(2, "Quit to title");
 		bQuitAndSaveLocally = new Touch::TButton(3, "Quit and copy map");
 		bServerVisibility = new Touch::TButton(4, "");
 //		bThirdPerson = new Touch::TButton(5, "Toggle 3:rd person view");
 	} else {
 		bContinue = new Button(1, "Back to game");
+		bOptions = new Button(5, "Options");
 		bQuit = new Button(2, "Quit to title");
 		bQuitAndSaveLocally = new Button(3, "Quit and copy map");
 		bServerVisibility = new Button(4, "");
@@ -59,7 +66,7 @@ void PauseScreen::init() {

 	buttons.push_back(bContinue);
 	buttons.push_back(bQuit);
-
+	buttons.push_back(bOptions);
 	// bSound.updateImage(&minecraft->options);
 	bThirdPerson.updateImage(&minecraft->options);
 	bHideGui.updateImage(&minecraft->options);
@@ -99,21 +106,24 @@ void PauseScreen::setupPositions() {
    saveStep = 0;
 	int yBase = 16;

-	bContinue->width = bQuit->width = /*bThirdPerson->w =*/ 160;
+	bContinue->width = bOptions->width = bQuit->width = /*bThirdPerson->w =*/ 160;
 	bQuitAndSaveLocally->width = bServerVisibility->width = 160;

 	bContinue->x = (width - bContinue->width) / 2;
 	bContinue->y = yBase + 32 * 1;

+	bOptions->x = (width - bOptions->width) / 2;
+	bOptions->y = yBase + 32 * 2;
+
 	bQuit->x = (width - bQuit->width) / 2;
-	bQuit->y = yBase + 32 * 2;
+	bQuit->y = yBase + 32 * 3;

 #if APPLE_DEMO_PROMOTION
    bQuit->y += 16;
 #endif
    
 	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
-	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 3;
+	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 4;

 	// bSound.y = bThirdPerson.y = 8;
 	// bSound.x = 4;
@@ -157,7 +167,9 @@ void PauseScreen::buttonClicked(Button* button) {
 	if (button->id == bQuitAndSaveLocally->id) {
 		minecraft->leaveGame(true);
 	}
-
+	if (button->id == bOptions->id) {
+		minecraft->setScreen(new OptionsScreen());
+	}
 	if (button->id == bServerVisibility->id) {
 		if (minecraft->raknetInstance && minecraft->netCallback && minecraft->raknetInstance->isServer()) {
 			ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) minecraft->netCallback;
--- a/src/client/gui/screens/PauseScreen.h
+++ b/src/client/gui/screens/PauseScreen.h
@@ -33,7 +33,9 @@ private:
 	Button* bQuit;
 	Button* bQuitAndSaveLocally;
 	Button* bServerVisibility;
-//	Button* bThirdPerson;
+	Button* bOptions;
+
+	//	Button* bThirdPerson;

 	// OptionButton bSound;
 	OptionButton bThirdPerson;
--- a/src/client/gui/screens/ProgressScreen.h
+++ b/src/client/gui/screens/ProgressScreen.h
@@ -11,6 +11,8 @@ public:
 	void render(int xm, int ym, float a);
 	bool isInGameScreen();

+	virtual void keyPressed(int eventKey) {}
+
 	void tick();
 private:
 	int ticks;
--- a/src/client/gui/screens/ScreenChooser.cpp
+++ b/src/client/gui/screens/ScreenChooser.cpp
@@ -4,6 +4,7 @@
 #include "JoinGameScreen.h"
 #include "PauseScreen.h"
 #include "RenameMPLevelScreen.h"
+#include "ConsoleScreen.h"
 #include "IngameBlockSelectionScreen.h"
 #include "JoinByIPScreen.h"
 #include "touch/TouchStartMenuScreen.h"
@@ -19,7 +20,8 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 {
 	Screen* screen = NULL;

-	if (_mc->useTouchscreen()) {
+	// :sob:
+	if (/* _mc->useTouchscreen() */ true) {
 		switch (id) {
 		case SCREEN_STARTMENU:	     screen = new Touch::StartMenuScreen();	break;
 		case SCREEN_SELECTWORLD:     screen = new Touch::SelectWorldScreen();break;
@@ -28,6 +30,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 		case SCREEN_PAUSEPREV:	     screen = new PauseScreen(true);	 break;
 		case SCREEN_BLOCKSELECTION:	 screen = new Touch::IngameBlockSelectionScreen();	break;
 		case SCREEN_JOINBYIP:        screen = new JoinByIPScreen(); break;
+		case SCREEN_CONSOLE:		 screen = new ConsoleScreen(); break;
 		case SCREEN_NONE:
 		default:
 			// Do nothing
@@ -42,7 +45,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 		case SCREEN_PAUSEPREV:	     screen = new PauseScreen(true);	 break;
 		case SCREEN_BLOCKSELECTION:	 screen = new IngameBlockSelectionScreen();	break;
 		case SCREEN_JOINBYIP:        screen = new JoinByIPScreen(); break;
-
+		case SCREEN_CONSOLE:		 screen = new ConsoleScreen(); break;
 		case SCREEN_NONE:
 		default:
 			// Do nothing
--- a/src/client/gui/screens/ScreenChooser.h
+++ b/src/client/gui/screens/ScreenChooser.h
@@ -9,7 +9,8 @@ enum ScreenId {
 	SCREEN_PAUSEPREV,
 	SCREEN_SELECTWORLD,
 	SCREEN_BLOCKSELECTION,
-	SCREEN_JOINBYIP
+	SCREEN_JOINBYIP,
+	SCREEN_CONSOLE
 };

 class Screen;
--- 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()) {
+    if (/* minecraft->useTouchscreen() */ true) {
        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/crafting/PaneCraftingScreen.cpp
+++ b/src/client/gui/screens/crafting/PaneCraftingScreen.cpp
@@ -41,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) : false);
+			(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));

 		if (hovered || *selectedPtr == this)
 			statePressed->draw(Tesselator::instance, (float)x, (float)y);
@@ -547,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) : false);
+		(_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));

 	if (hovered || selected)
 		bgSelected->draw(Tesselator::instance, (float)x, (float)y);
--- a/src/client/player/LocalPlayer.cpp
+++ b/src/client/player/LocalPlayer.cpp
@@ -28,6 +28,7 @@

 #if defined(_WIN32)
 #include <direct.h>
+#include <sys/stat.h>
 #else
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -187,6 +188,33 @@ static bool ensureDirectoryExists(const std::string& path) {
    return _mkdir(path.c_str()) == 0 || errno == EEXIST;
 #else
    struct stat st;
+    if (stat(path.c_str(), &st) == 0 && S_ISDIR(st.st_mode))
+        return true;
+
+    std::string subPath;
+    size_t i = 0;
+    while (i < path.length()) {
+        i = path.find_first_of("/\\", i);
+        if (i == std::string::npos) {
+            subPath = path;
+        } else {
+            subPath = path.substr(0, i);
+        }
+
+        if (!subPath.empty()) {
+            if (stat(subPath.c_str(), &st) != 0) {
+                if (mkdir(subPath.c_str(), 0755) != 0 && errno != EEXIST)
+                    return false;
+            } else if (!S_ISDIR(st.st_mode)) {
+                return false;
+            }
+        }
+
+        if (i == std::string::npos)
+            break;
+        i += 1;
+    }
+
    if (stat(path.c_str(), &st) == 0 && S_ISDIR(st.st_mode))
        return true;
    return mkdir(path.c_str(), 0755) == 0 || errno == EEXIST;
@@ -236,7 +264,8 @@ static void* fetchSkinForPlayer(void* param) {
    std::vector<unsigned char> skinData;
    if (!HttpClient::download(skinUrl, skinData) || skinData.empty()) {
        LOGW("[Skin] download failed for %s\n", skinUrl.c_str());
- 	        return NULL;
+        player->setTextureName("mob/char.png");
+        return NULL;
    }

    // Save to cache
--- a/src/client/player/input/KeyboardInput.cpp
+++ b/src/client/player/input/KeyboardInput.cpp
@@ -50,10 +50,8 @@ void KeyboardInput::tick( Player* player )
 		ya *= 0.3f;
 	}

-	#if defined(RPI) || defined(PLATFORM_DESKTOP)
-		wantUp = jumping;
-		wantDown = sneaking;
-	#endif
+	wantUp = jumping;
+	wantDown = sneaking;

 	if (keys[KEY_CRAFT])
 		player->startCrafting((int)player->x, (int)player->y, (int)player->z, Recipe::SIZE_2X2);
--- a/src/client/player/input/touchscreen/TouchInputHolder.h
+++ b/src/client/player/input/touchscreen/TouchInputHolder.h
@@ -426,9 +426,7 @@ public:
 	virtual void onConfigChanged(const Config& c) {
 		_move.onConfigChanged(c);
 		_turnBuild.moveArea = _move.getRectangleArea();
-#ifdef __APPLE__
 		_turnBuild.pauseArea = _move.getPauseRectangleArea();
-#endif
 		_turnBuild.inventoryArea = _mc->gui.getRectangleArea( _mc->options.getBooleanValue(OPTIONS_IS_LEFT_HANDED)? 1 : -1 );
 		_turnBuild.setSensitivity(c.options->getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA)? 1.8f : 1.0f);
 		((ITurnInput*)&_turnBuild)->onConfigChanged(c);
--- a/src/client/player/input/touchscreen/TouchscreenInput.cpp
+++ b/src/client/player/input/touchscreen/TouchscreenInput.cpp
@@ -9,7 +9,10 @@
 #include "../../../../platform/log.h"
 #include "../../../renderer/Textures.h"
 #include "../../../sound/SoundEngine.h"
+#include "client/gui/screens/ScreenChooser.h"

+
+// ARGHHHHHH WHY NOT FUCKING ENUM
 static const int AREA_DPAD_FIRST = 100;
 static const int AREA_DPAD_N = 100;
 static const int AREA_DPAD_S = 101;
@@ -17,6 +20,7 @@ static const int AREA_DPAD_W = 102;
 static const int AREA_DPAD_E = 103;
 static const int AREA_DPAD_C = 104;
 static const int AREA_PAUSE = 105;
+static const int AREA_CHAT = 106;

 static int cPressed = 0;
 static int cReleased = 0;
@@ -158,14 +162,11 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
 	xx = BaseX + 2 * Bw; yy = BaseY + Bh;
 	_model.addArea(AREA_DPAD_E, aRight = new RectangleArea(xx, yy, xx+Bw, yy+Bh));

-#ifdef __APPLE__
    float maxPixels = _minecraft->pixelCalc.millimetersToPixels(10);
-    float btnSize = Mth::Min(18 * Gui::GuiScale, maxPixels);
-	_model.addArea(AREA_PAUSE, aPause = new RectangleArea(w - 4 - btnSize,
-                                                          4,
-                                                          w - 4,
-                                                          4 + btnSize));
-#endif /* __APPLE__ */
+    // float btnSize = Mth::Min(18 * Gui::GuiScale, maxPixels);
+	float btnSize = pc.millimetersToPixels(18 * Gui::GuiScale);
+	_model.addArea(AREA_PAUSE, aPause = new RectangleArea(w - 4 - btnSize, 4, w - 4, 4 + btnSize));
+	_model.addArea(AREA_CHAT,  aChat  = new RectangleArea(w - 8 - btnSize * 2, 4, w - 8 - btnSize, 4 + btnSize));

 	//rebuild();
 }
@@ -309,14 +310,20 @@ void TouchscreenInput_TestFps::tick( Player* player )
 			setButton = true;
 			xa -= 1;
 		}
-#ifdef __APPLE__
 		else if (areaId == AREA_PAUSE) {
 			if (Multitouch::isReleased(p)) {
                _minecraft->soundEngine->playUI("random.click", 1, 1);
 				_minecraft->screenChooser.setScreen(SCREEN_PAUSE);
            }
 		}
-#endif /*__APPLE__*/
+		else if (areaId == AREA_CHAT) {
+			if (Multitouch::isReleased(p)) {
+                _minecraft->soundEngine->playUI("random.click", 1, 1);
+				_minecraft->screenChooser.setScreen(SCREEN_CONSOLE);
+				_minecraft->platform()->showKeyboard();
+            }
+		}
+
 		_buttons[areaId - AREA_DPAD_FIRST] = setButton;
 	}

@@ -499,15 +506,14 @@ void TouchscreenInput_TestFps::rebuild() {
 		drawRectangleArea(t, aJump, imageU + imageSize * 4, imageV, (float)imageSize);
 	}
 	
-
-#ifdef __APPLE__
 	if (!_minecraft->screen) {
-		if (isButtonDown(AREA_PAUSE))  t.colorABGR(cPressedPause);
-		else						   t.colorABGR(cReleasedPause);
+		t.colorABGR(0xFFFFFFFF);
+		// if (isButtonDown(AREA_PAUSE))  t.colorABGR(cPressedPause);
+		// else						   t.colorABGR(cReleasedPause);
 		
        drawRectangleArea(t, aPause, 200, 64, 18.0f);
+		drawRectangleArea(t, aChat,  200, 82, 18.0f);
 	}
-#endif /*__APPLE__*/
 //t.end(true, _bufferId);
 	//return;

--- a/src/client/player/input/touchscreen/TouchscreenInput.h
+++ b/src/client/player/input/touchscreen/TouchscreenInput.h
@@ -61,6 +61,7 @@ private:
 	RectangleArea* aUp;
 	RectangleArea* aDown;
 	RectangleArea* aPause;
+	RectangleArea* aChat;
 	//RectangleArea* aUpJump;
 	RectangleArea* aJump;
 	RectangleArea* aUpLeft;
--- a/src/client/renderer/GameRenderer.cpp
+++ b/src/client/renderer/GameRenderer.cpp
@@ -1,4 +1,5 @@
 #include "GameRenderer.h"
+#include "client/Options.h"
 #include "gles.h"

 #include "../../util/PerfTimer.h"
@@ -152,7 +153,7 @@ void GameRenderer::render(float a) {

 	int xMouse = (int)(Mouse::getX() * Gui::InvGuiScale);
 	int yMouse = (int)(Mouse::getY() * Gui::InvGuiScale);
-#ifndef PLATFORM_DESKTOP
+
    if (mc->useTouchscreen()) {
 		const int pid = Multitouch::getFirstActivePointerIdExThisUpdate();
 		if (pid >= 0) {
@@ -163,7 +164,6 @@ void GameRenderer::render(float a) {
 			yMouse = -9999;
 		}
 	}
-#endif
 	TIMER_POP();

 	bool hasClearedColorBuffer = false;
@@ -214,12 +214,14 @@ void GameRenderer::render(float a) {
 			glDisable2(GL_SCISSOR_TEST);

 		mc->screen->render(xMouse, yMouse, a);
-#ifdef RPI
+
+    mc->platform()->hideCursor(!mc->options.getBooleanValue(OPTIONS_RPI_CURSOR));
+    if (mc->options.getBooleanValue(OPTIONS_RPI_CURSOR))        
 		renderCursor(xMouse, yMouse, mc);
-#endif
-		// Screen might have been removed, so check it again
-		if (mc->screen && !mc->screen->isInGameScreen())
-			sleepMs(15);
+        
+	// Screen might have been removed, so check it again
+    if (mc->screen && !mc->screen->isInGameScreen())
+        sleepMs(15);
    }
 }

@@ -358,9 +360,9 @@ void GameRenderer::renderLevel(float a) {
 			if (mc->hitResult.isHit() && !cameraEntity->isUnderLiquid(Material::water)) {
 				TIMER_POP_PUSH("select");
 				Player* player = (Player*) cameraEntity;
-				if (mc->useTouchscreen()) {
+				// if (mc->useTouchscreen()) {
 					levelRenderer->renderHitSelect(player, mc->hitResult, 0, NULL, a); //player.inventory->getSelected(), a);
-				}
+				// }
 				levelRenderer->renderHit(player, mc->hitResult, 0, NULL, a);//player->inventory.getSelected(), a);
 			}
 		}
@@ -654,11 +656,9 @@ void GameRenderer::pick(float a) {

    float range = mc->gameMode->getPickRange();
    bool isPicking = true;
-#ifndef PLATFORM_DESKTOP
-    bool freeform = mc->useTouchscreen()  && !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
-#else 
-    bool freeform = false;
-#endif
+
+    bool freeform = mc->useTouchscreen(); //&& !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
+    
    if (freeform) {
        isPicking = updateFreeformPickDirection(a, pickDirection);
    } else {
--- a/src/client/renderer/entity/HumanoidMobRenderer.h
+++ b/src/client/renderer/entity/HumanoidMobRenderer.h
@@ -19,12 +19,13 @@ public:
 protected:
    void additionalRendering(Mob* mob, float a);

-private:
 	HumanoidModel* humanoidModel;

 	// Last rotation values for cape smoothing (reduces jitter)
 	float lastCapeXRot;
 	float lastCapeZRot;
+private:
+	// i guess ill keep this just in case seomthing breaks
 };

 #endif /*NET_MINECRAFT_CLIENT_RENDERER_ENTITY__HumanoidMobRenderer_H__*/
--- a/src/client/renderer/entity/MobRenderer.h
+++ b/src/client/renderer/entity/MobRenderer.h
@@ -43,8 +43,8 @@ public:
 protected:
 	void setArmor(Model* armor);
 	Model* getArmor();
+	Model* model; // allows derived renderers to swap models dynamically for skin formats
 private:
-	Model* model;
 	Model* armor;
 };

--- a/src/client/renderer/entity/PlayerRenderer.cpp
+++ b/src/client/renderer/entity/PlayerRenderer.cpp
@@ -1,5 +1,6 @@
 #include "PlayerRenderer.h"
 #include "EntityRenderDispatcher.h"
+#include "../Textures.h"
 #include "../../../world/entity/player/Player.h"
 #include "../../../world/level/Level.h"
 #include "../../../world/item/ArmorItem.h"
@@ -14,12 +15,22 @@ static const std::string armorFilenames[10] = {

 PlayerRenderer::PlayerRenderer( HumanoidModel* humanoidModel, float shadow )
 :	super(humanoidModel, shadow),
-	armorParts1(new HumanoidModel(1.0f, 0, 64, 64)),
-	armorParts2(new HumanoidModel(0.5f, 0, 64, 64))
+	playerModel64(humanoidModel),
+	playerModel32(new HumanoidModel(0, 0, 64, 32)),
+	armorParts1(new HumanoidModel(1.0f, 0, 64, 32)),
+	armorParts2(new HumanoidModel(0.5f, 0, 64, 32))
 {
+	// default to legacy skin path until we know the exact texture size
+	model = playerModel32;
+	humanoidModel = playerModel32;
 }

 PlayerRenderer::~PlayerRenderer() {
+	// prevent MobRenderer destructor from deleting model pointers we manage manually
+	model = nullptr;
+
+	delete playerModel32;
+	delete playerModel64;
 	delete armorParts1;
 	delete armorParts2;
 }
@@ -43,6 +54,15 @@ void PlayerRenderer::setupRotations( Entity* mob, float bob, float bodyRot, floa
 	super::setupRotations(mob, bob, bodyRot, a);
 }

+bool PlayerRenderer::isModernPlayerSkin(Mob* mob) {
+	const std::string texName = mob->getTexture();
+	TextureId texId = entityRenderDispatcher->textures->loadTexture(texName);
+	if (!Textures::isTextureIdValid(texId))
+		return false;
+	const TextureData* texData = entityRenderDispatcher->textures->getTemporaryTextureData(texId);
+	return texData && texData->w == 64 && texData->h == 64;
+}
+
 void PlayerRenderer::renderName( Mob* mob, float x, float y, float z ){
 	//@todo: figure out how to handle HideGUI
 	if (mob != entityRenderDispatcher->cameraEntity && mob->level->adventureSettings.showNameTags) {
@@ -50,6 +70,20 @@ void PlayerRenderer::renderName( Mob* mob, float x, float y, float z ){
 	}
 }

+void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot, float a) {
+	Mob* mob = (Mob*) mob_;
+	HumanoidModel* desired = isModernPlayerSkin(mob) ? playerModel64 : playerModel32;
+	if (model != desired || humanoidModel != desired) {
+		model = desired;
+		humanoidModel = desired;
+	}
+	LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", 
+		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
+		humanoidModel->texWidth, humanoidModel->texHeight,
+		(desired == playerModel64 ? "64" : "32"));
+	HumanoidMobRenderer::render(mob_, x, y, z, rot, a);
+}
+
 int PlayerRenderer::prepareArmor(Mob* mob, int layer, float a) {
 	Player* player = (Player*) mob;

@@ -80,8 +114,11 @@ int PlayerRenderer::prepareArmor(Mob* mob, int layer, float a) {
 }

 void PlayerRenderer::onGraphicsReset() {
-	super::onGraphicsReset();
+	if (playerModel32) playerModel32->onGraphicsReset();
+	if (playerModel64) playerModel64->onGraphicsReset();

 	if (armorParts1) armorParts1->onGraphicsReset();
 	if (armorParts2) armorParts2->onGraphicsReset();
+
+	super::onGraphicsReset();
 }
--- a/src/client/renderer/entity/PlayerRenderer.h
+++ b/src/client/renderer/entity/PlayerRenderer.h
@@ -11,6 +11,8 @@ public:
 	~PlayerRenderer();

 	virtual int prepareArmor(Mob* mob, int layer, float a);
+	bool isModernPlayerSkin(Mob* mob);
+	virtual void render(Entity* mob, float x, float y, float z, float rot, float a);

 	virtual void setupPosition(Entity* mob, float x, float y, float z);
 	virtual void setupRotations(Entity* mob, float bob, float bodyRot, float a);
@@ -18,6 +20,8 @@ public:
 	virtual void renderName(Mob* mob, float x, float y, float z);
 	virtual void onGraphicsReset();
 private:
+	HumanoidModel* playerModel32;
+	HumanoidModel* playerModel64;
 	HumanoidModel* armorParts1;
 	HumanoidModel* armorParts2;
 };
--- a/src/client/renderer/gles.h
+++ b/src/client/renderer/gles.h
@@ -31,7 +31,7 @@
 // #else
 //     // Uglyness to fix redeclaration issues
 //     #ifdef WIN32
-// 	   #include <WinSock2.h>
+// 	   #include <winsock2.h>
 // 	   #include <Windows.h>
 // 	#endif
 // 	#include <gl/glew.h>
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -27,7 +27,7 @@
 // #endif


-#ifdef PLATFORM_DESKTOP
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
    #include "main_glfw.h"
 #endif

--- a/src/main_android.cpp
+++ b/src/main_android.cpp
@@ -25,12 +25,33 @@ static void setupExternalPath(struct android_app* state, MAIN_CLASS* app)
    {
        LOGI("Environment exists");
    }
-    jclass clazz = env->FindClass("android/os/Environment");
-    jmethodID method = env->GetStaticMethodID(clazz, "getExternalStorageDirectory", "()Ljava/io/File;");
-    if (env->ExceptionOccurred()) {
-        env->ExceptionDescribe();
+    // try appspecific external directory first
+    jobject activity = state->activity->clazz;
+    jclass activityClass = env->GetObjectClass(activity);
+    jmethodID getExternalFilesDir = env->GetMethodID(activityClass, "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
+
+    jobject file = NULL;
+    if (getExternalFilesDir != NULL) {
+        file = env->CallObjectMethod(activity, getExternalFilesDir, NULL);
+    }
+
+    if (file == NULL) {
+        // Fallback to the legacy shared storage directory
+        jclass clazz = env->FindClass("android/os/Environment");
+        jmethodID method = env->GetStaticMethodID(clazz, "getExternalStorageDirectory", "()Ljava/io/File;");
+        if (env->ExceptionOccurred()) {
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+        }
+        file = env->CallStaticObjectMethod(clazz, method);
+    }
+
+    if (!file) {
+        LOGI("Failed to get external storage file object, using current working dir");
+        app->externalStoragePath = ".";
+        app->externalCacheStoragePath = ".";
+        return;
    }
-    jobject file = env->CallStaticObjectMethod(clazz, method);

    jclass fileClass = env->GetObjectClass(file);
    jmethodID fileMethod = env->GetMethodID(fileClass, "getAbsolutePath", "()Ljava/lang/String;");
@@ -38,7 +59,7 @@ static void setupExternalPath(struct android_app* state, MAIN_CLASS* app)

    const char* str = env->GetStringUTFChars((jstring) pathString, NULL);
    app->externalStoragePath = str;
-	app->externalCacheStoragePath = str;
+    app->externalCacheStoragePath = str;
    LOGI("%s", str);

    // ensure the process working directory is set to a writable location
--- a/src/main_android_java.cpp
+++ b/src/main_android_java.cpp
@@ -30,12 +30,33 @@ static void setupExternalPath(JNIEnv* env, MAIN_CLASS* app)
    {
        LOGI("Environment exists");
    }
-    jclass clazz = env->FindClass("android/os/Environment");
-    jmethodID method = env->GetStaticMethodID(clazz, "getExternalStorageDirectory", "()Ljava/io/File;");
-    if (env->ExceptionOccurred()) {
-        env->ExceptionDescribe();
+    // try appspecific external directory first
+    jobject activity = g_pActivity;
+    jclass activityClass = env->GetObjectClass(activity);
+    jmethodID getExternalFilesDir = env->GetMethodID(activityClass, "getExternalFilesDir", "(Ljava/lang/String;)Ljava/io/File;");
+
+    jobject file = NULL;
+    if (getExternalFilesDir != NULL) {
+        file = env->CallObjectMethod(activity, getExternalFilesDir, NULL);
+    }
+
+    if (file == NULL) {
+        // Fallback to the legacy shared storage directory
+        jclass clazz = env->FindClass("android/os/Environment");
+        jmethodID method = env->GetStaticMethodID(clazz, "getExternalStorageDirectory", "()Ljava/io/File;");
+        if (env->ExceptionOccurred()) {
+            env->ExceptionDescribe();
+            env->ExceptionClear();
+        }
+        file = env->CallStaticObjectMethod(clazz, method);
+    }
+
+    if (!file) {
+        LOGI("Failed to get external storage file object, using current working dir");
+        app->externalStoragePath = ".";
+        app->externalCacheStoragePath = ".";
+        return;
    }
-    jobject file = env->CallStaticObjectMethod(clazz, method);

    jclass fileClass = env->GetObjectClass(file);
    jmethodID fileMethod = env->GetMethodID(fileClass, "getAbsolutePath", "()Ljava/lang/String;");
@@ -43,7 +64,7 @@ static void setupExternalPath(JNIEnv* env, MAIN_CLASS* app)

    const char* str = env->GetStringUTFChars((jstring) pathString, NULL);
    app->externalStoragePath = str;
-	app->externalCacheStoragePath = str;
+    app->externalCacheStoragePath = str;
    LOGI("%s", str);

    // same fix as the native entry point: make sure cwd is writable
--- a/src/main_glfw.h
+++ b/src/main_glfw.h
@@ -139,12 +139,14 @@ int main(void) {
 #ifndef STANDALONE_SERVER
 	// Platform init.
 	appContext.platform = new AppPlatform_glfw();
-#if defined(DEBUG) && defined(__EMSCRIPTEN__)
-	EM_ASM({
-		console.log(FS.readdir("/"));
-		console.log(FS.readdir("/data"));
-		console.log(FS.readdir("/data/images"));
-	});
+#if defined(__EMSCRIPTEN__)
+	EM_ASM(
+		FS.mkdir('/games');
+		FS.mkdir('/games/com.mojang');
+        FS.mkdir('/games/com.mojang/minecraftWorlds');
+        FS.mount(IDBFS, {}, '/games');
+        FS.syncfs(true, function (err) {});
+    );
 #endif

 	glfwSetErrorCallback(error_callback);
@@ -166,7 +168,7 @@ int main(void) {

 	AppPlatform_glfw* platform = (AppPlatform_glfw*)appContext.platform;

-	platform->window = glfwCreateWindow(appContext.platform->getScreenWidth(), appContext.platform->getScreenHeight(), "main", NULL, NULL);
+	platform->window = glfwCreateWindow(appContext.platform->getScreenWidth(), appContext.platform->getScreenHeight(), "Minecraft PE 0.6.1", NULL, NULL);
 	
 	if (platform->window == NULL) {
 		return 1;
@@ -205,16 +207,16 @@ int main(void) {

 	delete app;

-	appContext.platform->finish();
-	
-	delete appContext.platform;
-	
 #ifndef STANDALONE_SERVER
 	// Exit.
 	glfwDestroyWindow(platform->window);
 	glfwTerminate();
 #endif

+	appContext.platform->finish();
+	
+	delete appContext.platform;
+
 	return 0;
 }

--- a/src/main_win32.h
+++ b/src/main_win32.h
@@ -14,7 +14,7 @@
 #include <windows.h>
 #include <windowsx.h>

-#include <WinSock2.h>
+#include <winsock2.h>
 #include <process.h>
 #include "SharedConstants.h"

--- a/src/network/command/CommandServer.h
+++ b/src/network/command/CommandServer.h
@@ -5,7 +5,7 @@
 #include <vector>

 #ifdef WIN32
-	#include <WinSock2.h>
+	#include <winsock2.h>
 #else
 	#include <sys/socket.h>
 	#include <netinet/in.h>
--- a/src/raknet/GetTime.cpp
+++ b/src/raknet/GetTime.cpp
@@ -140,7 +140,9 @@ RakNet::TimeUS GetTimeUS_Windows( void )
 #if _MSC_VER >= 1400 && defined (_M_X64)
 		GetProcessAffinityMask(mProc, (PDWORD_PTR)&mProcMask, (PDWORD_PTR)&mSysMask);
 #else
+#ifndef __MINGW32__
 		GetProcessAffinityMask(mProc, &mProcMask, &mSysMask);
+#endif
 #endif
 		mThread = GetCurrentThread();

--- a/src/raknet/WindowsIncludes.h
+++ b/src/raknet/WindowsIncludes.h
@@ -1,8 +1,8 @@
 #if defined(X360__) 
 #elif defined (_WIN32)
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>

 // Must always include Winsock2.h before windows.h
 // or else:
Author	SHA1	Message	Date
Kolyah35	82f827af29	Merge remote-tracking branch 'refs/remotes/origin/main'	2026-03-22 02:12:46 +03:00
Kolyah35	4f8b18b735	FIX: Now we're using useTouchsceen() right way!!!!	2026-03-22 02:12:04 +03:00
InviseDivine	2acb57d051	revert all sht	2026-03-21 19:19:07 +02:00
InviseDivine	5251085752	i broke all	2026-03-21 19:09:11 +02:00
InviseDivine	a16f76f2b6	idk???	2026-03-21 19:05:00 +02:00
InviseDivine	b088f39e52	emm	2026-03-21 18:54:51 +02:00
InviseDivine	13c624e07e	hmmmmmmmmmm	2026-03-21 18:54:04 +02:00
InviseDivine	2bfa8f11f1	hmm	2026-03-21 18:39:08 +02:00
InviseDivine	98a05e5aa3	FIX: Keyboard on android	2026-03-21 18:25:42 +02:00
InviseDivine	3f6d9cdcb8	FIX: Armor display	2026-03-21 18:10:46 +02:00
InviseDivine	39186069cf	Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1	2026-03-21 16:22:50 +02:00
InviseDivine	b94c16b22a	FIX: Bow release	2026-03-21 16:22:50 +02:00
Kolyah35	91ce365a26	Merge remote-tracking branch 'refs/remotes/origin/main'	2026-03-21 17:20:18 +03:00
Kolyah35	f114536463	FIX: improve web port	2026-03-21 17:19:46 +03:00
InviseDivine	6e0615c0bc	FEAT: Auto jump in settings (again)	2026-03-21 16:03:51 +02:00
InviseDivine	fd3ee23e4e	Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1	2026-03-21 15:44:06 +02:00
InviseDivine	e9766ed2a1	FEAT: Option button in PauseScreen	2026-03-21 15:44:05 +02:00
Kolyah35	298451c290	USE_LIBPNG when compile web	2026-03-21 15:28:50 +03:00
Kolyah35	668fc9d16f	oh i forgot data	2026-03-21 15:25:18 +03:00
Kolyah35	5717aeab24	ADD: Web action	2026-03-21 15:23:37 +03:00
Kolyah35	9af1496b9d	FIX: windows CI build	2026-03-21 15:04:50 +03:00
InviseDivine	6bfae5a14e	Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1	2026-03-21 13:43:29 +02:00
InviseDivine	4034cf243d	FIX: glfw crash when closing the game	2026-03-21 13:43:28 +02:00
Kolyah35	b6e7414f04	Merge pull request 'fix msvc build & mingw build' (#10 ) from evildebugger/minecraft-pe-0.6.1:main into main Reviewed-on: https://192.168.0.2:3000/Kolyah35/minecraft-pe-0.6.1/pulls/10	2026-03-21 12:48:51 +02:00
66hh	83f3284827	fix msvc build & mingw build 1. Include unified header files using lowercase filenames 2. Change special characters to escape sequences to solve encoding issues	2026-03-21 18:32:09 +08:00
Kolyah35	3dab395af3	fix workflow and im done	2026-03-21 02:45:06 +03:00
Kolyah35	011c8f7123	fix mingw build	2026-03-21 02:35:04 +03:00
Kolyah35	f69c009da9	replace pwd with workspace	2026-03-21 01:38:17 +03:00
Kolyah35	b66b4a2dc2	wtf im dumb	2026-03-21 01:35:40 +03:00
Kolyah35	7037b2b5f2	create build dir	2026-03-21 01:33:57 +03:00
Kolyah35	d54e39b332	-_-	2026-03-21 01:32:47 +03:00
Kolyah35	f96ba8bb33	ubuntu 22.04	2026-03-21 01:31:42 +03:00
Kolyah35	f0e1980f59	i dont like xwin anymore	2026-03-21 01:31:35 +03:00
mschiller890	52f607b126	Made some changes to the GUI scale slider. Should be waaaaaaay better now	2026-03-20 23:20:37 +01:00
Kolyah35	84a956531c	and here	2026-03-21 00:56:21 +03:00
Kolyah35	c4f5f22f24	disable module scan	2026-03-21 00:51:35 +03:00
Kolyah35	7867aea042	bruh	2026-03-21 00:43:57 +03:00
Kolyah35	a90e1463ee	maybe try geode msvc sdk	2026-03-21 00:41:19 +03:00
Kolyah35	59e820e27f	setup ninja	2026-03-21 00:33:59 +03:00
Kolyah35	1199f53632	-_-	2026-03-21 00:28:07 +03:00
Kolyah35	dc0e2c192b	oh i forgot headers	2026-03-21 00:23:56 +03:00
Kolyah35	6ef9efa434	maybe ninja?	2026-03-21 00:17:53 +03:00
Kolyah35	72e6537dc5	Merge remote-tracking branch 'refs/remotes/origin/main'	2026-03-21 00:15:24 +03:00
Kolyah35	0e2e7694d3	oops	2026-03-21 00:12:51 +03:00
InviseDivine	45f04ca07b	readme fix	2026-03-20 23:08:24 +02:00
InviseDivine	42e7a3da90	Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1	2026-03-20 23:00:36 +02:00
InviseDivine	0edee15930	FEAT:Raspberry PI cursor in tweaks	2026-03-20 22:59:52 +02:00
mschiller890	753fdbe701	FIXED: support 64x32 + 64x64 skins with fallback for failed skin URL	2026-03-20 21:47:53 +01:00
mschiller890	ac60559a22	FIXED: Saving works on Android now! I honestly changed too much stuff trying to pinpoint a fix. I might be stupid. I have no idea what I did that fixed this.	2026-03-20 21:11:17 +01:00
Kolyah35	be6fa57a10	trying to speed up windows build	2026-03-20 23:07:27 +03:00
Kolyah35	68f5bc3a0a	why zip only files inside data???	2026-03-20 22:56:00 +03:00
Kolyah35	0a24a51663	uuuh	2026-03-20 22:43:49 +03:00
Kolyah35	96b17e9c8a	tring to pack data with desktop releases	2026-03-20 22:26:26 +03:00
Kolyah35	c08c4d270d	specify targets for linux	2026-03-20 22:17:20 +03:00
Kolyah35	8cd74922bf	maybe remove that subdir from path?	2026-03-20 22:10:50 +03:00
Kolyah35	b2707cc35d	yeah fix shit	2026-03-20 22:03:41 +03:00
Kolyah35	1ff91505d8	FIX: ndk and tools caching	2026-03-20 21:57:57 +03:00
Kolyah35	b909f3c576	EnumOption	2026-03-20 21:53:10 +03:00
Kolyah35	8d1c4f1c4e	aaah who did revert my cmake changes	2026-03-20 21:50:45 +03:00
Kolyah35	bc5cbe6b73	Merge remote-tracking branch 'refs/remotes/origin/main'	2026-03-20 21:47:46 +03:00
Kolyah35	cda2534c1e	ADD: pause and chat btn	2026-03-20 21:46:43 +03:00
mschiller890	c54bdfdcff	Target SDK lowered for compatibility Setting it to 36 broke some permission things Still seems like the game can't write anywhere even with r/w permissions...	2026-03-20 19:07:25 +01:00
InviseDivine	d5b2c59ebf	FIX: Cmake	2026-03-20 19:14:18 +02:00