Added iOS comppiling instructions to README

fixed the possible broken header search and added all jobs including ios to publish
FIX: web and android compilation
2026-04-05 23:13:33 +00:00 · 2026-04-05 14:43:35 -04:00 · 2026-04-05 14:43:35 -04:00 · 2026-04-05 14:43:35 -04:00 · 2026-04-05 14:43:35 -04:00 · 2026-04-05 14:43:35 -04:00
243 changed files with 13636 additions and 4382 deletions
--- a/.github/actions/setup-cache/action.yml
+++ b/.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-
--- a/.github/actions/setup-ninja/action.yml
+++ b/.github/actions/setup-ninja/action.yml
@@ -0,0 +1,17 @@
+name: Setup Ninja
+description: Sets up Ninja
+
+inputs:
+  host:
+    description: 'Host platform: win, mac or linux'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Setup
+    shell: bash
+    run: |
+      curl -L https://github.com/ninja-build/ninja/releases/latest/download/ninja-${{ inputs.host }}.zip -o ninja.zip
+      7z x ninja.zip -o"$GITHUB_WORKSPACE/ninja"
+      echo "$GITHUB_WORKSPACE/ninja" >> $GITHUB_PATH
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,366 @@
+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-ios:
+  # credit to pengubow from deepfriedwaffles repo
+    name: Build iOS
+    runs-on: macos-latest
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+
+      - name: Build
+        run: |
+          cd project/iosproj
+          xcodebuild -scheme minecraftpe -derivedDataPath build -destination 'generic/platform=iOS' CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
+          mkdir -p Payload
+          cp -R build/Build/Products/Debug-iphoneos/minecraftpe.app Payload/
+          zip -r minecraftpe.ipa Payload
+          rm -rf Payload
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@main
+        with:
+          name: minecraftpe-ios
+          path: project/iosproj/minecraftpe.ipa
+          
+  build-linux:
+    name: Build Linux
+    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-ios, build-linux, build-android, build-web ]
+    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
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,202 @@
+# Build output
 build/
-linux-build/
+out/
+bin/
+lib/
+build-apk/
+cmake-build-*/
+CMakeFiles/
+CMakeCache.txt
+cmake_install.cmake
+Makefile
+
+# Compiled object files
+*.o
+*.obj
+*.a
+*.lib
+*.so
+*.dylib
+*.dll
+*.exe
+*.out
+
+# CMake generated
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_CPack_Packages/
+*.cbp
+
+# Visual Studio
+*.sdf
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+*.VC.db
+*.VC.opendb
+.vs/
+ipch/
+x64/
+x86/
+Debug/
+Release/
+RelWithDebInfo/
+MinSizeRel/
+
+# Xcode
+*.xcworkspace
+xcuserdata/
+*.xccheckout
+*.xcuserstate
+*.moved-aside
+DerivedData/
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# Android
+*.apk
+*.aab
+*.ap_
+local.properties
+.gradle/
+project/.gradle/
+project/android/bin/
+project/android/gen/
+project/android/obj/
+project/android_java/bin/
+project/android_java/gen/
+project/android_java/obj/
+project/android/libs/*.so
+
+# macOS
+.DS_Store
+.AppleDouble
+.LSOverride
+._*
+
+# Windows
+Thumbs.db
+ehthumbs.db
+Desktop.ini
+$RECYCLE.BIN/
+
+# Linux
+*~
+.nfs*
+
+# CLion / JetBrains
+.idea/
+*.iml
+*.ipr
+*.iws
+
+# Eclipse CDT
+.project
+.cproject
+.settings/
+
+# Logs
+*.log
+
+# Ninja
+.ninja_deps
+.ninja_log
+build.ninja
+
+# VS Code
+.vscode/
+*.code-workspace
+
+# Visual Studio additional
+*.ncb
+*.aps
+*.pdb
+*.ilk
+*.exp
+*.iobj
+*.ipdb
+*.tlog
+*.lastbuildstate
+*.pch
+*.ipch
+*.VC.db-shm
+*.VC.db-wal
+*.svclog
+*.vcxproj.user
+
+# CMake generated project files
+ALL_BUILD.vcxproj
+ALL_BUILD.vcxproj.filters
+INSTALL.vcxproj
+INSTALL.vcxproj.filters
+PACKAGE.vcxproj
+PACKAGE.vcxproj.filters
+ZERO_CHECK.vcxproj
+ZERO_CHECK.vcxproj.filters
+MinecraftPE.vcxproj
+MinecraftPE.vcxproj.filters
+MinecraftPE.sln
+CPackConfig.cmake
+CPackSourceConfig.cmake
+cpm-package-lock.cmake
+MinecraftPE.dir/
+_deps/
+
+# Test / coverage
+Testing/
+CTestResults/
+*.gcno
+*.gcda
+*.gcov
+coverage/
+lcov.info
+
+# Precompiled headers
+*.gch
+
+# Compiler / linker intermediates
+*.map
+*.res
+*.d
+
+# Patch / diff leftovers
+*.orig
+*.rej
+*.patch
+
+# Backup / temp
+*.bak
+*.swp
+*.swo
+*.tmp
+*~.nib
+
+# Tags
+tags
+TAGS
+.tags
+ctags
+
+# macOS extra
+.Spotlight-V100
+.Trashes
+.fseventsd
+Icon\r
+
+# Windows extra
+*.lnk
+[Dd]esktop.ini
+
+# User / local config
+options.txt
+local.cmake
+games/
+
+# Dependency cache
+vcpkg_installed/
 .cache/
+conan/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,12 +5,75 @@ 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-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()

-CPMAddPackage("gh:madler/zlib@1.3.2")
+enum_option(PLATFORM "Desktop;Web" "Platform to build for.")
+
+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"
@@ -20,9 +83,20 @@ CPMAddPackage(
            "ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
            "PNG_TOOLS OFF"
            "PNG_TESTS OFF"
-        "BUILD_SHARED_LIBS ON"
    )

+    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"
    GIT_REPOSITORY "https://github.com/kcat/openal-soft.git"
@@ -31,21 +105,116 @@ CPMAddPackage(
        "ALSOFT_EXAMPLES OFF"
        "ALSOFT_TESTS OFF"
        "ALSOFT_UTILS OFF"
-        "BUILD_SHARED_LIBS ON"
+        "LIBTYPE ${AL_LIBTYPE}"
+        "ALSOFT_ENABLE_MODULES OFF"
+        "ALSOFT_STATIC_STDCXX ON"
+        "ALSOFT_STATIC_LIBGCC 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"
+# TODO: Clear this paths with *
+file(GLOB SERVER_SOURCES
+    "project/lib_projects/raknet/jni/RaknetSources/*.cpp"
+    "src/NinecraftApp.cpp"
+    "src/Performance.cpp"
+    "src/SharedConstants.cpp"
+
+    "src/client/IConfigListener.cpp"
+    "src/client/Minecraft.cpp"
+    "src/client/OptionStrings.cpp"
+    "src/client/Option.cpp"
+    "src/client/Options.cpp"
+    "src/client/OptionsFile.cpp"
+    "src/client/ServerProfiler.cpp"
+
+    "src/client/gamemode/CreativeMode.cpp"
+    "src/client/gamemode/GameMode.cpp"
+    "src/client/gamemode/SurvivalMode.cpp"
+
+    "src/client/player/LocalPlayer.cpp"
+    "src/client/player/RemotePlayer.cpp"
+    "src/client/player/input/KeyboardInput.cpp"
+
+    "src/locale/I18n.cpp"
+
+    "src/main.cpp"
+    "src/main_dedicated.cpp"
+
+    "src/nbt/Tag.cpp"
+
+    "src/network/ClientSideNetworkHandler.cpp"
+    "src/network/NetEventCallback.cpp"
+    "src/network/Packet.cpp"
+    "src/network/RakNetInstance.cpp"
+    "src/network/ServerSideNetworkHandler.cpp"
+    "src/network/command/CommandServer.cpp"
+
+    "src/platform/CThread.cpp"
+    "src/platform/HttpClient.cpp"
+    "src/platform/PngLoader.cpp"
+    "src/platform/time.cpp"
+
+    "src/platform/input/Controller.cpp"
+    "src/platform/input/Keyboard.cpp"
+    "src/platform/input/Mouse.cpp"
+    "src/platform/input/Multitouch.cpp"
+
+    "src/server/ArgumentsSettings.cpp"
+    "src/server/ServerLevel.cpp"
+    "src/server/ServerPlayer.cpp"
+
+    "src/util/DataIO.cpp"
+    "src/util/Mth.cpp"
+    "src/util/PerfTimer.cpp"
+    "src/util/StringUtils.cpp"
+
+    "src/world/Direction.cpp"
+
+    "src/world/entity/*.cpp"
+
+    "src/world/entity/ai/control/MoveControl.cpp"
+
+    "src/world/entity/animal/*.cpp"
+
+    "src/world/entity/item/*.cpp"
+
+    "src/world/entity/monster/*.cpp"
+
+    "src/world/entity/player/Inventory.cpp"
+    "src/world/entity/player/Player.cpp"
+
+    "src/world/entity/projectile/Arrow.cpp"
+    "src/world/entity/projectile/Throwable.cpp"
+
+    "src/world/food/SimpleFoodData.cpp"
+
+    "src/world/inventory/*.cpp"
+    "src/world/item/*.cpp"
+    "src/world/item/crafting/*.cpp"
+    "src/world/level/*.cpp"
+
+    "src/world/level/biome/Biome.cpp"
+    "src/world/level/biome/BiomeSource.cpp"
+
+    "src/world/level/chunk/LevelChunk.cpp"
+
+    "src/world/level/dimension/Dimension.cpp"
+
+    "src/world/level/levelgen/*.cpp"
+    "src/world/level/levelgen/feature/Feature.cpp"
+    "src/world/level/levelgen/synth/*.cpp"
+
+    "src/world/level/material/Material.cpp"
+
+    "src/world/level/pathfinder/Path.cpp"
+
+    "src/world/level/storage/*.cpp"
+    "src/world/level/tile/*.cpp"
+    "src/world/level/tile/entity/*.cpp"
+
+    "src/world/phys/HitResult.cpp"
 ) 

-file(GLOB SOURCES 
+file(GLOB CLIENT_SOURCES 
    "src/client/*.cpp"

    "src/client/gamemode/*.cpp"
@@ -121,34 +290,32 @@ file(GLOB 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")
+if (${PLATFORM} STREQUAL "Desktop")
+    list(APPEND CLIENT_SOURCES glad/src/glad.c)
 endif()

+# Server
+if(UNIX)
+    add_executable("${PROJECT_NAME}-server" ${SERVER_SOURCES})

-if(PLATFORM STREQUAL "PLATFORM_WIN32")
-    list(APPEND SOURCES "src/AppPlatform_win32.cpp")
-endif()
+    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")

-if(PLATFORM STREQUAL "PLATFORM_GLFW")
-    list(APPEND SOURCES "src/AppPlatform_glfw.cpp")
-endif()
-
-add_executable(${PROJECT_NAME} 
-    ${SOURCES}
-    "glad/src/glad.c"
+    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+        "${CMAKE_SOURCE_DIR}/src/"
+        "project/lib_projects/raknet/jni/RaknetSources"
    )

-if(WIN32)
-    set(EXTRA_LIBS "ws2_32")
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "_CRT_SECURE_NO_WARNINGS")
+    target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
 endif()

-if(PLATFORM STREQUAL "PLATFORM_WIN32" OR PLATFORM STREQUAL "PLATFORM_GLFW")
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "PLATFORM_DESKTOP")
-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/"
@@ -158,8 +325,57 @@ target_include_directories(${PROJECT_NAME} PUBLIC
    "lib/include"
 )

+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")
+
+    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()
+
+# 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})
+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(
@@ -170,8 +386,19 @@ add_custom_command(
    )
 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})
--- a/README.md
+++ b/README.md
@@ -1,21 +1,235 @@
 # 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).

-This is leaked source code of Minecraft PE 0.6.1 with my own impovements :sunglasses:
+> [!Important]
+> We have a discord server, where you can report bugs or send feedback https://discord.gg/c58YesBxve

-First of all I made it build with CMake (w/o VS2012). Also I fixed some compile errors. And finally I ported it to GLFW to make it run on several platforms and remove binary dependencies.
+Source code for **Minecraft Pocket Edition 0.6.1 alpha** with various fixes and improvements.

-# TODO
+This project aims to preserve and improve this early version of Minecraft PE.
+
+# TODO / Roadmap
 - [x] Add platform GLFW
 - [x] Compile for Linux
- [ ] Compile for android aarch64
+- [x] Compile for android aarch64
+    - [x] Touch control improvements
+    - [ ] Screen fixes
 - [ ] Rewrite platform logic
 - [x] Fix sound
- [ ] Do a server connection gui
+- [x] Do a server connection GUI
+- [ ] Controller support
+- [x] Minecraft server hosting
+- [x] Screen fixess
+- [x] Fix fog
+- [x] Add sprinting
+- [x] Chat (semi working) and commands
+- [x] Implementing options
+- [x] Better F3

 # Build
+
 ## CMake
+### Linux 
+1. Install dependiences
+
+(Debian-like)
+
+``sudo apt install build-essential git cmake libgl-dev libwayland-dev xorg-dev libxkbcommon-dev``
+
+(Arch-like)
+
+``sudo pacman -S base-devel git cmake libglvnd wayland xorg-server-devel xorgproto libxkbcommon``
+
+2. Create build folder
+``mkdir build && cd build``
+
+3. Generate CMake cache and build the project
+```
+cmake .. -B .
+cmake --build .
+```
+
+### Windows
+1. Install [Visual studio Build Tools](https://aka.ms/vs/stable/vs_BuildTools.exe) and [CMake](https://github.com/Kitware/CMake/releases/download/v4.3.0-rc3/cmake-4.3.0-rc3-windows-x86_64.msi)
+
+2. Create build folder
+``mkdir build && cd build``
+
+3. Generate CMake cache and build the project
+```
+cmake ..
+cmake --build .
+```
+
+## Visual Studio
+
+1. Open the repository folder in **Visual Studio**.  
+2. Visual Studio will automatically detect the `CMakeLists.txt` file and generate the project configuration.  
+3. Set **MinecraftPE.exe** as the **target**.  
+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
+
+2. Extract it to the root of your `C:` drive so the path becomes:
+
+   ```
+   C:\android-ndk-r14b
+   ```
+
+3. Run the build script:
+
+```powershell
+# Full build (NDK + Java + APK + install)
+.\build.ps1
+
+# Skip C++ compilation (Java/assets changed only)
+.\build.ps1 -NoCpp
+
+# Skip Java compilation (C++ changed only)
+.\build.ps1 -NoJava
+
+# 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 .
-make -j4
+   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 .
+   ```
+## iOS
+### Xcode
+> [Note!]
+> There's a precompiled IPA artifact in the GitHub mirror under Actions for those who either don't have Macs or don't want to build themself. But if you want to build youself, you'll need a Mac with Xcode. Download Xcode from the Mac App Store.
+
+### 1. Clone
+Open your terminal and clone the repository
+```bash
+git clone https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git
+cd minecraft-pe-0.6.1
+```
+You can also build from the ios-support branch by checking out to it
+```
+git checkout ios-support
+```
+
+### 2. Open in Xcode
+
+The project file is in `minecraft-pe-0.6.1/project/iosproj/minecraftpe.xcodeproj`. Open it.
+
+### 3. Configure Code Signing
+
+Before you can deploy to an iPhone, you must sign the app with your own Apple Developer account:
+
+1. Select the **minecraftpe** project in the left sidebar.
+2. Go to **Signing & Capabilities**.
+3. Change the **Bundle Identifier** to something unique (e.g., `com.yourname.mcpe`).
+4. Select your **Team** from the dropdown menu.
+
+### 4. Build and Run
+
+1. Connect your iPhone via USB or LAN.
+2. Select your device from the run destination menu at the top of Xcode.
+3. Press **Cmd + R** (or the Play button).
+4. **Note:** If you encounter a "Developer Mode" or "Untrusted Developer" error on your phone, go to **Settings > General > VPN & Device Management** to trust your certificate.
--- a/build.ps1
+++ b/build.ps1
@@ -0,0 +1,305 @@
+# ============================================================
+#  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 -Clean       # remove build output before building
+# ============================================================
+param(
+    [switch]$NoCpp,
+    [switch]$NoJava,
+    [switch]$NoBuild,
+    [switch]$Clean
+)
+
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+# ── Paths ────────────────────────────────────────────────────
+$repo       = $PSScriptRoot
+$apkbuild   = "C:\apkbuild"
+$ndk        = "C:\android-ndk-r14b"
+$sdkTools   = "$env:LOCALAPPDATA\Android\Sdk\build-tools\35.0.0"
+$androidJar = "$env:LOCALAPPDATA\Android\Sdk\platforms\android-36\android.jar"
+$adb        = "$env:LOCALAPPDATA\Android\Sdk\platform-tools\adb.exe"
+$keystore   = "$apkbuild\debug.keystore"
+$pkg        = "com.mojang.minecraftpe"
+
+# Auto-detect keytool from JAVA_HOME, then from common install locations
+$keytool = if ($env:JAVA_HOME) { "$env:JAVA_HOME\bin\keytool.exe" } else {
+    $found = Get-ChildItem "C:\Program Files\Java","C:\Program Files\Eclipse Adoptium" `
+        -Filter keytool.exe -Recurse -ErrorAction SilentlyContinue |
+        Sort-Object FullName -Descending | Select-Object -First 1 -ExpandProperty FullName
+    if (-not $found) { throw "keytool not found. Set JAVA_HOME or install a JDK." }
+    $found
+}
+
+$jniDir     = "$repo\project\android\jni"
+$libSrc     = "$repo\project\android\libs\arm64-v8a\libminecraftpe.so"
+$libDst     = "$apkbuild\lib\arm64-v8a\libminecraftpe.so"
+$manifest   = "$repo\project\android_java\AndroidManifest.xml"
+$res        = "$repo\project\android_java\res"
+$javaSrc    = "$repo\project\android_java\src"
+$stubsDir   = "$apkbuild\stubs"
+$rJava      = "$apkbuild\gen\R.java"
+$classesDir = "$apkbuild\classes"
+$dexOut     = "$apkbuild\classes.dex"
+$dataDir    = "$repo\data"
+
+$unsigned   = "$apkbuild\minecraftpe-unsigned.apk"
+$aligned    = "$apkbuild\minecraftpe-aligned.apk"
+$signed     = "$apkbuild\minecraftpe-debug.apk"
+
+Add-Type -Assembly "System.IO.Compression.FileSystem"
+
+function Write-Step([string]$msg) { Write-Host "`n==> $msg" -ForegroundColor Cyan }
+function Assert-ExitCode([string]$step) {
+    if ($LASTEXITCODE -ne 0) { Write-Host "FAILED: $step (exit $LASTEXITCODE)" -ForegroundColor Red; exit 1 }
+}
+function New-Dir([string]$path) { New-Item $path -ItemType Directory -Force | Out-Null }
+function Write-Stub([string]$rel, [string]$content) {
+    $full = "$stubsDir\$rel"
+    New-Dir (Split-Path $full -Parent)
+    if (-not (Test-Path $full)) { [System.IO.File]::WriteAllText($full, $content); Write-Host "  stub: $rel" }
+}
+
+# ── 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
+New-Dir "$apkbuild\lib\arm64-v8a"
+New-Dir "$apkbuild\gen"
+New-Dir $stubsDir
+
+if (-not (Test-Path $keystore)) {
+    Write-Host "  generating debug.keystore..."
+    $eap = $ErrorActionPreference; $ErrorActionPreference = "Continue"
+    & $keytool -genkeypair `
+        -keystore $keystore -storepass android -keypass android `
+        -alias androiddebugkey -keyalg RSA -keysize 2048 -validity 10000 `
+        -dname "CN=Android Debug,O=Android,C=US" 2>&1 | Out-Null
+    $ErrorActionPreference = $eap
+    Assert-ExitCode "keytool"
+    Write-Host "  keystore created"
+} else { Write-Host "  keystore OK" }
+
+Write-Stub "com\mojang\android\StringValue.java" "package com.mojang.android;`npublic interface StringValue { String getStringValue(); }`n"
+
+Write-Stub "com\mojang\android\licensing\LicenseCodes.java" "package com.mojang.android.licensing;`npublic class LicenseCodes { public static final int LICENSE_OK = 0; }`n"
+
+Write-Stub "com\mojang\android\EditTextAscii.java" @"
+package com.mojang.android;
+import android.content.Context;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.util.AttributeSet;
+import android.widget.EditText;
+public class EditTextAscii extends EditText implements TextWatcher {
+    public EditTextAscii(Context c) { super(c); addTextChangedListener(this); }
+    public EditTextAscii(Context c, AttributeSet a) { super(c,a); addTextChangedListener(this); }
+    public EditTextAscii(Context c, AttributeSet a, int d) { super(c,a,d); addTextChangedListener(this); }
+    @Override public void onTextChanged(CharSequence s,int st,int b,int co){}
+    public void beforeTextChanged(CharSequence s,int st,int co,int aft){}
+    public void afterTextChanged(Editable e){
+        String s=e.toString(),san=sanitize(s);
+        if(!s.equals(san))e.replace(0,e.length(),san);
+    }
+    static public String sanitize(String s){
+        StringBuilder sb=new StringBuilder();
+        for(int i=0;i<s.length();i++){char c=s.charAt(i);if(c<128)sb.append(c);}
+        return sb.toString();
+    }
+}
+"@
+
+Write-Stub "com\mojang\android\preferences\SliderPreference.java" @"
+package com.mojang.android.preferences;
+import android.content.Context;
+import android.content.res.Resources;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.SeekBar;
+import android.widget.TextView;
+public class SliderPreference extends DialogPreference implements SeekBar.OnSeekBarChangeListener {
+    private static final String NS="http://schemas.android.com/apk/res/android";
+    private Context _ctx; private TextView _tv; private SeekBar _sb;
+    private String _suf; private int _def,_max,_val,_min;
+    public SliderPreference(Context ctx,AttributeSet a){
+        super(ctx,a); _ctx=ctx;
+        _suf=gStr(a,NS,"text",""); _def=gInt(a,NS,"defaultValue",0);
+        _max=gInt(a,NS,"max",100); _min=gInt(a,null,"min",0);
+        setDefaultValue(_def);
+    }
+    @Override protected View onCreateDialogView(){
+        LinearLayout l=new LinearLayout(_ctx); l.setOrientation(LinearLayout.VERTICAL); l.setPadding(6,6,6,6);
+        _tv=new TextView(_ctx); _tv.setGravity(Gravity.CENTER_HORIZONTAL); _tv.setTextSize(32);
+        l.addView(_tv,new LinearLayout.LayoutParams(-1,-2));
+        _sb=new SeekBar(_ctx); _sb.setOnSeekBarChangeListener(this);
+        l.addView(_sb,new LinearLayout.LayoutParams(-1,-2));
+        if(shouldPersist())_val=getPersistedInt(_def);
+        _sb.setMax(_max); _sb.setProgress(_val); return l;
+    }
+    @Override protected void onSetInitialValue(boolean r,Object d){
+        super.onSetInitialValue(r,d);
+        _val=r?(shouldPersist()?getPersistedInt(_def):0):(Integer)d;
+    }
+    public void onProgressChanged(SeekBar s,int v,boolean f){
+        _val=v+_min; _tv.setText(_val+_suf);
+        if(shouldPersist())persistInt(_val); callChangeListener(Integer.valueOf(_val));
+    }
+    public void onStartTrackingTouch(SeekBar s){}
+    public void onStopTrackingTouch(SeekBar s){}
+    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);}
+    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;}
+}
+"@
+
+Write-Stub "com\mojang\minecraftpe\MainMenuOptionsActivity.java" @"
+package com.mojang.minecraftpe;
+import android.app.Activity;
+public class MainMenuOptionsActivity extends Activity {
+    public static final String Internal_Game_DifficultyPeaceful="internal_game_difficulty_peaceful";
+    public static final String Game_DifficultyLevel="game_difficulty";
+    public static final String Controls_Sensitivity="controls_sensitivity";
+}
+"@
+
+Write-Stub "com\mojang\minecraftpe\Minecraft_Market.java" @"
+package com.mojang.minecraftpe;
+import android.app.Activity; import android.content.Intent; import android.os.Bundle;
+public class Minecraft_Market extends Activity {
+    @Override protected void onCreate(Bundle s){super.onCreate(s);startActivity(new Intent(this,MainActivity.class));finish();}
+}
+"@
+
+Write-Stub "com\mojang\minecraftpe\Minecraft_Market_Demo.java" @"
+package com.mojang.minecraftpe;
+import android.content.Intent; import android.net.Uri;
+public class Minecraft_Market_Demo extends MainActivity {
+    @Override public void buyGame(){startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse("market://details?id=com.mojang.minecraftpe")));}
+    @Override protected boolean isDemo(){return true;}
+}
+"@
+
+Write-Stub "com\mojang\minecraftpe\GameModeButton.java" @"
+package com.mojang.minecraftpe;
+import com.mojang.android.StringValue;
+import android.content.Context; import android.util.AttributeSet;
+import android.view.View; import android.view.View.OnClickListener;
+import android.widget.TextView; import android.widget.ToggleButton;
+public class GameModeButton extends ToggleButton implements OnClickListener,StringValue {
+    static final int Creative=0,Survival=1;
+    private int _type=0; private boolean _attached=false;
+    public GameModeButton(Context c,AttributeSet a){super(c,a);setOnClickListener(this);}
+    public void onClick(View v){_update();}
+    @Override protected void onFinishInflate(){super.onFinishInflate();_update();}
+    @Override protected void onAttachedToWindow(){if(!_attached){_update();_attached=true;}}
+    private void _update(){_set(isChecked()?Survival:Creative);}
+    private void _set(int i){
+        _type=i<Creative?Creative:(i>Survival?Survival:i);
+        int id=_type==Survival?R.string.gamemode_survival_summary:R.string.gamemode_creative_summary;
+        String desc=getContext().getString(id);
+        View v=getRootView().findViewById(R.id.labelGameModeDesc);
+        if(desc!=null&&v instanceof TextView)((TextView)v).setText(desc);
+    }
+    public String getStringValue(){return new String[]{"creative","survival"}[_type];}
+    static public String getStringForType(int i){int c=i<Creative?Creative:(i>Survival?Survival:i);return new String[]{"creative","survival"}[c];}
+}
+"@
+
+Write-Host "  stubs OK"
+
+# ── 1. NDK build ─────────────────────────────────────────────
+if (-not $NoCpp -and -not $NoBuild) {
+    Write-Step "NDK build (arm64-v8a)"
+    # NDK r14b on Windows hits the 32K CreateProcess limit with long paths.
+    # Work around it by building through a short junction C:\m -> repo root.
+    # Use forward slashes in the build paths to prevent the NDK toolchain from stripping backslashes.
+    $junctionBase = "C:/m"
+    if (-not (Test-Path "C:\m")) {
+        & cmd.exe /c "mklink /J `"C:\m`" `"$repo`"" | Out-Null
+    }
+    Push-Location "$junctionBase/project/android/jni"
+    $env:NDK_MODULE_PATH = "$junctionBase/project/lib_projects"
+    # 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
+    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"
+}
+
+# ── 2. Java compile ──────────────────────────────────────────
+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"
+    Assert-ExitCode "aapt R.java"
+    Remove-Item "$apkbuild\_rgen.apk" -ea SilentlyContinue
+
+    $srcs = @(
+        Get-ChildItem $javaSrc  -Recurse -Filter "*.java" | Select-Object -Exp FullName
+        Get-ChildItem $stubsDir -Recurse -Filter "*.java" | Select-Object -Exp FullName
+        $rJava
+    )
+
+    Remove-Item $classesDir -Recurse -Force -ea SilentlyContinue
+    New-Dir $classesDir
+
+    & 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
+    & "$sdkTools\d8.bat" --min-api 21 --output $apkbuild $classFiles
+    Assert-ExitCode "d8"
+    Write-Host "  d8  ->  $dexOut"
+}
+
+# ── 3. Package APK ───────────────────────────────────────────
+Write-Step "Package APK"
+Remove-Item $unsigned,$aligned,$signed -ea SilentlyContinue
+
+& "$sdkTools\aapt.exe" package -f -M $manifest -S $res -I $androidJar -F $unsigned
+Assert-ExitCode "aapt package"
+
+$zip = [System.IO.Compression.ZipFile]::Open($unsigned, 'Update')
+try {
+    [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip,$dexOut,"classes.dex",[System.IO.Compression.CompressionLevel]::Fastest)|Out-Null
+    [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip,$libDst,"lib/arm64-v8a/libminecraftpe.so",[System.IO.Compression.CompressionLevel]::NoCompression)|Out-Null
+    Get-ChildItem $dataDir -Recurse -File | ForEach-Object {
+        $rel=$_.FullName.Substring("$dataDir\".Length).Replace('\','/')
+        [System.IO.Compression.ZipFileExtensions]::CreateEntryFromFile($zip,$_.FullName,"assets/$rel",[System.IO.Compression.CompressionLevel]::NoCompression)|Out-Null
+    }
+} finally { $zip.Dispose() }
+Write-Host "  APK assembled"
+
+& "$sdkTools\zipalign.exe" -p 4 $unsigned $aligned; Assert-ExitCode "zipalign"
+& "$sdkTools\apksigner.bat" sign --ks $keystore --ks-pass pass:android --key-pass pass:android --out $signed $aligned; Assert-ExitCode "apksigner"
+Write-Host "  signed  ->  $signed"
+
+# ── 4. Install ───────────────────────────────────────────────
+Write-Step "Install"
+& $adb shell am force-stop $pkg
+& $adb uninstall $pkg 2>$null
+& $adb install --no-incremental $signed
+Assert-ExitCode "adb install"
+
+Write-Host "`nDone." -ForegroundColor Green
--- a/build.sh
+++ b/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!"
--- a/cmake/EnumOption.cmake
+++ b/cmake/EnumOption.cmake
@@ -0,0 +1,9 @@
+macro(enum_option var values description)
+  set(${var}_VALUES ${values})
+  list(GET ${var}_VALUES 0 default)
+  set(${var} "${default}" CACHE STRING "${description}")
+  set_property(CACHE ${var} PROPERTY STRINGS ${${var}_VALUES})
+  if (NOT ";${${var}_VALUES};" MATCHES ";${${var}};")
+    message(FATAL_ERROR "Unknown value ${${var}}. Only -D${var}=${${var}_VALUES} allowed.")
+  endif()
+endmacro()
--- a/data/images/environment/foliagecolor.png
+++ b/data/images/environment/foliagecolor.png
--- a/data/images/environment/grasscolor.png
+++ b/data/images/environment/grasscolor.png
--- a/data/images/gui/gui.png
+++ b/data/images/gui/gui.png
--- a/data/images/gui/logo/github.png
+++ b/data/images/gui/logo/github.png
--- a/data/images/mob/char.png
+++ b/data/images/mob/char.png
--- a/data/images/terrain.png
+++ b/data/images/terrain.png
--- a/data/lang/en_US.lang
+++ b/data/lang/en_US.lang
@@ -144,6 +144,19 @@ options.fov.max=Quake Pro
 options.gamma=Brightness
 options.gamma.min=Moody
 options.gamma.max=Bright
+options.group.mojang=Login
+options.group.general=General
+options.group.game=Game
+options.group.controls=Controls
+options.group.graphics=Graphics
+options.group.tweaks=Tweaks
+options.allowSprint=Allow sprint
+options.barOnTop=HUD above inventory
+options.rpiCursor=Show Raspberry PI cursor
+options.foliageTint=Tint Grass and Leaves
+options.autoJump=Auto Jump
+options.thirdperson=Third Person
+options.servervisible=Server Visible
 options.sensitivity=Sensitivity
 options.sensitivity.min=*yawn*
 options.sensitivity.max=HYPERSPEED!!!
@@ -156,6 +169,8 @@ options.viewBobbing=View Bobbing
 options.ao=Smooth Lighting
 options.anaglyph=3D Anaglyph
 options.framerateLimit=Performance
+options.limitFramerate=Limit Framerate
+options.vsync=VSync
 options.difficulty=Difficulty
 options.difficulty.peaceful=Peaceful
 options.difficulty.easy=Easy
@@ -168,8 +183,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
@@ -178,6 +195,15 @@ options.particles=Particles
 options.particles.all=All
 options.particles.decreased=Decreased
 options.particles.minimal=Minimal
+options.username=Username
+options.smoothCamera=Smooth camera
+options.destroyVibration=Destroy vibration
+options.isLeftHanded=Left handed
+options.useTouchscreen=Use touchscreen
+options.fancyGraphics=Fancy graphics
+options.renderDebug=Debug render
+options.anaglyph3d=3D anaglyph
+

 performance.max=Max FPS
 performance.balanced=Balanced
@@ -185,21 +211,21 @@ performance.powersaver=Power saver

 controls.title=Controls

-key.forward=Forward
-key.left=Left
-key.back=Back
-key.right=Right
-key.jump=Jump
-key.inventory=Inventory
-key.drop=Drop
-key.chat=Chat
-key.fog=Toggle Fog
-key.sneak=Sneak
-key.playerlist=List Players
-key.attack=Attack
-key.use=Use Item
-key.pickItem=Pick Block
-key.mouseButton=Button %1$s
+options.key.forward=Forward
+options.key.left=Left
+options.key.back=Back
+options.key.right=Right
+options.key.jump=Jump
+options.key.inventory=Inventory
+options.key.drop=Drop
+options.key.chat=Chat
+options.key.fog=Toggle Fog
+options.key.sneak=Sneak
+options.key.playerlist=List Players
+options.key.attack=Attack
+options.key.use=Use Item
+options.key.pickItem=Pick Block
+options.key.mouseButton=Button %1$s

 texturePack.openFolder=Open texture pack folder
 texturePack.title=Select Texture Pack
--- a/glad/include/KHR/khrplatform.h
+++ b/glad/include/KHR/khrplatform.h
--- a/glad/include/glad/glad.h
+++ b/glad/include/glad/glad.h
--- a/glad/src/glad.c
+++ b/glad/src/glad.c
--- a/misc/web/index.html
+++ b/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>
--- a/project/android/AndroidManifest.xml
+++ b/project/android/AndroidManifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="com.mojang.minecraftpe"
-      android:versionCode="6006"
-      android:versionName="0.6.0"
+      android:versionCode="6010"
+      android:versionName="0.6.1-alpha-0.0.3"
      android:installLocation="preferExternal">

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

--- a/project/android/assets/lang/en_US.lang
+++ b/project/android/assets/lang/en_US.lang
@@ -168,8 +168,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 options.guiScale.large=Large
+options.guiScale.larger=Larger
+options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended
--- a/project/android/jni/Android.mk
+++ b/project/android/jni/Android.mk
@@ -1,10 +1,12 @@
 LOCAL_PATH := $(call my-dir)
+# Convert Windows backslashes to forward slashes so NDK toolchain doesn’t treat them as escapes.
+LOCAL_PATH := $(subst \,/,$(LOCAL_PATH))

 include $(CLEAR_VARS)

 LOCAL_MODULE    := minecraftpe
 LOCAL_SRC_FILES := ../../../src/main.cpp \
-                   ../../../src/main_android.cpp \
+                   ../../../src/main_android_java.cpp \
                   ../../../src/platform/audio/SoundSystemSL.cpp \
                   ../../../src/platform/input/Controller.cpp \
                   ../../../src/platform/input/Keyboard.cpp \
@@ -12,6 +14,7 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
                   ../../../src/platform/input/Multitouch.cpp \
                   ../../../src/platform/time.cpp \
                   ../../../src/platform/CThread.cpp \
+                   ../../../src/platform/HttpClient.cpp \
 ../../../src/NinecraftApp.cpp \
 ../../../src/Performance.cpp \
 ../../../src/SharedConstants.cpp \
@@ -21,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 \
@@ -34,13 +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/SmallButton.cpp \
+../../../src/client/gui/components/TextBox.cpp \
 ../../../src/client/gui/Font.cpp \
 ../../../src/client/gui/Gui.cpp \
 ../../../src/client/gui/GuiComponent.cpp \
@@ -48,6 +53,10 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/gui/screens/ScreenChooser.cpp \
 ../../../src/client/gui/screens/ArmorScreen.cpp \
 ../../../src/client/gui/screens/ChatScreen.cpp \
+../../../src/client/gui/screens/ChooseLevelScreen.cpp \
+../../../src/client/gui/screens/SimpleChooseLevelScreen.cpp \
+../../../src/client/gui/screens/ConsoleScreen.cpp \
+../../../src/client/gui/screens/UsernameScreen.cpp \
 ../../../src/client/gui/screens/ConfirmScreen.cpp \
 ../../../src/client/gui/screens/ChestScreen.cpp \
 ../../../src/client/gui/screens/DeathScreen.cpp \
@@ -56,12 +65,14 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/gui/screens/IngameBlockSelectionScreen.cpp \
 ../../../src/client/gui/screens/JoinGameScreen.cpp \
 ../../../src/client/gui/screens/OptionsScreen.cpp \
+                   ../../../src/client/gui/screens/CreditsScreen.cpp \
                   ../../../src/client/gui/screens/PauseScreen.cpp \
 ../../../src/client/gui/screens/ProgressScreen.cpp \
 ../../../src/client/gui/screens/RenameMPLevelScreen.cpp \
 ../../../src/client/gui/screens/SelectWorldScreen.cpp \
 ../../../src/client/gui/screens/StartMenuScreen.cpp \
 ../../../src/client/gui/screens/TextEditScreen.cpp \
+../../../src/client/gui/screens/JoinByIPScreen.cpp \
 ../../../src/client/gui/screens/touch/TouchIngameBlockSelectionScreen.cpp \
 ../../../src/client/gui/screens/touch/TouchJoinGameScreen.cpp \
 ../../../src/client/gui/screens/touch/TouchSelectWorldScreen.cpp \
@@ -198,6 +209,8 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/MobSpawner.cpp \
 ../../../src/world/level/Region.cpp \
 ../../../src/world/level/TickNextTickData.cpp \
+../../../src/world/level/FoliageColor.cpp \
+../../../src/world/level/GrassColor.cpp \
 ../../../src/world/level/biome/Biome.cpp \
 ../../../src/world/level/biome/BiomeSource.cpp \
 ../../../src/world/level/chunk/LevelChunk.cpp \
@@ -245,7 +258,10 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/tile/entity/FurnaceTileEntity.cpp \
 ../../../src/world/phys/HitResult.cpp

-LOCAL_CFLAGS := -Wno-psabi $(LOCAL_CFLAGS)
+LOCAL_CFLAGS := -DPLATFORM_ANDROID -DPRE_ANDROID23 -Wno-narrowing $(LOCAL_CFLAGS)
+LOCAL_CPPFLAGS := -std=c++14 -frtti
+LOCAL_CPPFLAGS += -frtti
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../src

 #LOCAL_CFLAGS := -DANDROID_PUBLISH -DDEMO_MODE $(LOCAL_CFLAGS)
 #LOCAL_CFLAGS := -DANDROID_PUBLISH $(LOCAL_CFLAGS)
--- a/project/android/jni/Application.mk
+++ b/project/android/jni/Application.mk
@@ -1,5 +1,7 @@
-APP_PLATFORM := android-9
-APP_STL := stlport_static
+APP_PLATFORM := android-19
+APP_STL := gnustl_static
 APP_OPTIM        := release
-APP_ABI          := armeabi-v7a
+APP_ABI          := arm64-v8a
+APP_SHORT_COMMANDS := true
+APP_CPPFLAGS += -frtti -fexceptions
 #APP_ABI          := armeabi-v7a x86
--- a/project/android/src/com/mojang/minecraftpe/MainActivity.java
+++ b/project/android/src/com/mojang/minecraftpe/MainActivity.java
@@ -468,17 +468,16 @@ public class MainActivity extends NativeActivity {

 	    _userInputStatus = 1;
 	    InputMethodManager inputManager = (InputMethodManager)getSystemService("input_method");
-        boolean result = inputManager.showSoftInput(this.getCurrentFocus(), InputMethodManager.SHOW_IMPLICIT);
+        View focused = this.getCurrentFocus();
+        if (focused != null) {
+            boolean result = inputManager.showSoftInput(focused, InputMethodManager.SHOW_IMPLICIT);
+        } else {
+            // fallback: try to show using decor view token
+            View decor = getWindow().getDecorView();
+            if (decor != null) {
+                inputManager.showSoftInput(decor, InputMethodManager.SHOW_IMPLICIT);
            }
-    
-    protected void onStart() {
-    	//System.out.println("onStart");
-    	super.onStart();
        }
-
-    protected void onResume() {
-    	//System.out.println("onResume");
-    	super.onResume();
    }

    protected void onPause() {
--- a/project/android_java/AndroidManifest.xml
+++ b/project/android_java/AndroidManifest.xml
@@ -1,30 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="com.mojang.minecraftpe"
-      android:versionCode="4000"
-      android:versionName="0.4.0"
-      >
-      <!-- android:installLocation="preferExternal" -->
+      android:versionCode="6010"
+      android:versionName="0.6.1-alpha-0.0.3">

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

-    <uses-feature android:name="android.hardware.touchscreen.multitouch" android:required="true"/>
+    <uses-feature
+        android:name="android.hardware.touchscreen.multitouch"
+        android:required="true"/>

    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
    <uses-permission android:name="android.permission.VIBRATE"/>

-    <application	android:icon="@drawable/icon"
+    <application
+        android:icon="@drawable/icon"
        android:label="@string/app_name"
-    				>
+        android:hardwareAccelerated="true"
+        android:extractNativeLibs="true"
+        android:requestLegacyExternalStorage="true">

-        <activity   android:name="com.mojang.minecraftpe.Minecraft_Market"
+        <activity
+            android:name="com.mojang.minecraftpe.Minecraft_Market"
            android:label="@string/app_name_short"
-                    android:configChanges="orientation|keyboardHidden"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode"
            android:screenOrientation="landscape"
-                    android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:exported="true">

-            <meta-data  android:name="android.app.lib_name"
+            <meta-data
+                android:name="android.app.lib_name"
                android:value="minecraftpe"/>

            <intent-filter>
@@ -32,13 +41,34 @@
                <category android:name="android.intent.category.LAUNCHER"/>
            </intent-filter>
        </activity>
-		<activity android:name="com.mojang.minecraftpe.MainMenuOptionsActivity"></activity>

-        <meta-data android:name="xperiaplayoptimized_content" android:resource="@string/xperiaplayoptimized_content" />
-        <meta-data android:name="game_display_name" android:resource="@string/app_name" />
-        <meta-data android:name="game_icon" android:resource="@drawable/iconx" />
+        <activity
+            android:name="com.mojang.minecraftpe.MainActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|uiMode"
+            android:screenOrientation="landscape"
+            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:exported="false"/>
+
+        <activity
+            android:name="com.mojang.minecraftpe.MainMenuOptionsActivity"
+            android:exported="false"/>
+
+        <meta-data
+            android:name="xperiaplayoptimized_content"
+            android:resource="@string/xperiaplayoptimized_content"/>
+
+        <meta-data
+            android:name="game_display_name"
+            android:resource="@string/app_name"/>
+
+        <meta-data
+            android:name="game_icon"
+            android:resource="@drawable/iconx"/>
+
+        <uses-library
+            android:name="xperiaplaycertified"
+            android:required="false"/>

-        <uses-library android:name="xperiaplaycertified" android:required="false"/>
    </application>

 </manifest>
--- a/project/android_java/assets/lang/en_US.lang
+++ b/project/android_java/assets/lang/en_US.lang
@@ -168,8 +168,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 options.guiScale.large=Large
+options.guiScale.larger=Larger
+options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended
--- a/project/android_java/jni/Android.mk
+++ b/project/android_java/jni/Android.mk
@@ -183,6 +183,8 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/level/MobSpawner.cpp \
 ../../../src/world/level/Region.cpp \
 ../../../src/world/level/TickNextTickData.cpp \
+../../../src/world/level/FoliageColor.cpp \
+../../../src/world/level/GrassColor.cpp \
 ../../../src/world/level/biome/Biome.cpp \
 ../../../src/world/level/biome/BiomeSource.cpp \
 ../../../src/world/level/chunk/LevelChunk.cpp \
--- a/project/android_java/jni/Application.mk
+++ b/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
--- a/project/android_java/src/com/mojang/minecraftpe/MainActivity.java
+++ b/project/android_java/src/com/mojang/minecraftpe/MainActivity.java
@@ -31,6 +31,8 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.AssetManager;
 import android.graphics.Bitmap;
+import android.content.pm.PackageManager;
+import android.os.Build;
 import android.graphics.Bitmap.CompressFormat;
 import android.graphics.BitmapFactory;
 import android.media.AudioManager;
@@ -40,7 +42,6 @@ import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Display;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -55,9 +56,13 @@ import com.mojang.minecraftpe.sound.SoundPlayer;

 public class MainActivity extends Activity {
 	/** Called when the activity is first created. */
+    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;
    
    Vector<MotionEvent> _touchEvents = new Vector<MotionEvent>();
    Vector<KeyEvent> _keyEvents = new Vector<KeyEvent>();
@@ -68,53 +73,103 @@ public class MainActivity extends Activity {
        super.onCreate(savedInstanceState);
        nativeRegisterThis();

-        nativeOnCreate();
+        // Cache screen dimensions once to avoid re-entrant getDisplayMetrics() callbacks
+        android.util.DisplayMetrics _dm = getResources().getDisplayMetrics();
+        _screenWidth = Math.max(_dm.widthPixels, _dm.heightPixels);
+        _screenHeight = Math.min(_dm.widthPixels, _dm.heightPixels);

        _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);
+
+        checkAndRequestPermissions();
+        initNative();
+    }
+
+    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
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            boolean granted = true;
+            for (int r : grantResults) {
+                if (r != PackageManager.PERMISSION_GRANTED) {
+                    granted = false;
+                    break;
+                }
+            }
+            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);
+    }
+
+    // method required by native code to detect touchscreen support
+    public boolean supportsTouchscreen() {
+        return true; // all devices using this build are touch-capable
    }

-    public boolean isTouchscreen() { return true; }
    static public boolean isXperiaPlay() { return false; }

    static private boolean _isPowerVr = false;
    public void setIsPowerVR(boolean status) { MainActivity._isPowerVr = status; }
    static public boolean isPowerVR() { return _isPowerVr; }
    
+    @SuppressWarnings("deprecation")
    public void vibrate(int milliSeconds) {
-    	Vibrator v = (Vibrator)this.getSystemService(VIBRATOR_SERVICE);
+    	Vibrator v = (Vibrator) getSystemService(VIBRATOR_SERVICE);
+    	if (android.os.Build.VERSION.SDK_INT >= 26) {
+    		v.vibrate(android.os.VibrationEffect.createOneShot(milliSeconds,
+    				android.os.VibrationEffect.DEFAULT_AMPLITUDE));
+    	} else {
    		v.vibrate(milliSeconds);
    	}
+    }

    private void createAlertDialog(boolean hasOkButton, boolean hasCancelButton, boolean preventBackKey) {
    	AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -144,9 +199,16 @@ public class MainActivity extends Activity {

    @Override
    public void onWindowFocusChanged(boolean hasFocus) {
-    	// TODO Auto-generated method stub
-    	//System.out.println("Focus has changed. Has Focus? " + hasFocus);
    	super.onWindowFocusChanged(hasFocus);
+    	if (hasFocus) {
+    		getWindow().getDecorView().setSystemUiVisibility(
+    				View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
+    				| View.SYSTEM_UI_FLAG_FULLSCREEN
+    				| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+    				| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+    				| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+    				| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+    	}
    }

    @Override
@@ -184,9 +246,12 @@ public class MainActivity extends Activity {
 			return;
 		}

-    	if (event.getAction() == KeyEvent.ACTION_DOWN)
+    	if (event.getAction() == KeyEvent.ACTION_DOWN) {
    		nativeOnKeyDown(keyCode);
-    	else if (event.getAction() == KeyEvent.ACTION_UP)
+    		int unicodeChar = event.getUnicodeChar(event.getMetaState());
+    		if (unicodeChar > 0)
+    			nativeTextChar(unicodeChar);
+    	} else if (event.getAction() == KeyEvent.ACTION_UP)
        	nativeOnKeyUp(keyCode);
    }

@@ -347,22 +412,15 @@ public class MainActivity extends Activity {
    }
    
    public int getScreenWidth() {
-    	Display display = ((WindowManager)this.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-    	int out = Math.max(display.getWidth(), display.getHeight());
-    	//System.out.println("getwidth: " + out);
-    	return out;
+    	return _screenWidth;
    }
    
    public int getScreenHeight() {
-    	Display display = ((WindowManager)this.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-    	int out = Math.min(display.getWidth(), display.getHeight());
-    	//System.out.println("getheight: " + out);
-    	return out;
+    	return _screenHeight;
    }

    public float getPixelsPerMillimeter() {
-   	    DisplayMetrics metrics = new DisplayMetrics();
-   	    getWindowManager().getDefaultDisplay().getMetrics(metrics);
+   	    android.util.DisplayMetrics metrics = getResources().getDisplayMetrics();
   	    return (metrics.xdpi + metrics.ydpi) * 0.5f / 25.4f;
    }

@@ -465,8 +523,8 @@ public class MainActivity extends Activity {

    	        MainActivity.this.mDialog.show();
    	        MainActivity.this.mDialog.getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
-    	        MainActivity.this.mDialog.getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
-    	        //MainActivity.this.getWindow().setLayout(LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT);
+    	        MainActivity.this.mDialog.getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+    	        //MainActivity.this.getWindow().setLayout(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
    	    }
    	});
    }
@@ -516,6 +574,20 @@ public class MainActivity extends Activity {

    public void buyGame() {}

+    public int getKeyFromKeyCode(int keyCode, int metaState, int deviceId) {
+        android.view.KeyCharacterMap kcm = android.view.KeyCharacterMap.load(deviceId);
+        return kcm.get(keyCode, metaState);
+    }
+
+    public void openURL(String url) {
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW, android.net.Uri.parse(url));
+            startActivity(intent);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
    public String getPlatformStringVar(int id) {
    	if (id == 0) return android.os.Build.MODEL;
    	return null;
@@ -604,10 +676,11 @@ public class MainActivity extends Activity {
    //
    native void nativeRegisterThis();
    native void nativeUnregisterThis();
-    native static void nativeOnCreate();
+    native static void nativeOnCreate(int screenWidth, int screenHeight);
    native static void nativeOnDestroy();
    native static void nativeOnKeyDown(int key);
    native static void nativeOnKeyUp(int key);
+    native static void nativeTextChar(int unicodeChar);
    native static boolean nativeHandleBack(boolean isDown);
    native static void nativeMouseDown(int pointerId, int buttonId, float x, float y);
    native static void nativeMouseUp(int pointerId, int buttonId, float x, float y);
--- a/project/dedicated_server/CMakeLists.txt
+++ b/project/dedicated_server/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.5.0)
 find_package (Threads)
 include_directories("${PROJECT_SOURCE_DIR}/../lib_projects/raknet/jni/RaknetSources")
 add_subdirectory("${PROJECT_SOURCE_DIR}/../lib_projects/raknet/jni" "${CMAKE_CURRENT_BINARY_DIR}/raknet")
@@ -19,6 +19,7 @@ set(CompileFiles ../../src/main.cpp
 ../../src/client/IConfigListener.cpp
 ../../src/client/Minecraft.cpp
 ../../src/client/Options.cpp
+../../src/client/Option.cpp
 ../../src/client/OptionsFile.cpp
 ../../src/client/OptionStrings.cpp
 ../../src/client/gamemode/GameMode.cpp
@@ -151,6 +152,9 @@ set(CompileFiles ../../src/main.cpp
 ../../src/world/level/tile/entity/TileEntity.cpp
 ../../src/world/level/tile/entity/FurnaceTileEntity.cpp
 ../../src/world/phys/HitResult.cpp)
-message(${CMAKE_LIBRARY_ARCHITECTURE})
+
 add_executable(mcpe_server ${CompileFiles})
 target_link_libraries(mcpe_server raknet ${CMAKE_THREAD_LIBS_INIT})
+target_include_directories(mcpe_server PUBLIC
+    "../../src/"
+)
--- a/project/iosproj/Launch
+++ b/project/iosproj/Launch
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13142" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12042"/>
+        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="EHf-IW-A2E">
+            <objects>
+                <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="0.0" y="626.5" width="375" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="minecraftpe" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="0.0" y="202" width="375" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="20" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+</document>
--- a/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
+++ b/project/iosproj/minecraftpe.xcodeproj/project.pbxproj
@@ -41,7 +41,6 @@
 		042A91AE16B17517007ABBC6 /* GuiElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A316B17517007ABBC6 /* GuiElement.cpp */; };
 		042A91AF16B17517007ABBC6 /* NinePatch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A516B17517007ABBC6 /* NinePatch.cpp */; };
 		042A91B016B17517007ABBC6 /* OptionsGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A716B17517007ABBC6 /* OptionsGroup.cpp */; };
-		042A91B116B17517007ABBC6 /* OptionsPane.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91A916B17517007ABBC6 /* OptionsPane.cpp */; };
 		042A91B216B17517007ABBC6 /* TextBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 042A91AB16B17517007ABBC6 /* TextBox.cpp */; };
 		044129071682FF9600B70EE6 /* MouseHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 044129061682FF9600B70EE6 /* MouseHandler.cpp */; };
 		9D293CE716071C08000305C8 /* CreateNewWorld_iphone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */; };
@@ -1147,6 +1146,33 @@
 		D5F3B7DD14548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7C814548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib */; };
 		D5F3B7DE14548E7900D25470 /* IASKSpecifierValuesView.xib in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7C914548E7900D25470 /* IASKSpecifierValuesView.xib */; };
 		D5F3B7E51454930400D25470 /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D5F3B7E41454930400D25470 /* InAppSettings.bundle */; };
+		F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */ = {isa = PBXBuildFile; fileRef = 042A91AC16B17517007ABBC6 /* TextBox.h */; };
+		F99D341F2F736AA100DC153E /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D341E2F736AA100DC153E /* HttpClient.cpp */; };
+		F99D34202F736AA100DC153E /* HttpClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D341E2F736AA100DC153E /* HttpClient.cpp */; };
+		F99D34232F736AD400DC153E /* TextOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34222F736AD400DC153E /* TextOption.cpp */; };
+		F99D34242F736AD400DC153E /* TextOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34222F736AD400DC153E /* TextOption.cpp */; };
+		F99D34272F736AFB00DC153E /* OptionsFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34262F736AFB00DC153E /* OptionsFile.cpp */; };
+		F99D34282F736AFB00DC153E /* OptionsFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34262F736AFB00DC153E /* OptionsFile.cpp */; };
+		F99D342B2F736B6F00DC153E /* OptionsItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342A2F736B6F00DC153E /* OptionsItem.cpp */; };
+		F99D342C2F736B6F00DC153E /* OptionsItem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342A2F736B6F00DC153E /* OptionsItem.cpp */; };
+		F99D342F2F736BAD00DC153E /* ConsoleScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */; };
+		F99D34302F736BAD00DC153E /* ConsoleScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */; };
+		F99D34332F736BDA00DC153E /* CreditsScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34322F736BDA00DC153E /* CreditsScreen.cpp */; };
+		F99D34342F736BDA00DC153E /* CreditsScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34322F736BDA00DC153E /* CreditsScreen.cpp */; };
+		F99D34372F736C1000DC153E /* JoinByIPScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */; };
+		F99D34382F736C1000DC153E /* JoinByIPScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */; };
+		F99D343B2F736C3B00DC153E /* UsernameScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */; };
+		F99D343C2F736C3B00DC153E /* UsernameScreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */; };
+		F99D343F2F736C8400DC153E /* GuiElementContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */; };
+		F99D34402F736C8400DC153E /* GuiElementContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */; };
+		F99D34432F736F9400DC153E /* Option.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34422F736F9400DC153E /* Option.cpp */; };
+		F99D34442F736F9400DC153E /* Option.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34422F736F9400DC153E /* Option.cpp */; };
+		F99D34472F736FE800DC153E /* KeyOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34462F736FE800DC153E /* KeyOption.cpp */; };
+		F99D34482F736FE800DC153E /* KeyOption.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D34462F736FE800DC153E /* KeyOption.cpp */; };
+		F99D344B2F7370CF00DC153E /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D344A2F7370CF00DC153E /* Slider.cpp */; };
+		F99D344C2F7370CF00DC153E /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F99D344A2F7370CF00DC153E /* Slider.cpp */; };
+		F99D344E2F7372A100DC153E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F99D344D2F7372A100DC153E /* Launch Screen.storyboard */; };
+		F99D344F2F7372A100DC153E /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F99D344D2F7372A100DC153E /* Launch Screen.storyboard */; };
 /* End PBXBuildFile section */

 /* Begin PBXFileReference section */
@@ -1208,10 +1234,8 @@
 		042A91A616B17517007ABBC6 /* NinePatch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NinePatch.h; sourceTree = "<group>"; };
 		042A91A716B17517007ABBC6 /* OptionsGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionsGroup.cpp; sourceTree = "<group>"; };
 		042A91A816B17517007ABBC6 /* OptionsGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsGroup.h; sourceTree = "<group>"; };
-		042A91A916B17517007ABBC6 /* OptionsPane.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionsPane.cpp; sourceTree = "<group>"; };
-		042A91AA16B17517007ABBC6 /* OptionsPane.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionsPane.h; sourceTree = "<group>"; };
 		042A91AB16B17517007ABBC6 /* TextBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextBox.cpp; sourceTree = "<group>"; };
-		042A91AC16B17517007ABBC6 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextBox.h; sourceTree = "<group>"; };
+		042A91AC16B17517007ABBC6 /* TextBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextBox.h; path = ../../src/client/gui/components/TextBox.h; sourceTree = SOURCE_ROOT; };
 		044129061682FF9600B70EE6 /* MouseHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MouseHandler.cpp; sourceTree = "<group>"; };
 		9D293CE616071C08000305C8 /* CreateNewWorld_iphone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = CreateNewWorld_iphone.xib; path = minecraftpe/dialogs/CreateNewWorld_iphone.xib; sourceTree = "<group>"; };
 		9D293CEA160720D6000305C8 /* worldname_iphone5_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = worldname_iphone5_3.png; sourceTree = "<group>"; };
@@ -2017,7 +2041,7 @@
 		D5B50D6914CFF66F005F7284 /* Multitouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Multitouch.h; sourceTree = "<group>"; };
 		D5B50D6A14CFF66F005F7284 /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = "<group>"; };
 		D5B50D6B14CFF66F005F7284 /* time.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = time.cpp; sourceTree = "<group>"; };
-		D5B50D6C14CFF66F005F7284 /* time.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = time.h; sourceTree = "<group>"; };
+		D5B50D6C14CFF66F005F7284 /* time.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; fileEncoding = 4; path = time.h; sourceTree = "<group>"; };
 		D5B50E5614CFF66F005F7284 /* SharedConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedConstants.h; sourceTree = "<group>"; };
 		D5B50E5714CFF66F005F7284 /* terrain_4444.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terrain_4444.h; sourceTree = "<group>"; };
 		D5B50E5814CFF66F005F7284 /* terrain_5551.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = terrain_5551.h; sourceTree = "<group>"; };
@@ -2408,6 +2432,31 @@
 		D5F3B7C814548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IASKPSToggleSwitchSpecifierViewCell.xib; sourceTree = "<group>"; };
 		D5F3B7C914548E7900D25470 /* IASKSpecifierValuesView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IASKSpecifierValuesView.xib; sourceTree = "<group>"; };
 		D5F3B7E41454930400D25470 /* InAppSettings.bundle */ = {isa = PBXFileReference; explicitFileType = "wrapper.installer-pkg"; path = InAppSettings.bundle; sourceTree = "<group>"; };
+		F99D341D2F736AA100DC153E /* HttpClient.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = HttpClient.h; path = ../../src/platform/HttpClient.h; sourceTree = "<group>"; };
+		F99D341E2F736AA100DC153E /* HttpClient.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = HttpClient.cpp; path = ../../src/platform/HttpClient.cpp; sourceTree = "<group>"; };
+		F99D34212F736AD400DC153E /* TextOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = TextOption.h; path = ../../src/client/gui/components/TextOption.h; sourceTree = "<group>"; };
+		F99D34222F736AD400DC153E /* TextOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = TextOption.cpp; path = ../../src/client/gui/components/TextOption.cpp; };
+		F99D34252F736AFB00DC153E /* OptionsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsFile.h; path = ../../src/client/OptionsFile.h; sourceTree = "<group>"; sourceTree = "<group>"; };
+		F99D34262F736AFB00DC153E /* OptionsFile.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsFile.cpp; path = ../../src/client/OptionsFile.cpp; sourceTree = "<group>"; };
+		F99D34292F736B6F00DC153E /* OptionsItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionsItem.h; path = ../../src/client/gui/components/OptionsItem.h; sourceTree = "<group>"; };
+		F99D342A2F736B6F00DC153E /* OptionsItem.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = OptionsItem.cpp; path = ../../src/client/gui/components/OptionsItem.cpp; sourceTree = "<group>"; };
+		F99D342D2F736BAD00DC153E /* ConsoleScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ConsoleScreen.h; path = ../../src/client/gui/screens/ConsoleScreen.h; sourceTree = "<group>"; };
+		F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ConsoleScreen.cpp; path = ../../src/client/gui/screens/ConsoleScreen.cpp; sourceTree = "<group>"; };
+		F99D34312F736BDA00DC153E /* CreditsScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CreditsScreen.h; path = ../../src/client/gui/screens/CreditsScreen.h; sourceTree = "<group>"; };
+		F99D34322F736BDA00DC153E /* CreditsScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = CreditsScreen.cpp; path = ../../src/client/gui/screens/CreditsScreen.cpp; sourceTree = "<group>"; };
+		F99D34352F736C1000DC153E /* JoinByIPScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = JoinByIPScreen.h; path = ../../src/client/gui/screens/JoinByIPScreen.h; sourceTree = "<group>"; };
+		F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = JoinByIPScreen.cpp; path = ../../src/client/gui/screens/JoinByIPScreen.cpp; sourceTree = "<group>"; };
+		F99D34392F736C3B00DC153E /* UsernameScreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = UsernameScreen.h; path = ../../src/client/gui/screens/UsernameScreen.h; sourceTree = "<group>"; };
+		F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = UsernameScreen.cpp; path = ../../src/client/gui/screens/UsernameScreen.cpp; sourceTree = "<group>"; };
+		F99D343D2F736C8400DC153E /* GuiElementContainer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = GuiElementContainer.h; path = ../../src/client/gui/components/GuiElementContainer.h; sourceTree = "<group>"; };
+		F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = GuiElementContainer.cpp; path = ../../src/client/gui/components/GuiElementContainer.cpp; sourceTree = "<group>"; };
+		F99D34412F736F9400DC153E /* Option.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Option.h; path = ../../src/client/Option.h; sourceTree = "<group>"; };
+		F99D34422F736F9400DC153E /* Option.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Option.cpp; path = ../../src/client/Option.cpp; sourceTree = "<group>"; };
+		F99D34452F736FE800DC153E /* KeyOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KeyOption.h; path = ../../src/client/gui/components/KeyOption.h; sourceTree = "<group>"; };
+		F99D34462F736FE800DC153E /* KeyOption.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = KeyOption.cpp; path = ../../src/client/gui/components/KeyOption.cpp; sourceTree = "<group>"; };
+		F99D34492F7370CF00DC153E /* Slider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Slider.h; path = ../../src/client/gui/components/Slider.h; sourceTree = "<group>"; };
+		F99D344A2F7370CF00DC153E /* Slider.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Slider.cpp; path = ../../src/client/gui/components/Slider.cpp; sourceTree = "<group>"; };
+		F99D344D2F7372A100DC153E /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 /* End PBXFileReference section */

 /* Begin PBXFrameworksBuildPhase section */
@@ -3226,8 +3275,6 @@
 				042A91A616B17517007ABBC6 /* NinePatch.h */,
 				042A91A716B17517007ABBC6 /* OptionsGroup.cpp */,
 				042A91A816B17517007ABBC6 /* OptionsGroup.h */,
-				042A91A916B17517007ABBC6 /* OptionsPane.cpp */,
-				042A91AA16B17517007ABBC6 /* OptionsPane.h */,
 				042A91AB16B17517007ABBC6 /* TextBox.cpp */,
 				042A91AC16B17517007ABBC6 /* TextBox.h */,
 				D5B50C2814CFF66F005F7284 /* Button.cpp */,
@@ -4256,6 +4303,7 @@
 		D5CF9C37144C225000E4244F = {
 			isa = PBXGroup;
 			children = (
+				F99D344D2F7372A100DC153E /* Launch Screen.storyboard */,
 				D5E1BA9A1451C8A0007DCC4F /* Default@2x.png */,
 				9D959AFF16036BEE00E23A6F /* Default-568h@2x.png */,
 				D5F07744145EF79B00EC30FB /* Default-Landscape~ipad.png */,
@@ -4267,6 +4315,30 @@
 				D5CF9C45144C225000E4244F /* Frameworks */,
 				D5CF9C43144C225000E4244F /* Products */,
 				D5B50C1614CFF66F005F7284 /* src */,
+				F99D341D2F736AA100DC153E /* HttpClient.h */,
+				F99D341E2F736AA100DC153E /* HttpClient.cpp */,
+				F99D34212F736AD400DC153E /* TextOption.h */,
+				F99D34222F736AD400DC153E /* TextOption.cpp */,
+				F99D34252F736AFB00DC153E /* OptionsFile.h */,
+				F99D34262F736AFB00DC153E /* OptionsFile.cpp */,
+				F99D34292F736B6F00DC153E /* OptionsItem.h */,
+				F99D342A2F736B6F00DC153E /* OptionsItem.cpp */,
+				F99D342D2F736BAD00DC153E /* ConsoleScreen.h */,
+				F99D342E2F736BAD00DC153E /* ConsoleScreen.cpp */,
+				F99D34312F736BDA00DC153E /* CreditsScreen.h */,
+				F99D34322F736BDA00DC153E /* CreditsScreen.cpp */,
+				F99D34352F736C1000DC153E /* JoinByIPScreen.h */,
+				F99D34362F736C1000DC153E /* JoinByIPScreen.cpp */,
+				F99D34392F736C3B00DC153E /* UsernameScreen.h */,
+				F99D343A2F736C3B00DC153E /* UsernameScreen.cpp */,
+				F99D343D2F736C8400DC153E /* GuiElementContainer.h */,
+				F99D343E2F736C8400DC153E /* GuiElementContainer.cpp */,
+				F99D34412F736F9400DC153E /* Option.h */,
+				F99D34422F736F9400DC153E /* Option.cpp */,
+				F99D34452F736FE800DC153E /* KeyOption.h */,
+				F99D34462F736FE800DC153E /* KeyOption.cpp */,
+				F99D34492F7370CF00DC153E /* Slider.h */,
+				F99D344A2F7370CF00DC153E /* Slider.cpp */,
 			);
 			sourceTree = "<group>";
 		};
@@ -4527,10 +4599,16 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0420;
+				TargetAttributes = {
+					D5CF9C41144C225000E4244F = {
+						DevelopmentTeam = PZUVNW8F2U;
+						ProvisioningStyle = Automatic;
+					};
+				};
 			};
 			buildConfigurationList = D5CF9C3C144C225000E4244F /* Build configuration list for PBXProject "minecraftpe" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
@@ -4599,6 +4677,7 @@
 				D5B50A5614CFF492005F7284 /* pig.png in Resources */,
 				D5B50A5814CFF492005F7284 /* sheep_fur.png in Resources */,
 				D5B50A5A14CFF492005F7284 /* sheep.png in Resources */,
+				F99D344F2F7372A100DC153E /* Launch Screen.storyboard in Resources */,
 				D5B50A5C14CFF492005F7284 /* skeleton.png in Resources */,
 				D5B50A5E14CFF492005F7284 /* spider.png in Resources */,
 				D5B50A6014CFF492005F7284 /* zombie.png in Resources */,
@@ -4935,6 +5014,7 @@
 				D5ACF26F15C03DBF00E21C22 /* sand2.m4a in Resources */,
 				D5ACF27115C03DBF00E21C22 /* sand3.m4a in Resources */,
 				D5ACF27315C03DBF00E21C22 /* sand4.m4a in Resources */,
+				F99D344E2F7372A100DC153E /* Launch Screen.storyboard in Resources */,
 				D5ACF27515C03DBF00E21C22 /* snow1.m4a in Resources */,
 				D5ACF27715C03DBF00E21C22 /* snow2.m4a in Resources */,
 				D5ACF27915C03DBF00E21C22 /* snow3.m4a in Resources */,
@@ -5011,18 +5091,22 @@
 				D58BB544146A0B910002C9F5 /* IASKSettingsStore.m in Sources */,
 				D58BB545146A0B910002C9F5 /* IASKSettingsStoreFile.m in Sources */,
 				D58BB546146A0B910002C9F5 /* IASKSettingsStoreUserDefaults.m in Sources */,
+				F99D34232F736AD400DC153E /* TextOption.cpp in Sources */,
 				D58BB547146A0B910002C9F5 /* IASKSpecifier.m in Sources */,
 				D58BB548146A0B910002C9F5 /* IASKPSSliderSpecifierViewCell.m in Sources */,
 				D58BB549146A0B910002C9F5 /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
 				D58BB54A146A0B910002C9F5 /* IASKPSTitleValueSpecifierViewCell.m in Sources */,
 				D58BB54B146A0B910002C9F5 /* IASKPSToggleSwitchSpecifierViewCell.m in Sources */,
+				F99D343B2F736C3B00DC153E /* UsernameScreen.cpp in Sources */,
 				D58BB54C146A0B910002C9F5 /* IASKSlider.m in Sources */,
 				D58BB54D146A0B910002C9F5 /* IASKSwitch.m in Sources */,
+				F99D34302F736BAD00DC153E /* ConsoleScreen.cpp in Sources */,
 				D58BB54E146A0B910002C9F5 /* IASKTextField.m in Sources */,
 				D58BB550146A0B910002C9F5 /* PVRTexture.m in Sources */,
 				D5D43CC9146AF4B4002ED842 /* RenameMPWorldViewController.mm in Sources */,
 				D5B50F7014CFF670005F7284 /* AppPlatform_iOS.mm in Sources */,
 				D5B50F7414CFF670005F7284 /* CreativeMode.cpp in Sources */,
+				F99D34432F736F9400DC153E /* Option.cpp in Sources */,
 				D5B50F7614CFF670005F7284 /* GameMode.cpp in Sources */,
 				D5B50F7814CFF670005F7284 /* Button.cpp in Sources */,
 				D5B50F7A14CFF670005F7284 /* ImageButton.cpp in Sources */,
@@ -5067,6 +5151,7 @@
 				D5B50FC814CFF670005F7284 /* KeyboardInput.cpp in Sources */,
 				D5B50FCA14CFF670005F7284 /* TouchscreenInput.cpp in Sources */,
 				D5B50FCC14CFF670005F7284 /* LocalPlayer.cpp in Sources */,
+				F99D34482F736FE800DC153E /* KeyOption.cpp in Sources */,
 				D5B50FCE14CFF670005F7284 /* Chunk.cpp in Sources */,
 				D5B50FD014CFF670005F7284 /* Frustum.cpp in Sources */,
 				D5B50FD214CFF670005F7284 /* ChickenRenderer.cpp in Sources */,
@@ -5125,6 +5210,7 @@
 				D5B5113014CFF670005F7284 /* TripodCamera.cpp in Sources */,
 				D5B5113214CFF670005F7284 /* Mob.cpp in Sources */,
 				D5B5113414CFF670005F7284 /* MobCategory.cpp in Sources */,
+				F99D34282F736AFB00DC153E /* OptionsFile.cpp in Sources */,
 				D5B5113814CFF670005F7284 /* PathFinderMob.cpp in Sources */,
 				D5B5113A14CFF670005F7284 /* Inventory.cpp in Sources */,
 				D5B5113C14CFF670005F7284 /* Player.cpp in Sources */,
@@ -5136,6 +5222,7 @@
 				D5B5114814CFF670005F7284 /* Item.cpp in Sources */,
 				D5B5114A14CFF670005F7284 /* ItemInstance.cpp in Sources */,
 				D5B5114C14CFF670005F7284 /* PickaxeItem.cpp in Sources */,
+				F99D344B2F7370CF00DC153E /* Slider.cpp in Sources */,
 				D5B5114E14CFF670005F7284 /* ShovelItem.cpp in Sources */,
 				D5B5115014CFF670005F7284 /* Biome.cpp in Sources */,
 				D5B5115214CFF670005F7284 /* BiomeSource.cpp in Sources */,
@@ -5186,6 +5273,7 @@
 				D5251DBA1538192700FC82C8 /* CloudServer.cpp in Sources */,
 				D5251DBE1538192700FC82C8 /* CommandParserInterface.cpp in Sources */,
 				D5251DC01538192700FC82C8 /* ConnectionGraph2.cpp in Sources */,
+				F99D34402F736C8400DC153E /* GuiElementContainer.cpp in Sources */,
 				D5251DC21538192700FC82C8 /* ConsoleServer.cpp in Sources */,
 				D5251DC41538192700FC82C8 /* DataCompressor.cpp in Sources */,
 				D5251DC61538192700FC82C8 /* DirectoryDeltaTransfer.cpp in Sources */,
@@ -5210,6 +5298,8 @@
 				D5251DEC1538192700FC82C8 /* HTTPConnection.cpp in Sources */,
 				D5251DEE1538192700FC82C8 /* IncrementalReadInterface.cpp in Sources */,
 				D5251DF01538192700FC82C8 /* Itoa.cpp in Sources */,
+				F99D34202F736AA100DC153E /* HttpClient.cpp in Sources */,
+				F99D34382F736C1000DC153E /* JoinByIPScreen.cpp in Sources */,
 				D5251DF21538192700FC82C8 /* LinuxStrings.cpp in Sources */,
 				D5251DF41538192700FC82C8 /* LocklessTypes.cpp in Sources */,
 				D5251DF61538192700FC82C8 /* LogCommandParser.cpp in Sources */,
@@ -5238,6 +5328,7 @@
 				D5251E2A1538192700FC82C8 /* RakSleep.cpp in Sources */,
 				D5251E2C1538192700FC82C8 /* RakString.cpp in Sources */,
 				D5251E2E1538192700FC82C8 /* RakThread.cpp in Sources */,
+				F99D34332F736BDA00DC153E /* CreditsScreen.cpp in Sources */,
 				D5251E301538192700FC82C8 /* RakWString.cpp in Sources */,
 				D5251E321538192700FC82C8 /* Rand.cpp in Sources */,
 				D5251E341538192700FC82C8 /* rdlmalloc.cpp in Sources */,
@@ -5280,6 +5371,7 @@
 				D5951EEB159349100043A12A /* TileEntity.cpp in Sources */,
 				D5951EEF159349680043A12A /* FurnaceScreen.cpp in Sources */,
 				D5951EF215934A2D0043A12A /* Feature.cpp in Sources */,
+				F99D342C2F736B6F00DC153E /* OptionsItem.cpp in Sources */,
 				D5951EF815934AC50043A12A /* BaseContainerMenu.cpp in Sources */,
 				D5951EFA15934AC50043A12A /* FurnaceMenu.cpp in Sources */,
 				D5D381F315A1A1CF00B6C50E /* FillingContainer.cpp in Sources */,
@@ -5339,8 +5431,10 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F912B8CF2F6C3D5200BC60DF /* TextBox.h in Sources */,
 				D5CF9C57144C225000E4244F /* main.mm in Sources */,
 				D5CF9C5B144C225000E4244F /* minecraftpeAppDelegate.mm in Sources */,
+				F99D343C2F736C3B00DC153E /* UsernameScreen.cpp in Sources */,
 				D5CF9C65144C225000E4244F /* EAGLView.m in Sources */,
 				D5CFA01D144C453900E4244F /* minecraftpeViewController.mm in Sources */,
 				D5A55E4914500EDE00A7571B /* CreateNewWorldViewController.mm in Sources */,
@@ -5354,6 +5448,7 @@
 				D5F3B7D014548E7900D25470 /* IASKSettingsStoreUserDefaults.m in Sources */,
 				D5F3B7D114548E7900D25470 /* IASKSpecifier.m in Sources */,
 				D5F3B7D214548E7900D25470 /* IASKPSSliderSpecifierViewCell.m in Sources */,
+				F99D34472F736FE800DC153E /* KeyOption.cpp in Sources */,
 				D5F3B7D314548E7900D25470 /* IASKPSTextFieldSpecifierViewCell.m in Sources */,
 				D5F3B7D414548E7900D25470 /* IASKPSTitleValueSpecifierViewCell.m in Sources */,
 				D5F3B7D514548E7900D25470 /* IASKPSToggleSwitchSpecifierViewCell.m in Sources */,
@@ -5465,11 +5560,13 @@
 				D5B5112D14CFF670005F7284 /* PrimedTnt.cpp in Sources */,
 				D5B5112F14CFF670005F7284 /* TripodCamera.cpp in Sources */,
 				D5B5113114CFF670005F7284 /* Mob.cpp in Sources */,
+				F99D34442F736F9400DC153E /* Option.cpp in Sources */,
 				D5B5113314CFF670005F7284 /* MobCategory.cpp in Sources */,
 				D5B5113714CFF670005F7284 /* PathFinderMob.cpp in Sources */,
 				D5B5113914CFF670005F7284 /* Inventory.cpp in Sources */,
 				D5B5113B14CFF670005F7284 /* Player.cpp in Sources */,
 				D5B5113D14CFF670005F7284 /* Arrow.cpp in Sources */,
+				F99D343F2F736C8400DC153E /* GuiElementContainer.cpp in Sources */,
 				D5B5113F14CFF670005F7284 /* Recipes.cpp in Sources */,
 				D5B5114114CFF670005F7284 /* ToolRecipes.cpp in Sources */,
 				D5B5114314CFF670005F7284 /* WeaponRecipes.cpp in Sources */,
@@ -5507,10 +5604,12 @@
 				D5B5118514CFF670005F7284 /* HitResult.cpp in Sources */,
 				D5B5118B14D03342005F7284 /* SynchedEntityData.cpp in Sources */,
 				D5B5118E14DEA27F005F7284 /* DeathScreen.cpp in Sources */,
+				F99D34242F736AD400DC153E /* TextOption.cpp in Sources */,
 				D5B5119114DEA2B7005F7284 /* LevelData.cpp in Sources */,
 				D5B5119414DEA2EF005F7284 /* DyePowderItem.cpp in Sources */,
 				D584926D14FD234400741128 /* SharedConstants.cpp in Sources */,
 				D584927314FD236700741128 /* MoveControl.cpp in Sources */,
+				F99D344C2F7370CF00DC153E /* Slider.cpp in Sources */,
 				D584928614FD240D00741128 /* IConfigListener.cpp in Sources */,
 				D584928914FD2FAF00741128 /* Path.cpp in Sources */,
 				D5B86281153810BD00F3238A /* I18n.cpp in Sources */,
@@ -5562,6 +5661,7 @@
 				D5251E011538192700FC82C8 /* NatTypeDetectionServer.cpp in Sources */,
 				D5251E031538192700FC82C8 /* NetworkIDManager.cpp in Sources */,
 				D5251E051538192700FC82C8 /* NetworkIDObject.cpp in Sources */,
+				F99D34372F736C1000DC153E /* JoinByIPScreen.cpp in Sources */,
 				D5251E071538192700FC82C8 /* PacketConsoleLogger.cpp in Sources */,
 				D5251E091538192700FC82C8 /* PacketFileLogger.cpp in Sources */,
 				D5251E0B1538192700FC82C8 /* PacketizedTCP.cpp in Sources */,
@@ -5591,11 +5691,13 @@
 				D5251E411538192700FC82C8 /* SendToThread.cpp in Sources */,
 				D5251E431538192700FC82C8 /* SHA1.cpp in Sources */,
 				D5251E451538192700FC82C8 /* SignaledEvent.cpp in Sources */,
+				F99D34342F736BDA00DC153E /* CreditsScreen.cpp in Sources */,
 				D5251E471538192700FC82C8 /* SimpleMutex.cpp in Sources */,
 				D5251E491538192700FC82C8 /* SocketLayer.cpp in Sources */,
 				D5251E4B1538192700FC82C8 /* StringCompressor.cpp in Sources */,
 				D5251E4D1538192700FC82C8 /* StringTable.cpp in Sources */,
 				D5251E4F1538192700FC82C8 /* SuperFastHash.cpp in Sources */,
+				F99D342B2F736B6F00DC153E /* OptionsItem.cpp in Sources */,
 				D5251E511538192700FC82C8 /* TableSerializer.cpp in Sources */,
 				D5251E531538192700FC82C8 /* TCPInterface.cpp in Sources */,
 				D5251E551538192700FC82C8 /* TeamBalancer.cpp in Sources */,
@@ -5618,6 +5720,7 @@
 				D5951EDD159348C50043A12A /* ItemPane.cpp in Sources */,
 				D5951EE3159349000043A12A /* FurnaceTile.cpp in Sources */,
 				D5951EE8159349100043A12A /* FurnaceTileEntity.cpp in Sources */,
+				F99D342F2F736BAD00DC153E /* ConsoleScreen.cpp in Sources */,
 				D5951EEA159349100043A12A /* TileEntity.cpp in Sources */,
 				D5951EEE159349680043A12A /* FurnaceScreen.cpp in Sources */,
 				D5951EF115934A2D0043A12A /* Feature.cpp in Sources */,
@@ -5654,6 +5757,7 @@
 				D544941E15D13F45005FA9B0 /* PlayerRenderer.cpp in Sources */,
 				D544942215D13F5E005FA9B0 /* RemotePlayer.cpp in Sources */,
 				D5B17ED515E226F50056E751 /* Throwable.cpp in Sources */,
+				F99D341F2F736AA100DC153E /* HttpClient.cpp in Sources */,
 				D5B17ED915E2273F0056E751 /* SurvivalMode.cpp in Sources */,
 				D5B17EDD15E227670056E751 /* TrapDoorTile.cpp in Sources */,
 				D5B17EE115E260910056E751 /* MoveFolder.mm in Sources */,
@@ -5689,6 +5793,7 @@
 				0400453A16A4125C003EB6FA /* FallingTileRenderer.cpp in Sources */,
 				0413970716A82E1E008A9F1A /* ArmorItem.cpp in Sources */,
 				0413970D16A82E6B008A9F1A /* CraftingFilters.cpp in Sources */,
+				F99D34272F736AFB00DC153E /* OptionsFile.cpp in Sources */,
 				0413970E16A82E6B008A9F1A /* StonecutterScreen.cpp in Sources */,
 				0413971116A82E7B008A9F1A /* ArmorScreen.cpp in Sources */,
 				0413971516A82EB9008A9F1A /* ArmorRecipes.cpp in Sources */,
@@ -5697,7 +5802,6 @@
 				042A91AE16B17517007ABBC6 /* GuiElement.cpp in Sources */,
 				042A91AF16B17517007ABBC6 /* NinePatch.cpp in Sources */,
 				042A91B016B17517007ABBC6 /* OptionsGroup.cpp in Sources */,
-				042A91B116B17517007ABBC6 /* OptionsPane.cpp in Sources */,
 				042A91B216B17517007ABBC6 /* TextBox.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -5735,25 +5839,29 @@
 		D50BE20815EE05B8008AA75E /* Ad-Hoc */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = "$(ARCHS_STANDARD)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Mojang AB";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = PUBLISH;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "C93D3524-5C6F-466E-B12B-833663B7EAE0";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = "Ad-Hoc";
@@ -5765,15 +5873,26 @@
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../src",
+					"$(SRCROOT)/../../src/client/gui/components",
+					"$(SRCROOT)/../../src/world",
+					"$(SRCROOT)/../../src/platform/input",
+					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
-				VALID_ARCHS = "i386 armv6 armv7";
+				SDKROOT = iphoneos;
+				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = "Ad-Hoc";
@@ -5846,24 +5965,28 @@
 		D5A20ADB146AAD9C00A52FEC /* AppStore */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = "$(ARCHS_STANDARD)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Mojang AB";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "64BA8967-1A9A-4980-972C-42E75AD5E023";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = AppStore;
@@ -5876,11 +5999,19 @@
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = PUBLISH;
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../src",
+					"$(SRCROOT)/../../src/client/gui/components",
+					"$(SRCROOT)/../../src/world",
+					"$(SRCROOT)/../../src/platform/input",
+					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DNS_BLOCK_ASSERTIONS=1",
 					"-DANDROID_PUBLISH",
@@ -5888,8 +6019,10 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "1B194957-98CF-49B7-A0E7-76692B4B722D";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
-				VALID_ARCHS = "i386 armv6 armv7";
+				SDKROOT = iphoneos;
+				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = AppStore;
@@ -5922,8 +6055,8 @@
 		D5CF9C6C144C225000E4244F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = "$(ARCHS_STANDARD)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -5935,41 +6068,50 @@
 					"$(inherited)",
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				USE_HEADERMAP = NO;
+				VALIDATE_PRODUCT = YES;
 			};
 			name = Debug;
 		};
 		D5CF9C6D144C225000E4244F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_UNIVERSAL_IPHONE_OS)";
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = "$(ARCHS_STANDARD)";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_PREPROCESSOR_DEFINITIONS = PUBLISH;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO;
 				GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
+				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src";
+				USE_HEADERMAP = NO;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -5977,19 +6119,34 @@
 		D5CF9C6F144C225000E4244F /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PZUVNW8F2U;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../src",
+					"$(SRCROOT)/../../src/client/gui/components",
+					"$(SRCROOT)/../../src/world",
+					"$(SRCROOT)/../../src/platform/input",
+					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
-				VALID_ARCHS = "i386 armv6 armv7";
+				SDKROOT = iphoneos;
+				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Debug;
@@ -5997,19 +6154,34 @@
 		D5CF9C70144C225000E4244F /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = PZUVNW8F2U;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "minecraftpe/minecraftpe-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				"GCC_THUMB_SUPPORT[arch=armv7]" = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = "";
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				HEADER_SEARCH_PATHS = "";
+				HEADER_SEARCH_PATHS = (
+					"$(SRCROOT)/../../src",
+					"$(SRCROOT)/../../src/client/gui/components",
+					"$(SRCROOT)/../../src/world",
+					"$(SRCROOT)/../../src/platform/input",
+					"$(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views",
+				);
 				INFOPLIST_FILE = "minecraftpe/minecraftpe-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
+				IPHONEOS_DEPLOYMENT_TARGET = 14;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_BUNDLE_IDENTIFIER = "com.mojang.mcpe-arm64";
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				RUN_CLANG_STATIC_ANALYZER = NO;
-				SDKROOT = iphoneos6.0;
-				VALID_ARCHS = "i386 armv6 armv7";
+				SDKROOT = iphoneos;
+				SYSTEM_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../src $(SRCROOT)/../lib_projects/InAppSettingsKit/Models $(SRCROOT)/../../src/client/gui/components $(SRCROOT)/../../src/world $(SRCROOT)/../../src/platform/input $(SRCROOT)/../../project/lib_projects/InAppSettingsKit/Views";
+				USE_HEADERMAP = NO;
 				WRAPPER_EXTENSION = app;
 			};
 			name = Release;
--- a/project/iosproj/minecraftpe/minecraftpe-Info.plist
+++ b/project/iosproj/minecraftpe/minecraftpe-Info.plist
@@ -37,7 +37,7 @@
 		</dict>
 	</dict>
 	<key>CFBundleIdentifier</key>
-	<string>com.mojang.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -58,6 +58,8 @@
 	<array>
 		<string>minecraft.ttf</string>
 	</array>
+	<key>UILaunchStoryboardName</key>
+	<string>Launch Screen</string>
 	<key>UIPrerenderedIcon</key>
 	<true/>
 	<key>UIRequiresPersistentWiFi</key>
--- a/project/lib_projects/raknet/jni/Android.mk
+++ b/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)
--- a/project/lib_projects/raknet/jni/RaknetSources/FileList.cpp
+++ b/project/lib_projects/raknet/jni/RaknetSources/FileList.cpp
@@ -5,13 +5,13 @@
 #include <stdio.h> // RAKNET_DEBUG_PRINTF
 #include "RakAssert.h"
 #if defined(ANDROID)
-#include <asm/io.h>
+// <asm/io.h> not needed and unavailable on arm64
 #elif defined(_WIN32) || defined(__CYGWIN__)
 #include <io.h>


-#elif !defined ( __APPLE__ ) && !defined ( __APPLE_CC__ ) && !defined ( __PPC__ ) && !defined ( __FreeBSD__ ) && !defined ( __S3E__ )
-#include <sys/io.h>
+// #elif !defined ( __APPLE__ ) && !defined ( __APPLE_CC__ ) && !defined ( __PPC__ ) && !defined ( __FreeBSD__ ) && !defined ( __S3E__ )
+// #include <sys/io.h>
 #endif


--- a/project/lib_projects/raknet/jni/RaknetSources/RakPeer.cpp
+++ b/project/lib_projects/raknet/jni/RaknetSources/RakPeer.cpp
@@ -124,7 +124,7 @@ static const unsigned int MAX_OFFLINE_DATA_LENGTH=400; // I set this because I l
 #pragma warning(disable:4309) // 'initializing' : truncation of constant value
 #endif
 // Make sure highest bit is 0, so isValid in DatagramHeaderFormat is false
-static const char OFFLINE_MESSAGE_DATA_ID[16]={0x00,0xFF,0xFF,0x00,0xFE,0xFE,0xFE,0xFE,0xFD,0xFD,0xFD,0xFD,0x12,0x34,0x56,0x78};
+static const unsigned char OFFLINE_MESSAGE_DATA_ID[16]={0x00,0xFF,0xFF,0x00,0xFE,0xFE,0xFE,0xFE,0xFD,0xFD,0xFD,0xFD,0x12,0x34,0x56,0x78};

 struct PacketFollowedByData
 {
--- a/project/lib_projects/raknet/jni/RaknetSources/WindowsIncludes.h
+++ b/project/lib_projects/raknet/jni/RaknetSources/WindowsIncludes.h
@@ -1,8 +1,8 @@
 #if defined(X360__) 
 #elif defined (_WIN32)
-#include <WinSock2.h>
+#include <winsock2.h>
 #include <windows.h>
-#include <Ws2tcpip.h>
+#include <ws2tcpip.h>

 // Must always include Winsock2.h before windows.h
 // or else:
--- a/src/AppPlatform.h
+++ b/src/AppPlatform.h
@@ -71,9 +71,12 @@ public:

 	virtual void saveScreenshot(const std::string& filename, int glWidth, int glHeight) {}
 	virtual TextureData loadTexture(const std::string& filename_, bool textureFolder) { return TextureData(); }
+	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() {}
 	
@@ -96,9 +99,6 @@ public:
 	virtual std::string getDateString(int s) { return ""; }
 	//virtual void createUserInputScreen(const char* types) {}

-    virtual int checkLicense() { return 0; }
-	virtual bool hasBuyButtonWhenInvalidLicense() { return false; }
-
 	virtual void uploadPlatformDependentData(int id, void* data) {}
 	virtual BinaryBlob readAssetFile(const std::string& filename) { return BinaryBlob(); }
 	virtual void _tick() {}
@@ -117,7 +117,7 @@ public:
    virtual bool isSuperFast() = 0;
 #endif

-	virtual void buyGame() {}
+	virtual void openURL(const std::string& url) {}

 	virtual void finish() {}
 	
--- a/src/AppPlatform_android.h
+++ b/src/AppPlatform_android.h
@@ -68,9 +68,6 @@ public:

        _methodGetDateString(0),

-        _methodCheckLicense(0),
-        _methodHasBuyButton(0),
-        _methodBuyGame(0),
        _methodVibrate(0),
        _methodSupportsTouchscreen(0),
 		_methodSetIsPowerVR(0),
@@ -104,6 +101,7 @@ public:

    int getScreenWidth() { return _screenWidth; }
    int getScreenHeight() { return _screenHeight; }
+    void setScreenDimensions(int w, int h) { _screenWidth = w; _screenHeight = h; }

    // Note, this has to be called from the main thread (e.g. do it from JNI_onLoad)
    // Somewhere between calling this, and calling the AppPlatform methods,
@@ -146,10 +144,6 @@ public:

        _methodGetDateString = env->GetMethodID( _activityClass, "getDateString", "(I)Ljava/lang/String;");

-        _methodCheckLicense = env->GetMethodID( _activityClass, "checkLicense", "()I");
-        _methodHasBuyButton = env->GetMethodID( _activityClass, "hasBuyButtonWhenInvalidLicense", "()Z");
-        _methodBuyGame = env->GetMethodID( _activityClass, "buyGame", "()V");
-
        _methodVibrate = env->GetMethodID( _activityClass, "vibrate", "(I)V");
        _methodSupportsTouchscreen = env->GetMethodID( _activityClass, "supportsTouchscreen", "()Z");
 		_methodSetIsPowerVR  = env->GetMethodID( _activityClass, "setIsPowerVR", "(Z)V");
@@ -157,6 +151,8 @@ public:

 		_methodGetPixelsPerMillimeter = env->GetMethodID( _activityClass, "getPixelsPerMillimeter", "()F");
 		_methodGetPlatformStringVar = env->GetMethodID( _activityClass, "getPlatformStringVar", "(I)Ljava/lang/String;");
+		// custom helper to launch external URLs
+		_methodOpenURL = env->GetMethodID(_activityClass, "openURL", "(Ljava/lang/String;)V");

 		_classWindow = (jclass)env->NewGlobalRef(env->FindClass("android/view/Window"));
 		_classContext = (jclass)env->NewGlobalRef(env->FindClass("android/content/Context"));
@@ -192,14 +188,22 @@ public:
    //        be rewritten later on anyway
    int initConsts() {

+        LOGI("initConsts: start\n");
        JVMAttacher ta(_vm);
        JNIEnv* env = ta.getEnv();

+        LOGI("initConsts: getting method IDs\n");
        jmethodID fWidth = env->GetMethodID( _activityClass, "getScreenWidth", "()I");
+        LOGI("initConsts: got fWidth=%p\n", fWidth);
        jmethodID fHeight = env->GetMethodID( _activityClass, "getScreenHeight", "()I");
+        LOGI("initConsts: got fHeight=%p, calling getScreenWidth\n", fHeight);

        _screenWidth = env->CallIntMethod(instance, fWidth);
+        LOGI("initConsts: screenWidth=%d, calling getScreenHeight\n", _screenWidth);
        _screenHeight = env->CallIntMethod(instance, fHeight);
+        LOGI("initConsts: screenHeight=%d, done\n", _screenHeight);
+
+        return 1;
    }

    void tick() {
@@ -376,8 +380,9 @@ public:
        JVMAttacher ta(_vm);
        JNIEnv* env = ta.getEnv();

+        std::string path = textureFolder ? "images/" + filename : filename;
        jintArray arr = (jintArray)env->CallObjectMethod(
-            instance, _getImageData, env->NewStringUTF(filename.c_str()));
+            instance, _getImageData, env->NewStringUTF(path.c_str()));

        if (!arr)
            return TextureData();
@@ -464,37 +469,15 @@ public:
 		env->ReleaseStringUTFChars(stringVar, str);
 		return out;
 	}
-
-	int checkLicense() {
-        if (!_isInited) return -2;
-        if (!_methodCheckLicense) return -2;
-
+	// Opens a webpage using an Android intent.  Called from native code.
+	virtual void openURL(const std::string& url) {
+		if (!_isInited || !_methodOpenURL) return;
 		JVMAttacher ta(_vm);
 		JNIEnv* env = ta.getEnv();
-
-        return env->CallIntMethod(instance, _methodCheckLicense);
+		jstring jurl = env->NewStringUTF(url.c_str());
+		env->CallVoidMethod(instance, _methodOpenURL, jurl);
+		env->DeleteLocalRef(jurl);
 	}
-
-    bool hasBuyButtonWhenInvalidLicense() {
-        if (!_isInited) return false;
-        if (!_methodHasBuyButton) return false;
-
-        JVMAttacher ta(_vm);
-        JNIEnv* env = ta.getEnv();
-
-        return JNI_TRUE == env->CallBooleanMethod(instance, _methodHasBuyButton);
-    }
-
-    void buyGame() {
-        if (!_isInited) return;
-        if (!_methodBuyGame) return;
-
-        JVMAttacher ta(_vm);
-        JNIEnv* env = ta.getEnv();
-
-        env->CallVoidMethod(instance, _methodBuyGame);
-    }
-
    virtual void finish() {
        if (!_isInited) return;
        if (!_methodFinish) return;
@@ -555,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;
@@ -636,10 +619,6 @@ private:

    jmethodID _methodGetDateString;

-    jmethodID _methodCheckLicense;
-    jmethodID _methodHasBuyButton;
-    jmethodID _methodBuyGame;
-
    jmethodID _getScreenWidth;
    jmethodID _getScreenHeight;
    jmethodID _methodGetPixelsPerMillimeter;
@@ -649,6 +628,7 @@ private:
 	jmethodID _methodIsNetworkEnabled;

 	jmethodID _methodGetPlatformStringVar;
+	jmethodID _methodOpenURL; // new JNI method for launching browser

 	jclass _classWindow;
 	jclass _classContext;
--- a/src/AppPlatform_glfw.cpp
+++ b/src/AppPlatform_glfw.cpp
--- a/src/AppPlatform_glfw.h
+++ b/src/AppPlatform_glfw.h
@@ -3,6 +3,8 @@

 #include "AppPlatform.h"
 #include "platform/log.h"
+#include "platform/HttpClient.h"
+#include "platform/PngLoader.h"
 #include "client/renderer/gles.h"
 #include "world/level/storage/FolderMethods.h"
 #include <png.h>
@@ -10,6 +12,17 @@
 #include <fstream>
 #include <sstream>
 #include <GLFW/glfw3.h>
+#include <ctime>
+#include "util/StringUtils.h"
+
+#ifdef _WIN32
+#include <windows.h>
+#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);
@@ -22,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();
@@ -39,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
    }

@@ -47,83 +60,96 @@ 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://")) {
+			std::vector<unsigned char> body;
+			if (HttpClient::download(filename_, body) && !body.empty()) {
+				return loadTextureFromMemory(body.data(), body.size());
+			}
+			return TextureData();
+		}
+
 		TextureData out;

 		std::string filename = textureFolder? "data/images/" + filename_
 								: 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;
 		}

-    std::string getDateString(int s) {
-        std::stringstream ss;
-		ss << s << " s (UTC)";
-		return ss.str();
+		return loadTextureFromMemory(fileData.data(), fileData.size());
    }

-	virtual int checkLicense() {
-		static int _z = 0;//20;
-		_z--;
-		if (_z < 0) return 0;
-		//if (_z < 0) return 107;
-		return -2;
+	TextureData loadTextureFromMemory(const unsigned char* data, size_t size) override {
+		return loadPngFromMemory(data, size);
 	}

-	virtual int getScreenWidth() { return 854; };
-	virtual int getScreenHeight() { return 480; };
+	virtual std::string getDateString(int s) override {
+		time_t tm = s;

-	virtual float getPixelsPerMillimeter();
+		char mbstr[100];
+		std::strftime(mbstr, sizeof(mbstr), "%F %T", std::localtime(&tm));

-	virtual bool supportsTouchscreen() { return true; }
-	virtual bool hasBuyButtonWhenInvalidLicense() { return false; }
+		return std::string(mbstr);
+	}
+
+	virtual int getScreenWidth() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return w;
+		#endif
+
+		return 854; 
+	};
+
+	virtual int getScreenHeight() override { 
+		#ifdef __EMSCRIPTEN__
+			int w, h;
+			emscripten_get_canvas_element_size("canvas", &w, &h);
+
+			return h;
+		#endif
+
+		return 480; 
+	};
+
+	virtual float getPixelsPerMillimeter() override;
+
+	virtual bool supportsTouchscreen() override { return 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
+		ShellExecuteA(NULL, "open", url.c_str(), NULL, NULL, SW_SHOWNORMAL);
+#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:
 };
-
 #endif /*APPPLATFORM_GLFW_H__*/
--- a/src/AppPlatform_iOS.h
+++ b/src/AppPlatform_iOS.h
@@ -41,17 +41,6 @@ public:
    
    std::string getDateString(int s);

-	virtual int checkLicense() {
-        return 0;
-		static int _z = 20;
-		_z--;
-		if (_z < 0) return 0;
-		//if (_z < 0) return 107;
-		return -2;
-	}
-    
-    virtual void buyGame();
-
 	virtual int getScreenWidth();
 	virtual int getScreenHeight();
    virtual float getPixelsPerMillimeter();
@@ -63,11 +52,10 @@ public:
    
 	virtual StringVector getOptionStrings();

-    virtual bool isPowerVR() { return false; }
+    virtual bool isPowerVR();
    virtual bool isSuperFast();
    virtual void showKeyboard();
    virtual void hideKeyboard();
-	virtual void isPowerVR();
 private:
    
    std::string _basePath;
--- a/src/AppPlatform_iOS.mm
+++ b/src/AppPlatform_iOS.mm
@@ -175,10 +175,6 @@ BinaryBlob AppPlatform_iOS::readAssetFile(const std::string& filename_) {
    return BinaryBlob(bytes, numBytes);
 }

-void AppPlatform_iOS::buyGame() {
-    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"http://phobos.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=479516143&mt=8"]];
-}
-
 std::string AppPlatform_iOS::getDateString(int s) {

    NSDate* date = [NSDate dateWithTimeIntervalSince1970:s];
@@ -279,7 +275,9 @@ void AppPlatform_iOS::hideKeyboard() {
    [_viewController hideKeyboard];
 	super::hideKeyboard();
 }
-void AppPlatform_iOS::isPowerVR() {
+
+// this was originally void but i changed it to bool because void cant return values
+bool AppPlatform_iOS::isPowerVR() {
 	const char* s = (const char*)glGetString(GL_RENDERER);
 	if (!s) return false;
 	return strstr(s, "SGX") != NULL;
--- a/src/AppPlatform_win32.cpp
+++ b/src/AppPlatform_win32.cpp
@@ -14,4 +14,3 @@ float AppPlatform_win32::getPixelsPerMillimeter() {
 }

 bool AppPlatform_win32::supportsTouchscreen()  { return true; }
-bool AppPlatform_win32::hasBuyButtonWhenInvalidLicense() { return true; }
--- a/src/AppPlatform_win32.h
+++ b/src/AppPlatform_win32.h
@@ -3,12 +3,17 @@

 #include "AppPlatform.h"
 #include "platform/log.h"
+#include "platform/HttpClient.h"
+#include "platform/PngLoader.h"
 #include "client/renderer/gles.h"
 #include "world/level/storage/FolderMethods.h"
+#include "util/StringUtils.h"
 #include <png.h>
 #include <cmath>
 #include <fstream>
 #include <sstream>
+#include <windows.h>
+#include <shellapi.h>

 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);
@@ -48,6 +53,15 @@ public:

    TextureData loadTexture(const std::string& filename_, bool textureFolder)
 	{
+		// Support fetching PNG textures via HTTP/HTTPS (for skins, etc).
+		if (Util::startsWith(filename_, "http://") || Util::startsWith(filename_, "https://")) {
+			std::vector<unsigned char> body;
+			if (HttpClient::download(filename_, body) && !body.empty()) {
+				return loadTextureFromMemory(body.data(), body.size());
+			}
+			return TextureData();
+		}
+
 		TextureData out;

 		std::string filename = textureFolder? "data/images/" + filename_
@@ -100,18 +114,15 @@ public:
 		}
    }

-    std::string getDateString(int s) {
-        std::stringstream ss;
-		ss << s << " s (UTC)";
-		return ss.str();
+	TextureData loadTextureFromMemory(const unsigned char* data, size_t size) override {
+		return loadPngFromMemory(data, size);
 	}
+ 		time_t tm = s;

-	virtual int checkLicense() {
-		static int _z = 0;//20;
-		_z--;
-		if (_z < 0) return 0;
-		//if (_z < 0) return 107;
-		return -2;
+		char mbstr[100];
+		std::strftime(mbstr, sizeof(mbstr), "%F %T", std::localtime(&tm));
+
+		return std::string(mbstr);
 	}

 	virtual int getScreenWidth();
@@ -120,7 +131,10 @@ public:
 	virtual float getPixelsPerMillimeter();

 	virtual bool supportsTouchscreen();
-	virtual bool hasBuyButtonWhenInvalidLicense();
+
+	virtual void openURL(const std::string& url) {
+		ShellExecuteA(NULL, "open", url.c_str(), NULL, NULL, SW_SHOWNORMAL);
+	}

 private:
 };
--- a/src/NinecraftApp.cpp
+++ b/src/NinecraftApp.cpp
@@ -18,6 +18,7 @@
 //#include "world/level/storage/FolderMethods.h"
 #ifndef STANDALONE_SERVER
 #include "client/gui/screens/StartMenuScreen.h"
+#include "client/gui/screens/UsernameScreen.h"
 #endif
 #include "client/player/LocalPlayer.h"
 #ifndef STANDALONE_SERVER
@@ -98,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)
@@ -110,8 +114,12 @@ void NinecraftApp::init()
 #ifndef STANDALONE_SERVER
 	LOGI("This: %p\n", this);
 	screenChooser.setScreen(SCREEN_STARTMENU);
+
+	if (options.getBooleanValue(OPTIONS_FIRST_LAUNCH)) {
+		options.toggle(OPTIONS_FIRST_LAUNCH);
+		setScreen(new UsernameScreen());
+	}
 #else
-	user->name = "Server";
 	hostMultiplayer();
 #endif
 }
@@ -240,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__
--- a/src/SharedConstants.cpp
+++ b/src/SharedConstants.cpp
@@ -4,7 +4,13 @@ namespace Common {

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

 };
--- a/src/client/KeyMapping.h
+++ b/src/client/KeyMapping.h
--- a/src/client/Minecraft.cpp
+++ b/src/client/Minecraft.cpp
@@ -1,5 +1,12 @@
 #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"
+#include "world/item/ItemInstance.h"
+#include <string>
+#include <cstdlib>

 #if defined(APPLE_DEMO_PROMOTION)
    #define NO_NETWORK
@@ -8,88 +15,36 @@
 #if defined(RPI)
 	#define CREATORMODE
 #endif
-
 #include "../network/RakNetInstance.h"
 #include "../network/ClientSideNetworkHandler.h"
 #include "../network/ServerSideNetworkHandler.h"
 //#include "../network/Packet.h"
 #include "../world/entity/player/Inventory.h"
-#include "../world/level/chunk/ChunkCache.h"
 #include "../world/level/tile/Tile.h"
 #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
 #include "player/input/touchscreen/TouchInputHolder.h"
-#endif
-#include "player/LocalPlayer.h"
-#include "gamemode/CreativeMode.h"
-#include "gamemode/SurvivalMode.h"
-#include "player/LocalPlayer.h"
-#ifndef STANDALONE_SERVER
 #include "particle/ParticleEngine.h"
 #include "gui/Screen.h"
 #include "gui/Font.h"
 #include "gui/screens/RenameMPLevelScreen.h"
+#include "gui/screens/ConsoleScreen.h"
+#include "gui/screens/ChatScreen.h"
 #include "sound/SoundEngine.h"
-#endif
-#include "../platform/CThread.h"
-#include "../platform/input/Mouse.h"
-#include "../AppPlatform.h"
-#include "../Performance.h"
-#include "../LicenseCodes.h"
-#include "../util/PerfTimer.h"
-#include "../util/PerfRenderer.h"
-#include "player/input/MouseBuildInput.h"
-
-#include "../world/Facing.h"
-
-#include "../network/packet/PlaceBlockPacket.h"
-
-#include "player/input/IInputHolder.h"
-#ifndef STANDALONE_SERVER
 #include "player/input/touchscreen/TouchscreenInput.h"
-
-#include "player/input/ControllerTurnInput.h"
-#include "player/input/XperiaPlayInput.h"
-
-#endif
-
-#include "player/input/MouseTurnInput.h"
-#include "../world/entity/MobFactory.h"
-#include "../world/level/MobSpawner.h"
-#include "../util/Mth.h"
-#include "../network/packet/InteractPacket.h"
-#ifndef STANDALONE_SERVER
+#include "renderer/Chunk.h"
 #include "gui/screens/PrerenderTilesScreen.h"
 #include "renderer/Textures.h"
 #include "gui/screens/DeathScreen.h"
-#endif
-
-#include "../network/packet/RespawnPacket.h"
-#include "IConfigListener.h"
-#include "../world/entity/MobCategory.h"
-#ifndef STANDALONE_SERVER
 #include "gui/screens/FurnaceScreen.h"
-#endif
-#include "../world/Difficulty.h"
-#include "../server/ServerLevel.h"
-#ifdef CREATORMODE
-#include "../server/CreatorLevel.h"
-#endif
-#include "../network/packet/AdventureSettingsPacket.h"
-#include "../network/packet/SetSpawnPositionPacket.h"
-#include "../network/command/CommandServer.h"
-#include "gamemode/CreatorMode.h"
-#ifndef STANDALONE_SERVER
 #include "gui/screens/ArmorScreen.h"
-#endif
-#include "../world/level/levelgen/synth/ImprovedNoise.h"
-#ifndef STANDALONE_SERVER
 #include "renderer/tileentity/TileEntityRenderDispatcher.h"
-#endif
-
-#ifndef STANDALONE_SERVER
 #include "renderer/ptexture/DynamicTexture.h"
 #include "renderer/GameRenderer.h"
 #include "renderer/ItemInHandRenderer.h"
@@ -99,8 +54,43 @@
 #include "gui/Font.h"
 #include "gui/screens/RenameMPLevelScreen.h"
 #include "sound/SoundEngine.h"
+#endif // STANDALONE_SERVER
+
+#include "player/LocalPlayer.h"
+#include "gamemode/CreativeMode.h"
+#include "gamemode/SurvivalMode.h"
+#include "player/LocalPlayer.h"
+#include "../platform/CThread.h"
+#include "../platform/input/Mouse.h"
+#include "../AppPlatform.h"
+#include "../LicenseCodes.h"
+#include "../util/PerfTimer.h"
+#include "../util/PerfRenderer.h"
+#include "player/input/MouseBuildInput.h"
+
+#include "player/input/IInputHolder.h"
+
+#include "player/input/MouseTurnInput.h"
+#include "../world/entity/MobFactory.h"
+#include "../world/level/MobSpawner.h"
+#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"
+#include "../server/ServerLevel.h"
+
+#ifdef CREATORMODE
+#include "../server/CreatorLevel.h"
 #endif

+#include "../network/command/CommandServer.h"
+#include "gamemode/CreatorMode.h"
+
+#include "../world/level/GrassColor.h"
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG
 	while (1) {
@@ -128,8 +118,7 @@ int Minecraft::customDebugId = Minecraft::CDI_NONE;

 bool Minecraft::useAmbientOcclusion = false;

-Minecraft::Minecraft()
-:	user(NULL),
+Minecraft::Minecraft() :	
 	level(NULL),
 	player(NULL),
 	cameraTargetPlayer(NULL),
@@ -187,7 +176,7 @@ Minecraft::Minecraft()
 	_powerVr(false),
 	commandPort(4711),
 	reserved_d1(0),reserved_d2(0),
-	reserved_f1(0),reserved_f2(0)
+	reserved_f1(0),reserved_f2(0), options(this)
 {
 //#ifdef ANDROID

@@ -234,7 +223,6 @@ Minecraft::~Minecraft()
 	}

 	//delete player;
-	delete user;
 	delete inputHolder;

 	delete storageSource;
@@ -349,6 +337,7 @@ void Minecraft::leaveGame(bool renameLevel /*=false*/)

 	_running = false;
 #ifndef STANDALONE_SERVER
+	gui.clearMessages();
 	if (renameLevel) {
 		setScreen(new RenameMPLevelScreen(LevelStorageSource::TempLevelId));
 	}
@@ -449,20 +438,21 @@ void Minecraft::update() {
 	//	}
 	//}

-	if (pause && level != NULL) {
-		float lastA = timer.a;
-		timer.advanceTime();
-		timer.a = lastA;
-	} else {
+	// If we're paused (local world / invisible server), freeze gameplay and
+	// networking and only keep UI responsive.
+	bool freezeGame = pause;
+
+	if (!freezeGame) {
 		timer.advanceTime();
 	}

-	if (raknetInstance) {
+	if (raknetInstance && !freezeGame) {
 		raknetInstance->runEvents(netCallback);
 	}

 	TIMER_PUSH("tick");
-	int toTick = timer.ticks;
+	int toTick = freezeGame ? 1 : timer.ticks;
+	if (!freezeGame) timer.ticks = 0;
 	for (int i = 0; i < toTick; ++i, ++ticks)
 		tick(i, toTick-1);

@@ -489,16 +479,15 @@ void Minecraft::update() {
 #ifndef STANDALONE_SERVER
 	checkGlError("Update finished");

-	if (options.renderDebug) {
+	if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+#ifndef PLATFORM_DESKTOP
 		if (!PerfTimer::enabled) {
 			PerfTimer::reset();
 			PerfTimer::enabled = true;
 		}
-
-		//TIMER_PUSH("debugfps");
 		_perfRenderer->renderFpsMeter(1);
 		checkGlError("render debug");
-		//TIMER_POP();
+#endif
 	} else {
 		PerfTimer::enabled = false;
 	}
@@ -558,7 +547,7 @@ void Minecraft::tick(int nTick, int maxTick) {
 			TIMER_POP_PUSH("levelRenderer");
 			levelRenderer->tick();
 #endif
-			level->difficulty = options.difficulty;
+			level->difficulty = options.getIntValue(OPTIONS_DIFFICULTY);
 			if (level->isClientSide) level->difficulty = Difficulty::EASY;

 			TIMER_POP_PUSH("level");
@@ -588,7 +577,9 @@ void Minecraft::tick(int nTick, int maxTick) {
 		#endif
 	}
 	TIMER_POP_PUSH("particles");
+	if (!pause) {
 		particleEngine->tick();
+	}
 	if (screen) {
 		screenMutex = true;
 		screen->tick();
@@ -651,29 +642,30 @@ 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());
 		}

 		if (e.action == MouseAction::ACTION_WHEEL) {
+			// If chat/console is open, use the wheel to scroll through chat history.
+			if (screen && (dynamic_cast<ChatScreen*>(screen) || dynamic_cast<ConsoleScreen*>(screen))) {
+				gui.scrollChat(e.dy);
+			} else {
 				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);
 			}
+		}
 		/*
 		if (mouseDiggable && options.useMouseForDigging) {
 			if (Mouse::getEventButton() == MouseAction::ACTION_LEFT && Mouse::getEventButtonState()) {
@@ -697,7 +689,6 @@ 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;
@@ -720,17 +711,25 @@ void Minecraft::tickInput() {
 					}
 				#endif
 			}
-			#endif
-			#if defined(PLATFORM_DESKTOP)
+
+			if (key == Keyboard::KEY_LEFT_CTRL) {
+				player->setSprinting(true);
+			}
+
 			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.thirdPersonView = !options.thirdPersonView;
+				options.toggle(OPTIONS_THIRD_PERSON_VIEW);
 				/*
 				ImprovedNoise noise;
 				for (int i = 0; i < 16; ++i)
@@ -738,34 +737,15 @@ void Minecraft::tickInput() {
 				*/
 			}

-				// Change distance
-				if (key == Keyboard::KEY_F)
-					options.viewDistance = (options.viewDistance + 1) % 4;
-			#endif
-			#if defined(WIN32)
+			if (!screen && key == Keyboard::KEY_O || key == 250) {
+				releaseMouse();
+			}
+
 			if (key == Keyboard::KEY_F) {
-					options.isFlying = !options.isFlying;
-					player->noPhysics = options.isFlying;
+				int dst = options.getIntValue(OPTIONS_VIEW_DISTANCE);
+				options.set(OPTIONS_VIEW_DISTANCE, (dst + 1) % 4);
 			}
-
-				// if (key == Keyboard::KEY_T) {
-				// 	options.thirdPersonView = !options.thirdPersonView;
-				// 	/*
-				// 	ImprovedNoise noise;
-				// 	for (int i = 0; i < 16; ++i)
-				// 		printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
-				// 	*/
-				// }
-
-				if (key == Keyboard::KEY_O) {
-					useAmbientOcclusion = !useAmbientOcclusion;
-					options.ambientOcclusion = useAmbientOcclusion;
-					levelRenderer->allChanged();
-				}
-
-				if (key == Keyboard::KEY_L)
-					options.viewDistance = (options.viewDistance + 1) % 4;
-
+			#ifdef CHEATS
 				if (key == Keyboard::KEY_U) {
 					onGraphicsReset();
 					player->heal(100);
@@ -834,29 +814,22 @@ void Minecraft::tickInput() {
 						if (player->inventory->getItem(i))
 							player->inventory->dropSlot(i, false);
 				}
-				if (key == Keyboard::KEY_F3) {
-					options.renderDebug = !options.renderDebug;
-				}
 				if (key == Keyboard::KEY_M) {
-					options.difficulty = (options.difficulty == Difficulty::PEACEFUL)?
-						Difficulty::NORMAL : Difficulty::PEACEFUL;
+					Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
+					options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
+						Difficulty::NORMAL : Difficulty::PEACEFUL);
 					//setIsCreativeMode( !isCreativeMode() );
 				}

-				if (options.renderDebug) {
+				if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
 					if (key >= '0' && key <= '9') {
 						_perfRenderer->debugFpsMeterKeyPress(key - '0');
 					}
 				}
 			#endif

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

 			#ifndef OPENGL_ES
 				if (key == Keyboard::KEY_P) {
@@ -879,7 +852,25 @@ void Minecraft::tickInput() {
 	
 	static bool prevMouseDownLeft = false;

-	// Destroy and attack is on same button
+	if (Mouse::getButtonState(MouseAction::ACTION_LEFT) == 0) {
+		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
 		if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
 			auto baiFlags = BuildActionIntention::BAI_REMOVE | BuildActionIntention::BAI_ATTACK;

@@ -891,10 +882,9 @@ void Minecraft::tickInput() {

 		prevMouseDownLeft = Mouse::isButtonDown(MouseAction::ACTION_LEFT);

-	static int buildHoldTicks = 0;
-
 		// Build and use/interact is on same button
 		// USPESHNO spizheno
+		static int buildHoldTicks = 0;
 		if (Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
 			if (buildHoldTicks >= 5) buildHoldTicks = 0;

@@ -904,6 +894,8 @@ void Minecraft::tickInput() {
 			}
 		} else {
 			buildHoldTicks = 0;
+			gameMode->releaseUsingItem(player);
+		}
 	}

 	lastTickTime = getTimeMs();
@@ -1019,6 +1011,17 @@ bool Minecraft::isOnline()
 }

 void Minecraft::pauseGame(bool isBackPaused) {
+	// Only freeze gameplay when running a local server and it is not accepting
+	// incoming connections (invisible server), which includes typical single-
+	// player/lobby mode. If the server is visible, the game should keep ticking.
+	bool canFreeze = false;
+	if (raknetInstance && raknetInstance->isServer() && netCallback) {
+		ServerSideNetworkHandler* ss = (ServerSideNetworkHandler*) netCallback;
+		if (!ss->allowsIncomingConnections())
+			canFreeze = true;
+	}
+	pause = canFreeze;
+
 #ifndef STANDALONE_SERVER
 	if (screen != NULL) return;
 	screenChooser.setScreen(isBackPaused? SCREEN_PAUSEPREV : SCREEN_PAUSE);
@@ -1071,6 +1074,8 @@ void Minecraft::setScreen( Screen* screen )

 		//noRender = false;
 	} else {
+		// Closing a screen and returning to the game should unpause.
+		pause = false;
 		grabMouse();
 	}
 #endif
@@ -1101,34 +1106,53 @@ void Minecraft::releaseMouse()
 }

 bool Minecraft::useTouchscreen() {
-#ifdef RPI
+#if TARGET_OS_IPHONE
+    return true;
+#elif RPI
 	return false;
 #endif
-	return options.useTouchScreen || !_supportsNonTouchscreen;
+	return options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN) && !_supportsNonTouchscreen;
 }
 bool Minecraft::supportNonTouchScreen() {
 	return _supportsNonTouchscreen;
 }
 void Minecraft::init()
 {
-	options.minecraft = this;
-	options.initDefaultValues();
 #ifndef STANDALONE_SERVER
 	checkGlError("Init enter");

 	_supportsNonTouchscreen = !platform()->supportsTouchscreen();

-	LOGI("IS TOUCHSCREEN? %d\n", options.useTouchScreen);
+	LOGI("IS TOUCHSCREEN? %d\n", options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN));

 	textures = new Textures(&options, platform());
 	textures->addDynamicTexture(new WaterTexture());
 	textures->addDynamicTexture(new WaterSideTexture());
+	textures->addDynamicTexture(new FireTexture());
 	gui.texturesLoaded(textures);

 	levelRenderer = new LevelRenderer(this);
 	gameRenderer = new GameRenderer(this);
 	particleEngine = new ParticleEngine(level, textures);

+	// 4j's code for reference
+//	FoliageColor::init(textures->loadTexturePixels(L"misc/foliagecolor.png"));
+
+
+	// my code
+	TextureId foliageId = (textures->loadTexture("environment/foliagecolor.png")); // loading the uh png for foliage color
+	int* foliagePixels = textures->loadTexturePixels(foliageId, "environment/foliagecolor.png");
+	// now i can finally initialize foliage color, probably not the best way to handle this but i cant be arsed rn
+	FoliageColor::init(foliagePixels);
+
+	TextureId grassId = (textures->loadTexture("environment/grasscolor.png")); // loading the uh png for foliage color
+	int* grassPixels = textures->loadTexturePixels(grassId, "environment/grasscolor.png");
+	GrassColor::init(grassPixels);
+	
+	bool tint = options.getBooleanValue(OPTIONS_FOLIAGE_TINT); // finally, toggleable foliage color
+	FoliageColor::setUseTint(tint);
+	GrassColor::setUseTint(tint);
+
 	// Platform specific initialization here
 	font = new Font(&options, "font/default8.png", textures);

@@ -1137,10 +1161,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) {
@@ -1150,6 +1174,21 @@ void Minecraft::setSize(int w, int h) {
 	width  = w;
 	height = h;

+	int guiScale = options.getIntValue(OPTIONS_GUI_SCALE);
+
+	// determine gui scale, optionally overriding auto
+	if (guiScale != 0) {
+		// 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;
+		case 5: Gui::GuiScale = 6.0f; break;
+		default: Gui::GuiScale = 1.0f; break; // auto
+		}
+	} else {
+		// auto compute from resolution
 		if (width >= 1000) {
        #ifdef __APPLE__
            Gui::GuiScale = (width > 2000)? 8.0f : 4.0f;
@@ -1168,16 +1207,17 @@ void Minecraft::setSize(int w, int h) {
 			Gui::GuiScale = 2.0f;
 		else
 			Gui::GuiScale = 1.0f;
+	}

 	Gui::InvGuiScale = 1.0f / Gui::GuiScale;
 	int screenWidth  = (int)(width  * Gui::InvGuiScale);
 	int screenHeight = (int)(height * Gui::InvGuiScale);

-	if (platform()) {
-		float pixelsPerMillimeter = options.getProgressValue(&Options::Option::PIXELS_PER_MILLIMETER);
-		pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
-		pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
-	}
+	// if (platform()) {
+	// 	float pixelsPerMillimeter = options.getProgressValue(&Option::PIXELS_PER_MILLIMETER);
+	// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
+	// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
+	// }

 	Config config = createConfig(this);
 	gui.onConfigChanged(config);
@@ -1198,16 +1238,15 @@ void Minecraft::setSize(int w, int h) {
 }

 void Minecraft::reloadOptions() {
-	options.update();
 	options.save();
-	bool wasTouchscreen = options.useTouchScreen;
-	options.useTouchScreen = useTouchscreen();
+	bool wasTouchscreen = options.getBooleanValue(OPTIONS_USE_TOUCHSCREEN);
+	options.set(OPTIONS_USE_TOUCHSCREEN, useTouchscreen());
 	options.save();

-	if ((wasTouchscreen != options.useTouchScreen) || (inputHolder == 0))
+	if ((wasTouchscreen != useTouchscreen()) || (inputHolder == 0))
 		_reloadInput();

-	user->name = options.username;
+	// user->name = options.username;

 	LOGI("Reloading-options\n");

@@ -1220,7 +1259,8 @@ void Minecraft::_reloadInput() {
 #ifndef STANDALONE_SERVER
 	delete inputHolder;

-	if (useTouchscreen() && !PLATFORM_DESKTOP) {
+	const bool useTouchHolder = useTouchscreen();
+	if (useTouchHolder) {
 		inputHolder = new TouchInputHolder(this, &options);
 	} else {
 		#if defined(ANDROID) || defined(__APPLE__) 
@@ -1272,6 +1312,31 @@ bool Minecraft::joinMultiplayer( const PingedCompatibleServer& server )
 	return false;
 }

+bool Minecraft::joinMultiplayerFromString( const std::string& server )
+{	
+	std::string ip = "";
+	std::string port = "19132";
+	
+	size_t pos = server.find(":");
+
+	if (pos != std::string::npos) {
+		ip = server.substr(0, pos);
+		port = server.substr(pos + 1);
+	} else {
+		ip = server;
+	}
+
+	printf("%s \n", port.c_str());
+	
+	if (isLookingForMultiplayer && netCallback) {
+		isLookingForMultiplayer = false;
+		printf("test");
+		int portNum = atoi(port.c_str());
+		return raknetInstance->connect(ip.c_str(), portNum);
+	}
+	return false;
+}
+
 void Minecraft::hostMultiplayer(int port) {
    // Tear down last instance
    raknetInstance->disconnect();
@@ -1281,9 +1346,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
 }
@@ -1340,8 +1405,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);
@@ -1439,11 +1506,11 @@ LevelStorageSource* Minecraft::getLevelSource()
 	return storageSource;
 }

-int Minecraft::getLicenseId() {
-	if (!LicenseCodes::isReady(_licenseId))
-		_licenseId = platform()->checkLicense();
-	return _licenseId;
-}
+// int Minecraft::getLicenseId() {
+// 	if (!LicenseCodes::isReady(_licenseId))
+// 		_licenseId = platform()->checkLicense();
+// 	return _licenseId;
+// }

 void Minecraft::audioEngineOn() {
 #ifndef STANDALONE_SERVER
@@ -1513,22 +1580,27 @@ ICreator* Minecraft::getCreator()
 #endif
 }

-void Minecraft::optionUpdated( const Options::Option* option, bool value ) {
-	if(netCallback != NULL && option == &Options::Option::SERVER_VISIBLE) {
+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();
 	}
 }

-void Minecraft::optionUpdated( const Options::Option* option, float value ) {
-#ifndef STANDALONE_SERVER
-	if(option == &Options::Option::PIXELS_PER_MILLIMETER) {
-		pixelCalcUi.setPixelsPerMillimeter(value * Gui::InvGuiScale);
-		pixelCalc.setPixelsPerMillimeter(value);
-	}
-#endif
+void Minecraft::optionUpdated(OptionId option, float value ) {
+// #ifndef STANDALONE_SERVER
+// 	if(option == OPTIONS_PIXELS_PER_MILLIMETER) {
+// 		pixelCalcUi.setPixelsPerMillimeter(value * Gui::InvGuiScale);
+// 		pixelCalc.setPixelsPerMillimeter(value);
+// 	}
+// #endif
 }

-void Minecraft::optionUpdated( const Options::Option* option, int value ) {
-
+void Minecraft::optionUpdated(OptionId option, int value ) {
+    if(option == OPTIONS_GUI_SCALE) {
+        // reapply screen scaling using current window size
+        setSize(width, height);
+    }
 }
--- a/src/client/Minecraft.h
+++ b/src/client/Minecraft.h
@@ -4,17 +4,15 @@
 #include "Options.h"
 #ifndef STANDALONE_SERVER
 #include "MouseHandler.h"
-#endif
-#include "Timer.h"
-#include "player/input/ITurnInput.h"
-#ifndef STANDALONE_SERVER
 #include "gui/Gui.h"
 #include "gui/screens/ScreenChooser.h"
 #endif
+
+#include "Timer.h"
+
 //#include "../network/RakNetInstance.h"
 #include "../world/phys/HitResult.h"

-class User;
 class Level;
 class LocalPlayer;
 class IInputHolder;
@@ -80,6 +78,7 @@ public:
 	void locateMultiplayer();
 	void cancelLocateMultiplayer();
 	bool joinMultiplayer(const PingedCompatibleServer& server);
+	bool joinMultiplayerFromString(const std::string& server);
 	void hostMultiplayer(int port=19132);
 	Player* respawnPlayer(int playerId);
 	void respawnPlayer();
@@ -109,7 +108,8 @@ public:
 	void onGraphicsReset();

 	bool isLevelGenerated();
-	int getLicenseId();
+
+	void handleMouseDown(int button, bool down);
 	
    void audioEngineOn();
    void audioEngineOff();
@@ -117,9 +117,9 @@ public:
 	bool isPowerVR() { return _powerVr; }
 	bool isKindleFire(int kindleVersion);
 	bool transformResolution(int* w, int* h);
-	void optionUpdated(const Options::Option* option, bool value);
-	void optionUpdated(const Options::Option* option, float value);
-	void optionUpdated(const Options::Option* option, int value);
+	void optionUpdated(OptionId option, bool value);
+	void optionUpdated(OptionId option, float value);
+	void optionUpdated(OptionId option, int value);
 #ifdef __APPLE__
    bool _isSuperFast;
    bool isSuperFast() { return _isSuperFast; }
@@ -166,7 +166,6 @@ public:
 	int lastTickTime;
 	float ticksSinceLastUpdate;

-	User*  user;
 	Level* level;

 	LocalPlayer*	player;
@@ -222,6 +221,7 @@ private:
 	bool _isCreativeMode;
 	//int _respawnPlayerTicks;
 	Player* _pendingRemovePlayer; // @attn @todo @fix: remove this shait and fix the respawn behaviour
+    // shit* lmao

 	PerfRenderer* _perfRenderer;
 	CommandServer* _commandServer;
--- a/src/client/MouseHandler.cpp
+++ b/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
 }
--- a/src/client/Option.cpp
+++ b/src/client/Option.cpp
@@ -0,0 +1,52 @@
+#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") {
+        out = true;
+        return true;
+    }
+
+    if (value == "false" || value == "NO") {
+        out = false;
+        return true;
+    }
+
+    return false;
+}
+
+bool OptionFloat::parse(const std::string& value) {
+    bool b;
+    
+    if (parse_bool_like(value, b)) {
+        m_value = b ? 1.f : 0.f;
+        return true;
+    }
+
+    return sscanf(value.c_str(), "%f", &m_value) == 1;
+}
+bool OptionInt::parse(const std::string& value) {
+    bool b;
+    if (parse_bool_like(value, b)) {
+        m_value = b ? 1 : 0;
+        return true;
+    }
+
+    return sscanf(value.c_str(), "%d", &m_value) == 1;
+}
+bool OptionBool::parse(const std::string& value) {
+    if (value == "0") {
+        m_value = false;
+        return true;
+    }
+
+    if (value == "1") {
+        m_value = true;
+        return true;
+    }
+
+    return parse_bool_like(value, m_value);
+}
--- a/src/client/Option.h
+++ b/src/client/Option.h
@@ -0,0 +1,107 @@
+#pragma once 
+#include <sstream>
+#include <type_traits>
+#include <util/Mth.h>
+/*
+template<typename T>
+struct is_option_type : std::false_type {};
+
+template<> struct is_option_type<bool>  : std::true_type {};
+template<> struct is_option_type<int>   : std::true_type {};
+template<> struct is_option_type<float> : std::true_type {};
+template<> struct is_option_type<std::string> : std::true_type {};
+
+template<typename T>
+struct is_min_max_option : std::false_type {};
+
+template<> struct is_min_max_option<int>   : std::true_type {};
+template<> struct is_min_max_option<float> : std::true_type {};
+*/
+
+class Option {
+public:
+    Option(const std::string& key) : m_key("options." + key) {}
+    virtual ~Option();
+
+    const std::string& getStringId() { return m_key; }
+
+    virtual bool parse(const std::string& value) { return false; }
+    virtual std::string serialize() { return m_key + ":"; }
+
+protected:
+    std::string m_key;
+
+    template<typename T>
+    std::string serialize_value(const T& value) const {
+        std::ostringstream ss;
+        ss << m_key << ":" << value;
+        return ss.str();
+    }
+
+    bool parse_bool_like(const std::string& value, bool& out);
+};
+
+class OptionFloat : public Option {
+public:
+    OptionFloat(const std::string& key, float value = 0.f, float min = 0.f, float max = 1.f) : 
+        Option(key), m_value(value), m_min(min), m_max(max) {}
+
+    float get() { return m_value; }
+    void set(float value) { m_value = Mth::clamp(value, m_min, m_max); }
+
+    float getMin() { return m_min; }
+    float getMax() { return m_max; }
+
+    virtual bool parse(const std::string& value);
+    virtual std::string serialize() { return serialize_value(m_value); }
+
+private:
+    float m_value, m_min, m_max;
+};
+
+class OptionInt : public Option {
+public:
+    OptionInt(const std::string& key, int value = 0, int min = -999999, int max = 999999) : 
+        Option(key), m_value(value), m_min(min), m_max(max) {}
+
+    int get() { return m_value; }
+    void set(int value) { m_value = Mth::clamp(value, m_min, m_max); }
+
+    int getMin() { return m_min; }
+    int getMax() { return m_max; }
+
+    virtual bool parse(const std::string& value);
+    virtual std::string serialize() { return serialize_value(m_value); }
+
+private:
+    int m_value, m_min, m_max;
+};
+
+class OptionBool : public Option {
+public:
+    OptionBool(const std::string& key, bool value = false) : Option(key), m_value(value) {}
+
+    bool get() { return m_value; }
+    void set(int value) { m_value = value; }
+    void toggle() { m_value = !m_value; }
+
+    virtual bool parse(const std::string& value);
+    virtual std::string serialize() { return serialize_value(m_value); }
+
+private:
+    bool m_value;
+};
+
+class OptionString : public Option {
+public:
+    OptionString(const std::string& key, const std::string& str = "") : Option(key), m_value(str) {}
+
+    const std::string& get() { return m_value; }
+    void set(const std::string& value) { m_value = value; }
+
+    virtual bool parse(const std::string& value) { m_value = value; return true; }
+    virtual std::string serialize() { return m_key + ":" + m_value; }
+
+private:
+    std::string m_value;
+};
--- a/src/client/OptionStrings.cpp
+++ b/src/client/OptionStrings.cpp
@@ -5,12 +5,20 @@ const char* OptionStrings::Multiplayer_ServerVisible   = "mp_server_visible_defa

 const char* OptionStrings::Graphics_Fancy              = "gfx_fancygraphics";
 const char* OptionStrings::Graphics_LowQuality         = "gfx_lowquality";
+const char* OptionStrings::Graphics_Vsync              = "gfx_vsync";
+const char* OptionStrings::Graphics_GUIScale           = "gfx_guiscale";
+const char* OptionStrings::Graphics_SmoothLightning    = "gfx_smoothlightning";
+const char* OptionStrings::Graphics_Anaglyph           = "gfx_anaglyph";
+const char* OptionStrings::Graphics_ViewBobbing        = "gfx_viewbobbing";

 const char* OptionStrings::Controls_Sensitivity        = "ctrl_sensitivity";
 const char* OptionStrings::Controls_InvertMouse        = "ctrl_invertmouse";
 const char* OptionStrings::Controls_UseTouchScreen     = "ctrl_usetouchscreen";
 const char* OptionStrings::Controls_UseTouchJoypad     = "ctrl_usetouchjoypad";
 const char* OptionStrings::Controls_IsLefthanded       = "ctrl_islefthanded";
+// why it isnt ctrl_feedback_vibration? i dont want touch it because compatibility with older versions
 const char* OptionStrings::Controls_FeedbackVibration  = "feedback_vibration";
+const char* OptionStrings::Controls_AutoJump  = "ctrl_autojump";

 const char* OptionStrings::Game_DifficultyLevel = "game_difficulty";
+
--- a/src/client/OptionStrings.h
+++ b/src/client/OptionStrings.h
@@ -8,6 +8,11 @@ public:
    
    static const char* Graphics_Fancy;
    static const char* Graphics_LowQuality;
+    static const char* Graphics_GUIScale;
+	static const char* Graphics_Vsync;
+	static const char* Graphics_SmoothLightning;
+    static const char* Graphics_Anaglyph;
+    static const char* Graphics_ViewBobbing;

    static const char* Controls_Sensitivity;
    static const char* Controls_InvertMouse;
@@ -15,8 +20,17 @@ public:
 	static const char* Controls_UseTouchJoypad;
    static const char* Controls_IsLefthanded;
    static const char* Controls_FeedbackVibration;
+    static const char* Controls_AutoJump;
+
+    static const char* Audio_Music;
+	static const char* Audio_Sound;
+

 	static const char* Game_DifficultyLevel;
+
+    static const char* Tweaks_Sprint;
+    static const char* Tweaks_BarOnTop;
+
 };

 #endif /*NET_MINECRAFT_CLIENT__OptionsStrings_H__*/
--- a/src/client/Options.cpp
+++ b/src/client/Options.cpp
@@ -4,458 +4,304 @@
 #include "../platform/log.h"
 #include "../world/Difficulty.h"
 #include <cmath>
-#include <sstream>
-/*static*/
+
+#include <memory>
+
 bool Options::debugGl = false;

-void Options::initDefaultValues() {
-	difficulty = Difficulty::NORMAL;
-	hideGui = false;
-	thirdPersonView = false;
-	renderDebug = false;
-	isFlying = false;
-	smoothCamera = true;
-	fixedCamera = false;
-	flySpeed = 1;
-	cameraSpeed = 1;
-	guiScale = 0;
+// OPTIONS TABLE

-	useMouseForDigging = false;
-	destroyVibration = true;
-	isLeftHanded = false;
+OptionInt difficulty("difficulty", Difficulty::NORMAL, 0, Difficulty::COUNT);
+OptionBool hidegui("hidegui", false);
+OptionBool thirdPersonView("thirdperson", false);
+OptionBool renderDebug("renderDebug", false);
+OptionBool smoothCamera("smoothCamera", false);
+OptionBool fixedCamera("fixedCamera", false);
+OptionBool isFlying("isflying", false);
+OptionBool barOnTop("barOnTop", false);
+OptionBool allowSprint("allowSprint", true);
+OptionBool rpiCursor("rpiCursor", false);
+OptionBool autoJump("autoJump", true);

-	isJoyTouchArea = false;

-	music = 1;
-	sound = 1;
-	sensitivity = 0.5f;
-	invertYMouse = false;
-	viewDistance = 2;
-	bobView = true;
-	anaglyph3d = false;
-	limitFramerate = false;
-	fancyGraphics = true;//false;
-	ambientOcclusion = false;
-	if(minecraft->supportNonTouchScreen())
-		useTouchScreen = false;
-	else
-		useTouchScreen = true;
-	pixelsPerMillimeter = minecraft->platform()->getPixelsPerMillimeter();
-	//useMouseForDigging = true;
+OptionFloat flySpeed("flySpeed", 1.f);
+OptionFloat cameraSpeed("cameraSpeed", 1.f);

-	//skin     = "Default";
-	username = "Steve";
-	serverVisible = true;
+OptionInt guiScale("guiScale", 0, 0, 5);

-	keyUp	 = KeyMapping("key.forward", Keyboard::KEY_W);
-	keyLeft  = KeyMapping("key.left", Keyboard::KEY_A);
-	keyDown  = KeyMapping("key.back", Keyboard::KEY_S);
-	keyRight = KeyMapping("key.right", Keyboard::KEY_D);
-	keyJump  = KeyMapping("key.jump", Keyboard::KEY_SPACE);
-	keyBuild = KeyMapping("key.inventory", Keyboard::KEY_E);
-	keySneak = KeyMapping("key.sneak", Keyboard::KEY_LSHIFT);
-#ifndef RPI
-	// keyCraft = KeyMapping("key.crafting", Keyboard::KEY_Q);
-	keyDrop  = KeyMapping("key.drop", Keyboard::KEY_Q);
-	keyChat  = KeyMapping("key.chat", Keyboard::KEY_T);
-	keyFog   = KeyMapping("key.fog", Keyboard::KEY_F);
-	keyDestroy=KeyMapping("key.destroy", 88); // @todo @fix
-	keyUse   = KeyMapping("key.use", Keyboard::KEY_U);
+OptionString skin("skin", "Default");
+
+#ifdef RPI
+OptionString username("username", "StevePi");
+#else 
+OptionString username("username", "Steve");
 #endif

-	//const int Unused = 99999;
-	keyMenuNext     = KeyMapping("key.menu.next",     40);
-	keyMenuPrevious = KeyMapping("key.menu.previous", 38);
-	keyMenuOk       = KeyMapping("key.menu.ok",       13);
-	keyMenuCancel   = KeyMapping("key.menu.cancel",   8);
+OptionBool destroyVibration("destroyVibration", true);
+OptionBool isLeftHanded("isLeftHanded", false);
+OptionBool isJoyTouchArea("isJoyTouchArea", false);

-	int k = 0;
-	keyMappings[k++] = &keyUp;
-	keyMappings[k++] = &keyLeft;
-	keyMappings[k++] = &keyDown;
-	keyMappings[k++] = &keyRight;
-	keyMappings[k++] = &keyJump;
-	keyMappings[k++] = &keySneak;
-	keyMappings[k++] = &keyDrop;
-	keyMappings[k++] = &keyBuild;
-	keyMappings[k++] = &keyChat;
-	keyMappings[k++] = &keyFog;
-	keyMappings[k++] = &keyDestroy;
-	keyMappings[k++] = &keyUse;
+OptionFloat musicVolume("music", 1.f, MUSIC_MIN_VALUE, MUSIC_MAX_VALUE);
+OptionFloat soundVolume("sound", 1.f, SOUND_MIN_VALUE, SOUND_MAX_VALUE);

-	keyMappings[k++] = &keyMenuNext;
-	keyMappings[k++] = &keyMenuPrevious;
-	keyMappings[k++] = &keyMenuOk;
-	keyMappings[k++] = &keyMenuCancel;
+OptionFloat sensitivityOpt("sensitivity", 0.5f, SENSITIVITY_MIN_VALUE, SENSITIVITY_MAX_VALUE);

-//	"Polymorphism" at it's worst. At least it's better to have it here
-//	for now, then to have it spread all around the game code (even if
-//	it would be slightly better performance with it inlined. Should
-//  probably create separate subclasses (or read from file). @fix @todo.
-#if defined(ANDROID) || defined(__APPLE__) || defined(RPI)
-    viewDistance = 2;
-    thirdPersonView = false;
-	useMouseForDigging = false;
-	fancyGraphics = false;
+OptionBool invertYMouse("invertMouse", false);
+OptionInt viewDistance("renderDistance", 2, 0, 4);

-	//renderDebug = true;
-	#if !defined(RPI)
-		keyUp.key		= 19;
-		keyDown.key		= 20;
-		keyLeft.key		= 21;
-		keyRight.key	= 22;
-		keyJump.key		= 23;
-		keyUse.key		= 103;
-		keyDestroy.key	= 102;
-		keyCraft.key    = 109;
+OptionBool anaglyph3d("anaglyph3d", false);
+OptionBool limitFramerate("limitFramerate", false);
+OptionBool vsync("vsync", true);
+OptionBool fancyGraphics("fancyGraphics", true);
+OptionBool viewBobbing("viewBobbing", true);
+OptionBool ambientOcclusion("ao", false);
+
+OptionBool useTouchscreen("useTouchscreen", true);
+
+OptionBool serverVisible("servervisible", true);
+
+OptionBool foliageTint("foliagetint", false);
+
+OptionInt keyForward("key.forward", Keyboard::KEY_W);
+OptionInt keyLeft("key.left", Keyboard::KEY_A);
+OptionInt keyBack("key.back", Keyboard::KEY_S);
+OptionInt keyRight("key.right", Keyboard::KEY_D);
+OptionInt keyJump("key.jump", Keyboard::KEY_SPACE);
+OptionInt keyInventory("key.inventory", Keyboard::KEY_E);
+OptionInt keySneak("key.sneak", Keyboard::KEY_LSHIFT);
+OptionInt keyDrop("key.drop", Keyboard::KEY_Q);
+OptionInt keyChat("key.chat", Keyboard::KEY_T);
+OptionInt keyFog("key.fog", Keyboard::KEY_F);
+OptionInt keyUse("key.use", Keyboard::KEY_U);
+
+// TODO: make human readable keycodes here
+OptionInt keyMenuNext("key.menu.next", 40);
+OptionInt keyMenuPrev("key.menu.previous", 38);
+OptionInt keyMenuOk("key.menu.ok", 13);
+OptionInt keyMenuCancel("key.menu.cancel", 8);
+
+OptionBool firstLaunch("firstLaunch", true);
+
+OptionString lastIp("lastip");
+
+void Options::initTable() {
+    m_options[OPTIONS_DIFFICULTY] = &difficulty;
+    m_options[OPTIONS_HIDEGUI] = &hidegui;
+    m_options[OPTIONS_THIRD_PERSON_VIEW] = &thirdPersonView;
+    m_options[OPTIONS_RENDER_DEBUG] = &renderDebug;
+    m_options[OPTIONS_SMOOTH_CAMERA] = &smoothCamera;
+    m_options[OPTIONS_FIXED_CAMERA] = &fixedCamera;
+	m_options[OPTIONS_IS_FLYING] = &isFlying;
+
+	m_options[OPTIONS_FLY_SPEED] = &flySpeed;
+	m_options[OPTIONS_CAMERA_SPEED] = &cameraSpeed;
+
+	m_options[OPTIONS_GUI_SCALE] = &guiScale;
+
+	m_options[OPTIONS_DESTROY_VIBRATION] = &destroyVibration;
+
+	m_options[OPTIONS_IS_LEFT_HANDED] = &isLeftHanded;
+	m_options[OPTIONS_IS_JOY_TOUCH_AREA] = &isJoyTouchArea;
+
+	m_options[OPTIONS_MUSIC_VOLUME] = &musicVolume;
+	m_options[OPTIONS_SOUND_VOLUME] = &soundVolume;

-		keyMenuNext.key     = 20;
-		keyMenuPrevious.key = 19;
-		keyMenuOk.key       = 23;
-		keyMenuCancel.key   = 4;
-	#endif
-#endif
 	#if defined(PLATFORM_DESKTOP) || defined(RPI)
+		float sensitivity = sensitivityOpt.get();
 		sensitivity *= 0.4f;
+		sensitivityOpt.set(sensitivity);
 	#endif
-#if defined(RPI)
-	username = "StevePi";
-	useMouseForDigging = true;
-#endif
+
+
+    m_options[OPTIONS_GUI_SCALE] = &guiScale;
+
+	m_options[OPTIONS_SKIN] = &skin;
+	m_options[OPTIONS_USERNAME] = &username;
+
+    m_options[OPTIONS_DESTROY_VIBRATION] = &destroyVibration;
+    m_options[OPTIONS_IS_LEFT_HANDED] = &isLeftHanded;
+
+    m_options[OPTIONS_MUSIC_VOLUME] = &musicVolume;
+    m_options[OPTIONS_SOUND_VOLUME] = &soundVolume;
+
+    m_options[OPTIONS_SENSITIVITY] = &sensitivityOpt;
+
+    m_options[OPTIONS_INVERT_Y_MOUSE] = &invertYMouse;
+    m_options[OPTIONS_VIEW_DISTANCE] = &viewDistance;
+
+    m_options[OPTIONS_ANAGLYPH_3D] = &anaglyph3d;
+    m_options[OPTIONS_LIMIT_FRAMERATE] = &limitFramerate;
+    m_options[OPTIONS_VSYNC] = &vsync;
+    m_options[OPTIONS_FANCY_GRAPHICS] = &fancyGraphics;
+	m_options[OPTIONS_VIEW_BOBBING] = &viewBobbing;
+	m_options[OPTIONS_AMBIENT_OCCLUSION] = &ambientOcclusion;
+
+    m_options[OPTIONS_USE_TOUCHSCREEN] = &useTouchscreen;
+
+
+
+    m_options[OPTIONS_SERVER_VISIBLE] = &serverVisible;
+
+    m_options[OPTIONS_KEY_FORWARD] = &keyForward;
+    m_options[OPTIONS_KEY_LEFT] = &keyLeft;
+    m_options[OPTIONS_KEY_BACK] = &keyBack;
+    m_options[OPTIONS_KEY_RIGHT] = &keyRight;
+    m_options[OPTIONS_KEY_JUMP] = &keyJump;
+    m_options[OPTIONS_KEY_INVENTORY] = &keyInventory;
+    m_options[OPTIONS_KEY_SNEAK] = &keySneak;
+    m_options[OPTIONS_KEY_DROP] = &keyDrop;
+    m_options[OPTIONS_KEY_CHAT] = &keyChat;
+    m_options[OPTIONS_KEY_FOG] = &keyFog;
+    m_options[OPTIONS_KEY_USE] = &keyUse;
+
+    m_options[OPTIONS_KEY_MENU_NEXT] = &keyMenuNext;
+    m_options[OPTIONS_KEY_MENU_PREV] = &keyMenuPrev;
+    m_options[OPTIONS_KEY_MENU_OK] = &keyMenuOk;
+    m_options[OPTIONS_KEY_MENU_CANCEL] = &keyMenuCancel;
+
+	m_options[OPTIONS_FIRST_LAUNCH] = &firstLaunch;
+
+	m_options[OPTIONS_BAR_ON_TOP] = &barOnTop;
+	m_options[OPTIONS_ALLOW_SPRINT] = &allowSprint;
+	m_options[OPTIONS_RPI_CURSOR] = &rpiCursor;
+	m_options[OPTIONS_FOLIAGE_TINT] = &foliageTint;
+
+	m_options[OPTIONS_AUTOJUMP] = &autoJump;
+	m_options[OPTIONS_LAST_IP] = &lastIp;
 }

-const Options::Option
-	Options::Option::MUSIC				 (0, "options.music",		true, false),
-	Options::Option::SOUND				 (1, "options.sound",		true, false),
-	Options::Option::INVERT_MOUSE		 (2, "options.invertMouse",	false, true),
-	Options::Option::SENSITIVITY		 (3, "options.sensitivity",	true, false),
-	Options::Option::RENDER_DISTANCE	 (4, "options.renderDistance",false, false),
-	Options::Option::VIEW_BOBBING		 (5, "options.viewBobbing",	false, true),
-	Options::Option::ANAGLYPH			 (6, "options.anaglyph",		false, true),
-	Options::Option::LIMIT_FRAMERATE	 (7, "options.limitFramerate",false, true),
-	Options::Option::DIFFICULTY			 (8, "options.difficulty",	false, false),
-	Options::Option::GRAPHICS			 (9, "options.graphics",		false, false),
-	Options::Option::AMBIENT_OCCLUSION	 (10, "options.ao",		false, true),
-	Options::Option::GUI_SCALE			 (11, "options.guiScale",	false, false),
-	Options::Option::THIRD_PERSON		 (12, "options.thirdperson",	false, true),
-    Options::Option::HIDE_GUI			 (13, "options.hidegui",     false, true),
-	Options::Option::SERVER_VISIBLE		 (14, "options.servervisible", false, true),
-	Options::Option::LEFT_HANDED		 (15, "options.lefthanded", false, true),
-	Options::Option::USE_TOUCHSCREEN	 (16, "options.usetouchscreen", false, true),
-	Options::Option::USE_TOUCH_JOYPAD	 (17, "options.usetouchpad", false, true),
-	Options::Option::DESTROY_VIBRATION   (18, "options.destroyvibration", false, true),
-	Options::Option::PIXELS_PER_MILLIMETER(19, "options.pixelspermilimeter", true, false);
+void Options::set(OptionId key, const std::string& value) {
+	auto option = opt<OptionString>(key);

-/* private */
-const float Options::SOUND_MIN_VALUE = 0.0f;
-const float Options::SOUND_MAX_VALUE = 1.0f;
-const float Options::MUSIC_MIN_VALUE = 0.0f;
-const float Options::MUSIC_MAX_VALUE = 1.0f;
-const float Options::SENSITIVITY_MIN_VALUE = 0.0f;
-const float Options::SENSITIVITY_MAX_VALUE = 1.0f;
-const float Options::PIXELS_PER_MILLIMETER_MIN_VALUE = 3.0f;
-const float Options::PIXELS_PER_MILLIMETER_MAX_VALUE = 4.0f;
-const int DIFFICULY_LEVELS[] = {
-	Difficulty::PEACEFUL,
-	Difficulty::NORMAL
-};
+	if (option) {
+		option->set(value);
+		notifyOptionUpdate(key, value);
+	}
+}

-/*private*/
-const char* Options::RENDER_DISTANCE_NAMES[] = {
-	"options.renderDistance.far",
-	"options.renderDistance.normal",
-	"options.renderDistance.short",
-	"options.renderDistance.tiny"
-};
+void Options::set(OptionId key, float value) {
+	auto option = opt<OptionFloat>(key);

-/*private*/
-const char* Options::DIFFICULTY_NAMES[] = {
-	"options.difficulty.peaceful",
-	"options.difficulty.easy",
-	"options.difficulty.normal",
-	"options.difficulty.hard"
-};
+	if (option) {
+		option->set(value);
+		notifyOptionUpdate(key, value);
+	}
+}

-/*private*/
-const char* Options::GUI_SCALE[] = {
-	"options.guiScale.auto",
-	"options.guiScale.small",
-	"options.guiScale.normal",
-	"options.guiScale.large"
-};
+void Options::set(OptionId key, int value) {
+	auto option = opt<OptionInt>(key);

-void Options::update()
-{
-	viewDistance = 2;
+	if (option) {
+		option->set(value);
+		notifyOptionUpdate(key, value);
+	}
+}
+
+void Options::toggle(OptionId key) {
+	auto option = opt<OptionBool>(key);
+
+	if (option) {
+		option->toggle();
+		notifyOptionUpdate(key, option->get());
+	}
+}
+
+void Options::load() {
 	StringVector optionStrings = optionsFile.getOptionStrings();
-	for (unsigned int i = 0; i < optionStrings.size(); i += 2) {
+
+	for (auto i = 0; i < optionStrings.size(); i += 2) {
 		const std::string& key = optionStrings[i];
 		const std::string& value = optionStrings[i+1];

-        //LOGI("reading key: %s (%s)\n", key.c_str(), value.c_str());
+		// FIXME: woah this is so slow 
+		auto opt = std::find_if(m_options.begin(), m_options.end(), [&](auto& it) {
+			return it != nullptr && it->getStringId() == key;
+		});

-		// Multiplayer
-		if (key == OptionStrings::Multiplayer_Username) username = value;
-		if (key == OptionStrings::Multiplayer_ServerVisible) readBool(value, serverVisible);
+		if (opt == m_options.end()) continue;

-		// Controls
-        if (key == OptionStrings::Controls_Sensitivity) {
-            float sens;
-            if (readFloat(value, sens)) {
-                // sens is in range [0,1] with default/center at 0.5 (for aesthetics)
-                // We wanna map it to something like [0.3, 0.9] BUT keep 0.5 @ ~0.5...
-                sensitivity = 0.3f + std::pow(1.1f * sens, 1.3f) * 0.42f;
-            }
-        }
-		if (key == OptionStrings::Controls_InvertMouse) {
-			readBool(value, invertYMouse);
-		}
-		if (key == OptionStrings::Controls_IsLefthanded) {
-			readBool(value, isLeftHanded);
-		}
-		if (key == OptionStrings::Controls_UseTouchJoypad) {
-			readBool(value, isJoyTouchArea);
-			if (!minecraft->useTouchscreen())
-				isJoyTouchArea = false;
-		}
+		(*opt)->parse(value);
+/*
+        // //LOGI("reading key: %s (%s)\n", key.c_str(), value.c_str());
        
-		// Feedback
-		if (key == OptionStrings::Controls_FeedbackVibration)
-			readBool(value, destroyVibration);
-
-		// Graphics
-		if (key == OptionStrings::Graphics_Fancy) {
-			readBool(value, fancyGraphics);
-		}
-		if (key == OptionStrings::Graphics_LowQuality) {
-			bool isLow;
-			readBool(value, isLow);
-			if (isLow) {
-				viewDistance = 3;
-				fancyGraphics = false;
-			}
-		}
-		// Game
-		if (key == OptionStrings::Game_DifficultyLevel) {
-			readInt(value, difficulty);
-			// Only support peaceful and normal right now
-			if (difficulty != Difficulty::PEACEFUL && difficulty != Difficulty::NORMAL)
-				difficulty = Difficulty::NORMAL;
-		}
-	}
-    
-#ifdef __APPLE__
-//    if (minecraft->isSuperFast()) {
-//        viewDistance = (viewDistance>0)? --viewDistance : 0;
+		// // Multiplayer
+		// // if (key == OptionStrings::Multiplayer_Username) username = value;
+		// if (key == OptionStrings::Multiplayer_ServerVisible) {
+		// 	m_options[OPTIONS_SERVER_VISIBLE] = readBool(value);
 		// }
-//    LOGI("Is this card super fast?: %d\n", viewDistance);
-#endif

-    //LOGI("Lefty is: %d\n", isLeftHanded);
+		// // Controls
+        // if (key == OptionStrings::Controls_Sensitivity) {
+		// 	float sens = readFloat(value);
+
+		// 	// sens is in range [0,1] with default/center at 0.5 (for aesthetics)
+        //     // We wanna map it to something like [0.3, 0.9] BUT keep 0.5 @ ~0.5...
+        //     m_options[OPTIONS_SENSITIVITY] = 0.3f + std::pow(1.1f * sens, 1.3f) * 0.42f;
+        // }
+
+		// if (key == OptionStrings::Controls_InvertMouse) {
+		// 	m_options[OPTIONS_INVERT_Y_MOUSE] = readBool(value);
+		// }
+
+		// if (key == OptionStrings::Controls_IsLefthanded) {
+		// 	m_options[OPTIONS_IS_LEFT_HANDED] = readBool(value);
+		// }
+		
+		// if (key == OptionStrings::Controls_UseTouchJoypad) {
+		// 	m_options[OPTIONS_IS_JOY_TOUCH_AREA] = readBool(value) && minecraft->useTouchscreen();
+		// }
+
+		// // Feedback
+		// if (key == OptionStrings::Controls_FeedbackVibration) {
+		// 	m_options[OPTIONS_DESTROY_VIBRATION] = readBool(value);
+		// }
+
+		// // Graphics
+		// if (key == OptionStrings::Graphics_Fancy) {
+		// 	m_options[OPTIONS_FANCY_GRAPHICS] = readBool(value);
+		// }
+
+		// // Graphics extras
+		// if (key == OptionStrings::Graphics_Vsync) {
+		// 	m_options[OPTIONS_VSYNC] = readBool(value);
+		// }
+
+		// if (key == OptionStrings::Graphics_GUIScale) {
+		// 	m_options[OPTIONS_GUI_SCALE] = readInt(value) % 5;
+		// }
+
+		// // Game
+		// if (key == OptionStrings::Game_DifficultyLevel) {
+		// 	readInt(value, difficulty);
+		// 	// Only support peaceful and normal right now
+		// 	if (difficulty != Difficulty::PEACEFUL && difficulty != Difficulty::NORMAL)
+		// 		difficulty = Difficulty::NORMAL;
+		// }*/
+	}
 }

-void Options::load()
-{
-	int a = 0;
-	//try {
-	//    if (!optionsFile.exists()) return;
-	//    BufferedReader br = /*new*/ BufferedReader(/*new*/ FileReader(optionsFile));
-	//    std::string line = "";
-	//    while ((line = br.readLine()) != NULL) {
-	//        std::string[] cmds = line.split(":");
-	//        if (cmds[0].equals("music")) music = readFloat(cmds[1]);
-	//        if (cmds[0].equals("sound")) sound = readFloat(cmds[1]);
-	//        if (cmds[0].equals("mouseSensitivity")) sensitivity = readFloat(cmds[1]);
-	//        if (cmds[0].equals("invertYMouse")) invertYMouse = cmds[1].equals("true");
-	//        if (cmds[0].equals("viewDistance")) viewDistance = Integer.parseInt(cmds[1]);
-	//        if (cmds[0].equals("guiScale")) guiScale = Integer.parseInt(cmds[1]);
-	//        if (cmds[0].equals("bobView")) bobView = cmds[1].equals("true");
-	//        if (cmds[0].equals("anaglyph3d")) anaglyph3d = cmds[1].equals("true");
-	//        if (cmds[0].equals("limitFramerate")) limitFramerate = cmds[1].equals("true");
-	//        if (cmds[0].equals("difficulty")) difficulty = Integer.parseInt(cmds[1]);
-	//        if (cmds[0].equals("fancyGraphics")) fancyGraphics = cmds[1].equals("true");
-	//        if (cmds[0].equals("ao")) ambientOcclusion = cmds[1].equals("true");
-	//        if (cmds[0].equals("skin")) skin = cmds[1];
-	//        if (cmds[0].equals("lastServer") && cmds.length >= 2) lastMpIp = cmds[1];
-
-	//        for (int i = 0; i < keyMappings.length; i++) {
-	//            if (cmds[0].equals("key_" + keyMappings[i].name)) {
-	//                keyMappings[i].key = Integer.parseInt(cmds[1]);
-	//            }
-	//        }
-	//    }
-	//    br.close();
-	//} catch (Exception e) {
-	//    System.out.println("Failed to load options");
-	//    e.printStackTrace();
-	//}
-}
-
-void Options::save()
-{
+void Options::save() {
 	StringVector stringVec;
-	// Game
-	addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_ServerVisible, serverVisible);
-	addOptionToSaveOutput(stringVec, OptionStrings::Game_DifficultyLevel, difficulty);
 	
-	// Input
-	addOptionToSaveOutput(stringVec, OptionStrings::Controls_InvertMouse, invertYMouse);
-	addOptionToSaveOutput(stringVec, OptionStrings::Controls_Sensitivity, sensitivity);
-	addOptionToSaveOutput(stringVec, OptionStrings::Controls_IsLefthanded, isLeftHanded);
-	addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchScreen, useTouchScreen);
-	addOptionToSaveOutput(stringVec, OptionStrings::Controls_UseTouchJoypad, isJoyTouchArea);
-	addOptionToSaveOutput(stringVec, OptionStrings::Controls_FeedbackVibration, destroyVibration);
-// 
-// 	static const Option MUSIC;
-// 	static const Option SOUND;
-// 	static const Option INVERT_MOUSE;
-// 	static const Option SENSITIVITY;
-// 	static const Option RENDER_DISTANCE;
-// 	static const Option VIEW_BOBBING;
-// 	static const Option ANAGLYPH;
-// 	static const Option LIMIT_FRAMERATE;
-// 	static const Option DIFFICULTY;
-// 	static const Option GRAPHICS;
-// 	static const Option AMBIENT_OCCLUSION;
-// 	static const Option GUI_SCALE;
-// 
-// 	static const Option THIRD_PERSON;
-// 	static const Option HIDE_GUI;
-	//try {
-	//    PrintWriter pw = /*new*/ PrintWriter(/*new*/ FileWriter(optionsFile));
-
-	//    pw.println("music:" + music);
-	//    pw.println("sound:" + sound);
-	//    pw.println("invertYMouse:" + invertYMouse);
-	//    pw.println("mouseSensitivity:" + sensitivity);
-	//    pw.println("viewDistance:" + viewDistance);
-	//    pw.println("guiScale:" + guiScale);
-	//    pw.println("bobView:" + bobView);
-	//    pw.println("anaglyph3d:" + anaglyph3d);
-	//    pw.println("limitFramerate:" + limitFramerate);
-	//    pw.println("difficulty:" + difficulty);
-	//    pw.println("fancyGraphics:" + fancyGraphics);
-	//    pw.println("ao:" + ambientOcclusion);
-	//    pw.println("skin:" + skin);
-	//    pw.println("lastServer:" + lastMpIp);
-
-	//    for (int i = 0; i < keyMappings.length; i++) {
-	//        pw.println("key_" + keyMappings[i].name + ":" + keyMappings[i].key);
-	//    }
-
-	//    pw.close();
-	//} catch (Exception e) {
-	//    System.out.println("Failed to save options");
-	//    e.printStackTrace();
-	//}
-}
-void Options::addOptionToSaveOutput(StringVector& stringVector, std::string name, bool boolValue) {
-	std::stringstream ss;
-	ss << name << ":" << boolValue;
-	stringVector.push_back(ss.str());
-}
-void Options::addOptionToSaveOutput(StringVector& stringVector, std::string name, float floatValue) {
-	std::stringstream ss;
-	ss << name << ":" << floatValue;
-	stringVector.push_back(ss.str());
-}
-void Options::addOptionToSaveOutput(StringVector& stringVector, std::string name, int intValue) {
-	std::stringstream ss;
-	ss << name << ":" << intValue;
-	stringVector.push_back(ss.str());
+	for (auto& it : m_options) {
+		if (it) stringVec.push_back(it->serialize());
 	}

-std::string Options::getMessage( const Option* item )
-{
-	return "Options::getMessage - Not implemented";
-
-	//Language language = Language.getInstance();
-	//std::string caption = language.getElement(item.getCaptionId()) + ": ";
-
-	//if (item.isProgress()) {
-	//    float progressValue = getProgressValue(item);
-
-	//    if (item == Option.SENSITIVITY) {
-	//        if (progressValue == 0) {
-	//            return caption + language.getElement("options.sensitivity.min");
-	//        }
-	//        if (progressValue == 1) {
-	//            return caption + language.getElement("options.sensitivity.max");
-	//        }
-	//        return caption + (int) (progressValue * 200) + "%";
-	//    } else {
-	//        if (progressValue == 0) {
-	//            return caption + language.getElement("options.off");
-	//        }
-	//        return caption + (int) (progressValue * 100) + "%";
-	//    }
-	//} else if (item.isBoolean()) {
-
-	//    bool booleanValue = getBooleanValue(item);
-	//    if (booleanValue) {
-	//        return caption + language.getElement("options.on");
-	//    }
-	//    return caption + language.getElement("options.off");
-	//} else if (item == Option.RENDER_DISTANCE) {
-	//    return caption + language.getElement(RENDER_DISTANCE_NAMES[viewDistance]);
-	//} else if (item == Option.DIFFICULTY) {
-	//    return caption + language.getElement(DIFFICULTY_NAMES[difficulty]);
-	//} else if (item == Option.GUI_SCALE) {
-	//    return caption + language.getElement(GUI_SCALE[guiScale]);
-	//} else if (item == Option.GRAPHICS) {
-	//    if (fancyGraphics) {
-	//        return caption + language.getElement("options.graphics.fancy");
-	//    }
-	//    return caption + language.getElement("options.graphics.fast");
-	//}
-
-	//return caption;
+	optionsFile.save(stringVec);
 }

-/*static*/
-bool Options::readFloat(const std::string& string, float& value) {
-	if (string == "true" || string == "YES")  { value = 1; return true; }
-	if (string == "false" || string == "NO") { value = 0; return true; }
-#ifdef _WIN32
-	if (sscanf_s(string.c_str(), "%f", &value))
-		return true;
-#else
-	if (sscanf(string.c_str(), "%f", &value))
-		return true;
-#endif
-	return false;
+void Options::setOptionsFilePath(const std::string& path) {
+	optionsFile.setOptionsPath(path + "/options.txt");
 }

-/*static*/
-bool Options::readInt(const std::string& string, int& value) {
-	if (string == "true" || string == "YES")  { value = 1; return true; }
-	if (string == "false" || string == "NO") { value = 0; return true; }
-#ifdef _WIN32
-	if (sscanf_s(string.c_str(), "%d", &value))
-		return true;
-#else
-	if (sscanf(string.c_str(), "%d", &value))
-		return true;
-#endif
-	return false;
+void Options::notifyOptionUpdate(OptionId key, bool value) {
+	minecraft->optionUpdated(key, value);
 }

-/*static*/
-bool Options::readBool(const std::string& string, bool& value) {
-	std::string s = Util::stringTrim(string);
-	if (string == "true" || string == "1" || string == "YES")  { value = true;  return true; }
-	if (string == "false" || string == "0" || string == "NO") { value = false; return true; }
-	return false;
+void Options::notifyOptionUpdate(OptionId key, float value) {
+	minecraft->optionUpdated(key, value);
 }

-void Options::notifyOptionUpdate( const Option* option, bool value ) {
-	minecraft->optionUpdated(option, value);
-}
-
-void Options::notifyOptionUpdate( const Option* option, float value ) {
-	minecraft->optionUpdated(option, value);
-}
-
-void Options::notifyOptionUpdate( const Option* option, int value ) {
-	minecraft->optionUpdated(option, value);
+void Options::notifyOptionUpdate(OptionId key, int value) {
+	minecraft->optionUpdated(key, value);
 }
--- a/src/client/Options.h
+++ b/src/client/Options.h
@@ -1,16 +1,93 @@
 #ifndef NET_MINECRAFT_CLIENT__Options_H__
 #define NET_MINECRAFT_CLIENT__Options_H__

+#define SOUND_MIN_VALUE 0.0f
+#define SOUND_MAX_VALUE 1.0f
+#define MUSIC_MIN_VALUE 0.0f
+#define MUSIC_MAX_VALUE 1.0f
+#define SENSITIVITY_MIN_VALUE 0.0f
+#define SENSITIVITY_MAX_VALUE 1.0f
+#define PIXELS_PER_MILLIMETER_MIN_VALUE 3.0f
+#define PIXELS_PER_MILLIMETER_MAX_VALUE 4.0f
+
 //package net.minecraft.client;

 //#include "locale/Language.h"

 #include <string>
 #include <cstdio>
-#include "KeyMapping.h"
 #include "../platform/input/Keyboard.h"
 #include "../util/StringUtils.h"
 #include "OptionsFile.h"
+#include "Option.h"
+#include <array>
+
+enum OptionId {
+    // General
+    OPTIONS_DIFFICULTY,
+    OPTIONS_HIDEGUI,
+    OPTIONS_THIRD_PERSON_VIEW,
+    OPTIONS_GUI_SCALE,
+    OPTIONS_DESTROY_VIBRATION,
+    OPTIONS_MUSIC_VOLUME,
+    OPTIONS_SOUND_VOLUME,
+    OPTIONS_SKIN,
+    OPTIONS_USERNAME,
+    OPTIONS_SERVER_VISIBLE,
+    OPTIONS_BAR_ON_TOP,
+    OPTIONS_ALLOW_SPRINT,
+    OPTIONS_AUTOJUMP,
+
+    // Graphics
+    OPTIONS_RENDER_DEBUG,
+    OPTIONS_SMOOTH_CAMERA,
+    OPTIONS_FIXED_CAMERA,
+    OPTIONS_VIEW_DISTANCE,
+    OPTIONS_VIEW_BOBBING,
+    OPTIONS_AMBIENT_OCCLUSION,
+    OPTIONS_ANAGLYPH_3D,
+    OPTIONS_LIMIT_FRAMERATE,
+    OPTIONS_VSYNC,
+    OPTIONS_FANCY_GRAPHICS,
+
+    // Cheats / debug
+    OPTIONS_FLY_SPEED,
+    OPTIONS_CAMERA_SPEED,
+    OPTIONS_IS_FLYING,
+
+    // Control
+    OPTIONS_USE_MOUSE_FOR_DIGGING,
+    OPTIONS_IS_LEFT_HANDED,
+    OPTIONS_IS_JOY_TOUCH_AREA,
+    OPTIONS_SENSITIVITY,
+    OPTIONS_INVERT_Y_MOUSE,
+    OPTIONS_USE_TOUCHSCREEN,
+
+    OPTIONS_KEY_FORWARD,
+    OPTIONS_KEY_LEFT,
+    OPTIONS_KEY_BACK,
+    OPTIONS_KEY_RIGHT,
+    OPTIONS_KEY_JUMP,
+    OPTIONS_KEY_INVENTORY,
+    OPTIONS_KEY_SNEAK,
+    OPTIONS_KEY_DROP,
+    OPTIONS_KEY_CHAT,
+    OPTIONS_KEY_FOG,
+    OPTIONS_KEY_USE,
+
+    OPTIONS_KEY_MENU_NEXT,
+    OPTIONS_KEY_MENU_PREV,
+    OPTIONS_KEY_MENU_OK,
+    OPTIONS_KEY_MENU_CANCEL,
+
+    OPTIONS_FIRST_LAUNCH,
+    OPTIONS_LAST_IP,
+
+    OPTIONS_RPI_CURSOR,
+	OPTIONS_FOLIAGE_TINT,
+	// Should be last!
+	OPTIONS_COUNT
+};

 class Minecraft;
 typedef std::vector<std::string> StringVector;
@@ -18,311 +95,78 @@ typedef std::vector<std::string> StringVector;
 class Options
 {
 public:
-    class Option
-	{
-        const bool _isProgress;
-        const bool _isBoolean;
-        const std::string _captionId;
-		const int _ordinal;
+    // deepfriedwaffles: for iOS, was getting compile errors saying: No member named 'sound' in 'Options' and No member named 'music' in 'Options' so I floated them here. 1.0f means full volume out of the box, but if everything is too loud, you might want to try adjusting this
+    float sound = 1.0f;
+    float music = 1.0f;
    
-	public:
-		static const Option MUSIC;
-		static const Option SOUND;
-		static const Option INVERT_MOUSE;
-		static const Option SENSITIVITY;
-		static const Option RENDER_DISTANCE;
-		static const Option VIEW_BOBBING;
-		static const Option ANAGLYPH;
-		static const Option LIMIT_FRAMERATE;
-		static const Option DIFFICULTY;
-		static const Option GRAPHICS;
-		static const Option AMBIENT_OCCLUSION;
-		static const Option GUI_SCALE;
-        
-		static const Option THIRD_PERSON;
-		static const Option HIDE_GUI;
-		static const Option SERVER_VISIBLE;
-		static const Option LEFT_HANDED;
-		static const Option USE_TOUCHSCREEN;
-		static const Option USE_TOUCH_JOYPAD;
-		static const Option DESTROY_VIBRATION;
-
-		static const Option PIXELS_PER_MILLIMETER;
-
-		/*
-        static Option* getItem(int id) {
-            for (Option item : Option.values()) {
-                if (item.getId() == id) {
-                    return item;
-                }
-            }
-            return NULL;
-        }
-		*/
-
-        Option(int ordinal, const std::string& captionId, bool hasProgress, bool isBoolean)
-		:	_captionId(captionId),
-			_isProgress(hasProgress),
-			_isBoolean(isBoolean),
-			_ordinal(ordinal)
-		{}
-
-        bool isProgress() const {
-            return _isProgress;
-        }
-
-        bool isBoolean() const {
-            return _isBoolean;
-        }
-
-		bool isInt() const {
-			return (!_isBoolean && !_isProgress);
-		}
-
-        int getId() {
-            return _ordinal;
-        }
-
-        std::string getCaptionId() const {
-            return _captionId;
-        }
-    };
-
-private:
-	static const float SOUND_MIN_VALUE;
-	static const float SOUND_MAX_VALUE;
-	static const float MUSIC_MIN_VALUE;
-	static const float MUSIC_MAX_VALUE;
-	static const float SENSITIVITY_MIN_VALUE;
-	static const float SENSITIVITY_MAX_VALUE;
-	static const float PIXELS_PER_MILLIMETER_MIN_VALUE;
-	static const float PIXELS_PER_MILLIMETER_MAX_VALUE;
-    static const char* RENDER_DISTANCE_NAMES[];
-    static const char* DIFFICULTY_NAMES[];
-    static const char* GUI_SCALE[];
-	static const int DIFFICULY_LEVELS[];
-public:
    static bool debugGl;

-	float music;
-    float sound;
-    //note: sensitivity is transformed in Options::update
-    float sensitivity;
-    bool invertYMouse;
-    int viewDistance;
-    bool bobView;
-    bool anaglyph3d;
-    bool limitFramerate;
-    bool fancyGraphics;
-    bool ambientOcclusion;
-	bool useMouseForDigging;
-	bool isLeftHanded;
-	bool destroyVibration;
-    //std::string skin;
-
-    KeyMapping keyUp;
-    KeyMapping keyLeft;
-    KeyMapping keyDown;
-    KeyMapping keyRight;
-    KeyMapping keyJump;
-    KeyMapping keyBuild;
-    KeyMapping keyDrop;
-    KeyMapping keyChat;
-    KeyMapping keyFog;
-    KeyMapping keySneak;
-	KeyMapping keyCraft;
-	KeyMapping keyDestroy;
-	KeyMapping keyUse;
-
-	KeyMapping keyMenuNext;
-	KeyMapping keyMenuPrevious;
-	KeyMapping keyMenuOk;
-	KeyMapping keyMenuCancel;
-
-    KeyMapping* keyMappings[16];
-
-	/*protected*/ Minecraft* minecraft;
-    ///*private*/ File optionsFile;
-
-    int difficulty;
-    bool hideGui;
-    bool thirdPersonView;
-    bool renderDebug;
-
-    bool isFlying;
-    bool smoothCamera;
-    bool fixedCamera;
-    float flySpeed;
-    float cameraSpeed;
-    int guiScale;
-	std::string username;
-
-	bool serverVisible;
-	bool isJoyTouchArea;
-	bool useTouchScreen;
-	float pixelsPerMillimeter;
-    Options(Minecraft* minecraft, const std::string& workingDirectory)
-	:	minecraft(minecraft)
-	{
-        //optionsFile = /*new*/ File(workingDirectory, "options.txt");
-        initDefaultValues();
-
-		load();
+    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() is deferred to init() where path is configured correctly
    }

-	Options()
-	:	minecraft(NULL)
-	{
+    void initTable();

+    int getIntValue(OptionId key) {
+        auto option = opt<OptionInt>(key);
+        return (option)? option->get() : 0;
    }

-	void initDefaultValues();
-
-    std::string getKeyDescription(int i) {
-        //Language language = Language.getInstance();
-        //return language.getElement(keyMappings[i].name);
-		return "Options::getKeyDescription not implemented";
+    std::string getStringValue(OptionId key) {
+        auto option = opt<OptionString>(key);
+        return (option)? option->get() : "";
    }

-    std::string getKeyMessage(int i) {
-        //return Keyboard.getKeyName(keyMappings[i].key);
-		return "Options::getKeyMessage not implemented";
+    float getProgressValue(OptionId key) {
+        auto option = opt<OptionFloat>(key);
+        return (option)? option->get() : 0.f;
    }

-    void setKey(int i, int key) {
-        keyMappings[i]->key = key;
-        save();
+    bool getBooleanValue(OptionId key) {
+        auto option = opt<OptionBool>(key);
+        return (option)? option->get() : false;
    }

-    void set(const Option* item, float value) {
-        if (item == &Option::MUSIC) {
-            music = value;
-            //minecraft.soundEngine.updateOptions();
-        } else if (item == &Option::SOUND) {
-            sound = value;
-            //minecraft.soundEngine.updateOptions();
-        } else if (item == &Option::SENSITIVITY) {
-            sensitivity = value;
-		} else if (item == &Option::PIXELS_PER_MILLIMETER) {
-			 pixelsPerMillimeter = value;
-		}
-		notifyOptionUpdate(item, value);
-    }
-	void set(const Option* item, int value) {
-		if(item == &Option::DIFFICULTY) {
-			difficulty = value;
-		}
-		notifyOptionUpdate(item, value);
+    float getProgrssMin(OptionId key) {
+        auto option = opt<OptionFloat>(key);
+        return (option)? option->getMin() : 0.f;
    }

-    void toggle(const Option* option, int dir) {
-        if (option == &Option::INVERT_MOUSE)	invertYMouse = !invertYMouse;
-        if (option == &Option::RENDER_DISTANCE) viewDistance = (viewDistance + dir) & 3;
-        if (option == &Option::GUI_SCALE)		guiScale = (guiScale + dir) & 3;
-        if (option == &Option::VIEW_BOBBING)	bobView = !bobView;
-		if (option == &Option::THIRD_PERSON)	thirdPersonView = !thirdPersonView;
-		if (option == &Option::HIDE_GUI)		hideGui = !hideGui;
-		if (option == &Option::SERVER_VISIBLE)		serverVisible = !serverVisible;
-		if (option == &Option::LEFT_HANDED) isLeftHanded = !isLeftHanded;
-		if (option == &Option::USE_TOUCHSCREEN) useTouchScreen = !useTouchScreen;
-		if (option == &Option::USE_TOUCH_JOYPAD) isJoyTouchArea = !isJoyTouchArea;
-		if (option == &Option::DESTROY_VIBRATION) destroyVibration = !destroyVibration;
-		if (option == &Option::ANAGLYPH) {
-            anaglyph3d = !anaglyph3d;
-            //minecraft->textures.reloadAll();
-        }
-        if (option == &Option::LIMIT_FRAMERATE) limitFramerate = !limitFramerate;
-        if (option == &Option::DIFFICULTY) difficulty = (difficulty + dir) & 3;
-        if (option == &Option::GRAPHICS) {
-            fancyGraphics = !fancyGraphics;
-            //minecraft->levelRenderer.allChanged();
-        }
-        if (option == &Option::AMBIENT_OCCLUSION) {
-            ambientOcclusion = !ambientOcclusion;
-            //minecraft->levelRenderer.allChanged();
-        }
-		notifyOptionUpdate(option, getBooleanValue(option));
-        save();
+    float getProgrssMax(OptionId key) {
+        auto option = opt<OptionFloat>(key);
+        return (option)? option->getMax() : 0.f;
    }

-	int getIntValue(const Option* item) {
-		if(item == &Option::DIFFICULTY) return difficulty;
-		return 0;
-	}
+    Option* getOpt(OptionId id) { return m_options[id]; }

-    float getProgressValue(const Option* item) {
-        if (item == &Option::MUSIC) return music;
-        if (item == &Option::SOUND) return sound;
-        if (item == &Option::SENSITIVITY) return sensitivity;
-		if (item == &Option::PIXELS_PER_MILLIMETER) return pixelsPerMillimeter;
-        return 0;
-    }
-
-    bool getBooleanValue(const Option* item) {
-        if (item == &Option::INVERT_MOUSE)
-            return invertYMouse;
-        if (item == &Option::VIEW_BOBBING)
-            return bobView;
-        if (item == &Option::ANAGLYPH)
-            return anaglyph3d;
-        if (item == &Option::LIMIT_FRAMERATE)
-            return limitFramerate;
-        if (item == &Option::AMBIENT_OCCLUSION)
-            return ambientOcclusion;
-        if (item == &Option::THIRD_PERSON)
-            return thirdPersonView;
-        if (item == &Option::HIDE_GUI)
-            return hideGui;
-		if (item == &Option::THIRD_PERSON)
-			return thirdPersonView;
-		if (item == &Option::SERVER_VISIBLE)
-			return serverVisible;
-		if (item == &Option::LEFT_HANDED)
-			return isLeftHanded;
-		if (item == &Option::USE_TOUCHSCREEN)
-			return useTouchScreen;
-		if (item == &Option::USE_TOUCH_JOYPAD)
-			return isJoyTouchArea;
-		if (item == &Option::DESTROY_VIBRATION)
-			return destroyVibration;
-		return false;
-	}
-
-	float getProgrssMin(const Option* item) {
-		if (item == &Option::MUSIC) return MUSIC_MIN_VALUE;
-		if (item == &Option::SOUND) return SOUND_MIN_VALUE;
-		if (item == &Option::SENSITIVITY) return SENSITIVITY_MIN_VALUE;
-		if (item == &Option::PIXELS_PER_MILLIMETER) return PIXELS_PER_MILLIMETER_MIN_VALUE;
-		return 0;
-	}
-
-	float getProgrssMax(const Option* item) {
-		if (item == &Option::MUSIC) return MUSIC_MAX_VALUE;
-		if (item == &Option::SOUND) return SOUND_MAX_VALUE;
-		if (item == &Option::SENSITIVITY) return SENSITIVITY_MAX_VALUE;
-		if (item == &Option::PIXELS_PER_MILLIMETER) return PIXELS_PER_MILLIMETER_MAX_VALUE;
-		return 1.0f;
-	} 
-
-	std::string getMessage(const Option* item);
-
-	void update();
    void load();
    void save();
-	void addOptionToSaveOutput(StringVector& stringVector, std::string name, bool boolValue);
-	void addOptionToSaveOutput(StringVector& stringVector, std::string name, float floatValue);
-	void addOptionToSaveOutput(StringVector& stringVector, std::string name, int intValue);
-	void notifyOptionUpdate(const Option* option, bool value);
-	void notifyOptionUpdate(const Option* option, float value);
-	void notifyOptionUpdate(const Option* option, int value);
-private:
-    static bool readFloat(const std::string& string, float& value);
-    static bool readInt(const std::string& string, int& value);
-	static bool readBool(const std::string& string, bool& value);
+    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);
+	void notifyOptionUpdate(OptionId key, int value);
+    void notifyOptionUpdate(OptionId key, const std::string& value) {}

 private:
+    template<typename T>
+    T* opt(OptionId key) { 
+        if (m_options[key] == nullptr) return nullptr;
+        return dynamic_cast<T*>(m_options[key]); 
+    }
+
+	std::array<Option*, OPTIONS_COUNT> m_options;
 	OptionsFile optionsFile;

+	Minecraft* minecraft;
 };

 #endif /*NET_MINECRAFT_CLIENT__Options_H__*/
--- a/src/client/OptionsFile.cpp
+++ b/src/client/OptionsFile.cpp
@@ -1,37 +1,98 @@
 #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::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 != NULL) {
-		for(StringVector::const_iterator it = settings.begin(); it != settings.end(); ++it) {
-			fprintf(pFile, "%s\n", it->c_str());
+
+    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
                    }
-		fclose(pFile);
+                }
+                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(), "w");
+	FILE* pFile = fopen(settingsPath.c_str(), "r");
 	if(pFile != NULL) {
 		char lineBuff[128];
 		while(fgets(lineBuff, sizeof lineBuff, pFile)) {
-			if(strlen(lineBuff) > 2)
-				returnVector.push_back(std::string(lineBuff));
+			// Strip trailing newline
+			size_t len = strlen(lineBuff);
+			while(len > 0 && (lineBuff[len-1] == '\n' || lineBuff[len-1] == '\r'))
+				lineBuff[--len] = '\0';
+			if(len < 3) continue;
+			// Split "key:value" into two separate entries to match update() pairing
+			char* colon = strchr(lineBuff, ':');
+			if(colon) {
+				returnVector.push_back(std::string(lineBuff, colon - lineBuff));
+				returnVector.push_back(std::string(colon + 1));
+			}
 		}
 		fclose(pFile);
+	} else {
+		if (errno != ENOENT)
+			LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
 	}
 	return returnVector;
 }
--- a/src/client/OptionsFile.h
+++ b/src/client/OptionsFile.h
@@ -11,6 +11,8 @@ public:
 	OptionsFile();
    void save(const StringVector& settings);
 	StringVector getOptionStrings();
+	void setOptionsPath(const std::string& path);
+	std::string getOptionsPath() const;

 private:
 	std::string settingsPath;
--- a/src/client/User.h
+++ b/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__*/
--- a/src/client/gamemode/CreativeMode.cpp
+++ b/src/client/gamemode/CreativeMode.cpp
@@ -13,7 +13,7 @@
 #include "../../network/packet/RemoveBlockPacket.h"
 #include "../../world/entity/player/Abilities.h"

-static const int DestructionTickDelay = 10;
+static const int DestructionTickDelay = 5;

 CreativeMode::CreativeMode(Minecraft* minecraft)
 : 	super(minecraft)
@@ -29,12 +29,8 @@ void CreativeMode::startDestroyBlock(int x, int y, int z, int face) {
 }

 void CreativeMode::creativeDestroyBlock(int x, int y, int z, int face) {
-	//if (!
-	minecraft->level->extinguishFire(x, y, z, face)
-	//{
-		;
+	minecraft->level->extinguishFire(x, y, z, face);
 	destroyBlock(x, y, z, face);
-	//}
 }

 void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
@@ -46,6 +42,7 @@ void CreativeMode::continueDestroyBlock(int x, int y, int z, int face) {
 }

 void CreativeMode::stopDestroyBlock() {
+	destroyDelay = 0;
 }

 void CreativeMode::initAbilities( Abilities& abilities ) {
@@ -57,16 +54,3 @@ void CreativeMode::initAbilities( Abilities& abilities ) {
 bool CreativeMode::isCreativeType() {
 	return true;
 }
-
-void CreativeMode::releaseUsingItem( Player* player ) {
-	if(player->getCarriedItem() != NULL) {
-		int oldItemId = player->getCarriedItem()->id;
-		int oldAux = player->getAuxData();
-		super::releaseUsingItem(player);
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
-			player->getCarriedItem()->setAuxValue(oldAux);
-		}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}
--- a/src/client/gamemode/CreativeMode.h
+++ b/src/client/gamemode/CreativeMode.h
@@ -19,7 +19,6 @@ public:

 	void initAbilities(Abilities& abilities);

-	void releaseUsingItem(Player* player);
 private:
 	void creativeDestroyBlock(int x, int y, int z, int face);
 };
--- a/src/client/gamemode/CreatorMode.cpp
+++ b/src/client/gamemode/CreatorMode.cpp
@@ -9,7 +9,7 @@
 #include "../../network/packet/RemoveBlockPacket.h"
 #include "../../world/entity/player/Abilities.h"

-static const int DestructionTickDelay = 10;
+static const int DestructionTickDelay = 5;

 class Creator: public ICreator {
 	//virtual void getEvents();
@@ -60,12 +60,8 @@ void CreatorMode::startDestroyBlock(int x, int y, int z, int face) {
 }

 void CreatorMode::CreatorDestroyBlock(int x, int y, int z, int face) {
-	//if (!
-	minecraft->level->extinguishFire(x, y, z, face)
-	//{
-		;
+	minecraft->level->extinguishFire(x, y, z, face);
 	destroyBlock(x, y, z, face);
-	//}
 }

 void CreatorMode::continueDestroyBlock(int x, int y, int z, int face) {
@@ -83,6 +79,7 @@ bool CreatorMode::useItemOn( Player* player, Level* level, ItemInstance* item, i
 }

 void CreatorMode::stopDestroyBlock() {
+	destroyDelay = 0;
 }

 void CreatorMode::initAbilities( Abilities& abilities ) {
@@ -95,19 +92,6 @@ bool CreatorMode::isCreativeType() {
 	return true;
 }

-void CreatorMode::releaseUsingItem( Player* player ) {
-	if(player->getCarriedItem() != NULL) {
-		int oldItemId = player->getCarriedItem()->id;
-		int oldAux = player->getAuxData();
-		super::releaseUsingItem(player);
-		if(player->getCarriedItem() != NULL && player->getCarriedItem()->id == oldItemId) {
-			player->getCarriedItem()->setAuxValue(oldAux);
-		}
-	} else {
-		super::releaseUsingItem(player);
-	}
-}
-
 ICreator* CreatorMode::getCreator() {
 	return _creator;
 }
--- a/src/client/gamemode/CreatorMode.h
+++ b/src/client/gamemode/CreatorMode.h
@@ -118,7 +118,6 @@ public:

 	void initAbilities(Abilities& abilities);

-	void releaseUsingItem(Player* player);
 private:
 	void CreatorDestroyBlock(int x, int y, int z, int face);

--- a/src/client/gamemode/GameMode.cpp
+++ b/src/client/gamemode/GameMode.cpp
@@ -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*/
@@ -74,7 +75,7 @@ bool GameMode::destroyBlock(int x, int y, int z, int face) {
        minecraft->soundEngine->play(oldTile->soundType->getBreakSound(), x + 0.5f, y + 0.5f, z + 0.5f, (oldTile->soundType->getVolume() + 1) / 2, oldTile->soundType->getPitch() * 0.8f);
 #endif
        oldTile->destroy(level, x, y, z, data);
-		if (minecraft->options.destroyVibration) minecraft->platform()->vibrate(24);
+		if (minecraft->options.getBooleanValue(OPTIONS_DESTROY_VIBRATION)) minecraft->platform()->vibrate(24);

 		if (minecraft->isOnline()) {
 			RemoveBlockPacket packet(minecraft->player, x, y, z);
@@ -88,8 +89,8 @@ bool GameMode::useItemOn(Player* player, Level* level, ItemInstance* item, int x
 	float clickX = hit.x - x;
 	float clickY = hit.y - y;
 	float clickZ = hit.z - z;
-	item = player->inventory->getSelected();
 	if (level->isClientSide) {
+		item = player->inventory->getSelected();
 		UseItemPacket packet(x, y, z, face, item, player->entityId, clickX, clickY, clickZ);
 		minecraft->raknetInstance->send(packet);
 	}
@@ -148,7 +149,7 @@ void GameMode::initPlayer( Player* player ) {
 }

 void GameMode::releaseUsingItem(Player* player){
-	if(minecraft->level->isClientSide) {
+	if (minecraft->level->isClientSide && player->isUsingItem()) {
 		PlayerActionPacket packet(PlayerActionPacket::RELEASE_USE_ITEM,  0, 0, 0, 0, player->entityId);
 		minecraft->raknetInstance->send(packet);
 	}
--- a/src/client/gui/Font.cpp
+++ b/src/client/gui/Font.cpp
@@ -186,7 +186,7 @@ void Font::draw( const std::string& str, float x, float y, int color, bool darke
 	glPushMatrix2();
 	glTranslatef2((GLfloat)x, (GLfloat)y, 0.0f);
 	for (unsigned int i = 0; i < str.length(); i++) {
-		while (str.length() > i + 1 && str[i] == '<EFBFBD>') {
+		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] == '<EFBFBD>') {
+		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] == '<EFBFBD>') {
+		if (str[i] == '\xa7') {
 			i++;
 			//} else if (SharedConstants.acceptableLetters.indexOf(str.charAt(i)) >= 0) {
 		} else {
--- a/src/client/gui/Gui.cpp
+++ b/src/client/gui/Gui.cpp
@@ -1,7 +1,10 @@
 #include "Gui.h"
 #include "Font.h"
 #include "client/Options.h"
+#include "platform/input/Keyboard.h"
 #include "screens/IngameBlockSelectionScreen.h"
+#include "screens/ChatScreen.h"
+#include "screens/ConsoleScreen.h"
 #include "../Minecraft.h"
 #include "../player/LocalPlayer.h"
 #include "../renderer/Tesselator.h"
@@ -21,6 +24,10 @@
 #include "../../platform/input/Mouse.h"
 #include "../../world/level/Level.h"
 #include "../../world/PosTranslator.h"
+#include "../../platform/time.h"
+#include <cmath>
+#include <algorithm>
+#include <sstream>

 float Gui::InvGuiScale = 1.0f / 3.0f;
 float Gui::GuiScale = 1.0f / Gui::InvGuiScale;
@@ -34,6 +41,7 @@ Gui::Gui(Minecraft* minecraft)
 	progress(0),
 	overlayMessageTime(0),
 	animateOverlayMessageColor(false),
+	chatScrollOffset(0),
 	tbr(1),
 	_inventoryNeedsUpdate(true),
 	_flashSlotId(-1),
@@ -43,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);
@@ -67,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;
@@ -85,6 +91,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
    // F: 3
 	int ySlot = screenHeight - 16 - 3;

+	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
 		if (minecraft->gameMode->canHurtPlayer()) {
 			minecraft->textures->loadAndBindTexture("gui/icons.png");
 			Tesselator& t = Tesselator::instance;
@@ -94,6 +101,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 			renderBubbles();
 			t.endOverrideAndDraw();
 		}
+	}

 	if(minecraft->player->getSleepTimer() > 0) {
 		glDisable(GL_DEPTH_TEST);
@@ -104,12 +112,22 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 		glEnable(GL_ALPHA_TEST);
 		glEnable(GL_DEPTH_TEST);
 	}
-
+	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
 	renderToolBar(a, ySlot, screenWidth);

 	glEnable(GL_BLEND);
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
 	unsigned int max = 10;
-    bool isChatting = false;
+	if (isChatting) {
+		int lineHeight = 9;
+		max = (screenHeight - 48) / lineHeight;
+		if (max < 1) max = 1;
+		int maxScroll = (int)guiMessages.size() - (int)max;
+		if (maxScroll < 0) maxScroll = 0;
+		if (chatScrollOffset > maxScroll) chatScrollOffset = maxScroll;
+	} else {
+		chatScrollOffset = 0;
+	}
 	renderChatMessages(screenHeight, max, isChatting, font);
 #if !defined(RPI)
 	renderOnSelectItemNameText(screenWidth, font, ySlot);
@@ -118,6 +136,14 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
 	renderDebugInfo();
 #endif

+	if (Keyboard::isKeyDown(Keyboard::KEY_TAB)) {
+		renderPlayerList(font, screenWidth, screenHeight);
+	}
+
+	if (minecraft->options.getBooleanValue(OPTIONS_RENDER_DEBUG))
+		renderDebugInfo();
+	}
+
    glDisable(GL_BLEND);
 	glEnable2(GL_ALPHA_TEST);
 }
@@ -178,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;
 		}
@@ -196,6 +216,33 @@ void Gui::handleClick(int button, int x, int y) {

 void Gui::handleKeyPressed(int key)
 {
+	bool isChatting = (minecraft->screen && (dynamic_cast<ChatScreen*>(minecraft->screen) || dynamic_cast<ConsoleScreen*>(minecraft->screen)));
+	if (isChatting) {
+		// Allow scrolling the chat history with the mouse/keyboard when chat is open
+		if (key == 38) { // VK_UP
+			scrollChat(1);
+			return;
+		} else if (key == 40) { // VK_DOWN
+			scrollChat(-1);
+			return;
+		} else if (key == 33) { // VK_PRIOR (Page Up)
+			// Scroll by a page
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(maxVisible);
+			return;
+		} else if (key == 34) { // VK_NEXT (Page Down)
+			int screenHeight = (int)(minecraft->height * InvGuiScale);
+			int maxVisible = (screenHeight - 48) / 9;
+			scrollChat(-maxVisible);
+			return;
+		}
+	}
+
+	if (key == Keyboard::KEY_F1) {
+		minecraft->options.toggle(OPTIONS_HIDEGUI);
+	}
+	
 	if (key == 99)
 	{
 		if (minecraft->player->inventory->selected > 0)
@@ -214,12 +261,29 @@ void Gui::handleKeyPressed(int key)
 	{
 		minecraft->screenChooser.setScreen(SCREEN_BLOCKSELECTION);
 	}
-	else if (key == minecraft->options.keyDrop.key) 
+	else if (key == minecraft->options.getIntValue(OPTIONS_KEY_DROP)) 
 	{
 		minecraft->player->inventory->dropSlot(minecraft->player->inventory->selected, false);
 	}
 }

+void Gui::scrollChat(int delta) {
+	if (delta == 0)
+		return;
+
+	int screenHeight = (int)(minecraft->height * InvGuiScale);
+	int maxVisible = (screenHeight - 48) / 9;
+	if (maxVisible <= 0)
+		return;
+
+	int maxScroll = (int)guiMessages.size() - maxVisible;
+	if (maxScroll < 0) maxScroll = 0;
+	int desired = chatScrollOffset + delta;
+	if (desired < 0) desired = 0;
+	if (desired > maxScroll) desired = maxScroll;
+	chatScrollOffset = desired;
+}
+
 void Gui::tick() {
 	if (overlayMessageTime > 0) overlayMessageTime--;
 	tickCount++;
@@ -250,9 +314,22 @@ void Gui::addMessage(const std::string& _string) {
 	message.message = string;
 	message.ticks = 0;
 	guiMessages.insert(guiMessages.begin(), message);
-	while (guiMessages.size() > 30) {
+
+	// Keep a larger history so users can scroll through the full chat
+	const unsigned int MaxHistoryLines = 200;
+	while (guiMessages.size() > MaxHistoryLines) {
 		guiMessages.pop_back();
 	}
+
+	// If the user has scrolled up, keep their window fixed (new messages shift older ones down)
+	if (chatScrollOffset > 0) {
+		chatScrollOffset++;
+	}
+}
+
+void Gui::clearMessages() {
+	guiMessages.clear();
+	chatScrollOffset = 0;
 }

 void Gui::setNowPlaying(const std::string& string) {
@@ -264,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) {
@@ -345,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);
@@ -397,7 +474,7 @@ void Gui::onConfigChanged( const Config& c ) {
 	if (c.minecraft->useTouchscreen()) {
 		// I'll bump this up to 6.
 		int num = 6; // without "..." dots
-		if (!c.minecraft->options.isJoyTouchArea && c.width > 480) {
+		if (!c.minecraft->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA) && c.width > 480) {
 			while (num < Inventory::MAX_SELECTION_SIZE - 1) {
 				int x0, x1, y;
 				getSlotPos(0, x0, y);
@@ -452,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());
@@ -511,7 +584,8 @@ void Gui::renderProgressIndicator( const bool isTouchInterface, const int screen
 	ItemInstance* currentItem = minecraft->player->inventory->getSelected();
 	bool bowEquipped = currentItem != NULL ? currentItem->getItem() == Item::bow : false;
 	bool itemInUse = currentItem != NULL ? currentItem->getItem() == minecraft->player->getUseItem()->getItem() : false;
-	if (!isTouchInterface || minecraft->options.isJoyTouchArea || (bowEquipped && itemInUse)) {
+	if ((!isTouchInterface || minecraft->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA) 
+	|| (bowEquipped && itemInUse)) && !minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
 		minecraft->textures->loadAndBindTexture("gui/icons.png");
 		glEnable(GL_BLEND);
 		glBlendFunc2(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
@@ -580,11 +654,14 @@ void Gui::renderHearts() {
 	int oh = minecraft->player->lastHealth;
 	random.setSeed(tickCount * 312871);

-	int xx = 2;//screenWidth / 2 - getNumSlots() * 10;
+	int screenWidth = (int)(minecraft->width * InvGuiScale);
+	int screenHeight = (int)(minecraft->height * InvGuiScale);
+
+	int xx = (minecraft->options.getBooleanValue(OPTIONS_BAR_ON_TOP)) ? screenWidth / 2 - getNumSlots() * 10 - 1 : 2;

 	int armor = minecraft->player->getArmorValue();
 	for (int i = 0; i < Player::MAX_HEALTH / 2; i++) {
-		int yo = 2;
+		int yo = (minecraft->options.getBooleanValue(OPTIONS_BAR_ON_TOP)) ? screenHeight - 32 : 2;
 		int ip2 = i + i + 1;

 		if (armor > 0) {
@@ -612,11 +689,15 @@ void Gui::renderHearts() {

 void Gui::renderBubbles() {
 	if (minecraft->player->isUnderLiquid(Material::water)) {
-		int yo = 12;
+		int screenWidth = (int)(minecraft->width * InvGuiScale);
+		int screenHeight = (int)(minecraft->height * InvGuiScale);
+		
+		int xx = (minecraft->options.getBooleanValue(OPTIONS_BAR_ON_TOP)) ? screenWidth / 2 - getNumSlots() * 10 - 1 : 2;
+		int yo = (minecraft->options.getBooleanValue(OPTIONS_BAR_ON_TOP)) ? screenHeight - 42 : 12;
 		int count = (int) std::ceil((minecraft->player->airSupply - 2) * 10.0f / Player::TOTAL_AIR_SUPPLY);
 		int extra = (int) std::ceil((minecraft->player->airSupply) * 10.0f / Player::TOTAL_AIR_SUPPLY) - count;
 		for (int i = 0; i < count + extra; i++) {
-			int xo =  i * 8 + 2;
+			int xo =  i * 8 + xx;
 			if (i < count) blit(xo, yo, 16, 9 * 2, 9, 9);
 			else blit(xo, yo, 16 + 9, 9 * 2, 9, 9);
 		}
@@ -632,20 +713,169 @@ void Gui::onLevelGenerated() {
 }

 void Gui::renderDebugInfo() {
-	static char buf[256];
-	float xx = minecraft->player->x;
-	float yy = minecraft->player->y - minecraft->player->heightOffset;
-	float zz = minecraft->player->z;
-	posTranslator.to(xx, yy, zz);
-	sprintf(buf, "pos: %3.1f, %3.1f, %3.1f\n", xx, yy, zz);
+	// FPS counter (updates once per second)
+	static float fps = 0.0f;
+	static float fpsLastTime = 0.0f;
+	static int   fpsFrames = 0;
+	float now = getTimeS();
+	fpsFrames++;
+	if (now - fpsLastTime >= 1.0f) {
+		fps = fpsFrames / (now - fpsLastTime);
+		fpsFrames = 0;
+		fpsLastTime = now;
+	}
+
+	LocalPlayer* p   = minecraft->player;
+	Level*       lvl = minecraft->level;
+
+	// Position
+	float px = p->x, py = p->y - p->heightOffset, pz = p->z;
+	posTranslator.to(px, py, pz);
+	int bx = (int)floorf(px), by = (int)floorf(py), bz = (int)floorf(pz);
+	int cx = bx >> 4, cz = bz >> 4;
+
+	// Facing direction
+	float yMod = fmodf(p->yRot, 360.0f);
+	if (yMod < 0) yMod += 360.0f;
+	const char* facing;
+	const char* axis;
+	if      (yMod < 45  || yMod >= 315) { facing = "South"; axis = "+Z"; }
+	else if (yMod < 135)                 { facing = "West";  axis = "-X"; }
+	else if (yMod < 225)                 { facing = "North"; axis = "-Z"; }
+	else                                 { facing = "East";  axis = "+X"; }
+
+	// Biome
+	const char* biomeName = "unknown";
+	if (lvl) {
+		Biome* biome = lvl->getBiome(bx, bz);
+		if (biome) biomeName = biome->name.c_str();
+	}
+
+	// Time
+	long worldTime = lvl ? lvl->getTime() : 0;
+	long dayTime   = worldTime % Level::TICKS_PER_DAY;
+	long day       = worldTime / Level::TICKS_PER_DAY;
+	long seed      = lvl ? lvl->getSeed() : 0;
+
+	// Build lines (NULL entry = blank gap)
+	static char ln[8][96];
+	sprintf(ln[0], "Minecraft PE 0.6.1 alpha (mcpe64)");
+	sprintf(ln[1], "%.1f fps", fps);
+	ln[2][0] = '\0'; // blank separator
+	sprintf(ln[3], "XYZ: %.3f / %.3f / %.3f", px, py, pz);
+	sprintf(ln[4], "Block: %d %d %d   Chunk: %d %d", bx, by, bz, cx, cz);
+	sprintf(ln[5], "Facing: %s (%s)  (%.1f / %.1f)", facing, axis, p->yRot, p->xRot);
+	sprintf(ln[6], "Biome: %s", biomeName);
+	sprintf(ln[7], "Day %ld  Time: %ld  Seed: %ld", day, dayTime, seed);
+
+	const int N   = 8;
+	const float LH  = (float)Font::DefaultLineHeight; // 10 font-pixels
+	const float MGN = 2.0f;  // left/top margin in font-pixels
+	const float PAD = 2.0f;  // horizontal padding for background
+	Font* font = minecraft->font;
+
+	// 1) Draw semi-transparent background boxes behind each line
+	for (int i = 0; i < N; i++) {
+		if (ln[i][0] == '\0') continue;
+		float w  = (float)font->width(ln[i]);
+		float x0 = MGN - PAD;
+		float y0 = MGN + i * LH - 1.0f;
+		float x1 = MGN + w + PAD;
+		float y1 = MGN + (i + 1) * LH - 1.0f;
+		fill(x0, y0, x1, y1, 0x90000000);
+	}
+
+	// 2) Draw text (no extra scale — font coords are in GUI units, same as fill)
 	Tesselator& t = Tesselator::instance;
 	t.beginOverride();
-	t.scale2d(InvGuiScale, InvGuiScale);
-	minecraft->font->draw(buf, 2, 2, 0xffffff);
-	t.resetScale();
+	for (int i = 0; i < N; i++) {
+		if (ln[i][0] == '\0') continue;
+		float y = MGN + i * LH;
+		int col = (i == 0) ? 0xffFFFF55 : 0xffffffff; // title yellow, rest white
+		font->draw(ln[i], MGN, y, col);
+	}
 	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;
@@ -676,6 +906,70 @@ void Gui::renderOnSelectItemNameText( const int screenWidth, Font* font, int ySl
 	}
 }

+
+
+// helper structure used by drawColoredString
+struct ColorSegment {
+    std::string text;
+    uint32_t color;
+};
+
+// parse [tag] and [/tag] markers; tags may contain a color name (gold, green, etc.)
+static void parseColorTags(const std::string& in, std::vector<ColorSegment>& out) {
+    uint32_t curColor = 0xffffff;
+    size_t pos = 0;
+    while (pos < in.size()) {
+        size_t open = in.find('[', pos);
+        if (open == std::string::npos) {
+            out.push_back({in.substr(pos), curColor});
+            break;
+        }
+        if (open > pos) {
+            out.push_back({in.substr(pos, open - pos), curColor});
+        }
+        size_t close = in.find(']', open);
+        if (close == std::string::npos) {
+            out.push_back({in.substr(open), curColor});
+            break;
+        }
+        std::string tag = in.substr(open + 1, close - open - 1);
+        if (!tag.empty() && tag[0] == '/') {
+            curColor = 0xffffff;
+        } else {
+            std::string lower;
+            lower.resize(tag.size());
+            std::transform(tag.begin(), tag.end(), lower.begin(), ::tolower);
+            if (lower.find("gold") != std::string::npos) curColor = 0xffd700;
+            else if (lower.find("green") != std::string::npos) curColor = 0x00ff00;
+            else if (lower.find("yellow") != std::string::npos) curColor = 0xffff00;
+            else if (lower.find("red") != std::string::npos) curColor = 0xff0000;
+            else if (lower.find("blue") != std::string::npos) curColor = 0x0000ff;
+        }
+        pos = close + 1;
+    }
+}
+
+void Gui::drawColoredString(Font* font, const std::string& text, float x, float y, int alpha) {
+    std::vector<ColorSegment> segs;
+    parseColorTags(text, segs);
+    float cx = x;
+    for (auto &s : segs) {
+        int color = s.color + (alpha << 24);
+        font->drawShadow(s.text, cx, y, color);
+        cx += font->width(s.text);
+    }
+}
+
+float Gui::getColoredWidth(Font* font, const std::string& text) {
+    std::vector<ColorSegment> segs;
+    parseColorTags(text, segs);
+    float w = 0;
+    for (auto &s : segs) {
+        w += font->width(s.text);
+    }
+    return w;
+}
+
 void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isChatting, Font* font ) {
 	//        if (minecraft.screen instanceof ChatScreen) {
 	//            max = 20;
@@ -691,9 +985,16 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC
 	//        // glScalef2(1.0f / ssc.scale, 1.0f / ssc.scale, 1);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	int baseY = screenHeight - 48;
-	for (unsigned int i = 0; i < guiMessages.size() && i < max; i++) {
-		if (guiMessages.at(i).ticks < 20 * 10 || isChatting) {
-			float t = guiMessages.at(i).ticks / (20 * 10.0f);
+	int start = chatScrollOffset;
+	if (start < 0) start = 0;
+	for (unsigned int i = 0; i < max; i++) {
+		unsigned int msgIdx = (unsigned int)start + i;
+		if (msgIdx >= guiMessages.size())
+			break;
+
+		GuiMessage& message = guiMessages.at(msgIdx);
+		if (message.ticks < 20 * 10 || isChatting) {
+			float t = message.ticks / (20 * 10.0f);
 			t = 1 - t;
 			t = t * 10;
 			if (t < 0) t = 0;
@@ -705,11 +1006,18 @@ void Gui::renderChatMessages( const int screenHeight, unsigned int max, bool isC
 			if (alpha > 0) {
 				const float x = 2;
 				const float y = (float)(baseY - i * 9);
-				std::string msg = guiMessages.at(i).message;
+				std::string msg = message.message;
 				this->fill(x, y - 1, x + MAX_MESSAGE_WIDTH, y + 8, (alpha / 2) << 24);
 				glEnable(GL_BLEND);

-				font->drawShadow(msg, x, y, 0xffffff + (alpha << 24));
+				// special-case join/leave announcements
+			int baseColor = 0xffffff;
+			if (msg.find(" joined the game") != std::string::npos ||
+				msg.find(" left the game") != std::string::npos) {
+				baseColor = 0xffff00; // yellow
+			}
+			// replace previous logic; allow full colour tags now
+			Gui::drawColoredString(font, msg, x, y, alpha);
 			}
 		}
 	}
@@ -763,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);
@@ -777,9 +1079,10 @@ void Gui::renderToolBar( float a, int ySlot, const int screenWidth ) {
 	}
 	_inventoryNeedsUpdate = false;

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

 	minecraft->textures->loadAndBindTexture("gui/gui_blocks.png");
 	t.endOverrideAndDraw();
--- a/src/client/gui/Gui.h
+++ b/src/client/gui/Gui.h
@@ -39,6 +39,7 @@ public:

 	void handleClick(int button, int x, int y);
 	void handleKeyPressed( int key );
+	void scrollChat(int delta);

 	void tick();
 	void render(float a, bool mouseFree, int xMouse, int yMouse);
@@ -47,6 +48,12 @@ public:

 	void renderChatMessages( const int screenHeight, unsigned int max, bool isChatting, Font* font );

+	// draw a string containing simple [color]...[/color] tags; color names are matched
+	// case-insensitively and default to white. alpha is applied to each segment.
+	// draw tagged string (ignores simple [color]…[/color] tags)
+	static void drawColoredString(Font* font, const std::string& text, float x, float y, int alpha);
+	static float getColoredWidth(Font* font, const std::string& text);
+
 	void renderOnSelectItemNameText( const int screenWidth, Font* font, int ySlot );

 	void renderSleepAnimation( const int screenWidth, const int screenHeight );
@@ -54,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();
@@ -90,6 +99,7 @@ private:
 	int MAX_MESSAGE_WIDTH;
 	//ItemRenderer itemRenderer;
 	GuiMessageList guiMessages;
+	int chatScrollOffset;
 	Random random;

 	Minecraft* minecraft;
@@ -117,6 +127,8 @@ private:
 	static const float DropTicks;
 	float  _currentDropTicks;
 	int    _currentDropSlot;
+
+	bool   _openInventorySlot;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI__Gui_H__*/
--- a/src/client/gui/Screen.cpp
+++ b/src/client/gui/Screen.cpp
@@ -25,6 +25,12 @@ void Screen::render( int xm, int ym, float a )
 		Button* button = buttons[i];
 		button->render(minecraft, xm, ym);
 	}
+
+	// render any text boxes after buttons
+	for (unsigned int i = 0; i < textBoxes.size(); i++) {
+		TextBox* textbox = textBoxes[i];
+		textbox->render(minecraft, xm, ym);
+	}
 }

 void Screen::init( Minecraft* minecraft, int width, int height )
@@ -72,6 +78,14 @@ void Screen::updateEvents()
 void Screen::mouseEvent()
 {
 	const MouseAction& e = Mouse::getEvent();
+	// forward wheel events to subclasses
+	if (e.action == MouseAction::ACTION_WHEEL) {
+		int xm = e.x * width / minecraft->width;
+		int ym = e.y * height / minecraft->height - 1;
+		mouseWheel(e.dx, e.dy, xm, ym);
+		return;
+	}
+
 	if (!e.isButton())
 		return;

@@ -98,7 +112,7 @@ void Screen::keyboardEvent()
 }
 void Screen::keyboardTextEvent()
 {
-	keyboardNewChar(Keyboard::getChar());
+	charPressed(Keyboard::getChar());
 }
 void Screen::renderBackground()
 {
@@ -157,20 +171,28 @@ void Screen::keyPressed( int eventKey )
 		minecraft->setScreen(NULL);
 		//minecraft->grabMouse();
 	}
+
+	// pass key events to any text boxes first
+	for (auto& textbox : textBoxes) {
+		textbox->keyPressed(minecraft, eventKey);
+	}
+
+#ifdef TABBING
 	if (minecraft->useTouchscreen())
 		return;

+
 	// "Tabbing" the buttons (walking with keys)
 	const int tabButtonCount = tabButtons.size();
 	if (!tabButtonCount)
 		return;

 	Options& o = minecraft->options;
-	if (eventKey == o.keyMenuNext.key)
+	if (eventKey == o.getIntValue(OPTIONS_KEY_MENU_NEXT))
 		if (++tabButtonIndex == tabButtonCount) tabButtonIndex = 0;
-	if (eventKey == o.keyMenuPrevious.key)
+	if (eventKey == o.getIntValue(OPTIONS_KEY_MENU_PREV))
 		if (--tabButtonIndex == -1) tabButtonIndex = tabButtonCount-1;
-	if (eventKey == o.keyMenuOk.key) {
+	if (eventKey == o.getIntValue(OPTIONS_KEY_MENU_OK)) {
 		Button* button = tabButtons[tabButtonIndex];
 		if (button->active) {
 			minecraft->soundEngine->playUI("random.click", 1, 1);
@@ -179,15 +201,24 @@ void Screen::keyPressed( int eventKey )
 	}

 	updateTabButtonSelection();
+#endif
+}
+
+void Screen::charPressed(char inputChar) {
+	for (auto& textbox : textBoxes) {
+		textbox->charPressed(minecraft, 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 )
@@ -210,6 +241,11 @@ void Screen::mouseClicked( int x, int y, int buttonNum )
 			}
 		}
 	}
+
+	// let textboxes see the click regardless
+	for (auto& textbox : textBoxes) {
+		textbox->mouseClicked(minecraft, x, y, buttonNum);
+	}
 }

 void Screen::mouseReleased( int x, int y, int buttonNum )
--- a/src/client/gui/Screen.h
+++ b/src/client/gui/Screen.h
@@ -57,8 +57,11 @@ protected:
 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);

+	// mouse wheel movement (dx/dy are wheel deltas, xm/ym are GUI coords)
+	virtual void mouseWheel(int dx, int dy, int xm, int ym) {}
+
 	virtual void keyPressed(int eventKey);
-	virtual void keyboardNewChar(char inputChar) {}
+	virtual void charPressed(char inputChar);
 public:
 	int width;
 	int height;
--- a/src/client/gui/components/Button.cpp
+++ b/src/client/gui/components/Button.cpp
@@ -95,7 +95,7 @@ void Button::renderBg( Minecraft* minecraft, int xm, int ym )
 }

 bool Button::hovered(Minecraft* minecraft, int xm , int ym) {
-	return minecraft->useTouchscreen()? (_currentlyDown && isInside(xm, ym)) : false;
+	return minecraft->useTouchscreen()? (_currentlyDown && isInside(xm, ym)) : isInside(xm, ym);
 }

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

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

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

--- a/src/client/gui/components/GuiElement.h
+++ b/src/client/gui/components/GuiElement.h
@@ -9,13 +9,20 @@ class GuiElement : public GuiComponent {
 public:
 	GuiElement(bool active=false, bool visible=true, int x = 0, int y = 0, int width=24, int height=24);
    virtual ~GuiElement() {}
+    
 	virtual void tick(Minecraft* minecraft) {}
    virtual void render(Minecraft* minecraft, int xm, int ym) { }
 	virtual void setupPositions() {}
+
 	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {}
 	virtual void mouseReleased(Minecraft* minecraft, int x, int y, int buttonNum) {}
+	virtual void keyPressed(Minecraft* minecraft, int key) {}
+	virtual void charPressed(Minecraft* minecraft, char key) {}
+
 	virtual bool pointInside(int x, int y);
+	
 	void setVisible(bool visible);
+	
 	bool active;
 	bool visible;
 	int x;
--- a/src/client/gui/components/GuiElementContainer.cpp
+++ b/src/client/gui/components/GuiElementContainer.cpp
@@ -52,3 +52,15 @@ void GuiElementContainer::mouseReleased( Minecraft* minecraft, int x, int y, int
 		(*it)->mouseReleased(minecraft, x, y, buttonNum);
 	}
 }
+
+void GuiElementContainer::keyPressed(Minecraft* minecraft, int key) {
+	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
+		(*it)->keyPressed(minecraft, key);
+	}
+}
+
+void GuiElementContainer::charPressed(Minecraft* minecraft, char key) {
+	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
+		(*it)->charPressed(minecraft, key);
+	}
+}
--- a/src/client/gui/components/GuiElementContainer.h
+++ b/src/client/gui/components/GuiElementContainer.h
@@ -17,8 +17,9 @@ public:
 	virtual void tick( Minecraft* minecraft );

 	virtual void mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum );
-
 	virtual void mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum );
+	virtual void keyPressed(Minecraft* minecraft, int key);
+	virtual void charPressed(Minecraft* minecraft, char key);

 protected:
 	std::vector<GuiElement*> children;
--- a/src/client/gui/components/ImageButton.cpp
+++ b/src/client/gui/components/ImageButton.cpp
@@ -4,6 +4,7 @@
 #include "../../../platform/log.h"
 #include "../../../util/Mth.h"
 #include "../../renderer/Textures.h"
+#include <client/Option.h>


 ImageButton::ImageButton(int id, const std::string& msg)
@@ -41,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);
@@ -112,43 +113,17 @@ void ImageButton::render(Minecraft* minecraft, int xm, int ym) {
 //
 // A toggleable Button
 //
-OptionButton::OptionButton(const Options::Option* option)
-:	_option(option),
-	_isFloat(false),
-	super(ButtonId, "")
-{
-}
-
-OptionButton::OptionButton(const Options::Option* option, float onValue, float offValue)
-:	_option(option),
-	_isFloat(true),
-	_onValue(onValue),
-	_offValue(offValue),
-	super(ButtonId, "")
-{
-}
-
-bool OptionButton::isSecondImage(bool hovered) {
-	return _secondImage;
-}
+OptionButton::OptionButton(OptionId option) : m_optId(option), super(ButtonId, "") {}

 void OptionButton::toggle(Options* options) {
-	if (_isFloat) {
-		options->set(_option, (Mth::abs(_current - _onValue) < 0.01f) ? _offValue : _onValue);
-	} else {
-		options->toggle(_option, 1);
-	}
+	options->toggle(m_optId);
+
 	// Update graphics here
 	updateImage(options);
 }

 void OptionButton::updateImage(Options* options) {
-	if (_isFloat) {
-		_current = options->getProgressValue(_option);
-		_secondImage = Mth::abs(_current - _onValue) < 0.01f;
-	} else {
-		_secondImage = options->getBooleanValue(_option);
-	}
+	_secondImage = options->getBooleanValue(m_optId);
 }

 void OptionButton::mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum ) {
--- a/src/client/gui/components/ImageButton.h
+++ b/src/client/gui/components/ImageButton.h
@@ -77,28 +77,20 @@ class OptionButton: public ImageButton
 {
 	typedef ImageButton super;
 public:
-	OptionButton(const Options::Option* option);
-	OptionButton(const Options::Option* option, float onValue, float offValue);
+	OptionButton(OptionId optId);

 	void toggle(Options* options);
 	void updateImage(Options* options);

 	static const int ButtonId = 9999999;
 protected:
-	bool isSecondImage(bool hovered);
+	bool isSecondImage(bool hovered) { return _secondImage; }

 	virtual void mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum );

 private:
-
-	const Options::Option* _option;
+	OptionId m_optId;
 	bool _secondImage;
-
-	// If not float, it's considered to be a boolean value
-	bool _isFloat;
-	float _onValue;
-	float _offValue;
-	float _current;
 };


--- a/src/client/gui/components/KeyOption.cpp
+++ b/src/client/gui/components/KeyOption.cpp
@@ -0,0 +1,22 @@
+#include "KeyOption.h"
+#include <client/Minecraft.h>
+
+KeyOption::KeyOption(Minecraft* minecraft, OptionId optId) 
+    : Touch::TButton((int)optId, Keyboard::getKeyName(minecraft->options.getIntValue(optId))) {}
+
+
+void KeyOption::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+    selected = isInside(x, y);
+    msg = (selected)? "..." : Keyboard::getKeyName(minecraft->options.getIntValue((OptionId)id));
+}
+
+void KeyOption::keyPressed(Minecraft* minecraft, int key) {
+    if (!selected) return;
+
+    if (key != Keyboard::KEY_ESCAPE) {
+        minecraft->options.set((OptionId)id, key);
+    }
+
+    selected = false;
+    msg = Keyboard::getKeyName(minecraft->options.getIntValue((OptionId)id));
+}
--- a/src/client/gui/components/KeyOption.h
+++ b/src/client/gui/components/KeyOption.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "Button.h"
+#include <client/Options.h>
+
+class KeyOption : public Touch::TButton {
+public:
+    KeyOption(Minecraft* minecraft, OptionId optId);
+
+    virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+    virtual void released(int mx, int my) {}
+    virtual void keyPressed(Minecraft* minecraft, int key);
+protected:
+    bool m_captureMode;
+};
--- a/src/client/gui/components/LargeImageButton.cpp
+++ b/src/client/gui/components/LargeImageButton.cpp
@@ -33,7 +33,7 @@ void LargeImageButton::render(Minecraft* minecraft, int xm, int ym) {

 	//minecraft->textures->loadAndBindTexture("gui/gui.png");
 	glColor4f2(1, 1, 1, 1);
-	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : false);
+	bool hovered = active && (minecraft->useTouchscreen()? (_currentlyDown && xm >= x && ym >= y && xm < x + width && ym < y + height) : isInside(xm, ym));

 	//printf("ButtonId: %d - Hovered? %d (cause: %d, %d, %d, %d, <> %d, %d)\n", id, hovered, x, y, x+w, y+h, xm, ym);
 	//int yImage = getYImage(hovered || selected);
--- a/src/client/gui/components/OptionsGroup.cpp
+++ b/src/client/gui/components/OptionsGroup.cpp
@@ -4,13 +4,16 @@
 #include "OptionsItem.h"
 #include "Slider.h"
 #include "../../../locale/I18n.h"
+#include "TextOption.h"
+#include "KeyOption.h"
+
 OptionsGroup::OptionsGroup( std::string labelID )  {
 	label = I18n::get(labelID);
 }

 void OptionsGroup::setupPositions() {
 	// First we write the header and then we add the items
-	int curY = y + 10;
+	int curY = y + 18;
 	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it) {
 		(*it)->width = width - 5;
 		
@@ -23,46 +26,90 @@ void OptionsGroup::setupPositions() {
 }

 void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
-	minecraft->font->draw(label, (float)x + 2, (float)y, 0xffffffff, false);
+	float padX = 10.0f;
+	float padY = 5.0f;
+	
+	minecraft->font->draw(label, (float)x + padX, (float)y + padY, 0xffffffff, false);
+
 	super::render(minecraft, xm, ym);
 }

-OptionsGroup& OptionsGroup::addOptionItem( const Options::Option* option, Minecraft* minecraft ) {
-	if(option->isBoolean())
-		createToggle(option, minecraft);
-	else if(option->isProgress())
-		createProgressSlider(option, minecraft);
-	else if(option->isInt())
-		createStepSlider(option, minecraft);
+OptionsGroup& OptionsGroup::addOptionItem(OptionId optId, Minecraft* minecraft ) {
+	auto option = minecraft->options.getOpt(optId);
+
+	if (option == nullptr) return *this;
+
+	// TODO: do a options key class to check it faster via dynamic_cast
+	if (option->getStringId().find("options.key") != std::string::npos) createKey(optId, minecraft);
+	else if (dynamic_cast<OptionBool*>(option)) createToggle(optId, minecraft);
+	else if (dynamic_cast<OptionFloat*>(option)) createProgressSlider(optId, minecraft);
+	else if (dynamic_cast<OptionInt*>(option)) createStepSlider(optId, minecraft);
+	else if (dynamic_cast<OptionString*>(option)) createTextbox(optId, minecraft);
+
 	return *this;
 }

-void OptionsGroup::createToggle( const Options::Option* option, Minecraft* minecraft ) {
+// TODO: wrap this copypaste shit into templates
+
+void OptionsGroup::createToggle(OptionId optId, Minecraft* minecraft ) {
 	ImageDef def;
+
 	def.setSrc(IntRectangle(160, 206, 39, 20));
 	def.name = "gui/touchgui.png";
 	def.width = 39 * 0.7f;
 	def.height = 20 * 0.7f;
-	OptionButton* element = new OptionButton(option);
+	
+	OptionButton* element = new OptionButton(optId);
 	element->setImageDef(def, true);
-	std::string itemLabel = I18n::get(option->getCaptionId());
-	OptionsItem* item = new OptionsItem(itemLabel, element);
+	element->updateImage(&minecraft->options);
+	
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	
 	addChild(item);
 	setupPositions();
 }

-void OptionsGroup::createProgressSlider( const Options::Option* option, Minecraft* minecraft ) {
-	Slider* element = new Slider(minecraft,
-									option,
-									minecraft->options.getProgrssMin(option),
-									minecraft->options.getProgrssMax(option));
+void OptionsGroup::createProgressSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderFloat(minecraft, optId);
 	element->width = 100;
 	element->height = 20;
-	OptionsItem* item = new OptionsItem(label, element);
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
 	addChild(item);
 	setupPositions();
 }

-void OptionsGroup::createStepSlider( const Options::Option* option, Minecraft* minecraft ) {
-
+void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderInt(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createTextbox(OptionId optId, Minecraft* minecraft) {
+	TextBox* element = new TextOption(minecraft, optId);
+	element->width = 100;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
+}
+
+void OptionsGroup::createKey(OptionId optId, Minecraft* minecraft) {
+	KeyOption* element = new KeyOption(minecraft, optId);
+	element->width = 50;
+	element->height = 20;
+
+	std::string itemLabel = I18n::get(minecraft->options.getOpt(optId)->getStringId());
+	OptionsItem* item = new OptionsItem(optId, itemLabel, element);
+	addChild(item);
+	setupPositions();
 }
--- a/src/client/gui/components/OptionsGroup.h
+++ b/src/client/gui/components/OptionsGroup.h
@@ -5,6 +5,7 @@

 #include <string>
 #include "GuiElementContainer.h"
+#include "ScrollingPane.h"
 #include "../../Options.h"

 class Font;
@@ -16,11 +17,15 @@ public:
 	OptionsGroup(std::string labelID);
 	virtual void setupPositions();
 	virtual void render(Minecraft* minecraft, int xm, int ym);
-	virtual OptionsGroup& addOptionItem(const Options::Option* option, Minecraft* minecraft);
+	OptionsGroup& addOptionItem(OptionId optId, Minecraft* minecraft);
 protected:
-	virtual void createToggle(const Options::Option* option, Minecraft* minecraft);
-	virtual void createProgressSlider(const Options::Option* option, Minecraft* minecraft);
-	virtual void createStepSlider(const Options::Option* option, Minecraft* minecraft);
+
+	void createToggle(OptionId optId, Minecraft* minecraft);
+	void createProgressSlider(OptionId optId, Minecraft* minecraft);
+	void createStepSlider(OptionId optId, Minecraft* minecraft);
+	void createTextbox(OptionId optId, Minecraft* minecraft);
+	void createKey(OptionId optId, Minecraft* minecraft);
+
 	std::string label;
 };

--- a/src/client/gui/components/OptionsItem.cpp
+++ b/src/client/gui/components/OptionsItem.cpp
@@ -1,9 +1,11 @@
 #include "OptionsItem.h"
 #include "../../Minecraft.h"
+#include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
-OptionsItem::OptionsItem( std::string label, GuiElement* element )
+OptionsItem::OptionsItem( OptionId optionId, std::string label, GuiElement* element )
 : GuiElementContainer(false, true, 0, 0, 24, 12),
-  label(label) {
+  m_optionId(optionId),
+  m_label(label) {
 	  addChild(element);
 }

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

 void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 	int yOffset = (height - 8) / 2;
-	minecraft->font->draw(label, (float)x, (float)y + yOffset, 0x909090, false);
+	std::string text = m_label;
+	if (m_optionId == OPTIONS_GUI_SCALE) {
+		int value = minecraft->options.getIntValue(OPTIONS_GUI_SCALE);
+		std::string scaleText;
+		switch (value) {
+		case 0: scaleText = I18n::get("options.guiScale.auto"); break;
+		case 1: scaleText = I18n::get("options.guiScale.small"); break;
+		case 2: scaleText = I18n::get("options.guiScale.medium"); break;
+		case 3: scaleText = I18n::get("options.guiScale.large"); break;
+		case 4: scaleText = I18n::get("options.guiScale.larger"); break;
+		case 5: scaleText = I18n::get("options.guiScale.largest"); break;
+		default: scaleText = I18n::get("options.guiScale.auto"); break;
+		}
+		text += ": " + scaleText;
+	}
+
+	minecraft->font->draw(text, (float)x, (float)y + yOffset, 0x909090, false);
 	super::render(minecraft, xm, ym);
 }
--- a/src/client/gui/components/OptionsItem.h
+++ b/src/client/gui/components/OptionsItem.h
@@ -15,12 +15,13 @@ class OptionsItem: public GuiElementContainer
 {
 	typedef GuiElementContainer super;
 public:
-	OptionsItem(std::string label, GuiElement* element);
+	OptionsItem(OptionId optionId, std::string label, GuiElement* element);
 	virtual void render(Minecraft* minecraft, int xm, int ym);
 	void setupPositions();

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

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__*/
--- a/src/client/gui/components/OptionsPane.cpp
+++ b/src/client/gui/components/OptionsPane.cpp
@@ -4,6 +4,7 @@
 #include "ImageButton.h"
 #include "Slider.h"
 #include "../../Minecraft.h"
+#include "client/Options.h"

 OptionsPane::OptionsPane() {

@@ -28,37 +29,36 @@ OptionsGroup& OptionsPane::createOptionsGroup( std::string label ) {
 	return *newGroup;
 }

-void OptionsPane::createToggle( unsigned int group, std::string label, const Options::Option* option ) {
-// 	if(group > children.size()) return;
-// 	ImageDef def;
-// 	def.setSrc(IntRectangle(160, 206, 39, 20));
-// 	def.name = "gui/touchgui.png";
-// 	def.width = 39 * 0.7f;
-// 	def.height = 20 * 0.7f;
-// 	OptionButton* element = new OptionButton(option);
-// 	element->setImageDef(def, true);
-// 	OptionsItem* item = new OptionsItem(label, element);
-// 	((OptionsGroup*)children[group])->addChild(item);
-// 	setupPositions();
+void OptionsPane::createToggle( unsigned int group, std::string label, OptionId option ) {
+	if(group > children.size()) return;
+	ImageDef def;
+	def.setSrc(IntRectangle(160, 206, 39, 20));
+	def.name = "gui/touchgui.png";
+	def.width = 39 * 0.7f;
+	def.height = 20 * 0.7f;
+	OptionButton* element = new OptionButton(option);
+	element->setImageDef(def, true);
+	OptionsItem* item = new OptionsItem(option, label, element);
+	((OptionsGroup*)children[group])->addChild(item);
+	setupPositions();
 }

-void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) {
-// 	if(group > children.size()) return;
-// 	Slider* element = new Slider(minecraft, option, progressMin, progressMax);
-// 	element->width = 100;
-// 	element->height = 20;
-// 	OptionsItem* item = new OptionsItem(label, element);
-// 	((OptionsGroup*)children[group])->addChild(item);
-// 	setupPositions();
+void OptionsPane::createProgressSlider( Minecraft* minecraft, unsigned int group, std::string label, OptionId option, float progressMin/*=1.0f*/, float progressMax/*=1.0f */ ) {
+	if(group > children.size()) return;
+	Slider* element = new SliderFloat(minecraft, option);
+	element->width = 100;
+	element->height = 20;
+	OptionsItem* item = new OptionsItem(option, label, element);
+	((OptionsGroup*)children[group])->addChild(item);
+	setupPositions();
 }

-void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, const std::vector<int>& stepVec ) {
-// 	if(group > children.size()) return;
-// 	Slider* element = new Slider(minecraft, option, stepVec);
-// 	element->width = 100;
-// 	element->height = 20;
-// 	sliders.push_back(element);
-// 	OptionsItem* item = new OptionsItem(label, element);
-// 	((OptionsGroup*)children[group])->addChild(item);
-// 	setupPositions();
+void OptionsPane::createStepSlider( Minecraft* minecraft, unsigned int group, std::string label, OptionId option, const std::vector<int>& stepVec ) {
+	if(group > children.size()) return;
+	Slider* element = new SliderInt(minecraft, option);
+	element->width = 100;
+	element->height = 20;
+	OptionsItem* item = new OptionsItem(option, label, element);
+	((OptionsGroup*)children[group])->addChild(item);
+	setupPositions();
 }
--- a/src/client/gui/components/OptionsPane.h
+++ b/src/client/gui/components/OptionsPane.h
@@ -21,9 +21,9 @@ class OptionsPane: public GuiElementContainer
 public:
 	OptionsPane();
 	OptionsGroup& createOptionsGroup( std::string label );
-	void createToggle( unsigned int group, std::string label, const Options::Option* option );
-	void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, float progressMin=1.0f, float progressMax=1.0f );
-	void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, const Options::Option* option, const std::vector<int>& stepVec );
+	void createToggle( unsigned int group, std::string label, OptionId option );
+	void createProgressSlider(Minecraft* minecraft, unsigned int group, std::string label, OptionId option, float progressMin=1.0f, float progressMax=1.0f );
+	void createStepSlider(Minecraft* minecraft, unsigned int group, std::string label, OptionId option, const std::vector<int>& stepVec );
 	void setupPositions();
 };

--- a/src/client/gui/components/ScrollingPane.cpp
+++ b/src/client/gui/components/ScrollingPane.cpp
@@ -20,6 +20,9 @@ static const float kMinimumTrackingForDrag = 5;
 static const float kMinIndicatorLength = 34.0f / 3;
 static const float PKScrollIndicatorEndSize = 3;
 static const float PKScrollIndicatorThickness = 7.0f /3;
+static const float kWheelOverscrollMax = 80.0f;
+static const float kWheelOverscrollDamping = 0.6f;
+static const float kWheelOverscrollRestoreAlpha = 0.18f;

 ScrollingPane::ScrollingPane(
 		int optionFlags,
@@ -70,13 +73,19 @@ ScrollingPane::ScrollingPane(
 	}
 	//LOGI("%d, %d :: %d\n", bbox.w, itemBbox.w, this->columns);

-	rows = 1 + (numItems-1) / this->columns,
+	rows = 1 + (numItems-1) / this->columns;

 	/*
 	if (columns * itemBbox.w <= bbox.w) flags |= SF_LockX;
 	if (rows    * itemBbox.h <= bbox.h) flags |= SF_LockY;
 	*/

+	// initialize content bounds immediately
+	adjustContentSize();
+	minPoint.set((float)(this->size.w - this->adjustedContentSize.w), (float)(this->size.h - this->adjustedContentSize.h), 0);
+	this->snapContentOffsetToBounds(false);
+
+
 	dragDeltas.reserve(128);

 	te_moved = 0;
@@ -114,6 +123,34 @@ void ScrollingPane::tick() {
 		updateScrollFade(vScroll);
 		updateScrollFade(hScroll);
 	}
+
+	if (isNotSet(SF_HardLimits) && !Mouse::isButtonDown(MouseAction::ACTION_LEFT) && !dragging && !tracking && !decelerating) {
+		float targetX = _contentOffset.x;
+		float targetY = _contentOffset.y;
+		bool corrected = false;
+
+		if (targetX > 0.0f) {
+			targetX = Mth::lerp(targetX, 0.0f, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		} else if (targetX < minPoint.x) {
+			targetX = Mth::lerp(targetX, minPoint.x, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		}
+
+		if (targetY > 0.0f) {
+			targetY = Mth::lerp(targetY, 0.0f, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		} else if (targetY < minPoint.y) {
+			targetY = Mth::lerp(targetY, minPoint.y, kWheelOverscrollRestoreAlpha);
+			corrected = true;
+		}
+
+		if (corrected) {
+			if (Mth::abs(targetX - _contentOffset.x) < 0.25f) targetX = (targetX > 0.0f ? 0.0f : (targetX < minPoint.x ? minPoint.x : targetX));
+			if (Mth::abs(targetY - _contentOffset.y) < 0.25f) targetY = (targetY > 0.0f ? 0.0f : (targetY < minPoint.y ? minPoint.y : targetY));
+			setContentOffset(Vec3(targetX, targetY, 0));
+		}
+	}
 }

 bool ScrollingPane::getGridItemFor_slow(int itemIndex, GridItem& out) {
@@ -548,6 +585,42 @@ void ScrollingPane::stepThroughDecelerationAnimation(bool noAnimation) {
 	}
 }

+void ScrollingPane::scrollBy(float dx, float dy) {
+	// compute target content offset from wheel delta (in screen-space w/ opposite sign)
+	float targetX = _contentOffset.x - dx;
+	float targetY = _contentOffset.y - dy;
+
+	if (isSet(SF_LockX)) targetX = _contentOffset.x;
+	if (isSet(SF_LockY)) targetY = _contentOffset.y;
+
+	if (isSet(SF_HardLimits)) {
+		targetX = Mth::clamp(targetX, minPoint.x, 0.0f);
+		targetY = Mth::clamp(targetY, minPoint.y, 0.0f);
+	} else {
+		if (targetX > 0.0f) {
+			float overshoot = targetX;
+			overshoot = Mth::Min(overshoot, kWheelOverscrollMax);
+			targetX = overshoot * kWheelOverscrollDamping;
+		} else if (targetX < minPoint.x) {
+			float overshoot = targetX - minPoint.x;
+			overshoot = Mth::Max(overshoot, -kWheelOverscrollMax);
+			targetX = minPoint.x + overshoot * kWheelOverscrollDamping;
+		}
+
+		if (targetY > 0.0f) {
+			float overshoot = targetY;
+			overshoot = Mth::Min(overshoot, kWheelOverscrollMax);
+			targetY = overshoot * kWheelOverscrollDamping;
+		} else if (targetY < minPoint.y) {
+			float overshoot = targetY - minPoint.y;
+			overshoot = Mth::Max(overshoot, -kWheelOverscrollMax);
+			targetY = minPoint.y + overshoot * kWheelOverscrollDamping;
+		}
+	}
+
+	setContentOffset(Vec3(targetX, targetY, 0));
+}
+
 void ScrollingPane::setContentOffset(float x, float y) {
 	this->setContentOffsetWithAnimation(Vec3(x, y, 0), false);
 }
--- a/src/client/gui/components/ScrollingPane.h
+++ b/src/client/gui/components/ScrollingPane.h
@@ -51,6 +51,10 @@ public:
 	void tick();
 	void render(int xm, int ym, float alpha);

+	// scroll the content by the given amount (dx horizontal, dy vertical)
+	// positive values move content downward/rightward
+	void scrollBy(float dx, float dy);
+
 	bool getGridItemFor_slow(int itemIndex, GridItem& out);

 	void setSelected(int id, bool selected);
--- a/src/client/gui/components/Slider.cpp
+++ b/src/client/gui/components/Slider.cpp
@@ -2,38 +2,12 @@
 #include "../../Minecraft.h"
 #include "../../renderer/Textures.h"
 #include "../Screen.h"
+#include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
 #include <algorithm>
 #include <assert.h>
-Slider::Slider(Minecraft* minecraft, const Options::Option* option,  float progressMin, float progressMax)
-: sliderType(SliderProgress), mouseDownOnElement(false), option(option), numSteps(0), progressMin(progressMin), progressMax(progressMax) {
-	if(option != NULL) {
-		percentage = (minecraft->options.getProgressValue(option) - progressMin) / (progressMax - progressMin);
-	}
-}

-Slider::Slider(Minecraft* minecraft, const Options::Option* option, const std::vector<int>& stepVec )
-: sliderType(SliderStep),
-  curStepValue(0),
-  curStep(0),
-  sliderSteps(stepVec),
-  mouseDownOnElement(false),
-  option(option),
-  percentage(0),
-  progressMin(0.0f),
-  progressMax(1.0) {
-	assert(stepVec.size() > 1);
-	numSteps = sliderSteps.size();
-	if(option != NULL) {
-		curStepValue;
-		int curStep;
-		curStepValue = minecraft->options.getIntValue(option);
-		std::vector<int>::iterator currentItem = std::find(sliderSteps.begin(), sliderSteps.end(), curStepValue);
-		if(currentItem != sliderSteps.end()) {
-			curStep = currentItem - sliderSteps.begin();
-		}
-	}
-}
+Slider::Slider(OptionId optId) : m_mouseDownOnElement(false), m_optId(optId), m_numSteps(0) {}

 void Slider::render( Minecraft* minecraft, int xm, int ym ) {
 	int xSliderStart = x + 5;
@@ -45,56 +19,76 @@ void Slider::render( Minecraft* minecraft, int xm, int ym ) {
 	int barWidth = xSliderEnd - xSliderStart;
 	//fill(x, y + 8, x + (int)(width * percentage), y + height, 0xffff00ff);
 	fill(xSliderStart, ySliderStart, xSliderEnd, ySliderEnd, 0xff606060);
-	if(sliderType == SliderStep) {
-		int stepDistance = barWidth / (numSteps -1);
-		for(int a = 0; a <= numSteps - 1; ++a) {
+
+	if (m_numSteps > 2) {
+		int stepDistance = barWidth / (m_numSteps-1);
+		for(int a = 0; a < m_numSteps; ++a) {
 			int renderSliderStepPosX = xSliderStart + a * stepDistance + 1;
 			fill(renderSliderStepPosX - 1, ySliderStart - 2, renderSliderStepPosX + 1, ySliderEnd + 2, 0xff606060);
 		}
 	}
+
 	minecraft->textures->loadAndBindTexture("gui/touchgui.png");
-	blit(xSliderStart + (int)(percentage * barWidth) - handleSizeX / 2, y, 226, 126, handleSizeX, handleSizeY, handleSizeX, handleSizeY);
+	blit(xSliderStart + (int)(m_percentage * barWidth) - handleSizeX / 2, y, 226, 126, handleSizeX, handleSizeY, handleSizeX, handleSizeY);
 }

 void Slider::mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum ) {
 	if(pointInside(x, y)) {
-		mouseDownOnElement = true;
+		m_mouseDownOnElement = true;
 	}
 }

 void Slider::mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum ) {
-	mouseDownOnElement = false;
-	if(sliderType == SliderStep) {
-		curStep = Mth::floor((percentage * (numSteps-1) + 0.5f));
-		curStepValue = sliderSteps[Mth::Min(curStep, numSteps-1)];
-		percentage = float(curStep) / (numSteps - 1);
-		setOption(minecraft);
-	}
+	m_mouseDownOnElement = false;
 } 

 void Slider::tick(Minecraft* minecraft) {
 	if(minecraft->screen != NULL) {
 		int xm = Mouse::getX();
 		int ym = Mouse::getY();
+		
 		minecraft->screen->toGUICoordinate(xm, ym);
-		if(mouseDownOnElement) {
-			percentage = float(xm - x) / float(width);
-			percentage = Mth::clamp(percentage, 0.0f, 1.0f);
-			setOption(minecraft);
+
+		if(m_mouseDownOnElement) {
+			m_percentage = float(xm - x) / float(width);
+			m_percentage = Mth::clamp(m_percentage, 0.0f, 1.0f);
 		}
 	}
 }

-void Slider::setOption( Minecraft* minecraft ) {
-	if(option != NULL) {
-		if(sliderType == SliderStep) {
-			if(minecraft->options.getIntValue(option) != curStepValue) {
-				minecraft->options.set(option, curStepValue);
+SliderFloat::SliderFloat(Minecraft* minecraft, OptionId option) 
+: Slider(option), m_option(dynamic_cast<OptionFloat*>(minecraft->options.getOpt(option)))
+{
+	m_percentage = Mth::clamp((m_option->get() - m_option->getMin()) / (m_option->getMax() - m_option->getMin()), 0.f, 1.f);
 }
-		} else {
-			if(minecraft->options.getProgressValue(option) != percentage * (progressMax - progressMin) + progressMin) {
-				minecraft->options.set(option, percentage *  (progressMax - progressMin) + progressMin);
+
+SliderInt::SliderInt(Minecraft* minecraft, OptionId option) 
+: Slider(option), m_option(dynamic_cast<OptionInt*>(minecraft->options.getOpt(option)))
+{
+	m_numSteps = m_option->getMax() - m_option->getMin() + 1;
+	m_percentage = float(m_option->get() - m_option->getMin()) / (m_numSteps-1);
+}
+
+void SliderInt::render( Minecraft* minecraft, int xm, int ym ) {
+	Slider::render(minecraft, xm, ym);
+}
+
+void SliderInt::mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum ) {
+	Slider::mouseReleased(minecraft, x, y, buttonNum);
+
+	if (pointInside(x, y)) {
+		int curStep = int(m_percentage * (m_numSteps-1) + 0.5f);
+		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);
 	}
 }
+
+void SliderFloat::mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum ) {
+	Slider::mouseReleased(minecraft, x, y, buttonNum);
+
+	if (pointInside(x, y)) {
+		minecraft->options.set(m_optId, m_percentage * (m_option->getMax() - m_option->getMin()) + m_option->getMin());
 	}
 }
--- a/src/client/gui/components/Slider.h
+++ b/src/client/gui/components/Slider.h
@@ -3,38 +3,45 @@

 #include "GuiElement.h"
 #include "../../../client/Options.h"
-enum SliderType {
-	SliderProgress, // Sets slider between {0..1}
-	SliderStep // Uses the closest step
-};
+
 class Slider : public GuiElement {
 	typedef GuiElement super;
 public:
-	// Creates a progress slider with no steps
-	Slider(Minecraft* minecraft, const Options::Option* option, float progressMin, float progressMax);
-	Slider(Minecraft* minecraft, const Options::Option* option, const std::vector<int>& stepVec);
 	virtual void render( Minecraft* minecraft, int xm, int ym );
-
 	virtual void mouseClicked( Minecraft* minecraft, int x, int y, int buttonNum );
-
 	virtual void mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum );
-
 	virtual void tick(Minecraft* minecraft);

-private:
-	virtual void setOption(Minecraft* minecraft);
+protected:
+	Slider(OptionId optId);

-private:
-	SliderType sliderType;
-	std::vector<int> sliderSteps;
-	bool mouseDownOnElement;
-	float percentage;
-	int curStepValue;
-	int curStep;
-	int numSteps;
-	float progressMin;
-	float progressMax;
-	const Options::Option* option;
+	OptionId m_optId;
+
+	bool m_mouseDownOnElement;
+	float m_percentage;
+	int m_numSteps;
+};
+
+class SliderFloat : public Slider {
+public:
+	SliderFloat(Minecraft* minecraft, OptionId option);
+
+	virtual void mouseReleased( Minecraft* minecraft, int x, int y, int buttonNum ) override;	
+
+protected:
+	OptionFloat* m_option;
+};
+
+
+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:
+	OptionInt* m_option;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__Slider_H__*/
--- a/src/client/gui/components/SmallButton.cpp
+++ b/src/client/gui/components/SmallButton.cpp
@@ -12,13 +12,13 @@ SmallButton::SmallButton( int id, int x, int y, int width, int height, const std
 {
 }

-SmallButton::SmallButton( int id, int x, int y, Options::Option* item, const std::string& msg )
+SmallButton::SmallButton( int id, int x, int y, Option* item, const std::string& msg )
 :	super(id, x, y, 150, 20, msg),
 	option(item)
 {
 }

-Options::Option* SmallButton::getOption()
+Option* SmallButton::getOption()
 {
 	return option;
 }
--- a/src/client/gui/components/SmallButton.h
+++ b/src/client/gui/components/SmallButton.h
@@ -13,11 +13,11 @@ class SmallButton: public Button
 public:
    SmallButton(int id, int x, int y, const std::string& msg);
    SmallButton(int id, int x, int y, int width, int height, const std::string& msg);
-    SmallButton(int id, int x, int y, Options::Option* item, const std::string& msg);
+    SmallButton(int id, int x, int y, Option* item, const std::string& msg);

-    Options::Option* getOption();
+    Option* getOption();
 private:
-	Options::Option* option;
+	Option* option;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__*/
--- a/src/client/gui/components/TextBox.cpp
+++ b/src/client/gui/components/TextBox.cpp
@@ -1,37 +1,102 @@
 #include "TextBox.h"
+#include "../Gui.h"
 #include "../../Minecraft.h"
 #include "../../../AppPlatform.h"
-TextBox::TextBox( int id, const std::string& msg )
- : id(0), w(0), h(0), x(0), y(0), text(msg), focused(false) {
+#include "../../../platform/input/Mouse.h"

+// delegate constructors
+TextBox::TextBox(int id, const std::string& msg)
+ : TextBox(id, 0, 0, msg)
+{
 }

 TextBox::TextBox(int id, int x, int y, const std::string& msg)
- : id(id), w(0), h(0), x(x), y(y), text(msg), focused(false) {
-
+ : TextBox(id, x, y, 24, Font::DefaultLineHeight + 4, msg)
+{
 }

 TextBox::TextBox(int id, int x, int y, int w, int h, const std::string& msg)
- : id(id), w(w), h(h), x(x), y(y), text(msg) {
-
+ : GuiElement(true, true, x, y, w, h),
+   id(id), hint(msg), focused(false), blink(false), blinkTicks(0)
+{
 }

 void TextBox::setFocus(Minecraft* minecraft) {
    if (!focused) {
        minecraft->platform()->showKeyboard();
        focused = true;
+        blinkTicks = 0;
+        blink = false;
    }
 }

 bool TextBox::loseFocus(Minecraft* minecraft) {
    if (focused) {
-		minecraft->platform()->showKeyboard();
+        minecraft->platform()->hideKeyboard();
        focused = false;
        return true;
    }
    return false;
 }

-void TextBox::render( Minecraft* minecraft, int xm, int ym ) {
-	
+void TextBox::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
+    if (buttonNum == MouseAction::ACTION_LEFT) {
+        if (pointInside(x, y)) {
+            setFocus(minecraft);
+        } else {
+            loseFocus(minecraft);
+        }
+    }
+}
+
+void TextBox::charPressed(Minecraft* minecraft, char c)  {
+    if (focused && c >= 32 && c < 127 && (int)text.size() < 256) {
+        text.push_back(c);
+    }
+}
+
+void TextBox::keyPressed(Minecraft* minecraft, int key) {
+    if (focused && key == Keyboard::KEY_BACKSPACE && !text.empty()) {
+        text.pop_back();
+    }
+}
+
+void TextBox::tick(Minecraft* minecraft) {
+    blinkTicks++;
+    if (blinkTicks >= 5) {
+        blink = !blink;
+        blinkTicks = 0;
+    }
+}
+
+void TextBox::render(Minecraft* minecraft, int xm, int ym) {
+    // textbox like in beta 1.7.3
+    // change appearance when focused so the user can tell it's active
+    // active background darker gray with a subtle border
+    uint32_t bgColor = focused ? 0xffa0a0a0 : 0xffa0a0a0;
+    uint32_t borderColor = focused ? 0xff000000 : 0xff000000;
+    fill(x, y, x + width, y + height, bgColor);
+    fill(x + 1, y + 1, x + width - 1, y + height - 1, borderColor);
+
+    glEnable2(GL_SCISSOR_TEST);
+    glScissor(
+        Gui::GuiScale * (x + 2), 
+        minecraft->height - Gui::GuiScale * (y + height - 2), 
+        Gui::GuiScale * (width - 2), 
+        Gui::GuiScale * (height - 2)
+    );
+
+	int _y = y + (height - Font::DefaultLineHeight) / 2;
+
+    if (text.empty() && !focused) {
+        drawString(minecraft->font, hint, x + 2, _y, 0xff5e5e5e);
+    }
+
+    if (focused && blink) text.push_back('_');
+
+    drawString(minecraft->font, text, x + 2, _y, 0xffffffff);
+
+    if (focused && blink) text.pop_back();
+
+    glDisable2(GL_SCISSOR_TEST);
 }
--- a/src/client/gui/components/TextBox.h
+++ b/src/client/gui/components/TextBox.h
@@ -4,31 +4,41 @@
 //package net.minecraft.client.gui;

 #include <string>
-#include "../GuiComponent.h"
+#include "GuiElement.h"
 #include "../../Options.h"
+#include "../../../platform/input/Mouse.h"
+#include "../../../platform/input/Keyboard.h"

 class Font;
 class Minecraft;

-class TextBox: public GuiComponent
+class TextBox: public GuiElement
 {
 public:
 	TextBox(int id, const std::string& msg);
 	TextBox(int id, int x, int y, const std::string& msg);
 	TextBox(int id, int x, int y, int w, int h, const std::string& msg);

+	virtual void mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum);
+
 	virtual void setFocus(Minecraft* minecraft);
 	virtual bool loseFocus(Minecraft* minecraft);

 	virtual void render(Minecraft* minecraft, int xm, int ym);

-public:
-	int w, h;
-	int x, y;
+	virtual void keyPressed(Minecraft* minecraft, int key);
+	virtual void charPressed(Minecraft* minecraft, char c);
+	virtual void tick(Minecraft* minecraft);
 	
+public:
+	std::string hint;
 	std::string text;
 	int id;
+
+	int blinkTicks;
+
 	bool focused;
+	bool blink;
 };

 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__TextBox_H__*/
--- a/src/client/gui/components/TextOption.cpp
+++ b/src/client/gui/components/TextOption.cpp
@@ -0,0 +1,17 @@
+#include "TextOption.h"
+#include <client/Minecraft.h>
+
+TextOption::TextOption(Minecraft* minecraft, OptionId optId) 
+    : TextBox((int)optId, minecraft->options.getOpt(optId)->getStringId()) 
+{
+    text = minecraft->options.getStringValue(optId);
+}
+
+bool TextOption::loseFocus(Minecraft* minecraft) {
+    if (TextBox::loseFocus(minecraft)) {
+        minecraft->options.set((OptionId)id, text);
+        return true;
+    }
+
+    return false;
+}
--- a/src/client/gui/components/TextOption.h
+++ b/src/client/gui/components/TextOption.h
@@ -0,0 +1,10 @@
+#pragma once
+#include "TextBox.h"
+#include <client/Options.h>
+
+class TextOption : public TextBox {
+public:
+    TextOption(Minecraft* minecraft, OptionId optId);
+
+    virtual bool loseFocus(Minecraft* minecraft);
+};
--- a/src/client/gui/screens/BuyGameScreen.h
+++ b/src/client/gui/screens/BuyGameScreen.h
--- a/src/client/gui/screens/ConfirmScreen.cpp
+++ b/src/client/gui/screens/ConfirmScreen.cpp
@@ -31,7 +31,7 @@ ConfirmScreen::~ConfirmScreen() {

 void ConfirmScreen::init()
 {
-	if (minecraft->useTouchscreen()) {
+	if (/* minecraft->useTouchscreen() */ true) {
 		yesButton = new Touch::TButton(0, 0, 0, yesButtonText),
 		noButton  = new Touch::TButton(1, 0, 0, noButtonText);
 	} else {
--- a/src/client/gui/screens/ConfirmScreen.h
+++ b/src/client/gui/screens/ConfirmScreen.h
@@ -4,7 +4,6 @@
 //package net.minecraft.client.gui;

 #include "../Screen.h"
-#include "../components/SmallButton.h"
 #include <string>

 class ConfirmScreen: public Screen
--- a/src/client/gui/screens/ConsoleScreen.cpp
+++ b/src/client/gui/screens/ConsoleScreen.cpp
@@ -0,0 +1,220 @@
+#include "ConsoleScreen.h"
+#include "../Gui.h"
+#include "../../Minecraft.h"
+#include "../../player/LocalPlayer.h"
+#include "../../../platform/input/Keyboard.h"
+#include "../../../world/level/Level.h"
+#include "../../../network/RakNetInstance.h"
+#include "../../../network/ServerSideNetworkHandler.h"
+#include "../../../network/packet/ChatPacket.h"
+#include "../../../platform/log.h"
+
+#include <sstream>
+#include <cstdlib>
+#include <cctype>
+
+ConsoleScreen::ConsoleScreen()
+:   _input(""),
+    _cursorBlink(0)
+{
+}
+
+void ConsoleScreen::init()
+{
+}
+
+void ConsoleScreen::tick()
+{
+    _cursorBlink++;
+}
+
+bool ConsoleScreen::handleBackEvent(bool /*isDown*/)
+{
+    minecraft->setScreen(NULL);
+    return true;
+}
+
+void ConsoleScreen::keyPressed(int eventKey)
+{
+    if (eventKey == Keyboard::KEY_ESCAPE) {
+        minecraft->setScreen(NULL);
+    } else if (eventKey == Keyboard::KEY_RETURN) {
+        execute();
+    } else if (eventKey == Keyboard::KEY_BACKSPACE) {
+        if (!_input.empty())
+            _input.erase(_input.size() - 1, 1);
+    } else {
+        super::keyPressed(eventKey);
+    }
+}
+
+void ConsoleScreen::charPressed(char inputChar)
+{
+    if (inputChar >= 32 && inputChar < 127)
+        _input += inputChar;
+}
+
+// ---------------------------------------------------------------------------
+// execute: run _input as a command, print result, close screen
+// ---------------------------------------------------------------------------
+void ConsoleScreen::execute()
+{
+    if (_input.empty()) {
+        minecraft->setScreen(NULL);
+        return;
+    }
+
+    if (_input[0] == '/') {
+        // Command
+        std::string result = processCommand(_input);
+        if (!result.empty())
+            minecraft->gui.addMessage(result);
+    } else {
+        // Chat message: <name> message
+        std::string msg = std::string("<") + minecraft->player->name + "> " + _input;
+        if (minecraft->netCallback && minecraft->raknetInstance->isServer()) {
+            // Hosting a LAN game: displayGameMessage shows locally + broadcasts MessagePacket to clients
+            static_cast<ServerSideNetworkHandler*>(minecraft->netCallback)->displayGameMessage(msg);
+        } else if (minecraft->netCallback) {
+            // Connected client: send ChatPacket to server; server echoes it back as MessagePacket
+            ChatPacket chatPkt(msg);
+            minecraft->raknetInstance->send(chatPkt);
+        } else {
+            // Singleplayer: show locally only
+            minecraft->gui.addMessage(msg);
+        }
+    }
+
+    minecraft->setScreen(NULL);
+}
+
+// ---------------------------------------------------------------------------
+// processCommand
+// ---------------------------------------------------------------------------
+static std::string trim(const std::string& s) {
+    size_t a = s.find_first_not_of(" \t");
+    if (a == std::string::npos) return "";
+    size_t b = s.find_last_not_of(" \t");
+    return s.substr(a, b - a + 1);
+}
+
+std::string ConsoleScreen::processCommand(const std::string& raw)
+{
+    // strip leading '/'
+    std::string line = raw;
+    if (!line.empty() && line[0] == '/') line = line.substr(1);
+    line = trim(line);
+
+    // tokenise
+    std::vector<std::string> args;
+    {
+        std::istringstream ss(line);
+        std::string tok;
+        while (ss >> tok) args.push_back(tok);
+    }
+
+    if (args.empty()) return "";
+
+    Level* level = minecraft->level;
+    if (!level) return "No level loaded.";
+
+    // -----------------------------------------------------------------------
+    // /time ...
+    // -----------------------------------------------------------------------
+    if (args[0] == "time") {
+        if (args.size() < 2)
+            return "Usage: /time <add|set|query> ...";
+
+        const std::string& sub = args[1];
+
+        // -- time add <value> -----------------------------------------------
+        if (sub == "add") {
+            if (args.size() < 3) return "Usage: /time add <value>";
+            long delta = std::atol(args[2].c_str());
+            long newTime = level->getTime() + delta;
+            level->setTime(newTime);
+            std::ostringstream out;
+            out << "Set the time to " << (newTime % Level::TICKS_PER_DAY);
+            return out.str();
+        }
+
+        // -- time set <value|day|night|noon|midnight> -----------------------
+        if (sub == "set") {
+            if (args.size() < 3) return "Usage: /time set <value|day|night|noon|midnight>";
+            const std::string& val = args[2];
+
+            long t = -1;
+            if      (val == "day")      t = 1000;
+            else if (val == "noon")     t = 6000;
+            else if (val == "night")    t = 13000;
+            else if (val == "midnight") t = 18000;
+            else {
+                // numeric — accept positive integers only
+                bool numeric = true;
+                for (char c : val)
+                    if (!std::isdigit((unsigned char)c)) { numeric = false; break; }
+                if (!numeric) return std::string("Unknown value: ") + val;
+                t = std::atol(val.c_str());
+            }
+
+            // Preserve the total day count so only the time-of-day changes
+            long dayCount = level->getTime() / Level::TICKS_PER_DAY;
+            long newTime  = dayCount * Level::TICKS_PER_DAY + (t % Level::TICKS_PER_DAY);
+            level->setTime(newTime);
+            std::ostringstream out;
+            out << "Set the time to " << t;
+            return out.str();
+        }
+
+        // -- time query <daytime|gametime|day> ------------------------------
+        if (sub == "query") {
+            if (args.size() < 3) return "Usage: /time query <daytime|gametime|day>";
+            const std::string& what = args[2];
+
+            long total   = level->getTime();
+            long daytime = total % Level::TICKS_PER_DAY;
+            long day     = total / Level::TICKS_PER_DAY;
+
+            std::ostringstream out;
+            if      (what == "daytime")  { out << "The time of day is " << daytime; }
+            else if (what == "gametime") { out << "The game time is "   << total;   }
+            else if (what == "day")      { out << "The day is "         << day;     }
+            else return std::string("Unknown query: ") + what;
+            return out.str();
+        }
+
+        return "Unknown sub-command. Usage: /time <add|set|query> ...";
+    }
+
+    return std::string("Unknown command: /") + args[0];
+}
+
+// ---------------------------------------------------------------------------
+// render
+// ---------------------------------------------------------------------------
+void ConsoleScreen::render(int /*xm*/, int /*ym*/, float /*a*/)
+{
+    // Dim the game world slightly
+    fillGradient(0, 0, width, height, 0x00000000, 0x40000000);
+
+    const int boxH  = 12;
+    const int boxY  = height - boxH - 2;
+    const int boxX0 = 2;
+    const int boxX1 = width - 2;
+
+    // Input box background
+    fill(boxX0, boxY, boxX1, boxY + boxH, 0xc0000000);
+    // Border
+    fill(boxX0,     boxY,          boxX1, boxY + 1,   0xff808080);
+    fill(boxX0,     boxY + boxH - 1, boxX1, boxY + boxH, 0xff808080);
+    fill(boxX0,     boxY,          boxX0 + 1, boxY + boxH, 0xff808080);
+    fill(boxX1 - 1, boxY,          boxX1,     boxY + boxH, 0xff808080);
+
+    // Input text + blinking cursor
+    std::string displayed = _input;
+    if ((_cursorBlink / 10) % 2 == 0)
+        displayed += '_';
+
+    // Placeholder hint when empty
+    font->drawShadow(displayed, (float)(boxX0 + 2), (float)(boxY + 2), 0xffffffff);
+}
--- a/Show More
+++ b/Show More