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

Reviewed-on: https://192.168.0.2:3000/Kolyah35/minecraft-pe-0.6.1/pulls/10

.github/actions/setup-cache/action.yml

@@ -0,0 +1,27 @@
+name: Setup cache
+description: Sets up sccache, CPM cache, etc.
+
+inputs:
+  host:
+    description: 'Host platform: win or linux'
+    required: true
+  target:
+    description: 'Target platform: win, linux'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Setup sccache
+    uses: hendrikmuhs/ccache-action@v1.2.13
+    with:
+      variant: sccache
+      key: ${{ inputs.target }}-v1
+
+  - name: Setup CPM Cache
+    uses: actions/cache@v4
+    with:
+      path: cpm-cache
+      key: cpm-${{ inputs.target }}-v1-${{ hashFiles('**/CMakeLists.txt', '**/*.cmake') }}
+      restore-keys: |
+        cpm-${{ inputs.target }}-v1-

.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

.github/workflows/build.yml

@@ -0,0 +1,343 @@
+name: Build Game
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+    - '**'              # every branch
+    - '!no-build-**'    # unless marked as no-build
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Release
+  CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
+
+permissions:
+  contents: write
+
+jobs:
+  build-windows:
+    name: Build Windows
+    runs-on: ubuntu-22.04
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup caches
+        uses: ./.github/actions/setup-cache
+        with:
+          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
+        working-directory: ${{github.workspace}}/build
+        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
+        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/MinecraftPE.exe
+            ${{github.workspace}}/build/libpng16.dll
+            ${{github.workspace}}/build/OpenAL32.dll
+            ${{github.workspace}}/build/libz.dll
+
+  build-linux:
+    name: Build Linux
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup caches
+        uses: ./.github/actions/setup-cache
+        with:
+          host: linux
+          target: linux
+
+      - 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: Setup Environment
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install gcc-multilib
+          sudo apt-get install -y --no-install-recommends build-essential libgl-dev libwayland-dev xorg-dev libxkbcommon-dev
+      
+      - 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
+
+      - name: Build
+        working-directory: ${{github.workspace}}/build
+        shell: bash
+        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
+        with:
+          name: mcpe-linux
+          path: |
+            ${{github.workspace}}/build/MinecraftPE
+            ${{github.workspace}}/build/MinecraftPE-server
+
+  build-android: # pray to god
+    name: Build Android (${{ matrix.abi }})
+    runs-on: ubuntu-latest
+
+    strategy:
+      # keep going with the other ABI if one fails so you at least get something useful
+      fail-fast: false
+      matrix:
+        abi: [ arm64-v8a, armeabi-v7a ]
+
+    env:
+      ANDROID_SDK_ROOT: ${{ github.workspace }}/android-sdk
+      ANDROID_NDK_PATH: ${{ github.workspace }}/android-ndk-r14b
+      ANDROID_PLATFORM_API: 36
+      ANDROID_BUILD_TOOLS_VERSION: 36.0.0
+      ADB: /bin/true
+      # build.sh reads MATRIX_ABI to decide which ABI to build when no --abi flag is passed
+      MATRIX_ABI: ${{ matrix.abi }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Cache Android command-line tools
+        id: cache-android-tools
+        uses: actions/cache@v3
+        with:
+          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"
+            curl -o cmdline-tools.zip -L "https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip"
+            unzip -q cmdline-tools.zip -d "$ANDROID_SDK_ROOT/cmdline-tools"
+            mv "$ANDROID_SDK_ROOT/cmdline-tools/cmdline-tools" "$ANDROID_SDK_ROOT/cmdline-tools/latest"
+          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 "$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
+
+      - name: Install system prerequisites
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y --no-install-recommends wget unzip curl git python3 libncurses6 libtinfo6
+          if ! ldconfig -p | grep -q "libncurses.so.5"; then
+            sudo ln -sf /lib/x86_64-linux-gnu/libncurses.so.6 /usr/lib/x86_64-linux-gnu/libncurses.so.5 || true
+          fi
+          if ! ldconfig -p | grep -q "libtinfo.so.5"; then
+            sudo ln -sf /lib/x86_64-linux-gnu/libtinfo.so.6 /usr/lib/x86_64-linux-gnu/libtinfo.so.5 || true
+          fi
+
+      - name: Setup Java 25
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 25
+
+      - name: Validate environment
+        run: |
+          echo "ANDROID_SDK_ROOT=$ANDROID_SDK_ROOT"
+          echo "ANDROID_NDK_PATH=$ANDROID_NDK_PATH"
+          echo "JAVA_HOME=$JAVA_HOME"
+          echo "MATRIX_ABI=$MATRIX_ABI"
+          $ANDROID_SDK_ROOT/platform-tools/adb version || true
+          java -version
+          javac -version
+
+      - name: Run Android build script
+        run: |
+          chmod +x ./build.sh
+          ./build.sh
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          # artifact name is ABI-specific so both matrix legs can upload without clobbering each other
+          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, build-web ]
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Declare Version Variables
+        id: ref
+        run: |
+          echo "version=$(cat VERSION | xargs)" >> $GITHUB_OUTPUT
+          echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Zip Windows Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-windows/MinecraftPE.exe mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/libz.dll
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
+
+      - name: Zip Linux Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-linux/MinecraftPE
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
+
+      - name: Zip Linux Server Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-linux/MinecraftPE-server
+          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.zip
+
+      - name: Zip Android arm64-v8a Artifact
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: minecraftpe-apk-arm64-v8a/minecraftpe-v8a-debug.apk
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-android-arm64-v8a.zip
+
+      - name: Zip Android armeabi-v7a Artifact
+        uses: vimtor/action-zip@v1.2
+        with:
+          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:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: dev
+          name: 'Development Release'
+          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 }}-web.zip

.gitignore

@@ -3,13 +3,12 @@ build/
 out/
 bin/
 lib/
+build-apk/
 cmake-build-*/
 CMakeFiles/
 CMakeCache.txt
 cmake_install.cmake
 Makefile
-*.cmake
-!cmake/CPM.cmake
 
 # Compiled object files
 *.o
@@ -50,6 +49,7 @@ MinSizeRel/
 *.xcworkspace
 xcuserdata/
 *.xccheckout
+*.xcuserstate
 *.moved-aside
 DerivedData/
 *.hmap

CMakeLists.txt

@@ -6,24 +6,96 @@ include(cmake/CPM.cmake)
 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")
+
+include(cmake/EnumOption.cmake)
+
+if(EMSCRIPTEN)
+    # When configuring web builds with "emcmake cmake -B build -S .", set PLATFORM to Web by default
+    set(PLATFORM Web CACHE STRING "Platform to build for.")
 endif()
 
-find_package(Threads REQUIRED)
+enum_option(PLATFORM "Desktop;Web" "Platform to build for.")
 
-CPMAddPackage("gh:madler/zlib@1.3.2")
-CPMAddPackage(
-    NAME "libpng"
-    GIT_REPOSITORY "https://github.com/pnggroup/libpng.git"
-    GIT_TAG "v1.6.55"
-    OPTIONS
-        "ZLIB_ROOT ${zlib_SOURCE_DIR}"
-        "ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
-        "PNG_TOOLS OFF"
-        "PNG_TESTS OFF"
-        "BUILD_SHARED_LIBS ON"
-)
+find_package(Threads REQUIRED)
+find_package(OpenSSL)
+
+if (${PLATFORM} STREQUAL "Desktop")
+    set(PLATFORM_CPP "PLATFORM_DESKTOP")
+
+    if (MINGW)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++ -static-libgcc")
+    endif()
+
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
+    endif()
+
+    if (WIN32)
+        add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+        include_directories(misc/windows)
+        set(EXTRA_LIBS ws2_32 winhttp)
+    elseif(UNIX)
+        find_library(pthread NAMES pthread)
+        set(EXTRA_LIBS pthread m)
+    endif()
+
+elseif (${PLATFORM} STREQUAL "Web")
+    set(PLATFORM_CPP "PLATFORM_WEB")
+    set(EXTRA_LIBS "idbfs.js")
+endif()
+
+# I totally shocked
+if(${PLATFORM} MATCHES "Web")
+    set(PNG_LIB png)
+    set(AL_LIBTYPE "STATIC")
+
+    add_library(zlib INTERFACE IMPORTED)
+    set_target_properties(zlib PROPERTIES
+        INTERFACE_LINK_OPTIONS "-sUSE_ZLIB=1"
+    )
+
+    add_library(png INTERFACE IMPORTED)
+    set_target_properties(png PROPERTIES
+        INTERFACE_COMPILE_OPTIONS "-sUSE_LIBPNG=1" 
+        INTERFACE_LINK_OPTIONS "-sUSE_LIBPNG=1"
+    )
+
+    add_library(glfw INTERFACE IMPORTED)
+    set_target_properties(glfw PROPERTIES
+        INTERFACE_LINK_OPTIONS "-sUSE_GLFW=3"
+    )
+else()
+    set(PNG_LIB png_shared)
+    set(AL_LIBTYPE "SHARED")
+
+    CPMAddPackage(
+        NAME "zlib"
+        GIT_REPOSITORY "https://github.com/madler/zlib"
+        GIT_TAG "v1.3.2"
+    )
+
+    CPMAddPackage(
+        NAME "libpng"
+        GIT_REPOSITORY "https://github.com/pnggroup/libpng.git"
+        GIT_TAG "v1.6.55"
+        OPTIONS
+            "ZLIB_ROOT ${zlib_SOURCE_DIR}"
+            "ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
+            "PNG_TOOLS OFF"
+            "PNG_TESTS OFF"
+    )
+
+    CPMAddPackage(
+        NAME "glfw"
+        GIT_REPOSITORY "https://github.com/glfw/glfw.git"
+        GIT_TAG "3.4"
+        EXCLUDE_FROM_ALL TRUE
+        OPTIONS
+            "GLFW_BUILD_EXAMPLES OFF"
+            "GLFW_BUILD_TESTS OFF"
+            "GLFW_BUILD_DOCS OFF"
+    )
+endif()
 
 CPMAddPackage(
     NAME "openal"
@@ -33,18 +105,10 @@ CPMAddPackage(
         "ALSOFT_EXAMPLES OFF"
         "ALSOFT_TESTS OFF"
         "ALSOFT_UTILS OFF"
-        "BUILD_SHARED_LIBS ON"
-)
-
-CPMAddPackage(
-    NAME "glfw"
-    GIT_REPOSITORY "https://github.com/glfw/glfw.git"
-    GIT_TAG "3.4"
-    OPTIONS
-        "GLFW_BUILD_EXAMPLES OFF"
-        "GLFW_BUILD_TESTS OFF"
-        "GLFW_BUILD_DOCS OFF"
-        "BUILD_SHARED_LIBS ON"
+        "LIBTYPE ${AL_LIBTYPE}"
+        "ALSOFT_ENABLE_MODULES OFF"
+        "ALSOFT_STATIC_STDCXX ON"
+        "ALSOFT_STATIC_LIBGCC ON"
 )
 
 # TODO: Clear this paths with *
@@ -226,49 +290,32 @@ file(GLOB CLIENT_SOURCES
     "src/SharedConstants.cpp"
     "src/main.cpp"
     "src/NinecraftApp.cpp"
+
+    "src/AppPlatform_glfw.cpp"
+    "src/main.cpp"
 )
 
-if(NOT DEFINED PLATFORM)
-    set(PLATFORM "PLATFORM_GLFW")
-endif()
-
-
-if(PLATFORM STREQUAL "PLATFORM_WIN32")
-    list(APPEND CLIENT_SOURCES "src/AppPlatform_win32.cpp")
-endif()
-
-if(PLATFORM STREQUAL "PLATFORM_GLFW")
-    list(APPEND CLIENT_SOURCES "src/AppPlatform_glfw.cpp")
+if (${PLATFORM} STREQUAL "Desktop")
+    list(APPEND CLIENT_SOURCES glad/src/glad.c)
 endif()
 
 # Server
-add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
+if(UNIX)
+    add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})
 
-target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
+    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
 
-target_include_directories("${PROJECT_NAME}-server" PUBLIC 
-   "${CMAKE_SOURCE_DIR}/src/"
-   "project/lib_projects/raknet/jni/RaknetSources"
-)
+    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+        "${CMAKE_SOURCE_DIR}/src/"
+        "project/lib_projects/raknet/jni/RaknetSources"
+    )
 
-target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT} png_shared)
-
-
-add_executable(${PROJECT_NAME} 
-    ${CLIENT_SOURCES}
-    "glad/src/glad.c"
-)
-
-if(WIN32)
-    set(EXTRA_LIBS "ws2_32")
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "_CRT_SECURE_NO_WARNINGS")
-endif()
-
-if(PLATFORM STREQUAL "PLATFORM_WIN32" OR PLATFORM STREQUAL "PLATFORM_GLFW")
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "PLATFORM_DESKTOP")
+    target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
+add_executable(${PROJECT_NAME} ${CLIENT_SOURCES})
 
+target_compile_definitions(${PROJECT_NAME} PUBLIC ${PLATFORM_CPP})
 
 target_include_directories(${PROJECT_NAME} PUBLIC 
     "${CMAKE_SOURCE_DIR}/glad/include/"
@@ -278,21 +325,80 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     "lib/include"
 )
 
-# Client
-target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
-target_link_libraries(${PROJECT_NAME} zlib png_shared alsoft.common OpenAL::OpenAL glfw ${EXTRA_LIBS})
+if(${PLATFORM} MATCHES "Web")
+    set(CMAKE_CXX_STANDARD 11)
+    # uuuh i hate it
+    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sUSE_LIBPNG=1 -sSHARED_MEMORY=1")
+    
+    set(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")
 
-if (NOT UNIX)
-add_custom_command(
-    TARGET ${PROJECT_NAME} 
-    POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}> $<TARGET_FILE_DIR:${PROJECT_NAME}> 
-        COMMAND_EXPAND_LISTS
-)
+    target_compile_options(${PROJECT_NAME} PUBLIC
+        "-Os"
+        "-Wno-invalid-source-encoding"
+        "-Wno-narrowing"
+        "-Wno-deprecated-register"
+        "-Wno-reserved-user-defined-literal"
+    )
+
+    target_link_options(${PROJECT_NAME} PUBLIC
+        "-Os"
+        "-sALLOW_MEMORY_GROWTH=1"
+        "-sFORCE_FILESYSTEM=1"
+        "-sLEGACY_GL_EMULATION=1"
+        "-sGL_UNSAFE_OPTS=0"
+        "-sEMULATE_FUNCTION_POINTER_CASTS=1"
+        "-sALLOW_TABLE_GROWTH=1"
+        "-sEXPORTED_RUNTIME_METHODS=['FS','stringToUTF8','UTF8ToString','cwrap','ccall','HEAP8','HEAPU8','HEAP32','HEAPU32']"
+        "-sEXPORTED_FUNCTIONS=['_main']"
+    )
+
+    if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+        message("DEBUG MODE")
+
+        target_link_options(${PROJECT_NAME} PUBLIC
+            "-sASSERTIONS=2"
+            "-sSTACK_OVERFLOW_CHECK=2"
+            "-sSTACK_SIZE=5242880"
+            "-sGL_DEBUG=1"
+        )
+    endif()
+
+    target_compile_definitions(${PROJECT_NAME} PUBLIC "__EMSCRIPTEN__" "NO_SOUND" "NO_NETWORK")
 endif()
 
-add_custom_command(
-    TARGET ${PROJECT_NAME} 
-    POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/data" $<TARGET_FILE_DIR:${PROJECT_NAME}>/data
-)
+# Client
+target_compile_definitions(${PROJECT_NAME} PUBLIC "OPENGL_ES" "NO_EGL" ${PLATFORM})
+target_link_libraries(${PROJECT_NAME} zlib ${PNG_LIB} OpenAL::OpenAL glfw ${EXTRA_LIBS})
+
+if (OpenSSL_FOUND)
+    target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC HTTPCLIENT_USE_OPENSSL)
+endif()
+
+if (NOT UNIX)
+    add_custom_command(
+        TARGET ${PROJECT_NAME} 
+        POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}> $<TARGET_FILE_DIR:${PROJECT_NAME}> 
+            COMMAND_EXPAND_LISTS
+    )
+endif()
+
+if(NOT ${PLATFORM} MATCHES "Web")
+    add_custom_command(
+        TARGET ${PROJECT_NAME} 
+        POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/data" $<TARGET_FILE_DIR:${PROJECT_NAME}>/data
+    )
+else()
+    add_custom_command(
+        TARGET ${PROJECT_NAME} 
+        POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/index.html" $<TARGET_FILE_DIR:${PROJECT_NAME}>
+    )
+endif()
+
+message(STATUS "Compiling with the flags:")
+message(STATUS "  PLATFORM=" ${PLATFORM_CPP})

README.md

@@ -1,4 +1,7 @@
 # MinecraftPE
+> [!Warning]
+> Github repository **isnt main**. All issues and pull requests should be send in [Gitea Repository](https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1).
+
 > [!Important]
 > We have a discord server, where you can report bugs or send feedback https://discord.gg/c58YesBxve
 
@@ -14,9 +17,9 @@ This project aims to preserve and improve this early version of Minecraft PE.
     - [ ] Screen fixes
 - [ ] Rewrite platform logic
 - [x] Fix sound
-- [ ] Do a server connection GUI
+- [x] Do a server connection GUI
 - [ ] Controller support
-- [ ] Minecraft server hosting
+- [x] Minecraft server hosting
 - [x] Screen fixess
 - [x] Fix fog
 - [x] Add sprinting
@@ -32,7 +35,7 @@ This project aims to preserve and improve this early version of Minecraft PE.
 
 (Debian-like)
 
-``sudo apt install build-essentials git cmake libgl-dev libwayland-dev xorg-dev libxkbcommon-dev``
+``sudo apt install build-essential git cmake libgl-dev libwayland-dev xorg-dev libxkbcommon-dev``
 
 (Arch-like)
 
@@ -67,7 +70,7 @@ cmake --build .
 4. Press **Run** (or F5) to build and launch the game.
 
 ## Android
-
+### Windows
 1. Download **Android NDK r14b**:  
    http://dl.google.com/android/repository/android-ndk-r14b-windows-x86_64.zip
 
@@ -91,4 +94,107 @@ cmake --build .
 
 # Only repackage + install (no compilation)
 .\build.ps1 -NoBuild
-```
+```
+
+### Linux
+1. Download **Command line tools**:  
+   https://developer.android.com/studio#command-line-tools-only
+
+2. Unzip it into a folder, e.g.:
+
+   ```bash
+   mkdir -p "$HOME/Android/Sdk/"
+   unzip commandlinetools-linux-*.zip -d "$HOME/Android/Sdk/"
+   ```
+
+3. Your structure should look like
+
+   ```bash
+   $HOME/Android/Sdk/cmdline-tools/bin/sdkmanager
+   ```
+
+   > [!Note] 
+   > `sdkmanager` expects the SDK to include a `cmdline-tools/latest/` folder.
+   > If you only have `cmdline-tools/bin`, create the required layout:
+   >
+   > ```bash
+   > mkdir -p "$HOME/Android/Sdk/cmdline-tools/latest"
+   > ln -snf ../bin  "$HOME/Android/Sdk/cmdline-tools/latest/bin"
+   > ln -snf ../lib  "$HOME/Android/Sdk/cmdline-tools/latest/lib"
+   > ln -snf ../source.properties "$HOME/Android/Sdk/cmdline-tools/latest/source.properties"
+   > ln -snf ../NOTICE.txt        "$HOME/Android/Sdk/cmdline-tools/latest/NOTICE.txt"
+   > ```
+
+4. Install the build tools (and platform) using `sdkmanager`
+   
+   ```bash
+   export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+   export PATH="$ANDROID_SDK_ROOT/cmdline-tools/latest/bin:$PATH"
+
+   sdkmanager --install "platform-tools" "platforms;android-35" "build-tools;35.0.0"
+   ```
+
+   > [!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:
+   >
+   > ```bash
+   > export ANDROID_SDK_ROOT="$HOME/Android/Sdk"
+   > ```
+   >
+   > Then restart your shell (or `source` the file)
+
+5. Verify the install
+
+   ```bash
+   ls "$ANDROID_SDK_ROOT/build-tools"
+   ```
+
+   You should see a version folder like:
+
+   ```bash
+   35.0.0
+   33.0.2
+   ```
+
+6. Download **Android NDK r14b**:  
+   https://dl.google.com/android/repository/android-ndk-r14b-linux-x86_64.zip
+
+7. Extract the archive to `/home/username/`, so that the final directory path is `/home/username/android-ndk-r14b/` 
+   
+   > [!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]
+   > On arch linux you can use AUR:
+   > `yay -Sy emsdk`
+   
+2. Configure and build project:
+   ```
+   mkdir build && cd build
+   cmake .. -B . -G Ninja "-DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+   cmake --build . --target MinecraftPE
+   ```
+   > [!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
+   > 3. Add this:
+      ```json
+      {
+         "name": "Emscripten",
+         "compilers": {
+            "C": "/usr/lib/emsdk/upstream/bin/clang",
+            "CXX": "/usr/lib/emsdk/upstream/bin/clang++"
+         },
+         "toolchainFile": "/usr/lib/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+      }
+      ```
+3. Run game:
+   ```
+   emrun --port 8080 .
+   ```

build.ps1

@@ -1,18 +1,16 @@
 # ============================================================
-#  MCPE 0.6.1 Android Build Script  —  from-scratch capable
-#  Works on a clean machine; creates all dirs, keystore and
-#  stub Java files automatically.
-#
 #  Usage:
-#    .\build.ps1          # full build (NDK + Java + APK + install)
-#    .\build.ps1 -NoCpp   # skip NDK rebuild (Java/assets changed)
-#    .\build.ps1 -NoJava  # skip Java recompile (C++ changed only)
-#    .\build.ps1 -NoBuild # repackage + install only (no recompile)
+#    .\build.ps1              # full build (NDK + Java + APK + install)
+#    .\build.ps1 -NoCpp       # skip NDK rebuild (Java/assets changed)
+#    .\build.ps1 -NoJava      # skip Java recompile (C++ changed only)
+#    .\build.ps1 -NoBuild     # repackage + install only (no recompile)
+#    .\build.ps1 -Clean       # remove build output before building
 # ============================================================
 param(
     [switch]$NoCpp,
     [switch]$NoJava,
-    [switch]$NoBuild
+    [switch]$NoBuild,
+    [switch]$Clean
 )
 
 Set-StrictMode -Version Latest
@@ -66,7 +64,13 @@ function Write-Stub([string]$rel, [string]$content) {
     if (-not (Test-Path $full)) { [System.IO.File]::WriteAllText($full, $content); Write-Host "  stub: $rel" }
 }
 
-# ── 0. Bootstrap ─────────────────────────────────────────────
+# ── 0. Clean (optional) ───────────────────────────────────────
+if ($Clean) {
+    Write-Step "Cleaning build output"
+    Remove-Item -Recurse -Force $apkbuild -ErrorAction SilentlyContinue
+}
+
+# ── 1. Bootstrap ─────────────────────────────────────────────
 Write-Step "Bootstrap"
 
 New-Dir $apkbuild
@@ -227,16 +231,16 @@ if (-not $NoCpp -and -not $NoBuild) {
     }
     Push-Location "$junctionBase/project/android/jni"
     $env:NDK_MODULE_PATH = "$junctionBase/project/lib_projects"
-    # run ndk-build and capture everything; let user see full output for debugging
-    $ndkOutput = & "$ndk\ndk-build.cmd" NDK_PROJECT_PATH="$junctionBase/project/android" APP_BUILD_SCRIPT="$junctionBase/project/android/jni/Android.mk" 2>&1 | Tee-Object -Variable ndkOutput
-    # dump entire output for diagnosis
-    Write-Host "---- NDK BUILD OUTPUT BEGIN ----"
-    $ndkOutput | ForEach-Object { Write-Host $_ }
-    Write-Host "---- NDK BUILD OUTPUT END ----"
-    # optionally highlight errors/warnings afterwards
-    $ndkOutput | Where-Object { $_ -match "error:|warning:|libminecraftpe|In file included" }
+    # run ndk-build and stream output directly to the console
+    $ndkCmd = Join-Path $ndk 'ndk-build.cmd'
+    $ndkArgs = "NDK_PROJECT_PATH=`"$junctionBase/project/android`" APP_BUILD_SCRIPT=`"$junctionBase/project/android/jni/Android.mk`""
+
+    $proc = Start-Process -FilePath $ndkCmd -ArgumentList $ndkArgs -NoNewWindow -Wait -PassThru
     Pop-Location
-    Assert-ExitCode "ndk-build"
+    if ($proc.ExitCode -ne 0) {
+        Write-Host "ndk-build failed (exit $($proc.ExitCode))" -ForegroundColor Red
+        exit 1
+    }
     Copy-Item $libSrc $libDst -Force
     Write-Host "  .so  ->  $libDst"
 }
@@ -246,7 +250,7 @@ if (-not $NoJava -and -not $NoBuild) {
     Write-Step "Java compile"
 
     New-Dir (Split-Path $rJava -Parent)
-    & "$sdkTools\aapt.exe" package -f -M $manifest -S $res -I $androidJar -J "$apkbuild\gen" -F "$apkbuild\_rgen.apk" 2>&1 | Out-Null
+    & "$sdkTools\aapt.exe" package -f -M $manifest -S $res -I $androidJar -J "$apkbuild\gen" -F "$apkbuild\_rgen.apk"
     Assert-ExitCode "aapt R.java"
     Remove-Item "$apkbuild\_rgen.apk" -ea SilentlyContinue
 
@@ -258,11 +262,9 @@ if (-not $NoJava -and -not $NoBuild) {
 
     Remove-Item $classesDir -Recurse -Force -ea SilentlyContinue
     New-Dir $classesDir
-    $eap = $ErrorActionPreference; $ErrorActionPreference = "Continue"
-    $errors = & javac --release 8 -cp $androidJar -d $classesDir @srcs 2>&1 |
-              Where-Object { $_ -match "error:" }
-    $ErrorActionPreference = $eap
-    if ($errors) { Write-Host $errors -ForegroundColor Red; exit 1 }
+
+    & javac --release 8 -cp $androidJar -d $classesDir @srcs
+    if ($LASTEXITCODE -ne 0) { Write-Host 'javac failed' -ForegroundColor Red; exit 1 }
     Write-Host "  javac OK"
 
     $classFiles = Get-ChildItem $classesDir -Recurse -Filter "*.class" | Select-Object -Exp FullName

build.sh

@@ -0,0 +1,455 @@
+#!/usr/bin/env bash
+# ============================================================
+# Usage:
+#   ./build.sh           # full build (NDK + Java + APK + install)
+#   ./build.sh --no-cpp  # skip NDK rebuild (Java/assets changed)
+#   ./build.sh --no-java # skip Java recompile (C++ changed only)
+#   ./build.sh --no-build # repackage + install only (no recompile)
+#
+# ABI targeting:
+#   ./build.sh --abi arm64-v8a    # build for arm64 only (default)
+#   ./build.sh --abi armeabi-v7a  # build for ARMv7 only
+#   ./build.sh --abi all          # build for both ABIs (fat APK)
+# ============================================================
+
+# lets be strict cuz we are safe like that
+# *thanos snap*
+set -euo pipefail
+IFS=$'\n\t'
+
+########################################
+# configuration
+########################################
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="$SCRIPT_DIR"
+
+# build output directory (similar to apkbuild in the PS script)
+# maybe doing this in build.ps1 would be cleaner, than putting the apkbuild in C:
+BUILD_DIR="$REPO_ROOT/build-apk"
+
+# default Android/NDK/SDK paths (can be overridden by env vars)
+ANDROID_NDK_PATH="${ANDROID_NDK_PATH:-$HOME/android-ndk-r14b}"
+ANDROID_SDK_ROOT="${ANDROID_SDK_ROOT:-${ANDROID_HOME:-$HOME/Android/Sdk}}"
+ANDROID_BUILD_TOOLS_VERSION="${ANDROID_BUILD_TOOLS_VERSION:-}"
+ANDROID_PLATFORM_API="${ANDROID_PLATFORM_API:-}"
+
+# ABI selection: can be set via --abi flag or MATRIX_ABI env var.
+# Supported values: arm64-v8a, armeabi-v7a, all
+# MATRIX_ABI takes precedence over the default but is overridden by --abi on the CLI.
+TARGET_ABI="${MATRIX_ABI:-arm64-v8a}"
+
+function fail() {
+  echo "ERROR: $1" >&2
+  exit 1
+}
+
+function find_build_tools_dir() {
+  if [[ -n "$ANDROID_BUILD_TOOLS_VERSION" ]]; then
+    local candidate="$ANDROID_SDK_ROOT/build-tools/$ANDROID_BUILD_TOOLS_VERSION"
+    [[ -d "$candidate" ]] && echo "$candidate" && return
+  fi
+
+  if [[ ! -d "$ANDROID_SDK_ROOT/build-tools" ]]; then
+    fail "Android build-tools not found under $ANDROID_SDK_ROOT/build-tools. Set ANDROID_SDK_ROOT or install Android SDK build-tools."
+  fi
+
+  # picking the highest build tools version because its the easiest way rn
+  # i guess if it breaks then fuck you
+  local best
+  best=$(ls -1 "$ANDROID_SDK_ROOT/build-tools" | sort -V | tail -n 1)
+  [[ -n "$best" && -d "$ANDROID_SDK_ROOT/build-tools/$best" ]] || \
+    fail "No Android build-tools versions found under $ANDROID_SDK_ROOT/build-tools."
+  echo "$ANDROID_SDK_ROOT/build-tools/$best"
+}
+
+function find_android_platform_dir() {
+  if [[ -n "$ANDROID_PLATFORM_API" ]]; then
+    local candidate="$ANDROID_SDK_ROOT/platforms/android-$ANDROID_PLATFORM_API"
+    [[ -d "$candidate" ]] && echo "$candidate" && return
+  fi
+
+  if [[ ! -d "$ANDROID_SDK_ROOT/platforms" ]]; then
+    fail "Android platforms not found under $ANDROID_SDK_ROOT/platforms. Install an Android platform."
+  fi
+
+  # pick the highest api level installed for now
+  # ideally we should be able to build to any api level, but lets keep it simple for now and 
+  # just pick the highest one available
+  local best
+  best=$(ls -1 "$ANDROID_SDK_ROOT/platforms" | grep -E '^android-[0-9]+' | sed 's/android-//' | sort -n | tail -n 1)
+  [[ -n "$best" ]] || fail "No Android platforms found under $ANDROID_SDK_ROOT/platforms."
+  echo "$ANDROID_SDK_ROOT/platforms/android-$best"
+}
+
+ANDROID_BUILD_TOOLS_DIR="$(find_build_tools_dir)"
+ANDROID_PLATFORM_DIR="$(find_android_platform_dir)"
+
+KEYSTORE_FILE="$BUILD_DIR/debug.keystore"
+PACKAGE_NAME="com.mojang.minecraftpe"
+
+# android tool binaries
+AAPT="$ANDROID_BUILD_TOOLS_DIR/aapt"
+ZIPALIGN="$ANDROID_BUILD_TOOLS_DIR/zipalign"
+APKSIGNER="$ANDROID_BUILD_TOOLS_DIR/apksigner"
+DEX_TOOL="$ANDROID_BUILD_TOOLS_DIR/d8"
+ADB="${ADB:-$ANDROID_SDK_ROOT/platform-tools/adb}"
+
+# java tool binaries
+JAVA_HOME_DEFAULT="${JAVA_HOME:-}"  # may be empty
+
+# prefer javac from the jdk; 
+# on some systems /usr/lib/jvm/default points to a JRE only.
+# If javac is missing, try to locate a JDK installation.
+JAVAC_CMD=""
+if command -v javac >/dev/null 2>&1; then
+  JAVAC_CMD="$(command -v javac)"
+elif [[ -n "$JAVA_HOME_DEFAULT" && -x "$JAVA_HOME_DEFAULT/bin/javac" ]]; then
+  JAVAC_CMD="$JAVA_HOME_DEFAULT/bin/javac"
+elif [[ -x "/usr/lib/jvm/java-8-openjdk/bin/javac" ]]; then
+  JAVAC_CMD="/usr/lib/jvm/java-8-openjdk/bin/javac"
+elif [[ -x "/usr/lib/jvm/default/bin/javac" ]]; then
+  JAVAC_CMD="/usr/lib/jvm/default/bin/javac"
+fi
+
+if [[ -z "$JAVAC_CMD" ]]; then
+  fail "javac not found; install a JDK and ensure javac is on PATH"
+fi
+
+KEYTOOL=""  # will be detected later
+
+# swource directories
+JNI_DIR="$REPO_ROOT/project/android/jni"
+JAVA_SRC_DIR="$REPO_ROOT/project/android_java/src"
+ANDROID_MANIFEST="$REPO_ROOT/project/android_java/AndroidManifest.xml"
+ANDROID_RES_DIR="$REPO_ROOT/project/android_java/res"
+DATA_DIR="$REPO_ROOT/data"
+
+# output files: APK names are derived after argument parsing once TARGET_ABI is final.
+# see the "resolve APK output filenames" block below.
+APK_UNSIGNED=""
+APK_ALIGNED=""
+APK_SIGNED=""
+DEX_OUTPUT="$BUILD_DIR/classes.dex"
+
+# flags parsed from CLI args
+NO_CPP=false
+NO_JAVA=false
+NO_BUILD=false
+
+########################################
+# helpers
+########################################
+function usage() {
+  cat <<EOF
+Usage: $0 [--no-cpp] [--no-java] [--no-build] [--abi <abi>]
+
+Options:
+  --no-cpp         Skip the NDK (C++) build step
+  --no-java        Skip the Java build step
+  --no-build       Skip the compile steps; just package + install
+  --abi <abi>      Target ABI: arm64-v8a (default), armeabi-v7a, or all
+                   Can also be set via MATRIX_ABI env var for CI matrix builds.
+EOF
+  exit 1
+}
+
+function log_step() {
+  echo -e "\n==> $1"
+}
+
+function fail() {
+  echo "ERROR: $1" >&2
+  exit 1
+}
+
+function require_cmd() {
+  if ! command -v "$1" >/dev/null 2>&1; then
+    fail "$1 not found; install it (e.g. 'sudo pacman -S $1')"
+  fi
+}
+
+# ensure required tools are available early
+require_cmd zip
+require_cmd unzip
+
+function ensure_dir() {
+  mkdir -p "$1"
+}
+
+function find_keytool() {
+  # first try JAVA_HOME if set
+  if [[ -n "$JAVA_HOME_DEFAULT" && -x "$JAVA_HOME_DEFAULT/bin/keytool" ]]; then
+    echo "$JAVA_HOME_DEFAULT/bin/keytool"
+    return
+  fi
+
+  # try common install locations
+  if [[ -n "${JAVA_HOME:-}" && -x "${JAVA_HOME}/bin/keytool" ]]; then
+    echo "${JAVA_HOME}/bin/keytool"
+    return
+  fi
+
+  if command -v keytool >/dev/null 2>&1; then
+    command -v keytool
+    return
+  fi
+
+  fail "keytool not found. Set JAVA_HOME or install a JDK."
+}
+
+function write_stub_file() {
+  local rel_path="$1"
+  local content="$2"
+  local full_path="$BUILD_DIR/stubs/$rel_path"
+
+  ensure_dir "$(dirname "$full_path")"
+  if [[ ! -f "$full_path" ]]; then
+    echo -e "$content" > "$full_path"
+    echo "  stub: $rel_path"
+  fi
+}
+
+function build_ndk_abi() {
+  local abi="$1"
+
+  # armeabi-v7a needs a few extra NDK flags to get hardware FPU support
+  # without APP_ABI the default would be whatever Android.mk says, so we
+  # always pass it explicitly so the same Android.mk works for both targets
+  local -a extra_flags=( "APP_ABI=$abi" )
+  if [[ "$abi" == "armeabi-v7a" ]]; then
+    # enable hardware FPU + NEON like the old Minecraft ARMv7 builds used to
+    extra_flags+=( "APP_ARM_MODE=arm" "APP_ARM_NEON=true" )
+  fi
+
+  echo "  ndk-build for $abi..."
+  if ! "$ANDROID_NDK_PATH/ndk-build" \
+      NDK_PROJECT_PATH="$REPO_ROOT/project/android" \
+      APP_BUILD_SCRIPT="$JNI_DIR/Android.mk" \
+      "${extra_flags[@]}" \
+      2>&1 | tee "$BUILD_DIR/ndk-build-${abi}.log"; then
+    echo "NDK build failed for $abi. See $BUILD_DIR/ndk-build-${abi}.log" >&2
+    exit 1
+  fi
+
+  ensure_dir "$BUILD_DIR/lib/$abi"
+  cp -v "$REPO_ROOT/project/android/libs/$abi/libminecraftpe.so" "$BUILD_DIR/lib/$abi/"
+  echo "  .so -> $BUILD_DIR/lib/$abi/libminecraftpe.so"
+}
+
+########################################
+# argument parsing
+########################################
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --no-cpp) NO_CPP=true ;;
+    --no-java) NO_JAVA=true ;;
+    --no-build) NO_BUILD=true ;;
+    --abi)
+      shift
+      [[ $# -gt 0 ]] || fail "--abi requires a value (arm64-v8a, armeabi-v7a, all)"
+      TARGET_ABI="$1"
+      ;;
+    -h|--help) usage ;;
+    *)
+      echo "Unknown option: $1" >&2
+      usage
+      ;;
+  esac
+  shift
+done
+
+# validate the ABI value now that all args are parsed
+case "$TARGET_ABI" in
+  arm64-v8a|armeabi-v7a|all) ;;
+  *) fail "Unknown ABI '$TARGET_ABI'. Supported values: arm64-v8a, armeabi-v7a, all" ;;
+esac
+
+echo "  TARGET_ABI=$TARGET_ABI"
+
+# resolve APK output filenames now that TARGET_ABI is final.
+# arm64-v8a -> minecraftpe-v8a-debug.apk
+# armeabi-v7a -> minecraftpe-v7a-debug.apk
+# all -> minecraftpe-all-debug.apk  (fat APK containing both ABIs)
+case "$TARGET_ABI" in
+  arm64-v8a)   APK_SUFFIX="v8a" ;;
+  armeabi-v7a) APK_SUFFIX="v7a" ;;
+  *)           APK_SUFFIX="$TARGET_ABI" ;;
+esac
+APK_UNSIGNED="$BUILD_DIR/minecraftpe-${APK_SUFFIX}-unsigned.apk"
+APK_ALIGNED="$BUILD_DIR/minecraftpe-${APK_SUFFIX}-aligned.apk"
+APK_SIGNED="$BUILD_DIR/minecraftpe-${APK_SUFFIX}-debug.apk"
+
+########################################
+# validate required tools
+########################################
+KEYTOOL="$(find_keytool)"
+
+if [[ ! -x "$AAPT" ]]; then
+  fail "aapt not found at $AAPT"
+fi
+
+if [[ ! -x "$ZIPALIGN" ]]; then
+  fail "zipalign not found at $ZIPALIGN"
+fi
+
+if [[ ! -x "$APKSIGNER" ]]; then
+  fail "apksigner not found at $APKSIGNER"
+fi
+
+if [[ ! -x "$DEX_TOOL" ]]; then
+  fail "d8 not found at $DEX_TOOL"
+fi
+
+if [[ ! -x "$ADB" ]]; then
+  fail "adb not found at $ADB"
+fi
+
+########################################
+# bootstrap
+########################################
+log_step "Bootstrap"
+
+ensure_dir "$BUILD_DIR"
+ensure_dir "$BUILD_DIR/lib/arm64-v8a"
+ensure_dir "$BUILD_DIR/lib/armeabi-v7a"
+ensure_dir "$BUILD_DIR/gen"
+ensure_dir "$BUILD_DIR/stubs"
+
+# create a debug keystore if it doesn't exist
+if [[ ! -f "$KEYSTORE_FILE" ]]; then
+  echo "  generating debug.keystore..."
+  "$KEYTOOL" -genkeypair \
+    -keystore "$KEYSTORE_FILE" -storepass android -keypass android \
+    -alias androiddebugkey -keyalg RSA -keysize 2048 -validity 10000 \
+    -dname "CN=Android Debug,O=Android,C=US" >/dev/null 2>&1
+  echo "  keystore created"
+else
+  echo "  keystore OK"
+fi
+
+# why dont we just include the stubs lol
+write_stub_file "com/mojang/android/StringValue.java" "package com.mojang.android;\npublic interface StringValue { String getStringValue(); }\n"
+
+write_stub_file "com/mojang/android/licensing/LicenseCodes.java" "package com.mojang.android.licensing;\npublic class LicenseCodes { public static final int LICENSE_OK = 0; }\n"
+
+write_stub_file "com/mojang/android/EditTextAscii.java" "package com.mojang.android;\nimport android.content.Context;\nimport android.text.Editable;\nimport android.text.TextWatcher;\nimport android.util.AttributeSet;\nimport android.widget.EditText;\npublic class EditTextAscii extends EditText implements TextWatcher {\n    public EditTextAscii(Context c) { super(c); addTextChangedListener(this); }\n    public EditTextAscii(Context c, AttributeSet a) { super(c,a); addTextChangedListener(this); }\n    public EditTextAscii(Context c, AttributeSet a, int d) { super(c,a,d); addTextChangedListener(this); }\n    @Override public void onTextChanged(CharSequence s,int st,int b,int co){}\n    public void beforeTextChanged(CharSequence s,int st,int co,int aft){}\n    public void afterTextChanged(Editable e){\n        String s=e.toString(),san=sanitize(s);\n        if(!s.equals(san))e.replace(0,e.length(),san);\n    }\n    static public String sanitize(String s){\n        StringBuilder sb=new StringBuilder();\n        for(int i=0;i<s.length();i++){char c=s.charAt(i);if(c<128)sb.append(c);}\n        return sb.toString();\n    }\n}\n"
+
+write_stub_file "com/mojang/android/preferences/SliderPreference.java" "package com.mojang.android.preferences;\nimport android.content.Context;\nimport android.content.res.Resources;\nimport android.preference.DialogPreference;\nimport android.util.AttributeSet;\nimport android.view.Gravity;\nimport android.view.View;\nimport android.widget.LinearLayout;\nimport android.widget.SeekBar;\nimport android.widget.TextView;\npublic class SliderPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener {\n    private static final String NS=\"http://schemas.android.com/apk/res/android\";\n    private Context _ctx; private TextView _tv; private SeekBar _sb;\n    private String _suf; private int _def,_max,_val,_min;\n    public SliderPreference(Context ctx,AttributeSet a){\n        super(ctx,a); _ctx=ctx;\n        _suf=gStr(a,NS,\"text\",\"\"); _def=gInt(a,NS,\"defaultValue\",0);\n        _max=gInt(a,NS,\"max\",100); _min=gInt(a,null,\"min\",0);\n        setDefaultValue(_def);\n    }\n    @Override protected View onCreateDialogView(){\n        LinearLayout l=new LinearLayout(_ctx); l.setOrientation(LinearLayout.VERTICAL); l.setPadding(6,6,6,6);\n        _tv=new TextView(_ctx); _tv.setGravity(Gravity.CENTER_HORIZONTAL); _tv.setTextSize(32);\n        l.addView(_tv,new LinearLayout.LayoutParams(-1,-2));\n        _sb=new SeekBar(_ctx); _sb.setOnSeekBarChangeListener(this);\n        l.addView(_sb,new LinearLayout.LayoutParams(-1,-2));\n        if(shouldPersist())_val=getPersistedInt(_def);\n        _sb.setMax(_max); _sb.setProgress(_val); return l;\n    }\n    @Override protected void onSetInitialValue(boolean r,Object d){\n        super.onSetInitialValue(r,d);\n        _val=r?(shouldPersist()?getPersistedInt(_def):0):(Integer)d;\n    }\n    public void onProgressChanged(SeekBar s,int v,boolean f){\n        _val=v+_min; _tv.setText(_val+_suf);\n        if(shouldPersist())persistInt(_val); callChangeListener(Integer.valueOf(_val));\n    }\n    public void onStartTrackingTouch(SeekBar s){}\n    public void onStopTrackingTouch(SeekBar s){}\n    private int gInt(AttributeSet a,String ns,String n,int d){int id=a.getAttributeResourceValue(ns,n,0);return id!=0?getContext().getResources().getInteger(id):a.getAttributeIntValue(ns,n,d);}\n    private String gStr(AttributeSet a,String ns,String n,String d){int id=a.getAttributeResourceValue(ns,n,0);if(id!=0)return getContext().getResources().getString(id);String v=a.getAttributeValue(ns,n);return v!=null?v:d;}\n}\n"
+
+write_stub_file "com/mojang/minecraftpe/MainMenuOptionsActivity.java" "package com.mojang.minecraftpe;\nimport android.app.Activity;\npublic class MainMenuOptionsActivity extends Activity {\n    public static final String Internal_Game_DifficultyPeaceful=\"internal_game_difficulty_peaceful\";\n    public static final String Game_DifficultyLevel=\"game_difficulty\";\n    public static final String Controls_Sensitivity=\"controls_sensitivity\";\n}\n"
+
+write_stub_file "com/mojang/minecraftpe/Minecraft_Market.java" "package com.mojang.minecraftpe;\nimport android.app.Activity; import android.content.Intent; import android.os.Bundle;\npublic class Minecraft_Market extends Activity {\n    @Override protected void onCreate(Bundle s){super.onCreate(s);startActivity(new Intent(this,MainActivity.class));finish();}\n}\n"
+
+write_stub_file "com/mojang/minecraftpe/Minecraft_Market_Demo.java" "package com.mojang.minecraftpe;\nimport android.content.Intent; import android.net.Uri;\npublic class Minecraft_Market_Demo extends MainActivity {\n    @Override public void buyGame(){startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(\"market://details?id=com.mojang.minecraftpe\")));}\n    @Override protected boolean isDemo(){return true;}\n}\n"
+
+write_stub_file "com/mojang/minecraftpe/GameModeButton.java" "package com.mojang.minecraftpe;\nimport com.mojang.android.StringValue;\nimport android.content.Context; import android.util.AttributeSet;\nimport android.view.View; import android.view.View.OnClickListener;\nimport android.widget.TextView; import android.widget.ToggleButton;\npublic class GameModeButton extends ToggleButton implements OnClickListener,StringValue {\n    static final int Creative=0,Survival=1;\n    private int _type=0; private boolean _attached=false;\n    public GameModeButton(Context c,AttributeSet a){super(c,a);setOnClickListener(this);}\n    public void onClick(View v){_update();}\n    @Override protected void onFinishInflate(){super.onFinishInflate();_update();}\n    @Override protected void onAttachedToWindow(){if(!_attached){_update();_attached=true;}}\n    private void _update(){_set(isChecked()?Survival:Creative);}\n    private void _set(int i){\n        _type=i<Creative?Creative:(i>Survival?Survival:i);\n        int id=_type==Survival?R.string.gamemode_survival_summary:R.string.gamemode_creative_summary;\n        String desc=getContext().getString(id);\n        View v=getRootView().findViewById(R.id.labelGameModeDesc);\n        if(desc!=null&&v instanceof TextView)((TextView)v).setText(desc);\n    }\n    public String getStringValue(){return new String[]{\"creative\",\"survival\"}[_type];}\n    static public String getStringForType(int i){int c=i<Creative?Creative:(i>Survival?Survival:i);return new String[]{\"creative\",\"survival\"}[c];}\n}\n"
+
+echo "  stubs OK"
+
+########################################
+# ndk build
+########################################
+if [[ "$NO_CPP" == false && "$NO_BUILD" == false ]]; then
+  log_step "NDK build ($TARGET_ABI)"
+
+  # the original windows build script used a junction to avoid long paths here
+  # on linux, path lengths are *usually* fine, but we still keep things simple
+  pushd "$JNI_DIR" >/dev/null
+
+  export NDK_MODULE_PATH="$REPO_ROOT/project/lib_projects"
+
+  # build each requested ABI by delegating to build_ndk_abi()
+  if [[ "$TARGET_ABI" == "all" ]]; then
+    build_ndk_abi "arm64-v8a"
+    build_ndk_abi "armeabi-v7a"
+  else
+    build_ndk_abi "$TARGET_ABI"
+  fi
+
+  popd >/dev/null
+fi
+
+########################################
+# java compile
+########################################
+if [[ "$NO_JAVA" == false && "$NO_BUILD" == false ]]; then
+  log_step "Java compile"
+
+  ensure_dir "$(dirname "$BUILD_DIR/gen/R.java")"
+
+  # generate R.java
+  "$AAPT" package -f -M "$ANDROID_MANIFEST" -S "$ANDROID_RES_DIR" -I "$ANDROID_PLATFORM_DIR/android.jar" -J "$BUILD_DIR/gen" -F "$BUILD_DIR/_rgen.apk"
+  rm -f "$BUILD_DIR/_rgen.apk"
+
+  # collect all source files (project + stubs + generated R.java)
+  JAVA_SOURCES=(
+    $(find "$JAVA_SRC_DIR" -name "*.java" -print)
+    $(find "$BUILD_DIR/stubs" -name "*.java" -print)
+    "$BUILD_DIR/gen/R.java"
+  )
+
+  rm -rf "$BUILD_DIR/classes"
+  ensure_dir "$BUILD_DIR/classes"
+
+  # Some JDK versions (<=8) don't support --release.
+  JAVAC_ARGS=(--release 8)
+  if "$JAVAC_CMD" -version 2>&1 | grep -qE '^javac 1\.'; then
+    JAVAC_ARGS=(-source 1.8 -target 1.8)
+  fi
+
+  "$JAVAC_CMD" "${JAVAC_ARGS[@]}" -cp "$ANDROID_PLATFORM_DIR/android.jar" -d "$BUILD_DIR/classes" "${JAVA_SOURCES[@]}"
+  echo "  javac OK"
+
+  # convert class files into dex
+  JAVA_CLASS_FILES=( $(find "$BUILD_DIR/classes" -name "*.class" -print) )
+  "$DEX_TOOL" --min-api 21 --output "$BUILD_DIR" "${JAVA_CLASS_FILES[@]}"
+  echo "  d8 -> $DEX_OUTPUT"
+fi
+
+########################################
+# package apk
+########################################
+log_step "Package APK"
+
+rm -f "$APK_UNSIGNED" "$APK_ALIGNED" "$APK_SIGNED"
+
+"$AAPT" package -f -M "$ANDROID_MANIFEST" -S "$ANDROID_RES_DIR" -I "$ANDROID_PLATFORM_DIR/android.jar" -F "$APK_UNSIGNED"
+
+# add classes.dex and native library/libraries into apk.
+# when building for "all" we pack both ABIs into the same APK so Android can
+# pick the right one at install time (fat APK). for a single-ABI build we
+# only include the one .so that was actually compiled.
+pushd "$BUILD_DIR" >/dev/null
+zip -q "$APK_UNSIGNED" "classes.dex"
+if [[ "$TARGET_ABI" == "all" ]]; then
+  zip -q "$APK_UNSIGNED" "lib/arm64-v8a/libminecraftpe.so"
+  zip -q "$APK_UNSIGNED" "lib/armeabi-v7a/libminecraftpe.so"
+else
+  zip -q "$APK_UNSIGNED" "lib/$TARGET_ABI/libminecraftpe.so"
+fi
+popd >/dev/null
+
+# add assets from data/ directory into the apk under assets/
+TMP_ASSETS_DIR="$(mktemp -d)"
+mkdir -p "$TMP_ASSETS_DIR/assets"
+cp -r "$DATA_DIR/." "$TMP_ASSETS_DIR/assets/"
+pushd "$TMP_ASSETS_DIR" >/dev/null
+zip -q -r "$APK_UNSIGNED" assets
+popd >/dev/null
+rm -rf "$TMP_ASSETS_DIR"
+
+"$ZIPALIGN" -p 4 "$APK_UNSIGNED" "$APK_ALIGNED"
+"$APKSIGNER" sign --ks "$KEYSTORE_FILE" --ks-pass pass:android --key-pass pass:android --out "$APK_SIGNED" "$APK_ALIGNED"
+
+echo "  signed -> $APK_SIGNED"
+
+########################################
+# install
+########################################
+log_step "Install"
+
+"$ADB" shell am force-stop "$PACKAGE_NAME" || true
+"$ADB" uninstall "$PACKAGE_NAME" || true
+"$ADB" install --no-incremental "$APK_SIGNED"
+
+echo -e "\nDone. Enjoy MCPE 0.6.1 on your device!"

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()

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

misc/web/index.html

@@ -0,0 +1,46 @@
+<!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;
+    }
+
+    #canvas {
+      width: 100vw;
+      height: 100vh;
+      display: block;
+    }
+  </style>
+</head>
+<body>
+
+<canvas id="canvas"></canvas>
+
+<script>
+  var Module = {
+    canvas: document.getElementById('canvas'),
+    onRuntimeInitialized: function () { resizeCanvas() }
+  };
+
+  function resizeCanvas() {
+    const canvas = Module.canvas;
+    canvas.width = window.innerWidth;
+    canvas.height = window.innerHeight;
+  }
+
+  window.addEventListener('resize', resizeCanvas);
+  window.addEventListener('onunload', () => {
+    FS.syncfs(true, function (err) { console.log('Sync FS failed: ' + err) });
+  })
+</script>
+
+<script src="MinecraftPE.js"></script>
+</body>
+</html>

project/android/AndroidManifest.xml

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

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

project/android/jni/Android.mk

@@ -24,6 +24,7 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/Options.cpp \
 ../../../src/client/OptionsFile.cpp \
 ../../../src/client/OptionStrings.cpp \
+../../../src/client/Option.cpp \
 ../../../src/client/gamemode/GameMode.cpp \
 ../../../src/client/gamemode/CreativeMode.cpp \
 ../../../src/client/gamemode/SurvivalMode.cpp \
@@ -37,14 +38,14 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/gui/components/NinePatch.cpp \
 ../../../src/client/gui/components/OptionsGroup.cpp \
 ../../../src/client/gui/components/OptionsItem.cpp \
-../../../src/client/gui/components/OptionsPane.cpp \
+../../../src/client/gui/components/KeyOption.cpp \
+../../../src/client/gui/components/TextOption.cpp \
 ../../../src/client/gui/components/RolledSelectionListH.cpp \
 ../../../src/client/gui/components/RolledSelectionListV.cpp \
 ../../../src/client/gui/components/ScrolledSelectionList.cpp \
 ../../../src/client/gui/components/ScrollingPane.cpp \
 ../../../src/client/gui/components/Slider.cpp \
 ../../../src/client/gui/components/TextBox.cpp \
-../../../src/client/gui/components/SmallButton.cpp \
 ../../../src/client/gui/Font.cpp \
 ../../../src/client/gui/Gui.cpp \
 ../../../src/client/gui/GuiComponent.cpp \
@@ -256,7 +257,8 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/phys/HitResult.cpp
 
 LOCAL_CFLAGS := -DPLATFORM_ANDROID -DPRE_ANDROID23 -Wno-narrowing $(LOCAL_CFLAGS)
-LOCAL_CPPFLAGS := -std=c++11
+LOCAL_CPPFLAGS := -std=c++14 -frtti
+LOCAL_CPPFLAGS += -frtti
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../src
 
 #LOCAL_CFLAGS := -DANDROID_PUBLISH -DDEMO_MODE $(LOCAL_CFLAGS)

project/android/jni/Application.mk

@@ -1,6 +1,7 @@
-APP_PLATFORM := android-21
+APP_PLATFORM := android-19
 APP_STL := gnustl_static
 APP_OPTIM        := release
 APP_ABI          := arm64-v8a
 APP_SHORT_COMMANDS := true
+APP_CPPFLAGS += -frtti -fexceptions
 #APP_ABI          := armeabi-v7a x86

project/android_java/AndroidManifest.xml

@@ -5,8 +5,8 @@
       android:versionName="0.6.1-alpha-0.0.3">
 
     <uses-sdk
-        android:minSdkVersion="24"
-        android:targetSdkVersion="28"/>
+        android:minSdkVersion="19"
+        android:targetSdkVersion="30"/>
 
     <uses-feature
         android:name="android.hardware.touchscreen.multitouch"

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

project/android_java/jni/Application.mk

@@ -1,4 +1,4 @@
-APP_PLATFORM := android-9
+APP_PLATFORM := android-19
 APP_STL := gnustl_static
 APP_OPTIM        := release
 APP_ABI          := armeabi-v7a

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);

project/lib_projects/raknet/jni/Android.mk

@@ -4,10 +4,11 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE    := RakNet
 
-MY_PREFIX := $(LOCAL_PATH)/RakNetSources/
+MY_PREFIX := $(LOCAL_PATH)/RaknetSources/
 MY_SOURCES := $(wildcard $(MY_PREFIX)*.cpp)
-LOCAL_SRC_FILES += $(MY_SOURCES:$(MY_PREFIX)%=RakNetSources/%)
+LOCAL_SRC_FILES += $(MY_SOURCES:$(MY_PREFIX)%=RaknetSources/%)
 
 LOCAL_CFLAGS := -Wno-psabi $(LOCAL_CFLAGS)
+LOCAL_CPPFLAGS += -frtti
 
 include $(BUILD_STATIC_LIBRARY)

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

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

src/AppPlatform.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() {}

src/AppPlatform_android.h

@@ -202,6 +202,8 @@ public:
         LOGI("initConsts: screenWidth=%d, calling getScreenHeight\n", _screenWidth);
         _screenHeight = env->CallIntMethod(instance, fHeight);
         LOGI("initConsts: screenHeight=%d, done\n", _screenHeight);
+
+        return 1;
     }
 
     void tick() {
@@ -536,7 +538,7 @@ public:
 
     static __inline bool isSquare(int n) {
         int L = n & 0xf;
-        if ((1 << L) & 0x213 == 0) return false;
+        if (((1 << L) & 0x213) == 0) return false;
 
         int t = (int) sqrt((double) n) + 0.5;
         return t*t == n;

src/AppPlatform_glfw.cpp

@@ -1,74 +1,5 @@
 #include "AppPlatform_glfw.h"
 
-#ifdef WIN32
-#include <Windows.h>
-#endif
-
-// Loader that tries GLFW first, then falls back to opengl32.dll for any
-// function that glfwGetProcAddress can't resolve.
-void* winGLLoader(const char* name) {
-    void* p = (void*)glfwGetProcAddress(name);
-#ifdef WIN32
-    if (!p) {
-        static HMODULE opengl32 = LoadLibraryA("opengl32.dll");
-        if (opengl32) p = (void*)GetProcAddress(opengl32, name);
-    }
-#endif
-    return p;
-}
-
-// -----------------------------------------------------------------------
-// Compatibility wrappers for OpenGL ES functions absent from desktop GL.
-// The desktop equivalents use double parameters and are not declared in
-// the GLES1 GLAD header, so look them up at runtime via winGLLoader.
-// -----------------------------------------------------------------------
-static void APIENTRY compat_glDepthRangef(GLfloat n, GLfloat f) {
-    typedef void(APIENTRY *fn_t)(double, double);
-    static fn_t fn = (fn_t)winGLLoader("glDepthRange");
-    if (fn) fn((double)n, (double)f);
-}
-static void APIENTRY compat_glClearDepthf(GLfloat d) {
-    typedef void(APIENTRY *fn_t)(double);
-    static fn_t fn = (fn_t)winGLLoader("glClearDepth");
-    if (fn) fn((double)d);
-}
-static void APIENTRY compat_glOrthof(GLfloat l, GLfloat r, GLfloat b,
-                                      GLfloat t, GLfloat n, GLfloat f) {
-    typedef void(APIENTRY *fn_t)(double,double,double,double,double,double);
-    static fn_t fn = (fn_t)winGLLoader("glOrtho");
-    if (fn) fn(l, r, b, t, n, f);
-}
-static void APIENTRY compat_glFrustumf(GLfloat l, GLfloat r, GLfloat b,
-                                        GLfloat t, GLfloat n, GLfloat f) {
-    typedef void(APIENTRY *fn_t)(double,double,double,double,double,double);
-    static fn_t fn = (fn_t)winGLLoader("glFrustum");
-    if (fn) fn(l, r, b, t, n, f);
-}
-
-// glFogx / glFogxv are OpenGL ES fixed-point variants that don't exist in
-// desktop opengl32.dll.  Wrap them via the float equivalents.  For fog-mode
-// enum params the GLfixed value IS the enum integer, so the cast is exact.
-static void APIENTRY compat_glFogx(GLenum pname, GLfixed param) {
-    glFogf(pname, (GLfloat)param);
-}
-static void APIENTRY compat_glFogxv(GLenum pname, const GLfixed* params) {
-    // Only GL_FOG_COLOR uses an array; convert each element.
-    GLfloat fp[4] = {
-        (GLfloat)params[0], (GLfloat)params[1],
-        (GLfloat)params[2], (GLfloat)params[3]
-    };
-    glFogfv(pname, fp);
-}
-
-void glPatchDesktopCompat() {
-    if (!glad_glDepthRangef) glad_glDepthRangef = compat_glDepthRangef;
-    if (!glad_glClearDepthf) glad_glClearDepthf = compat_glClearDepthf;
-    if (!glad_glOrthof)      glad_glOrthof      = compat_glOrthof;
-    if (!glad_glFrustumf)    glad_glFrustumf    = compat_glFrustumf;
-    if (!glad_glFogx)        glad_glFogx        = compat_glFogx;
-    if (!glad_glFogxv)       glad_glFogxv       = compat_glFogxv;
-}
-
 float AppPlatform_glfw::getPixelsPerMillimeter() {
     GLFWmonitor* monitor = glfwGetPrimaryMonitor();
 

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);
 }
@@ -31,7 +35,7 @@ public:
     {
     }
 
-	BinaryBlob readAssetFile(const std::string& filename) {
+	BinaryBlob readAssetFile(const std::string& filename) override {
 		FILE* fp = fopen(("data/" + filename).c_str(), "r");
 		if (!fp)
 			return BinaryBlob();
@@ -48,7 +52,7 @@ public:
 		return blob;
 	}
 
-    void saveScreenshot(const std::string& filename, int glWidth, int glHeight) {
+    void saveScreenshot(const std::string& filename, int glWidth, int glHeight) override {
         //@todo
     }
 
@@ -56,7 +60,7 @@ public:
         return (p & 0xff00ff00) | ((p >> 16) & 0xff) | ((p << 16) & 0xff0000);
     }
 
-    TextureData loadTexture(const std::string& filename_, bool textureFolder)
+    TextureData loadTexture(const std::string& filename_, bool textureFolder) override
 	{
 		// Support fetching PNG textures via HTTP/HTTPS (for skins, etc)
 		if (Util::startsWith(filename_, "http://") || Util::startsWith(filename_, "https://")) {
@@ -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() { return 854; };
-	virtual int getScreenHeight() { return 480; };
+	virtual int getScreenWidth() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
 
-	virtual float getPixelsPerMillimeter();
+			return w;
+		#endif
 
-	virtual bool supportsTouchscreen() override { return true; }
+		return 854; 
+	};
+
+	virtual int getScreenHeight() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return h;
+		#endif
+
+		return 480; 
+	};
+
+	virtual float getPixelsPerMillimeter() override;
+
+	virtual bool supportsTouchscreen() override { return false; /* glfw supports only mouse and keyboard */ }
+
+	virtual 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,13 +143,13 @@ 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
 	}
 
+	GLFWwindow* window;
+
 private:
 };
-
-void* winGLLoader(const char* name);
-void glPatchDesktopCompat();
-
 #endif /*APPPLATFORM_GLFW_H__*/

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)
@@ -117,7 +120,6 @@ void NinecraftApp::init()
 		setScreen(new UsernameScreen());
 	}
 #else
-	user->name = "Server";
 	hostMultiplayer();
 #endif
 }
@@ -246,8 +248,9 @@ void NinecraftApp::initGLStates()
 	glCullFace(GL_BACK);
 
 	glEnable2(GL_TEXTURE_2D);
+#ifndef _EMSCRIPTEN_
 	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-
+#endif
 	// Both updates isPowerVR flag in java and returns if the graphics chip is PowerVR SGX or not
 	_powerVr = platform()->isPowerVR();
 #ifdef __APPLE__

src/client/Minecraft.cpp

@@ -1,4 +1,6 @@
 #include "Minecraft.h"
+#include "Options.h"
+#include "client/Options.h"
 #include "client/player/input/IBuildInput.h"
 #include "platform/input/Keyboard.h"
 #include "world/item/Item.h"
@@ -22,6 +24,8 @@
 #include "../world/level/storage/LevelStorageSource.h"
 #include "../world/level/storage/LevelStorage.h"
 #include "player/input/KeyboardInput.h"
+#include "player/input/ControllerTurnInput.h"
+#include "player/input/XperiaPlayInput.h"
 #include "world/level/chunk/ChunkSource.h"
 
 #ifndef STANDALONE_SERVER
@@ -72,6 +76,8 @@
 #include "../util/Mth.h"
 #include "../network/packet/InteractPacket.h"
 #include "../network/packet/RespawnPacket.h"
+#include "../network/packet/AdventureSettingsPacket.h"
+#include "../network/packet/SetSpawnPositionPacket.h"
 #include "IConfigListener.h"
 #include "../world/entity/MobCategory.h"
 #include "../world/Difficulty.h"
@@ -111,8 +117,7 @@ int Minecraft::customDebugId = Minecraft::CDI_NONE;
 
 bool Minecraft::useAmbientOcclusion = false;
 
-Minecraft::Minecraft()
-:	user(NULL),
+Minecraft::Minecraft() :	
 	level(NULL),
 	player(NULL),
 	cameraTargetPlayer(NULL),
@@ -217,7 +222,6 @@ Minecraft::~Minecraft()
 	}
 
 	//delete player;
-	delete user;
 	delete inputHolder;
 
 	delete storageSource;
@@ -332,6 +336,7 @@ void Minecraft::leaveGame(bool renameLevel /*=false*/)
 
 	_running = false;
 #ifndef STANDALONE_SERVER
+	gui.clearMessages();
 	if (renameLevel) {
 		setScreen(new RenameMPLevelScreen(LevelStorageSource::TempLevelId));
 	}
@@ -636,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());
@@ -656,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);
@@ -687,66 +688,63 @@ 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_E) {
-					screenChooser.setScreen(SCREEN_BLOCKSELECTION);
-				}
+			if (key == Keyboard::KEY_LEFT_CTRL) {
+				player->setSprinting(true);
+			}
 
-				if (!screen && key == Keyboard::KEY_T && level) {
-					setScreen(new ConsoleScreen());
-				}
+			if (key == Keyboard::KEY_E) {
+				screenChooser.setScreen(SCREEN_BLOCKSELECTION);
+			}
 
-				if (!screen && key == Keyboard::KEY_O || key == 250) {
-					releaseMouse();
-				}
+			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 (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 (key == Keyboard::KEY_L) {
-					int dst = options.getIntValue(OPTIONS_VIEW_DISTANCE);
-					options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
-				}
+			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);
@@ -829,13 +827,8 @@ void Minecraft::tickInput() {
 				}
 			#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) {
@@ -862,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
@@ -1108,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;
@@ -1139,10 +1139,10 @@ void Minecraft::init()
 	checkGlError("Init complete");
 #endif
 
-	user = new User("TestUser", "");
+	options.load();
+
 	setIsCreativeMode(false); // false means it's Survival Mode
 	reloadOptions();
-
 }
 
 void Minecraft::setSize(int w, int h) {
@@ -1156,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 {
@@ -1223,7 +1224,6 @@ void Minecraft::reloadOptions() {
 	if ((wasTouchscreen != useTouchscreen()) || (inputHolder == 0))
 		_reloadInput();
 
-	// TODO:
 	// user->name = options.username;
 
 	LOGI("Reloading-options\n");
@@ -1237,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 {
@@ -1328,9 +1324,9 @@ void Minecraft::hostMultiplayer(int port) {
 #if !defined(NO_NETWORK)
 	netCallback = new ServerSideNetworkHandler(this, raknetInstance);
     #ifdef STANDALONE_SERVER
-        raknetInstance->host(user->name, port, 16);
+        raknetInstance->host("Server", port, 16);
     #else
-        raknetInstance->host(user->name, port);
+        raknetInstance->host(options.getStringValue(OPTIONS_USERNAME), port);
     #endif
 #endif
 }
@@ -1387,8 +1383,10 @@ void Minecraft::_levelGenerated()
 
 	this->cameraTargetPlayer = player;
 
+	std::string serverName = options.getStringValue(OPTIONS_USERNAME) + " - " + level->getLevelData()->levelName;
+
 	if (raknetInstance->isServer())
-		raknetInstance->announceServer(user->name);
+		raknetInstance->announceServer(serverName);
 
 	if (netCallback) {
 		netCallback->levelGenerated(level);
@@ -1564,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();
 	}
 }
 

src/client/Minecraft.h

@@ -13,7 +13,6 @@
 //#include "../network/RakNetInstance.h"
 #include "../world/phys/HitResult.h"
 
-class User;
 class Level;
 class LocalPlayer;
 class IInputHolder;
@@ -110,6 +109,8 @@ public:
 
 	bool isLevelGenerated();
 
+	void handleMouseDown(int button, bool down);
+	
     void audioEngineOn();
     void audioEngineOff();
     
@@ -165,7 +166,6 @@ public:
 	int lastTickTime;
 	float ticksSinceLastUpdate;
 
-	User*  user;
 	Level* level;
 
 	LocalPlayer*	player;

src/client/MouseHandler.cpp

@@ -5,7 +5,7 @@
 #include <SDL/SDL.h>
 #endif
 
-#ifdef PLATFORM_GLFW
+#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_GLFW
+#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_GLFW
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
 	glfwSetInputMode(glfwGetCurrentContext(), GLFW_CURSOR, GLFW_CURSOR_NORMAL);
 #endif
 }

src/client/Option.cpp

@@ -1,5 +1,8 @@
 #include "Option.h"
 #include <sstream>
+#include <cstdio>
+
+Option::~Option() {}
 
 bool Option::parse_bool_like(const std::string& value, bool& out) {
     if (value == "true" || value == "YES") {
@@ -23,7 +26,7 @@ bool OptionFloat::parse(const std::string& value) {
         return true;
     }
 
-    return std::sscanf(value.c_str(), "%f", &m_value) == 1;
+    return sscanf(value.c_str(), "%f", &m_value) == 1;
 }
 bool OptionInt::parse(const std::string& value) {
     bool b;
@@ -32,7 +35,7 @@ bool OptionInt::parse(const std::string& value) {
         return true;
     }
 
-    return std::sscanf(value.c_str(), "%d", &m_value) == 1;
+    return sscanf(value.c_str(), "%d", &m_value) == 1;
 }
 bool OptionBool::parse(const std::string& value) {
     if (value == "0") {

src/client/Option.h

@@ -21,7 +21,7 @@ template<> struct is_min_max_option<float> : std::true_type {};
 class Option {
 public:
     Option(const std::string& key) : m_key("options." + key) {}
-    virtual ~Option() = default;
+    virtual ~Option();
 
     const std::string& getStringId() { return m_key; }
 

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;
@@ -168,9 +170,7 @@ void Options::set(OptionId key, const std::string& value) {
 
 	if (option) {
 		option->set(value);
-
 		notifyOptionUpdate(key, value);
-		save();
 	}
 }
 
@@ -179,9 +179,7 @@ void Options::set(OptionId key, float value) {
 
 	if (option) {
 		option->set(value);
-
 		notifyOptionUpdate(key, value);
-		save();
 	}
 }
 
@@ -190,9 +188,7 @@ void Options::set(OptionId key, int value) {
 
 	if (option) {
 		option->set(value);
-
 		notifyOptionUpdate(key, value);
-		save();
 	}
 }
 
@@ -201,9 +197,7 @@ void Options::toggle(OptionId key) {
 
 	if (option) {
 		option->toggle();
-
 		notifyOptionUpdate(key, option->get());
-		save();
 	}
 }
 
@@ -291,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);
 }

src/client/Options.h

@@ -83,6 +83,7 @@ enum OptionId {
     OPTIONS_FIRST_LAUNCH,
     OPTIONS_LAST_IP,
 
+    OPTIONS_RPI_CURSOR,
 	// Should be last!
 	OPTIONS_COUNT
 };
@@ -97,16 +98,13 @@ public:
 
     Options(Minecraft* minecraft, const std::string& workingDirectory = "") 
 	: minecraft(minecraft) {
+        // 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);
@@ -142,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);

src/client/OptionsFile.cpp

@@ -1,30 +1,76 @@
 #include "OptionsFile.h"
 #include <stdio.h>
 #include <string.h>
+#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");
@@ -45,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;
 }

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;
 };

src/client/User.h

@@ -1,62 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT__User_H__
-#define NET_MINECRAFT_CLIENT__User_H__
-
-//package net.minecraft.client;
-
-#include "../world/level/tile/Tile.h"
-
-class User
-{
-public:
-    //static List<Tile> allowedTiles = /*new*/ ArrayList<Tile>();
-
-    //static {
-    //    allowedTiles.push_back(Tile::rock);
-    //    allowedTiles.push_back(Tile::stoneBrick);
-    //    allowedTiles.push_back(Tile::redBrick);
-    //    allowedTiles.push_back(Tile::dirt);
-    //    allowedTiles.push_back(Tile::wood);
-    //    allowedTiles.push_back(Tile::treeTrunk);
-    //    allowedTiles.push_back(Tile::leaves);
-    //    allowedTiles.push_back(Tile::torch);
-    //    allowedTiles.push_back(Tile::stoneSlabHalf);
-
-    //    allowedTiles.push_back(Tile::glass);
-    //    allowedTiles.push_back(Tile::mossStone);
-    //    allowedTiles.push_back(Tile::sapling);
-    //    allowedTiles.push_back(Tile::flower);
-    //    allowedTiles.push_back(Tile::rose);
-    //    allowedTiles.push_back(Tile::mushroom1);
-    //    allowedTiles.push_back(Tile::mushroom2);
-    //    allowedTiles.push_back(Tile::sand);
-    //    allowedTiles.push_back(Tile::gravel);
-    //    allowedTiles.push_back(Tile::sponge);
-
-    //    allowedTiles.push_back(Tile::cloth);
-    //    allowedTiles.push_back(Tile::coalOre);
-    //    allowedTiles.push_back(Tile::ironOre);
-    //    allowedTiles.push_back(Tile::goldOre);
-    //    allowedTiles.push_back(Tile::ironBlock);
-    //    allowedTiles.push_back(Tile::goldBlock);
-    //    allowedTiles.push_back(Tile::bookshelf);
-    //    allowedTiles.push_back(Tile::tnt);
-    //    allowedTiles.push_back(Tile::obsidian);
-
-    //    // System.out.println(allowedTiles.size());
-    //}
-
-	static bool isTileAllowed(const Tile& tile) {
-		return true;
-	}
-
-    std::string name;
-    std::string sessionId;
-    //std::string mpPassword;
-
-    User(const std::string& name, const std::string& sessionId) {
-        this->name = name;
-        this->sessionId = sessionId;
-    }
-};
-
-#endif /*NET_MINECRAFT_CLIENT__User_H__*/

src/client/gamemode/GameMode.cpp

@@ -5,6 +5,7 @@
 #include "../../world/level/Level.h"
 #include "../../world/item/ItemInstance.h"
 #include "../player/LocalPlayer.h"
+#include "client/Options.h"
 #ifndef STANDALONE_SERVER
 #include "../sound/SoundEngine.h"
 #include "../particle/ParticleEngine.h"
@@ -27,7 +28,7 @@ GameMode::GameMode( Minecraft* minecraft)
 
 /*virtual*/
 Player* GameMode::createPlayer(Level* level) {
-    return new LocalPlayer(minecraft, level, minecraft->user, level->dimension->id, isCreativeType());
+    return new LocalPlayer(minecraft, level, minecraft->options.getStringValue(OPTIONS_USERNAME), level->dimension->id, isCreativeType());
 }
 
 /*virtual*/

src/client/gui/Font.cpp

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

src/client/gui/Gui.cpp

@@ -27,6 +27,7 @@
 #include "../../platform/time.h"
 #include <cmath>
 #include <algorithm>
+#include <sstream>
 
 float Gui::InvGuiScale = 1.0f / 3.0f;
 float Gui::GuiScale = 1.0f / Gui::InvGuiScale;
@@ -50,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);
@@ -74,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;
@@ -135,10 +134,14 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 #endif
 #if defined(RPI)
 	renderDebugInfo();
-#elif defined(PLATFORM_DESKTOP)
+#endif
+
+	if (Keyboard::isKeyDown(Keyboard::KEY_TAB)) {
+		renderPlayerList(font, screenWidth, screenHeight);
+	}
+
 	if (minecraft->options.getBooleanValue(OPTIONS_RENDER_DEBUG))
 		renderDebugInfo();
-#endif
 	}
 
     glDisable(GL_BLEND);
@@ -201,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;
 		}
@@ -330,6 +327,11 @@ void Gui::addMessage(const std::string& _string) {
 	}
 }
 
+void Gui::clearMessages() {
+	guiMessages.clear();
+	chatScrollOffset = 0;
+}
+
 void Gui::setNowPlaying(const std::string& string) {
 	overlayMessageString = "Now playing: " + string;
 	overlayMessageTime = 20 * 3;
@@ -339,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) {
@@ -420,9 +422,9 @@ void Gui::onConfigChanged( const Config& c ) {
 	// Create outer feedback circle
 	//
 #ifdef ANDROID
-	const float mm = 12;
+	const float mm = 50; //20
 #else
-	const float mm = 12;
+	const float mm = 50; //20
 #endif
 	const float maxRadius = minecraft->pixelCalcUi.millimetersToPixels(mm);
 	const float radius = Mth::Min(80.0f/2, maxRadius);
@@ -527,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());
@@ -799,6 +797,85 @@ void Gui::renderDebugInfo() {
 	t.endOverrideAndDraw();
 }
 
+void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {
+	// only show when in game, no other screen
+	// if (!minecraft->level) return;
+
+	// only show the overlay while connected to a multiplayer server
+	Level* level = minecraft->level;
+	if (!level) return;
+	if (!level->isClientSide) return;
+
+	std::vector<std::string> playerNames;
+	playerNames.reserve(level->players.size());
+
+	for (Player* player : level->players) {
+		if (!player) continue;
+		playerNames.push_back(player->name);
+	}
+
+	// is this check needed? if there are no players, the box won't render at all since height will be 0, 
+	// but maybe we want to skip rendering entirely in that case
+	// if (playerNames.empty())
+	// 	return;
+
+	std::sort(playerNames.begin(), playerNames.end());
+
+	float maxNameWidth = 0.0f;
+	// find the longest name so we can size the box accordingly
+	for (const std::string& name : playerNames) {
+		float nameWidth = font->width(name);
+		if (nameWidth > maxNameWidth)
+			maxNameWidth = nameWidth;
+	}
+
+	// player count title
+	std::ostringstream titleStream;
+	titleStream << "Players (" << playerNames.size() << ")";
+	std::string titleText = titleStream.str();
+	float titleWidth = font->width(titleText);
+
+	if (titleWidth > maxNameWidth)
+		maxNameWidth = titleWidth;
+
+	const float padding = 4.0f;
+	const float lineHeight = (float)Font::DefaultLineHeight;
+
+	const float boxWidth = maxNameWidth + padding * 2;
+	const float boxHeight = (playerNames.size() + 1) * lineHeight + padding * 2;
+
+	const float boxLeft = (screenWidth - boxWidth) / 2.0f;
+	const float boxTop = 10.0f;
+	const float boxRight = boxLeft + boxWidth;
+	const float boxBottom = boxTop + boxHeight;
+
+	fill(boxLeft, boxTop, boxRight, boxBottom, 0x90000000);
+
+	float titleX = (screenWidth - titleWidth) / 2.0f;
+	float titleY = boxTop + padding;
+
+	// scale the text down slightly
+	// i think the gl scaling is the best for this
+	// oh my god this looks really bad OH GOD
+	//const float textScale = 0.8f;
+	//const float invTextScale = 1.0f / textScale;
+	//glPushMatrix2();
+	//glScalef2(textScale, textScale, 1);
+
+	// draw title
+	//font->draw(titleText, titleX * invTextScale, titleY * invTextScale, 0xFFFFFFFF);
+	font->draw(titleText, titleX, titleY, 0xFFFFFFFF);
+
+	// draw player names
+	// we should add ping icons here eventually, but for now just show names
+	float currentY = boxTop + padding + lineHeight;
+	for (const std::string& name : playerNames) {
+		font->draw(name, (boxLeft + padding), currentY, 0xFFDDDDDD);
+		currentY += lineHeight;
+	}
+	//glPopMatrix2();
+}
+
 void Gui::renderSleepAnimation( const int screenWidth, const int screenHeight ) {
 	int timer = minecraft->player->getSleepTimer();
 	float amount = (float) timer / (float) Player::SLEEP_DURATION;
@@ -994,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);
@@ -1008,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();

src/client/gui/Gui.h

@@ -61,10 +61,12 @@ public:
 	void renderBubbles();
 	void renderHearts();
 	void renderDebugInfo();
+	void renderPlayerList(Font* font, int screenWidth, int screenHeight);
 
 	void renderProgressIndicator( const bool isTouchInterface, const int screenWidth, const int screenHeight, float a );
 
     void addMessage(const std::string& string);
+	void clearMessages();
 	void postError(int errCode);
 
     void onGraphicsReset();
@@ -125,6 +127,8 @@ private:
 	static const float DropTicks;
 	float  _currentDropTicks;
 	int    _currentDropSlot;
+
+	bool   _openInventorySlot;
 };
 
 #endif /*NET_MINECRAFT_CLIENT_GUI__Gui_H__*/

src/client/gui/Screen.cpp

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

src/client/gui/components/Button.cpp

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

src/client/gui/components/ImageButton.cpp

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

src/client/gui/components/LargeImageButton.cpp

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

src/client/gui/components/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();
 }

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);
 }

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__*/

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);

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:

src/client/gui/screens/ConfirmScreen.cpp

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

src/client/gui/screens/ConsoleScreen.cpp

@@ -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);
 }

src/client/gui/screens/CreditsScreen.cpp

@@ -37,6 +37,8 @@ void CreditsScreen::init() {
     _lines.push_back("mschiller890");
     _lines.push_back("InviseDivine");
     _lines.push_back("Kolyah35");
+    _lines.push_back("karson");
+    _lines.push_back("deepfriedwaffles");
     _lines.push_back("");
     // avoid color tags around the URL so it isn't mangled by the parser please
     _lines.push_back("Join our Discord server: https://discord.gg/c58YesBxve");

src/client/gui/screens/DeathScreen.cpp

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

src/client/gui/screens/DisconnectionScreen.h

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

src/client/gui/screens/InBedScreen.cpp

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

src/client/gui/screens/OptionsScreen.cpp

@@ -9,6 +9,7 @@
 
 #include "../components/ImageButton.h"
 #include "../components/OptionsGroup.h"
+#include "platform/input/Keyboard.h"
 
 OptionsScreen::OptionsScreen()
 	: btnClose(NULL),
@@ -18,7 +19,6 @@ OptionsScreen::OptionsScreen()
 }
 
 OptionsScreen::~OptionsScreen() {
-
 	if (btnClose != NULL) {
 		delete btnClose;
 		btnClose = NULL;
@@ -52,7 +52,6 @@ OptionsScreen::~OptionsScreen() {
 }
 
 void OptionsScreen::init() {
-
 	bHeader = new Touch::THeader(0, "Options");
 
 	btnClose = new ImageButton(1, "");
@@ -88,7 +87,6 @@ void OptionsScreen::init() {
 }
 
 void OptionsScreen::setupPositions() {
-
 	int buttonHeight = btnClose->height;
 
 	btnClose->x = width - btnClose->width;
@@ -133,7 +131,6 @@ void OptionsScreen::setupPositions() {
 
 
 void OptionsScreen::render(int xm, int ym, float a) {
-
 	renderBackground();
 
 	int xmm = xm * width / minecraft->width;
@@ -149,27 +146,24 @@ 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;
 		selectCategory(categoryButton);
-
 	}
 	else if (button == btnCredits) {
-
 		minecraft->setScreen(new CreditsScreen());
-
 	}
 }
 
 void OptionsScreen::selectCategory(int index) {
-
 	int currentIndex = 0;
 
 	for (std::vector<Touch::TButton*>::iterator it = categoryButtons.begin(); it != categoryButtons.end(); ++it) {
@@ -213,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);
@@ -221,9 +216,6 @@ void OptionsScreen::generateOptionScreens() {
 
 	// // Graphics Pane
 	optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft)
-		// .addOptionItem(&Options::Option::VIEW_BOBBING, minecraft)
-		// .addOptionItem(&Options::Option::AMBIENT_OCCLUSION, minecraft)
-		// .addOptionItem(&Options::Option::ANAGLYPH, minecraft)
 		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
 		.addOptionItem(OPTIONS_VSYNC, minecraft)
 		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
@@ -232,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);
 
@@ -244,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);
 
@@ -254,7 +245,9 @@ void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 void OptionsScreen::keyPressed(int eventKey) {
 	if (currentOptionsGroup != NULL)
 		currentOptionsGroup->keyPressed(minecraft, eventKey);
-
+	if (eventKey == Keyboard::KEY_ESCAPE) 
+		minecraft->options.save();
+	
 	super::keyPressed(eventKey);
 }
 

src/client/gui/screens/PauseScreen.cpp

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

src/client/gui/screens/PauseScreen.h

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

src/client/gui/screens/ProgressScreen.h

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

src/client/gui/screens/ScreenChooser.cpp

@@ -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

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;

src/client/gui/screens/SimpleChooseLevelScreen.cpp

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

src/client/gui/screens/UsernameScreen.cpp

@@ -1,7 +1,6 @@
 #include "UsernameScreen.h"
 #include "StartMenuScreen.h"
 #include "../../Minecraft.h"
-#include "../../User.h"
 #include "../Font.h"
 #include "../components/Button.h"
 #include "../../../platform/input/Keyboard.h"
@@ -75,7 +74,6 @@ void UsernameScreen::buttonClicked(Button* button)
     if (button == &_btnDone && !tUsername.text.empty()) {
         minecraft->options.set(OPTIONS_USERNAME, tUsername.text);
         minecraft->options.save();
-        minecraft->user->name = tUsername.text;
         minecraft->setScreen(NULL); // goes to StartMenuScreen
     }
 }

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);

src/client/gui/screens/touch/TouchSelectWorldScreen.h

@@ -86,21 +86,21 @@ public:
 	SelectWorldScreen();
 	virtual ~SelectWorldScreen();
 
-	virtual void init();
-	virtual void setupPositions();
+	virtual void init() override;
+	virtual void setupPositions() override;
 
-	virtual void tick();
-	virtual void render(int xm, int ym, float a);
+	virtual void tick() override;
+	virtual void render(int xm, int ym, float a) override;
 
 	virtual bool isIndexValid(int index);
-	virtual bool handleBackEvent(bool isDown);
-	virtual void buttonClicked(Button* button);
-	virtual void keyPressed(int eventKey);
+	virtual bool handleBackEvent(bool isDown) override;
+	virtual void buttonClicked(Button* button) override;
+	virtual void keyPressed(int eventKey) override;
 
 	// support for mouse wheel when desktop code uses touch variant
 	virtual void mouseWheel(int dx, int dy, int xm, int ym) override;
 
-	bool isInGameScreen();
+	bool isInGameScreen() override;
 private:
 	void loadLevelSource();
 	std::string getUniqueLevelName(const std::string& level);

src/client/player/LocalPlayer.cpp

@@ -24,12 +24,15 @@
 #include "../../platform/HttpClient.h"
 #include "../../platform/CThread.h"
 #include "../../util/StringUtils.h"
+#include "client/Options.h"
 
 #if defined(_WIN32)
 #include <direct.h>
+#include <sys/stat.h>
 #else
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <errno.h>
 #endif
 
 #ifndef STANDALONE_SERVER
@@ -185,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;
@@ -226,6 +256,7 @@ static void* fetchSkinForPlayer(void* param) {
     std::string skinUrl = getSkinUrlForUsername(player->name);
     if (skinUrl.empty()) {
         LOGW("[Skin] skin URL lookup failed for %s\n", player->name.c_str());
+        player->setTextureName("mob/char.png");
         return NULL;
     }
 
@@ -233,6 +264,7 @@ 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());
+        player->setTextureName("mob/char.png");
         return NULL;
     }
 
@@ -242,11 +274,13 @@ static void* fetchSkinForPlayer(void* param) {
         fwrite(skinData.data(), 1, skinData.size(), fp);
         fclose(fp);
         LOGI("[Skin] cached skin to %s\n", cacheFile.c_str());
-    } else {
+
+		player->setTextureName("skins/" + player->name + ".png");
+	} else {
         LOGW("[Skin] failed to write skin cache %s\n", cacheFile.c_str());
+        player->setTextureName("mob/char.png");
     }
 
-    player->setTextureName("skins/" + player->name + ".png");
     return NULL;
 }
 
@@ -287,11 +321,12 @@ static void* fetchCapeForPlayer(void* param) {
         fwrite(capeData.data(), 1, capeData.size(), fp);
         fclose(fp);
         LOGI("[Cape] cached cape to %s\n", cacheFile.c_str());
+
+		player->setCapeTextureName("capes/" + player->name + ".png");
     } else {
         LOGW("[Cape] failed to write cape cache %s\n", cacheFile.c_str());
     }
 
-    player->setCapeTextureName("capes/" + player->name + ".png");
     return NULL;
 }
 
@@ -310,7 +345,7 @@ static bool isJumpable(int tileId) {
 
 } // anonymous namespace
 
-LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user, int dimension, bool isCreative)
+LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string& username, int dimension, bool isCreative)
 :	Player(level, isCreative),
 	minecraft(minecraft),
 	input(NULL),
@@ -324,11 +359,15 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user, int dim
 {
 	this->dimension = dimension;
 	_init();
-
 #ifndef STANDALONE_SERVER
-	if (user != NULL && !user->name.empty()) {
-		this->name = user->name;
+
+	if (minecraft->options.getStringValue(OPTIONS_USERNAME).size() != 0) {
+		textureName = "mob/char.png";
+
+		this->name = minecraft->options.getStringValue(OPTIONS_USERNAME);
+		printf("test \n");
 		// Fetch user skin and cape from Mojang servers in the background (avoids blocking the main thread)
+		// TODO: Fix this memory leak
 		new CThread(fetchSkinForPlayer, this);
 		new CThread(fetchCapeForPlayer, this);
 	}
@@ -350,8 +389,8 @@ void LocalPlayer::calculateFlight(float xa, float ya, float za) {
     za = za * flySpeed;
 
 #ifdef ANDROID
-    if (Keyboard::isKeyDown(103)) ya = .2f * minecraft->options.flySpeed;
-    if (Keyboard::isKeyDown(102)) ya = -.2f * minecraft->options.flySpeed;
+    if (Keyboard::isKeyDown(103)) ya = .2f * flySpeed;
+    if (Keyboard::isKeyDown(102)) ya = -.2f * flySpeed;
 #else
     if (Keyboard::isKeyDown(Keyboard::KEY_E)) ya = .2f * flySpeed;
     if (Keyboard::isKeyDown(Keyboard::KEY_Q)) ya = -.2f * flySpeed;

src/client/player/LocalPlayer.h

@@ -4,8 +4,6 @@
 //package net.minecraft.client.player;
 
 #include "input/IMoveInput.h"
-#include "../User.h"
-#include "../../platform/input/Keyboard.h"
 #include "../../util/SmoothFloat.h"
 #include "../../world/entity/player/Player.h"
 
@@ -17,7 +15,7 @@ class LocalPlayer: public Player
 {
 	typedef Player super;
 public:
-	LocalPlayer(Minecraft* minecraft, Level* level, User* user, int dimension, bool isCreative);
+	LocalPlayer(Minecraft* minecraft, Level* level, const std::string& username, int dimension, bool isCreative);
 	~LocalPlayer();
 
 	void _init();

src/client/player/input/KeyboardInput.cpp

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

src/client/player/input/XperiaPlayInput.h

@@ -4,6 +4,8 @@
 //package net.minecraft.client.player;
 
 #include "KeyboardInput.h"
+#include "platform/input/Controller.h"
+#include "world/entity/player/Player.h"
 
 // @note: This is just copy-pasted from KeyboardInput right now.
 class XperiaPlayInput: public KeyboardInput

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);

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;
@@ -126,8 +130,8 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
     
     // If too large (like playing on Tablet)
     PixelCalc& pc = _minecraft->pixelCalc;
-    if (pc.pixelsToMillimeters(Bw) > 14) {
-        Bw = Bh = pc.millimetersToPixels(14);
+    if (pc.pixelsToMillimeters(Bw) > 200) { //14
+        Bw = Bh = pc.millimetersToPixels(200); //14
     }
 	// temp data
 	float xx;
@@ -158,34 +162,40 @@ 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();
 }
 
-void TouchscreenInput_TestFps::setKey( int key, bool state )
+void TouchscreenInput_TestFps::setKey(int key, bool state)
 {
 	#ifdef WIN32
-        //LOGI("key: %d, %d\n", key, state);
+		//LOGI("key: %d, %d\n", key, state);
 
 		int id = -1;
-		if (key == _options->keyUp.key) id = KEY_UP;
-		if (key == _options->keyDown.key) id = KEY_DOWN;
-		if (key == _options->keyLeft.key) id = KEY_LEFT;
-		if (key == _options->keyRight.key) id = KEY_RIGHT;
-		if (key == _options->keyJump.key) id = KEY_JUMP;
-		if (key == _options->keySneak.key) id = KEY_SNEAK;
-		if (key == _options->keyCraft.key) id = KEY_CRAFT;
-		if (id >= 0) {
-			_keys[id] = state;
-		}
+		// theres no keyUp etc???
+		//if (key == _options->keyUp.key) id = KEY_UP;
+		//if (key == _options->keyDown.key) id = KEY_DOWN;
+		//if (key == _options->keyLeft.key) id = KEY_LEFT;
+		//if (key == _options->keyRight.key) id = KEY_RIGHT;
+		//if (key == _options->keyJump.key) id = KEY_JUMP;
+		//if (key == _options->keySneak.key) id = KEY_SNEAK;
+		//if (key == _options->keyCraft.key) id = KEY_CRAFT;
+		//if (id >= 0) {
+		//	_keys[id] = state;
+		//}
+
+		if (key == _options->getIntValue(OPTIONS_KEY_FORWARD)) id = KEY_UP;
+		if (key == _options->getIntValue(OPTIONS_KEY_BACK)) id = KEY_DOWN;
+		if (key == _options->getIntValue(OPTIONS_KEY_LEFT)) id = KEY_LEFT;
+		if (key == _options->getIntValue(OPTIONS_KEY_RIGHT)) id = KEY_RIGHT;
+		if (key == _options->getIntValue(OPTIONS_KEY_JUMP)) id = KEY_JUMP;
+		if (key == _options->getIntValue(OPTIONS_KEY_SNEAK)) id = KEY_SNEAK;
+		//if (key == _options->getIntValue(OPTIONS_KEY_CRAFT)) id = KEY_CRAFT;
 	#endif
 }
 
@@ -300,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;
 	}
 
@@ -490,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;
 

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;

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.isJoyTouchArea;
-#else 
-    bool freeform = false;
-#endif
+
+    bool freeform = mc->useTouchscreen(); //&& !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
+    
     if (freeform) {
         isPicking = updateFreeformPickDirection(a, pickDirection);
     } else {

src/client/renderer/Tesselator.cpp

@@ -79,6 +79,9 @@ RenderChunk Tesselator::end( bool useMine, int bufferId )
 	const int o_vertices = vertices;
 
 	if (vertices > 0) {
+		if (p <= 0 || p > maxVertices) { clear(); return RenderChunk(); }
+		int bytes = p * sizeof(VERTEX);
+		if (bytes <= 0) return RenderChunk();
 		if (++vboId >= vboCounts)
 			vboId = 0;
 
@@ -92,11 +95,11 @@ RenderChunk Tesselator::end( bool useMine, int bufferId )
 		bufferId = vboIds[vboId];
 #endif
 		int access = GL_STATIC_DRAW;//(accessMode==ACCESS_DYNAMIC) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW;
-		int bytes = p * sizeof(VERTEX);
 		glBindBuffer2(GL_ARRAY_BUFFER, bufferId);
 		glBufferData2(GL_ARRAY_BUFFER, bytes, _varray, access); // GL_STREAM_DRAW
+		
 		totalSize += bytes;
-
+	
 #ifndef USE_VBO
 		// 0 1 2 3 4 5 6 7
 		// x y z u v c
@@ -264,6 +267,7 @@ void Tesselator::vertex( float x, float y, float z )
 		for (int i = 0; i < 2; i++) {
 
 			const int offs = 3 - i;
+			if (p - offs < 0 || p >= maxVertices) { clear(); return; }
 			VERTEX& src = _varray[p - offs];
 			VERTEX& dst = _varray[p];
 
@@ -287,6 +291,7 @@ void Tesselator::vertex( float x, float y, float z )
 		}
 	}
 
+	if (p < 0 || p >= maxVertices) { clear(); return; }
 	VERTEX& vertex = _varray[p];
 
 	if (hasTexture) {
@@ -377,13 +382,15 @@ void Tesselator::draw()
 	tesselating = false;
 
 	if (vertices > 0) {
+		if (p <= 0 || p > maxVertices) { clear(); return; }
+		int bytes = p * sizeof(VERTEX);
+		if (bytes <= 0) { clear(); return; }
 		if (++vboId >= vboCounts)
 			vboId = 0;
 
 		int bufferId = vboIds[vboId];
 		
 		int access = GL_DYNAMIC_DRAW;//(accessMode==ACCESS_DYNAMIC) ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW;
-		int bytes = p * sizeof(VERTEX);
 		glBindBuffer2(GL_ARRAY_BUFFER, bufferId);
 		glBufferData2(GL_ARRAY_BUFFER, bytes, _varray, access); // GL_STREAM_DRAW
 

src/client/renderer/entity/HumanoidMobRenderer.cpp

@@ -167,16 +167,16 @@ void HumanoidMobRenderer::additionalRendering(Mob* mob, float a) {
             const float depth = 1.0f;
 
             // Front
-            t.tex(u0, vTop);    t.vertex(-halfW, 0.0f, 0.0f);
-            t.tex(u1, vTop);    t.vertex(halfW, 0.0f, 0.0f);
-            t.tex(u1, vBottom); t.vertex(halfW, height, 0.0f);
-            t.tex(u0, vBottom); t.vertex(-halfW, height, 0.0f);
+            t.tex(u2, vTop);    t.vertex(-halfW, 0.0f, 0.0f);
+            t.tex(u3, vTop);    t.vertex(halfW, 0.0f, 0.0f);
+            t.tex(u3, vBottom); t.vertex(halfW, height, 0.0f);
+            t.tex(u2, vBottom); t.vertex(-halfW, height, 0.0f);
 
-            // Back
-            t.tex(u2, vTop);    t.vertex(halfW, 0.0f, depth);
-            t.tex(u3, vTop);    t.vertex(-halfW, 0.0f, depth);
-            t.tex(u3, vBottom); t.vertex(-halfW, height, depth);
-            t.tex(u2, vBottom); t.vertex(halfW, height, depth);
+            // Back 
+            t.tex(u0, vTop);    t.vertex(halfW, 0.0f, depth);
+            t.tex(u1, vTop);    t.vertex(-halfW, 0.0f, depth);
+            t.tex(u1, vBottom); t.vertex(-halfW, height, depth);
+            t.tex(u0, vBottom); t.vertex(halfW, height, depth);
 
             // Left
             t.tex(uL0, vTop);    t.vertex(-halfW, 0.0f, depth);

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__*/

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;
 };
 

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();
 }

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;
 };

src/client/renderer/gles.cpp

@@ -47,9 +47,13 @@ void glInit()
 }
 
 void anGenBuffers(GLsizei n, GLuint* buffers) {
-	static GLuint k = 1;
-	for (int i = 0; i < n; ++i)
-		buffers[i] = ++k;
+#ifdef __EMSCRIPTEN__
+    glGenBuffers(n, buffers);
+#else
+    static GLuint k = 1;
+    for (int i = 0; i < n; ++i)
+        buffers[i] = ++k;
+#endif
 }
 
 #ifdef USE_VBO

src/client/renderer/gles.h

@@ -10,30 +10,36 @@
 #endif
 
 // Other systems might run it, if they #define OPENGL_ES
-#if defined(OPENGL_ES) // || defined(ANDROID)
+// #if defined(OPENGL_ES) // || defined(ANDROID)
 	#define USE_VBO
 	#define GL_QUADS 0x0007
     #if defined(__APPLE__)
         #import <OpenGLES/ES1/gl.height>
         #import <OpenGLES/ES1/glext.height>
-    #elif defined(ANDROID)
+    #elif defined(ANDROID) || defined(__EMSCRIPTEN__)
         #include <GLES/gl.h>
         #include <GLES/glext.h>
     #else
         #include <glad/glad.h>
-    #endif
-#else
-    // Uglyness to fix redeclaration issues
-    #ifdef WIN32
-	   #include <WinSock2.h>
-	   #include <Windows.h>
-	#endif
-	#include <gl/glew.h>
-	#include <gl/GL.h>
 
-	#define glFogx(a,b)	glFogi(a,b)
-	#define glOrthof(a,b,c,d,e,f) glOrtho(a,b,c,d,e,f)
-#endif
+		// https://github.com/programmer1o1/MinecraftPE-v0.6.1/blob/main/handheld/src/client/renderer/gles.h#L135-L138
+		#define glFogx(a,b)             glFogi(a,b)
+		#define glOrthof(a,b,c,d,e,f)   glOrtho(a,b,c,d,e,f)
+		#define glClearDepthf(x)        glClearDepth(x)
+		#define glDepthRangef(a,b)      glDepthRange(a,b)
+    #endif
+// #else
+//     // Uglyness to fix redeclaration issues
+//     #ifdef WIN32
+// 	   #include <winsock2.h>
+// 	   #include <Windows.h>
+// 	#endif
+// 	#include <gl/glew.h>
+// 	#include <gl/GL.h>
+
+// 	#define glFogx(a,b)	glFogi(a,b)
+// 	#define glOrthof(a,b,c,d,e,f) glOrtho(a,b,c,d,e,f)
+// #endif
 
 
 #define GLERRDEBUG 1

src/client/sound/SoundEngine.h

@@ -1,68 +1,68 @@
-#ifndef NET_MINECRAFT_CLIENT_SOUND__SoundEngine_H__
-#define NET_MINECRAFT_CLIENT_SOUND__SoundEngine_H__
-
-//package net.minecraft.client.sound;
-
-#if defined(ANDROID) && !defined(PRE_ANDROID23)
-	#include "../../platform/audio/SoundSystemSL.h"
-#elif defined(__APPLE__) || defined(PLATFORM_DESKTOP)
-    #include "../../platform/audio/SoundSystemAL.h"
-#else
-	#include "../../platform/audio/SoundSystem.h"
-#endif
-#include "SoundRepository.h"
-#include "../../util/Random.h"
-
-class Minecraft;
-class Mob;
-class Options;
-
-class SoundEngine
-{
-    static const int SOUND_DISTANCE = 16;
-
-	#if defined(ANDROID) && !defined(PRE_ANDROID23) && !defined(RPI)
-		SoundSystemSL soundSystem;
-    #elif defined(__APPLE__) || defined(PLATFORM_DESKTOP)
-        SoundSystemAL soundSystem;
-	#else
-	    SoundSystem soundSystem;
-	#endif
-
-	Options* options;
-	int idCounter;
-	//static bool loaded;
-	Random random;
-	//int noMusicDelay = random.nextInt(20 * 60 * 10);
-	float _x;
-	float _y;
-	float _z;
-    float _yRot;
-	float _invMaxDistance;
-
-public:
-	SoundEngine(float maxDistance);
-
-	~SoundEngine();
-
-    void init(Minecraft* mc, Options* options);
-	void destroy();
-
-	void enable(bool status);
-
-	void updateOptions();
-    void update(Mob* player, float a);
-
-	void play(const std::string& name, float x, float y, float z, float volume, float pitch);
-	void playUI(const std::string& name, float volume, float pitch);
-
-	float _getVolumeMult(float x, float y, float z);
-private:
-	void loadLibrary() {}
-    SoundDesc _pp(const std::string& fn);
-    
-	SoundRepository sounds;
-	Minecraft* mc;
-};
-
-#endif /*NET_MINECRAFT_CLIENT_SOUND__SoundEngine_H__*/
+#ifndef NET_MINECRAFT_CLIENT_SOUND__SoundEngine_H__
+#define NET_MINECRAFT_CLIENT_SOUND__SoundEngine_H__
+
+//package net.minecraft.client.sound;
+
+#if defined(ANDROID) && !defined(PRE_ANDROID23)
+	#include "../../platform/audio/SoundSystemSL.h"
+#elif (defined(__APPLE__) || defined(PLATFORM_DESKTOP)) && !defined(NO_SOUND)
+    #include "../../platform/audio/SoundSystemAL.h"
+#else
+	#include "../../platform/audio/SoundSystem.h"
+#endif
+#include "SoundRepository.h"
+#include "../../util/Random.h"
+
+class Minecraft;
+class Mob;
+class Options;
+
+class SoundEngine
+{
+    static const int SOUND_DISTANCE = 16;
+
+	#if defined(ANDROID) && !defined(PRE_ANDROID23) && !defined(RPI)
+		SoundSystemSL soundSystem;
+    #elif (defined(__APPLE__) || defined(PLATFORM_DESKTOP)) && !defined(NO_SOUND)
+        SoundSystemAL soundSystem;
+	#else
+	    SoundSystem soundSystem;
+	#endif
+
+	Options* options;
+	int idCounter;
+	//static bool loaded;
+	Random random;
+	//int noMusicDelay = random.nextInt(20 * 60 * 10);
+	float _x;
+	float _y;
+	float _z;
+    float _yRot;
+	float _invMaxDistance;
+
+public:
+	SoundEngine(float maxDistance);
+
+	~SoundEngine();
+
+    void init(Minecraft* mc, Options* options);
+	void destroy();
+
+	void enable(bool status);
+
+	void updateOptions();
+    void update(Mob* player, float a);
+
+	void play(const std::string& name, float x, float y, float z, float volume, float pitch);
+	void playUI(const std::string& name, float volume, float pitch);
+
+	float _getVolumeMult(float x, float y, float z);
+private:
+	void loadLibrary() {}
+    SoundDesc _pp(const std::string& fn);
+    
+	SoundRepository sounds;
+	Minecraft* mc;
+};
+
+#endif /*NET_MINECRAFT_CLIENT_SOUND__SoundEngine_H__*/

src/main.cpp

@@ -22,12 +22,12 @@
 #include "NinecraftApp.h"
 #define MAIN_CLASS NinecraftApp
 
-#ifdef PLATFORM_WINDOWS
-	#include "main_win32.h"
-#endif
+// #ifdef PLATFORM_WINDOWS
+// 	#include "main_win32.h"
+// #endif
 
 
-#ifdef PLATFORM_GLFW
+#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_WEB)
     #include "main_glfw.h"
 #endif
 

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

src/main_android.h

@@ -25,7 +25,7 @@
 #include "platform/input/Mouse.h"
 #include "platform/input/Multitouch.h"
 
-#include "EGLConfigPrinter.h"
+#include "EglConfigPrinter.h"
 
 const int BroadcastPort = 9991;
 

src/main_android_java.cpp

@@ -7,8 +7,7 @@
 //#include "main_android_java.h"
 #include "platform/input/Multitouch.h"
 #include <unistd.h>
-#include <sys/syscall.h>
-#define gettid() ((int)syscall(SYS_gettid))
+#include <pthread.h>
 
 // Horrible, I know. / A
 #ifndef MAIN_CLASS
@@ -31,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;");
@@ -44,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
@@ -145,7 +165,7 @@ Java_com_mojang_minecraftpe_GLRenderer_nativeOnSurfaceCreated(JNIEnv* env) {
 
 JNIEXPORT void JNICALL
 Java_com_mojang_minecraftpe_GLRenderer_nativeOnSurfaceChanged(JNIEnv* env, jclass cls, jint w, jint h) {
-    LOGI("@nativeOnSurfaceChanged: %p\n", pthread_self());
+    LOGI("@nativeOnSurfaceChanged: %lu\n", (unsigned long)pthread_self());
 
     if (gApp) {
         gApp->setSize(w, h);

src/main_android_java.h

@@ -23,7 +23,7 @@
 #include "platform/input/Mouse.h"
 #include "platform/input/Controller.h"
 
-#include "EGLConfigPrinter.h"
+#include "EglConfigPrinter.h"
 
 const int BroadcastPort = 9991;
 

src/main_glfw.h

@@ -2,9 +2,9 @@
 #define MAIN_GLFW_H__
 
 #include "App.h"
-#include "GLFW/glfw3.h"
+#include "client/renderer/entity/PlayerRenderer.h"
 #include "client/renderer/gles.h"
-#include "SharedConstants.h"
+#include "GLFW/glfw3.h"
 
 #include <cstdio>
 #include <chrono>
@@ -12,9 +12,10 @@
 #include "platform/input/Keyboard.h"
 #include "platform/input/Mouse.h"
 #include "platform/input/Multitouch.h"
-#include "util/Mth.h"
 #include "AppPlatform_glfw.h"
-
+#ifdef __EMSCRIPTEN__
+#include <emscripten/emscripten.h>
+#endif
 static App* g_app = 0;
 
 int transformKey(int glfwkey) {
@@ -24,6 +25,7 @@ int transformKey(int glfwkey) {
 
 	switch (glfwkey) {
 		case GLFW_KEY_ESCAPE: return Keyboard::KEY_ESCAPE;
+		case GLFW_KEY_TAB: return Keyboard::KEY_TAB;
 		case GLFW_KEY_BACKSPACE: return Keyboard::KEY_BACKSPACE;
 		case GLFW_KEY_LEFT_SHIFT: return Keyboard::KEY_LSHIFT;
 		case GLFW_KEY_ENTER: return Keyboard::KEY_RETURN;
@@ -111,12 +113,41 @@ void error_callback(int error, const char* desc) {
 	printf("Error: %s\n", desc);
 }
 
+
+void loop() {
+	using clock = std::chrono::steady_clock;
+	auto frameStart = clock::now();
+
+	g_app->update();
+
+	glfwSwapBuffers(((AppPlatform_glfw*)g_app->platform())->window);
+	glfwPollEvents();
+
+	glfwSwapInterval(((MAIN_CLASS*)g_app)->options.getBooleanValue(OPTIONS_VSYNC) ? 1 : 0);
+	if(((MAIN_CLASS*)g_app)->options.getBooleanValue(OPTIONS_LIMIT_FRAMERATE)) {
+		auto frameEnd = clock::now();
+		auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(frameEnd - frameStart);
+		auto target = std::chrono::microseconds(33333); // ~30 fps
+		if(elapsed < target)
+			std::this_thread::sleep_for(target - elapsed);
+	}
+}
+
 int main(void) {
 	AppContext appContext;
 
 #ifndef STANDALONE_SERVER
 	// Platform init.
 	appContext.platform = new AppPlatform_glfw();
+#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);
 
@@ -125,27 +156,36 @@ int main(void) {
 	}
 
 	glfwWindowHint(GLFW_CONTEXT_CREATION_API, GLFW_NATIVE_CONTEXT_API);
+#ifndef __EMSCRIPTEN__
 	glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
 	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
+#else
+	glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_ES_API);
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 1);
+	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+#endif
 
-	GLFWwindow* window = glfwCreateWindow(appContext.platform->getScreenWidth(), appContext.platform->getScreenHeight(), "main", NULL, NULL);
+	AppPlatform_glfw* platform = (AppPlatform_glfw*)appContext.platform;
+
+	platform->window = glfwCreateWindow(appContext.platform->getScreenWidth(), appContext.platform->getScreenHeight(), "Minecraft PE 0.6.1", NULL, NULL);
 	
-	if (window == NULL) {
+	if (platform->window == NULL) {
 		return 1;
 	}
 
-	glfwSetKeyCallback(window, key_callback);
-	glfwSetCharCallback(window, character_callback);
-	glfwSetCursorPosCallback(window, cursor_position_callback);
-	glfwSetMouseButtonCallback(window, mouse_button_callback);
-	glfwSetScrollCallback(window, scroll_callback);
-	glfwSetWindowSizeCallback(window, window_size_callback);
+	glfwSetKeyCallback(platform->window, key_callback);
+	glfwSetCharCallback(platform->window, character_callback);
+	glfwSetCursorPosCallback(platform->window, cursor_position_callback);
+	glfwSetMouseButtonCallback(platform->window, mouse_button_callback);
+	glfwSetScrollCallback(platform->window, scroll_callback);
+	glfwSetWindowSizeCallback(platform->window, window_size_callback);
 
-	glfwMakeContextCurrent(window);
-	gladLoadGLES1Loader((GLADloadproc)winGLLoader);
+	glfwMakeContextCurrent(platform->window);
+	#ifndef __EMSCRIPTEN__
+	gladLoadGLLoader((GLADloadproc)glfwGetProcAddress);
 	glfwSwapInterval(0);
-	glPatchDesktopCompat();
+	#endif
 #endif
 
 	App* app = new MAIN_CLASS();
@@ -156,37 +196,26 @@ int main(void) {
 	g_app->init(appContext);
 	g_app->setSize(appContext.platform->getScreenWidth(), appContext.platform->getScreenHeight());
 
+#ifdef __EMSCRIPTEN__
+	emscripten_set_main_loop(loop, 0, 1);
+#else
 	// Main event loop
-	using clock = std::chrono::steady_clock;
-	while(!glfwWindowShouldClose(window) && !app->wantToQuit()) {
-		auto frameStart = clock::now();
-
-		app->update();
-
-		glfwSwapBuffers(window);
-		glfwPollEvents();
-
-		glfwSwapInterval(((MAIN_CLASS*)app)->options.getBooleanValue(OPTIONS_VSYNC) ? 1 : 0);
-		if(((MAIN_CLASS*)app)->options.getBooleanValue(OPTIONS_LIMIT_FRAMERATE)) {
-			auto frameEnd = clock::now();
-			auto elapsed = std::chrono::duration_cast<std::chrono::microseconds>(frameEnd - frameStart);
-			auto target = std::chrono::microseconds(33333); // ~30 fps
-			if(elapsed < target)
-				std::this_thread::sleep_for(target - elapsed);
-		}
+	while(!glfwWindowShouldClose(platform->window) && !app->wantToQuit()) {
+		loop();
 	}
+#endif
 
 	delete app;
 
+#ifndef STANDALONE_SERVER
+	// Exit.
+	glfwDestroyWindow(platform->window);
+	glfwTerminate();
+#endif
+
 	appContext.platform->finish();
 	
 	delete appContext.platform;
-	
-#ifndef STANDALONE_SERVER
-	// Exit.
-	glfwDestroyWindow(window);
-	glfwTerminate();
-#endif
 
 	return 0;
 }

src/main_win32.h

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

src/network/ClientSideNetworkHandler.cpp

@@ -1,5 +1,6 @@
 
 #include "ClientSideNetworkHandler.h"
+#include "client/Options.h"
 #include "packet/PacketInclude.h"
 #include "RakNetInstance.h"
 #include "../world/level/chunk/ChunkSource.h"
@@ -85,7 +86,7 @@ void ClientSideNetworkHandler::onConnect(const RakNet::RakNetGUID& hostGuid)
 	serverGuid = hostGuid;
 
 	clearChunksLoaded();
-	LoginPacket packet(minecraft->user->name.c_str(), SharedConstants::NetworkProtocolVersion);
+	LoginPacket packet(minecraft->options.getStringValue(OPTIONS_USERNAME).c_str(), SharedConstants::NetworkProtocolVersion);
 	raknetInstance->send(packet);
 }
 
@@ -157,7 +158,7 @@ void ClientSideNetworkHandler::handle(const RakNet::RakNetGUID& source, StartGam
 	level->isClientSide = true;
 
 	bool isCreative = (packet->gameType == GameType::Creative);
-	LocalPlayer* player = new LocalPlayer(minecraft, level, minecraft->user, level->dimension->id, isCreative);
+	LocalPlayer* player = new LocalPlayer(minecraft, level, minecraft->options.getStringValue(OPTIONS_USERNAME), level->dimension->id, isCreative);
 	player->owner = rakPeer->GetMyGUID();
 	player->entityId = packet->entityId;
 	player->moveTo(packet->x, packet->y, packet->z, player->yRot, player->xRot);

src/network/ServerSideNetworkHandler.h

@@ -66,7 +66,9 @@ public:
 
 	void displayGameMessage(const std::string& message);
 private:
-
+	/**
+	 * @brief Send packet to all players
+	 */
 	void redistributePacket(Packet* packet, const RakNet::RakNetGUID& fromPlayer);
 	Player* getPlayer(const RakNet::RakNetGUID& source);
 

src/network/command/CommandServer.h

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

src/platform/CThread.cpp

@@ -25,7 +25,7 @@
 			&m_threadID        // pointer to receive thread ID
 		);
 	#endif
-	#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX)
+	#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__)
 		mp_threadFunc = (pthread_fn)threadFunc;
 
 		pthread_attr_init(&m_attributes);

src/platform/CThread.h

@@ -13,7 +13,7 @@
 
 typedef void *( * pthread_fn )( void * );
 
-#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX)
+#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__)
 	#include <pthread.h>
 	#include <unistd.h>
 
@@ -38,7 +38,7 @@ typedef void *( * pthread_fn )( void * );
 		DWORD						m_threadID;
 		HANDLE						m_threadHandle;
 	#endif
-	#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX)
+	#if defined(__linux__) || defined(ANDROID) || defined(__APPLE__) || defined(POSIX) || defined(__EMSCRIPTEN__)
 		pthread_fn					mp_threadFunc;
 		pthread_t					m_thread;
 		pthread_attr_t				m_attributes;

src/platform/HttpClient.cpp

@@ -23,39 +23,57 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
+
+// if cmake detected opensll, we define HTTPCLIENT_USE_OPENSSL and include the openssl headers
+// most linux distros should have openssl right
+#if defined(HTTPCLIENT_USE_OPENSSL)
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#endif
 #endif
 
 namespace {
-
-bool startsWith(const std::string& s, const std::string& prefix) {
-    return s.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), s.begin());
+bool stringStartsWith(const std::string& str, const std::string& prefix) {
+    return str.size() >= prefix.size() && std::equal(prefix.begin(), prefix.end(), str.begin());
 }
 
-bool parseUrl(const std::string& url, std::string& scheme, std::string& host, int& port, std::string& path);
+bool parseUrl(const std::string& url, std::string& schemeOut, std::string& hostOut, int& portOut, std::string& pathOut);
+
+// forward declarations for helper functions used by https implementation
+bool resolveAndConnect(const std::string& host, int port, int& outSocket);
+bool extractStatusCode(const std::string& headers, int& outStatus);
 
 #if defined(_WIN32)
 
-bool downloadHttpsWinHttp(const std::string& url, std::vector<unsigned char>& outBody) {
-    outBody.clear();
+// download an https url using windows winhttp 
+// this is only used on windows because the rest of the code is a simple raw tcp http client
+bool downloadHttpsWinHttp(const std::string& url, std::vector<unsigned char>& outputBody) {
+    // gotta start clear
+    outputBody.clear();
 
-    std::string scheme, host, path;
+    std::string scheme;
+    std::string host;
+    std::string path;
     int port = 0;
-    if (!parseUrl(url, scheme, host, port, path))
-        return false;
 
-    // WinHTTP expects the path to include the leading '/'.
-    HINTERNET hSession = WinHttpOpen(L"MinecraftPE/1.0", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
-    if (!hSession)
-        return false;
-
-    HINTERNET hConnect = WinHttpConnect(hSession, std::wstring(host.begin(), host.end()).c_str(), port, 0);
-    if (!hConnect) {
-        WinHttpCloseHandle(hSession);
+    // split into scheme/host/port/path
+    if (!parseUrl(url, scheme, host, port, path)) {
         return false;
     }
 
-    HINTERNET hRequest = WinHttpOpenRequest(
-        hConnect,
+    // creating an http session
+    HINTERNET session = WinHttpOpen(L"MinecraftPE/0.6.1", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0);
+    if (!session) {
+        return false;
+    }
+    HINTERNET connectHandle = WinHttpConnect(session, std::wstring(host.begin(), host.end()).c_str(), port, 0);
+    if (!connectHandle) {
+        WinHttpCloseHandle(session);
+        return false;
+    }
+
+    HINTERNET requestHandle = WinHttpOpenRequest(
+        connectHandle,
         L"GET",
         std::wstring(path.begin(), path.end()).c_str(),
         NULL,
@@ -64,109 +82,245 @@ bool downloadHttpsWinHttp(const std::string& url, std::vector<unsigned char>& ou
         WINHTTP_FLAG_SECURE
     );
 
-    if (!hRequest) {
-        WinHttpCloseHandle(hConnect);
-        WinHttpCloseHandle(hSession);
+    if (!requestHandle) {
+        WinHttpCloseHandle(connectHandle);
+        WinHttpCloseHandle(session);
         return false;
     }
 
     DWORD redirectPolicy = WINHTTP_OPTION_REDIRECT_POLICY_ALWAYS;
-    WinHttpSetOption(hRequest, WINHTTP_OPTION_REDIRECT_POLICY, &redirectPolicy, sizeof(redirectPolicy));
+    WinHttpSetOption(requestHandle, WINHTTP_OPTION_REDIRECT_POLICY, &redirectPolicy, sizeof(redirectPolicy));
 
-    BOOL result = WinHttpSendRequest(hRequest, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0);
-    if (!result) {
-        WinHttpCloseHandle(hRequest);
-        WinHttpCloseHandle(hConnect);
-        WinHttpCloseHandle(hSession);
+    BOOL sendResult = WinHttpSendRequest(requestHandle, WINHTTP_NO_ADDITIONAL_HEADERS, 0, WINHTTP_NO_REQUEST_DATA, 0, 0, 0);
+    if (!sendResult) {
+        WinHttpCloseHandle(requestHandle);
+        WinHttpCloseHandle(connectHandle);
+        WinHttpCloseHandle(session);
         return false;
     }
 
-    result = WinHttpReceiveResponse(hRequest, NULL);
-    if (!result) {
-        WinHttpCloseHandle(hRequest);
-        WinHttpCloseHandle(hConnect);
-        WinHttpCloseHandle(hSession);
+    BOOL receiveResult = WinHttpReceiveResponse(requestHandle, NULL);
+    if (!receiveResult) {
+        WinHttpCloseHandle(requestHandle);
+        WinHttpCloseHandle(connectHandle);
+        WinHttpCloseHandle(session);
         return false;
     }
 
     DWORD bytesAvailable = 0;
-    while (WinHttpQueryDataAvailable(hRequest, &bytesAvailable) && bytesAvailable > 0) {
+    while (WinHttpQueryDataAvailable(requestHandle, &bytesAvailable) && bytesAvailable > 0) {
         std::vector<unsigned char> buffer(bytesAvailable);
         DWORD bytesRead = 0;
-        if (!WinHttpReadData(hRequest, buffer.data(), bytesAvailable, &bytesRead) || bytesRead == 0)
+        if (!WinHttpReadData(requestHandle, buffer.data(), bytesAvailable, &bytesRead) || bytesRead == 0)
             break;
-        outBody.insert(outBody.end(), buffer.begin(), buffer.begin() + bytesRead);
+        outputBody.insert(outputBody.end(), buffer.begin(), buffer.begin() + bytesRead);
     }
 
-    WinHttpCloseHandle(hRequest);
-    WinHttpCloseHandle(hConnect);
-    WinHttpCloseHandle(hSession);
+    WinHttpCloseHandle(requestHandle);
+    WinHttpCloseHandle(connectHandle);
+    WinHttpCloseHandle(session);
 
-    return !outBody.empty();
+    return !outputBody.empty();
 }
 
 #endif
 
-std::string toLower(const std::string& s) {
-    std::string out = s;
-    std::transform(out.begin(), out.end(), out.begin(), ::tolower);
-    return out;
+#if defined(HTTPCLIENT_USE_OPENSSL) && !defined(_WIN32)
+bool downloadHttpsOpenSSL(const std::string& url, std::vector<unsigned char>& outputBody) {
+    outputBody.clear();
+
+    std::string scheme;
+    std::string host;
+    std::string path;
+    int port = 0;
+
+    // split into scheme/host/port/path
+    if (!parseUrl(url, scheme, host, port, path)) {
+        return false;
+    }
+
+    int socketFd = -1;
+    if (!resolveAndConnect(host, port, socketFd)) {
+        return false;
+    }
+
+    SSL_library_init();
+    SSL_load_error_strings();
+    OpenSSL_add_all_algorithms();
+
+    SSL_CTX* ctx = SSL_CTX_new(TLS_client_method());
+    if (!ctx) {
+        close(socketFd);
+        return false;
+    }
+
+    // do not validate certificates we donst ship ca roots.
+    SSL_CTX_set_verify(ctx, SSL_VERIFY_NONE, nullptr);
+
+    SSL* ssl = SSL_new(ctx);
+    if (!ssl) {
+        SSL_CTX_free(ctx);
+        close(socketFd);
+        return false;
+    }
+
+    SSL_set_fd(ssl, socketFd);
+    SSL_set_tlsext_host_name(ssl, host.c_str());
+
+    if (SSL_connect(ssl) != 1) {
+        SSL_free(ssl);
+        SSL_CTX_free(ctx);
+        close(socketFd);
+        return false;
+    }
+
+    std::string httpRequest;
+    httpRequest += "GET ";
+    httpRequest += path;
+    httpRequest += " HTTP/1.1\r\n";
+    httpRequest += "Host: ";
+    httpRequest += host;
+    httpRequest += "\r\n";
+    httpRequest += "User-Agent: MinecraftPE\r\n";
+    httpRequest += "Connection: close\r\n";
+    httpRequest += "\r\n";
+
+    if (SSL_write(ssl, httpRequest.data(), (int)httpRequest.size()) <= 0) {
+        SSL_shutdown(ssl);
+        SSL_free(ssl);
+        SSL_CTX_free(ctx);
+        close(socketFd);
+        return false;
+    }
+
+    std::vector<unsigned char> rawResponse;
+
+    const int BUFFER_SIZE = 4096;
+    unsigned char buffer[BUFFER_SIZE];
+    while (true) {
+        int bytesRead = SSL_read(ssl, buffer, BUFFER_SIZE);
+        if (bytesRead <= 0)
+            break;
+        rawResponse.insert(rawResponse.end(), buffer, buffer + bytesRead);
+    }
+
+    SSL_shutdown(ssl);
+    SSL_free(ssl);
+    SSL_CTX_free(ctx);
+    close(socketFd);
+
+    if (rawResponse.empty()) {
+        return false;
+    }
+
+    const std::string headerDelimiter = "\r\n\r\n";
+    auto headerEndIt = std::search(rawResponse.begin(), rawResponse.end(), headerDelimiter.begin(), headerDelimiter.end());
+    if (headerEndIt == rawResponse.end()) {
+        return false;
+    }
+
+    size_t headerLength = headerEndIt - rawResponse.begin();
+    std::string headers(reinterpret_cast<const char*>(rawResponse.data()), headerLength);
+    size_t bodyStartIndex = headerLength + headerDelimiter.size();
+
+    int statusCode = 0;
+    if (!extractStatusCode(headers, statusCode)) {
+        return false;
+    }
+
+    if (statusCode != 200) {
+        std::string bodySnippet;
+        size_t len = rawResponse.size() < 1024 ? rawResponse.size() : 1024;
+        bodySnippet.assign(rawResponse.begin(), rawResponse.begin() + len);
+        LOGW("[HttpClient] HTTP status %d for %s\n", statusCode, url.c_str());
+        LOGW("[HttpClient] Headers:\n%s\n", headers.c_str());
+        LOGW("[HttpClient] Body (up to 1024 bytes):\n%s\n", bodySnippet.c_str());
+        return false;
+    }
+
+    outputBody.assign(rawResponse.begin() + bodyStartIndex, rawResponse.end());
+    return true;
+}
+#endif
+
+std::string toLower(const std::string& input) {
+    std::string output = input;
+    std::transform(output.begin(), output.end(), output.begin(), ::tolower);
+    return output;
 }
 
-bool parseUrl(const std::string& url, std::string& scheme, std::string& host, int& port, std::string& path) {
-    scheme.clear();
-    host.clear();
-    path.clear();
-    port = 0;
+bool parseUrl(const std::string& url, std::string& schemeOut, std::string& hostOut, int& portOut, std::string& pathOut) {
+    schemeOut.clear();
+    hostOut.clear();
+    pathOut.clear();
+    portOut = 0;
 
-    // Very simple URL parser.
-    // url format: scheme://host[:port]/path
-    auto pos = url.find("://");
-    if (pos == std::string::npos) return false;
-    scheme = toLower(url.substr(0, pos));
-    size_t start = pos + 3;
+    size_t schemeSep = url.find("://");
+    if (schemeSep == std::string::npos) {
+        return false;
+    }
 
-    size_t slash = url.find('/', start);
-    std::string hostPort = (slash == std::string::npos) ? url.substr(start) : url.substr(start, slash - start);
-    path = (slash == std::string::npos) ? "/" : url.substr(slash);
+    schemeOut = toLower(url.substr(0, schemeSep));
+    size_t hostStart = schemeSep + 3;
 
-    size_t colon = hostPort.find(':');
-    if (colon != std::string::npos) {
-        host = hostPort.substr(0, colon);
-        port = atoi(hostPort.c_str() + colon + 1);
+    // split host/port from the path
+    size_t pathStart = url.find('/', hostStart);
+    std::string hostPort;
+    if (pathStart == std::string::npos) {
+        // no path part, so just use / as the default
+        hostPort = url.substr(hostStart);
+        pathOut = "/";
     } else {
-        host = hostPort;
+        hostPort = url.substr(hostStart, pathStart - hostStart);
+        pathOut = url.substr(pathStart);
     }
 
-    if (scheme == "http") {
-        if (port == 0) port = 80;
-    } else if (scheme == "https") {
-        if (port == 0) port = 443;
+    // if the host includes a ":port", split it out
+    size_t portSep = hostPort.find(':');
+    if (portSep != std::string::npos) {
+        hostOut = hostPort.substr(0, portSep);
+        portOut = atoi(hostPort.c_str() + portSep + 1);
+    } else {
+        hostOut = hostPort;
     }
 
-    return !host.empty() && !scheme.empty();
+    // fill in default ports for known schemes
+    if (schemeOut == "http") {
+        if (portOut == 0) portOut = 80;
+    } else if (schemeOut == "https") {
+        if (portOut == 0) portOut = 443;
+    }
+
+    // return success only if we got at a scheme and host
+    return !hostOut.empty() && !schemeOut.empty();
 }
 
-bool readAll(int sockfd, std::vector<unsigned char>& out) {
-    const int BUF_SIZE = 4096;
-    unsigned char buffer[BUF_SIZE];
+// read all available data from a tcp socket until the connection is closed
+// data is appended to outData
+bool readAll(int socketFd, std::vector<unsigned char>& outData) {
+    const int BUFFER_SIZE = 4096;
+    unsigned char buffer[BUFFER_SIZE];
 
     while (true) {
-        int received = recv(sockfd, (char*)buffer, BUF_SIZE, 0);
-        if (received <= 0)
+        int bytesRead = recv(socketFd, (char*)buffer, BUFFER_SIZE, 0);
+        if (bytesRead <= 0)
             break;
-        out.insert(out.end(), buffer, buffer + received);
+        outData.insert(outData.end(), buffer, buffer + bytesRead);
     }
+
     return true;
 }
 
-bool resolveAndConnect(const std::string& host, int port, int& outSock) {
+// resolve a hostname and connect a tcp socket to the given host:port
+// on windows this also makes sure winsock is initialized
+// if successful, outSocket will contain a connected socket descriptor
+bool resolveAndConnect(const std::string& host, int port, int& outSocket) {
 #if defined(_WIN32)
-    static bool initialized = false;
-    if (!initialized) {
+    static bool wsaStarted = false;
+    if (!wsaStarted) {
         WSADATA wsaData;
         WSAStartup(MAKEWORD(2, 2), &wsaData);
-        initialized = true;
+        wsaStarted = true;
     }
 #endif
 
@@ -174,60 +328,95 @@ bool resolveAndConnect(const std::string& host, int port, int& outSock) {
     struct addrinfo* result = NULL;
 
     memset(&hints, 0, sizeof(hints));
-    hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_family = AF_UNSPEC;   // ipv4 ipv6
+    hints.ai_socktype = SOCK_STREAM; // tcp
 
+    // getaddrinfo expects strings for port and host
     std::ostringstream portStream;
     portStream << port;
-    const std::string portStr = portStream.str();
-    if (getaddrinfo(host.c_str(), portStr.c_str(), &hints, &result) != 0)
+    const std::string portString = portStream.str();
+
+    if (getaddrinfo(host.c_str(), portString.c_str(), &hints, &result) != 0) {
         return false;
+    }
 
-    int sock = -1;
-    for (struct addrinfo* rp = result; rp != NULL; rp = rp->ai_next) {
-        sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if (sock < 0) continue;
-        if (connect(sock, rp->ai_addr, (int)rp->ai_addrlen) == 0)
-            break; // success
+    int socketFd = -1;
 
+    // try each resolved address until we successfully connect
+    for (struct addrinfo* addr = result; addr != NULL; addr = addr->ai_next) {
+        socketFd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+        if (socketFd < 0) {
+            continue;
+        }
+
+        if (connect(socketFd, addr->ai_addr, (int)addr->ai_addrlen) == 0) {
+            // connected! yay!
+            break;
+        }
+
+        // failed to connect, try next
 #if defined(_WIN32)
-        closesocket(sock);
+        closesocket(socketFd);
 #else
-        close(sock);
+        close(socketFd);
 #endif
-        sock = -1;
+        socketFd = -1;
     }
 
     freeaddrinfo(result);
 
-    if (sock < 0)
+    if (socketFd < 0) {
         return false;
+    }
 
-    outSock = sock;
+    outSocket = socketFd;
     return true;
 }
 
 std::string getHeaderValue(const std::string& headers, const std::string& key) {
-    std::string lower = toLower(headers);
-    std::string lowerKey = toLower(key);
-    size_t pos = lower.find(lowerKey);
-    if (pos == std::string::npos) return "";
-    size_t colon = lower.find(':', pos + lowerKey.size());
-    if (colon == std::string::npos) return "";
-    size_t start = colon + 1;
-    while (start < lower.size() && (lower[start] == ' ' || lower[start] == '\t')) start++;
-    size_t end = lower.find('\r', start);
-    if (end == std::string::npos) end = lower.find('\n', start);
-    if (end == std::string::npos) end = lower.size();
-    return headers.substr(start, end - start);
+    std::string headersLower = toLower(headers);
+    std::string keyLower = toLower(key);
+
+    size_t pos = headersLower.find(keyLower);
+    if (pos == std::string::npos) {
+        return "";
+    }
+
+    size_t colonPos = headersLower.find(':', pos + keyLower.size());
+    if (colonPos == std::string::npos) {
+        return "";
+    }
+
+    size_t valueStart = colonPos + 1;
+    while (valueStart < headersLower.size() && (headersLower[valueStart] == ' ' || headersLower[valueStart] == '\t')) {
+        valueStart++;
+    }
+
+    size_t valueEnd = headersLower.find('\r', valueStart);
+    if (valueEnd == std::string::npos) {
+        valueEnd = headersLower.find('\n', valueStart);
+    }
+    if (valueEnd == std::string::npos) {
+        valueEnd = headersLower.size();
+    }
+
+    return headers.substr(valueStart, valueEnd - valueStart);
 }
 
+// wxtract the http status code from the first response line (foex example "HTTP/1.1 200 OK")
+// returns false on malformed responses.
 bool extractStatusCode(const std::string& headers, int& outStatus) {
-    size_t pos = headers.find(" ");
-    if (pos == std::string::npos) return false;
-    size_t pos2 = headers.find(" ", pos + 1);
-    if (pos2 == std::string::npos) return false;
-    std::string code = headers.substr(pos + 1, pos2 - pos - 1);
+    size_t firstSpace = headers.find(' ');
+    if (firstSpace == std::string::npos) {
+        return false;
+    }
+
+    size_t secondSpace = headers.find(' ', firstSpace + 1);
+    if (secondSpace == std::string::npos) {
+        return false;
+    }
+
+    std::string code = headers.substr(firstSpace + 1, secondSpace - firstSpace - 1);
     outStatus = atoi(code.c_str());
     return true;
 }
@@ -239,96 +428,121 @@ namespace HttpClient {
 bool download(const std::string& url, std::vector<unsigned char>& outBody) {
     outBody.clear();
 
-    std::string currentUrl = url;
-    for (int redirect = 0; redirect < 3; ++redirect) {
-        std::string scheme, host, path;
-        int port = 0;
-        if (!parseUrl(currentUrl, scheme, host, port, path)) {
-            LOGW("[HttpClient] parseUrl failed for '%s'\n", currentUrl.c_str());
+    // keep a copy of the current url so we can follow redirects
+    std::string urlToDownload = url;
+
+    // follow up to 3 redirects (301/302/307/308)
+    // if a redirect is encountered we loop again with the new loaction url
+    for (int redirectCount = 0; redirectCount < 3; ++redirectCount) {
+        std::string urlScheme;
+        std::string urlHost;
+        std::string urlPath;
+        int urlPort = 0;
+
+        // parse the url into its components so we can open a socket/start an https request
+        if (!parseUrl(urlToDownload, urlScheme, urlHost, urlPort, urlPath)) {
+            LOGW("[HttpClient] parseUrl failed for '%s'\n", urlToDownload.c_str());
             return false;
         }
 
-        if (scheme == "https") {
+        // for https we delegate to winhttp on windows, since this simple client
+        // only supports plain http over raw sockets
+        if (urlScheme == "https") {
 #if defined(_WIN32)
-            LOGI("[HttpClient] using WinHTTP for HTTPS URL %s\n", currentUrl.c_str());
-            return downloadHttpsWinHttp(currentUrl, outBody);
+            LOGI("[HttpClient] using WinHTTP for HTTPS URL %s\n", urlToDownload.c_str());
+            return downloadHttpsWinHttp(urlToDownload, outBody);
+#elif defined(HTTPCLIENT_USE_OPENSSL)
+            LOGI("[HttpClient] using OpenSSL for HTTPS URL %s\n", urlToDownload.c_str());
+            return downloadHttpsOpenSSL(urlToDownload, outBody);
 #else
-            LOGW("[HttpClient] HTTPS not supported on this platform: %s\n", currentUrl.c_str());
+            LOGW("[HttpClient] HTTPS not supported on this platform: %s\n", urlToDownload.c_str());
             return false;
 #endif
         }
 
-        if (scheme != "http") {
-            LOGW("[HttpClient] unsupported scheme '%s' for URL '%s'\n", scheme.c_str(), currentUrl.c_str());
+        // we only support plain http for all non-windows platforms for nw
+        if (urlScheme != "http") {
+            LOGW("[HttpClient] unsupported scheme '%s' for URL '%s'\n", urlScheme.c_str(), urlToDownload.c_str());
             return false;
         }
 
-        int sock = -1;
-        if (!resolveAndConnect(host, port, sock)) {
-            LOGW("[HttpClient] resolve/connect failed for %s:%d\n", host.c_str(), port);
+        int socketFd = -1;
+        if (!resolveAndConnect(urlHost, urlPort, socketFd)) {
+            LOGW("[HttpClient] resolve/connect failed for %s:%d\n", urlHost.c_str(), urlPort);
             return false;
         }
 
-        std::string request = "GET " + path + " HTTP/1.1\r\n";
-        request += "Host: " + host + "\r\n";
-        request += "User-Agent: MinecraftPE\r\n";
-        request += "Connection: close\r\n";
-        request += "\r\n";
+        std::string httpRequest;
+        httpRequest += "GET ";
+        httpRequest += urlPath;
+        httpRequest += " HTTP/1.1\r\n";
+        httpRequest += "Host: ";
+        httpRequest += urlHost;
+        httpRequest += "\r\n";
+        httpRequest += "User-Agent: MinecraftPE\r\n";
+        httpRequest += "Connection: close\r\n";
+        httpRequest += "\r\n";
 
-        send(sock, request.c_str(), (int)request.size(), 0);
+        send(socketFd, httpRequest.c_str(), (int)httpRequest.size(), 0);
 
-        std::vector<unsigned char> raw;
-        readAll(sock, raw);
+        std::vector<unsigned char> rawResponse;
+        readAll(socketFd, rawResponse);
 
 #if defined(_WIN32)
-        closesocket(sock);
+        closesocket(socketFd);
 #else
-        close(sock);
+        close(socketFd);
 #endif
 
-        if (raw.empty()) {
-            LOGW("[HttpClient] no response data from %s\n", currentUrl.c_str());
+        if (rawResponse.empty()) {
+            LOGW("[HttpClient] no response data from %s\n", urlToDownload.c_str());
             return false;
         }
 
-        // split headers and body
-        const std::string delim = "\r\n\r\n";
-        auto it = std::search(raw.begin(), raw.end(), delim.begin(), delim.end());
-        if (it == raw.end())
+        // find the end of the headers (\r\n\r\n) so we can split headers and body
+        const std::string headerDelimiter = "\r\n\r\n";
+        auto headerEndIt = std::search(rawResponse.begin(), rawResponse.end(), headerDelimiter.begin(), headerDelimiter.end());
+        if (headerEndIt == rawResponse.end()) {
+            // we didn't find the end of headers :(
             return false;
+        }
 
-        size_t headerLen = it - raw.begin();
-        std::string headers(reinterpret_cast<const char*>(raw.data()), headerLen);
-        size_t bodyStart = headerLen + delim.size();
+        // extract the header block as a string so we can inspect it
+        size_t headerLength = headerEndIt - rawResponse.begin();
+        std::string headers(reinterpret_cast<const char*>(rawResponse.data()), headerLength);
+        size_t bodyStartIndex = headerLength + headerDelimiter.size();
 
-        int status = 0;
-        if (!extractStatusCode(headers, status))
+        int statusCode = 0;
+        if (!extractStatusCode(headers, statusCode)) {
             return false;
+        }
 
-        if (status == 301 || status == 302 || status == 307 || status == 308) {
+        if (statusCode == 301 || statusCode == 302 || statusCode == 307 || statusCode == 308) {
             std::string location = getHeaderValue(headers, "Location");
             if (location.empty()) {
-                LOGW("[HttpClient] redirect without Location header for %s\n", currentUrl.c_str());
+                LOGW("[HttpClient] redirect without Location header for %s\n", urlToDownload.c_str());
                 return false;
             }
-            LOGI("[HttpClient] redirect %s -> %s\n", currentUrl.c_str(), location.c_str());
-            currentUrl = location;
+            LOGI("[HttpClient] redirect %s -> %s\n", urlToDownload.c_str(), location.c_str());
+            urlToDownload = location;
             continue;
         }
 
-        if (status != 200) {
+        if (statusCode != 200) {
+            // if we got any status other than 200 OK, log what happened
             std::string bodySnippet;
             if (!outBody.empty()) {
                 size_t len = outBody.size() < 1024 ? outBody.size() : 1024;
                 bodySnippet.assign(outBody.begin(), outBody.begin() + len);
             }
-            LOGW("[HttpClient] HTTP status %d for %s\n", status, currentUrl.c_str());
+            LOGW("[HttpClient] HTTP status %d for %s\n", statusCode, urlToDownload.c_str());
             LOGW("[HttpClient] Headers:\n%s\n", headers.c_str());
             LOGW("[HttpClient] Body (up to 1024 bytes):\n%s\n", bodySnippet.c_str());
             return false;
         }
 
-        outBody.assign(raw.begin() + bodyStart, raw.end());
+        // everything looks good! copy just the body bytes (after the headers) into outBody.
+        outBody.assign(rawResponse.begin() + bodyStartIndex, rawResponse.end());
         return true;
     }