Merge branch 'main' of https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1

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

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

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

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

@@ -0,0 +1,17 @@
+name: Setup Ninja
+description: Sets up Ninja
+
+inputs:
+  host:
+    description: 'Host platform: win, mac or linux'
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+  - name: Setup
+    shell: bash
+    run: |
+      curl -L https://github.com/ninja-build/ninja/releases/latest/download/ninja-${{ inputs.host }}.zip -o ninja.zip
+      7z x ninja.zip -o"$GITHUB_WORKSPACE/ninja"
+      echo "$GITHUB_WORKSPACE/ninja" >> $GITHUB_PATH

.github/workflows/build.yml

@@ -0,0 +1,280 @@
+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: Windows Build
+    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/glfw3.dll
+            ${{github.workspace}}/build/libpng16.dll
+            ${{github.workspace}}/build/OpenAL32.dll
+            ${{github.workspace}}/build/z.dll
+
+  build-linux:
+    name: Linux Build
+    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 APK (${{ 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
+
+  publish:
+    name: Publish
+    runs-on: ubuntu-latest
+    needs: [ build-windows, build-linux, build-android ]
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Declare Version Variables
+        id: ref
+        run: |
+          echo "version=$(cat VERSION | xargs)" >> $GITHUB_OUTPUT
+          echo "hash=$(git rev-parse --short "$GITHUB_SHA")" >> $GITHUB_OUTPUT
+
+      - name: Download Artifacts
+        uses: actions/download-artifact@v4
+
+      - name: Zip Windows Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: data mcpe-windows/MinecraftPE.exe mcpe-windows/glfw3.dll mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/z.dll
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
+
+      - name: Zip Linux Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: data mcpe-linux/MinecraftPE
+          dest: minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
+
+      - name: Zip Linux Server Artifacts
+        uses: vimtor/action-zip@v1.2
+        with:
+          files: mcpe-linux/MinecraftPE-server
+          dest: minecraftpe-server-${{ steps.ref.outputs.hash }}.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: 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: |
+            ./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

.gitignore

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

CMakeLists.txt

@@ -6,22 +6,91 @@ include(cmake/CPM.cmake)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(CMAKE_POLICY_VERSION_MINIMUM 3.10)
+
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(CMAKE_CXX_FLAGS "-Wno-c++11-narrowing -Wno-narrowing -Wno-invalid-source-encoding -Wno-reserved-user-defined-literal")
 endif()
+
+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()
+
+enum_option(PLATFORM "Desktop;Web" "Platform to build for.")
+
 find_package(Threads REQUIRED)
-CPMAddPackage("gh:madler/zlib@1.3.2")
-CPMAddPackage(
-    NAME "libpng"
-    GIT_REPOSITORY "https://github.com/pnggroup/libpng.git"
-    GIT_TAG "v1.6.55"
-    OPTIONS
-        "ZLIB_ROOT ${zlib_SOURCE_DIR}"
-        "ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
-        "PNG_TOOLS OFF"
-        "PNG_TESTS OFF"
-        "BUILD_SHARED_LIBS ON"
-)
+find_package(OpenSSL)
+
+if (${PLATFORM} STREQUAL "Desktop")
+    set(PLATFORM_CPP "PLATFORM_DESKTOP")
+
+    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_LINK_OPTIONS "-sUSE_LIBPNG=1"
+    )
+
+    add_library(glfw INTERFACE IMPORTED)
+    set_target_properties(glfw PROPERTIES
+        INTERFACE_LINK_OPTIONS "-sUSE_GLFW=3"
+    )
+else()
+    set(PNG_LIB png_shared)
+    set(AL_LIBTYPE "SHARED")
+
+    CPMAddPackage(
+        NAME "zlib"
+        GIT_REPOSITORY "https://github.com/madler/zlib"
+        GIT_TAG "v1.3.2"
+    )
+
+    CPMAddPackage(
+        NAME "libpng"
+        GIT_REPOSITORY "https://github.com/pnggroup/libpng.git"
+        GIT_TAG "v1.6.55"
+        OPTIONS
+            "ZLIB_ROOT ${zlib_SOURCE_DIR}"
+            "ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR}"
+            "PNG_TOOLS OFF"
+            "PNG_TESTS OFF"
+    )
+
+    CPMAddPackage(
+        NAME "glfw"
+        GIT_REPOSITORY "https://github.com/glfw/glfw.git"
+        GIT_TAG "3.4"
+        EXCLUDE_FROM_ALL TRUE
+        OPTIONS
+            "GLFW_BUILD_EXAMPLES OFF"
+            "GLFW_BUILD_TESTS OFF"
+            "GLFW_BUILD_DOCS OFF"
+    )
+endif()
 
 CPMAddPackage(
     NAME "openal"
@@ -31,21 +100,13 @@ CPMAddPackage(
         "ALSOFT_EXAMPLES OFF"
         "ALSOFT_TESTS OFF"
         "ALSOFT_UTILS OFF"
-        "BUILD_SHARED_LIBS ON"
+        "LIBTYPE ${AL_LIBTYPE}"
+        "ALSOFT_ENABLE_MODULES OFF"
 )
 
-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"
@@ -53,8 +114,10 @@ file(GLOB SERVER_SOURCES
     "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"
@@ -79,6 +142,8 @@ file(GLOB SERVER_SOURCES
     "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"
@@ -97,38 +162,15 @@ file(GLOB SERVER_SOURCES
 
     "src/world/Direction.cpp"
 
-    "src/world/entity/AgableMob.cpp"
-    "src/world/entity/Entity.cpp"
-    "src/world/entity/EntityFactory.cpp"
-    "src/world/entity/FlyingMob.cpp"
-    "src/world/entity/HangingEntity.cpp"
-    "src/world/entity/Mob.cpp"
-    "src/world/entity/MobCategory.cpp"
-    "src/world/entity/Motive.cpp"
-    "src/world/entity/Painting.cpp"
-    "src/world/entity/PathfinderMob.cpp"
-    "src/world/entity/SynchedEntityData.cpp"
+    "src/world/entity/*.cpp"
 
     "src/world/entity/ai/control/MoveControl.cpp"
 
-    "src/world/entity/animal/Animal.cpp"
-    "src/world/entity/animal/Chicken.cpp"
-    "src/world/entity/animal/Cow.cpp"
-    "src/world/entity/animal/Pig.cpp"
-    "src/world/entity/animal/Sheep.cpp"
-    "src/world/entity/animal/WaterAnimal.cpp"
+    "src/world/entity/animal/*.cpp"
 
-    "src/world/entity/item/FallingTile.cpp"
-    "src/world/entity/item/ItemEntity.cpp"
-    "src/world/entity/item/PrimedTnt.cpp"
-    "src/world/entity/item/TripodCamera.cpp"
+    "src/world/entity/item/*.cpp"
 
-    "src/world/entity/monster/Creeper.cpp"
-    "src/world/entity/monster/Monster.cpp"
-    "src/world/entity/monster/PigZombie.cpp"
-    "src/world/entity/monster/Skeleton.cpp"
-    "src/world/entity/monster/Spider.cpp"
-    "src/world/entity/monster/Zombie.cpp"
+    "src/world/entity/monster/*.cpp"
 
     "src/world/entity/player/Inventory.cpp"
     "src/world/entity/player/Player.cpp"
@@ -138,38 +180,10 @@ file(GLOB SERVER_SOURCES
 
     "src/world/food/SimpleFoodData.cpp"
 
-    "src/world/inventory/BaseContainerMenu.cpp"
-    "src/world/inventory/ContainerMenu.cpp"
-    "src/world/inventory/FillingContainer.cpp"
-    "src/world/inventory/FurnaceMenu.cpp"
-
-    "src/world/item/ArmorItem.cpp"
-    "src/world/item/BedItem.cpp"
-    "src/world/item/DyePowderItem.cpp"
-    "src/world/item/HangingEntityItem.cpp"
-    "src/world/item/HatchetItem.cpp"
-    "src/world/item/HoeItem.cpp"
-    "src/world/item/Item.cpp"
-    "src/world/item/ItemInstance.cpp"
-    "src/world/item/PickaxeItem.cpp"
-    "src/world/item/ShovelItem.cpp"
-
-    "src/world/item/crafting/ArmorRecipes.cpp"
-    "src/world/item/crafting/FurnaceRecipes.cpp"
-    "src/world/item/crafting/OreRecipes.cpp"
-    "src/world/item/crafting/Recipe.cpp"
-    "src/world/item/crafting/Recipes.cpp"
-    "src/world/item/crafting/StructureRecipes.cpp"
-    "src/world/item/crafting/ToolRecipes.cpp"
-    "src/world/item/crafting/WeaponRecipes.cpp"
-
-    "src/world/level/Explosion.cpp"
-    "src/world/level/Level.cpp"
-    "src/world/level/LightLayer.cpp"
-    "src/world/level/LightUpdate.cpp"
-    "src/world/level/MobSpawner.cpp"
-    "src/world/level/Region.cpp"
-    "src/world/level/TickNextTickData.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"
@@ -178,54 +192,21 @@ file(GLOB SERVER_SOURCES
 
     "src/world/level/dimension/Dimension.cpp"
 
-    "src/world/level/levelgen/CanyonFeature.cpp"
-    "src/world/level/levelgen/DungeonFeature.cpp"
-    "src/world/level/levelgen/LargeCaveFeature.cpp"
-    "src/world/level/levelgen/LargeFeature.cpp"
-    "src/world/level/levelgen/RandomLevelSource.cpp"
+    "src/world/level/levelgen/*.cpp"
     "src/world/level/levelgen/feature/Feature.cpp"
-    "src/world/level/levelgen/synth/ImprovedNoise.cpp"
-    "src/world/level/levelgen/synth/PerlinNoise.cpp"
-    "src/world/level/levelgen/synth/Synth.cpp"
+    "src/world/level/levelgen/synth/*.cpp"
 
     "src/world/level/material/Material.cpp"
 
     "src/world/level/pathfinder/Path.cpp"
 
-    "src/world/level/storage/ExternalFileLevelStorage.cpp"
-    "src/world/level/storage/ExternalFileLevelStorageSource.cpp"
-    "src/world/level/storage/FolderMethods.cpp"
-    "src/world/level/storage/LevelData.cpp"
-    "src/world/level/storage/LevelStorageSource.cpp"
-    "src/world/level/storage/RegionFile.cpp"
-
-    "src/world/level/tile/BedTile.cpp"
-    "src/world/level/tile/ChestTile.cpp"
-    "src/world/level/tile/CropTile.cpp"
-    "src/world/level/tile/DoorTile.cpp"
-    "src/world/level/tile/EntityTile.cpp"
-    "src/world/level/tile/FurnaceTile.cpp"
-    "src/world/level/tile/GrassTile.cpp"
-    "src/world/level/tile/HeavyTile.cpp"
-    "src/world/level/tile/LightGemTile.cpp"
-    "src/world/level/tile/MelonTile.cpp"
-    "src/world/level/tile/Mushroom.cpp"
-    "src/world/level/tile/NetherReactor.cpp"
-    "src/world/level/tile/NetherReactorPattern.cpp"
-    "src/world/level/tile/StairTile.cpp"
-    "src/world/level/tile/StemTile.cpp"
-    "src/world/level/tile/StoneSlabTile.cpp"
-    "src/world/level/tile/TallGrass.cpp"
-    "src/world/level/tile/Tile.cpp"
-    "src/world/level/tile/TrapDoorTile.cpp"
-    "src/world/level/tile/entity/ChestTileEntity.cpp"
-    "src/world/level/tile/entity/FurnaceTileEntity.cpp"
-    "src/world/level/tile/entity/NetherReactorTileEntity.cpp"
-    "src/world/level/tile/entity/SignTileEntity.cpp"
-    "src/world/level/tile/entity/TileEntity.cpp"
+    "src/world/level/storage/*.cpp"
+    "src/world/level/tile/*.cpp"
+    "src/world/level/tile/entity/*.cpp"
 
     "src/world/phys/HitResult.cpp"
 ) 
+
 file(GLOB CLIENT_SOURCES 
     "src/client/*.cpp"
 
@@ -302,46 +283,32 @@ file(GLOB CLIENT_SOURCES
     "src/SharedConstants.cpp"
     "src/main.cpp"
     "src/NinecraftApp.cpp"
+
+    "src/AppPlatform_glfw.cpp"
+    "src/main.cpp"
 )
 
-if(NOT DEFINED PLATFORM)
-    set(PLATFORM "PLATFORM_GLFW")
+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 CLIENT_SOURCES "src/AppPlatform_win32.cpp")
+    target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER" "SERVER_PROFILER")
+
+    target_include_directories("${PROJECT_NAME}-server" PUBLIC 
+        "${CMAKE_SOURCE_DIR}/src/"
+        "project/lib_projects/raknet/jni/RaknetSources"
+    )
+
+    target_link_libraries("${PROJECT_NAME}-server" ${CMAKE_THREAD_LIBS_INIT})
 endif()
 
-if(PLATFORM STREQUAL "PLATFORM_GLFW")
-    list(APPEND CLIENT_SOURCES "src/AppPlatform_glfw.cpp")
-endif()
-
-# Explicitly list files added after the initial glob so they are always included
-list(APPEND CLIENT_SOURCES
-    "src/client/gui/screens/ConsoleScreen.cpp"
-    "src/client/gui/screens/UsernameScreen.cpp"
-    "src/client/gui/screens/CreditsScreen.cpp"
-)
-
-add_executable(${PROJECT_NAME} 
-    ${CLIENT_SOURCES}
-    "glad/src/glad.c"
-)
-
-#add_executable("${PROJECT_NAME}-server"
-#    ${SERVER_SOURCES} 
-#)
-
-if(WIN32)
-    set(EXTRA_LIBS "ws2_32")
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "_CRT_SECURE_NO_WARNINGS")
-endif()
-
-if(PLATFORM STREQUAL "PLATFORM_WIN32" OR PLATFORM STREQUAL "PLATFORM_GLFW")
-    target_compile_definitions(${PROJECT_NAME} PUBLIC "PLATFORM_DESKTOP")
-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/"
@@ -351,30 +318,80 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     "lib/include"
 )
 
-# Server
-#target_link_libraries("${PROJECT_NAME}-server"     PRIVATE
-#    raknet ${CMAKE_THREAD_LIBS_INIT})
-#target_compile_definitions("${PROJECT_NAME}-server" PUBLIC "STANDALONE_SERVER")
+if(${PLATFORM} MATCHES "Web")
+    set(CMAKE_CXX_STANDARD 11)
+    # uuuh i hate it
+    set(EM_FLAGS "-pthread -sUSE_PTHREADS=1 -sSHARED_MEMORY=1")
     
-#target_include_directories("${PROJECT_NAME}-server" PUBLIC 
-#    "${CMAKE_SOURCE_DIR}/src/"
-#)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EM_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EM_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${EM_FLAGS} --preload-file ${CMAKE_SOURCE_DIR}/data@/data -sPROXY_TO_PTHREAD")
+
+    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 (NOT UNIX)
-add_custom_command(
-    TARGET ${PROJECT_NAME} 
-    POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}> $<TARGET_FILE_DIR:${PROJECT_NAME}> 
-        COMMAND_EXPAND_LISTS
-)
+if (OpenSSL_FOUND)
+    target_link_libraries(${PROJECT_NAME} OpenSSL::SSL OpenSSL::Crypto)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC HTTPCLIENT_USE_OPENSSL)
 endif()
 
-add_custom_command(
-    TARGET ${PROJECT_NAME} 
-    POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/data" $<TARGET_FILE_DIR:${PROJECT_NAME}>/data
-)
+if (NOT UNIX)
+    add_custom_command(
+        TARGET ${PROJECT_NAME} 
+        POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_RUNTIME_DLLS:${PROJECT_NAME}> $<TARGET_FILE_DIR:${PROJECT_NAME}> 
+            COMMAND_EXPAND_LISTS
+    )
+endif()
+
+if(NOT ${PLATFORM} MATCHES "Web")
+    add_custom_command(
+        TARGET ${PROJECT_NAME} 
+        POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_SOURCE_DIR}/data" $<TARGET_FILE_DIR:${PROJECT_NAME}>/data
+    )
+else()
+    add_custom_command(
+        TARGET ${PROJECT_NAME} 
+        POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/misc/web/index.html" $<TARGET_FILE_DIR:${PROJECT_NAME}>
+    )
+endif()
+
+message(STATUS "Compiling with the flags:")
+message(STATUS "  PLATFORM=" ${PLATFORM_CPP})

README.md

@@ -1,4 +1,7 @@
 # MinecraftPE
+> [!Warning]
+> Github repository **isnt main**. All issues and pull requests should be send in [Gitea Repository](https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1).
+
 > [!Important]
 > We have a discord server, where you can report bugs or send feedback https://discord.gg/c58YesBxve
 
@@ -14,9 +17,9 @@ This project aims to preserve and improve this early version of Minecraft PE.
     - [ ] Screen fixes
 - [ ] Rewrite platform logic
 - [x] Fix sound
-- [ ] Do a server connection GUI
+- [x] Do a server connection GUI
 - [ ] Controller support
-- [ ] Minecraft server hosting
+- [x] Minecraft server hosting
 - [x] Screen fixess
 - [x] Fix fog
 - [x] Add sprinting
@@ -27,11 +30,38 @@ This project aims to preserve and improve this early version of Minecraft PE.
 # 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
 ```
-mkdir build && cd build
 cmake .. -B .
-make -j4
+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**.  
@@ -40,17 +70,131 @@ make -j4
 4. Press **Run** (or F5) to build and launch the game.
 
 ## Android
-Download [r14b Android NDK](http://dl.google.com/android/repository/android-ndk-r14b-windows-x86_64.zip) and run `build.ps1`:
-```
+### 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 NDK recompile (Java/assets changed only)
-.\build.ps1 -NoJava
-
-# Skip Java recompile (C++ changed only)  
+# Skip C++ compilation (Java/assets changed only)
 .\build.ps1 -NoCpp
 
-# Only repackage + install (no recompile at all)
+# 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 . -G Ninja "-DCMAKE_TOOLCHAIN_FILE=$EMSDK/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+   cmake --build . --target MinecraftPE
+   ```
+   > [!Note]
+   > If you are using VSCode with CMake plugin, you can add Emscripten kit
+   > 1. Press Ctrl + Shift + P
+   > 2. Type `CMake: Edit User-Local CMake Kits` and hit Enter
+   > 3. Add this:
+      ```json
+      {
+         "name": "Emscripten",
+         "compilers": {
+            "C": "/usr/lib/emsdk/upstream/bin/clang",
+            "CXX": "/usr/lib/emsdk/upstream/bin/clang++"
+         },
+         "toolchainFile": "/usr/lib/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake"
+      }
+      ```
+3. Run game:
+   ```
+   emrun --port 8080 .
+   ```

build.ps1

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

build.sh

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

cmake/EnumOption.cmake

@@ -0,0 +1,9 @@
+macro(enum_option var values description)
+  set(${var}_VALUES ${values})
+  list(GET ${var}_VALUES 0 default)
+  set(${var} "${default}" CACHE STRING "${description}")
+  set_property(CACHE ${var} PROPERTY STRINGS ${${var}_VALUES})
+  if (NOT ";${${var}_VALUES};" MATCHES ";${${var}};")
+    message(FATAL_ERROR "Unknown value ${${var}}. Only -D${var}=${${var}_VALUES} allowed.")
+  endif()
+endmacro()

data/lang/en_US.lang

@@ -145,9 +145,15 @@ 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.autojump=Auto Jump
 options.thirdperson=Third Person
 options.servervisible=Server Visible
 options.sensitivity=Sensitivity
@@ -176,9 +182,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 options.guiScale.large=Large
 options.guiScale.larger=Larger
+options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended
@@ -187,6 +194,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
@@ -194,21 +210,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

misc/web/index.html

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

project/android/AndroidManifest.xml

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

project/android/assets/lang/en_US.lang

@@ -168,9 +168,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 options.guiScale.large=Large
 options.guiScale.larger=Larger
+options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended

project/android/jni/Android.mk

@@ -1,4 +1,6 @@
 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)
 
@@ -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,14 +38,14 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/client/gui/components/NinePatch.cpp \
 ../../../src/client/gui/components/OptionsGroup.cpp \
 ../../../src/client/gui/components/OptionsItem.cpp \
-../../../src/client/gui/components/OptionsPane.cpp \
+../../../src/client/gui/components/KeyOption.cpp \
+../../../src/client/gui/components/TextOption.cpp \
 ../../../src/client/gui/components/RolledSelectionListH.cpp \
 ../../../src/client/gui/components/RolledSelectionListV.cpp \
 ../../../src/client/gui/components/ScrolledSelectionList.cpp \
 ../../../src/client/gui/components/ScrollingPane.cpp \
 ../../../src/client/gui/components/Slider.cpp \
 ../../../src/client/gui/components/TextBox.cpp \
-../../../src/client/gui/components/SmallButton.cpp \
 ../../../src/client/gui/Font.cpp \
 ../../../src/client/gui/Gui.cpp \
 ../../../src/client/gui/GuiComponent.cpp \
@@ -253,7 +257,8 @@ LOCAL_SRC_FILES := ../../../src/main.cpp \
 ../../../src/world/phys/HitResult.cpp
 
 LOCAL_CFLAGS := -DPLATFORM_ANDROID -DPRE_ANDROID23 -Wno-narrowing $(LOCAL_CFLAGS)
-LOCAL_CPPFLAGS := -std=c++11
+LOCAL_CPPFLAGS := -std=c++14 -frtti
+LOCAL_CPPFLAGS += -frtti
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../src
 
 #LOCAL_CFLAGS := -DANDROID_PUBLISH -DDEMO_MODE $(LOCAL_CFLAGS)

project/android/jni/Application.mk

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

project/android_java/AndroidManifest.xml

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

project/android_java/assets/lang/en_US.lang

@@ -168,8 +168,10 @@ options.graphics.fast=Fast
 options.guiScale=GUI Scale
 options.guiScale.auto=Auto
 options.guiScale.small=Small
-options.guiScale.normal=Normal
+options.guiScale.medium=Medium
 options.guiScale.large=Large
+options.guiScale.larger=Larger
+options.guiScale.largest=Largest
 options.advancedOpengl=Advanced OpenGL
 options.renderClouds=Clouds
 options.farWarning1=A 64 bit Java installation is recommended

project/android_java/jni/Application.mk

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

project/android_java/src/com/mojang/minecraftpe/MainActivity.java

@@ -59,6 +59,7 @@ public class MainActivity extends Activity {
     private static final int PERMISSION_REQUEST_CODE = 123;
 
     private GLView _glView;
+    private boolean _nativeInitialized = false;
     public float invScale = 1.0f;// / 1.5f;
     private int _screenWidth = 0;
     private int _screenHeight = 0;
@@ -77,63 +78,48 @@ public class MainActivity extends Activity {
         _screenWidth = Math.max(_dm.widthPixels, _dm.heightPixels);
         _screenHeight = Math.min(_dm.widthPixels, _dm.heightPixels);
 
-        nativeOnCreate(_screenWidth, _screenHeight);
-
         _glView = new GLView(getApplication(), this);
         //_glView.setEGLConfigChooser(8, 8, 8, 8, 16, 0);
+
         _glView.setEGLConfigChooser(true);
         //_glView
 
-//        _glView.setEGLConfigChooser(
-//        	new GLSurfaceView.EGLConfigChooser() {
-//			
-//			@Override
-//			public EGLConfig chooseConfig(EGL10 egl, EGLDisplay display) {
-//				// TODO Auto-generated method stub
-//				
-//		        // Specify a configuration for our opengl session 
-//		         // and grab the first configuration that matches is 
-//		         int[] configSpec = { 
-//		                 EGL10.EGL_DEPTH_SIZE,   24, 
-//		                 EGL10.EGL_NONE 
-//		         }; 
-//		         EGLConfig[] configs = new EGLConfig[1]; 
-//		         int[] num_config = new int[1]; 
-//		         egl.eglChooseConfig(display, configSpec, configs, 1, num_config); 
-//		         EGLConfig config = configs[0];
-//		         return config;
-//				
-//				//return null;
-//			}
-//		} );
-
         _glView.commit();
-    	setContentView(_glView);
+        setContentView(_glView);
 
-    	_soundPlayer = new SoundPlayer(this, AudioManager.STREAM_MUSIC);
+        _soundPlayer = new SoundPlayer(this, AudioManager.STREAM_MUSIC);
 
-        // request dangerous permissions at runtime if necessary
         checkAndRequestPermissions();
+        initNative();
     }
 
-    private void checkAndRequestPermissions() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            boolean needRequest = false;
-            if (checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                needRequest = true;
-            }
-            if (checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE)
-                    != PackageManager.PERMISSION_GRANTED) {
-                needRequest = true;
-            }
-            if (needRequest) {
-                requestPermissions(new String[] {
-                        android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        android.Manifest.permission.READ_EXTERNAL_STORAGE
-                }, PERMISSION_REQUEST_CODE);
-            }
+    private void initNative() {
+        if (_nativeInitialized) {
+            return;
         }
+        _nativeInitialized = true;
+        nativeOnCreate(_screenWidth, _screenHeight);
+    }
+
+    // request dangerous permissions at runtime if necessary
+    private boolean checkAndRequestPermissions() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return true;
+        }
+
+        boolean writeGranted = checkSelfPermission(android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+        boolean readGranted = checkSelfPermission(android.Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
+
+        if (writeGranted && readGranted) {
+            return true;
+        }
+
+        requestPermissions(new String[] {
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            android.Manifest.permission.READ_EXTERNAL_STORAGE
+        }, PERMISSION_REQUEST_CODE);
+
+        return false;
     }
 
     @Override
@@ -146,8 +132,18 @@ public class MainActivity extends Activity {
                     break;
                 }
             }
-            if (!granted) {
-                // user denied; you might want to warn or close the app
+            if (granted) {
+                initNative();
+            } else {
+                // We can still run using app-specific external files in scoped-storage,
+                // so allow startup while warning the user.
+                initNative();
+                new AlertDialog.Builder(this)
+                    .setTitle("Storage permission recommended")
+                    .setMessage("MinecraftPE can still run with app-private storage, but public external save/load may require permission.")
+                    .setPositiveButton("OK", null)
+                    .setCancelable(true)
+                    .show();
             }
         }
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);

project/dedicated_server/CMakeLists.txt

@@ -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
@@ -155,5 +156,5 @@ set(CompileFiles ../../src/main.cpp
 add_executable(mcpe_server ${CompileFiles})
 target_link_libraries(mcpe_server raknet ${CMAKE_THREAD_LIBS_INIT})
 target_include_directories(mcpe_server PUBLIC
-    "minecraft-pe-0.6.1/src/"
+    "../../src/"
 )

project/lib_projects/raknet/jni/Android.mk

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

project/lib_projects/raknet/jni/RaknetSources/FileList.cpp

@@ -10,8 +10,8 @@
 #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
 
 

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

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

src/AppPlatform.h

@@ -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() {}
 	

src/AppPlatform_android.h

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

src/AppPlatform_glfw.cpp

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

src/AppPlatform_glfw.h

@@ -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>
@@ -11,6 +13,7 @@
 #include <sstream>
 #include <GLFW/glfw3.h>
 #include <ctime>
+#include "util/StringUtils.h"
 
 #ifdef _WIN32
 #include <windows.h>
@@ -28,7 +31,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();
@@ -45,7 +48,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
     }
 
@@ -53,61 +56,44 @@ 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_;
+								: filename_;
 		std::ifstream source(filename.c_str(), std::ios::binary);
 
-		if (source) {
-			png_structp pngPtr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-
-			if (!pngPtr)
-				return out;
-
-			png_infop infoPtr = png_create_info_struct(pngPtr);
-
-			if (!infoPtr) {
-				png_destroy_read_struct(&pngPtr, NULL, NULL);
-				return out;
-			}
-
-			// Hack to get around the broken libpng for windows
-			png_set_read_fn(pngPtr,(void*)&source, png_funcReadFile);
-
-			png_read_info(pngPtr, infoPtr);
-
-			// Set up the texdata properties
-			out.w = png_get_image_width(pngPtr, infoPtr);
-			out.h = png_get_image_height(pngPtr, infoPtr);
-
-			png_bytep* rowPtrs = new png_bytep[out.h];
-			out.data = new unsigned char[4 * out.w * out.h];
-			out.memoryHandledExternally = false;
-
-			int rowStrideBytes = 4 * out.w;
-			for (int i = 0; i < out.h; i++) {
-				rowPtrs[i] = (png_bytep)&out.data[i*rowStrideBytes];
-			}
-			png_read_image(pngPtr, rowPtrs);
-
-			// Teardown and return
-			png_destroy_read_struct(&pngPtr, &infoPtr,(png_infopp)0);
-			delete[] (png_bytep)rowPtrs;
-			source.close();
-
-			return out;
-		}
-		else
-		{
+		if (!source) {
 			LOGI("Couldn't find file: %s\n", filename.c_str());
 			return out;
 		}
+
+		std::vector<unsigned char> fileData((std::istreambuf_iterator<char>(source)), std::istreambuf_iterator<char>());
+		source.close();
+
+		if (fileData.empty()) {
+			LOGI("Couldn't read file: %s\n", filename.c_str());
+			return out;
+		}
+
+		return loadTextureFromMemory(fileData.data(), fileData.size());
     }
 
-    std::string getDateString(int s) {
+	TextureData loadTextureFromMemory(const unsigned char* data, size_t size) override {
+		return loadPngFromMemory(data, size);
+	}
+
+	virtual std::string getDateString(int s) override {
 		time_t tm = s;
 
 		char mbstr[100];
@@ -116,14 +102,19 @@ public:
 		return std::string(mbstr);
 	}
 
-	virtual int getScreenWidth() { return 854; };
-	virtual int getScreenHeight() { return 480; };
+	virtual int getScreenWidth() override { return 854; };
+	virtual int getScreenHeight() override { return 480; };
 
-	virtual float getPixelsPerMillimeter();
+	virtual float getPixelsPerMillimeter() override;
 
-	virtual bool supportsTouchscreen() { return true; }
+	virtual bool supportsTouchscreen() override { return true; }
 
-	virtual void openURL(const std::string& url) {
+	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__
@@ -132,10 +123,8 @@ public:
 #endif
 	}
 
+	GLFWwindow* window;
+
 private:
 };
-
-void* winGLLoader(const char* name);
-void glPatchDesktopCompat();
-
 #endif /*APPPLATFORM_GLFW_H__*/

src/AppPlatform_win32.h

@@ -3,8 +3,11 @@
 
 #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>
@@ -50,10 +53,19 @@ 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_
-											: filename_;
+								: filename_;
 		std::ifstream source(filename.c_str(), std::ios::binary);
 
 		if (source) {
@@ -102,7 +114,9 @@ public:
 		}
     }
 
-    std::string getDateString(int s) {
+	TextureData loadTextureFromMemory(const unsigned char* data, size_t size) override {
+		return loadPngFromMemory(data, size);
+	}
  		time_t tm = s;
 
 		char mbstr[100];

src/NinecraftApp.cpp

@@ -99,6 +99,9 @@ void NinecraftApp::init()
 	I18n::loadLanguage(platform(), "en_US");
 #endif
 
+	if (!externalStoragePath.empty()) {
+		options.setOptionsFilePath(externalStoragePath);
+	}
 	Minecraft::init();
 
 #if !defined(DEMO_MODE) && !defined(APPLE_DEMO_PROMOTION) && !defined(NO_STORAGE)
@@ -111,11 +114,12 @@ void NinecraftApp::init()
 #ifndef STANDALONE_SERVER
 	LOGI("This: %p\n", this);
 	screenChooser.setScreen(SCREEN_STARTMENU);
-	if (options.username.empty()) {
+
+	if (options.getBooleanValue(OPTIONS_FIRST_LAUNCH)) {
+		options.toggle(OPTIONS_FIRST_LAUNCH);
 		setScreen(new UsernameScreen());
 	}
 #else
-	user->name = "Server";
 	hostMultiplayer();
 #endif
 }
@@ -244,8 +248,9 @@ void NinecraftApp::initGLStates()
 	glCullFace(GL_BACK);
 
 	glEnable2(GL_TEXTURE_2D);
+#ifndef _EMSCRIPTEN_
 	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-
+#endif
 	// Both updates isPowerVR flag in java and returns if the graphics chip is PowerVR SGX or not
 	_powerVr = platform()->isPowerVR();
 #ifdef __APPLE__

src/client/KeyMapping.h

@@ -1,21 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT__KeyMapping_H__
-#define NET_MINECRAFT_CLIENT__KeyMapping_H__
-
-//package net.minecraft.client;
-#include <string>
-
-class KeyMapping
-{
-public:
-    std::string name;
-    int key;
-    
-	KeyMapping() {}
-
-    KeyMapping(const std::string& name_, int key_)
-	:	name(name_),
-		key(key_)
-    {}
-};
-
-#endif /*NET_MINECRAFT_CLIENT__KeyMapping_H__*/

src/client/Minecraft.cpp

@@ -1,5 +1,9 @@
 #include "Minecraft.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>
 
@@ -10,88 +14,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"
@@ -101,8 +53,42 @@
 #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"
+
 static void checkGlError(const char* tag) {
 #ifdef GLDEBUG
 	while (1) {
@@ -130,8 +116,7 @@ int Minecraft::customDebugId = Minecraft::CDI_NONE;
 
 bool Minecraft::useAmbientOcclusion = false;
 
-Minecraft::Minecraft()
-:	user(NULL),
+Minecraft::Minecraft() :	
 	level(NULL),
 	player(NULL),
 	cameraTargetPlayer(NULL),
@@ -189,7 +174,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
 
@@ -236,7 +221,6 @@ Minecraft::~Minecraft()
 	}
 
 	//delete player;
-	delete user;
 	delete inputHolder;
 
 	delete storageSource;
@@ -351,6 +335,7 @@ void Minecraft::leaveGame(bool renameLevel /*=false*/)
 
 	_running = false;
 #ifndef STANDALONE_SERVER
+	gui.clearMessages();
 	if (renameLevel) {
 		setScreen(new RenameMPLevelScreen(LevelStorageSource::TempLevelId));
 	}
@@ -451,20 +436,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);
 
@@ -491,7 +477,7 @@ 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();
@@ -559,7 +545,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");
@@ -589,7 +575,9 @@ void Minecraft::tick(int nTick, int maxTick) {
 		#endif
 	}
 	TIMER_POP_PUSH("particles");
-	particleEngine->tick();
+	if (!pause) {
+		particleEngine->tick();
+	}
 	if (screen) {
 		screenMutex = true;
 		screen->tick();
@@ -665,15 +653,20 @@ void Minecraft::tickInput() {
 		}
 
 		if (e.action == MouseAction::ACTION_WHEEL) {
-			Inventory* v = player->inventory;
+			// 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();
+				int numSlots = gui.getNumSlots();
 #ifndef PLATFORM_DESKTOP
-			numSlots--;
+				numSlots--;
 #endif
 
-			int slot = (v->selected - e.dy + numSlots) % numSlots;
-			v->selectSlot(slot);
+				int slot = (v->selected - e.dy + numSlots) % numSlots;
+				v->selectSlot(slot);
+			}
 		}
 		/*
 		if (mouseDiggable && options.useMouseForDigging) {
@@ -723,117 +716,121 @@ void Minecraft::tickInput() {
 				}
 			#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_T && level) {
 					setScreen(new ConsoleScreen());
 				}
-				if (!screen && key == Keyboard::KEY_O || key == 250) {
-					releaseMouse();
+
+				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)
 						printf("%d\t%f\n", i, noise.grad2(i, 3, 8));
 					*/
 				}
-			#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_L)
-					options.viewDistance = (options.viewDistance + 1) % 4;
-
-				if (key == Keyboard::KEY_U) {
-					onGraphicsReset();
-					player->heal(100);
-				}
-
-				if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
-					setIsCreativeMode(!isCreativeMode());
-
-				if (key == Keyboard::KEY_P) // Step forward in time
-					level->setTime( level->getTime() + 1000);
-
-				if (key == Keyboard::KEY_G) {
-					setScreen(new ArmorScreen());
-					/*
-					std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
-					LOGI("boxes: %d\n", (int)boxs.size());
-					*/
-				}
-
-				if (key == Keyboard::KEY_Y) {
-					textures->reloadAll();
-					player->hurtTo(2);
-				}
-				if (key == Keyboard::KEY_Z || key == 108) {
-					for (int i = 0; i < 1; ++i) {
-						Mob* mob = NULL;
-						int forceId = 0;//MobTypes::Sheep;
-
-						int types[] = {
-							MobTypes::Sheep,
-							MobTypes::Pig,
-							MobTypes::Chicken,
-							MobTypes::Cow,
-						};
-
-						int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
-						mob = MobFactory::CreateMob(mobType, level);
-
-						//((Animal*)mob)->setAge(-1000);
-						float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
-						float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
-						if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
-							delete mob;
+				#ifdef CHEATS
+					if (key == Keyboard::KEY_U) {
+						onGraphicsReset();
+						player->heal(100);
 					}
-				}
 
-				if (key == Keyboard::KEY_X) {
-					const EntityList& entities = level->getAllEntities();
-					for (int i = entities.size()-1; i >= 0; --i) {
-						Entity* e = entities[i];
-						if (!e->isPlayer())
-							level->removeEntity(e);
+					if (key == Keyboard::KEY_B || key == 108) // Toggle the game mode
+						setIsCreativeMode(!isCreativeMode());
+
+					if (key == Keyboard::KEY_P) // Step forward in time
+						level->setTime( level->getTime() + 1000);
+
+					if (key == Keyboard::KEY_G) {
+						setScreen(new ArmorScreen());
+						/*
+						std::vector<AABB>& boxs = level->getCubes(NULL, AABB(128.1f, 73, 128.1f, 128.9f, 74.9f, 128.9f));
+						LOGI("boxes: %d\n", (int)boxs.size());
+						*/
 					}
-				}
 
-				if (key == Keyboard::KEY_C /*|| key == 4*/) {
-					player->inventory->clearInventoryWithDefault();
-					// @todo: Add saving here for benchmarking
-				}
-				if (key == Keyboard::KEY_H) {
-					setScreen( new PrerenderTilesScreen() );
-				}
-
-				if (key == Keyboard::KEY_O) {
-					for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
-						if (player->inventory->getItem(i))
-							player->inventory->dropSlot(i, false);
-				}
-				if (key == Keyboard::KEY_F3) {
-					options.renderDebug = !options.renderDebug;
-				}
-				if (key == Keyboard::KEY_M) {
-					options.difficulty = (options.difficulty == Difficulty::PEACEFUL)?
-						Difficulty::NORMAL : Difficulty::PEACEFUL;
-					//setIsCreativeMode( !isCreativeMode() );
-				}
-
-				if (options.renderDebug) {
-					if (key >= '0' && key <= '9') {
-						_perfRenderer->debugFpsMeterKeyPress(key - '0');
+					if (key == Keyboard::KEY_Y) {
+						textures->reloadAll();
+						player->hurtTo(2);
 					}
-				}
+					if (key == Keyboard::KEY_Z || key == 108) {
+						for (int i = 0; i < 1; ++i) {
+							Mob* mob = NULL;
+							int forceId = 0;//MobTypes::Sheep;
+
+							int types[] = {
+								MobTypes::Sheep,
+								MobTypes::Pig,
+								MobTypes::Chicken,
+								MobTypes::Cow,
+							};
+
+							int mobType = (forceId > 0)? forceId : types[Mth::random(sizeof(types) / sizeof(int))];
+							mob = MobFactory::CreateMob(mobType, level);
+
+							//((Animal*)mob)->setAge(-1000);
+							float dx = 4 - 8 * Mth::random() + 4 * Mth::sin(Mth::DEGRAD * player->yRot);
+							float dz = 4 - 8 * Mth::random() + 4 * Mth::cos(Mth::DEGRAD * player->yRot);
+							if (mob && !MobSpawner::addMob(level, mob, player->x + dx, player->y, player->z + dz, Mth::random()*360, 0, true))
+								delete mob;
+						}
+					}
+
+					if (key == Keyboard::KEY_X) {
+						const EntityList& entities = level->getAllEntities();
+						for (int i = entities.size()-1; i >= 0; --i) {
+							Entity* e = entities[i];
+							if (!e->isPlayer())
+								level->removeEntity(e);
+						}
+					}
+
+					if (key == Keyboard::KEY_C /*|| key == 4*/) {
+						player->inventory->clearInventoryWithDefault();
+						// @todo: Add saving here for benchmarking
+					}
+					if (key == Keyboard::KEY_H) {
+						setScreen( new PrerenderTilesScreen() );
+					}
+
+					if (key == Keyboard::KEY_O) {
+						for (int i = Inventory::MAX_SELECTION_SIZE; i < player->inventory->getContainerSize(); ++i)
+							if (player->inventory->getItem(i))
+								player->inventory->dropSlot(i, false);
+					}
+					if (key == Keyboard::KEY_M) {
+						Difficulty difficulty = (Difficulty)options.getIntValue(OPTIONS_DIFFICULTY);
+						options.set(OPTIONS_DIFFICULTY, (difficulty == Difficulty::PEACEFUL)?
+							Difficulty::NORMAL : Difficulty::PEACEFUL);
+						//setIsCreativeMode( !isCreativeMode() );
+					}
+
+					if (options.getBooleanValue(OPTIONS_RENDER_DEBUG)) {
+						if (key >= '0' && key <= '9') {
+							_perfRenderer->debugFpsMeterKeyPress(key - '0');
+						}
+					}
+				#endif
 			#endif
 
 			#ifndef PLATFORM_DESKTOP
@@ -892,8 +889,6 @@ void Minecraft::tickInput() {
 		// USPESHNO spizheno
 		static int buildHoldTicks = 0;
 		if (Mouse::isButtonDown(MouseAction::ACTION_RIGHT)) {
-			BuildActionIntention bai(BuildActionIntention::BAI_BUILD | BuildActionIntention::BAI_INTERACT);
-			handleBuildAction(&bai);
 			if (buildHoldTicks >= 5) buildHoldTicks = 0;
 
 			if (++buildHoldTicks == 1) {
@@ -902,6 +897,7 @@ void Minecraft::tickInput() {
 			}
 		} else {
 			buildHoldTicks = 0;
+			gameMode->releaseUsingItem(player);
 		}
 	}
 
@@ -1018,6 +1014,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);
@@ -1070,6 +1077,8 @@ void Minecraft::setScreen( Screen* screen )
 
 		//noRender = false;
 	} else {
+		// Closing a screen and returning to the game should unpause.
+		pause = false;
 		grabMouse();
 	}
 #endif
@@ -1103,21 +1112,19 @@ bool Minecraft::useTouchscreen() {
 #ifdef 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());
@@ -1136,10 +1143,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) {
@@ -1149,14 +1156,17 @@ 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 (options.guiScale != 0) {
-		// manual selection: 1->small, 2->normal, 3->large, 4->larger
-		switch (options.guiScale) {
+	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; // bigger than large
+		case 4: Gui::GuiScale = 5.0f; break;
+		case 5: Gui::GuiScale = 6.0f; break;
 		default: Gui::GuiScale = 1.0f; break; // auto
 		}
 	} else {
@@ -1185,11 +1195,11 @@ void Minecraft::setSize(int w, int h) {
 	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(&Options::Option::PIXELS_PER_MILLIMETER);
+	// 	pixelCalc.setPixelsPerMillimeter(pixelsPerMillimeter);
+	// 	pixelCalcUi.setPixelsPerMillimeter(pixelsPerMillimeter * Gui::InvGuiScale);
+	// }
 
 	Config config = createConfig(this);
 	gui.onConfigChanged(config);
@@ -1210,16 +1220,16 @@ 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;
+	// TODO:
+	// user->name = options.username;
 
 	LOGI("Reloading-options\n");
 
@@ -1323,9 +1333,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
 }
@@ -1382,8 +1392,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);
@@ -1555,24 +1567,24 @@ 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);
 	}
 }
 
-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 ) {
-    if(option == &Options::Option::GUI_SCALE) {
+void Minecraft::optionUpdated(OptionId option, int value ) {
+    if(option == OPTIONS_GUI_SCALE) {
         // reapply screen scaling using current window size
         setSize(width, height);
     }

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;
@@ -117,9 +115,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 +164,6 @@ public:
 	int lastTickTime;
 	float ticksSinceLastUpdate;
 
-	User*  user;
 	Level* level;
 
 	LocalPlayer*	player;

src/client/MouseHandler.cpp

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

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

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

src/client/OptionStrings.cpp

@@ -6,13 +6,19 @@ 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_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";
+

src/client/OptionStrings.h

@@ -10,14 +10,27 @@ public:
     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;
     static const char* Controls_UseTouchScreen;
 	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__*/

src/client/Options.cpp

@@ -4,476 +4,299 @@
 #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;
-	vsync = true;
-	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 = "";
-	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);
 
-		keyMenuNext.key     = 20;
-		keyMenuPrevious.key = 19;
-		keyMenuOk.key       = 23;
-		keyMenuCancel.key   = 4;
+OptionBool useTouchscreen("useTouchscreen", true);
+
+OptionBool serverVisible("servervisible", true);
+
+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;
+
+	#if defined(PLATFORM_DESKTOP) || defined(RPI)
+		float sensitivity = sensitivityOpt.get();
+		sensitivity *= 0.4f;
+		sensitivityOpt.set(sensitivity);
 	#endif
-#endif
-#if defined(PLATFORM_DESKTOP) || defined(RPI)
-	sensitivity *= 0.4f;
-#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_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),
-	Options::Option::VSYNC               (20, "options.vsync",             false, true);
+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",
-	"options.guiScale.larger"
-};
+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);
+		// // Multiplayer
+		// // if (key == OptionStrings::Multiplayer_Username) username = value;
+		// if (key == OptionStrings::Multiplayer_ServerVisible) {
+		// 	m_options[OPTIONS_SERVER_VISIBLE] = readBool(value);
+		// }
 
-		// 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;
-			}
-		}
-		// Graphics extras
-		if (key == OptionStrings::Graphics_Vsync)
-			readBool(value, vsync);
-		if (key == OptionStrings::Graphics_GUIScale) {
-			int v;
-			if (readInt(value, v)) guiScale = v % 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;
-		}
+		// // 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::save() {
+	StringVector stringVec;
+	
+	for (auto& it : m_options) {
+		if (it) stringVec.push_back(it->serialize());
 	}
 
-#ifdef __APPLE__
-//    if (minecraft->isSuperFast()) {
-//        viewDistance = (viewDistance>0)? --viewDistance : 0;
-//    }
-//    LOGI("Is this card super fast?: %d\n", viewDistance);
-#endif
-    
-    //LOGI("Lefty is: %d\n", isLeftHanded);
-}
-
-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()
-{
-	StringVector stringVec;
-	// Login
-	addOptionToSaveOutput(stringVec, OptionStrings::Multiplayer_Username, username);
-	// 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);
-	addOptionToSaveOutput(stringVec, OptionStrings::Graphics_Vsync, vsync);
-	addOptionToSaveOutput(stringVec, OptionStrings::Graphics_GUIScale, guiScale);
-// 
-// 	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();
-	//}
 	optionsFile.save(stringVec);
 }
-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());
-}
-void Options::addOptionToSaveOutput(StringVector& stringVector, std::string name, const std::string& strValue) {
-	stringVector.push_back(name + ":" + strValue);
+
+void Options::setOptionsFilePath(const std::string& path) {
+	optionsFile.setOptionsPath(path + "/options.txt");
 }
 
-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;
+void Options::notifyOptionUpdate(OptionId key, bool value) {
+	minecraft->optionUpdated(key, value);
 }
 
-/*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::notifyOptionUpdate(OptionId key, float value) {
+	minecraft->optionUpdated(key, value);
 }
 
-/*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;
-}
-
-/*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( 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);
 }

src/client/Options.h

@@ -1,16 +1,92 @@
 #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,
+	// Should be last!
+	OPTIONS_COUNT
+};
 
 class Minecraft;
 typedef std::vector<std::string> StringVector;
@@ -18,320 +94,74 @@ typedef std::vector<std::string> StringVector;
 class Options
 {
 public:
-    class Option
-	{
-        const bool _isProgress;
-        const bool _isBoolean;
-        const std::string _captionId;
-		const int _ordinal;
+    static bool debugGl;
 
-	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 const Option VSYNC;
-
-		/*
-        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 vsync;
-    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();
 
-	}
-
-	void initDefaultValues();
-
-    std::string getKeyDescription(int i) {
-        //Language language = Language.getInstance();
-        //return language.getElement(keyMappings[i].name);
-		return "Options::getKeyDescription not implemented";
+    int getIntValue(OptionId key) {
+        auto option = opt<OptionInt>(key);
+        return (option)? option->get() : 0;
     }
 
-    std::string getKeyMessage(int i) {
-        //return Keyboard.getKeyName(keyMappings[i].key);
-		return "Options::getKeyMessage not implemented";
+    std::string getStringValue(OptionId key) {
+        auto option = opt<OptionString>(key);
+        return (option)? option->get() : "";
     }
 
-    void setKey(int i, int key) {
-        keyMappings[i]->key = key;
-        save();
+    float getProgressValue(OptionId key) {
+        auto option = opt<OptionFloat>(key);
+        return (option)? option->get() : 0.f;
     }
 
-    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);		save();    }
-	void set(const Option* item, int value) {
-		if(item == &Option::DIFFICULTY) {
-			difficulty = value;
-		} else if(item == &Option::GUI_SCALE) {
-			guiScale = value % 5;
-		}
-		notifyOptionUpdate(item, value);
-		save();
-	}
-
-    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) % 5;
-        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::VSYNC) vsync = !vsync;
-        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();
+    bool getBooleanValue(OptionId key) {
+        auto option = opt<OptionBool>(key);
+        return (option)? option->get() : false;
     }
 
-	int getIntValue(const Option* item) {
-		if(item == &Option::DIFFICULTY) return difficulty;
-		if(item == &Option::GUI_SCALE) return guiScale;
-		return 0;
-	}
-
-    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;
+    float getProgrssMin(OptionId key) {
+        auto option = opt<OptionFloat>(key);
+        return (option)? option->getMin() : 0.f;
     }
 
-    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::VSYNC)
-            return vsync;
-        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 getProgrssMax(OptionId key) {
+        auto option = opt<OptionFloat>(key);
+        return (option)? option->getMax() : 0.f;
+    }
 
-	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;
-	}
+    Option* getOpt(OptionId id) { return m_options[id]; }
 
-	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 addOptionToSaveOutput(StringVector& stringVector, std::string name, const std::string& strValue);
-	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__*/

src/client/OptionsFile.cpp

@@ -1,8 +1,16 @@
 #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";
@@ -13,18 +21,54 @@ OptionsFile::OptionsFile() {
 #endif
 }
 
-void OptionsFile::save(const StringVector& settings) {
-	FILE* pFile = fopen(settingsPath.c_str(), "w");
-	if(pFile != NULL) {
-		for(StringVector::const_iterator it = settings.begin(); it != settings.end(); ++it) {
-			fprintf(pFile, "%s\n", it->c_str());
-		}
-		fclose(pFile);
-	} else {
-		LOGI("OptionsFile::save failed to open '%s' for writing: %s", settingsPath.c_str(), strerror(errno));
-	}
+void OptionsFile::setOptionsPath(const std::string& path) {
+	settingsPath = path;
 }
 
+std::string OptionsFile::getOptionsPath() const {
+	return settingsPath;
+}
+void OptionsFile::save(const StringVector& settings) {
+    FILE* pFile = fopen(settingsPath.c_str(), "w");
+
+    if (!pFile && errno == ENOENT) {
+        std::string dir = settingsPath;
+        size_t fpos = dir.find_last_of("/\\");
+        if (fpos != std::string::npos) {
+            dir.resize(fpos);
+
+            std::string toCreate;
+            for (size_t i = 0; i <= dir.size(); ++i) {
+                if (i == dir.size() || dir[i] == '/' || dir[i] == '\\') {
+                    if (!toCreate.empty()) {
+#if defined(_WIN32)
+                        _mkdir(toCreate.c_str());
+#else
+                        mkdir(toCreate.c_str(), 0755);
+#endif
+                    }
+                }
+                if (i < dir.size())
+                    toCreate.push_back(dir[i]);
+            }
+        }
+
+        pFile = fopen(settingsPath.c_str(), "w");
+    }
+
+    if (!pFile) {
+        LOGI("OptionsFile::save failed: %s", strerror(errno));
+        return;
+    }
+
+    for (const auto& s : settings) {
+        fprintf(pFile, "%s\n", s.c_str());
+    }
+
+    fclose(pFile);
+}
+
+
 StringVector OptionsFile::getOptionStrings() {
 	StringVector returnVector;
 	FILE* pFile = fopen(settingsPath.c_str(), "r");
@@ -45,7 +89,8 @@ StringVector OptionsFile::getOptionStrings() {
 		}
 		fclose(pFile);
 	} else {
-		LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
+		if (errno != ENOENT)
+			LOGI("OptionsFile::getOptionStrings failed to open '%s' for reading: %s", settingsPath.c_str(), strerror(errno));
 	}
 	return returnVector;
 }

src/client/OptionsFile.h

@@ -11,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;

src/client/User.h

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

src/client/gamemode/CreativeMode.cpp

@@ -13,10 +13,10 @@
 #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)
+: 	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)
-	//{
-		;
-		destroyBlock(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 ) {

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)
-	//{
-		;
-		destroyBlock(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 ) {

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

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 {

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"
@@ -23,6 +26,8 @@
 #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;
@@ -36,6 +41,7 @@ Gui::Gui(Minecraft* minecraft)
 	progress(0),
 	overlayMessageTime(0),
 	animateOverlayMessageColor(false),
+	chatScrollOffset(0),
 	tbr(1),
 	_inventoryNeedsUpdate(true),
 	_flashSlotId(-1),
@@ -87,14 +93,16 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
     // F: 3
 	int ySlot = screenHeight - 16 - 3;
 
-	if (minecraft->gameMode->canHurtPlayer()) {
-		minecraft->textures->loadAndBindTexture("gui/icons.png");
-		Tesselator& t = Tesselator::instance;
-		t.beginOverride();
-		t.colorABGR(0xffffffff);
-		renderHearts();
-		renderBubbles();
-		t.endOverrideAndDraw();
+	if (!minecraft->options.getBooleanValue(OPTIONS_HIDEGUI)) {
+		if (minecraft->gameMode->canHurtPlayer()) {
+			minecraft->textures->loadAndBindTexture("gui/icons.png");
+			Tesselator& t = Tesselator::instance;
+			t.beginOverride();
+			t.colorABGR(0xffffffff);
+			renderHearts();
+			renderBubbles();
+			t.endOverrideAndDraw();
+		}
 	}
 
 	if(minecraft->player->getSleepTimer() > 0) {
@@ -106,23 +114,38 @@ 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);
 #endif
 #if defined(RPI)
 	renderDebugInfo();
-#elif defined(PLATFORM_DESKTOP)
-	if (minecraft->options.renderDebug)
-		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);
 }
@@ -201,6 +224,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)
@@ -219,12 +269,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++;
@@ -255,9 +322,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) {
@@ -350,9 +430,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);
@@ -402,7 +482,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);
@@ -516,7 +596,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);
@@ -585,11 +666,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) {
@@ -617,11 +701,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);
 		}
@@ -721,6 +809,85 @@ void Gui::renderDebugInfo() {
 	t.endOverrideAndDraw();
 }
 
+void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {
+	// only show when in game, no other screen
+	// if (!minecraft->level) return;
+
+	// only show the overlay while connected to a multiplayer server
+	Level* level = minecraft->level;
+	if (!level) return;
+	if (!level->isClientSide) return;
+
+	std::vector<std::string> playerNames;
+	playerNames.reserve(level->players.size());
+
+	for (Player* player : level->players) {
+		if (!player) continue;
+		playerNames.push_back(player->name);
+	}
+
+	// is this check needed? if there are no players, the box won't render at all since height will be 0, 
+	// but maybe we want to skip rendering entirely in that case
+	// if (playerNames.empty())
+	// 	return;
+
+	std::sort(playerNames.begin(), playerNames.end());
+
+	float maxNameWidth = 0.0f;
+	// find the longest name so we can size the box accordingly
+	for (const std::string& name : playerNames) {
+		float nameWidth = font->width(name);
+		if (nameWidth > maxNameWidth)
+			maxNameWidth = nameWidth;
+	}
+
+	// player count title
+	std::ostringstream titleStream;
+	titleStream << "Players (" << playerNames.size() << ")";
+	std::string titleText = titleStream.str();
+	float titleWidth = font->width(titleText);
+
+	if (titleWidth > maxNameWidth)
+		maxNameWidth = titleWidth;
+
+	const float padding = 4.0f;
+	const float lineHeight = (float)Font::DefaultLineHeight;
+
+	const float boxWidth = maxNameWidth + padding * 2;
+	const float boxHeight = (playerNames.size() + 1) * lineHeight + padding * 2;
+
+	const float boxLeft = (screenWidth - boxWidth) / 2.0f;
+	const float boxTop = 10.0f;
+	const float boxRight = boxLeft + boxWidth;
+	const float boxBottom = boxTop + boxHeight;
+
+	fill(boxLeft, boxTop, boxRight, boxBottom, 0x90000000);
+
+	float titleX = (screenWidth - titleWidth) / 2.0f;
+	float titleY = boxTop + padding;
+
+	// scale the text down slightly
+	// i think the gl scaling is the best for this
+	// oh my god this looks really bad OH GOD
+	//const float textScale = 0.8f;
+	//const float invTextScale = 1.0f / textScale;
+	//glPushMatrix2();
+	//glScalef2(textScale, textScale, 1);
+
+	// draw title
+	//font->draw(titleText, titleX * invTextScale, titleY * invTextScale, 0xFFFFFFFF);
+	font->draw(titleText, titleX, titleY, 0xFFFFFFFF);
+
+	// draw player names
+	// we should add ping icons here eventually, but for now just show names
+	float currentY = boxTop + padding + lineHeight;
+	for (const std::string& name : playerNames) {
+		font->draw(name, (boxLeft + padding), currentY, 0xFFDDDDDD);
+		currentY += lineHeight;
+	}
+	//glPopMatrix2();
+}
+
 void Gui::renderSleepAnimation( const int screenWidth, const int screenHeight ) {
 	int timer = minecraft->player->getSleepTimer();
 	float amount = (float) timer / (float) Player::SLEEP_DURATION;
@@ -830,9 +997,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;
@@ -844,18 +1018,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);
 
 				// 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);
+			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);
 			}
 		}
 	}

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);
@@ -60,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();
@@ -96,6 +99,7 @@ private:
 	int MAX_MESSAGE_WIDTH;
 	//ItemRenderer itemRenderer;
 	GuiMessageList guiMessages;
+	int chatScrollOffset;
 	Random random;
 
 	Minecraft* minecraft;

src/client/gui/Screen.cpp

@@ -78,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;
 
@@ -104,7 +112,7 @@ void Screen::keyboardEvent()
 }
 void Screen::keyboardTextEvent()
 {
-	keyboardNewChar(Keyboard::getChar());
+	charPressed(Keyboard::getChar());
 }
 void Screen::renderBackground()
 {
@@ -166,7 +174,7 @@ void Screen::keyPressed( int eventKey )
 
 	// pass key events to any text boxes first
 	for (auto& textbox : textBoxes) {
-		textbox->handleKey(eventKey);
+		textbox->keyPressed(minecraft, eventKey);
 	}
 
 	if (minecraft->useTouchscreen())
@@ -178,11 +186,11 @@ void Screen::keyPressed( int eventKey )
 		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);
@@ -193,6 +201,12 @@ void Screen::keyPressed( int eventKey )
 	updateTabButtonSelection();
 }
 
+void Screen::charPressed(char inputChar) {
+	for (auto& textbox : textBoxes) {
+		textbox->charPressed(minecraft, inputChar);
+	}
+}
+
 void Screen::updateTabButtonSelection()
 {
 	if (minecraft->useTouchscreen())

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;

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

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

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;

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

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

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

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

src/client/gui/components/OptionsGroup.cpp

@@ -4,6 +4,9 @@
 #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);
 }
@@ -25,74 +28,88 @@ void OptionsGroup::setupPositions() {
 void OptionsGroup::render( Minecraft* minecraft, int xm, int ym ) {
 	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);
 	element->updateImage(&minecraft->options);
-	std::string itemLabel = I18n::get(option->getCaptionId());
-	OptionsItem* item = new OptionsItem(itemLabel, element);
+	
+	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;
-	std::string itemLabel = I18n::get(option->getCaptionId());
-	OptionsItem* item = new OptionsItem(itemLabel, 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 ) {
-	// integer-valued option; use step slider
-	std::vector<int> steps;
-	// render distance was removed; fall through to other cases
-	if(option == &Options::Option::DIFFICULTY) {
-		steps.push_back(0);
-		steps.push_back(1);
-		steps.push_back(2);
-		steps.push_back(3);
-	} else if(option == &Options::Option::GUI_SCALE) {
-		// slider order: small,normal,large,larger,auto
-		steps.push_back(1);
-		steps.push_back(2);
-		steps.push_back(3);
-		steps.push_back(4);
-		steps.push_back(0);
-	} else {
-		// fallback: use single value; duplicate so numSteps>1 and avoid divide-by-zero
-		steps.push_back(0);
-		steps.push_back(0);
-	}
-	Slider* element = new Slider(minecraft, option, steps);
+void OptionsGroup::createStepSlider(OptionId optId, Minecraft* minecraft ) {
+	Slider* element = new SliderInt(minecraft, optId);
 	element->width = 100;
 	element->height = 20;
-	std::string itemLabel = I18n::get(option->getCaptionId());
-	OptionsItem* item = new OptionsItem(itemLabel, element);
+	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();
 }

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

src/client/gui/components/OptionsItem.cpp

@@ -1,9 +1,11 @@
 #include "OptionsItem.h"
 #include "../../Minecraft.h"
+#include "../../../locale/I18n.h"
 #include "../../../util/Mth.h"
-OptionsItem::OptionsItem( std::string label, GuiElement* element )
+OptionsItem::OptionsItem( OptionId optionId, std::string label, GuiElement* element )
 : GuiElementContainer(false, true, 0, 0, 24, 12),
-  label(label) {
+  m_optionId(optionId),
+  m_label(label) {
 	  addChild(element);
 }
 
@@ -19,6 +21,22 @@ void OptionsItem::setupPositions() {
 
 void OptionsItem::render( Minecraft* minecraft, int xm, int ym ) {
 	int yOffset = (height - 8) / 2;
-	minecraft->font->draw(label, (float)x, (float)y + yOffset, 0x909090, false);
+	std::string text = m_label;
+	if (m_optionId == OPTIONS_GUI_SCALE) {
+		int value = minecraft->options.getIntValue(OPTIONS_GUI_SCALE);
+		std::string scaleText;
+		switch (value) {
+		case 0: scaleText = I18n::get("options.guiScale.auto"); break;
+		case 1: scaleText = I18n::get("options.guiScale.small"); break;
+		case 2: scaleText = I18n::get("options.guiScale.medium"); break;
+		case 3: scaleText = I18n::get("options.guiScale.large"); break;
+		case 4: scaleText = I18n::get("options.guiScale.larger"); break;
+		case 5: scaleText = I18n::get("options.guiScale.largest"); break;
+		default: scaleText = I18n::get("options.guiScale.auto"); break;
+		}
+		text += ": " + scaleText;
+	}
+
+	minecraft->font->draw(text, (float)x, (float)y + yOffset, 0x909090, false);
 	super::render(minecraft, xm, ym);
 }

src/client/gui/components/OptionsItem.h

@@ -15,12 +15,13 @@ class OptionsItem: public GuiElementContainer
 {
 	typedef GuiElementContainer super;
 public:
-	OptionsItem(std::string label, GuiElement* element);
+	OptionsItem(OptionId optionId, std::string label, GuiElement* element);
 	virtual void render(Minecraft* minecraft, int xm, int ym);
 	void setupPositions();
 
 private:
-	std::string label;
+	OptionId m_optionId;
+	std::string m_label;
 };
 
 #endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__OptionsItem_H__*/

src/client/gui/components/OptionsPane.cpp

@@ -1,64 +0,0 @@
-#include "OptionsPane.h"
-#include "OptionsGroup.h"
-#include "OptionsItem.h"
-#include "ImageButton.h"
-#include "Slider.h"
-#include "../../Minecraft.h"
-
-OptionsPane::OptionsPane() {
-
-}
-
-void OptionsPane::setupPositions() {
-	int currentHeight = y + 1;
-	for(std::vector<GuiElement*>::iterator it = children.begin(); it != children.end(); ++it ) {
-		(*it)->width = width;
-		(*it)->y = currentHeight;
-		(*it)->x = x;
-		currentHeight += (*it)->height + 1;
-	}
-	height = currentHeight;
-	super::setupPositions();
-}
-
-OptionsGroup& OptionsPane::createOptionsGroup( std::string label ) {
-	OptionsGroup* newGroup = new OptionsGroup(label);
-	children.push_back(newGroup);
-	// create and return a new group index
-	return *newGroup;
-}
-
-void OptionsPane::createToggle( unsigned int group, std::string label, 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::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::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();
-}

src/client/gui/components/OptionsPane.h

@@ -1,30 +0,0 @@
-#ifndef ITEMPANE_H__
-#define ITEMPANE_H__
-
-#include <string>
-#include <vector>
-#include "GuiElementContainer.h"
-#include "../../../world/item/ItemInstance.h"
-#include "../../../client/Options.h"
-class Font; 
-class Textures;
-class NinePatchLayer;
-class ItemPane;
-class OptionButton;
-class Button;
-class OptionsGroup;
-class Slider;
-class Minecraft;
-class OptionsPane: public GuiElementContainer
-{
-	typedef GuiElementContainer super;
-public:
-	OptionsPane();
-	OptionsGroup& createOptionsGroup( std::string label );
-	void createToggle( unsigned int group, std::string label, 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 setupPositions();
-};
-
-#endif /*ITEMPANE_H__*/

src/client/gui/components/ScrollingPane.cpp

@@ -548,6 +548,14 @@ void ScrollingPane::stepThroughDecelerationAnimation(bool noAnimation) {
 	}
 }
 
+void ScrollingPane::scrollBy(float dx, float dy) {
+	// adjust the translation offsets fpx/fpy by the requested amount
+	float nfpx = fpx + dx;
+	float nfpy = fpy + dy;
+	// convert back to content offset (fpx = -contentOffset.x)
+	setContentOffset(Vec3(-nfpx, -nfpy, 0));
+}
+
 void ScrollingPane::setContentOffset(float x, float y) {
 	this->setContentOffsetWithAnimation(Vec3(x, y, 0), false);
 }

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

src/client/gui/components/Slider.cpp

@@ -2,42 +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) {
-		// initialize slider position based on the current option value
-		curStepValue = minecraft->options.getIntValue(option);
-		auto currentItem = std::find(sliderSteps.begin(), sliderSteps.end(), curStepValue);
-		if(currentItem != sliderSteps.end()) {
-			curStep = static_cast<int>(currentItem - sliderSteps.begin());
-		} else {
-			// fallback to first step
-			curStep = 0;
-			curStepValue = sliderSteps[0];
-		}
-		percentage = float(curStep) / float(numSteps - 1);
-	}
-}
+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;
@@ -49,61 +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) {
-		// numSteps should be >=2; protect against bad input (zero division)
-		if(numSteps <= 1) {
-			// nothing to render
-		} else {
-			int stepDistance = barWidth / (numSteps -1);
-			for(int a = 0; a <= numSteps - 1; ++a) {
-				int renderSliderStepPosX = xSliderStart + a * stepDistance + 1;
-				fill(renderSliderStepPosX - 1, ySliderStart - 2, renderSliderStepPosX + 1, ySliderEnd + 2, 0xff606060);
-			}
+
+	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);
-			}
-		} else {
-			if(minecraft->options.getProgressValue(option) != percentage * (progressMax - progressMin) + progressMin) {
-				minecraft->options.set(option, percentage *  (progressMax - progressMin) + progressMin);
-			}
-		}
+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);
+}
+
+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());
 	}
 }

src/client/gui/components/Slider.h

@@ -3,38 +3,46 @@
 
 #include "GuiElement.h"
 #include "../../../client/Options.h"
-enum SliderType {
-	SliderProgress, // Sets slider between {0..1}
-	SliderStep // Uses the closest step
-};
+#include <client/Option.h>
+
 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__*/

src/client/gui/components/SmallButton.cpp

@@ -1,24 +0,0 @@
-#include "SmallButton.h"
-
-SmallButton::SmallButton( int id, int x, int y, const std::string& msg )
-:	super(id, x, y, 150, 20, msg),
-	option(NULL)
-{
-}
-
-SmallButton::SmallButton( int id, int x, int y, int width, int height, const std::string& msg )
-:	super(id, x, y, width, height, msg),
-	option(NULL)
-{
-}
-
-SmallButton::SmallButton( int id, int x, int y, Options::Option* item, const std::string& msg )
-:	super(id, x, y, 150, 20, msg),
-	option(item)
-{
-}
-
-Options::Option* SmallButton::getOption()
-{
-	return option;
-}

src/client/gui/components/SmallButton.h

@@ -1,23 +0,0 @@
-#ifndef NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__
-#define NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__
-
-//package net.minecraft.client.gui;
-
-#include <string>
-#include "Button.h"
-#include "../../Options.h"
-
-class SmallButton: public Button
-{
-	typedef Button super;
-public:
-    SmallButton(int id, int x, int y, const std::string& msg);
-    SmallButton(int id, int x, int y, int width, int height, const std::string& msg);
-    SmallButton(int id, int x, int y, Options::Option* item, const std::string& msg);
-
-    Options::Option* getOption();
-private:
-	Options::Option* option;
-};
-
-#endif /*NET_MINECRAFT_CLIENT_GUI_COMPONENTS__SmallButton_H__*/

src/client/gui/components/TextBox.cpp

@@ -49,13 +49,13 @@ void TextBox::mouseClicked(Minecraft* minecraft, int x, int y, int buttonNum) {
     }
 }
 
-void TextBox::handleChar(char c) {
+void TextBox::charPressed(Minecraft* minecraft, char c)  {
     if (focused && c >= 32 && c < 127 && (int)text.size() < 256) {
         text.push_back(c);
     }
 }
 
-void TextBox::handleKey(int key) {
+void TextBox::keyPressed(Minecraft* minecraft, int key) {
     if (focused && key == Keyboard::KEY_BACKSPACE && !text.empty()) {
         text.pop_back();
     }

src/client/gui/components/TextBox.h

@@ -26,8 +26,8 @@ public:
 
 	virtual void render(Minecraft* minecraft, int xm, int ym);
 
-	virtual void handleKey(int key);
-	virtual void handleChar(char c);
+	virtual void keyPressed(Minecraft* minecraft, int key);
+	virtual void charPressed(Minecraft* minecraft, char c);
 	virtual void tick(Minecraft* minecraft);
 	
 public:

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

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

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

src/client/gui/screens/ConsoleScreen.cpp

@@ -48,7 +48,7 @@ void ConsoleScreen::keyPressed(int eventKey)
     }
 }
 
-void ConsoleScreen::keyboardNewChar(char inputChar)
+void ConsoleScreen::charPressed(char inputChar)
 {
     if (inputChar >= 32 && inputChar < 127)
         _input += inputChar;
@@ -216,8 +216,5 @@ void ConsoleScreen::render(int /*xm*/, int /*ym*/, float /*a*/)
         displayed += '_';
 
     // Placeholder hint when empty
-    if (_input.empty() && (_cursorBlink / 10) % 2 != 0)
-        font->drawShadow("Type a message or /command", (float)(boxX0 + 2), (float)(boxY + 2), 0xff606060);
-    else
-        font->drawShadow(displayed, (float)(boxX0 + 2), (float)(boxY + 2), 0xffffffff);
+    font->drawShadow(displayed, (float)(boxX0 + 2), (float)(boxY + 2), 0xffffffff);
 }

src/client/gui/screens/ConsoleScreen.h

@@ -20,7 +20,7 @@ public:
     virtual bool isPauseScreen()    { return false; }
 
     virtual void keyPressed(int eventKey);
-    virtual void keyboardNewChar(char inputChar);
+    virtual void charPressed(char inputChar);
     virtual bool handleBackEvent(bool isDown);
 
 private:

src/client/gui/screens/CreditsScreen.cpp

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

src/client/gui/screens/IngameBlockSelectionScreen.cpp

@@ -169,19 +169,19 @@ void IngameBlockSelectionScreen::keyPressed(int eventKey)
 	int tmpSelectedSlot = selectedItem;
 
 	Options& o = minecraft->options;
-	if (eventKey == o.keyLeft.key && selX > 0)
+	if (eventKey == o.getIntValue(OPTIONS_KEY_LEFT) && selX > 0)
 	{
 		tmpSelectedSlot -= 1;
 	}
-	else if (eventKey == o.keyRight.key && selX < (InventoryCols - 1))
+	else if (eventKey == o.getIntValue(OPTIONS_KEY_RIGHT) && selX < (InventoryCols - 1))
 	{
 		tmpSelectedSlot += 1;
 	}
-	else if (eventKey == o.keyDown.key && selY < (InventoryRows - 1))
+	else if (eventKey == o.getIntValue(OPTIONS_KEY_BACK) && selY < (InventoryRows - 1))
 	{
 		tmpSelectedSlot += InventoryCols;
 	}
-	else if (eventKey == o.keyUp.key && selY > 0)
+	else if (eventKey == o.getIntValue(OPTIONS_KEY_FORWARD) && selY > 0)
 	{
 		tmpSelectedSlot -= InventoryCols;
 	}
@@ -189,19 +189,38 @@ void IngameBlockSelectionScreen::keyPressed(int eventKey)
 	if (isAllowed(tmpSelectedSlot))
 		selectedItem = tmpSelectedSlot;
 
-	if (eventKey == o.keyMenuOk.key)
+	if (eventKey == o.getIntValue(OPTIONS_KEY_MENU_OK))
 		selectSlotAndClose();
 
 #ifdef RPI
-	if (eventKey == o.keyMenuCancel.key
+	if (eventKey == o.getIntValue(OPTIONS_KEY_MENU_CANCEL)
 		||	eventKey == Keyboard::KEY_ESCAPE)
 		minecraft->setScreen(NULL);
 #else
-	if (eventKey == o.keyMenuCancel.key)
+	if (eventKey == o.getIntValue(OPTIONS_KEY_MENU_CANCEL))
 		minecraft->setScreen(NULL);
 #endif
 }
 
+//------------------------------------------------------------------------------
+// wheel support for creative inventory; scroll moves selection vertically
+void IngameBlockSelectionScreen::mouseWheel(int dx, int dy, int xm, int ym)
+{
+	if (dy == 0) return;
+	// just move selection up/down one row; desktop UI doesn't have a pane
+	int cols = InventoryCols;
+	int maxIndex = InventorySize - 1;
+	int idx = selectedItem;
+	if (dy > 0) {
+		// wheel up -> previous row
+		if (idx >= cols) idx -= cols;
+	} else {
+		// wheel down -> next row
+		if (idx + cols <= maxIndex) idx += cols;
+	}
+	selectedItem = idx;
+}
+
 int IngameBlockSelectionScreen::getSelectedSlot(int x, int y)
 {
 	int left = width / 2 - InventoryCols * 10;

src/client/gui/screens/IngameBlockSelectionScreen.h

@@ -12,18 +12,21 @@ public:
 	IngameBlockSelectionScreen();
 	virtual ~IngameBlockSelectionScreen() {}
 
-	virtual void init();
-	virtual void removed();
+	virtual void init() override;
+	virtual void removed() override;
 
-	void render(int xm, int ym, float a);
+	void render(int xm, int ym, float a) override;
 
 protected:
-	virtual void mouseClicked(int x, int y, int buttonNum);
-	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void mouseClicked(int x, int y, int buttonNum) override;
+	virtual void mouseReleased(int x, int y, int buttonNum) override;
 
-	virtual void buttonClicked(Button* button);
+	virtual void buttonClicked(Button* button) override;
 
-	virtual void keyPressed(int eventKey);
+	// wheel input for creative inventory scrolling
+	virtual void mouseWheel(int dx, int dy, int xm, int ym) override;
+
+	virtual void keyPressed(int eventKey) override;
 private:
 	void renderSlots();
 	void renderSlot(int slot, int x, int y, float a);

src/client/gui/screens/JoinByIPScreen.cpp

@@ -5,6 +5,8 @@
 #include "ProgressScreen.h"
 #include "../Font.h"
 #include "../../../network/RakNetInstance.h"
+#include "client/Options.h"
+#include "client/gui/Screen.h"
 #include "client/gui/components/TextBox.h"
 #include "network/ClientSideNetworkHandler.h"
 
@@ -31,7 +33,7 @@ void JoinByIPScreen::buttonClicked(Button* button)
 
         minecraft->joinMultiplayerFromString(tIP.text);
         {
-
+			minecraft->options.set(OPTIONS_LAST_IP, tIP.text);
             bJoin.active = false;
             bBack.active = false;
             minecraft->setScreen(new ProgressScreen());
@@ -55,6 +57,7 @@ bool JoinByIPScreen::handleBackEvent(bool isDown)
 
 void JoinByIPScreen::tick()
 {
+	Screen::tick();
 	bJoin.active = !tIP.text.empty();
 }
 
@@ -78,6 +81,8 @@ void JoinByIPScreen::init()
 	tabButtons.push_back(&bBack);
     tabButtons.push_back(&bHeader);
 #endif
+
+	tIP.text = minecraft->options.getStringValue(OPTIONS_LAST_IP);
 }
 
 void JoinByIPScreen::setupPositions() {
@@ -102,21 +107,6 @@ void JoinByIPScreen::setupPositions() {
     tIP.y     = ((height - bJoin.height) / 2) - tIP.height - 4;
 }
 
-void JoinByIPScreen::mouseClicked(int x, int y, int buttonNum) {
-    int lvlTop = tIP.y - (Font::DefaultLineHeight + 4);
-    int lvlBottom = tIP.y + tIP.height;
-    int lvlLeft = tIP.x;
-    int lvlRight = tIP.x + tIP.width;
-    bool clickedIP = x >= lvlLeft && x < lvlRight && y >= lvlTop && y < lvlBottom;
-
-    if (clickedIP) {
-        tIP.setFocus(minecraft);
-    } else {
-        tIP.loseFocus(minecraft);
-    }
-
-    Screen::mouseClicked(x, y, buttonNum);
-}
 void JoinByIPScreen::render( int xm, int ym, float a )
 {
 	renderBackground();
@@ -132,9 +122,3 @@ void JoinByIPScreen::keyPressed(int eventKey)
     // let base class handle navigation and text box keys
     Screen::keyPressed(eventKey);
 }
-
-void JoinByIPScreen::keyboardNewChar(char inputChar)
-{
-    // forward character input to focused textbox(s)
-    for (auto* tb : textBoxes) tb->handleChar(inputChar);
-}

src/client/gui/screens/JoinByIPScreen.h

@@ -18,9 +18,7 @@ public:
     void render(int xm, int ym, float a);
 
 	virtual void keyPressed(int eventKey);
-	virtual void keyboardNewChar(char inputChar);
 	void buttonClicked(Button* button);
-    virtual void mouseClicked(int x, int y, int buttonNum);
     virtual bool handleBackEvent(bool isDown);
 private:
     TextBox tIP;

src/client/gui/screens/JoinGameScreen.h

@@ -3,7 +3,6 @@
 
 #include "../Screen.h"
 #include "../components/Button.h"
-#include "../components/SmallButton.h"
 #include "../components/ScrolledSelectionList.h"
 #include "../../Minecraft.h"
 #include "../../../network/RakNetInstance.h"

src/client/gui/screens/OptionsScreen.cpp

@@ -7,14 +7,13 @@
 #include "../../../AppPlatform.h"
 #include "CreditsScreen.h"
 
-#include "../components/OptionsPane.h"
 #include "../components/ImageButton.h"
 #include "../components/OptionsGroup.h"
+#include "platform/input/Keyboard.h"
 
 OptionsScreen::OptionsScreen()
 	: btnClose(NULL),
 	bHeader(NULL),
-	btnChangeUsername(NULL),
 	btnCredits(NULL),
 	selectedCategory(0) {
 }
@@ -31,11 +30,6 @@ OptionsScreen::~OptionsScreen() {
 		bHeader = NULL;
 	}
 
-	if (btnChangeUsername != NULL) {
-		delete btnChangeUsername;
-		btnChangeUsername = NULL;
-	}
-
 	if (btnCredits != NULL) {
 		delete btnCredits;
 		btnCredits = NULL;
@@ -48,7 +42,7 @@ OptionsScreen::~OptionsScreen() {
 		}
 	}
 
-	for (std::vector<OptionsPane*>::iterator it = optionPanes.begin(); it != optionPanes.end(); ++it) {
+	for (std::vector<OptionsGroup*>::iterator it = optionPanes.begin(); it != optionPanes.end(); ++it) {
 		if (*it != NULL) {
 			delete* it;
 			*it = NULL;
@@ -72,17 +66,16 @@ void OptionsScreen::init() {
 	def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
 	btnClose->setImageDef(def, true);
 
-	categoryButtons.push_back(new Touch::TButton(2, "Login"));
+	categoryButtons.push_back(new Touch::TButton(2, "General"));
 	categoryButtons.push_back(new Touch::TButton(3, "Game"));
 	categoryButtons.push_back(new Touch::TButton(4, "Controls"));
 	categoryButtons.push_back(new Touch::TButton(5, "Graphics"));
+	categoryButtons.push_back(new Touch::TButton(6, "Tweaks"));
 
-	btnChangeUsername = new Touch::TButton(10, "Username");
 	btnCredits = new Touch::TButton(11, "Credits");
 
 	buttons.push_back(bHeader);
 	buttons.push_back(btnClose);
-	buttons.push_back(btnChangeUsername);
 	buttons.push_back(btnCredits);
 
 	for (std::vector<Touch::TButton*>::iterator it = categoryButtons.begin(); it != categoryButtons.end(); ++it) {
@@ -118,27 +111,13 @@ void OptionsScreen::setupPositions() {
 	bHeader->width = width - btnClose->width;
 	bHeader->height = btnClose->height;
 
-	// Username button (bottom-left)
-	if (btnChangeUsername != NULL) {
-
-		btnChangeUsername->width = categoryButtons.empty() ? 80 : categoryButtons[0]->width;
-		btnChangeUsername->height = btnClose->height;
-
-		btnChangeUsername->x = 0;
-		btnChangeUsername->y = height - btnChangeUsername->height;
-	}
-
 	// Credits button (bottom-right)
 	if (btnCredits != NULL) {
-
-		btnCredits->width = btnChangeUsername->width;
-		btnCredits->height = btnChangeUsername->height;
-
 		btnCredits->x = width - btnCredits->width;
 		btnCredits->y = height - btnCredits->height;
 	}
 
-	for (std::vector<OptionsPane*>::iterator it = optionPanes.begin(); it != optionPanes.end(); ++it) {
+	for (std::vector<OptionsGroup*>::iterator it = optionPanes.begin(); it != optionPanes.end(); ++it) {
 
 		if (categoryButtons.size() > 0 && categoryButtons[0] != NULL) {
 
@@ -158,13 +137,13 @@ void OptionsScreen::render(int xm, int ym, float a) {
 
 	renderBackground();
 
-	super::render(xm, ym, a);
-
 	int xmm = xm * width / minecraft->width;
 	int ymm = ym * height / minecraft->height - 1;
 
-	if (currentOptionPane != NULL)
-		currentOptionPane->render(minecraft, xmm, ymm);
+	if (currentOptionsGroup != NULL)
+		currentOptionsGroup->render(minecraft, xmm, ymm);
+	
+	super::render(xm, ym, a);
 }
 
 void OptionsScreen::removed() {
@@ -173,27 +152,15 @@ void OptionsScreen::removed() {
 void OptionsScreen::buttonClicked(Button* button) {
 
 	if (button == btnClose) {
-
 		minecraft->options.save();
 		minecraft->screenChooser.setScreen(SCREEN_STARTMENU);
-
-	}
-	else if (button == btnChangeUsername) {
-
-		minecraft->options.save();
-		minecraft->setScreen(new UsernameScreen());
-
 	}
 	else if (button->id > 1 && button->id < 7) {
-
 		int categoryButton = button->id - categoryButtons[0]->id;
 		selectCategory(categoryButton);
-
 	}
 	else if (button == btnCredits) {
-
 		minecraft->setScreen(new CreditsScreen());
-
 	}
 }
 
@@ -212,63 +179,92 @@ void OptionsScreen::selectCategory(int index) {
 	}
 
 	if (index < (int)optionPanes.size())
-		currentOptionPane = optionPanes[index];
+		currentOptionsGroup = optionPanes[index];
 }
 
 void OptionsScreen::generateOptionScreens() {
+	// how the fuck it works
 
-	optionPanes.push_back(new OptionsPane());
-	optionPanes.push_back(new OptionsPane());
-	optionPanes.push_back(new OptionsPane());
-	optionPanes.push_back(new OptionsPane());
+	optionPanes.push_back(new OptionsGroup("options.group.general"));
+	optionPanes.push_back(new OptionsGroup("options.group.game"));
+	optionPanes.push_back(new OptionsGroup("options.group.controls"));
+	optionPanes.push_back(new OptionsGroup("options.group.graphics"));
+	optionPanes.push_back(new OptionsGroup("options.group.tweaks"));
 
-	// Login Pane
-	optionPanes[0]->createOptionsGroup("options.group.mojang")
-		.addOptionItem(&Options::Option::SENSITIVITY, minecraft);
+	// General Pane
+	optionPanes[0]->addOptionItem(OPTIONS_USERNAME, minecraft)
+		.addOptionItem(OPTIONS_SENSITIVITY, minecraft);
 
 	// Game Pane
-	optionPanes[1]->createOptionsGroup("options.group.game")
-		.addOptionItem(&Options::Option::DIFFICULTY, minecraft)
-		.addOptionItem(&Options::Option::SERVER_VISIBLE, minecraft)
-		.addOptionItem(&Options::Option::THIRD_PERSON, minecraft)
-		.addOptionItem(&Options::Option::GUI_SCALE, minecraft);
+	optionPanes[1]->addOptionItem(OPTIONS_DIFFICULTY, minecraft)
+		.addOptionItem(OPTIONS_SERVER_VISIBLE, minecraft)
+		.addOptionItem(OPTIONS_THIRD_PERSON_VIEW, minecraft)
+		.addOptionItem(OPTIONS_GUI_SCALE, minecraft)
+		.addOptionItem(OPTIONS_SENSITIVITY, minecraft)
+		.addOptionItem(OPTIONS_MUSIC_VOLUME, minecraft)
+		.addOptionItem(OPTIONS_SOUND_VOLUME, minecraft)
+		.addOptionItem(OPTIONS_SMOOTH_CAMERA, minecraft)
+		.addOptionItem(OPTIONS_DESTROY_VIBRATION, minecraft)
+		.addOptionItem(OPTIONS_IS_LEFT_HANDED, minecraft);
 
-	// Controls Pane
-	optionPanes[2]->createOptionsGroup("options.group.controls")
-		.addOptionItem(&Options::Option::INVERT_MOUSE, minecraft);
+	// // Controls Pane
+	optionPanes[2]->addOptionItem(OPTIONS_INVERT_Y_MOUSE, minecraft)
+		.addOptionItem(OPTIONS_USE_TOUCHSCREEN, minecraft);
 
-	// Graphics Pane
-	optionPanes[3]->createOptionsGroup("options.group.graphics")
-		.addOptionItem(&Options::Option::GRAPHICS, minecraft)
-		.addOptionItem(&Options::Option::VIEW_BOBBING, minecraft)
-		.addOptionItem(&Options::Option::AMBIENT_OCCLUSION, minecraft)
-		.addOptionItem(&Options::Option::ANAGLYPH, minecraft)
-		.addOptionItem(&Options::Option::LIMIT_FRAMERATE, minecraft)
-		.addOptionItem(&Options::Option::VSYNC, minecraft)
-		.addOptionItem(&Options::Option::MUSIC, minecraft)
-		.addOptionItem(&Options::Option::SOUND, minecraft);
+	for (int i = OPTIONS_KEY_FORWARD; i <= OPTIONS_KEY_USE; i++) {
+		optionPanes[2]->addOptionItem((OptionId)i, minecraft);
+	}
+
+	// // Graphics Pane
+	optionPanes[3]->addOptionItem(OPTIONS_FANCY_GRAPHICS, minecraft)
+		.addOptionItem(OPTIONS_LIMIT_FRAMERATE, minecraft)
+		.addOptionItem(OPTIONS_VSYNC, minecraft)
+		.addOptionItem(OPTIONS_RENDER_DEBUG, minecraft)
+		.addOptionItem(OPTIONS_ANAGLYPH_3D, minecraft)
+		.addOptionItem(OPTIONS_VIEW_BOBBING, minecraft)
+		.addOptionItem(OPTIONS_AMBIENT_OCCLUSION, minecraft);
+	
+	optionPanes[4]->addOptionItem(OPTIONS_ALLOW_SPRINT, minecraft)
+		.addOptionItem(OPTIONS_BAR_ON_TOP, minecraft)
+		.addOptionItem(OPTIONS_RPI_CURSOR, minecraft);
 }
 
 void OptionsScreen::mouseClicked(int x, int y, int buttonNum) {
 
-	if (currentOptionPane != NULL)
-		currentOptionPane->mouseClicked(minecraft, x, y, buttonNum);
+	if (currentOptionsGroup != NULL)
+		currentOptionsGroup->mouseClicked(minecraft, x, y, buttonNum);
 
 	super::mouseClicked(x, y, buttonNum);
 }
 
 void OptionsScreen::mouseReleased(int x, int y, int buttonNum) {
 
-	if (currentOptionPane != NULL)
-		currentOptionPane->mouseReleased(minecraft, x, y, buttonNum);
+	if (currentOptionsGroup != NULL)
+		currentOptionsGroup->mouseReleased(minecraft, x, y, buttonNum);
 
 	super::mouseReleased(x, y, buttonNum);
 }
 
+void OptionsScreen::keyPressed(int eventKey) {
+	if (currentOptionsGroup != NULL)
+		currentOptionsGroup->keyPressed(minecraft, eventKey);
+	if (eventKey == Keyboard::KEY_ESCAPE) 
+		minecraft->options.save();
+	
+	super::keyPressed(eventKey);
+}
+
+void OptionsScreen::charPressed(char inputChar) {
+	if (currentOptionsGroup != NULL)
+		currentOptionsGroup->charPressed(minecraft, inputChar);
+
+	super::keyPressed(inputChar);
+}
+
 void OptionsScreen::tick() {
 
-	if (currentOptionPane != NULL)
-		currentOptionPane->tick(minecraft);
+	if (currentOptionsGroup != NULL)
+		currentOptionsGroup->tick(minecraft);
 
 	super::tick();
 }

src/client/gui/screens/OptionsScreen.h

@@ -3,6 +3,7 @@
 
 #include "../Screen.h"
 #include "../components/Button.h"
+#include "../components/OptionsGroup.h"
 
 class ImageButton;
 class OptionsPane;
@@ -26,19 +27,21 @@ public:
 
 	virtual void mouseClicked(int x, int y, int buttonNum);
 	virtual void mouseReleased(int x, int y, int buttonNum);
+	virtual void keyPressed(int eventKey);
+	virtual void charPressed(char inputChar);
+	
 	virtual void tick();
 
 private:
 	Touch::THeader* bHeader;
 	ImageButton* btnClose;
 
-	Button* btnChangeUsername;
 	Button* btnCredits;   // <-- ADD THIS
 
 	std::vector<Touch::TButton*> categoryButtons;
-	std::vector<OptionsPane*> optionPanes;
+	std::vector<OptionsGroup*> optionPanes;
 
-	OptionsPane* currentOptionPane;
+	OptionsGroup* currentOptionsGroup;
 
 	int selectedCategory;
 };

src/client/gui/screens/PauseScreen.cpp

@@ -15,9 +15,9 @@ PauseScreen::PauseScreen(bool wasBackPaused)
 	bServerVisibility(0),
 //	bThirdPerson(0),
 	wasBackPaused(wasBackPaused),
-	bSound(&Options::Option::SOUND, 1, 0),
-	bThirdPerson(&Options::Option::THIRD_PERSON),
-    bHideGui(&Options::Option::HIDE_GUI)
+	// bSound(OPTIONS_SOUND_VOLUME, 1, 0),
+	bThirdPerson(OPTIONS_THIRD_PERSON_VIEW),
+    bHideGui(OPTIONS_HIDEGUI)
 {
 	ImageDef def;
 	def.setSrc(IntRectangle(160, 144, 39, 31));
@@ -27,7 +27,7 @@ PauseScreen::PauseScreen(bool wasBackPaused)
 	def.width = defSrc.w * 0.666667f;
 	def.height = defSrc.h * 0.666667f;
 
-	bSound.setImageDef(def, true);
+	// bSound.setImageDef(def, true);
 	defSrc.y += defSrc.h;
 	bThirdPerson.setImageDef(def, true);
     bHideGui.setImageDef(def, true);
@@ -60,10 +60,10 @@ void PauseScreen::init() {
 	buttons.push_back(bContinue);
 	buttons.push_back(bQuit);
 
-	bSound.updateImage(&minecraft->options);
+	// bSound.updateImage(&minecraft->options);
 	bThirdPerson.updateImage(&minecraft->options);
 	bHideGui.updateImage(&minecraft->options);
-	buttons.push_back(&bSound);
+	// buttons.push_back(&bSound);
 	buttons.push_back(&bThirdPerson);
     //buttons.push_back(&bHideGui);
 
@@ -88,7 +88,7 @@ void PauseScreen::init() {
 //	buttons.push_back(bThirdPerson);
 
 	for (unsigned int i = 0; i < buttons.size(); ++i) {
-		if (buttons[i] == &bSound) continue;
+		// if (buttons[i] == &bSound) continue;
 		if (buttons[i] == &bThirdPerson) continue;
 		if (buttons[i] == &bHideGui) continue;
 		tabButtons.push_back(buttons[i]);
@@ -115,10 +115,10 @@ void PauseScreen::setupPositions() {
 	bQuitAndSaveLocally->x = bServerVisibility->x = (width - bQuitAndSaveLocally->width) / 2;
 	bQuitAndSaveLocally->y = bServerVisibility->y = yBase + 32 * 3;
 
-	bSound.y = bThirdPerson.y = 8;
-	bSound.x = 4;
-	bThirdPerson.x = bSound.x + 4 + bSound.width;
-	bHideGui.x = bThirdPerson.x + 4 + bThirdPerson.width;
+	// bSound.y = bThirdPerson.y = 8;
+	// bSound.x = 4;
+	// bThirdPerson.x = bSound.x + 4 + bSound.width;
+	// bHideGui.x = bThirdPerson.x + 4 + bThirdPerson.width;
 
 	//bThirdPerson->x = (width - bThirdPerson->w) / 2;
 	//bThirdPerson->y = yBase + 32 * 4;

src/client/gui/screens/PauseScreen.h

@@ -35,7 +35,7 @@ private:
 	Button* bServerVisibility;
 //	Button* bThirdPerson;
 
-	OptionButton bSound;
+	// OptionButton bSound;
 	OptionButton bThirdPerson;
     OptionButton bHideGui;
 };

src/client/gui/screens/ScreenChooser.cpp

@@ -4,6 +4,7 @@
 #include "JoinGameScreen.h"
 #include "PauseScreen.h"
 #include "RenameMPLevelScreen.h"
+#include "ConsoleScreen.h"
 #include "IngameBlockSelectionScreen.h"
 #include "JoinByIPScreen.h"
 #include "touch/TouchStartMenuScreen.h"
@@ -13,10 +14,13 @@
 
 #include "../../Minecraft.h"
 
+#include <client/gui/screens/UsernameScreen.h>
+
 Screen* ScreenChooser::createScreen( ScreenId id )
 {
 	Screen* screen = NULL;
 
+	// :sob:
 	if (_mc->useTouchscreen()) {
 		switch (id) {
 		case SCREEN_STARTMENU:	     screen = new Touch::StartMenuScreen();	break;
@@ -26,6 +30,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 		case SCREEN_PAUSEPREV:	     screen = new PauseScreen(true);	 break;
 		case SCREEN_BLOCKSELECTION:	 screen = new Touch::IngameBlockSelectionScreen();	break;
 		case SCREEN_JOINBYIP:        screen = new JoinByIPScreen(); break;
+		case SCREEN_CONSOLE:		 screen = new ConsoleScreen(); break;
 		case SCREEN_NONE:
 		default:
 			// Do nothing
@@ -40,7 +45,7 @@ Screen* ScreenChooser::createScreen( ScreenId id )
 		case SCREEN_PAUSEPREV:	     screen = new PauseScreen(true);	 break;
 		case SCREEN_BLOCKSELECTION:	 screen = new IngameBlockSelectionScreen();	break;
 		case SCREEN_JOINBYIP:        screen = new JoinByIPScreen(); break;
-
+		case SCREEN_CONSOLE:		 screen = new ConsoleScreen(); break;
 		case SCREEN_NONE:
 		default:
 			// Do nothing

src/client/gui/screens/ScreenChooser.h

@@ -9,7 +9,8 @@ enum ScreenId {
 	SCREEN_PAUSEPREV,
 	SCREEN_SELECTWORLD,
 	SCREEN_BLOCKSELECTION,
-	SCREEN_JOINBYIP
+	SCREEN_JOINBYIP,
+	SCREEN_CONSOLE
 };
 
 class Screen;

src/client/gui/screens/SelectWorldScreen.cpp

@@ -356,7 +356,7 @@ void SelectWorldScreen::render( int xm, int ym, float a )
 	worldsList->setComponentSelected(bWorldView.selected);
 	// #ifdef PLATFORM_DESKTOP
 
-	// We should add scrolling with mouse wheel but currently i dont know how to implement it
+	// desktop: render the list normally (mouse wheel handled separately below)
 	if (_mouseHasBeenUp)
 		worldsList->render(xm, ym, a);
 	else {
@@ -412,12 +412,34 @@ std::string SelectWorldScreen::getUniqueLevelName( const std::string& level )
 
 bool SelectWorldScreen::isInGameScreen() { return true;  }
 
+void SelectWorldScreen::mouseWheel(int dx, int dy, int xm, int ym)
+{
+	if (!worldsList)
+		return;
+	if (dy == 0)
+		return;
+	int num = worldsList->getNumberOfItems();
+	int idx = worldsList->selectedItem;
+	if (dy > 0) {
+		if (idx > 0) {
+			idx--;
+			worldsList->stepLeft();
+		}
+	} else {
+		if (idx < num - 1) {
+			idx++;
+			worldsList->stepRight();
+		}
+	}
+	worldsList->selectedItem = idx;
+}
+
 void SelectWorldScreen::keyPressed( int eventKey )
 {
 	if (bWorldView.selected) {
-		if (eventKey == minecraft->options.keyLeft.key)
+		if (eventKey == minecraft->options.getIntValue(OPTIONS_KEY_RIGHT))
 			worldsList->stepLeft();
-		if (eventKey == minecraft->options.keyRight.key)
+		if (eventKey == minecraft->options.getIntValue(OPTIONS_KEY_LEFT))
 			worldsList->stepRight();
 	}
 

src/client/gui/screens/SelectWorldScreen.h

@@ -4,7 +4,6 @@
 #include "../Screen.h"
 #include "../TweenData.h"
 #include "../components/Button.h"
-#include "../components/SmallButton.h"
 #include "../components/RolledSelectionListH.h"
 #include "../../Minecraft.h"
 #include "../../../world/level/storage/LevelStorageSource.h"
@@ -90,6 +89,9 @@ public:
 
 	void render(int xm, int ym, float a);
 
+	// mouse wheel scroll (new in desktop implementation)
+	virtual void mouseWheel(int dx, int dy, int xm, int ym);
+
 	bool isInGameScreen();
 private:
 	void loadLevelSource();

src/client/gui/screens/SimpleChooseLevelScreen.cpp

@@ -12,11 +12,13 @@
 SimpleChooseLevelScreen::SimpleChooseLevelScreen(const std::string& levelName)
 :   bHeader(0),
     bGamemode(0),
+    bCheats(0),
     bBack(0),
     bCreate(0),
     levelName(levelName),
     hasChosen(false),
     gamemode(GameType::Survival),
+    cheatsEnabled(false),
     tLevelName(0, "World name"),
     tSeed(1, "World seed")
 {
@@ -26,12 +28,20 @@ SimpleChooseLevelScreen::~SimpleChooseLevelScreen()
 {
     if (bHeader) delete bHeader;
     delete bGamemode;
+    delete bCheats;
     delete bBack;
     delete bCreate;
 }
 
 void SimpleChooseLevelScreen::init()
 {
+    // make sure the base class loads the existing level list; the
+    // derived screen uses ChooseLevelScreen::getUniqueLevelName(), which
+    // depends on `levels` being populated.  omitting this used to result
+    // in duplicate IDs ("creating the second world would load the
+    // first") when the name already existed.
+    ChooseLevelScreen::init();
+
     tLevelName.text = "New world";
 
     // header + close button
@@ -48,18 +58,22 @@ void SimpleChooseLevelScreen::init()
     }
     if (minecraft->useTouchscreen()) {
         bGamemode = new Touch::TButton(1, "Survival mode");
+        bCheats  = new Touch::TButton(4, "Cheats: Off");
         bCreate  = new Touch::TButton(3, "Create");
     } else {
         bGamemode = new Button(1, "Survival mode");
+        bCheats  = new Button(4, "Cheats: Off");
         bCreate  = new Button(3, "Create");
     }
 
     buttons.push_back(bHeader);
     buttons.push_back(bBack);
     buttons.push_back(bGamemode);
+    buttons.push_back(bCheats);
     buttons.push_back(bCreate);
 
     tabButtons.push_back(bGamemode);
+    tabButtons.push_back(bCheats);
     tabButtons.push_back(bBack);
     tabButtons.push_back(bCreate);
 
@@ -94,16 +108,26 @@ void SimpleChooseLevelScreen::setupPositions()
     tSeed.x = tLevelName.x;
     tSeed.y = tLevelName.y + 30;
 
-    bGamemode->width = 140;
-    bGamemode->x = centerX - bGamemode->width / 2;
-    // compute vertical centre for gamemode in remaining space
+    const int buttonWidth = 120;
+    const int buttonSpacing = 10;
+    const int totalButtonWidth = buttonWidth * 2 + buttonSpacing;
+
+    bGamemode->width = buttonWidth;
+    bCheats->width = buttonWidth;
+
+    bGamemode->x = centerX - totalButtonWidth / 2;
+    bCheats->x = bGamemode->x + buttonWidth + buttonSpacing;
+
+    // compute vertical centre for buttons in remaining space
     {
         int bottomPad = 20;
         int availTop = buttonHeight + 20 + 30 + 10; // just below seed
         int availBottom = height - bottomPad - bCreate->height - 10; // leave some gap before create
         int availHeight = availBottom - availTop;
         if (availHeight < 0) availHeight = 0;
-        bGamemode->y = availTop + (availHeight - bGamemode->height) / 2;
+        int y = availTop + (availHeight - bGamemode->height) / 2;
+        bGamemode->y = y;
+        bCheats->y = y;
     }
 
     bCreate->width = 100;
@@ -124,14 +148,14 @@ void SimpleChooseLevelScreen::render( int xm, int ym, float a )
     renderDirtBackground(0);
     glEnable2(GL_BLEND);
 
-    const char* str = NULL;
+    const char* modeDesc = NULL;
     if (gamemode == GameType::Survival) {
-        str = "Mobs, health and gather resources";
+        modeDesc = "Mobs, health and gather resources";
     } else if (gamemode == GameType::Creative) {
-        str = "Unlimited resources and flying";
+        modeDesc = "Unlimited resources and flying";
     }
-    if (str) {
-        drawCenteredString(minecraft->font, str, width/2, bGamemode->y + bGamemode->height + 4, 0xffcccccc);
+    if (modeDesc) {
+        drawCenteredString(minecraft->font, modeDesc, width / 2, bGamemode->y + bGamemode->height + 4, 0xffcccccc);
     }
 
     drawString(minecraft->font, "World name:", tLevelName.x, tLevelName.y - Font::DefaultLineHeight - 2, 0xffcccccc);
@@ -188,6 +212,12 @@ void SimpleChooseLevelScreen::buttonClicked( Button* button )
         return;
     }
 
+    if (button == bCheats) {
+        cheatsEnabled = !cheatsEnabled;
+        bCheats->msg = cheatsEnabled ? "Cheats: On" : "Cheats: Off";
+        return;
+    }
+
     if (button == bCreate && !tLevelName.text.empty()) {
         int seed = getEpochTimeS();
         if (!tSeed.text.empty()) {
@@ -200,7 +230,7 @@ void SimpleChooseLevelScreen::buttonClicked( Button* button )
             }
         }
         std::string levelId = getUniqueLevelName(tLevelName.text);
-        LevelSettings settings(seed, gamemode);
+        LevelSettings settings(seed, gamemode, cheatsEnabled);
         minecraft->selectLevel(levelId, levelId, settings);
         minecraft->hostMultiplayer();
         minecraft->setScreen(new ProgressScreen());
@@ -223,12 +253,6 @@ void SimpleChooseLevelScreen::keyPressed(int eventKey)
     Screen::keyPressed(eventKey);
 }
 
-void SimpleChooseLevelScreen::keyboardNewChar(char inputChar)
-{
-    // forward character input to focused textbox(s)
-    for (auto* tb : textBoxes) tb->handleChar(inputChar);
-}
-
 bool SimpleChooseLevelScreen::handleBackEvent(bool isDown) {
 	if (!isDown)
 		minecraft->screenChooser.setScreen(SCREEN_STARTMENU);

src/client/gui/screens/SimpleChooseLevelScreen.h

@@ -23,18 +23,19 @@ public:
 	void buttonClicked(Button* button);
 	bool handleBackEvent(bool isDown);
 	virtual void keyPressed(int eventKey);
-	virtual void keyboardNewChar(char inputChar);
 	virtual void mouseClicked(int x, int y, int buttonNum);
 
 private:
 	Touch::THeader* bHeader;
 	Button* bGamemode;
+	Button* bCheats;
 	ImageButton* bBack;
 	Button* bCreate;
 	bool hasChosen;
 
 	std::string levelName;
 	int gamemode;
+	bool cheatsEnabled;
 
 	TextBox tLevelName;
 	TextBox tSeed;

src/client/gui/screens/StartMenuScreen.cpp

@@ -6,11 +6,11 @@
 #include "OptionsScreen.h"
 #include "PauseScreen.h"
 #include "PrerenderTilesScreen.h" // test button
+#include "../components/ImageButton.h"
 
 #include "../../../util/Mth.h"
 
 #include "../Font.h"
-#include "../components/SmallButton.h"
 #include "../components/ScrolledSelectionList.h"
 
 #include "../../Minecraft.h"
@@ -25,7 +25,8 @@
 StartMenuScreen::StartMenuScreen()
 :	bHost(    2, 0, 0, 160, 24, "Start Game"),
 	bJoin(    3, 0, 0, 160, 24, "Join Game"),
-	bOptions( 4, 0, 0,  78, 22, "Options")
+	bOptions( 4, 0, 0, 160, 24, "Options"),
+	bQuit(    5, "")
 {
 }
 
@@ -35,10 +36,9 @@ StartMenuScreen::~StartMenuScreen()
 
 void StartMenuScreen::init()
 {
-
 	bJoin.active = bHost.active = bOptions.active = true;
 
-	if (minecraft->options.username.empty()) {
+	if (minecraft->options.getStringValue(OPTIONS_USERNAME).empty()) {
 		return; // tick() will redirect to UsernameScreen
 	}
 
@@ -54,16 +54,29 @@ void StartMenuScreen::init()
 		tabButtons.push_back(&bOptions);
 	#endif
 
-	#ifdef DEMO_MODE
-		buttons.push_back(&bBuy);
-		tabButtons.push_back(&bBuy);
-	#endif
+    // add quit button (top right X icon) – match OptionsScreen style
+    {
+        ImageDef def;
+        def.name = "gui/touchgui.png";
+        def.width = 34;
+        def.height = 26;
+        def.setSrc(IntRectangle(150, 0, (int)def.width, (int)def.height));
+        bQuit.setImageDef(def, true);
+        bQuit.scaleWhenPressed = false;
+        buttons.push_back(&bQuit);
+        // don't include in tab navigation
+    }
 
 	copyright = "\xffMojang AB";//. Do not distribute!";
 
 	// always show base version string, suffix was previously added for Android builds
 	std::string versionString = Common::getGameVersionString();
 
+	std::string _username = minecraft->options.getStringValue(OPTIONS_USERNAME);
+	if (_username.empty()) _username = "unknown";
+
+	username = "Username: " + _username;
+
 	#ifdef DEMO_MODE
 	#ifdef __APPLE__
 		version = versionString + " (Lite)";
@@ -77,38 +90,26 @@ void StartMenuScreen::init()
 			version = versionString;
 		#endif
 	#endif
-
-	bJoin.active = bHost.active = bOptions.active = false;
 }
 
 void StartMenuScreen::setupPositions() {
-	int yBase = height / 2 + 25;
+	int yBase = height / 2;
 
-	//#ifdef ANDROID
-	bHost.y =	 yBase - 28;
-#ifdef RPI
-	bJoin.y =	 yBase + 4;
-#else
-	bJoin.y =	 yBase;
-#endif
-
-	bOptions.y = yBase + 28 + 2;
-	//#endif
+	bHost.y =	 yBase;
+	bJoin.y =	 bHost.y + 24 + 4;
+	bOptions.y = bJoin.y + 24 + 4;
 
 	// Center buttons
 	bHost.x = (width - bHost.width) / 2;
 	bJoin.x = (width - bJoin.width) / 2;
-	bOptions.x = (width - bJoin.width) / 2;
+	bOptions.x = (width - bOptions.width) / 2;
 
-	copyrightPosX = width - minecraft->font->width(copyright) - 1;
-	versionPosX = (width - minecraft->font->width(version)) / 2;// - minecraft->font->width(version) - 2;
+    // position quit icon at top-right (use image-defined size)
+    bQuit.x = width - bQuit.width;
+    bQuit.y = 0;
 }
 
 void StartMenuScreen::tick() {
-	if (minecraft->options.username.empty()) {
-		minecraft->setScreen(new UsernameScreen());
-		return;
-	}
 }
 
 void StartMenuScreen::buttonClicked(Button* button) {
@@ -130,6 +131,10 @@ void StartMenuScreen::buttonClicked(Button* button) {
 	{
 		minecraft->setScreen(new OptionsScreen());
 	}
+	if (button == &bQuit)
+	{
+		minecraft->quit();
+	}
 }
 
 bool StartMenuScreen::isInGameScreen() { return false; }
@@ -138,6 +143,9 @@ void StartMenuScreen::render( int xm, int ym, float a )
 {
 	renderBackground();
 
+	// Show current username in the top-left corner
+	drawString(font, username, 2, 2, 0xffffffff);
+
 #if defined(RPI)
 	TextureId id = minecraft->textures->loadTexture("gui/pi_title.png");
 #else
@@ -149,7 +157,7 @@ void StartMenuScreen::render( int xm, int ym, float a )
 		minecraft->textures->bind(id);
 
 		const float x = (float)width / 2;
-		const float y = 4;
+		const float y = height/16;
 		//const float scale = Mth::Min(
 		const float wh = Mth::Min((float)width/2.0f, (float)data->w / 2);
 		const float scale = 2.0f * wh / (float)data->w;
@@ -171,14 +179,14 @@ void StartMenuScreen::render( int xm, int ym, float a )
 		blit(0, height - 12, 0, 0, 43, 12, 256, 72+72);
 #endif
 
-	drawString(font, version, versionPosX, 62, /*50,*/ 0xffcccccc);//0x666666);
-	drawString(font, copyright, copyrightPosX, height - 10, 0xffffff);
+	drawString(font, version, width - font->width(version) - 2, height - 10, 0xffcccccc);//0x666666);
+	drawString(font, copyright, 2, height - 20, 0xffffff);
 	glEnable2(GL_BLEND);
 	glBlendFunc2(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glColor4f2(1, 1, 1, 1);
 	if (Textures::isTextureIdValid(minecraft->textures->loadAndBindTexture("gui/logo/github.png")))
 		blit(2, height - 10, 0, 0, 8, 8, 256, 256);
-{
+	{
 			std::string txt = "Kolyah35/minecraft-pe-0.6.1";
 			float wtxt = font->width(txt);
 			Gui::drawColoredString(font, txt, 12, height - 10, 255);
@@ -186,6 +194,9 @@ void StartMenuScreen::render( int xm, int ym, float a )
 			float y0 = height - 10 + font->lineHeight - 1;
 			this->fill(12, (int)y0, 12 + (int)wtxt, (int)(y0 + 1), 0xffffffff);
     }
+
+	
+	Screen::render(xm, ym, a);
 }
 
 void StartMenuScreen::mouseClicked(int x, int y, int buttonNum) {

src/client/gui/screens/StartMenuScreen.h

@@ -3,6 +3,7 @@
 
 #include "../Screen.h"
 #include "../components/Button.h"
+#include "../components/ImageButton.h"
 
 class StartMenuScreen: public Screen
 {
@@ -25,12 +26,15 @@ private:
 	Button bHost;
 	Button bJoin;
 	Button bOptions;
+	ImageButton bQuit; // X button in top-right corner
 
 	std::string copyright;
 	int copyrightPosX;
 
 	std::string version;
 	int versionPosX;
+
+	std::string username;
 };
 
 #endif /*NET_MINECRAFT_CLIENT_GUI_SCREENS__StartMenuScreen_H__*/