Simplify MP chat code

So much for "MCPI limitations"!

.gitea/workflows/build.yml

@@ -0,0 +1,136 @@
+name: 'CI'
+
+on:
+    push:
+        branches:
+          - master
+        tags:
+          - '*'
+          - '!flatpak'
+
+jobs:
+    # Build Project
+    build:
+        strategy:
+            fail-fast: false
+            matrix:
+                arch:
+                  - AMD64
+                  - ARM64
+                  - ARMHF
+        name: Build
+        runs-on: ubuntu-latest
+        container: node:lts-bullseye
+        steps:
+          - name: Checkout Repository
+            uses: actions/checkout@v4
+            with:
+                submodules: true
+          # Dependencies
+          - name: Install Dependencies
+            run: ./scripts/install-dependencies.sh build ${{ matrix.arch }}
+          # Build
+          - name: Build
+            run: ./scripts/build.mjs appimage ${{ matrix.arch }}
+          - name: Upload Artifacts
+            uses: christopherhx/gitea-upload-artifact@v4
+            with:
+                name: ${{ matrix.arch }}
+                path: ./out/*.AppImage*
+                if-no-files-found: error
+    # Test Project
+    test:
+        needs: build
+        strategy:
+            fail-fast: false
+            matrix:
+                mode:
+                  - Client
+                  - Server
+                arch:
+                  - AMD64
+                  - ARM64
+                  - ARMHF
+        name: Test
+        runs-on: ${{ startsWith(matrix.arch, 'ARM') && 'raspberry-pi' || 'ubuntu-latest' }}
+        container: node:lts-bullseye
+        steps:
+          - name: Checkout Repository
+            uses: actions/checkout@v4
+            with:
+                submodules: false
+          # Dependencies
+          - name: Install Dependencies
+            run: ./scripts/install-dependencies.sh test ${{ matrix.arch }}
+          # Download Artifact
+          - name: Download Artifact
+            uses: christopherhx/gitea-download-artifact@v4
+            with:
+                name: ${{ matrix.arch }}
+                path: out
+          # Test
+          - name: Test
+            run: ./scripts/test.sh ${{ matrix.mode }} ${{ matrix.arch }}
+    # Example Mods
+    example-mods:
+        needs: build
+        name: Build Example Mods
+        runs-on: ubuntu-latest
+        container: node:lts-bullseye
+        steps:
+          - name: Checkout Repository
+            uses: actions/checkout@v4
+            with:
+                submodules: false
+          # Dependencies
+          - name: Install Dependencies
+            run: ./scripts/install-dependencies.sh example_mods amd64
+          # SDK
+          - name: Download SDK
+            uses: christopherhx/gitea-download-artifact@v4
+            with:
+                name: AMD64
+                path: out
+          - name: Extract SDK
+            run: |
+                ./scripts/fix-appimage-for-docker.sh ./out/*.AppImage
+                chmod +x ./out/*.AppImage
+                ./out/*.AppImage --appimage-extract-and-run --copy-sdk
+          # Build Example Mods
+          - name: Build Example Mods
+            run: ./example-mods/build.sh
+          - name: Upload Artifacts
+            uses: christopherhx/gitea-upload-artifact@v4
+            with:
+                name: Example Mods
+                path: ./example-mods/out/*
+                if-no-files-found: error
+    # Create Release
+    release:
+        if: startsWith(github.ref, 'refs/tags/')
+        needs:
+          - build
+          - test
+          - example-mods
+        name: Release
+        runs-on: ubuntu-latest
+        container: node:lts-bullseye
+        steps:
+          # Dependencies
+          - name: Install Go
+            uses: actions/setup-go@v5
+            with:
+                go-version: '>=1.20.1'
+          # Download Artifacts
+          - name: Download Artifacts
+            uses: christopherhx/gitea-download-artifact@v4
+            with:
+                path: out
+          # Create Release
+          - name: Create Release
+            uses: https://gitea.com/actions/release-action@main
+            with:
+                files: ./out/*/*.AppImage*
+                api_key: ${{ secrets.RELEASE_TOKEN }}
+                title: v${{ github.ref_name }}
+                body: "[View Changelog](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/src/branch/master/docs/CHANGELOG.md)"

.gitignore

@@ -12,4 +12,7 @@
 /*.AppImage
 /core*
 /qemu_*
-/cmake/.prebuilt-armhf-toolchain
+/example-mods/out
+/.testing-tmp
+/cmake-build-*
+/.idea

.gitmodules

@@ -1,15 +1,24 @@
-[submodule "dependencies/libpng/src"]
-	path = dependencies/libpng/src
-	url = https://github.com/glennrp/libpng.git
-[submodule "dependencies/zlib/src"]
-	path = dependencies/libpng/zlib/src
-	url = https://github.com/madler/zlib.git
 [submodule "dependencies/glfw/src"]
-	path = media-layer/core/dependencies/glfw/src
+	path = dependencies/glfw/src
 	url = https://github.com/glfw/glfw.git
 [submodule "dependencies/zenity/src"]
 	path = dependencies/zenity/src
-	url = https://gitea.thebrokenrail.com/TheBrokenRail/zenity.git
-[submodule "launcher/dependencies/patchelf/src"]
-	path = launcher/dependencies/patchelf/src
-	url = https://github.com/NixOS/patchelf.git
+	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/zenity.git
+[submodule "dependencies/LIEF/src"]
+	path = dependencies/LIEF/src
+	url = https://github.com/lief-project/LIEF.git
+[submodule "dependencies/stb_image/include"]
+	path = dependencies/stb_image/include
+	url = https://github.com/nothings/stb.git
+[submodule "dependencies/utf8cpp/src"]
+	path = dependencies/utf8cpp/src
+	url = https://github.com/nemtrif/utfcpp.git
+[submodule "archives"]
+	path = archives
+	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/archives.git
+[submodule "dependencies/symbol-processor/src"]
+	path = dependencies/symbol-processor/src
+	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/symbol-processor.git
+[submodule "dependencies/runtime/src"]
+	path = dependencies/runtime/src
+	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/runtime.git

CMakeLists.txt

@@ -1,141 +1,74 @@
-cmake_minimum_required(VERSION 3.16.0)
+cmake_minimum_required(VERSION 3.17.0)
+
+# Avoid Warning About DOWNLOAD_EXTRACT_TIMESTAMP
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.24.0)
+    cmake_policy(SET CMP0135 NEW)
+endif()
+
+# Core Options
+include(cmake/options/core-options.cmake)
 
 # Build Mode
-set(MCPI_BUILD_MODE "native" CACHE STRING "\"arm\" = Build Only Code That Must Be ARM; \"native\" = Build Architecture-Independent Code")
-set_property(CACHE MCPI_BUILD_MODE PROPERTY STRINGS "arm" "native")
-if(MCPI_BUILD_MODE STREQUAL "arm")
-    set(BUILD_ARM_COMPONENTS TRUE)
-    set(BUILD_NATIVE_COMPONENTS FALSE)
-elseif(MCPI_BUILD_MODE STREQUAL "native")
-    set(BUILD_ARM_COMPONENTS FALSE)
-    set(BUILD_NATIVE_COMPONENTS TRUE)
-else()
-    message(FATAL_ERROR "Invalid Mode")
-endif()
-
-# Specify Options
-option(MCPI_IS_MIXED_BUILD "Whether The Architecture-Independent And ARM Code Are Different Architecture" FALSE)
-option(MCPI_OPEN_SOURCE_ONLY "Only Install Open-Source Code (Will Result In Broken Install)" FALSE)
-option(MCPI_IS_APPIMAGE_BUILD "AppImage Build" FALSE)
-
-# Server/Headless Builds
-option(MCPI_SERVER_MODE "Server Mode" FALSE)
-option(MCPI_HEADLESS_MODE "Headless Mode" ${MCPI_SERVER_MODE})
-
-# Media Layer
-if(MCPI_HEADLESS_MODE)
-    set(DEFAULT_USE_MEDIA_LAYER_PROXY FALSE)
-else()
-    set(DEFAULT_USE_MEDIA_LAYER_PROXY ${MCPI_IS_MIXED_BUILD})
-endif()
-option(MCPI_USE_MEDIA_LAYER_PROXY "Whether To Enable The Media Layer Proxy" ${DEFAULT_USE_MEDIA_LAYER_PROXY})
-if(NOT MCPI_HEADLESS_MODE)
-    option(MCPI_USE_GLES1_COMPATIBILITY_LAYER "Whether To Enable The GLESv1_CM Compatibility Layer" TRUE)
-endif()
-
-# App ID
-set(DEFAULT_APP_ID "com.thebrokenrail.MCPIRebornLegacy")
-if(MCPI_SERVER_MODE)
-    string(APPEND DEFAULT_APP_ID "Server")
-else()
-    string(APPEND DEFAULT_APP_ID "Client")
-endif()
-set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID")
-
-# App Title
-set(DEFAULT_APP_TITLE "Minecraft: Pi Edition: Reborn Legacy")
-if(MCPI_SERVER_MODE)
-    string(APPEND DEFAULT_APP_TITLE " (Server)")
-else()
-    string(APPEND DEFAULT_APP_TITLE " (Client)")
-endif()
-set(MCPI_APP_TITLE "${DEFAULT_APP_TITLE}" CACHE STRING "App Title")
-
-# Specify Variant Name
-set(MCPI_VARIANT_NAME "minecraft-pi-reborn-legacy")
-if(MCPI_SERVER_MODE)
-    string(APPEND MCPI_VARIANT_NAME "-server")
-else()
-    string(APPEND MCPI_VARIANT_NAME "-client")
-endif()
-
-# Specify Installation Paths
-set(MCPI_INSTALL_DIR "lib/${MCPI_VARIANT_NAME}")
-set(MCPI_BIN_DIR "${MCPI_INSTALL_DIR}/bin")
-set(MCPI_LEGAL_DIR "${MCPI_INSTALL_DIR}/legal") # For Software Licenses
-set(MCPI_SDK_DIR "${MCPI_INSTALL_DIR}/sdk")
-set(MCPI_SDK_LIB_DIR "${MCPI_SDK_DIR}/lib")
-set(MCPI_SDK_INCLUDE_DIR "${MCPI_SDK_DIR}/include")
-
-# Library Directory
-set(MCPI_LIB_DIR "${MCPI_INSTALL_DIR}/lib")
-if(BUILD_ARM_COMPONENTS)
-    string(APPEND MCPI_LIB_DIR "/arm")
-elseif(BUILD_NATIVE_COMPONENTS)
-    string(APPEND MCPI_LIB_DIR "/native")
-endif()
-
-# Share Directory
-set(MCPI_SHARE_DIR "share")
-if(MCPI_IS_APPIMAGE_BUILD)
-    string(PREPEND MCPI_SHARE_DIR "usr/")
-endif()
-
-# Build Mode
-if(NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "Release")
-endif()
-
-# Prebuilt ARMHF Toolchain
-option(MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN "Whether To Use A Prebuilt ARMHF Toolchain For Building ARM Components" ${MCPI_IS_MIXED_BUILD})
-if(BUILD_ARM_COMPONENTS AND MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN)
-    include(cmake/prebuilt-armhf-toolchain.cmake)
+if(NOT DEFINED CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
 endif()
 
 # Start Project
 project(minecraft-pi-reborn)
 
 # Utility Functions
-include(cmake/util.cmake)
+include(cmake/util/util.cmake)
 
 # Sanity Checks
-if(BUILD_NATIVE_COMPONENTS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND NOT MCPI_IS_MIXED_BUILD)
-    message(FATAL_ERROR "Project is configured as a mixed-buld, but MCPI_IS_MIXED_BUILD is disabled.")
-endif()
-if(BUILD_ARM_COMPONENTS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
-    message(FATAL_ERROR "ARM-Targeting Compiler Required")
+string(CONCAT ARM_SANITY_CHECK
+    "include(CheckSymbolExists)\n"
+    "check_symbol_exists(\"__arm__\" \"\" IS_ARM_TARGETING)"
+)
+if(BUILD_ARM_COMPONENTS)
+    string(CONCAT ARM_SANITY_CHECK
+        "${ARM_SANITY_CHECK}\n"
+        "if(NOT IS_ARM_TARGETING)\n"
+        "    message(FATAL_ERROR \"ARM-Targeting Compiler Required\")\n"
+        "endif()"
+    )
 endif()
+cmake_language(EVAL CODE "${ARM_SANITY_CHECK}")
 
-# Specify Default Installation Prefix
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    set(DEFAULT_PREFIX "/usr")
-    if(MCPI_IS_APPIMAGE_BUILD)
-        set(DEFAULT_PREFIX "/")
-    endif()
-    set(CMAKE_INSTALL_PREFIX "${DEFAULT_PREFIX}" CACHE PATH "" FORCE)
-endif()
+# Extra Options
+include(cmake/options/extra-options.cmake)
 
-# Optimizations
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_compile_options(-O3 -s)
-else()
-    add_compile_options(-g)
-endif()
+# Paths
+include(cmake/options/paths.cmake)
 
-# Use LLD When Using Clang
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    add_link_options("-fuse-ld=lld")
-endif()
+# Required Compile Flags
+string(CONCAT COMPILE_FLAGS_SETUP
+    # Optimizations
+    "if(CMAKE_BUILD_TYPE STREQUAL \"Release\")\n"
+    "    add_compile_options(-O3)\n"
+    "    add_link_options(-s)\n"
+    "else()\n"
+    "    add_compile_options(-g)\n"
+    "endif()\n"
 
-# PIC
-set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+    # PIC
+    "set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)\n"
+
+    # Warnings
+    "add_link_options(-Wl,--no-undefined)\n"
+
+    # C Standard
+    "add_definitions(-D_GNU_SOURCE)\n"
+    "set(CMAKE_C_STANDARD 99)\n"
+    "set(CMAKE_CXX_STANDARD 20)\n"
+
+    # Skip RPath
+    "set(CMAKE_SKIP_BUILD_RPATH TRUE)"
+)
+cmake_language(EVAL CODE "${COMPILE_FLAGS_SETUP}")
 
 # Fast Math
 add_compile_options(-ffast-math)
 
-# Buld Dependencies
-add_subdirectory(dependencies)
-
 # Warnings
 add_compile_options(-Wall -Wextra -Werror -Wpointer-arith -Wshadow -Wnull-dereference)
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
@@ -147,19 +80,9 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
         add_compile_options(-Wno-array-bounds -Wno-stringop-overread)
     endif()
 endif()
-add_link_options(-Wl,--no-undefined)
-add_definitions(-D_GNU_SOURCE)
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_CXX_STANDARD 11)
 
-# Version
-set_property(
-    DIRECTORY
-    APPEND
-    PROPERTY CMAKE_CONFIGURE_DEPENDS VERSION
-)
-file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" MCPI_VERSION)
-file(TIMESTAMP "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" MCPI_VERSION_DATE "%Y-%m-%d" UTC)
+# Buld Dependencies
+add_subdirectory(dependencies)
 
 # Build libreborn
 add_subdirectory(libreborn)
@@ -187,7 +110,66 @@ if(BUILD_NATIVE_COMPONENTS)
     add_subdirectory(images)
 endif()
 
+# Install Prebuilt ARMHF Toolchain Sysroot
+if(BUILD_NATIVE_COMPONENTS AND MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN)
+    install_arm_sysroot()
+endif()
+
 # Install SDK
 if(BUILD_ARM_COMPONENTS)
-    install(EXPORT sdk DESTINATION "${MCPI_SDK_DIR}" EXPORT_LINK_INTERFACE_LIBRARIES)
+    install(EXPORT sdk DESTINATION "${MCPI_SDK_DIR}" FILE "sdk-targets.cmake" EXPORT_LINK_INTERFACE_LIBRARIES)
+    file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sdk.cmake"
+        # Compile Flags
+        "${COMPILE_FLAGS_SETUP}\n"
+        # Snaity Check
+        "${ARM_SANITY_CHECK}\n"
+        # Log
+        "message(STATUS \"Using Reborn SDK v${MCPI_VERSION}\")\n"
+        # Include Targets
+        "include(\"\${CMAKE_CURRENT_LIST_DIR}/sdk-targets.cmake\")\n"
+    )
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sdk.cmake" DESTINATION "${MCPI_SDK_DIR}")
+endif()
+
+# Packaging
+if(BUILD_NATIVE_COMPONENTS)
+    include(cmake/cpack/packaging.cmake)
+endif()
+
+# Superbuild
+if(BUILD_NATIVE_COMPONENTS)
+    include(ExternalProject)
+    # Arguments
+    set(ARM_OPTIONS "${MCPI_OPTIONS}")
+    list(APPEND ARM_OPTIONS "-DMCPI_BUILD_MODE:STRING=arm")
+    list(APPEND ARM_OPTIONS "-DCMAKE_INSTALL_MESSAGE:STRING=NEVER")
+    list(APPEND ARM_OPTIONS "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>")
+    if(NOT MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN)
+        if(DEFINED CMAKE_TOOLCHAIN_FILE)
+            list(APPEND ARM_OPTIONS "-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}")
+        endif()
+    else()
+        list(APPEND ARM_OPTIONS "-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${MCPI_CMAKE_TOOLCHAIN_FILE}")
+    endif()
+    list(APPEND ARM_OPTIONS "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}")
+    # Build
+    ExternalProject_Add(arm-components
+        DOWNLOAD_COMMAND ""
+        SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
+        CMAKE_CACHE_ARGS ${ARM_OPTIONS}
+        INSTALL_COMMAND
+            "${CMAKE_COMMAND}" "-E"
+            "rm" "-rf" "<INSTALL_DIR>/${MCPI_INSTALL_DIR}"
+        COMMAND
+            "${CMAKE_COMMAND}" "-E" "env"
+            "DESTDIR="
+            "${CMAKE_COMMAND}" "--install" "<BINARY_DIR>"
+        USES_TERMINAL_CONFIGURE TRUE
+        USES_TERMINAL_BUILD TRUE
+        USES_TERMINAL_INSTALL TRUE
+        BUILD_ALWAYS TRUE
+    )
+    # Install
+    ExternalProject_Get_Property(arm-components INSTALL_DIR)
+    install(DIRECTORY "${INSTALL_DIR}/${MCPI_INSTALL_DIR}/" DESTINATION "${MCPI_INSTALL_DIR}")
 endif()

Dockerfile

@@ -1,19 +0,0 @@
-FROM debian:bullseye-slim
-
-# Install
-RUN \
-    apt-get update && \
-    apt-get install -y tini qemu-user && \
-    apt-get --fix-broken install -y && \
-    rm -rf /var/lib/apt/lists/*
-
-# Copy
-ADD ./out/server-amd64 /app
-
-# Setup Working Directory
-RUN mkdir /data
-WORKDIR /data
-
-# Setup Entrypoint
-ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["/app/usr/bin/minecraft-pi-reborn-legacy-server"]

Jenkinsfile

@@ -1,37 +0,0 @@
-pipeline {
-    agent none
-    stages {
-        stage('Debian Buster') {
-            agent {
-                dockerfile {
-                    filename 'scripts/ci/Dockerfile'
-                    args '-v /var/run/docker.sock:/var/run/docker.sock --network host'
-                }
-            }
-            stages {
-                stage('Build') {
-                    steps {
-                        sh './scripts/ci/run.sh'
-                    }
-                    post {
-                        success {
-                            archiveArtifacts artifacts: 'out/*.AppImage*', fingerprint: true
-                        }
-                    }
-                }
-                stage('Publish') {
-                    steps {
-                        sh 'apt-get update && apt-get install -y docker.io'
-                        sh 'rm -rf ./out/server-amd64'
-                        sh './scripts/build.sh server amd64'
-                        sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-legacy-server .'
-                        withCredentials([usernamePassword(credentialsId: 'docker_hub_login', usernameVariable: 'DOCKER_HUB_USERNAME', passwordVariable: 'DOCKER_HUB_PASSWORD')]) {
-                            sh 'docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"'
-                        }
-                        sh 'docker push thebrokenrail/minecraft-pi-reborn-legacy-server'
-                    }
-                }
-            }
-        }
-    }
-}

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 TheBrokenRail
+Copyright (c) 2024 TheBrokenRail
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,8 +2,16 @@
     <img alt="Start Screen" src="images/start.png">
 </p>
 
-# Minecraft: Pi Edition: Reborn Legacy
+<p align="center">
+    <a href="https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/releases/latest"><img height="80" alt="Download as an AppImage" src="https://docs.appimage.org/_images/download-appimage-banner.svg" /></a>
+    <a href="https://flathub.org/apps/details/com.thebrokenrail.MCPIReborn"><img height="80" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.svg" /></a>
+    <a href="https://github.com/Botspot/pi-apps"><img height="80" alt="Get it from Pi-Apps" src="https://github.com/Botspot/pi-apps/blob/master/icons/badge.png?raw=true" /></a>
+</p>
+
+# Minecraft: Pi Edition: Reborn [![Gitea Actions](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/actions/workflows/build.yml/badge.svg)](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/actions)
 Minecraft: Pi Edition Modding Project
 
+Get started [here](docs/GETTING_STARTED.md)!
+
 ## Documentation
 [View Documentation](docs/README.md)

VERSION

@@ -1 +1 @@
-2.4.1
+3.0.0

archives

@@ -0,0 +1 @@
+Subproject commit 2f5953779674ec3a14114aa34b24c81005571ec4

cmake/cpack/appimage.cmake

@@ -0,0 +1,62 @@
+# Downlaod AppImage Runtime
+set(RUNTIME_ARCH "unknown")
+if(CPACK_MCPI_ARCH STREQUAL "armhf")
+    set(RUNTIME_ARCH "armhf")
+elseif(CPACK_MCPI_ARCH STREQUAL "arm64")
+    set(RUNTIME_ARCH "aarch64")
+elseif(CPACK_MCPI_ARCH STREQUAL "amd64")
+    set(RUNTIME_ARCH "x86_64")
+endif()
+set(RUNTIME "${CPACK_TOPLEVEL_DIRECTORY}/runtime")
+file(DOWNLOAD
+    "https://github.com/AppImage/AppImageKit/releases/download/continuous/runtime-${RUNTIME_ARCH}"
+    "${RUNTIME}"
+    STATUS DOWNLOAD_STATUS
+)
+list(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+list(GET DOWNLOAD_STATUS 1 ERROR_MESSAGE)
+if(NOT STATUS_CODE EQUAL 0)
+    message(FATAL_ERROR "Unable To Downlopad AppImage Runtime: ${ERROR_MESSAGE}")
+else()
+    message(STATUS "Downloaded AppImage Runtime: ${RUNTIME}")
+endif()
+
+# Package
+set(APPIMAGE_ARCH "unknown")
+if(CPACK_MCPI_ARCH STREQUAL "armhf")
+    set(APPIMAGE_ARCH "arm")
+elseif(CPACK_MCPI_ARCH STREQUAL "arm64")
+    set(APPIMAGE_ARCH "arm_aarch64")
+elseif(CPACK_MCPI_ARCH STREQUAL "amd64")
+    set(APPIMAGE_ARCH "x86_64")
+endif()
+execute_process(
+    COMMAND
+        "${CMAKE_COMMAND}" "-E" "env"
+        "ARCH=${APPIMAGE_ARCH}"
+        "appimagetool"
+        "--updateinformation" "zsync|https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/releases/download/latest/${CPACK_PACKAGE_FILE_NAME_ZSYNC}.AppImage.zsync"
+        "--runtime-file" "${RUNTIME}"
+        "--comp" "xz"
+        "${CPACK_TEMPORARY_DIRECTORY}"
+        "${CPACK_PACKAGE_FILE_NAME}.AppImage"
+    WORKING_DIRECTORY "${CPACK_PACKAGE_DIRECTORY}"
+    RESULT_VARIABLE APPIMAGETOOL_RESULT
+)
+if(NOT APPIMAGETOOL_RESULT EQUAL 0)
+    message(FATAL_ERROR "Unable Package AppImage")
+endif()
+
+# Rename ZSync File
+file(RENAME "${CPACK_PACKAGE_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.AppImage.zsync" "${CPACK_PACKAGE_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME_ZSYNC}.AppImage.zsync")
+
+# Summary Message
+function(check_file name)
+    if(EXISTS "${CPACK_PACKAGE_DIRECTORY}/${name}")
+        message(STATUS "Generated: ${name}")
+    else()
+        message(FATAL_ERROR "Missing File: ${name}")
+    endif()
+endfunction()
+check_file("${CPACK_PACKAGE_FILE_NAME}.AppImage")
+check_file("${CPACK_PACKAGE_FILE_NAME_ZSYNC}.AppImage.zsync")

cmake/cpack/packaging.cmake

@@ -0,0 +1,38 @@
+# Determine Architecture
+set(CPACK_MCPI_ARCH "unknown")
+include(CheckSymbolExists)
+function(check_arch symbol name)
+    set(CMAKE_REQUIRED_QUIET TRUE)
+    check_symbol_exists("${symbol}" "" "IS_ARCH_${name}")
+    unset(CMAKE_REQUIRED_QUIET)
+    if("${IS_ARCH_${name}}")
+        set(CPACK_MCPI_ARCH "${name}" PARENT_SCOPE)
+    endif()
+endfunction()
+check_arch("__arm__" "armhf")
+check_arch("__aarch64__" "arm64")
+check_arch("__x86_64__" "amd64")
+
+# CPack
+set(CPACK_PACKAGE_NAME "${MCPI_VARIANT_NAME}")
+set(CPACK_PACKAGE_VENDOR "TheBrokenRail & Mojang AB")
+set(CPACK_VERBATIM_VARIABLES TRUE)
+set(CPACK_MONOLITHIC_INSTALL TRUE)
+set(CPACK_PACKAGE_FILE_NAME "${MCPI_VARIANT_NAME}-${MCPI_VERSION}-${CPACK_MCPI_ARCH}")
+set(CPACK_PACKAGE_FILE_NAME_ZSYNC "${MCPI_VARIANT_NAME}-latest-${CPACK_MCPI_ARCH}")
+
+# Version
+string(REPLACE "." ";" VERSION_LIST "${MCPI_VERSION}")
+list(GET VERSION_LIST 0 CPACK_PACKAGE_VERSION_MAJOR)
+list(GET VERSION_LIST 1 CPACK_PACKAGE_VERSION_MINOR)
+list(GET VERSION_LIST 2 CPACK_PACKAGE_VERSION_PATCH)
+
+# AppImage
+if(MCPI_IS_APPIMAGE_BUILD)
+    set(CPACK_GENERATOR "External")
+    set(CPACK_EXTERNAL_ENABLE_STAGING TRUE)
+    set(CPACK_EXTERNAL_PACKAGE_SCRIPT "${CMAKE_CURRENT_LIST_DIR}/appimage.cmake")
+endif()
+
+# Package
+include(CPack)

cmake/options/core-options.cmake

@@ -0,0 +1,27 @@
+# Build Mode
+set(MCPI_BUILD_MODE "native" CACHE STRING "\"arm\" = Build Only Code That Must Be ARM; \"native\" = Build Architecture-Independent Code")
+set_property(CACHE MCPI_BUILD_MODE PROPERTY STRINGS "arm" "native")
+if(MCPI_BUILD_MODE STREQUAL "arm")
+    set(BUILD_ARM_COMPONENTS TRUE)
+    set(BUILD_NATIVE_COMPONENTS FALSE)
+elseif(MCPI_BUILD_MODE STREQUAL "native")
+    set(BUILD_ARM_COMPONENTS FALSE)
+    set(BUILD_NATIVE_COMPONENTS TRUE)
+else()
+    message(FATAL_ERROR "Invalid Mode")
+endif()
+
+# Specify Options
+set(MCPI_OPTIONS "")
+function(mcpi_option name description type default)
+    set(full_name "MCPI_${name}")
+    set("${full_name}" "${default}" CACHE "${type}" "${description}")
+    list(APPEND MCPI_OPTIONS "-D${full_name}:${type}=${${full_name}}")
+    set(MCPI_OPTIONS "${MCPI_OPTIONS}" PARENT_SCOPE)
+endfunction()
+
+# Clear External CFLAGS When Building ARM Components
+if(BUILD_ARM_COMPONENTS)
+    unset(ENV{CFLAGS})
+    unset(ENV{CXXFLAGS})
+endif()

cmake/options/extra-options.cmake

@@ -0,0 +1,57 @@
+# Specify Options
+mcpi_option(OPEN_SOURCE_ONLY "Only Install Open-Source Code (Will Result In Broken Install)" BOOL FALSE)
+mcpi_option(IS_APPIMAGE_BUILD "AppImage Build" BOOL FALSE)
+mcpi_option(IS_FLATPAK_BUILD "Flatpak Build" BOOL FALSE)
+if(MCPI_IS_APPIMAGE_BUILD AND MCPI_IS_FLATPAK_BUILD)
+    message(FATAL_ERROR "Invalid Build Configuration")
+endif()
+
+# Prebuilt ARMHF Toolchain
+if(BUILD_NATIVE_COMPONENTS)
+    set(MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN FALSE)
+    if(NOT IS_ARM_TARGETING)
+        set(MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN TRUE)
+    endif()
+    if(MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN)
+        include("${CMAKE_CURRENT_LIST_DIR}/prebuilt-armhf-toolchain.cmake")
+    endif()
+endif()
+
+# Media Layer
+set(DEFAULT_USE_MEDIA_LAYER_TRAMPOLINE FALSE)
+if(BUILD_NATIVE_COMPONENTS AND NOT IS_ARM_TARGETING)
+    set(DEFAULT_USE_MEDIA_LAYER_TRAMPOLINE TRUE)
+endif()
+mcpi_option(USE_MEDIA_LAYER_TRAMPOLINE "Whether To Enable The Media Layer Trampoline" BOOL "${DEFAULT_USE_MEDIA_LAYER_TRAMPOLINE}")
+if(MCPI_USE_MEDIA_LAYER_TRAMPOLINE)
+    set(BUILD_MEDIA_LAYER_CORE "${BUILD_NATIVE_COMPONENTS}")
+else()
+    set(BUILD_MEDIA_LAYER_CORE "${BUILD_ARM_COMPONENTS}")
+endif()
+
+# Specify Variant Name
+set(MCPI_VARIANT_NAME "minecraft-pi-reborn")
+
+# App ID
+mcpi_option(APP_ID "App ID" STRING "com.thebrokenrail.MCPIReborn")
+
+# App Title
+mcpi_option(APP_TITLE "App Title" STRING "Minecraft: Pi Edition: Reborn")
+
+# Skin Server
+mcpi_option(SKIN_SERVER "Skin Server" STRING "https://raw.githubusercontent.com/MCPI-Revival/Skins/data")
+
+# Discord Invite URL
+mcpi_option(DISCORD_INVITE "Discord Invite URL" STRING "https://discord.gg/mcpi-revival-740287937727561779")
+
+# Version
+set_property(
+    DIRECTORY
+    APPEND
+    PROPERTY CMAKE_CONFIGURE_DEPENDS VERSION
+)
+file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../../VERSION" MCPI_VERSION)
+file(TIMESTAMP "${CMAKE_CURRENT_LIST_DIR}/../../VERSION" MCPI_VERSION_DATE "%Y-%m-%d" UTC)
+
+# Documentation URL
+mcpi_option(DOCUMENTATION "Documentation URL" STRING "https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/src/tag/${MCPI_VERSION}/docs/")

cmake/options/paths.cmake

@@ -0,0 +1,33 @@
+# Specify Installation Paths
+set(MCPI_INSTALL_DIR "lib/${MCPI_VARIANT_NAME}")
+set(MCPI_BIN_DIR "${MCPI_INSTALL_DIR}/bin")
+set(MCPI_LEGAL_DIR "${MCPI_INSTALL_DIR}/legal") # For Software Licenses
+set(MCPI_SDK_DIR "${MCPI_INSTALL_DIR}/sdk")
+set(MCPI_SDK_LIB_DIR "${MCPI_SDK_DIR}/lib")
+set(MCPI_SDK_INCLUDE_DIR "${MCPI_SDK_DIR}/include")
+
+# Library Directory
+set(MCPI_LIB_DIR "${MCPI_INSTALL_DIR}/lib")
+if(BUILD_ARM_COMPONENTS)
+    string(APPEND MCPI_LIB_DIR "/arm")
+elseif(BUILD_NATIVE_COMPONENTS)
+    string(APPEND MCPI_LIB_DIR "/native")
+endif()
+
+# Share Directory
+set(MCPI_SHARE_DIR "share")
+if(MCPI_IS_APPIMAGE_BUILD)
+    string(PREPEND MCPI_SHARE_DIR "usr/")
+endif()
+
+# Specify Default Installation Prefix
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(DEFAULT_PREFIX "/usr")
+    if(MCPI_IS_APPIMAGE_BUILD)
+        set(DEFAULT_PREFIX "/")
+    elseif(MCPI_IS_FLATPAK_BUILD)
+        set(DEFAULT_PREFIX "/app")
+    endif()
+    set(CMAKE_INSTALL_PREFIX "${DEFAULT_PREFIX}" CACHE PATH "" FORCE)
+    set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT FALSE)
+endif()

cmake/options/prebuilt-armhf-toolchain.cmake

@@ -0,0 +1,72 @@
+# Pick Archive
+set(toolchain_version "13.3.rel1")
+execute_process(COMMAND uname -m OUTPUT_VARIABLE arch OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(arch STREQUAL "x86_64")
+    set(toolchain_file "arm-gnu-toolchain-${toolchain_version}-x86_64-arm-none-linux-gnueabihf.tar.xz")
+elseif(arch STREQUAL "aarch64" OR arch STREQUAL "armv8b" OR arch STREQUAL "armv8l")
+    set(toolchain_file "arm-gnu-toolchain-${toolchain_version}-aarch64-arm-none-linux-gnueabihf.tar.xz")
+else()
+    message(FATAL_ERROR "Unable To Download Prebuilt ARMHF Toolchain")
+endif()
+
+# Download If Needed
+include(FetchContent)
+FetchContent_Declare(
+    prebuilt-armhf-toolchain
+    URL "${CMAKE_CURRENT_LIST_DIR}/../../archives/${toolchain_file}"
+)
+FetchContent_MakeAvailable(prebuilt-armhf-toolchain)
+set(toolchain_dir "${prebuilt-armhf-toolchain_SOURCE_DIR}")
+
+# Force Toolchain
+file(WRITE "${toolchain_dir}/toolchain.cmake"
+    "set(CMAKE_C_COMPILER \"\${CMAKE_CURRENT_LIST_DIR}/bin/arm-none-linux-gnueabihf-gcc\")\n"
+    "set(CMAKE_CXX_COMPILER \"\${CMAKE_CURRENT_LIST_DIR}/bin/arm-none-linux-gnueabihf-g++\")\n"
+    "set(CMAKE_SYSTEM_NAME \"Linux\")\n"
+    "set(CMAKE_SYSTEM_PROCESSOR \"arm\")\n"
+    "set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)\n"
+)
+set(MCPI_CMAKE_TOOLCHAIN_FILE "${toolchain_dir}/toolchain.cmake" CACHE FILEPATH "" FORCE)
+
+# Build Sysroot
+set(sysroot_dir "${CMAKE_CURRENT_BINARY_DIR}/bundled-armhf-sysroot")
+if("${toolchain_dir}/bin/arm-none-linux-gnueabihf-gcc" IS_NEWER_THAN "${sysroot_dir}")
+    # Create Directory
+    file(REMOVE_RECURSE "${sysroot_dir}")
+    file(MAKE_DIRECTORY "${sysroot_dir}")
+
+    # Copy Files From Toolchain
+    file(
+        COPY "${toolchain_dir}/arm-none-linux-gnueabihf/libc/"
+        DESTINATION "${sysroot_dir}"
+        USE_SOURCE_PERMISSIONS
+        FILES_MATCHING
+        PATTERN "*.so*"
+    )
+
+    # Delete Unneeded Files
+    file(REMOVE_RECURSE "${sysroot_dir}/usr/lib/audit")
+    file(REMOVE_RECURSE "${sysroot_dir}/usr/lib/gconv")
+
+    # Strip Files
+    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+        file(GLOB_RECURSE files LIST_DIRECTORIES FALSE "${sysroot_dir}/*")
+        foreach(file IN LISTS files)
+            execute_process(COMMAND "${toolchain_dir}/bin/arm-none-linux-gnueabihf-strip" "${file}" RESULT_VARIABLE ret)
+            # Check Result
+            if(NOT ret EQUAL 0)
+                # Delete Invalid Files
+                file(REMOVE "${file}")
+            endif()
+        endforeach()
+    endif()
+endif()
+
+# Install Sysroot (Skipping Empty Directories)
+function(install_arm_sysroot)
+    file(GLOB_RECURSE files LIST_DIRECTORIES FALSE RELATIVE "${sysroot_dir}" "${sysroot_dir}/*")
+    foreach(file IN LISTS files)
+        get_filename_component(parent "${file}" DIRECTORY)
+        install(PROGRAMS "${sysroot_dir}/${file}" DESTINATION "${MCPI_INSTALL_DIR}/sysroot/${parent}")
+    endforeach()
+endfunction()

cmake/prebuilt-armhf-toolchain.cmake

@@ -1,84 +0,0 @@
-# Locations
-set(toolchain_dir "${CMAKE_CURRENT_LIST_DIR}/.prebuilt-armhf-toolchain")
-set(sysroot_dir "${CMAKE_CURRENT_BINARY_DIR}/bundled-armhf-sysroot")
-
-# Force Toolchain
-set(CMAKE_C_COMPILER "${toolchain_dir}/bin/arm-none-linux-gnueabihf-gcc")
-set(CMAKE_CXX_COMPILER "${toolchain_dir}/bin/arm-none-linux-gnueabihf-g++")
-set(CMAKE_SYSTEM_NAME "Linux")
-set(CMAKE_SYSTEM_PROCESSOR "arm")
-unset(CMAKE_TOOLCHAIN_FILE CACHE)
-
-# Download If Needed
-if(NOT EXISTS "${CMAKE_C_COMPILER}")
-    # Pick URL
-    execute_process(COMMAND uname -m OUTPUT_VARIABLE arch OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(arch STREQUAL "x86_64")
-        set(toolchain_url "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf.tar.xz")
-        set(toolchain_sha256 "aa074fa8371a4f73fecbd16bd62c8b1945f23289e26414794f130d6ccdf8e39c")
-    elseif(arch STREQUAL "aarch64" OR arch STREQUAL "armv8b" OR arch STREQUAL "armv8l")
-        set(toolchain_url "https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-aarch64-arm-none-linux-gnueabihf.tar.xz")
-        set(toolchain_sha256 "fccd7af76988da2b077f939eb2a78baa9935810918d2bf3f837bc74f52efa825")
-    else()
-        message(FATAL_ERROR "Unable To Download Prebuilt ARMHF Toolchain")
-    endif()
-
-    # Download
-    message(STATUS "Downloading Prebuilt ARMHF Toolchain...")
-    file(REMOVE_RECURSE "${toolchain_dir}")
-    include(FetchContent)
-    set(FETCHCONTENT_QUIET FALSE)
-    FetchContent_Declare(
-        prebuilt-armhf-toolchain
-        URL "${toolchain_url}"
-        URL_HASH "SHA256=${toolchain_sha256}"
-        SOURCE_DIR "${toolchain_dir}"
-    )
-    FetchContent_Populate(prebuilt-armhf-toolchain)
-
-    # Force Sysroot Rebuild
-    file(REMOVE_RECURSE "${sysroot_dir}")
-endif()
-
-# Build Sysroot
-if(NOT EXISTS "${sysroot_dir}")
-    # Create Directory
-    file(MAKE_DIRECTORY "${sysroot_dir}")
-
-    # Copy Files From Toolchain
-    file(
-        COPY "${toolchain_dir}/arm-none-linux-gnueabihf/libc/"
-        DESTINATION "${sysroot_dir}"
-        USE_SOURCE_PERMISSIONS
-        FILES_MATCHING
-        PATTERN "*.so*"
-    )
-
-    # Delete Unneeded Files
-    file(REMOVE_RECURSE "${sysroot_dir}/usr/lib/audit")
-
-    # Strip Files
-    file(GLOB_RECURSE files LIST_DIRECTORIES FALSE "${sysroot_dir}/*")
-    foreach(file IN LISTS files)
-        execute_process(COMMAND "${toolchain_dir}/bin/arm-none-linux-gnueabihf-strip" "${file}" RESULT_VARIABLE ret)
-        # Check Result
-        if(NOT ret EQUAL 0)
-            # Delete Invalid Files
-            file(REMOVE "${file}")
-        endif()
-    endforeach()
-
-    # Setup gconv
-    file(
-        COPY "${toolchain_dir}/arm-none-linux-gnueabihf/libc/usr/lib/gconv/gconv-modules"
-        DESTINATION "${sysroot_dir}/usr/lib/gconv"
-        USE_SOURCE_PERMISSIONS
-    )
-endif()
-
-# Install Sysroot (Skipping Empty Directories)
-file(GLOB_RECURSE files LIST_DIRECTORIES FALSE RELATIVE "${sysroot_dir}" "${sysroot_dir}/*")
-foreach(file IN LISTS files)
-    get_filename_component(parent "${file}" DIRECTORY)
-    install(PROGRAMS "${sysroot_dir}/${file}" DESTINATION "${MCPI_INSTALL_DIR}/sysroot/${parent}")
-endforeach()

cmake/toolchain/base-toolchain.cmake

@@ -9,6 +9,7 @@ macro(setup_toolchain target)
     add_target_variant(unknown)
     add_target_variant(none)
     add_target_variant(pc)
+
     # Find Compiler
     macro(find_compiler output name)
         set(possible_names "")
@@ -26,13 +27,11 @@ macro(setup_toolchain target)
     endmacro()
     find_compiler(CMAKE_C_COMPILER "gcc")
     find_compiler(CMAKE_CXX_COMPILER "g++")
+
     # Extra
     set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
     # Custom Search Paths
-    if(NOT DEFINED ENV{MCPI_TOOLCHAIN_USE_DEFAULT_SEARCH_PATHS})
-        # Find Root
-        set(CMAKE_FIND_ROOT_PATH "/usr/${target}" "/usr/lib/${target}" "/usr")
-        # pkg-config
-        set(ENV{PKG_CONFIG_LIBDIR} "/usr/lib/${target}/pkgconfig:/usr/${target}/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig")
-    endif()
+    set(CMAKE_FIND_ROOT_PATH "/usr/${target}" "/usr/lib/${target}" "/usr")
+    # pkg-config
+    set(ENV{PKG_CONFIG_LIBDIR} "/usr/lib/${target}/pkgconfig:/usr/${target}/lib/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig")
 endmacro()

cmake/toolchain/i386-toolchain.cmake

@@ -1,9 +0,0 @@
-# Warning
-message(WARNING "i686 Builds Are Unsupported, Proceed At Your Own Risk")
-# Compile For i686
-include("${CMAKE_CURRENT_LIST_DIR}/base-toolchain.cmake")
-# Use i686 Cross-Compiler
-setup_toolchain("i686-linux-gnu")
-# Details
-set(CMAKE_SYSTEM_NAME "Linux")
-set(CMAKE_SYSTEM_PROCESSOR "i686")

cmake/util.cmake

@@ -1,10 +0,0 @@
-# Symlink Function
-function(install_symlink target link)
-    get_filename_component(parent "${link}" DIRECTORY)
-    if(parent STREQUAL "")
-        set(parent ".")
-    endif()
-    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/symlink/${parent}")
-    file(CREATE_LINK "${target}" "${CMAKE_BINARY_DIR}/symlink/${link}" SYMBOLIC)
-    install(FILES "${CMAKE_BINARY_DIR}/symlink/${link}" DESTINATION "${parent}")
-endfunction()

cmake/util/embed-resource.cmake

@@ -0,0 +1,12 @@
+# Read Hex Data
+file(READ "${EMBED_IN}" data HEX)
+
+# Convert Hex Data For C Compatibility
+string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," data "${data}")
+
+# Get C Name
+get_filename_component(name "${EMBED_IN}" NAME)
+string(MAKE_C_IDENTIFIER "${name}" name)
+
+# Write Data
+file(WRITE "${EMBED_OUT}" "#include <stddef.h>\nconst unsigned char ${name}[] = {${data}};\nconst size_t ${name}_len = sizeof (${name});\n")

cmake/util/util.cmake

@@ -0,0 +1,33 @@
+# Symlink Function
+function(install_symlink target link)
+    get_filename_component(parent "${link}" DIRECTORY)
+    if(parent STREQUAL "")
+        set(parent ".")
+    endif()
+    file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/symlink/${parent}")
+    file(CREATE_LINK "${target}" "${CMAKE_BINARY_DIR}/symlink/${link}" SYMBOLIC)
+    install(FILES "${CMAKE_BINARY_DIR}/symlink/${link}" DESTINATION "${parent}")
+endfunction()
+
+# Embed Resources
+set(util_list_dir "${CMAKE_CURRENT_LIST_DIR}")
+function(embed_resource target file)
+    # Get C Name
+    get_filename_component(name "${file}" NAME)
+    string(MAKE_C_IDENTIFIER "${name}" name)
+    # Add Command
+    add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${name}.c"
+        COMMAND "${CMAKE_COMMAND}"
+        ARGS "-DEMBED_IN=${CMAKE_CURRENT_SOURCE_DIR}/${file}" "-DEMBED_OUT=${CMAKE_CURRENT_BINARY_DIR}/${name}.c" "-P" "${util_list_dir}/embed-resource.cmake"
+        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${file}" "${util_list_dir}/embed-resource.cmake"
+    )
+    # Add To Target
+    target_sources("${target}" PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/${name}.c")
+endfunction()
+
+# Nicer Output
+function(message log_level)
+    if((NOT MESSAGE_QUIET) OR (NOT (log_level STREQUAL "STATUS" OR log_level MATCHES "^CHECK_")))
+        _message("${log_level}" ${ARGN})
+    endif()
+endfunction()

dependencies/CMakeLists.txt

@@ -1,14 +1,30 @@
 project(dependencies)
 
-# LibPNG
+# stb_image
 if(BUILD_ARM_COMPONENTS)
-    add_subdirectory(libpng)
+    add_subdirectory(stb_image)
 endif()
 # Minecraft: Pi Edition
 if(BUILD_ARM_COMPONENTS AND NOT MCPI_OPEN_SOURCE_ONLY)
     add_subdirectory(minecraft-pi)
 endif()
 # Zenity (Minimal Build)
-if(BUILD_NATIVE_COMPONENTS AND NOT MCPI_SERVER_MODE)
+if(BUILD_NATIVE_COMPONENTS)
     add_subdirectory(zenity)
 endif()
+# LIEF
+if(BUILD_NATIVE_COMPONENTS OR BUILD_MEDIA_LAYER_CORE)
+    add_subdirectory(LIEF)
+endif()
+# Extra Runtime
+add_subdirectory(runtime)
+# GLFW
+if(BUILD_MEDIA_LAYER_CORE)
+    add_subdirectory(glfw)
+endif()
+# UTF8-CPP
+add_subdirectory(utf8cpp)
+# Symbol Prcoessor
+if(BUILD_ARM_COMPONENTS)
+    add_subdirectory(symbol-processor)
+endif()

dependencies/LIEF/CMakeLists.txt

@@ -0,0 +1,38 @@
+project(LIEF)
+
+# Silence Warnings
+add_compile_options(-w -Wno-psabi)
+
+## LIEF
+
+# Options
+set(BUILD_SHARED_LIBS TRUE CACHE BOOL "" FORCE)
+set(LIEF_C_API FALSE CACHE BOOL "" FORCE)
+set(LIEF_EXAMPLES FALSE CACHE BOOL "" FORCE)
+set(LIEF_PYTHON_API FALSE CACHE BOOL "" FORCE)
+set(LIEF_TESTS FALSE CACHE BOOL "" FORCE)
+set(LIEF_USE_CCACHE FALSE CACHE BOOL "" FORCE)
+set(LIEF_LOGGING FALSE CACHE BOOL "" FORCE)
+set(LIEF_LOGGING_DEBUG FALSE CACHE BOOL "" FORCE)
+set(LIEF_ENABLE_JSON FALSE CACHE BOOL "" FORCE)
+set(LIEF_ELF TRUE CACHE BOOL "" FORCE)
+set(LIEF_PE FALSE CACHE BOOL "" FORCE)
+set(LIEF_MACHO FALSE CACHE BOOL "" FORCE)
+set(LIEF_DEX FALSE CACHE BOOL "" FORCE)
+set(LIEF_ART FALSE CACHE BOOL "" FORCE)
+set(LIEF_OAT FALSE CACHE BOOL "" FORCE)
+set(LIEF_VDEX FALSE CACHE BOOL "" FORCE)
+
+# Download
+set(MESSAGE_QUIET TRUE)
+add_subdirectory(src EXCLUDE_FROM_ALL)
+unset(MESSAGE_QUIET)
+
+# Install
+install(TARGETS LIB_LIEF DESTINATION "${MCPI_LIB_DIR}")
+if(BUILD_ARM_COMPONENTS)
+    install(TARGETS LIB_LIEF EXPORT sdk DESTINATION "${MCPI_SDK_LIB_DIR}")
+endif()
+
+# License
+install(FILES src/LICENSE DESTINATION "${MCPI_LEGAL_DIR}/LIEF")

dependencies/LIEF/src

@@ -0,0 +1 @@
+Subproject commit bae887e095d87e756d1bf4aa4f95a97693a97b62

dependencies/glfw/CMakeLists.txt

@@ -16,16 +16,12 @@ set(GLFW_BUILD_COCOA FALSE CACHE BOOL "" FORCE)
 set(GLFW_BUILD_X11 TRUE CACHE BOOL "" FORCE)
 set(GLFW_BUILD_WAYLAND TRUE CACHE BOOL "" FORCE)
 set(GLFW_LIBRARY_TYPE "SHARED" CACHE BOOL "" FORCE)
+set(MESSAGE_QUIET TRUE)
 add_subdirectory(src EXCLUDE_FROM_ALL)
-
-# Ensure Build
-add_custom_target(glfw-build ALL DEPENDS glfw)
+unset(MESSAGE_QUIET)
 
 # Install
 install(TARGETS glfw DESTINATION "${MCPI_LIB_DIR}")
-if(BUILD_ARM_COMPONENTS)
-    install(TARGETS glfw EXPORT sdk DESTINATION "${MCPI_SDK_LIB_DIR}")
-endif()
 
 # License
 install(FILES src/LICENSE.md DESTINATION "${MCPI_LEGAL_DIR}/glfw")

dependencies/glfw/src

@@ -0,0 +1 @@
+Subproject commit 7b6aead9fb88b3623e3b3725ebb42670cbe4c579

dependencies/libpng/CMakeLists.txt

@@ -1,44 +0,0 @@
-project(libpng)
-
-# ZLib (Needed By libpng)
-add_subdirectory(zlib)
-
-# Silence Warnings
-add_compile_options(-w)
-
-## LibPNG
-
-# Options
-set(PNG_TESTS FALSE CACHE BOOL "" FORCE)
-set(PNG_NO_STDIO FALSE CACHE BOOL "" FORCE)
-set(PNG_STATIC FALSE CACHE BOOL "" FORCE)
-set(PNG_SHARED TRUE CACHE BOOL "" FORCE)
-
-# Download
-set(ZLIB_LIBRARY zlibstatic)
-set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib/src")
-set(CMAKE_POLICY_DEFAULT_CMP0054 OLD) # Silence Warning
-set(CMAKE_POLICY_DEFAULT_CMP0003 NEW) # Silence Warning
-set(CMAKE_POLICY_DEFAULT_CMP0022 NEW) # Fix Error
-set(M_LIBRARY m) # No Full Paths!
-add_subdirectory(src EXCLUDE_FROM_ALL)
-set(CMAKE_POLICY_DEFAULT_CMP0054 NEW) # Re-Enable New Behavior
-
-# Setup Target
-set_target_properties(png12 PROPERTIES LINK_OPTIONS "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libpng.vers") # Use Symbol Versioning
-set_target_properties(png12 PROPERTIES DEBUG_POSTFIX "") # Fix LibPNG Suffix In Debug Mode
-target_include_directories(png12 PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>")
-foreach(zlib_include_dir IN ITEMS "${ZLIB_INCLUDE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/zlib/src")
-    target_include_directories(png12 PUBLIC "$<BUILD_INTERFACE:${zlib_include_dir}>")
-endforeach()
-
-# Ensure Build
-add_custom_target(png12-build ALL DEPENDS png12)
-# Install
-install(TARGETS png12 DESTINATION "${MCPI_LIB_DIR}")
-if(BUILD_ARM_COMPONENTS)
-    install(TARGETS png12 zlibstatic EXPORT sdk DESTINATION "${MCPI_SDK_LIB_DIR}")
-endif()
-
-# License
-install(FILES src/LICENSE DESTINATION "${MCPI_LEGAL_DIR}/libpng")

dependencies/libpng/libpng.vers

@@ -1,208 +0,0 @@
-PNG12_0 {global:
-png_libpng_ver;
-png_pass_start;
-png_pass_inc;
-png_pass_ystart;
-png_pass_yinc;
-png_pass_mask;
-png_pass_dsp_mask;
-png_access_version_number;
-png_set_sig_bytes;
-png_sig_cmp;
-png_check_sig;
-png_create_read_struct;
-png_create_write_struct;
-png_get_compression_buffer_size;
-png_set_compression_buffer_size;
-png_reset_zstream;
-png_create_read_struct_2;
-png_create_write_struct_2;
-png_write_chunk;
-png_write_chunk_start;
-png_write_chunk_data;
-png_write_chunk_end;
-png_create_info_struct;
-png_info_init;
-png_info_init_3;
-png_write_info_before_PLTE;
-png_write_info;
-png_read_info;
-png_convert_to_rfc1123;
-png_convert_from_struct_tm;
-png_convert_from_time_t;
-png_set_expand;
-png_set_expand_gray_1_2_4_to_8;
-png_set_palette_to_rgb;
-png_set_tRNS_to_alpha;
-png_set_gray_1_2_4_to_8;
-png_set_bgr;
-png_set_gray_to_rgb;
-png_set_rgb_to_gray;
-png_set_rgb_to_gray_fixed;
-png_get_rgb_to_gray_status;
-png_build_grayscale_palette;
-png_set_strip_alpha;
-png_set_swap_alpha;
-png_set_invert_alpha;
-png_set_filler;
-png_set_add_alpha;
-png_set_swap;
-png_set_packing;
-png_set_packswap;
-png_set_shift;
-png_set_interlace_handling;
-png_set_invert_mono;
-png_set_background;
-png_set_strip_16;
-png_set_dither;
-png_set_gamma;
-png_permit_empty_plte;
-png_set_flush;
-png_write_flush;
-png_start_read_image;
-png_read_update_info;
-png_read_rows;
-png_read_row;
-png_read_image;
-png_write_row;
-png_write_rows;
-png_write_image;
-png_write_end;
-png_read_end;
-png_destroy_info_struct;
-png_destroy_read_struct;
-png_destroy_write_struct;
-png_set_crc_action;
-png_set_filter;
-png_set_filter_heuristics;
-png_set_compression_level;
-png_set_compression_mem_level;
-png_set_compression_strategy;
-png_set_compression_window_bits;
-png_set_compression_method;
-png_init_io;
-png_set_error_fn;
-png_get_error_ptr;
-png_set_write_fn;
-png_set_read_fn;
-png_get_io_ptr;
-png_set_read_status_fn;
-png_set_write_status_fn;
-png_set_mem_fn;
-png_get_mem_ptr;
-png_set_read_user_transform_fn;
-png_set_write_user_transform_fn;
-png_set_user_transform_info;
-png_get_user_transform_ptr;
-png_set_read_user_chunk_fn;
-png_get_user_chunk_ptr;
-png_set_progressive_read_fn;
-png_get_progressive_ptr;
-png_process_data;
-png_progressive_combine_row;
-png_malloc;
-png_malloc_warn;
-png_free;
-png_free_data;
-png_data_freer;
-png_malloc_default;
-png_free_default;
-png_memcpy_check;
-png_memset_check;
-png_error;
-png_chunk_error;
-png_warning;
-png_chunk_warning;
-png_get_valid;
-png_get_rowbytes;
-png_get_rows;
-png_set_rows;
-png_get_channels;
-png_get_image_width;
-png_get_image_height;
-png_get_bit_depth;
-png_get_color_type;
-png_get_filter_type;
-png_get_interlace_type;
-png_get_compression_type;
-png_get_pixels_per_meter;
-png_get_x_pixels_per_meter;
-png_get_y_pixels_per_meter;
-png_get_pixel_aspect_ratio;
-png_get_x_offset_pixels;
-png_get_y_offset_pixels;
-png_get_x_offset_microns;
-png_get_y_offset_microns;
-png_get_signature;
-png_get_bKGD;
-png_set_bKGD;
-png_get_cHRM;
-png_get_cHRM_fixed;
-png_set_cHRM;
-png_set_cHRM_fixed;
-png_get_gAMA;
-png_get_gAMA_fixed;
-png_set_gAMA;
-png_set_gAMA_fixed;
-png_get_hIST;
-png_set_hIST;
-png_get_IHDR;
-png_set_IHDR;
-png_get_oFFs;
-png_set_oFFs;
-png_get_pCAL;
-png_set_pCAL;
-png_get_pHYs;
-png_set_pHYs;
-png_get_PLTE;
-png_set_PLTE;
-png_get_sBIT;
-png_set_sBIT;
-png_get_sRGB;
-png_set_sRGB;
-png_set_sRGB_gAMA_and_cHRM;
-png_get_iCCP;
-png_set_iCCP;
-png_get_sPLT;
-png_set_sPLT;
-png_get_text;
-png_set_text;
-png_get_tIME;
-png_set_tIME;
-png_get_tRNS;
-png_set_tRNS;
-png_get_sCAL;
-png_set_sCAL;
-png_set_keep_unknown_chunks;
-png_handle_as_unknown;
-png_set_unknown_chunks;
-png_set_unknown_chunk_location;
-png_get_unknown_chunks;
-png_set_invalid;
-png_read_png;
-png_write_png;
-png_get_copyright;
-png_get_header_ver;
-png_get_header_version;
-png_get_libpng_ver;
-png_permit_mng_features;
-png_get_mmx_flagmask;
-png_get_asm_flagmask;
-png_get_asm_flags;
-png_get_mmx_bitdepth_threshold;
-png_get_mmx_rowbytes_threshold;
-png_set_asm_flags;
-png_set_mmx_thresholds;
-png_mmx_support;
-png_set_strip_error_numbers;
-png_set_user_limits;
-png_get_user_width_max;
-png_get_user_height_max;
-png_get_uint_32;
-png_get_uint_16;
-png_get_int_32;
-png_get_uint_31;
-png_save_uint_32;
-png_save_int_32;
-png_save_uint_16;
-local: *; };

dependencies/libpng/src

@@ -1 +0,0 @@
-Subproject commit 5bb5bf345aef1e62adcfe30791f4364730a2aede

dependencies/libpng/zlib/CMakeLists.txt

@@ -1,16 +0,0 @@
-project(zlib)
-
-# Silence Warnings
-add_compile_options(-w)
-
-## zlib
-
-# Download
-set(CMAKE_POLICY_DEFAULT_CMP0022 NEW) # Fix Error
-add_subdirectory(src EXCLUDE_FROM_ALL)
-
-# Ensure Build
-add_custom_target(zlib-build ALL DEPENDS zlibstatic)
-
-# License
-install(FILES src/README DESTINATION "${MCPI_LEGAL_DIR}/zlib")

dependencies/libpng/zlib/src

@@ -1 +0,0 @@
-Subproject commit 21767c654d31d2dccdde4330529775c6c5fd5389

dependencies/minecraft-pi/CMakeLists.txt

@@ -7,7 +7,7 @@ include(FetchContent)
 # Download
 FetchContent_Declare(
     minecraft-pi
-    URL "${CMAKE_CURRENT_SOURCE_DIR}/minecraft-pi-0.1.0.tar.gz"
+    URL "${CMAKE_CURRENT_SOURCE_DIR}/minecraft-pi-0.1.1.tar.gz"
 )
 FetchContent_Populate(minecraft-pi)
 

dependencies/runtime/CMakeLists.txt

@@ -0,0 +1,18 @@
+project(runtime)
+
+## Extra Runtime
+
+# QEMU
+set(QEMU_VERSION "9.0.2")
+set(RUNTIME_QEMU_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/../../archives/qemu-${QEMU_VERSION}.tar.xz")
+if(NOT BUILD_NATIVE_COMPONENTS)
+    set(TRAMPOLINE_HEADERS_ONLY TRUE)
+endif()
+
+# Build
+add_subdirectory(src)
+
+# Install
+if(COMMAND install_runtime)
+    install_runtime("${MCPI_BIN_DIR}" "${MCPI_LEGAL_DIR}")
+endif()

dependencies/runtime/src

@@ -0,0 +1 @@
+Subproject commit 377f9ddbc4747ca3a640231d259c0e6fcc71b4b0

dependencies/stb_image/CMakeLists.txt

@@ -0,0 +1,30 @@
+project(stb_image)
+
+# Silence Warnings
+add_compile_options(-w)
+
+## stb_image
+
+# Build
+add_library(stb_image SHARED src/stb_image_impl.c)
+target_include_directories(
+    stb_image
+    PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+    "$<INSTALL_INTERFACE:${MCPI_SDK_INCLUDE_DIR}/stb_image>"
+)
+target_link_libraries(stb_image PRIVATE m)
+target_compile_definitions(stb_image PUBLIC STBI_ONLY_PNG)
+
+# Install
+install(TARGETS stb_image DESTINATION "${MCPI_LIB_DIR}")
+install(
+    DIRECTORY "include/"
+    DESTINATION "${MCPI_SDK_INCLUDE_DIR}/stb_image"
+    FILES_MATCHING
+    PATTERN "*.h"
+)
+install(TARGETS stb_image EXPORT sdk DESTINATION "${MCPI_SDK_LIB_DIR}")
+
+# License
+install(FILES include/LICENSE DESTINATION "${MCPI_LEGAL_DIR}/stb_image")

dependencies/stb_image/include

@@ -0,0 +1 @@
+Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7

dependencies/stb_image/src/stb_image_impl.c

@@ -0,0 +1,5 @@
+#define STB_IMAGE_IMPLEMENTATION
+#define STB_IMAGE_WRITE_IMPLEMENTATION
+
+#include "stb_image.h"
+#include "stb_image_write.h"

dependencies/symbol-processor/CMakeLists.txt

@@ -0,0 +1,20 @@
+project(symbol-processor)
+
+# Install Dependencies
+set(SRC "${CMAKE_CURRENT_SOURCE_DIR}/src")
+set(NODE_MODULES "${SRC}/node_modules")
+function(npm_run)
+    execute_process(
+        COMMAND npm ${ARGV}
+        WORKING_DIRECTORY "${SRC}"
+        RESULT_VARIABLE RESULT
+    )
+    if(NOT RESULT EQUAL 0)
+        file(REMOVE_RECURSE "${NODE_MODULES}")
+        message(FATAL_ERROR "Unable To Run NPM Command")
+    endif()
+endfunction()
+if(NOT EXISTS "${NODE_MODULES}")
+    npm_run(ci --silent)
+    npm_run(run --silent lint)
+endif()

dependencies/symbol-processor/src

@@ -0,0 +1 @@
+Subproject commit f72c4f0567c62897d74c734819c11705df0bf4ee

dependencies/utf8cpp/CMakeLists.txt

@@ -0,0 +1,12 @@
+project(utf8cpp)
+
+# Silence Warnings
+add_compile_options(-w)
+
+## stb_image
+
+# Build
+add_subdirectory(src EXCLUDE_FROM_ALL)
+
+# License
+install(FILES src/LICENSE DESTINATION "${MCPI_LEGAL_DIR}/utf8cpp")

dependencies/utf8cpp/src

@@ -0,0 +1 @@
+Subproject commit f6780f77f6824aa0fbe69f9b97ef7d8aba26ed92

dependencies/zenity/CMakeLists.txt

@@ -6,7 +6,9 @@ add_compile_options(-w)
 ## Zenity
 
 # Download
+set(MESSAGE_QUIET TRUE)
 add_subdirectory(src EXCLUDE_FROM_ALL)
+unset(MESSAGE_QUIET)
 
 # Ensure Build
 add_custom_target(zenity-build ALL DEPENDS zenity)

dependencies/zenity/src

@@ -1 +1 @@
-Subproject commit d673e9aab842d7151d92eb9164872dc05e748db2
+Subproject commit a7496461161c917878d58131711425e7c8e59436

docs/ARCHITECTURE.md

@@ -1,104 +0,0 @@
-# Architecture
-
-## Launch Sequence
-
-### Common
-1. The launcher forks itself
-   1. The child process continues the launch sequence.
-   2. The original process monitors the child process for crashes.
-
-### Client
-1. The launcher is started by the user
-   1. The launcher starts several Zenity dialogs to configure MCPI-Reborn
-2. The launcher replaces itself with MCPI
-   1. MCPI-Reborn components are loaded using ``LD_PRELOAD`` and ``LD_LIBRARY_PATH``
-   2. If the Media Layer Proxy is enabled, the Media Layer Proxy Client is started as a sub-process
-
-### Server
-1. The launcher is started by the user
-2. The launcher replaces itself with MCPI
-
-## Components
-
-### Launcher
-This component configures the various environmental variables required for MCPI-Reborn to work. When running in client-mode, this component will also launch several Zenity dialogs for interactive configuration.
-
-The environmental variables configured by this component includes:
-* ``LD_PRELOAD``
-* ``LD_LIBRAR_PATH``
-* ``MCPI_FEATURE_FLAGS``
-* ``MCPI_RENDER_DISTANCE``
-* ``MCPI_USERNAME``
-
-This is always compiled for the host system's architecture.
-
-### Media Layer
-The Media Layer handles MCPI's graphics calls and user input. It replaces MCPI's native usage of SDL 1.2 with GLFW.
-
-#### Core
-This sub-component re-implements a subset of SDL 1.2 calls with GLFW. It also provides a few utility functions that are used internally by MCPI-Reborn.
-
-The utility functions include:
-* Fullscreen
-* Audio
-* Etc
-
-This is always compiled for the host system's architecture unless the Media Layer Proxy is disabled.
-
-This was created because SDL 1.2 has numerous bugs and is in-general unsupported.
-
-#### Proxy
-This sub-component must be used if the host system's architecture isn't ARM. It uses UNIX pipes to cross architectural boundaries and allow MCPI to use the Media Layer Core (which is always compiled for the host system's architecture).
-
-It is made of two parts:
-* Media Layer Proxy Server
-  * Links To MCPI
-  * Creates The UNIX Pipes
-  * Same External API As The Media Layer Core
-  * Compiled For ARM
-* Media Layer Proxy Client
-  * Links To The Media Layer Core
-  * Connects To The Media Layer Proxy Server
-  * Uses The System's Native GLES Driver (ie. Mesa)
-  * Compiled For The Host System's Architecture
-
-While proxying all Media Layer Core API calls across UNIX pipes does hurt performance, it is better than emulating the entire graphics stack.
-
-Using this in server-mode is redundant.
-
-#### Extras
-This sub-component contains code that must always be linked directly to MCPI.
-
-This is always compiled for ARM.
-
-#### Headers
-This sub-component includes headers for SDL, GLES, and EGL allowing easy (cross-)compilation.
-
-### Mods
-This component links directly to MCPI and patches it to modify its behavior.
-
-This is always compiled for ARM.
-
-### ``libreborn``
-This component contains various utility functions including:
-
-* Code Patching (ARM Only)
-* Logging
-* Etc
-
-The code patching is ARM only because it relies on hard-coded ARM instructions. However, this is irrelevant since code patching is only needed in ARM code (to patch MCPI).
-
-### ``symbols``
-This component contains all MCPI symbols.
-
-## Dependencies
-MCPI-Reborn has several dependencies:
-* MCPI (Bundled)
-* GLFW (Only In Client Mode; Bundled)
-  * Open GL ES 2.0
-  * EGL
-* OpenAL (Only In Client Mode)
-* ZLib (Required By LibPNG; Bundled)
-* LibPNG (Bundled)
-* QEMU User Mode (Only On Non-ARM Hosts; Runtime Only)
-* Zenity (Only In Client Mode; Runtime Only; Bundled)

docs/BUILDING.md

@@ -1,22 +0,0 @@
-# Building
-
-## Dependencies
-
-### Debian/Ubuntu
-```sh
-./scripts/install-dependencies.sh
-```
-
-## Instructions
-```sh
-./scripts/build.sh <client|server> <armhf|arm64|i686|amd64>
-```
-
-### Custom CMake Arguments
-```sh
-./scripts/setup.sh <client|server> <armhf|arm64|i686|amd64> <Custom CMake Arguments>
-./scripts/build.sh <client|server> <armhf|arm64|i686|amd64>
-```
-
-### Environment Variables
-* ``MCPI_TOOLCHAIN_USE_DEFAULT_SEARCH_PATHS``: Use Default CMake Search Paths Rather Than Guessing

docs/CHANGELOG.md

@@ -1,5 +1,165 @@
 # Changelog
 
+**3.0.0**
+* Modding API Revamped
+  * `*(unsigned char **)` Is Dead!
+  * Now C++ Only
+* Add Peaceful Mode To Options Screen
+* Proper Create New World Screen
+* Proper Chat Screen
+* New Feature Flags
+  * New Functionality
+    * `Animated Lava` (Enabled By Default)
+    * `Animated Fire` (Enabled By Default)
+    * `Add Cake` (Enabled By Default)
+    * `Use Java Beta 1.3 Light Ramp` (Enabled By Default)
+    * `Send Full Level When Hosting Game` (Enabled By Default)
+    * `Food Overlay` (Disabled By Default)
+    * `Add Splashes` (Enabled By Default)
+    * `Display Date In Select World Screen` (Enabled By Default)
+    * `Optimized Chunk Sorting` (Enabled By Default)
+    * `Fix Held Item Caching` (Enabled By Default)
+    * `Add Reborn Info To Options` (Enabled By Default)
+    * `Log FPS` (Disabled By Default)
+    * `Add Welcome Screen` (Enabled By Default)
+    * `F3 Debug Information` (Enabled By Default)
+    * `Multidraw Rendering` (Enabled By Default)
+    * `Add Missing Language Strings` (Enabled By Default)
+    * `Fix Pigmen Burning In The Sun` (Enabled By Default)
+    * `Fix Carried Grass's Bottom Texture` (Enabled By Default)
+    * `Hide Crosshair In Third-Person` (Enabled By Default)
+    * `Fix Camera Legs` (Enabled By Default)
+    * `Implement Crafting Remainders` (Enabled By Default)
+    * `Fix Door Duplication` (Enabled By Default)
+    * `Fix Cobweb Lighting` (Enabled By Default)
+    * `Fix Sneaking Syncing` (Enabled By Default)
+    * `Fix Fire Immunity` (Enabled By Default)
+    * `Fix Fire Syncing` (Enabled By Default)
+    * `Fix Sunlight Not Properly Setting Mobs On Fire` (Enabled By Default)
+    * `Stop Creative Players From Burning` (Enabled By Default)
+    * `Render Fire In Third-Person` (Enabled By Default)
+    * `Improved Water Rendering` (Enabled By Default)
+    * `Classic Item Count UI` (Enabled By Default)
+    * `Allow High-Resolution Title` (Enabled By Default)
+    * `Improved Classic Title Positioning` (Enabled By Default)
+    * `Use Updated Title` (Enabled By Default)
+    * `Hide Block Outline When GUI Is Hidden` (Enabled By Default)
+    * `Fix Crash When Generating Certain Seeds` (Enabled By Default)
+    * `Click Buttons On Mouse Down` (Enabled By Default)
+    * `3D Dropped Items` (Enabled By Default)
+    * `Render Entity Shadows` (Enabled By Default)
+    * `Render Vignette` (Enabled By Default)
+    * `Increase Render Chunk Size` (Enabled By Default)
+    * `Proper Entity Shading` (Enabled By Default)
+    * `Implement RaspberryJuice API` (Enabled By Default)
+  * Existing Functionality (All Enabled By Default)
+    * `Fix Screen Rendering When Hiding HUD`
+    * `Sanitize Usernames`
+    * `Patch RakNet Security Bug`
+    * `Log RakNet Startup Errors`
+    * `Prevent Unnecessary Server Pinging`
+    * `Proper OpenGL Buffer Generation`
+    * `Fix Furnace Screen Visual Bug`
+    * `Fix Text Wrapping`
+    * `Fullscreen Support`
+    * `Always Save Chest Tile Entities`
+    * `Fix Transferring Durability When Using Items`
+    * `Fix Switching Perspective While Sneaking`
+    * `Log Chat Messages`
+    * `Log Game Status`
+    * `Screenshot Support`
+    * `Fix Camera Functionality`
+    * `Property Scale Animated Textures`
+* Split Up `Remove Creative Mode Restrictions` Feature Flag
+  * `Remove Creative Mode Restrictions` (Disabled By Default)
+  * `Display Slot Count In Creative Mode` (Disabled By Default)
+  * `Force Survival Mode Inventory UI` (Disabled By Default)
+  * `Force Survival Mode Inventory Behavior` (Disabled By Default)
+  * `Maximize Creative Mode Inventory Stack Size` (Disabled By Default)
+* Rename `Disable Buggy Held Item Caching` Feature Flag To `Fix Held Item Caching`
+* Rename `Disable 'gui_blocks' Atlas` Feature Flag To `Regenerate "gui_blocks" Atlas`
+* Add Milk Buckets
+  * Included In The `Add Buckets` Feature Flag
+* Removed `Property Scale Animated Textures` Feature Flag
+* Removed `Remove Invalid Item Background` Feature Flag
+* Improve Death Messages
+* Massive Build System Improvements
+* Fix Item Dropping When Killing Players From The Server Console
+* Fix Furnace Visual Bug When Using Lava Bucket As Fuel
+* `overwrite_calls` Now Scans VTables
+* Unify Server/Client Builds
+* Controller Support Removed
+
+**2.5.3**
+* Add `Replace Block Highlight With Outline` Feature Flag (Enabled By Default)
+  * By Default, The Outline Width Is Set Using The GUI Scale
+  * This Can Be Overridden Using The `MCPI_BLOCK_OUTLINE_WIDTH` Environmental Variable
+* Added `overwrite_calls_within` Function
+
+**2.5.2**
+* Add `3D Chest Model` Feature Flag (Enabled By Default)
+* Stop Using Jenkins
+* Replace `iconv`
+* Replace LibPNG
+
+**2.5.1**
+* Allow Overriding Custom Skin Server Using `MCPI_SKIN_SERVER` Environmental Variable
+* Fix Bug With SDK Generation
+
+**2.5.0**
+* [Custom skin support](CUSTOM_SKINS.md)!
+* Add `Load Custom Skins` Feature Flag (Enabled By Default)
+
+**2.4.9**
+* Allow Overriding GUI Scale With `MCPI_GUI_SCALE` Environmental Variable
+* Add `Disable Block Tinting` Feature Flag (Disabled By Default)
+* Add `Disable Hostile AI In Creative Mode` Feature Flag (Enabled By Default)
+* Allow Accessing Configuration At Runtime (Useful For Mods That Need To Support Multiple Versions)
+
+**2.4.8**
+* Fix Bug In `extract_from_bl_instruction`
+* Update LIEF And GLFW
+* Allow Mods To Access The Original GLFW Keycode For Key Events (But Better)
+* More Accurate Sound
+
+**2.4.7**
+* Improve Server Performance
+* Add `Add Biome Colors To Grass` Feature Flag (Disabled By Default)
+* Add `Generate Caves` Feature Flag (Enabled By Default)
+* Allow Mods To Access The Original GLFW Keycode For Key Events
+
+**2.4.6**
+* [Minimal Controller Support](CONTROLS.md)
+* Fix Holding Left-Click When Attacking
+* Fix Crashing On ARMHF
+* Heavily Improved Crash Report Dialog
+
+**2.4.5**
+* Bundle QEMU
+
+**2.4.4**
+* Cache Previous Launcher Configuration
+* Add `MCPI_API_PORT` Environmental Variable
+* Fix Particles In Front-Facing View
+* Fixed Launch Crash On Ubuntu ARM64
+  * PatchELF Replaced With LIEF
+* Moved `3D Anaglyph` Feature Flag To Options Screen
+* Add `Improved Classic Title Screen` Feature Flag (Enabled By Default)
+  * Add Quit button
+  * Add Options Button (Moved From `Fix Options Screen` Feature Flag)
+* Add `Disable Speed Bridging` Feature Flag (Disabled By Default)
+* Add `Disable Creative Mode Mining Delay` Feature Flag (Disabled By Default)
+* Improved Feature Flag Names
+* Miscellaneous Bug Fixes
+* Improved Build System
+
+**2.4.3**
+* Fix Signs With CP-437
+
+**2.4.2**
+* Fix Picking Up Lava
+* Fix Wayland App ID
+
 **2.4.1**
 * Allow More Characters In Usernames And Chat
 * Fix Running On ARMHF Debian Buster
@@ -10,11 +170,11 @@
 * More Reliable AppImages
 * CMake Refactors
 * Disable Broken Touchscreen-Specific Block Outline Behavior
-* Add ``Remove Forced GUI Lag (Can Break Joining Servers)`` Feature Flag (Disabled By Default)
-* Add ``Add Buckets`` Feature Flag (Enabled By Default)
-* Add ``Classic HUD`` Feature Flag (Enabled By Default)
-* Add ``Translucent Toolbar`` Feature Flag (Enabled By Default)
-* Add ``Force EGL`` Feature Flag (Disabled By Default)
+* Add `Remove Forced GUI Lag (Can Break Joining Servers)` Feature Flag (Disabled By Default)
+* Add `Add Buckets` Feature Flag (Enabled By Default)
+* Add `Classic HUD` Feature Flag (Enabled By Default)
+* Add `Translucent Toolbar` Feature Flag (Enabled By Default)
+* Add `Force EGL` Feature Flag (Disabled By Default)
 * Fix Sound Pitch/Volume/Attenuation
 * Fix Holding Left-Click When Attacking
 * Don't Force EGL (Should Fix Some NVIDIA Systems)
@@ -28,7 +188,7 @@
 * Bug Fixes
 
 **2.3.11**
-* ``--version`` Command Line Option
+* `--version` Command Line Option
 * TPS Measured In Benchmark & Server
 * Front-Facing Third-Person
 * GLESv1 Comparability Layer
@@ -54,39 +214,39 @@
 * Don't Append Hyphens To New World Name, Only Folder Names
 
 **2.3.6**
-* Fix ``Invert Y-axis`` Option Name
+* Fix `Invert Y-axis` Option Name
 * Improve Touch GUI Inventory In Non-Touch GUI
 * New Create World Dialog
-  * Controlled By ``Implement Create World Dialog`` Feature Flag (Enabled By Default)
+  * Controlled By `Implement Create World Dialog` Feature Flag (Enabled By Default)
   * Custom World Names
   * Game-Mode Selection
   * Custom Seeds
 
 **2.3.5**
 * Renamed Some Feature Flags
-* Add ``Improved Title Background`` Feature Flag (Enabled By Default)
+* Add `Improved Title Background` Feature Flag (Enabled By Default)
 * Non-Touch GUI Rework
-  * Make ``Full Touch GUI`` Feature Flag Disabled By Default
-  * Add ``Force Touch GUI Button Behavior`` Feature Flag (Enabled By Default)
-  * Add ``Improved Button Hover Behavior`` Feature Flag (Enabled By Default)
+  * Make `Full Touch GUI` Feature Flag Disabled By Default
+  * Add `Force Touch GUI Button Behavior` Feature Flag (Enabled By Default)
+  * Add `Improved Button Hover Behavior` Feature Flag (Enabled By Default)
 
 **2.3.4**
 * AppImage Fixes
 * Make Death Messages Customizable Server-Side
 * Fix Q-Key Behavior Behavior When Editing Signs
-* Add ``Force Touch Inventory`` Feature Flag (Disabled By Default)
-* Add ``Fix Pause Menu`` Feature Flag (Enabled By Default)
+* Add `Force Touch Inventory` Feature Flag (Disabled By Default)
+* Add `Fix Pause Menu` Feature Flag (Enabled By Default)
   * Enables Server Visibility Toggle Button
 * Options Changes (Not Supported On Legacy)
-  * Add ``Fix Options Screen`` Feature Flag (Enabled By Default)
+  * Add `Fix Options Screen` Feature Flag (Enabled By Default)
     * Adds Options Button To Classic UI Start Screen
     * Removes Useless Options Toggles
     * Fixes Options Toggles' Default Position
   * Store Multiple Settings In `options.txt`
-    * ``Peaceful Mode`` Feature Flag Moved To ``game_difficulty``
-    * ``Smooth Lighting`` Feature Flag Moved To ``gfx_ao``
-    * ``Fancy Graphics`` Feature Flag Moved To ``gfx_fancygraphics``
-    * ``Disable Hosting LAN Worlds`` Feature Flag Moved To ``mp_server_visible_default``
+    * `Peaceful Mode` Feature Flag Moved To `game_difficulty`
+    * `Smooth Lighting` Feature Flag Moved To `gfx_ao`
+    * `Fancy Graphics` Feature Flag Moved To `gfx_fancygraphics`
+    * `Disable Hosting LAN Worlds` Feature Flag Moved To `mp_server_visible_default`
 
 **2.3.3**
 * Add More Blocks To Expanded Creative Inventory
@@ -97,31 +257,31 @@
 * Add More Blocks To Expanded Creative Inventory
 * Fix Nether Reactor With Creative Restrictions Disabled
 * Alphabetize Feature Flags
-* Add ``Disable V-Sync`` Feature Flag (Disabled By Default)
+* Add `Disable V-Sync` Feature Flag (Disabled By Default)
 
 **2.3.1**
-* Internal Refactor Of ``libreborn``
-* Remove Use Of ``/bin/sh``
+* Internal Refactor Of `libreborn`
+* Remove Use Of `/bin/sh`
 * Load Custom Mods First
 * Use Zenity Dark Mode
-* Add ``Improved Cursor Rendering`` Feature Flag (Enabled By Default)
+* Add `Improved Cursor Rendering` Feature Flag (Enabled By Default)
 
 **2.3.0**
 * Switch To AppImage For Packaging
 * Prevent OpenAL From Crashing When Out Of Memory
 * Vendor GLFW & Zenity
   * Seamless Wayland Support
-* Add ``MCPI_DEBUG`` Environmental Variable
-* Add ``Disable Hosting LAN Worlds`` Feature Flag (Disabled By Default)
-* Add ``Fix Furnace Not Checking Item Auxiliary`` Feature Flag (Enabled By Default)
-* Add ``Disable Raw Mouse Motion (Not Recommended)`` Feature Flag (Disabled By Default) For Broken X11 Setups
+* Add `MCPI_DEBUG` Environmental Variable
+* Add `Disable Hosting LAN Worlds` Feature Flag (Disabled By Default)
+* Add `Fix Furnace Not Checking Item Auxiliary` Feature Flag (Enabled By Default)
+* Add `Disable Raw Mouse Motion (Not Recommended)` Feature Flag (Disabled By Default) For Broken X11 Setups
 * Added Back `~/.minecraft-pi/mods`
 * Improve Build System
 * Improve Documentation
 
 **2.2.11**
-* Add ``Close Current Screen On Death`` Feature Flag (Enabled By Default) To Prevent Bugs
-* Fix More Furnace UI Bugs When Using "Disable 'gui_blocks' Atlas"
+* Add `Close Current Screen On Death` Feature Flag (Enabled By Default) To Prevent Bugs
+* Fix More Furnace UI Bugs When Using `Disable 'gui_blocks' Atlas`
 
 **2.2.10**
 * Fix Bug With Picking Up Items In "Remove Creative Mode Restrictions" Mode
@@ -131,8 +291,8 @@
 * Store Files In `/usr/lib`
 
 **2.2.8**
-* Add ``Hide Chat Messages`` Optional Feature Flag
-* Add ``Remove Creative Mode Restrictions`` Optional Feature Flag
+* Add `Hide Chat Messages` Optional Feature Flag
+* Add `Remove Creative Mode Restrictions` Optional Feature Flag
 * Improve GLFW->SDL Mouse Motion Event Conversion
 * Performance Optimizations
 * Make Majority Of Server-Specific Logging Code Also Apply To The Client
@@ -164,15 +324,15 @@
 * Make Missing Sound Event Cause Warning Rather Than Crash
 
 **2.2.1**
-* Prevent ``random.burp`` Sound From Crashing Game
+* Prevent `random.burp` Sound From Crashing Game
 * Always Cleanup Media Layer, Even On Crash
 * Resolve All Sounds On Startup
 
 **2.2.0**
 * Sound Support
-* Split Off ``Allow Joining Survival Servers`` From Game-Mode Mod
+* Split Off `Allow Joining Survival Servers` From Game-Mode Mod
 * Separate Headless Code From Server Code
-* Fix Bug Where ``RakNetInstance`` Starts Pinging Potential Servers Before The "Join Game" Screen Is Opened
+* Fix Bug Where `RakNetInstance` Starts Pinging Potential Servers Before The "Join Game" Screen Is Opened
 * Clean-Up Code
 * Remove Support For Debian Buster
 
@@ -189,7 +349,7 @@
 * Print Error Message If RakNet Fails To Start
 
 **2.1.4**
-* Fix ``RakNet::RakString`` Security Bug
+* Fix `RakNet::RakString` Security Bug
 
 **2.1.3**
 * Workaround Broken Library Search Path On Some ARM 32-Bit Systems
@@ -201,16 +361,16 @@
 * Fix Symlink Code
 
 **2.1.0**
-* Allow Binding ``Q`` Key To Item Dropping
+* Allow Binding `Q` Key To Item Dropping
 * Expose More Feature Flags
-* Replace ``Mob Spawning`` Feature Flag With ``Force Mob Spawning``
-* Fix ``ESC`` Key In Options Menu When ``Miscellaneous Input Fixes`` Is Enabled
+* Replace `Mob Spawning` Feature Flag With `Force Mob Spawning`
+* Fix `ESC` Key In Options Menu When `Miscellaneous Input Fixes` Is Enabled
 
 **2.0.9**
-* Fix Translucent Preview Items In Furnace UI Being Fully Opaque When The ``gui_blocks`` Atlas Is Disabled
+* Fix Translucent Preview Items In Furnace UI Being Fully Opaque When The `gui_blocks` Atlas Is Disabled
 
 **2.0.8**
-* Use Default Port In ``servers.txt`` If Not Specified
+* Use Default Port In `servers.txt` If Not Specified
 
 **2.0.7**
 * Fix Sign Text Not Updating In Multiplayer When Exiting Editing UI Using Escape Button
@@ -227,7 +387,7 @@
 * Optimize Media Layer Proxy
 
 **2.0.3**
-* Make ``kill`` Admin Command Print Death Message
+* Make `kill` Admin Command Print Death Message
 
 **2.0.2**
 * Fix Mouse Cursor Bugs

docs/COMMAND_LINE.md

@@ -1,45 +0,0 @@
-# Command Line Usage
-
-## Command Line Arguments
-
-### ``--version`` (Or ``-v``)
-If you run MCPI-Reborn with ``--version`` it will print its version to ``stdout``.
-
-### ``--print-available-feature-flags`` (Client Mode Only)
-If you run MCPI-Reborn with ``--print-available-feature-flags``, it will print the available feature flags to ``stdout`` and then immediately exit.
-
-The feature flags are printed in the following format:
-```
-TRUE This Flag Is On By Default
-FALSE This Flag Is Off By Default
-```
-
-### ``--default`` (Client Mode Only)
-If you run MCPI-Reborn with ``--default``, it will skip the startup configuration dialogs and just use the default values.
-
-### ``--only-generate`` (Server Mode Only)
-If you run MCPI-Reborn with ``--only-generate``, it will immediately exit once world generation has completed. This is mainly used for automatically testing MCPI-Reborn.
-
-### ``--benchmark`` (Client Mode Only)
-If you run MCPI-Reborn with ``--benchmark``, it will enter a simple benchmark mode. This means automatically loading a newly generated world, then rotating the camera for a period of time. When it has finished, it will then exit and print the average FPS while the world was loaded. In this mode, all user input is blocked. However you can still modify rendering settings by changing feature flags.
-
-The world used will always be re-created on start and uses a hard-coded seed.
-
-## Environmental Variables
-
-### ``MCPI_DEBUG``
-This enables debug logging if it is set.
-
-### Client Mode Only
-If any of the following variables aren't set, one configuration dialog will open on startup for each unset variable.
-
-#### ``MCPI_FEATURE_FLAGS``
-This corresponds to ``--print-available-feature-flags``. This is just a list of all enabled feature flags separated by ``|``.
-
-For instance, the string ``Feature A|Feature B`` would enable both ``Feature A`` and ``Feature B`` and *disable every other available feature flag*.
-
-#### ``MCPI_RENDER_DISTANCE``
-This is the render distance. The possible values are: ``Far``, ``Normal``, ``Short``, and ``Tiny``.
-
-#### ``MCPI_USERNAME``
-This is the username.

docs/CONTROLS.md

@@ -0,0 +1,26 @@
+# In-Game Controls
+
+## Keyboard & Mouse
+| Action | Function |
+| --- | --- |
+| W | Move Forward |
+| A | Move Left |
+| S | Move Backward |
+| D | Move Right |
+| Space | Jump |
+| Shift | Sneak |
+| E | Open Inventory |
+| Q | Drop Item |
+| Ctrl+Q | Drop Item Stack |
+| 1-9 | Select Item In Toolbar/Hotbar |
+| Escape | Pause |
+| Tab | Lock/Unlock Mouse |
+| F11 | Fullscreen |
+| F2 | Screenshot |
+| F1 | Hide GUI |
+| F5 | Change Perspective |
+| T | Open Chat |
+| Mouse Movement | Camera Control |
+| Scroll Wheel | Cycle Selected Item In Toolbar |
+| Left-CLick | Attack/Destroy |
+| Right-Click | Use Item/Place Block |

docs/CREDITS.md

@@ -4,7 +4,9 @@
 | [mhsjlw/mcpilauncher](https://github.com/mhsjlw/mcpilauncher/blob/master/trampoline/trampoline.c) | Information On Getting Minecraft: Pi Eiditon To Run On Desktop Linux |
 | [Phirel's Survival Patch](https://www.minecraftforum.net/forums/minecraft-editions/minecraft-pi-edition/1960005-survival-mode-patch) | Information On Survival Mode Support |
 | [zhuowei/MinecraftPEModWiki](https://github.com/zhuowei/MinecraftPEModWiki/wiki/How-some-unlocks-are-made) | Information On Smooth Lighting Support |
+| [zhuowei/RaspberryJuice](https://github.com/zhuowei/RaspberryJuice) | Design Of RaspberryJuice Extended API |
 | [Ghidra](https://ghidra-sre.org) | Used For Decompiling Minecraft: Pi Edition |
 | [RetDec](https://retdec.com) | Used For Decompiling Minecraft: Pi Edition |
 | [minecraft-linux/mcpelauncher-core](https://github.com/minecraft-linux/mcpelauncher-core/blob/6b5e17b5685a612143297ae4595bdd12327284f3/src/patch_utils.cpp#L42) | Original Function Overwrite Code |
-| [Hooking C Functions at Runtime - Thomas Finch](http://thomasfinch.me/blog/2015/07/24/Hooking-C-Functions-At-Runtime.html) | Original Patching Code |
+| [Hooking C Functions at Runtime - Thomas Finch](http://thomasfinch.me/blog/2015/07/24/Hooking-C-Functions-At-Runtime.html) | Original Patching Code |
+| [Bigjango](https://github.com/Bigjango13) | Misc programming contributions |

docs/CUSTOM_SKINS.md

@@ -0,0 +1,6 @@
+# Custom Skins
+MCPI-Reborn supports downloading custom skins from [a central skin server](https://github.com/MCPI-Revival/Skins). Skins are downloaded based on the current MCPI username.
+
+This *does not* cache skins and *will not* work without internet access.
+
+Custom skins can be disabled using the `Load Custom Skins` feature flag.

docs/DEDICATED_SERVER.md

@@ -1,19 +1,14 @@
 # Dedicated Server
-The dedicated server is a version of Minecraft: Pi Edition modified to run in a headless environment. It loads settings from a ``server.properties`` file.
+The dedicated server is a version of Minecraft: Pi Edition modified to run in a headless environment. It loads settings from a `server.properties` file.
 
-This server is also compatible with MCPE Alpha v0.5.0[^1].
+This server is also compatible with MCPE Alpha v0.6.1[^1].
 
 ## Setup
-
-### Debian Package
-To use, install and run ``minecraft-pi-reborn-legacy-server``. It will generate the world and ``server.properties`` in the current directory.
-
-### Docker Image
-An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-legacy-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-legacy-server).
+To use, run the normal AppImage with the `--server` argument. It will generate the world and `server.properties` in the current directory.
 
 ## Server Limitations
 * Player data is not saved because of limitations with MCPE LAN worlds
   * An easy workaround is to place your inventory in a chest before logging off
-* Survival Mode servers are incompatible with unmodded MCPI
+* Survival Mode servers are incompatible with un-modded MCPI
 
-[^1]: The exception to this is buckets, those will crash MCPE players.
+[^1]: The exception to this is buckets and other modded items, those will crash MCPE players.

docs/GETTING_STARTED.md

@@ -0,0 +1,70 @@
+---
+gitea: none
+include_toc: true
+---
+
+# Getting Started
+Welcome to the official guide for setting up Minecraft: Pi Edition: Reborn (also known as MCPI-Reborn)! This document will help you through the installation and setup process.
+
+## System Requirements
+MCPI-Reborn requires support for OpenGL ES v2.0 (unlike the original game, which used OpenGL ES v1.1). It also only supports Linux-based systems.
+
+In addition, while the original game could only be run on the Raspberry Pi, MCPI-Reborn is much more flexible. It supports running on 32-bit ARM (known as `armhf`), 64-bit ARM (known as `arm64`), and 64-bit x86 (known as `amd64`).
+
+## Installation
+There are three supported ways to install MCPI-Reborn.
+
+### AppImage
+The first supported way to install MCPI-Reborn is with an [AppImage](https://appimage.org). An AppImage is a portable application format that allows users to run software without installation.
+
+To run MCPI-Reborn, all you need to do is [download the latest AppImage](https://gitea.thebrokenrail.com/minecraft-pi-reborn/minecraft-pi-reborn/releases/latest) for your architecture and run it.
+
+More details can be found [here](https://docs.appimage.org/introduction/quickstart.html#how-to-run-an-appimage).
+
+<details>
+<summary><b>Additional System Requirements</b></summary>
+The AppImage requires Debian Bullseye or higher. This is equivalent to Ubuntu 20.04.
+
+It also requires some additional packages. To install them, run:
+```sh
+sudo apt install -y libfuse2 libgtk-3-0 libopenal1 libglib2.0-0
+```
+</details>
+
+### Flatpak
+The next method is the official [Flatpak](https://www.flatpak.org/). This method has the additional benefit of built-in sandboxing. Unfortunately, it does not support 32-bit ARM systems.
+
+It can be installed through [Flathub](https://flathub.org/apps/details/com.thebrokenrail.MCPIReborn).
+
+### Pi-Apps
+The final supported method is [Pi-Apps](https://github.com/Botspot/pi-apps). It is a ["well-maintained collection of app installation-scripts"](https://github.com/Botspot/pi-apps#:~:text=well-maintained%20collection%20of%20app%20installation-scripts) that includes support for MCPI-Reborn.
+
+The list of systems supported by Pi-Apps can be found [here](https://github.com/Botspot/pi-apps?tab=readme-ov-file#supported-systems).
+
+## Managing Game Data
+Just as regular Minecraft stores game data at `~/.minecraft`, MCPI-Reborn uses `~/.minecraft-pi`[^1]. This is the profile directory and is where your worlds, screenshots, and game settings are stored.
+
+The profile directory can easily be accessed by opening MCPI-Reborn and going to `Options -> Reborn -> Profile Directory`.
+
+## Sound
+One of MCPI-Reborn's most important modifications is the addition of a sound engine. However, due to copyright limitations, Minecraft's sounds cannot be distributed with MCPI-Reborn and must be installed manually.
+
+Fortunately, installing the sound data is simple:
+1. Obtain a valid Minecraft: Pocket Edition v0.6.1[^2] APK file.
+2. Extract `lib/*/libminecraftpe.so` from the APK.
+3. Create the directory `<Profile Directory>/overrides` if it does not already exist.
+4. Copy `libminecraftpe.so` into `<Profile Directory>/overrides`.
+5. Sound should now be fully functional!
+
+## Custom Textures
+MCPI-Reborn allows users to easily use custom textures through the use of an "overrides directory." Any files placed in this directory will automatically replace their equivalent file in MCPI-Reborn.
+
+For instance, to override `data/images/terrain.png`, you would copy the replacement file to `<Overrides Folder>/images/terrain.png`.
+
+The overrides directory is located at `<Profile Directory>/overrides`.
+
+## Discord
+If you have any questions or just want to talk about Minecraft: Pi Edition, there is an [official Discord server](https://discord.com/invite/aDqejQGMMy)!
+
+[^1]: When using the Flatpak, the profile directory is located at `~/.var/app/com.thebrokenrail.MCPIReborn/.minecraft-pi`.
+[^2]: This is not a strict requirement; a Minecraft: Pocket Edition v0.8.1 APK would likely work, but it is not guaranteed.

docs/INSTALL.md

@@ -1,27 +0,0 @@
-# Installation
-
-## AppImage
-Download packages [here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/legacy/lastSuccessfulBuild/artifact/out/).
-
-### System Requirements
-* Debian Buster/Ubuntu 18.04 Or Higher
-* QEMU User-Mode
-  * Debian/Ubuntu: ``sudo apt install qemu-user``
-  * Arch: ``sudo pacman -Sy qemu-user``
-* Client-Only Dependencies
-  * Graphics Drivers
-  * GTK+ 3
-    * Debian/Ubuntu: ``sudo apt install libgtk-3-0``
-    * Arch: ``sudo pacman -Sy gtk3``
-  * OpenAL
-    * Debian/Ubuntu: ``sudo apt install libopenal1``
-    * Arch: ``sudo pacman -Sy openal``
-
-### Running
-Follow [these](https://docs.appimage.org/introduction/quickstart.html#how-to-run-an-appimage) instructions.
-
-## Flatpak
-<a href="https://flathub.org/apps/details/com.thebrokenrail.MCPIReborn"><img width="240" alt="Download On Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.svg" /></a>
-
-### Note
-Game data is stored in ``~/.var/app/com.thebrokenrail.MCPIReborn/.minecraft-pi`` instead of ``~/.minecraft-pi``.

docs/MULTIPLAYER.md

@@ -5,9 +5,9 @@ MCPI-Reborn supports two ways to play multiplayer.
 This is also supported by vanilla MCPI. Just load a world in MCPI and other devices on the network can join.
 
 ## External Servers
-Unlike vanilla MCPI, MCPI-Reborn allows you to natively join a server outside of the local network. Just modify ``~/.minecraft-pi/servers.txt`` and it should show up in MCPI's server list.
+Unlike vanilla MCPI, MCPI-Reborn allows you to natively join a server outside of the local network. Just modify `~/.minecraft-pi/servers.txt` and it should show up in MCPI's server list.
 
-### Example ``~/.minecraft-pi/servers.txt``
+### Example `~/.minecraft-pi/servers.txt`
 ```
 # Default Port Is 19132
 example.com

docs/OVERRIDING_ASSETS.md

@@ -1,6 +0,0 @@
-# Overriding Assets
-To make overriding assets easier, MCPI-Reborn provides an overrides folder. Any file located in Minecraft: Pi Edition's ``data`` folder can be overridden by placing a file with the same name and path in the overrides folder. The overrides folder is located at ``~/.minecraft-pi/overrides``.
-
-## Examples
-- ``data/images/terrain.png`` -> ``~/.minecraft-pi/overrides/images/terrain.png``
-- ``data/lang/en_US.lang`` -> ``~/.minecraft-pi/overrides/lang/en_US.lang``

docs/README.md

@@ -1,12 +1,9 @@
 # Documentation
-* [View Installation](INSTALL.md)
-* [View Overriding Assets](OVERRIDING_ASSETS.md)
+* [View Getting Started](GETTING_STARTED.md)
 * [View Dedicated Server](DEDICATED_SERVER.md)
 * [View Credits](CREDITS.md)
 * [View Terminology](TERMINOLOGY.md)
-* [View Building](BUILDING.md)
-* [View Architecture](ARCHITECTURE.md)
-* [View Command Line Arguments](COMMAND_LINE.md)
 * [View Multiplayer](MULTIPLAYER.md)
-* [View Sound](SOUND.md)
+* [View In-Game Controls](CONTROLS.md)
+* [View Custom Skins](CUSTOM_SKINS.md)
 * [View Changelog](CHANGELOG.md)

docs/SOUND.md

@@ -1,7 +0,0 @@
-# Sound
-One of MCPI-Reborn's main modifications is a sound-engine since MCPI doesn't include one by default[^1]. However, it can't be used out-of-box because MCPI doesn't contain any sound data and MCPI-Reborn can't include it because of copyright.
-
-MCPE's sound data can be extracted from any MCPE v0.5.0[^2] APK file, just place its `libminecraftpe.so` into `~/.minecraft-pi/overrides` and you should have sound!
-
-[^1]: The mute button is just leftover code from MCPE, it doesn't actually do anything in un-modded MCPI, however it is connected to MCPI-Reborn's sound-engine.
-[^2]: This isn't a hard limit, an MCPE v0.8.1 APK would probably work, but don't rely on it.

example-mods/README.md

@@ -1,19 +1,11 @@
 # Example Mods
-This is an example of a mod that cane be built using the modding SDK.
+These are example mods that can be built using the modding SDK.
 
 * **Expanded Creative Mod**: This specific mod adds even more items and blocks to the Creative Inventory. It was originally by [@Bigjango13](https://github.com/bigjango13).
-* **Chat Commands Mod**: This specific mod makes an chat message starting with a ``/`` handled by the MCPI API.
+* **Chat Commands Mod**: This specific mod makes a chat message starting with `/` handled by the MCPI API.
 * **Recipes Mod**: This specific mod demos custom recipes.
 
 ## The SDK
 The modding SDK is a collection of exported CMake targets that allows anyone to create their own MCPI mod!
 
-The SDK is copied to ``~/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake`` whenever MCPI-Reborn is started.
-
-## How do I use this?
-```sh
-mkdir build
-cd build
-cmake ..
-cp libexpanded-creative.so ~/.minecraft-pi/legacy-mods
-```
+The SDK is copied to `~/.minecraft-pi/sdk` whenever MCPI-Reborn is started.

example-mods/build.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+set -e
+
+# Create Output Directory
+cd "$(dirname "$0")"
+ROOT="$(pwd)"
+OUT="${ROOT}/out"
+rm -rf "${OUT}"
+mkdir -p "${OUT}"
+
+# Build
+build() {
+    cd "${ROOT}/$1"
+    # Build
+    rm -rf build
+    mkdir build
+    cd build
+    cmake -GNinja ..
+    cmake --build .
+    # Copy Result
+    cp lib*.so "${OUT}"
+}
+build chat-commands
+build expanded-creative
+build recipes

example-mods/chat-commands/CMakeLists.txt

@@ -3,13 +3,15 @@ cmake_minimum_required(VERSION 3.16.0)
 # Build For ARM
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
+set(CMAKE_SYSTEM_NAME "Linux")
+set(CMAKE_SYSTEM_PROCESSOR "arm")
 
 # Start Project
 project(chat-commands)
 
 # Include SDK
-include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
+include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn/sdk/sdk.cmake")
 
 # Build
 add_library(chat-commands SHARED chat-commands.cpp)
-target_link_libraries(chat-commands mods-headers reborn-patch symbols chat misc)
+target_link_libraries(chat-commands mods reborn-patch symbols)

example-mods/chat-commands/chat-commands.cpp

@@ -1,25 +1,41 @@
 // Headers
-
 #include <libreborn/libreborn.h>
 #include <symbols/minecraft.h>
 #include <mods/chat/chat.h>
 #include <mods/misc/misc.h>
+#include <mods/server/server.h>
 
 // The Actual Mod
-HOOK(chat_handle_packet_send, void, (unsigned char *minecraft, unsigned char *packet)) {
+HOOK(chat_handle_packet_send, void, (const Minecraft *minecraft, ChatPacket *packet)) {
     // Get Message
-    char *message = *(char **) (packet + ChatPacket_message_property_offset);
+    const char *message = packet->message.c_str();
     if (message[0] == '/') {
         // API Command
-        unsigned char *gui = minecraft + Minecraft_gui_property_offset;
-        std::string out = chat_send_api_command(minecraft, &message[1]);
+        Minecraft *mc = (Minecraft *) minecraft;
+        Gui *gui = &mc->gui;
+        std::string out = chat_send_api_command(mc, (char *) &message[1]);
         if (out.length() > 0 && out[out.length() - 1] == '\n') {
             out[out.length() - 1] = '\0';
         }
-        misc_add_message(gui, out.c_str());
+        gui->addMessage(out);
     } else {
         // Call Original Method
-        ensure_chat_handle_packet_send();
-        (*real_chat_handle_packet_send)(minecraft, packet);
+        real_chat_handle_packet_send()(minecraft, packet);
     }
 }
+
+// Add Server Command
+HOOK(server_get_commands, std::vector<ServerCommand> *, (Minecraft *minecraft, ServerSideNetworkHandler *server_side_network_handler)) {
+    // Call Original Method
+    std::vector<ServerCommand> *commands = real_server_get_commands()(minecraft, server_side_network_handler);
+    // Add Command
+    commands->push_back({
+        .name = "greet",
+        .comment = "Example Custom Command",
+        .callback = [](__attribute__((unused)) const std::string &cmd) {
+            INFO("Hello World!");
+        }
+    });
+    // Return
+    return commands;
+}

example-mods/expanded-creative/CMakeLists.txt

@@ -3,13 +3,15 @@ cmake_minimum_required(VERSION 3.16.0)
 # Build For ARM
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
+set(CMAKE_SYSTEM_NAME "Linux")
+set(CMAKE_SYSTEM_PROCESSOR "arm")
 
 # Start Project
 project(expanded-creative)
 
 # Include SDK
-include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
+include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn/sdk/sdk.cmake")
 
 # Build
 add_library(expanded-creative SHARED expanded-creative.cpp)
-target_link_libraries(expanded-creative mods-headers reborn-patch symbols misc)
+target_link_libraries(expanded-creative mods reborn-patch symbols)

example-mods/expanded-creative/expanded-creative.cpp

@@ -1,494 +1,632 @@
 // Headers
-
 #include <libreborn/libreborn.h>
 #include <symbols/minecraft.h>
 #include <mods/misc/misc.h>
 
 // The Actual Mod
-
-static void Inventory_setupDefault_FillingContainer_addItem_call_injection(unsigned char *filling_container) {
+static void Inventory_setupDefault_FillingContainer_addItem_call_injection(FillingContainer *filling_container) {
     ItemInstance *fire_instance = new ItemInstance;
     ALLOC_CHECK(fire_instance);
     fire_instance->count = 255;
     fire_instance->auxiliary = 0;
     fire_instance->id = 51;
-    (*FillingContainer_addItem)(filling_container, fire_instance);
+    filling_container->addItem(fire_instance);
 
     ItemInstance *mushroomStew_instance = new ItemInstance;
     ALLOC_CHECK(mushroomStew_instance);
     mushroomStew_instance->count = 255;
     mushroomStew_instance->auxiliary = 0;
     mushroomStew_instance->id = 282;
-    (*FillingContainer_addItem)(filling_container, mushroomStew_instance);
+    filling_container->addItem(mushroomStew_instance);
 
     ItemInstance *steak_instance = new ItemInstance;
     ALLOC_CHECK(steak_instance);
     steak_instance->count = 255;
     steak_instance->auxiliary = 0;
     steak_instance->id = 364;
-    (*FillingContainer_addItem)(filling_container, steak_instance);
+    filling_container->addItem(steak_instance);
 
     ItemInstance *cookedChicken_instance = new ItemInstance;
     ALLOC_CHECK(cookedChicken_instance);
     cookedChicken_instance->count = 255;
     cookedChicken_instance->auxiliary = 0;
     cookedChicken_instance->id = 366;
-    (*FillingContainer_addItem)(filling_container, cookedChicken_instance);
+    filling_container->addItem(cookedChicken_instance);
 
     ItemInstance *porkCooked_instance = new ItemInstance;
     ALLOC_CHECK(porkCooked_instance);
     porkCooked_instance->count = 255;
     porkCooked_instance->auxiliary = 0;
     porkCooked_instance->id = 320;
-    (*FillingContainer_addItem)(filling_container, porkCooked_instance);
+    filling_container->addItem(porkCooked_instance);
 
     ItemInstance *apple_instance = new ItemInstance;
     ALLOC_CHECK(apple_instance);
     apple_instance->count = 255;
     apple_instance->auxiliary = 0;
     apple_instance->id = 260;
-    (*FillingContainer_addItem)(filling_container, apple_instance);
+    filling_container->addItem(apple_instance);
 
     ItemInstance *tallGrass_instance = new ItemInstance;
     ALLOC_CHECK(tallGrass_instance);
     tallGrass_instance->count = 255;
     tallGrass_instance->auxiliary = 0;
     tallGrass_instance->id = 31;
-    (*FillingContainer_addItem)(filling_container, tallGrass_instance);
+    filling_container->addItem(tallGrass_instance);
 
     ItemInstance *crops_instance = new ItemInstance;
     ALLOC_CHECK(crops_instance);
     crops_instance->count = 255;
     crops_instance->auxiliary = 0;
     crops_instance->id = 59;
-    (*FillingContainer_addItem)(filling_container, crops_instance);
+    filling_container->addItem(crops_instance);
 
     ItemInstance *farmland_instance = new ItemInstance;
     ALLOC_CHECK(farmland_instance);
     farmland_instance->count = 255;
     farmland_instance->auxiliary = 0;
     farmland_instance->id = 60;
-    (*FillingContainer_addItem)(filling_container, farmland_instance);
+    filling_container->addItem(farmland_instance);
 
     ItemInstance *activeFurnace_instance = new ItemInstance;
     ALLOC_CHECK(activeFurnace_instance);
     activeFurnace_instance->count = 255;
     activeFurnace_instance->auxiliary = 0;
     activeFurnace_instance->id = 62;
-    (*FillingContainer_addItem)(filling_container, activeFurnace_instance);
+    filling_container->addItem(activeFurnace_instance);
 
     ItemInstance *ironDoor_instance = new ItemInstance;
     ALLOC_CHECK(ironDoor_instance);
     ironDoor_instance->count = 255;
     ironDoor_instance->auxiliary = 0;
     ironDoor_instance->id = 330;
-    (*FillingContainer_addItem)(filling_container, ironDoor_instance);
+    filling_container->addItem(ironDoor_instance);
 
     ItemInstance *activeRedstoneOre_instance = new ItemInstance;
     ALLOC_CHECK(activeRedstoneOre_instance);
     activeRedstoneOre_instance->count = 255;
     activeRedstoneOre_instance->auxiliary = 0;
     activeRedstoneOre_instance->id = 74;
-    (*FillingContainer_addItem)(filling_container, activeRedstoneOre_instance);
+    filling_container->addItem(activeRedstoneOre_instance);
 
     ItemInstance *pumkinStem_instance = new ItemInstance;
     ALLOC_CHECK(pumkinStem_instance);
     pumkinStem_instance->count = 255;
     pumkinStem_instance->auxiliary = 0;
     pumkinStem_instance->id = 105;
-    (*FillingContainer_addItem)(filling_container, pumkinStem_instance);
+    filling_container->addItem(pumkinStem_instance);
 
     ItemInstance *newGrass_instance = new ItemInstance;
     ALLOC_CHECK(newGrass_instance);
     newGrass_instance->count = 255;
     newGrass_instance->auxiliary = 0;
     newGrass_instance->id = 253;
-    (*FillingContainer_addItem)(filling_container, newGrass_instance);
+    filling_container->addItem(newGrass_instance);
 
     ItemInstance *reserved6_instance = new ItemInstance;
     ALLOC_CHECK(reserved6_instance);
     reserved6_instance->count = 255;
     reserved6_instance->auxiliary = 0;
     reserved6_instance->id = 1;
-    (*FillingContainer_addItem)(filling_container, reserved6_instance);
+    filling_container->addItem(reserved6_instance);
 
     ItemInstance *doubleStoneSlab_instance = new ItemInstance;
     ALLOC_CHECK(doubleStoneSlab_instance);
     doubleStoneSlab_instance->count = 255;
     doubleStoneSlab_instance->auxiliary = 0;
     doubleStoneSlab_instance->id = 43;
-    (*FillingContainer_addItem)(filling_container, doubleStoneSlab_instance);
+    filling_container->addItem(doubleStoneSlab_instance);
 
     ItemInstance *arrow_instance = new ItemInstance;
     ALLOC_CHECK(arrow_instance);
     arrow_instance->count = 255;
     arrow_instance->auxiliary = 0;
     arrow_instance->id = 262;
-    (*FillingContainer_addItem)(filling_container, arrow_instance);
+    filling_container->addItem(arrow_instance);
 
     ItemInstance *coal_instance = new ItemInstance;
     ALLOC_CHECK(coal_instance);
     coal_instance->count = 255;
     coal_instance->auxiliary = 0;
     coal_instance->id = 263;
-    (*FillingContainer_addItem)(filling_container, coal_instance);
+    filling_container->addItem(coal_instance);
 
     ItemInstance *diamond_instance = new ItemInstance;
     ALLOC_CHECK(diamond_instance);
     diamond_instance->count = 255;
     diamond_instance->auxiliary = 0;
     diamond_instance->id = 264;
-    (*FillingContainer_addItem)(filling_container, diamond_instance);
+    filling_container->addItem(diamond_instance);
 
     ItemInstance *ironIngot_instance = new ItemInstance;
     ALLOC_CHECK(ironIngot_instance);
     ironIngot_instance->count = 255;
     ironIngot_instance->auxiliary = 0;
     ironIngot_instance->id = 265;
-    (*FillingContainer_addItem)(filling_container, ironIngot_instance);
+    filling_container->addItem(ironIngot_instance);
 
     ItemInstance *goldIngot_instance = new ItemInstance;
     ALLOC_CHECK(goldIngot_instance);
     goldIngot_instance->count = 255;
     goldIngot_instance->auxiliary = 0;
     goldIngot_instance->id = 266;
-    (*FillingContainer_addItem)(filling_container, goldIngot_instance);
+    filling_container->addItem(goldIngot_instance);
 
     ItemInstance *woodSword_instance = new ItemInstance;
     ALLOC_CHECK(woodSword_instance);
     woodSword_instance->count = 255;
     woodSword_instance->auxiliary = 0;
     woodSword_instance->id = 268;
-    (*FillingContainer_addItem)(filling_container, woodSword_instance);
+    filling_container->addItem(woodSword_instance);
 
     ItemInstance *woodShovel_instance = new ItemInstance;
     ALLOC_CHECK(woodShovel_instance);
     woodShovel_instance->count = 255;
     woodShovel_instance->auxiliary = 0;
     woodShovel_instance->id = 269;
-    (*FillingContainer_addItem)(filling_container, woodShovel_instance);
+    filling_container->addItem(woodShovel_instance);
 
     ItemInstance *woodPickaxe_instance = new ItemInstance;
     ALLOC_CHECK(woodPickaxe_instance);
     woodPickaxe_instance->count = 255;
     woodPickaxe_instance->auxiliary = 0;
     woodPickaxe_instance->id = 270;
-    (*FillingContainer_addItem)(filling_container, woodPickaxe_instance);
+    filling_container->addItem(woodPickaxe_instance);
 
     ItemInstance *woodAxe_instance = new ItemInstance;
     ALLOC_CHECK(woodAxe_instance);
     woodAxe_instance->count = 255;
     woodAxe_instance->auxiliary = 0;
     woodAxe_instance->id = 271;
-    (*FillingContainer_addItem)(filling_container, woodAxe_instance);
+    filling_container->addItem(woodAxe_instance);
 
     ItemInstance *stoneSword_instance = new ItemInstance;
     ALLOC_CHECK(stoneSword_instance);
     stoneSword_instance->count = 255;
     stoneSword_instance->auxiliary = 0;
     stoneSword_instance->id = 272;
-    (*FillingContainer_addItem)(filling_container, stoneSword_instance);
+    filling_container->addItem(stoneSword_instance);
 
     ItemInstance *stoneShovel_instance = new ItemInstance;
     ALLOC_CHECK(stoneShovel_instance);
     stoneShovel_instance->count = 255;
     stoneShovel_instance->auxiliary = 0;
     stoneShovel_instance->id = 273;
-    (*FillingContainer_addItem)(filling_container, stoneShovel_instance);
+    filling_container->addItem(stoneShovel_instance);
 
     ItemInstance *stonePickaxe_instance = new ItemInstance;
     ALLOC_CHECK(stonePickaxe_instance);
     stonePickaxe_instance->count = 255;
     stonePickaxe_instance->auxiliary = 0;
     stonePickaxe_instance->id = 274;
-    (*FillingContainer_addItem)(filling_container, stonePickaxe_instance);
+    filling_container->addItem(stonePickaxe_instance);
 
     ItemInstance *stoneAxe_instance = new ItemInstance;
     ALLOC_CHECK(stoneAxe_instance);
     stoneAxe_instance->count = 255;
     stoneAxe_instance->auxiliary = 0;
     stoneAxe_instance->id = 275;
-    (*FillingContainer_addItem)(filling_container, stoneAxe_instance);
+    filling_container->addItem(stoneAxe_instance);
 
     ItemInstance *shovelIron_instance = new ItemInstance;
     ALLOC_CHECK(shovelIron_instance);
     shovelIron_instance->count = 255;
     shovelIron_instance->auxiliary = 0;
     shovelIron_instance->id = 256;
-    (*FillingContainer_addItem)(filling_container, shovelIron_instance);
+    filling_container->addItem(shovelIron_instance);
 
     ItemInstance *ironPick_instance = new ItemInstance;
     ALLOC_CHECK(ironPick_instance);
     ironPick_instance->count = 255;
     ironPick_instance->auxiliary = 0;
     ironPick_instance->id = 257;
-    (*FillingContainer_addItem)(filling_container, ironPick_instance);
+    filling_container->addItem(ironPick_instance);
 
     ItemInstance *ironAxe_instance = new ItemInstance;
     ALLOC_CHECK(ironAxe_instance);
     ironAxe_instance->count = 255;
     ironAxe_instance->auxiliary = 0;
     ironAxe_instance->id = 258;
-    (*FillingContainer_addItem)(filling_container, ironAxe_instance);
+    filling_container->addItem(ironAxe_instance);
 
     ItemInstance *diamondSword_instance = new ItemInstance;
     ALLOC_CHECK(diamondSword_instance);
     diamondSword_instance->count = 255;
     diamondSword_instance->auxiliary = 0;
     diamondSword_instance->id = 276;
-    (*FillingContainer_addItem)(filling_container, diamondSword_instance);
+    filling_container->addItem(diamondSword_instance);
 
     ItemInstance *diamondShovel_instance = new ItemInstance;
     ALLOC_CHECK(diamondShovel_instance);
     diamondShovel_instance->count = 255;
     diamondShovel_instance->auxiliary = 0;
     diamondShovel_instance->id = 277;
-    (*FillingContainer_addItem)(filling_container, diamondShovel_instance);
+    filling_container->addItem(diamondShovel_instance);
 
     ItemInstance *diamondPickaxe_instance = new ItemInstance;
     ALLOC_CHECK(diamondPickaxe_instance);
     diamondPickaxe_instance->count = 255;
     diamondPickaxe_instance->auxiliary = 0;
     diamondPickaxe_instance->id = 278;
-    (*FillingContainer_addItem)(filling_container, diamondPickaxe_instance);
+    filling_container->addItem(diamondPickaxe_instance);
 
     ItemInstance *diamondAxe_instance = new ItemInstance;
     ALLOC_CHECK(diamondAxe_instance);
     diamondAxe_instance->count = 255;
     diamondAxe_instance->auxiliary = 0;
     diamondAxe_instance->id = 279;
-    (*FillingContainer_addItem)(filling_container, diamondAxe_instance);
+    filling_container->addItem(diamondAxe_instance);
 
     ItemInstance *magicWand_instance = new ItemInstance;
     ALLOC_CHECK(magicWand_instance);
     magicWand_instance->count = 255;
     magicWand_instance->auxiliary = 0;
     magicWand_instance->id = 280;
-    (*FillingContainer_addItem)(filling_container, magicWand_instance);
+    filling_container->addItem(magicWand_instance);
 
     ItemInstance *bowl_instance = new ItemInstance;
     ALLOC_CHECK(bowl_instance);
     bowl_instance->count = 255;
     bowl_instance->auxiliary = 0;
     bowl_instance->id = 281;
-    (*FillingContainer_addItem)(filling_container, bowl_instance);
+    filling_container->addItem(bowl_instance);
 
     ItemInstance *goldSword_instance = new ItemInstance;
     ALLOC_CHECK(goldSword_instance);
     goldSword_instance->count = 255;
     goldSword_instance->auxiliary = 0;
     goldSword_instance->id = 283;
-    (*FillingContainer_addItem)(filling_container, goldSword_instance);
+    filling_container->addItem(goldSword_instance);
 
     ItemInstance *goldShovel_instance = new ItemInstance;
     ALLOC_CHECK(goldShovel_instance);
     goldShovel_instance->count = 255;
     goldShovel_instance->auxiliary = 0;
     goldShovel_instance->id = 284;
-    (*FillingContainer_addItem)(filling_container, goldShovel_instance);
+    filling_container->addItem(goldShovel_instance);
 
     ItemInstance *goldPickaxe_instance = new ItemInstance;
     ALLOC_CHECK(goldPickaxe_instance);
     goldPickaxe_instance->count = 255;
     goldPickaxe_instance->auxiliary = 0;
     goldPickaxe_instance->id = 285;
-    (*FillingContainer_addItem)(filling_container, goldPickaxe_instance);
+    filling_container->addItem(goldPickaxe_instance);
 
     ItemInstance *goldAxe_instance = new ItemInstance;
     ALLOC_CHECK(goldAxe_instance);
     goldAxe_instance->count = 255;
     goldAxe_instance->auxiliary = 0;
     goldAxe_instance->id = 286;
-    (*FillingContainer_addItem)(filling_container, goldAxe_instance);
+    filling_container->addItem(goldAxe_instance);
 
     ItemInstance *string_instance = new ItemInstance;
     ALLOC_CHECK(string_instance);
     string_instance->count = 255;
     string_instance->auxiliary = 0;
     string_instance->id = 287;
-    (*FillingContainer_addItem)(filling_container, string_instance);
+    filling_container->addItem(string_instance);
 
     ItemInstance *feather_instance = new ItemInstance;
     ALLOC_CHECK(feather_instance);
     feather_instance->count = 255;
     feather_instance->auxiliary = 0;
     feather_instance->id = 288;
-    (*FillingContainer_addItem)(filling_container, feather_instance);
+    filling_container->addItem(feather_instance);
 
     ItemInstance *gunpowder_instance = new ItemInstance;
     ALLOC_CHECK(gunpowder_instance);
     gunpowder_instance->count = 255;
     gunpowder_instance->auxiliary = 0;
     gunpowder_instance->id = 289;
-    (*FillingContainer_addItem)(filling_container, gunpowder_instance);
+    filling_container->addItem(gunpowder_instance);
 
     ItemInstance *woodHoe_instance = new ItemInstance;
     ALLOC_CHECK(woodHoe_instance);
     woodHoe_instance->count = 255;
     woodHoe_instance->auxiliary = 0;
     woodHoe_instance->id = 290;
-    (*FillingContainer_addItem)(filling_container, woodHoe_instance);
+    filling_container->addItem(woodHoe_instance);
 
     ItemInstance *stoneHoe_instance = new ItemInstance;
     ALLOC_CHECK(stoneHoe_instance);
     stoneHoe_instance->count = 255;
     stoneHoe_instance->auxiliary = 0;
     stoneHoe_instance->id = 291;
-    (*FillingContainer_addItem)(filling_container, stoneHoe_instance);
+    filling_container->addItem(stoneHoe_instance);
 
     ItemInstance *flint1_instance = new ItemInstance;
     ALLOC_CHECK(flint1_instance);
     flint1_instance->count = 255;
     flint1_instance->auxiliary = 0;
     flint1_instance->id = 292;
-    (*FillingContainer_addItem)(filling_container, flint1_instance);
+    filling_container->addItem(flint1_instance);
 
     ItemInstance *diamondHoe_instance = new ItemInstance;
     ALLOC_CHECK(diamondHoe_instance);
     diamondHoe_instance->count = 255;
     diamondHoe_instance->auxiliary = 0;
     diamondHoe_instance->id = 293;
-    (*FillingContainer_addItem)(filling_container, diamondHoe_instance);
+    filling_container->addItem(diamondHoe_instance);
 
     ItemInstance *goldHoe_instance = new ItemInstance;
     ALLOC_CHECK(goldHoe_instance);
     goldHoe_instance->count = 255;
     goldHoe_instance->auxiliary = 0;
     goldHoe_instance->id = 294;
-    (*FillingContainer_addItem)(filling_container, goldHoe_instance);
+    filling_container->addItem(goldHoe_instance);
 
     ItemInstance *seeds_instance = new ItemInstance;
     ALLOC_CHECK(seeds_instance);
     seeds_instance->count = 255;
     seeds_instance->auxiliary = 0;
     seeds_instance->id = 295;
-    (*FillingContainer_addItem)(filling_container, seeds_instance);
+    filling_container->addItem(seeds_instance);
 
     ItemInstance *wheat_instance = new ItemInstance;
     ALLOC_CHECK(wheat_instance);
     wheat_instance->count = 255;
     wheat_instance->auxiliary = 0;
     wheat_instance->id = 296;
-    (*FillingContainer_addItem)(filling_container, wheat_instance);
+    filling_container->addItem(wheat_instance);
 
     ItemInstance *bread_instance = new ItemInstance;
     ALLOC_CHECK(bread_instance);
     bread_instance->count = 255;
     bread_instance->auxiliary = 0;
     bread_instance->id = 297;
-    (*FillingContainer_addItem)(filling_container, bread_instance);
+    filling_container->addItem(bread_instance);
+
+    ItemInstance *diamondHelm_instance = new ItemInstance;
+    ALLOC_CHECK(diamondHelm_instance);
+    diamondHelm_instance->count = 255;
+    diamondHelm_instance->auxiliary = 0;
+    diamondHelm_instance->id = 310;
+    filling_container->addItem(diamondHelm_instance);
+
+    ItemInstance *diamondChest_instance = new ItemInstance;
+    ALLOC_CHECK(diamondChest_instance);
+    diamondChest_instance->count = 255;
+    diamondChest_instance->auxiliary = 0;
+    diamondChest_instance->id = 311;
+    filling_container->addItem(diamondChest_instance);
+
+    ItemInstance *diamondLeg_instance = new ItemInstance;
+    ALLOC_CHECK(diamondLeg_instance);
+    diamondLeg_instance->count = 255;
+    diamondLeg_instance->auxiliary = 0;
+    diamondLeg_instance->id = 312;
+    filling_container->addItem(diamondLeg_instance);
+
+    ItemInstance *diamondBoot_instance = new ItemInstance;
+    ALLOC_CHECK(diamondBoot_instance);
+    diamondBoot_instance->count = 255;
+    diamondBoot_instance->auxiliary = 0;
+    diamondBoot_instance->id = 313;
+    filling_container->addItem(diamondBoot_instance);
+
+    ItemInstance *leatherCap_instance = new ItemInstance;
+    ALLOC_CHECK(leatherCap_instance);
+    leatherCap_instance->count = 255;
+    leatherCap_instance->auxiliary = 0;
+    leatherCap_instance->id = 298;
+    filling_container->addItem(leatherCap_instance);
+
+    ItemInstance *leatherShirt_instance = new ItemInstance;
+    ALLOC_CHECK(leatherShirt_instance);
+    leatherShirt_instance->count = 255;
+    leatherShirt_instance->auxiliary = 0;
+    leatherShirt_instance->id = 299;
+    filling_container->addItem(leatherShirt_instance);
+
+    ItemInstance *leatherPants_instance = new ItemInstance;
+    ALLOC_CHECK(leatherPants_instance);
+    leatherPants_instance->count = 255;
+    leatherPants_instance->auxiliary = 0;
+    leatherPants_instance->id = 300;
+    filling_container->addItem(leatherPants_instance);
+
+    ItemInstance *leatherBoots_instance = new ItemInstance;
+    ALLOC_CHECK(leatherBoots_instance);
+    leatherBoots_instance->count = 255;
+    leatherBoots_instance->auxiliary = 0;
+    leatherBoots_instance->id = 301;
+    filling_container->addItem(leatherBoots_instance);
+
+    ItemInstance *chainHelm_instance = new ItemInstance;
+    ALLOC_CHECK(chainHelm_instance);
+    chainHelm_instance->count = 255;
+    chainHelm_instance->auxiliary = 0;
+    chainHelm_instance->id = 302;
+    filling_container->addItem(chainHelm_instance);
+
+    ItemInstance *chainShirt_instance = new ItemInstance;
+    ALLOC_CHECK(chainShirt_instance);
+    chainShirt_instance->count = 255;
+    chainShirt_instance->auxiliary = 0;
+    chainShirt_instance->id = 303;
+    filling_container->addItem(chainShirt_instance);
+
+    ItemInstance *chainLegs_instance = new ItemInstance;
+    ALLOC_CHECK(chainLegs_instance);
+    chainLegs_instance->count = 255;
+    chainLegs_instance->auxiliary = 0;
+    chainLegs_instance->id = 304;
+    filling_container->addItem(chainLegs_instance);
+
+    ItemInstance *chainBoots_instance = new ItemInstance;
+    ALLOC_CHECK(chainBoots_instance);
+    chainBoots_instance->count = 255;
+    chainBoots_instance->auxiliary = 0;
+    chainBoots_instance->id = 305;
+    filling_container->addItem(chainBoots_instance);
+
+    ItemInstance *goldHelm_instance = new ItemInstance;
+    ALLOC_CHECK(goldHelm_instance);
+    goldHelm_instance->count = 255;
+    goldHelm_instance->auxiliary = 0;
+    goldHelm_instance->id = 314;
+    filling_container->addItem(goldHelm_instance);
+
+    ItemInstance *goldChest_instance = new ItemInstance;
+    ALLOC_CHECK(goldChest_instance);
+    goldChest_instance->count = 255;
+    goldChest_instance->auxiliary = 0;
+    goldChest_instance->id = 315;
+    filling_container->addItem(goldChest_instance);
+
+    ItemInstance *goldLegs_instance = new ItemInstance;
+    ALLOC_CHECK(goldLegs_instance);
+    goldLegs_instance->count = 255;
+    goldLegs_instance->auxiliary = 0;
+    goldLegs_instance->id = 316;
+    filling_container->addItem(goldLegs_instance);
+
+    ItemInstance *goldBoots_instance = new ItemInstance;
+    ALLOC_CHECK(goldBoots_instance);
+    goldBoots_instance->count = 255;
+    goldBoots_instance->auxiliary = 0;
+    goldBoots_instance->id = 317;
+    filling_container->addItem(goldBoots_instance);
+
+    ItemInstance *ironHelm_instance = new ItemInstance;
+    ALLOC_CHECK(ironHelm_instance);
+    ironHelm_instance->count = 255;
+    ironHelm_instance->auxiliary = 0;
+    ironHelm_instance->id = 306;
+    filling_container->addItem(ironHelm_instance);
+
+    ItemInstance *ironChest_instance = new ItemInstance;
+    ALLOC_CHECK(ironChest_instance);
+    ironChest_instance->count = 255;
+    ironChest_instance->auxiliary = 0;
+    ironChest_instance->id = 307;
+    filling_container->addItem(ironChest_instance);
+
+    ItemInstance *ironLegs_instance = new ItemInstance;
+    ALLOC_CHECK(ironLegs_instance);
+    ironLegs_instance->count = 255;
+    ironLegs_instance->auxiliary = 0;
+    ironLegs_instance->id = 308;
+    filling_container->addItem(ironLegs_instance);
+
+    ItemInstance *ironBoots_instance = new ItemInstance;
+    ALLOC_CHECK(ironBoots_instance);
+    ironBoots_instance->count = 255;
+    ironBoots_instance->auxiliary = 0;
+    ironBoots_instance->id = 309;
+    filling_container->addItem(ironBoots_instance);
 
     ItemInstance *flint2_instance = new ItemInstance;
     ALLOC_CHECK(flint2_instance);
     flint2_instance->count = 255;
     flint2_instance->auxiliary = 0;
     flint2_instance->id = 318;
-    (*FillingContainer_addItem)(filling_container, flint2_instance);
+    filling_container->addItem(flint2_instance);
 
     ItemInstance *porkRaw_instance = new ItemInstance;
     ALLOC_CHECK(porkRaw_instance);
     porkRaw_instance->count = 255;
     porkRaw_instance->auxiliary = 0;
     porkRaw_instance->id = 319;
-    (*FillingContainer_addItem)(filling_container, porkRaw_instance);
+    filling_container->addItem(porkRaw_instance);
 
     ItemInstance *leather_instance = new ItemInstance;
     ALLOC_CHECK(leather_instance);
     leather_instance->count = 255;
     leather_instance->auxiliary = 0;
     leather_instance->id = 334;
-    (*FillingContainer_addItem)(filling_container, leather_instance);
+    filling_container->addItem(leather_instance);
 
     ItemInstance *clayBrick_instance = new ItemInstance;
     ALLOC_CHECK(clayBrick_instance);
     clayBrick_instance->count = 255;
     clayBrick_instance->auxiliary = 0;
     clayBrick_instance->id = 336;
-    (*FillingContainer_addItem)(filling_container, clayBrick_instance);
+    filling_container->addItem(clayBrick_instance);
 
     ItemInstance *clay_instance = new ItemInstance;
     ALLOC_CHECK(clay_instance);
     clay_instance->count = 255;
     clay_instance->auxiliary = 0;
     clay_instance->id = 337;
-    (*FillingContainer_addItem)(filling_container, clay_instance);
+    filling_container->addItem(clay_instance);
 
     ItemInstance *notepad_instance = new ItemInstance;
     ALLOC_CHECK(notepad_instance);
     notepad_instance->count = 255;
     notepad_instance->auxiliary = 0;
     notepad_instance->id = 339;
-    (*FillingContainer_addItem)(filling_container, notepad_instance);
+    filling_container->addItem(notepad_instance);
 
     ItemInstance *book_instance = new ItemInstance;
     ALLOC_CHECK(book_instance);
     book_instance->count = 255;
     book_instance->auxiliary = 0;
     book_instance->id = 340;
-    (*FillingContainer_addItem)(filling_container, book_instance);
+    filling_container->addItem(book_instance);
 
     ItemInstance *slimeball_instance = new ItemInstance;
     ALLOC_CHECK(slimeball_instance);
     slimeball_instance->count = 255;
     slimeball_instance->auxiliary = 0;
     slimeball_instance->id = 341;
-    (*FillingContainer_addItem)(filling_container, slimeball_instance);
+    filling_container->addItem(slimeball_instance);
 
     ItemInstance *compass_instance = new ItemInstance;
     ALLOC_CHECK(compass_instance);
     compass_instance->count = 255;
     compass_instance->auxiliary = 0;
     compass_instance->id = 345;
-    (*FillingContainer_addItem)(filling_container, compass_instance);
+    filling_container->addItem(compass_instance);
 
     ItemInstance *clock_instance = new ItemInstance;
     ALLOC_CHECK(clock_instance);
     clock_instance->count = 255;
     clock_instance->auxiliary = 0;
     clock_instance->id = 347;
-    (*FillingContainer_addItem)(filling_container, clock_instance);
+    filling_container->addItem(clock_instance);
 
     ItemInstance *glowDust_instance = new ItemInstance;
     ALLOC_CHECK(glowDust_instance);
     glowDust_instance->count = 255;
     glowDust_instance->auxiliary = 0;
     glowDust_instance->id = 348;
-    (*FillingContainer_addItem)(filling_container, glowDust_instance);
+    filling_container->addItem(glowDust_instance);
 
     ItemInstance *bone_instance = new ItemInstance;
     ALLOC_CHECK(bone_instance);
     bone_instance->count = 255;
     bone_instance->auxiliary = 0;
     bone_instance->id = 352;
-    (*FillingContainer_addItem)(filling_container, bone_instance);
+    filling_container->addItem(bone_instance);
 
     ItemInstance *sugar_instance = new ItemInstance;
     ALLOC_CHECK(sugar_instance);
     sugar_instance->count = 255;
     sugar_instance->auxiliary = 0;
     sugar_instance->id = 353;
-    (*FillingContainer_addItem)(filling_container, sugar_instance);
+    filling_container->addItem(sugar_instance);
 
     ItemInstance *melon_instance = new ItemInstance;
     ALLOC_CHECK(melon_instance);
     melon_instance->count = 255;
     melon_instance->auxiliary = 0;
     melon_instance->id = 360;
-    (*FillingContainer_addItem)(filling_container, melon_instance);
+    filling_container->addItem(melon_instance);
 
     ItemInstance *beefRaw_instance = new ItemInstance;
     ALLOC_CHECK(beefRaw_instance);
     beefRaw_instance->count = 255;
     beefRaw_instance->auxiliary = 0;
     beefRaw_instance->id = 363;
-    (*FillingContainer_addItem)(filling_container, beefRaw_instance);
+    filling_container->addItem(beefRaw_instance);
 
     ItemInstance *chickenRaw_instance = new ItemInstance;
     ALLOC_CHECK(chickenRaw_instance);
     chickenRaw_instance->count = 255;
     chickenRaw_instance->auxiliary = 0;
     chickenRaw_instance->id = 365;
-    (*FillingContainer_addItem)(filling_container, chickenRaw_instance);
+    filling_container->addItem(chickenRaw_instance);
 }
 
 // Init

example-mods/recipes/CMakeLists.txt

@@ -3,13 +3,15 @@ cmake_minimum_required(VERSION 3.16.0)
 # Build For ARM
 set(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
+set(CMAKE_SYSTEM_NAME "Linux")
+set(CMAKE_SYSTEM_PROCESSOR "arm")
 
 # Start Project
 project(recipes)
 
 # Include SDK
-include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
+include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn/sdk/sdk.cmake")
 
 # Build
 add_library(recipes SHARED recipes.cpp)
-target_link_libraries(recipes mods-headers reborn-util symbols misc)
+target_link_libraries(recipes mods reborn-util symbols)

example-mods/recipes/recipes.cpp

@@ -1,18 +1,18 @@
 // Headers
-
 #include <libreborn/libreborn.h>
 #include <symbols/minecraft.h>
 #include <mods/misc/misc.h>
 
 // Custom Crafting Recipes
-static void Recipes_injection(unsigned char *recipes) {
+#define SAND 12
+static void Recipes_injection(Recipes *recipes) {
     // Add
     Recipes_Type type1 = {
         .item = 0,
         .tile = 0,
         .instance = {
             .count = 1,
-            .id = 12,
+            .id = SAND,
             .auxiliary = 0
         },
         .letter = 'a'
@@ -32,13 +32,19 @@ static void Recipes_injection(unsigned char *recipes) {
         .id = 344,
         .auxiliary = 0
     };
-    (*Recipes_addShapelessRecipe)(recipes, result, {type1, type2});
+    std::vector<Recipes_Type> types = {type1, type2};
+    recipes->addShapelessRecipe(result, types);
 }
 
 // Custom Furnace Recipes
-static void FurnaceRecipes_injection(unsigned char *recipes) {
+static void FurnaceRecipes_injection(FurnaceRecipes *recipes) {
     // Add
-    (*FurnaceRecipes_addFurnaceRecipe)(recipes, 49, {.count = 1, .id = 246, .auxiliary = 0});
+    ItemInstance result = {
+        .count = 1,
+        .id = 246,
+        .auxiliary = 0
+    };
+    recipes->addFurnaceRecipe(49, result);
 }
 
 // Init
@@ -49,4 +55,10 @@ __attribute__((constructor)) static void init_recipes() {
     // Setup
     misc_run_on_recipes_setup(Recipes_injection);
     misc_run_on_furnace_recipes_setup(FurnaceRecipes_injection);
+
+    // Recipe Remainder
+    overwrite_calls(Minecraft_init, [](Minecraft_init_t original, Minecraft *self) {
+        original(self);
+        Item::items[SAND]->craftingRemainingItem = Item::snowball;
+    });
 }

images/CMakeLists.txt

@@ -1,23 +1,38 @@
 project(images)
 
+# Logo
+install(
+    FILES "modern_logo.png"
+    DESTINATION "${MCPI_INSTALL_DIR}/data/images/gui"
+)
+
 # Title Background
-if(NOT MCPI_HEADLESS_MODE)
-    install(
-        FILES "background.png"
-        DESTINATION "${MCPI_INSTALL_DIR}/data/images/gui"
-        RENAME "titleBG.png"
-    )
-endif()
+install(
+    FILES "background.png"
+    DESTINATION "${MCPI_INSTALL_DIR}/data/images/gui"
+    RENAME "titleBG.png"
+)
+
+# Mojang Textures
+install(
+    FILES "mojang/chest.png"
+    DESTINATION "${MCPI_INSTALL_DIR}/data/images/item"
+)
+install(
+    FILES "mojang/shadow.png" "mojang/vignette.png"
+    DESTINATION "${MCPI_INSTALL_DIR}/data/images/misc"
+)
 
 # Icon
+set(ICON_DIR "${MCPI_SHARE_DIR}/icons/hicolor/512x512/apps")
 install(
     FILES "icon.png"
-    DESTINATION "${MCPI_SHARE_DIR}/icons/hicolor/scalable/apps"
+    DESTINATION "${ICON_DIR}"
     RENAME "${MCPI_APP_ID}.png"
 )
 
 # AppImage
 if(MCPI_IS_APPIMAGE_BUILD)
-    install_symlink("${MCPI_SHARE_DIR}/icons/hicolor/scalable/apps/${MCPI_APP_ID}.png" "${MCPI_APP_ID}.png")
+    install_symlink("${ICON_DIR}/${MCPI_APP_ID}.png" "${MCPI_APP_ID}.png")
     install_symlink("${MCPI_APP_ID}.png" ".DirIcon")
 endif()

launcher/CMakeLists.txt

@@ -1,25 +1,24 @@
 project(launcher)
 
-# Dependencies
-add_subdirectory(dependencies)
-
 # Launcher
-add_executable(launcher src/bootstrap.c src/patchelf.c src/crash-report.c)
-if(MCPI_SERVER_MODE)
-    target_sources(launcher PRIVATE src/server/launcher.c)
-else()
-    add_custom_command(
-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/available-feature-flags.c"
-        COMMAND xxd -i available-feature-flags "${CMAKE_CURRENT_BINARY_DIR}/available-feature-flags.c"
-        DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/client/available-feature-flags"
-        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/client"
-        VERBATIM
-    )
-    target_sources(launcher PRIVATE src/client/launcher.cpp "${CMAKE_CURRENT_BINARY_DIR}/available-feature-flags.c")
-endif()
-target_link_libraries(launcher reborn-util)
+add_executable(launcher
+    src/bootstrap.cpp
+    src/patchelf.cpp
+    src/util.cpp
+    src/crash-report.cpp
+    src/sdk.cpp
+    src/mods.cpp
+    src/options/parser.cpp
+    src/main.cpp
+    src/client/configuration.cpp
+    src/client/cache.cpp
+    src/client/available-feature-flags # Show In IDE
+)
+embed_resource(launcher src/client/available-feature-flags)
+target_link_libraries(launcher reborn-util LIB_LIEF trampoline-headers)
 # RPath
 set_target_properties(launcher PROPERTIES INSTALL_RPATH "$ORIGIN/lib/native")
+target_link_options(launcher PRIVATE "LINKER:--disable-new-dtags")
 
 # Install
 install(TARGETS launcher DESTINATION "${MCPI_INSTALL_DIR}")
@@ -35,18 +34,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
     "Type=Application\n"
     "Categories=Game;\n"
 )
-if(MCPI_HEADLESS_MODE)
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
-        "Terminal=true\n"
-        "NoDisplay=true\n"
-    )
-else()
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
-        "Terminal=false\n"
-        "StartupNotify=false\n"
-        "StartupWMClass=${MCPI_APP_TITLE}\n"
-    )
-endif()
+file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
+    "Terminal=false\n"
+    "StartupNotify=false\n"
+    "StartupWMClass=${MCPI_APP_ID}\n"
+)
 install(
     FILES "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
     DESTINATION "${MCPI_SHARE_DIR}/applications"
@@ -97,17 +89,11 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/appstream.xml"
     "    <releases>\n"
     "        <release version=\"${MCPI_VERSION}\" date=\"${MCPI_VERSION_DATE}\"></release>\n"
     "    </releases>\n"
-)
-if(NOT MCPI_HEADLESS_MODE)
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/appstream.xml"
-        "    <screenshots>\n"
-        "        <screenshot type=\"default\">\n"
-        "            <image>https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/master/images/start.png</image>\n"
-        "        </screenshot>\n"
-        "    </screenshots>\n"
-    )
-endif()
-file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/appstream.xml"
+    "    <screenshots>\n"
+    "        <screenshot type=\"default\">\n"
+    "            <image>https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn/raw/branch/master/images/start.png</image>\n"
+    "        </screenshot>\n"
+    "    </screenshots>\n"
     "</component>\n"
 )
 install(

launcher/dependencies/CMakeLists.txt

@@ -1,4 +0,0 @@
-project(launcher-dependencies)
-
-# PatchELF
-add_subdirectory(patchelf)

launcher/dependencies/patchelf/CMakeLists.txt

@@ -1,17 +0,0 @@
-project(patchelf)
-
-# Silence Warnings
-add_compile_options(-w)
-
-## PatchELF
-
-# Build
-add_executable(patchelf src/src/patchelf.cc)
-target_compile_definitions(patchelf PRIVATE -D_FILE_OFFSET_BITS=64)
-set_target_properties(patchelf PROPERTIES CXX_STANDARD 17)
-
-# Install
-install(TARGETS patchelf DESTINATION "${MCPI_BIN_DIR}")
-
-# License
-install(FILES src/COPYING DESTINATION "${MCPI_LEGAL_DIR}/patchelf")

launcher/dependencies/patchelf/src

@@ -1 +0,0 @@
-Subproject commit 734daa3d0f79cf1a0c81f927d846ace5d6a2c8e1

launcher/src/bootstrap.c

@@ -1,467 +0,0 @@
-#define _FILE_OFFSET_BITS 64
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <dirent.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-#include <libreborn/libreborn.h>
-
-#include "bootstrap.h"
-#include "patchelf.h"
-#include "crash-report.h"
-
-// Get All Mods In Folder
-static void load(char **ld_preload, char *folder) {
-    int folder_name_length = strlen(folder);
-    // Retry Until Successful
-    while (1) {
-        // Open Folder
-        DIR *dp = opendir(folder);
-        if (dp != NULL) {
-            // Loop Through Folder
-            struct dirent *entry = NULL;
-            errno = 0;
-            while (1) {
-                errno = 0;
-                entry = readdir(dp);
-                if (entry != NULL) {
-                    // Check If File Is Regular
-                    if (entry->d_type == DT_REG) {
-                        // Get Full Name
-                        int name_length = strlen(entry->d_name);
-                        int total_length = folder_name_length + name_length;
-                        char name[total_length + 1];
-
-                        // Concatenate Folder Name And File Name
-                        for (int i = 0; i < folder_name_length; i++) {
-                            name[i] = folder[i];
-                        }
-                        for (int i = 0; i < name_length; i++) {
-                            name[folder_name_length + i] = entry->d_name[i];
-                        }
-                        // Add Terminator
-                        name[total_length] = '\0';
-
-                        // Check If File Is Accessible
-                        int result = access(name, R_OK);
-                        if (result == 0) {
-                            // Add To LD_PRELOAD
-                            string_append(ld_preload, "%s%s", *ld_preload == NULL ? "" : ":", name);
-                        } else if (result == -1 && errno != 0) {
-                            // Fail
-                            WARN("Unable To Acesss: %s: %s", name, strerror(errno));
-                            errno = 0;
-                        }
-                    }
-                } else if (errno != 0) {
-                    // Error Reading Contents Of Folder
-                    ERR("Error Reading Directory: %s: %s", folder, strerror(errno));
-                } else {
-                    // Done!
-                    break;
-                }
-            }
-            // Close Folder
-            closedir(dp);
-
-            // Exit Function
-            return;
-        } else if (errno == ENOENT) {
-            // Folder Doesn't Exists, Attempt Creation
-            int ret = mkdir(folder, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-            if (ret != 0) {
-                // Unable To Create Folder
-                ERR("Error Creating Directory: %s: %s", folder, strerror(errno));
-            }
-            // Continue Retrying
-        } else {
-            // Unable To Open Folder
-            ERR("Error Opening Directory: %s: %s", folder, strerror(errno));
-        }
-    }
-}
-
-#define MCPI_BINARY "minecraft-pi"
-#define QEMU_BINARY "qemu-arm"
-
-// Exit Handler
-static void exit_handler(__attribute__((unused)) int signal_id) {
-    // Pass Signal To Child
-    murder_children();
-    while (wait(NULL) > 0) {}
-    _exit(EXIT_SUCCESS);
-}
-
-// Pre-Bootstrap
-void pre_bootstrap(int argc, char *argv[]) {
-    // Disable stdout Buffering
-    setvbuf(stdout, NULL, _IONBF, 0);
-
-    // Set Default Native Component Environment
-#define set_variable_default(name) set_and_print_env("MCPI_NATIVE_" name, getenv(name));
-    for_each_special_environmental_variable(set_variable_default);
-
-    // Print Version
-    for (int i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "-v") == 0) {
-            // Print
-            printf("Reborn v%s\n", MCPI_VERSION);
-            fflush(stdout);
-            exit(EXIT_SUCCESS);
-        }
-    }
-
-    // GTK Dark Mode
-#ifndef MCPI_SERVER_MODE
-    set_and_print_env("GTK_THEME", "Adwaita:dark");
-#endif
-
-    // Debug Zenity
-#ifndef MCPI_SERVER_MODE
-    {
-        const char *is_debug = getenv("MCPI_DEBUG");
-        if (is_debug != NULL && strlen(is_debug) > 0) {
-            set_and_print_env("ZENITY_DEBUG", "1");
-        }
-    }
-#endif
-
-    // AppImage
-#ifdef MCPI_IS_APPIMAGE_BUILD
-    {
-        char *owd = getenv("OWD");
-        if (owd != NULL && chdir(owd) != 0) {
-            ERR("AppImage: Unable To Fix Current Directory: %s", strerror(errno));
-        }
-    }
-#endif
-
-    // Get Binary Directory
-    char *binary_directory = get_binary_directory();
-
-    // Configure PATH
-    {
-        // Add Library Directory
-        char *new_path;
-        safe_asprintf(&new_path, "%s/bin", binary_directory);
-        // Add Existing PATH
-        {
-            char *value = getenv("PATH");
-            if (value != NULL && strlen(value) > 0) {
-                string_append(&new_path, ":%s", value);
-            }
-        }
-        // Set And Free
-        set_and_print_env("PATH", new_path);
-        free(new_path);
-    }
-
-    // Free Binary Directory
-    free(binary_directory);
-
-    // Setup Crash Reports
-    setup_crash_report();
-
-    // Install Signal Handlers
-    struct sigaction act_sigint;
-    memset((void *) &act_sigint, 0, sizeof (struct sigaction));
-    act_sigint.sa_flags = SA_RESTART;
-    act_sigint.sa_handler = &exit_handler;
-    sigaction(SIGINT, &act_sigint, NULL);
-    struct sigaction act_sigterm;
-    memset((void *) &act_sigterm, 0, sizeof (struct sigaction));
-    act_sigterm.sa_flags = SA_RESTART;
-    act_sigterm.sa_handler = &exit_handler;
-    sigaction(SIGTERM, &act_sigterm, NULL);
-}
-
-// Copy SDK Into ~/.minecraft-pi
-static void run_simple_command(const char *const command[], const char *error) {
-    int status = 0;
-    char *output = run_command(command, &status);
-    if (output != NULL) {
-        free(output);
-    }
-    if (!is_exit_status_success(status)) {
-        ERR("%s", error);
-    }
-}
-static void copy_sdk(char *binary_directory) {
-    // Output Directory
-    char *output = NULL;
-    safe_asprintf(&output, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/sdk/" MCPI_SDK_DIR, getenv("HOME"));
-    // Source Directory
-    char *source = NULL;
-    safe_asprintf(&source, "%s/sdk/.", binary_directory);
-
-    // Clean
-    {
-        const char *const command[] = {"rm", "-rf", output, NULL};
-        run_simple_command(command, "Unable To Clean SDK Output Directory");
-    }
-
-    // Make Directory
-    {
-        const char *const command[] = {"mkdir", "-p", output, NULL};
-        run_simple_command(command, "Unable To Create SDK Output Directory");
-    }
-
-    // Copy
-    {
-        const char *const command[] = {"cp", "-ar", source, output, NULL};
-        run_simple_command(command, "Unable To Copy SDK");
-    }
-
-    // Free
-    free(output);
-    free(source);
-}
-
-// Bootstrap
-void bootstrap(int argc, char *argv[]) {
-    INFO("Configuring Game...");
-
-    // Get Binary Directory
-    char *binary_directory = get_binary_directory();
-
-    // Copy SDK
-    copy_sdk(binary_directory);
-
-    // Set MCPI_REBORN_ASSETS_PATH
-    {
-        char *assets_path = realpath("/proc/self/exe", NULL);
-        ALLOC_CHECK(assets_path);
-        chop_last_component(&assets_path);
-        string_append(&assets_path, "/data");
-        set_and_print_env("MCPI_REBORN_ASSETS_PATH", assets_path);
-        free(assets_path);
-    }
-
-    // Resolve Binary Path & Set MCPI_DIRECTORY
-    char *resolved_path = NULL;
-    {
-        // Log
-        DEBUG("Resolving File Paths...");
-
-        // Resolve Full Binary Path
-        char *full_path = NULL;
-        safe_asprintf(&full_path, "%s/" MCPI_BINARY, binary_directory);
-        resolved_path = realpath(full_path, NULL);
-        ALLOC_CHECK(resolved_path);
-        free(full_path);
-    }
-
-    // Fix MCPI Dependencies
-    char new_mcpi_exe_path[] = MCPI_PATCHED_DIR "/XXXXXX";
-    {
-        // Log
-        DEBUG("Patching ELF Dependencies...");
-
-        // Find Linker
-        char *linker = NULL;
-        // Select Linker
-#ifdef MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
-        // Use ARM Sysroot Linker
-        safe_asprintf(&linker, "%s/sysroot/lib/ld-linux-armhf.so.3", binary_directory);
-#else
-        // Use Current Linker
-        char *exe = realpath("/proc/self/exe", NULL);
-        ALLOC_CHECK(exe);
-        linker = patch_get_interpreter(exe);
-        free(exe);
-#endif
-
-        // Patch
-        patch_mcpi_elf_dependencies(resolved_path, new_mcpi_exe_path, linker);
-
-        // Free Linker Path
-        if (linker != NULL) {
-            free(linker);
-        }
-
-        // Verify
-        if (!starts_with(new_mcpi_exe_path, MCPI_PATCHED_DIR)) {
-            IMPOSSIBLE();
-        }
-    }
-
-    // Set MCPI_VANILLA_ASSETS_PATH
-    {
-        char *assets_path = strdup(resolved_path);
-        ALLOC_CHECK(assets_path);
-        chop_last_component(&assets_path);
-        string_append(&assets_path, "/data");
-        set_and_print_env("MCPI_VANILLA_ASSETS_PATH", assets_path);
-        free(assets_path);
-    }
-
-    // Free Resolved Path
-    free(resolved_path);
-
-    // Configure Library Search Path
-    {
-        // Log
-        DEBUG("Setting Linker Search Paths...");
-
-        // Prepare
-        char *transitive_ld_path = NULL;
-        char *mcpi_ld_path = NULL;
-
-        // Library Search Path For Native Components
-        {
-            // Add Native Library Directory
-            safe_asprintf(&transitive_ld_path, "%s/lib/native", binary_directory);
-
-            // Add Host LD_LIBRARY_PATH
-            {
-                char *value = getenv("LD_LIBRARY_PATH");
-                if (value != NULL && strlen(value) > 0) {
-                    string_append(&transitive_ld_path, ":%s", value);
-                }
-            }
-
-            // Set
-            set_and_print_env("MCPI_NATIVE_LD_LIBRARY_PATH", transitive_ld_path);
-            free(transitive_ld_path);
-        }
-
-        // Library Search Path For ARM Components
-        {
-            // Add ARM Library Directory
-            // (This Overrides LD_LIBRARY_PATH Using ld.so's --library-path Option)
-            safe_asprintf(&mcpi_ld_path, "%s/lib/arm", binary_directory);
-
-            // Add ARM Sysroot Libraries (Ensure Priority) (Ignore On Actual ARM System)
-#ifdef MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
-            string_append(&mcpi_ld_path, ":%s/sysroot/lib:%s/sysroot/lib/arm-linux-gnueabihf:%s/sysroot/usr/lib:%s/sysroot/usr/lib/arm-linux-gnueabihf", binary_directory, binary_directory, binary_directory, binary_directory);
-#endif
-
-            // Add Host LD_LIBRARY_PATH
-            {
-                char *value = getenv("LD_LIBRARY_PATH");
-                if (value != NULL && strlen(value) > 0) {
-                    string_append(&transitive_ld_path, ":%s", value);
-                }
-            }
-
-            // Set
-            set_and_print_env("MCPI_ARM_LD_LIBRARY_PATH", mcpi_ld_path);
-            free(mcpi_ld_path);
-        }
-
-        // Setup iconv
-        {
-            // Native Components
-            char *host_gconv_path = getenv("GCONV_PATH");
-            set_and_print_env("MCPI_NATIVE_GCONV_PATH", host_gconv_path);
-
-            // ARM Components
-#ifdef MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
-            char *gconv_path = NULL;
-            safe_asprintf(&gconv_path, "%s/sysroot/usr/lib/gconv", binary_directory);
-            set_and_print_env("MCPI_ARM_GCONV_PATH", gconv_path);
-            free(gconv_path);
-#else
-            set_and_print_env("MCPI_ARM_GCONV_PATH", host_gconv_path);
-#endif
-        }
-    }
-
-    // Configure Preloaded Objects
-    {
-        // Log
-        DEBUG("Locating Mods...");
-
-        // Native Components
-        char *host_ld_preload = getenv("LD_PRELOAD");
-        set_and_print_env("MCPI_NATIVE_LD_PRELOAD", host_ld_preload);
-
-        // ARM Components
-        {
-            // Prepare
-            char *preload = NULL;
-
-            // ~/.minecraft-pi/mods
-            {
-                // Get Mods Folder
-                char *mods_folder = NULL;
-                safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/legacy-mods/", getenv("HOME"));
-                // Load Mods From ./mods
-                load(&preload, mods_folder);
-                // Free Mods Folder
-                free(mods_folder);
-            }
-
-            // Built-In Mods
-            {
-                // Get Mods Folder
-                char *mods_folder = NULL;
-                safe_asprintf(&mods_folder, "%s/mods/", binary_directory);
-                // Load Mods From ./mods
-                load(&preload, mods_folder);
-                // Free Mods Folder
-                free(mods_folder);
-            }
-
-            // Add LD_PRELOAD
-            {
-                char *value = getenv("LD_PRELOAD");
-                if (value != NULL && strlen(value) > 0) {
-                    string_append(&preload, ":%s", value);
-                }
-            }
-
-            // Set
-            set_and_print_env("MCPI_ARM_LD_PRELOAD", preload);
-            free(preload);
-        }
-    }
-
-    // Free Binary Directory
-    free(binary_directory);
-
-    // Start Game
-    INFO("Starting Game...");
-
-    // Arguments
-    int argv_start = 1; // argv = &new_args[argv_start]
-    const char *new_args[argv_start /* 1 Potential Prefix Argument (QEMU) */ + argc + 1 /* NULL-Terminator */]; //
-
-    // Copy Existing Arguments
-    for (int i = 1; i < argc; i++) {
-        new_args[i + argv_start] = argv[i];
-    }
-    // NULL-Terminator
-    new_args[argv_start + argc] = NULL;
-
-    // Set Executable Argument
-    new_args[argv_start] = new_mcpi_exe_path;
-
-    // Non-ARM Systems Need QEMU
-#ifndef __ARM_ARCH
-    argv_start--;
-    new_args[argv_start] = QEMU_BINARY;
-#endif
-
-    // Setup Environment
-    setup_exec_environment(1);
-
-    // Pass LD_* Variables Through QEMU
-#ifndef __ARM_ARCH
-    char *qemu_set_env = NULL;
-#define pass_variable_through_qemu(name) string_append(&qemu_set_env, "%s%s=%s", qemu_set_env == NULL ? "" : ",", name, getenv(name));
-    for_each_special_environmental_variable(pass_variable_through_qemu);
-    set_and_print_env("QEMU_SET_ENV", qemu_set_env);
-    free(qemu_set_env);
-    // Treat QEMU Itself As A Native Component
-    setup_exec_environment(0);
-#endif
-
-    // Run
-    const char **new_argv = &new_args[argv_start];
-    safe_execvpe(new_argv, (const char *const *) environ);
-}

launcher/src/bootstrap.cpp

@@ -0,0 +1,196 @@
+#define _FILE_OFFSET_BITS 64
+
+#include <string>
+#include <vector>
+
+#include <libreborn/libreborn.h>
+#include <trampoline/types.h>
+
+#include "util.h"
+#include "bootstrap.h"
+#include "patchelf.h"
+
+#define MCPI_BINARY "minecraft-pi"
+
+#define REQUIRED_PAGE_SIZE 4096
+
+// Debug Information
+static void run_debug_command(const char *const command[], const char *prefix) {
+    int status = 0;
+    char *output = run_command(command, &status, nullptr);
+    if (output != nullptr) {
+        // Remove Newline
+        size_t length = strlen(output);
+        if (length > 0 && output[length - 1] == '\n') {
+            output[length - 1] = '\0';
+        }
+
+        // Print
+        DEBUG("%s: %s", prefix, output);
+        free(output);
+    }
+    if (!is_exit_status_success(status)) {
+        ERR("Unable To Gather Debug Information");
+    }
+}
+static void print_debug_information() {
+    // System Information
+    const char *const command[] = {"uname", "-a", nullptr};
+    run_debug_command(command, "System Information");
+
+    // Version
+    DEBUG("Reborn Version: v%s", MCPI_VERSION);
+
+    // Architecture
+    const char *arch =
+#ifdef __x86_64__
+        "AMD64"
+#elif defined(__aarch64__)
+        "ARM64"
+#elif defined(__arm__)
+        "ARM32"
+#else
+        "Unknown"
+#endif
+        ;
+    DEBUG("Reborn Target Architecture: %s", arch);
+}
+
+// Bootstrap
+void bootstrap(const options_t &options) {
+    // Debug Information
+    print_debug_information();
+
+    // Check Page Size (Not Needed When Using QEMU)
+    long page_size = sysconf(_SC_PAGESIZE);
+    if (page_size != REQUIRED_PAGE_SIZE) {
+        CONDITIONAL_ERR(!options.skip_pagesize_check, "Invalid page size! A page size of %ld bytes is required, but the system size is %ld bytes.", (long) REQUIRED_PAGE_SIZE, page_size);
+    }
+
+    // Get Binary Directory
+    const std::string binary_directory = get_binary_directory();
+    DEBUG("Binary Directory: %s", binary_directory.c_str());
+
+    // Copy SDK
+    if (!reborn_is_server()) {
+        copy_sdk(binary_directory, true);
+    }
+
+    // Set MCPI_REBORN_ASSETS_PATH
+    {
+        std::string assets_path = safe_realpath("/proc/self/exe");
+        chop_last_component(assets_path);
+        assets_path += "/data";
+        set_and_print_env(_MCPI_REBORN_ASSETS_PATH_ENV, assets_path.c_str());
+    }
+
+    // Resolve Binary Path & Set MCPI_DIRECTORY
+    std::string original_game_binary;
+    std::string game_binary;
+    {
+        // Log
+        DEBUG("Resolving File Paths...");
+
+        // Resolve Full Binary Path
+        const std::string full_path = binary_directory + ("/" MCPI_BINARY);
+        original_game_binary = safe_realpath(full_path);
+        const char *custom_binary = getenv(MCPI_BINARY_ENV);
+        if (custom_binary != nullptr) {
+            game_binary = safe_realpath(custom_binary);
+        } else {
+            game_binary = original_game_binary;
+        }
+    }
+
+    // Configure Preloaded Objects
+    std::vector<std::string> mcpi_ld_preload;
+    {
+        // Log
+        DEBUG("Locating Mods...");
+
+        // ARM Components
+        mcpi_ld_preload = bootstrap_mods(binary_directory);
+    }
+
+    // Configure Library Search Path
+    std::vector<std::string> mcpi_ld_path;
+    {
+        // Log
+        DEBUG("Setting Linker Search Paths...");
+
+        // Library Search Path For ARM Components
+        {
+            // Add ARM Library Directory
+            mcpi_ld_path.push_back("lib/arm");
+
+            // Add ARM Sysroot Libraries (Ensure Priority) (Ignore On Actual ARM System)
+#ifdef MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
+            mcpi_ld_path.push_back("sysroot/lib");
+            mcpi_ld_path.push_back("sysroot/lib/arm-linux-gnueabihf");
+            mcpi_ld_path.push_back("sysroot/usr/lib");
+            mcpi_ld_path.push_back("sysroot/usr/lib/arm-linux-gnueabihf");
+#endif
+
+            // Fix Paths
+            for (std::string &path : mcpi_ld_path) {
+                path = binary_directory + '/' + path;
+            }
+        }
+    }
+
+    // Fix MCPI Dependencies
+    char new_mcpi_exe_path[] = MCPI_PATCHED_DIR "/XXXXXX";
+    {
+        // Log
+        DEBUG("Patching ELF...");
+
+        // Find Linker
+        std::string linker = "/lib/ld-linux-armhf.so.3";
+#ifdef MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
+        // Use ARM Sysroot Linker
+        linker = binary_directory + "/sysroot" + linker;
+#endif
+
+        // Patch
+        patch_mcpi_elf_dependencies(game_binary, new_mcpi_exe_path, linker, mcpi_ld_path, mcpi_ld_preload);
+
+        // Verify
+        if (!starts_with(new_mcpi_exe_path, MCPI_PATCHED_DIR)) {
+            IMPOSSIBLE();
+        }
+    }
+
+    // Set MCPI_VANILLA_ASSETS_PATH
+    {
+        std::string assets_path = original_game_binary;
+        chop_last_component(assets_path);
+        assets_path += "/data";
+        set_and_print_env(_MCPI_VANILLA_ASSETS_PATH_ENV, assets_path.c_str());
+    }
+
+    // Start Game
+    INFO("Starting Game...");
+
+    // Arguments
+    std::vector<std::string> args;
+    // Use Extra If Needed
+#ifdef MCPI_BUILD_RUNTIME
+    args.push_back("runtime");
+#endif
+    // Fix QEMU Bug
+#ifdef MCPI_RUNTIME_IS_QEMU
+    args.push_back("-B");
+    args.push_back(std::to_string(QEMU_GUEST_BASE));
+#endif
+
+    // Specify MCPI Binary
+    args.push_back(new_mcpi_exe_path);
+
+    // Run
+    const char *new_argv[args.size() + 1];
+    for (std::vector<std::string>::size_type i = 0; i < args.size(); i++) {
+        new_argv[i] = args[i].c_str();
+    }
+    new_argv[args.size()] = nullptr;
+    safe_execvpe(new_argv, environ);
+}

launcher/src/bootstrap.h

@@ -1,12 +1,10 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <string>
+#include <vector>
 
-void pre_bootstrap(int argc, char *argv[]);
-void bootstrap(int argc, char *argv[]);
+#include "options/parser.h"
 
-#ifdef __cplusplus
-}
-#endif
+void bootstrap(const options_t &options);
+void copy_sdk(const std::string &binary_directory, bool log_with_debug);
+std::vector<std::string> bootstrap_mods(const std::string &binary_directory);

launcher/src/client/available-feature-flags

@@ -1,24 +1,27 @@
 FALSE Full Touch GUI
+TRUE Fix Bow & Arrow
 TRUE Fix Attacking
 FALSE Force Mob Spawning
-TRUE Fancy Graphics
 TRUE Disable Autojump By Default
 TRUE Display Nametags By Default
+TRUE Fix Sign Placement
 TRUE Show Block Outlines
-FALSE Expand Creative Inventory
+FALSE Expand Creative Mode Inventory
 FALSE Remove Creative Mode Restrictions
-FALSE Peaceful Mode
+FALSE Display Slot Count In Creative Mode
+FALSE Force Survival Mode Inventory UI
+FALSE Force Survival Mode Inventory Behavior
+FALSE Maximize Creative Mode Inventory Stack Size
 TRUE Animated Water
-TRUE Remove Invalid Item Background
-TRUE Disable "gui_blocks" Atlas
-TRUE Smooth Lighting
-FALSE 3D Anaglyph
+TRUE Animated Lava
+TRUE Animated Fire
+TRUE Regenerate "gui_blocks" Atlas
 TRUE Fix Camera Rendering
 TRUE Implement Chat
 FALSE Hide Chat Messages
 TRUE Implement Death Messages
 TRUE Implement Game-Mode Switching
-TRUE Allow Joining Survival Servers
+TRUE Allow Joining Survival Mode Servers
 TRUE Miscellaneous Input Fixes
 TRUE Bind "Q" Key To Item Dropping
 TRUE Bind Common Toggleable Options To Function Keys
@@ -29,12 +32,12 @@ TRUE Implement Sound Engine
 TRUE Close Current Screen On Death
 FALSE Disable Raw Mouse Motion (Not Recommended)
 TRUE Fix Furnace Not Checking Item Auxiliary
-FALSE Disable Hosting LAN Worlds
 TRUE Improved Cursor Rendering
 TRUE Disable V-Sync
+TRUE Fix Options Screen
 TRUE Force Touch GUI Inventory
 TRUE Fix Pause Menu
-TRUE Improved Title Background
+TRUE Add Title Screen Background
 TRUE Force Touch GUI Button Behavior
 TRUE Improved Button Hover Behavior
 TRUE Implement Create World Dialog
@@ -43,3 +46,70 @@ TRUE Add Buckets
 TRUE Classic HUD
 TRUE Translucent Toolbar
 FALSE Force EGL
+TRUE Improved Classic Title Screen
+FALSE Disable Speed Bridging
+FALSE Disable Creative Mode Mining Delay
+FALSE Add Biome Colors To Grass
+TRUE Generate Caves
+FALSE Disable Block Tinting
+TRUE Disable Hostile AI In Creative Mode
+TRUE Load Custom Skins
+TRUE 3D Chest Model
+TRUE Replace Block Highlight With Outline
+TRUE Add Cake
+TRUE Use Java Beta 1.3 Light Ramp
+TRUE Send Full Level When Hosting Game
+FALSE Food Overlay
+TRUE Add Splashes
+TRUE Display Date In Select World Screen
+TRUE Optimized Chunk Sorting
+TRUE Fix Held Item Caching
+TRUE Add Reborn Info To Options
+FALSE Log FPS
+TRUE Add Welcome Screen
+TRUE F3 Debug Information
+TRUE Multidraw Rendering
+TRUE Add Missing Language Strings
+TRUE Fix Pigmen Burning In The Sun
+TRUE Fix Carried Grass's Bottom Texture
+TRUE Hide Crosshair In Third-Person
+TRUE Fix Camera Legs
+TRUE Implement Crafting Remainders
+TRUE Fix Door Duplication
+TRUE Fix Cobweb Lighting
+TRUE Fix Sneaking Syncing
+TRUE Fix Fire Immunity
+TRUE Fix Fire Syncing
+TRUE Fix Sunlight Not Properly Setting Mobs On Fire
+TRUE Stop Creative Players From Burning
+TRUE Render Fire In Third-Person
+TRUE Improved Water Rendering
+TRUE Classic Item Count UI
+TRUE Fix Screen Rendering When Hiding HUD
+TRUE Sanitize Usernames
+TRUE Patch RakNet Security Bug
+TRUE Log RakNet Startup Errors
+TRUE Prevent Unnecessary Server Pinging
+TRUE Proper OpenGL Buffer Generation
+TRUE Fix Furnace Screen Visual Bug
+TRUE Fix Text Wrapping
+TRUE Fullscreen Support
+TRUE Always Save Chest Tile Entities
+TRUE Fix Transferring Durability When Using Items
+TRUE Fix Switching Perspective While Sneaking
+TRUE Log Chat Messages
+TRUE Log Game Status
+TRUE Screenshot Support
+TRUE Fix Camera Functionality
+TRUE Allow High-Resolution Title
+TRUE Improved Classic Title Positioning
+TRUE Use Updated Title
+TRUE Hide Block Outline When GUI Is Hidden
+TRUE Fix Crash When Generating Certain Seeds
+TRUE Click Buttons On Mouse Down
+TRUE 3D Dropped Items
+TRUE Render Entity Shadows
+TRUE Render Vignette
+TRUE Implement RaspberryJuice API
+TRUE Increase Render Chunk Size
+TRUE Proper Entity Shading

launcher/src/client/cache.cpp

@@ -0,0 +1,172 @@
+#include <cstdlib>
+#include <string>
+#include <fstream>
+#include <unordered_map>
+#include <sstream>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <libreborn/libreborn.h>
+
+#include "configuration.h"
+#include "cache.h"
+
+// Get Cache Path
+static std::string get_cache_path() {
+    const char *home = getenv(_MCPI_HOME_ENV);
+    if (home == nullptr) {
+        IMPOSSIBLE();
+    }
+    return std::string(home) + get_home_subdirectory_for_game_data() + "/.launcher-cache";
+}
+
+// Load
+launcher_cache empty_cache = {
+    .username = DEFAULT_USERNAME,
+    .render_distance = DEFAULT_RENDER_DISTANCE,
+    .feature_flags = {}
+};
+launcher_cache load_cache() {
+    // Log
+    DEBUG("Loading Launcher Cache...");
+
+    // Return Value
+    launcher_cache ret = empty_cache;
+
+    // Open File
+    std::ifstream stream(get_cache_path(), std::ios::in | std::ios::binary);
+    if (!stream) {
+        // Fail
+        struct stat s;
+        // No Warning If File Doesn't Exist
+        if (stat(get_cache_path().c_str(), &s) == 0) {
+            WARN("Unable To Open Launcher Cache For Loading");
+        }
+    } else {
+        // Lock File
+        int lock_fd = lock_file(get_cache_path().c_str());
+
+        // Check Version
+        unsigned char cache_version;
+        stream.read((char *) &cache_version, 1);
+        if (stream.eof() || cache_version != (unsigned char) CACHE_VERSION) {
+            // Fail
+            if (!stream.eof()) {
+                WARN("Invalid Launcher Cache Version (Expected: %i, Actual: %i)", (int) CACHE_VERSION, (int) cache_version);
+            } else {
+                WARN("Unable To Read Launcher Cache Version");
+            }
+            stream.close();
+        } else {
+            // Load Username And Render Distance
+            launcher_cache cache;
+            std::getline(stream, cache.username, '\0');
+            std::getline(stream, cache.render_distance, '\0');
+
+            // Load Feature Flags
+            std::string flag;
+            while (!stream.eof() && std::getline(stream, flag, '\0')) {
+                if (flag.length() > 0) {
+                    unsigned char is_enabled = 0;
+                    stream.read((char *) &is_enabled, 1);
+                    cache.feature_flags[flag] = is_enabled != (unsigned char) 0;
+                }
+                stream.peek();
+            }
+
+            // Finish
+            stream.close();
+            if (!stream) {
+                // Fail
+                WARN("Failure While Loading Launcher Cache");
+            } else {
+                // Success
+                ret = cache;
+            }
+        }
+
+        // Unlock File
+        unlock_file(get_cache_path().c_str(), lock_fd);
+    }
+
+    // Return
+    return ret;
+}
+
+// Save
+#define write_env_to_stream(stream, env) \
+    { \
+        const char *env_value = getenv(env); \
+        if (env == NULL) { \
+            IMPOSSIBLE(); \
+        } \
+        stream.write(env_value, strlen(env_value) + 1); \
+    }
+void save_cache() {
+    // Log
+    DEBUG("Saving Launcher Cache...");
+
+    // Open File
+    std::ofstream stream(get_cache_path(), std::ios::out | std::ios::binary);
+    if (!stream) {
+        // Fail
+        WARN("Unable To Open Launcher Cache For Saving");
+    } else {
+        // Lock File
+        int lock_fd = lock_file(get_cache_path().c_str());
+
+        // Save Cache Version
+        unsigned char cache_version = (unsigned char) CACHE_VERSION;
+        stream.write((const char *) &cache_version, 1);
+
+        // Save Username And Render Distance
+        write_env_to_stream(stream, MCPI_USERNAME_ENV);
+        write_env_to_stream(stream, MCPI_RENDER_DISTANCE_ENV);
+
+        // Save Feature Flags
+        std::unordered_map<std::string, bool> flags;
+        load_available_feature_flags([&flags](std::string flag) {
+            std::string stripped_flag = strip_feature_flag_default(flag, nullptr);
+            flags[stripped_flag] = false;
+        });
+        {
+            const char *enabled_flags = getenv(MCPI_FEATURE_FLAGS_ENV);
+            if (enabled_flags == nullptr) {
+                IMPOSSIBLE();
+            }
+            std::istringstream enabled_flags_stream(enabled_flags);
+            std::string flag;
+            while (std::getline(enabled_flags_stream, flag, '|')) {
+                if (flag.length() > 0) {
+                    flags[flag] = true;
+                }
+            }
+        }
+        for (auto &it : flags) {
+            stream.write(it.first.c_str(), it.first.size() + 1);
+            unsigned char val = it.second ? (unsigned char) 1 : (unsigned char) 0;
+            stream.write((const char *) &val, 1);
+        }
+
+        // Finish
+        stream.close();
+        if (!stream.good()) {
+            WARN("Failure While Saving Launcher Cache");
+        }
+
+        // Unlock File
+        unlock_file(get_cache_path().c_str(), lock_fd);
+    }
+}
+
+// Wipe Cache
+void wipe_cache() {
+    // Log
+    INFO("Wiping Launcher Cache...");
+
+    // Unlink File
+    const int ret = unlink(get_cache_path().c_str());
+    if (ret != 0 && errno != ENOENT) {
+        WARN("Failure While Wiping Cache: %s", strerror(errno));
+    }
+}

launcher/src/client/cache.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string>
+#include <unordered_map>
+
+// Cache Version
+#define CACHE_VERSION 0
+
+// Load Cache
+typedef struct {
+    std::string username;
+    std::string render_distance;
+    std::unordered_map<std::string, bool> feature_flags;
+} launcher_cache;
+extern launcher_cache empty_cache;
+launcher_cache load_cache();
+
+// Save Cache
+void save_cache();
+
+// Wipe Cache
+void wipe_cache();

launcher/src/client/configuration.cpp

@@ -9,23 +9,25 @@
 
 #include <libreborn/libreborn.h>
 
-#include "../bootstrap.h"
+#include "../util.h"
+#include "configuration.h"
+#include "cache.h"
 
 // Strip Feature Flag Default
-static std::string strip_feature_flag_default(std::string flag, bool *default_ret) {
+std::string strip_feature_flag_default(const std::string &flag, bool *default_ret) {
     // Valid Values
     std::string true_str = "TRUE ";
     std::string false_str = "FALSE ";
     // Test
     if (flag.rfind(true_str, 0) == 0) {
         // Enabled By Default
-        if (default_ret != NULL) {
+        if (default_ret != nullptr) {
             *default_ret = true;
         }
         return flag.substr(true_str.length(), std::string::npos);
     } else if (flag.rfind(false_str, 0) == 0) {
         // Disabled By Default
-        if (default_ret != NULL) {
+        if (default_ret != nullptr) {
             *default_ret = false;
         }
         return flag.substr(false_str.length(), std::string::npos);
@@ -37,14 +39,10 @@ static std::string strip_feature_flag_default(std::string flag, bool *default_re
 
 // Load Available Feature Flags
 extern unsigned char available_feature_flags[];
-extern unsigned int available_feature_flags_len;
-static void load_available_feature_flags(std::function<void(std::string)> callback) {
-    // Get Path
-    char *binary_directory = get_binary_directory();
-    std::string path = std::string(binary_directory) + "/available-feature-flags";
-    free(binary_directory);
-    // Load File
-    std::string data(available_feature_flags, available_feature_flags + available_feature_flags_len);
+extern size_t available_feature_flags_len;
+void load_available_feature_flags(const std::function<void(std::string)> &callback) {
+    // Load Data
+    const std::string data(available_feature_flags, available_feature_flags + available_feature_flags_len);
     std::stringstream stream(data);
     // Store Lines
     std::vector<std::string> lines;
@@ -52,7 +50,7 @@ static void load_available_feature_flags(std::function<void(std::string)> callba
     {
         std::string line;
         while (std::getline(stream, line)) {
-            if (line.length() > 0) {
+            if (!line.empty()) {
                 // Verify Line
                 if (line.find('|') == std::string::npos) {
                     lines.push_back(line);
@@ -64,15 +62,15 @@ static void load_available_feature_flags(std::function<void(std::string)> callba
         }
     }
     // Sort
-    std::sort(lines.begin(), lines.end(), [](std::string a, std::string b) {
+    std::sort(lines.begin(), lines.end(), [](const std::string &a, const std::string &b) {
         // Strip Defaults
-        std::string stripped_a = strip_feature_flag_default(a, NULL);
-        std::string stripped_b = strip_feature_flag_default(b, NULL);
+        const std::string stripped_a = strip_feature_flag_default(a, nullptr);
+        const std::string stripped_b = strip_feature_flag_default(b, nullptr);
         // Sort
         return stripped_a < stripped_b;
     });
     // Run Callbacks
-    for (std::string &line : lines) {
+    for (const std::string &line : lines) {
         callback(line);
     }
 }
@@ -80,13 +78,15 @@ static void load_available_feature_flags(std::function<void(std::string)> callba
 // Run Command And Set Environmental Variable
 static void run_command_and_set_env(const char *env_name, const char *command[]) {
     // Only Run If Environmental Variable Is NULL
-    if (getenv(env_name) == NULL) {
+    if (getenv(env_name) == nullptr) {
+        // Check $DISPLAY
+        reborn_check_display();
         // Run
         int return_code;
-        char *output = run_command(command, &return_code);
-        if (output != NULL) {
+        char *output = run_command(command, &return_code, nullptr);
+        if (output != nullptr) {
             // Trim
-            int length = strlen(output);
+            const size_t length = strlen(output);
             if (output[length - 1] == '\n') {
                 output[length - 1] = '\0';
             }
@@ -97,7 +97,7 @@ static void run_command_and_set_env(const char *env_name, const char *command[])
         }
         // Check Return Code
         if (!is_exit_status_success(return_code)) {
-            INFO("Launch Interrupted");
+            // Launch Interrupted
             exit(EXIT_SUCCESS);
         }
     }
@@ -112,21 +112,21 @@ static void run_zenity_and_set_env(const char *env_name, std::vector<std::string
     full_command.push_back("--title");
     full_command.push_back(DIALOG_TITLE);
     full_command.push_back("--name");
-    full_command.push_back(MCPI_APP_TITLE);
+    full_command.push_back(MCPI_APP_ID);
     full_command.insert(full_command.end(), command.begin(), command.end());
     // Convert To C Array
     const char *full_command_array[full_command.size() + 1];
     for (std::vector<std::string>::size_type i = 0; i < full_command.size(); i++) {
         full_command_array[i] = full_command[i].c_str();
     }
-    full_command_array[full_command.size()] = NULL;
+    full_command_array[full_command.size()] = nullptr;
     // Run
     run_command_and_set_env(env_name, full_command_array);
 }
 
 // Set Variable If Not Already Set
-static void set_env_if_unset(const char *env_name, std::function<std::string()> callback) {
-    if (getenv(env_name) == NULL) {
+static void set_env_if_unset(const char *env_name, const std::function<std::string()> &callback) {
+    if (getenv(env_name) == nullptr) {
         char *value = strdup(callback().c_str());
         ALLOC_CHECK(value);
         set_and_print_env(env_name, value);
@@ -134,82 +134,59 @@ static void set_env_if_unset(const char *env_name, std::function<std::string()>
     }
 }
 
-// Defaults
-#define DEFAULT_USERNAME "StevePi"
-#define DEFAULT_RENDER_DISTANCE "Short"
+// Handle Non-Launch Commands
+void handle_non_launch_client_only_commands(const options_t &options) {
+    // Print Available Feature Flags
+    if (options.print_available_feature_flags) {
+        load_available_feature_flags([](const std::string &line) {
+            printf("%s\n", line.c_str());
+            fflush(stdout);
+        });
+        exit(EXIT_SUCCESS);
+    }
+    // Wipe Cache If Needed
+    if (options.wipe_cache) {
+        wipe_cache();
+        exit(EXIT_SUCCESS);
+    }
+}
 
-// Launch
+// Configure Client Options
 #define LIST_DIALOG_SIZE "400"
-int main(int argc, char *argv[]) {
-    // Don't Run As Root
-    if (getenv("_MCPI_SKIP_ROOT_CHECK") == NULL && (getuid() == 0 || geteuid() == 0)) {
-        ERR("Don't Run As Root");
-    }
-
-    // Pre-Bootstrap
-    pre_bootstrap(argc, argv);
-
-    // Print Features
-    for (int i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "--print-available-feature-flags") == 0) {
-            // Print Available Feature Flags
-            load_available_feature_flags([](std::string line) {
-                printf("%s\n", line.c_str());
-                fflush(stdout);
-            });
-            return 0;
-        }
-    }
+void configure_client(const options_t &options) {
+    // Load Cache
+    launcher_cache cache = options.no_cache ? empty_cache : load_cache();
 
     // --default
-    for (int i = 1; i < argc; i++) {
-        if (strcmp(argv[i], "--default") == 0) {
-            // Use Default Feature Flags
-            set_env_if_unset("MCPI_FEATURE_FLAGS", []() {
-                std::string feature_flags = "";
-                load_available_feature_flags([&feature_flags](std::string flag) {
-                    bool default_value;
-                    // Strip Default Value
-                    std::string stripped_flag = strip_feature_flag_default(flag, &default_value);
-                    // Specify Default Value
-                    if (default_value) {
-                        // Enabled By Default
-                        feature_flags += stripped_flag + '|';
-                    }
-                });
-                if (feature_flags.length() > 0 && feature_flags[feature_flags.length() - 1] == '|') {
-                    feature_flags.pop_back();
+    if (options.use_default) {
+        // Use Default Feature Flags
+        set_env_if_unset(MCPI_FEATURE_FLAGS_ENV, [&cache]() {
+            std::string feature_flags = "";
+            load_available_feature_flags([&feature_flags, &cache](const std::string &flag) {
+                bool value;
+                // Strip Default Value
+                std::string stripped_flag = strip_feature_flag_default(flag, &value);
+                // Use Cache
+                if (cache.feature_flags.count(stripped_flag) > 0) {
+                    value = cache.feature_flags[stripped_flag];
                 }
-                return feature_flags;
-            });
-            set_env_if_unset("MCPI_RENDER_DISTANCE", []() {
-                return DEFAULT_RENDER_DISTANCE;
-            });
-            set_env_if_unset("MCPI_USERNAME", []() {
-                return DEFAULT_USERNAME;
-            });
-            break;
-        }
-    }
-
-    // Create ~/.minecraft-pi If Needed
-    // Minecraft Folder
-    {
-        char *minecraft_folder = NULL;
-        safe_asprintf(&minecraft_folder, "%s/.minecraft-pi", getenv("HOME"));
-        {
-            // Check Minecraft Folder
-            struct stat obj;
-            if (stat(minecraft_folder, &obj) != 0 || !S_ISDIR(obj.st_mode)) {
-                // Create Minecraft Folder
-                int ret = mkdir(minecraft_folder, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
-                if (ret != 0) {
-                    // Unable To Create Folder
-                    ERR("Error Creating Directory: %s: %s", minecraft_folder, strerror(errno));
+                // Specify Default Value
+                if (value) {
+                    // Enabled By Default
+                    feature_flags += stripped_flag + '|';
                 }
+            });
+            if (!feature_flags.empty() && feature_flags[feature_flags.length() - 1] == '|') {
+                feature_flags.pop_back();
             }
-        }
-        free(minecraft_folder);
+            return feature_flags;
+        });
+        set_env_if_unset(MCPI_RENDER_DISTANCE_ENV, [&cache]() {
+            return cache.render_distance;
+        });
+        set_env_if_unset(MCPI_USERNAME_ENV, [&cache]() {
+            return cache.username;
+        });
     }
 
     // Setup MCPI_FEATURE_FLAGS
@@ -225,12 +202,16 @@ int main(int argc, char *argv[]) {
         command.push_back("Enabled");
         command.push_back("--column");
         command.push_back("Feature");
-        load_available_feature_flags([&command](std::string flag) {
-            bool default_value;
+        load_available_feature_flags([&command, &cache](const std::string &flag) {
+            bool value;
             // Strip Default Value
-            std::string stripped_flag = strip_feature_flag_default(flag, &default_value);
+            std::string stripped_flag = strip_feature_flag_default(flag, &value);
+            // Use Cache
+            if (cache.feature_flags.count(stripped_flag) > 0) {
+                value = cache.feature_flags[stripped_flag];
+            }
             // Specify Default Value
-            if (default_value) {
+            if (value) {
                 // Enabled By Default
                 command.push_back("TRUE");
             } else {
@@ -241,7 +222,7 @@ int main(int argc, char *argv[]) {
             command.push_back(stripped_flag);
         });
         // Run
-        run_zenity_and_set_env("MCPI_FEATURE_FLAGS", command);
+        run_zenity_and_set_env(MCPI_FEATURE_FLAGS_ENV, command);
     }
     // Setup MCPI_RENDER_DISTANCE
     {
@@ -260,11 +241,11 @@ int main(int argc, char *argv[]) {
         command.push_back("Name");
         std::string render_distances[] = {"Far", "Normal", "Short", "Tiny"};
         for (std::string &render_distance : render_distances) {
-            command.push_back(render_distance.compare(DEFAULT_RENDER_DISTANCE) == 0 ? "TRUE" : "FALSE");
+            command.push_back(render_distance == cache.render_distance ? "TRUE" : "FALSE");
             command.push_back(render_distance);
         }
         // Run
-        run_zenity_and_set_env("MCPI_RENDER_DISTANCE", command);
+        run_zenity_and_set_env(MCPI_RENDER_DISTANCE_ENV, command);
     }
     // Setup MCPI_USERNAME
     {
@@ -273,11 +254,13 @@ int main(int argc, char *argv[]) {
         command.push_back("--text");
         command.push_back("Enter Minecraft Username:");
         command.push_back("--entry-text");
-        command.push_back(DEFAULT_USERNAME);
+        command.push_back(cache.username);
         // Run
-        run_zenity_and_set_env("MCPI_USERNAME", command);
+        run_zenity_and_set_env(MCPI_USERNAME_ENV, command);
     }
 
-    // Bootstrap
-    bootstrap(argc, argv);
+    // Save Cache
+    if (!options.no_cache) {
+        save_cache();
+    }
 }

launcher/src/client/configuration.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include <string>
+#include <functional>
+
+#include "../options/parser.h"
+
+// Defaults
+#define DEFAULT_USERNAME "StevePi"
+#define DEFAULT_RENDER_DISTANCE "Short"
+
+// Feature Flags
+std::string strip_feature_flag_default(const std::string& flag, bool *default_ret);
+void load_available_feature_flags(const std::function<void(std::string)> &callback);
+
+// Handle Non-Launch Commands
+void handle_non_launch_client_only_commands(const options_t &options);
+
+// Configure Client Options
+void configure_client(const options_t &options);

launcher/src/crash-report.c

@@ -1,246 +0,0 @@
-#include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
-#include <signal.h>
-#include <poll.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-
-#include <libreborn/libreborn.h>
-
-#include "crash-report.h"
-
-// Show Crash Report Dialog
-#ifndef MCPI_HEADLESS_MODE
-#define DIALOG_TITLE "Crash Report"
-#define CRASH_REPORT_DIALOG_WIDTH "640"
-#define CRASH_REPORT_DIALOG_HEIGHT "480"
-static void show_report(const char *log_filename) {
-    const char *command[] = {
-        "zenity",
-        "--title", DIALOG_TITLE,
-        "--name", MCPI_APP_TITLE,
-        "--width", CRASH_REPORT_DIALOG_WIDTH,
-        "--height", CRASH_REPORT_DIALOG_HEIGHT,
-        "--text-info",
-        "--text", "Minecraft: Pi Edition: Reborn Legacy has crashed!\n\nNeed help? Consider asking on the <a href=\"https://discord.com/invite/aDqejQGMMy\">Discord server</a>!",
-        "--filename", log_filename,
-        "--no-wrap",
-        "--font", "Monospace",
-        NULL
-    };
-    free(run_command(command, NULL));
-}
-#endif
-
-// Exit Handler
-static void exit_handler(__attribute__((unused)) int signal) {
-    // Murder
-    murder_children();
-}
-
-// Setup
-#define PIPE_READ 0
-#define PIPE_WRITE 1
-#define MCPI_LOGS_DIR "/tmp/.minecraft-pi-logs"
-void setup_crash_report() {
-    // Store Output
-    int output_pipe[2];
-    safe_pipe2(output_pipe, 0);
-    int error_pipe[2];
-    safe_pipe2(error_pipe, 0);
-    int input_pipe[2];
-    safe_pipe2(input_pipe, 0);
-
-    // Fork
-    pid_t ret = fork();
-    if (ret == -1) {
-        ERR("Unable To Fork: %s", strerror(errno));
-    } else if (ret == 0) {
-        // Child Process
-
-        // Pipe stdio
-        dup2(output_pipe[PIPE_WRITE], STDOUT_FILENO);
-        close(output_pipe[PIPE_READ]);
-        close(output_pipe[PIPE_WRITE]);
-        dup2(error_pipe[PIPE_WRITE], STDERR_FILENO);
-        close(error_pipe[PIPE_READ]);
-        close(error_pipe[PIPE_WRITE]);
-        dup2(input_pipe[PIPE_READ], STDIN_FILENO);
-        close(input_pipe[PIPE_READ]);
-        close(input_pipe[PIPE_WRITE]);
-
-        // Create New Process Group
-        setpgid(0, 0);
-
-        // Continue Execution
-    } else {
-        // Parent Process
-        track_child(ret);
-
-        // Install Signal Handlers
-        struct sigaction act_sigint;
-        memset((void *) &act_sigint, 0, sizeof (struct sigaction));
-        act_sigint.sa_flags = SA_RESTART;
-        act_sigint.sa_handler = &exit_handler;
-        sigaction(SIGINT, &act_sigint, NULL);
-        struct sigaction act_sigterm;
-        memset((void *) &act_sigterm, 0, sizeof (struct sigaction));
-        act_sigterm.sa_flags = SA_RESTART;
-        act_sigterm.sa_handler = &exit_handler;
-        sigaction(SIGTERM, &act_sigterm, NULL);
-
-        // Close Unneeded File Descriptors
-        close(output_pipe[PIPE_WRITE]);
-        close(error_pipe[PIPE_WRITE]);
-        close(input_pipe[PIPE_READ]);
-
-        // Setup Logging
-#define BUFFER_SIZE 1024
-        char buf[BUFFER_SIZE];
-
-        // Ensure Temporary Directory
-        {
-            // Check If It Exists
-            struct stat tmp_stat;
-            int exists = stat(MCPI_LOGS_DIR, &tmp_stat) != 0 ? 0 : S_ISDIR(tmp_stat.st_mode);
-            if (!exists) {
-                // Doesn't Exist
-                if (mkdir(MCPI_LOGS_DIR, S_IRUSR | S_IWUSR | S_IXUSR) != 0) {
-                    ERR("Unable To Create Temporary Folder: %s", strerror(errno));
-                }
-            }
-        }
-
-        // Create Temporary File
-        char log_filename[] = MCPI_LOGS_DIR "/XXXXXX";
-        int log_file_fd = mkstemp(log_filename);
-        if (log_file_fd == -1) {
-            ERR("Unable To Create Log File: %s", strerror(errno));
-        }
-
-        // Setup Polling
-        int number_fds = 3;
-        struct pollfd poll_fds[number_fds];
-        poll_fds[0].fd = output_pipe[PIPE_READ];
-        poll_fds[1].fd = error_pipe[PIPE_READ];
-        poll_fds[2].fd = STDIN_FILENO;
-        for (int i = 0; i < number_fds; i++) {
-            poll_fds[i].events = POLLIN;
-        }
-
-        // Poll Data
-        int number_open_fds = number_fds;
-        while (number_open_fds > 0) {
-            int poll_ret = poll(poll_fds, number_fds, -1);
-            if (poll_ret == -1) {
-                if (errno == EINTR) {
-                    continue;
-                } else {
-                    ERR("Unable To Poll Data: %s", strerror(errno));
-                }
-            }
-
-            // Handle Data
-            for (int i = 0; i < number_fds; i++) {
-                if (poll_fds[i].revents != 0) {
-                    if (poll_fds[i].revents & POLLIN) {
-                        if (poll_fds[i].fd == STDIN_FILENO) {
-                            // Data Available From stdin
-                            int bytes_available;
-                            if (ioctl(fileno(stdin), FIONREAD, &bytes_available) == -1) {
-                                bytes_available = 0;
-                            }
-                            // Read
-                            ssize_t bytes_read = read(poll_fds[i].fd, (void *) buf, BUFFER_SIZE);
-                            if (bytes_read == -1) {
-                                ERR("Unable To Read Log Data: %s", strerror(errno));
-                            }
-                            // Write To Child
-                            if (write(input_pipe[PIPE_WRITE], (void *) buf, bytes_read) == -1) {
-                                ERR("Unable To Write Input To Child: %s", strerror(errno));
-                            }
-                        } else {
-                            // Data Available From Child's stdout/stderr
-                            ssize_t bytes_read = read(poll_fds[i].fd, (void *) buf, BUFFER_SIZE - 1 /* Account For NULL-Terminator */);
-                            if (bytes_read == -1) {
-                                ERR("Unable To Read Log Data: %s", strerror(errno));
-                            }
-
-                            // Print To Terminal
-                            buf[bytes_read] = '\0';
-                            fprintf(i == 0 ? stdout : stderr, "%s", buf);
-
-                            // Write To log
-                            if (write(log_file_fd, (void *) buf, bytes_read) == -1) {
-                                ERR("Unable To Write Log Data: %s", strerror(errno));
-                            }
-                        }
-                    } else {
-                        // File Descriptor No Longer Accessible
-                        if (poll_fds[i].events != 0 && close(poll_fds[i].fd) == -1) {
-                            ERR("Unable To Close File Descriptor: %s", strerror(errno));
-                        }
-                        poll_fds[i].events = 0;
-                        number_open_fds--;
-                    }
-                }
-            }
-        }
-
-        // Close Input Pipe
-        close(input_pipe[PIPE_WRITE]);
-
-        // Get Return Code
-        int status;
-        waitpid(ret, &status, 0);
-        untrack_child(ret);
-
-        // Check If Is Crash
-        int is_crash = !is_exit_status_success(status);
-
-        // Log Exit Code To log If Crash
-        if (is_crash) {
-            // Create Exit Code Log Line
-            char *exit_status = NULL;
-            get_exit_status_string(status, &exit_status);
-            char *exit_code_line = NULL;
-            safe_asprintf(&exit_code_line, "[CRASH]: Terminated%s\n", exit_status);
-            free(exit_status);
-
-            // Print Exit Code Log Line
-            fprintf(stderr, "%s", exit_code_line);
-
-            // Write Exit Code Log Line
-            if (write(log_file_fd, (void *) exit_code_line, strlen(exit_code_line)) == -1) {
-                ERR("Unable To Write Exit Code To Log: %s", strerror(errno));
-            }
-
-            // Free Exit Code Log Line
-            free(exit_code_line);
-        }
-
-        // Close Log File FD
-        if (close(log_file_fd) == -1) {
-            ERR("Unable To Close Log File Descriptor: %s", strerror(errno));
-        }
-
-        // Show Crash Log
-#ifndef MCPI_HEADLESS_MODE
-        if (is_crash) {
-            show_report(log_filename);
-        }
-#endif
-
-        // Delete Log File
-        if (unlink(log_filename) == -1) {
-            ERR("Unable To Delete Log File: %s", strerror(errno));
-        }
-
-        // Exit
-        exit(WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE);
-    }
-}

launcher/src/crash-report.cpp

@@ -0,0 +1,259 @@
+#include <unistd.h>
+#include <cstring>
+#include <cerrno>
+#include <cstdlib>
+#include <cstdio>
+#include <cstdint>
+#include <csignal>
+#include <poll.h>
+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/prctl.h>
+#include <ctime>
+#include <string>
+
+#include <libreborn/libreborn.h>
+
+#include "crash-report.h"
+
+// Show Crash Report Dialog
+#define DIALOG_TITLE "Crash Report"
+#define CRASH_REPORT_DIALOG_WIDTH "640"
+#define CRASH_REPORT_DIALOG_HEIGHT "480"
+static void show_report(const char *log_filename) {
+    // Fork
+    pid_t pid = fork();
+    if (pid == 0) {
+        // Child
+        setsid();
+        ALLOC_CHECK(freopen("/dev/null", "w", stdout));
+        ALLOC_CHECK(freopen("/dev/null", "w", stderr));
+        ALLOC_CHECK(freopen("/dev/null", "r", stdin));
+        const char *command[] = {
+            "zenity",
+            "--title", DIALOG_TITLE,
+            "--name", MCPI_APP_ID,
+            "--width", CRASH_REPORT_DIALOG_WIDTH,
+            "--height", CRASH_REPORT_DIALOG_HEIGHT,
+            "--text-info",
+            "--text", MCPI_APP_TITLE " has crashed!\n\nNeed help? Consider asking on the <a href=\"" MCPI_DISCORD_INVITE "\">Discord server</a>! <i>If you believe this is a problem with " MCPI_APP_TITLE " itself, please upload this crash report to the #bugs Discord channel.</i>",
+            "--filename", log_filename,
+            "--no-wrap",
+            "--font", "Monospace",
+            "--save-filename", MCPI_VARIANT_NAME "-crash-report.log",
+            "--ok-label", "Exit",
+            NULL
+        };
+        safe_execvpe(command, (const char *const *) environ);
+    }
+}
+
+// Exit Handler
+static pid_t child_pid = -1;
+static void exit_handler(__attribute__((unused)) int signal) {
+    // Murder
+    kill(child_pid, SIGTERM);
+}
+
+// Log File
+static std::string log_filename;
+static int log_fd;
+static void setup_log_file() {
+    // Get Log Directory
+    const std::string home = std::string(getenv(_MCPI_HOME_ENV)) + get_home_subdirectory_for_game_data();
+    ensure_directory(home.c_str());
+    const std::string logs = home + "/logs";
+    ensure_directory(logs.c_str());
+
+    // Get Timestamp
+    time_t raw_time;
+    time(&raw_time);
+    const tm *time_info = localtime(&raw_time);
+    char time[512];
+    strftime(time, 512, "%Y-%m-%d", time_info);
+
+    // Get Log Filename
+    std::string file;
+    int num = 1;
+    do {
+        file = std::string(time) + '-' + std::to_string(num) + ".log";
+        log_filename = logs + '/' + file;
+        num++;
+    } while (access(log_filename.c_str(), F_OK) != -1);
+
+    // Create latest.log Symlink
+    const std::string latest_log = logs + "/latest.log";
+    unlink(latest_log.c_str());
+    if (symlink(file.c_str(), latest_log.c_str()) != 0) {
+        WARN("Unable To Create Latest Log Symlink: %s", strerror(errno));
+    }
+
+    // Create File
+    log_fd = open(log_filename.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+    if (log_fd == -1) {
+        ERR("Unable To Create Log File: %s", strerror(errno));
+    }
+    reborn_set_log(log_fd);
+}
+
+// Setup
+#define PIPE_READ 0
+#define PIPE_WRITE 1
+#define BUFFER_SIZE 1024
+static void safe_write(int fd, const void *buf, size_t size) {
+    const ssize_t bytes_written = write(fd, buf, size);
+    if (bytes_written < 0) {
+        ERR("Unable To Write Data: %s", strerror(errno));
+    }
+}
+void setup_crash_report() {
+    // Setup Logging
+    setup_log_file();
+
+    // Store Output
+    int output_pipe[2];
+    safe_pipe2(output_pipe, 0);
+    int error_pipe[2];
+    safe_pipe2(error_pipe, 0);
+    int input_pipe[2];
+    safe_pipe2(input_pipe, 0);
+
+    // Fork
+    pid_t ret = fork();
+    if (ret == -1) {
+        ERR("Unable To Fork: %s", strerror(errno));
+    } else if (ret == 0) {
+        // Child Process
+
+        // Pipe stdio
+        dup2(output_pipe[PIPE_WRITE], STDOUT_FILENO);
+        close(output_pipe[PIPE_READ]);
+        close(output_pipe[PIPE_WRITE]);
+        dup2(error_pipe[PIPE_WRITE], STDERR_FILENO);
+        close(error_pipe[PIPE_READ]);
+        close(error_pipe[PIPE_WRITE]);
+        dup2(input_pipe[PIPE_READ], STDIN_FILENO);
+        close(input_pipe[PIPE_READ]);
+        close(input_pipe[PIPE_WRITE]);
+
+        // Create New Process Group
+        setpgid(0, 0);
+
+        // Kill Child If Parent Exits First
+        prctl(PR_SET_PDEATHSIG, SIGKILL);
+
+        // Continue Execution
+    } else {
+        // Install Signal Handlers
+        child_pid = ret;
+        struct sigaction act_sigint = {};
+        act_sigint.sa_flags = SA_RESTART;
+        act_sigint.sa_handler = &exit_handler;
+        sigaction(SIGINT, &act_sigint, nullptr);
+        struct sigaction act_sigterm = {};
+        act_sigterm.sa_flags = SA_RESTART;
+        act_sigterm.sa_handler = &exit_handler;
+        sigaction(SIGTERM, &act_sigterm, nullptr);
+
+        // Close Unneeded File Descriptors
+        close(output_pipe[PIPE_WRITE]);
+        close(error_pipe[PIPE_WRITE]);
+        close(input_pipe[PIPE_READ]);
+
+        // Set Debug Tag
+        reborn_debug_tag = "(Crash Reporter) ";
+
+        // Setup Polling
+        const int number_fds = 3;
+        pollfd poll_fds[number_fds];
+        poll_fds[0].fd = output_pipe[PIPE_READ];
+        poll_fds[1].fd = error_pipe[PIPE_READ];
+        poll_fds[2].fd = STDIN_FILENO;
+        for (pollfd &poll_fd : poll_fds) {
+            poll_fd.events = POLLIN;
+        }
+
+        // Poll Data
+        int status;
+        while (waitpid(ret, &status, WNOHANG) != ret) {
+            const int poll_ret = poll(poll_fds, number_fds, -1);
+            if (poll_ret == -1) {
+                if (errno == EINTR) {
+                    continue;
+                } else {
+                    ERR("Unable To Poll Data: %s", strerror(errno));
+                }
+            }
+
+            // Handle Data
+            for (pollfd &poll_fd : poll_fds) {
+                if (poll_fd.revents != 0) {
+                    if (poll_fd.revents & POLLIN) {
+                        char buf[BUFFER_SIZE];
+                        if (poll_fd.fd == STDIN_FILENO) {
+                            // Data Available From stdin
+                            int bytes_available;
+                            if (ioctl(fileno(stdin), FIONREAD, &bytes_available) == -1) {
+                                bytes_available = 0;
+                            }
+                            // Read
+                            const ssize_t bytes_read = read(poll_fd.fd, buf, BUFFER_SIZE);
+                            if (bytes_read == -1) {
+                                ERR("Unable To Read Input: %s", strerror(errno));
+                            }
+                            // Write To Child
+                            safe_write(input_pipe[PIPE_WRITE], buf, bytes_read);
+                        } else {
+                            // Data Available From Child's stdout/stderr
+                            const ssize_t bytes_read = read(poll_fd.fd, buf, BUFFER_SIZE);
+                            if (bytes_read == -1) {
+                                ERR("Unable To Read Log Data: %s", strerror(errno));
+                            }
+                            // Print To Terminal
+                            safe_write(poll_fd.fd == output_pipe[PIPE_READ] ? STDOUT_FILENO : STDERR_FILENO, buf, bytes_read);
+                            // Write To log
+                            safe_write(reborn_get_log_fd(), buf, bytes_read);
+                        }
+                    } else {
+                        // File Descriptor No Longer Accessible
+                        poll_fd.events = 0;
+                    }
+                }
+            }
+        }
+
+        // Close Pipes
+        close(output_pipe[PIPE_READ]);
+        close(error_pipe[PIPE_READ]);
+        close(input_pipe[PIPE_WRITE]);
+
+        // Check If Is Crash
+        const bool is_crash = !is_exit_status_success(status);
+
+        // Log Exit Code To log If Crash
+        if (is_crash) {
+            // Create Exit Code Log Line
+            char *exit_status = nullptr;
+            get_exit_status_string(status, &exit_status);
+            const std::string exit_code_line = "[CRASH]: Terminated" + std::string(exit_status) + '\n';
+            free(exit_status);
+
+            // Print Exit Code Log Line
+            safe_write(STDERR_FILENO, exit_code_line.c_str(), strlen(exit_code_line.c_str()));
+            // Write Exit Code Log Line
+            safe_write(reborn_get_log_fd(), exit_code_line.c_str(), strlen(exit_code_line.c_str()));
+        }
+
+        // Close Log File
+        close(log_fd);
+        unsetenv(_MCPI_LOG_FD_ENV);
+
+        // Show Crash Log
+        if (is_crash && !reborn_is_headless()) {
+            show_report(log_filename.c_str());
+        }
+
+        // Exit
+        exit(WIFEXITED(status) ? WEXITSTATUS(status) : EXIT_FAILURE);
+    }
+}

launcher/src/main.cpp

@@ -0,0 +1,123 @@
+#include <cstdlib>
+#include <libreborn/libreborn.h>
+#include <sys/stat.h>
+
+#include "bootstrap.h"
+#include "options/parser.h"
+#include "crash-report.h"
+#include "util.h"
+#include "client/configuration.h"
+
+// Bind Options To Environmental Variable
+static void bind_to_env(const char *env, const bool value) {
+    if (value) {
+        set_and_print_env(env, "1");
+    }
+}
+static void setup_environment(const options_t &options) {
+    // Clear Internal Variables
+    clear_internal_env_vars();
+
+    // Passthrough Options To Game
+    bind_to_env(_MCPI_SERVER_MODE_ENV, options.server_mode);
+    bind_to_env(_MCPI_BENCHMARK_ENV, options.benchmark);
+    bind_to_env(_MCPI_ONLY_GENERATE_ENV, options.only_generate);
+    bind_to_env(_MCPI_FORCE_HEADLESS_ENV, options.force_headless);
+    bind_to_env(_MCPI_FORCE_NON_HEADLESS_ENV, options.force_non_headless);
+
+    // GTK Dark Mode
+    set_and_print_env("GTK_THEME", "Adwaita:dark");
+
+    // Configure PATH
+    {
+        // Get Binary Directory
+        const std::string binary_directory = get_binary_directory();
+        std::string new_path = binary_directory + "/bin";
+        // Add Existing PATH
+        {
+            const char *value = getenv("PATH");
+            if (value != nullptr && strlen(value) > 0) {
+                new_path += std::string(":") + value;
+            }
+        }
+        // Set And Free
+        set_and_print_env("PATH", new_path.c_str());
+    }
+
+    // Setup MCPI_HOME
+    if (const char *custom_profile_directory = getenv(MCPI_PROFILE_DIRECTORY_ENV); custom_profile_directory != nullptr) {
+        // Custom Directory
+        custom_profile_directory = realpath(custom_profile_directory, nullptr);
+        ALLOC_CHECK(custom_profile_directory);
+        set_and_print_env(_MCPI_HOME_ENV, custom_profile_directory);
+        free((void *) custom_profile_directory);
+    } else if (!reborn_is_server()) {
+        // Ensure $HOME
+        const char *home = getenv("HOME");
+        if (home == nullptr) {
+            ERR("$HOME Is Not Set");
+        }
+        set_and_print_env(_MCPI_HOME_ENV, home);
+    } else {
+        // Set Home To Current Directory, So World Data Is Stored There
+        char *launch_directory = getcwd(nullptr, 0);
+        ALLOC_CHECK(launch_directory);
+        set_and_print_env(_MCPI_HOME_ENV, launch_directory);
+        free(launch_directory);
+    }
+    // Create If Needed
+    const std::string minecraft_folder = std::string(getenv(_MCPI_HOME_ENV)) + get_home_subdirectory_for_game_data();
+    ensure_directory(minecraft_folder.c_str());
+}
+
+// Non-Launch Commands
+static void handle_non_launch_commands(const options_t &options) {
+    if (options.copy_sdk) {
+        const std::string binary_directory = get_binary_directory();
+        copy_sdk(binary_directory, false);
+        fflush(stdout);
+        exit(EXIT_SUCCESS);
+    }
+}
+
+// Start The Game
+static void start_game(const options_t &options) {
+    // Disable stdout Buffering
+    setvbuf(stdout, nullptr, _IONBF, 0);
+
+    // Setup Crash Reporting
+    if (!options.disable_crash_report) {
+        setup_crash_report();
+    }
+
+    // Configure Client Options
+    if (!reborn_is_server()) {
+        configure_client(options);
+    }
+
+    // Bootstrap
+    bootstrap(options);
+}
+
+// Main
+int main(int argc, char *argv[]) {
+    // Parse Options
+    options_t options = parse_options(argc, argv);
+
+    // Set Debug Tag
+    reborn_debug_tag = "(Launcher) ";
+
+    // Debug Logging
+    unsetenv(_MCPI_LOG_FD_ENV);
+    bind_to_env(MCPI_DEBUG_ENV, options.debug);
+
+    // Setup Environment
+    setup_environment(options);
+
+    // Handle Non-Launch Commands (Copy SDK, Print Feature Flags, Etc)
+    handle_non_launch_commands(options);
+    handle_non_launch_client_only_commands(options);
+
+    // Start The Game
+    start_game(options);
+}

launcher/src/mods.cpp

@@ -0,0 +1,100 @@
+#include <dirent.h>
+#include <cerrno>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <libreborn/libreborn.h>
+
+#include "bootstrap.h"
+
+// Get All Mods In Folder
+static void load(std::vector<std::string> &ld_preload, const std::string &folder, int recursion_limit = 128);
+static void handle_file(std::vector<std::string> &ld_preload, const std::string &file, const int recursion_limit) {
+    // Check Type
+    struct stat file_stat = {};
+    lstat(file.c_str(), &file_stat);
+    if (S_ISDIR(file_stat.st_mode)) {
+        // Recurse Into Directory
+        load(ld_preload, std::string(file) + '/', recursion_limit - 1);
+    } else if (S_ISLNK(file_stat.st_mode)) {
+        // Resolve Symlink
+        char *resolved_file = realpath(file.c_str(), nullptr);
+        ALLOC_CHECK(resolved_file);
+        handle_file(ld_preload, resolved_file, recursion_limit);
+        free(resolved_file);
+    } else if (S_ISREG(file_stat.st_mode)) {
+        // Check If File Is Accessible
+        const int result = access(file.c_str(), R_OK);
+        if (result == 0) {
+            // Add To LD_PRELOAD
+            DEBUG("Found Mod: %s", file.c_str());
+            ld_preload.push_back(file);
+        } else if (result == -1 && errno != 0) {
+            // Fail
+            WARN("Unable To Access: %s: %s", file.c_str(), strerror(errno));
+            errno = 0;
+        }
+    }
+}
+static void load(std::vector<std::string> &ld_preload, const std::string &folder, const int recursion_limit) {
+    // Check Recursion
+    if (recursion_limit <= 0) {
+        ERR("Reached Recursion Limit While Loading Mods");
+    }
+    // Open Folder
+    ensure_directory(folder.c_str());
+    DIR *dp = opendir(folder.c_str());
+    if (dp == nullptr) {
+        // Unable To Open Folder
+        ERR("Error Opening Directory: %s: %s", folder.c_str(), strerror(errno));
+    }
+    // Loop Through Folder
+    while (true) {
+        errno = 0;
+        const dirent *entry = readdir(dp);
+        if (entry != nullptr) {
+            // Block Pseudo-Directories
+            if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) {
+                continue;
+            }
+            // Get Full Name
+            std::string name = folder + entry->d_name;
+            // Handle
+            handle_file(ld_preload, name, recursion_limit);
+        } else if (errno != 0) {
+            // Error Reading Contents Of Folder
+            ERR("Error Reading Directory: %s: %s", folder.c_str(), strerror(errno));
+        } else {
+            // Done!
+            break;
+        }
+    }
+    // Close Folder
+    closedir(dp);
+}
+
+// Bootstrap Mods
+#define SUBDIRECTORY_FOR_MODS "/mods/"
+std::vector<std::string> bootstrap_mods(const std::string &binary_directory) {
+    // Prepare
+    std::vector<std::string> preload;
+
+    // ~/.minecraft-pi/mods
+    {
+        // Get Mods Folder
+        const std::string mods_folder = std::string(getenv(_MCPI_HOME_ENV)) + get_home_subdirectory_for_game_data() + SUBDIRECTORY_FOR_MODS;
+        // Load Mods From ./mods
+        load(preload, mods_folder);
+    }
+
+    // Built-In Mods
+    {
+        // Get Mods Folder
+        const std::string mods_folder = binary_directory + SUBDIRECTORY_FOR_MODS;
+        // Load Mods From ./mods
+        load(preload, mods_folder);
+    }
+
+    // Return
+    return preload;
+}

launcher/src/options/option-list.h

@@ -0,0 +1,13 @@
+OPTION(debug, "debug", 'd', "Enable Debug Logging")
+OPTION(copy_sdk, "copy-sdk", -2, "Extract Modding SDK And Exit")
+OPTION(disable_crash_report, "disable-crash-report", -1, "Disable Crash Report Dialog")
+OPTION(use_default, "default", -3, "Skip Client-Mode Configuration Dialogs")
+OPTION(no_cache, "no-cache", -4, "Disable Client-Mode Configuration Cache")
+OPTION(wipe_cache, "wipe-cache", -5, "Wipe Cached Client-Mode Configuration And Exit")
+OPTION(print_available_feature_flags, "print-available-feature-flags", -6, "Print Available Client-Mode Feature Flags")
+OPTION(benchmark, "benchmark", -7, "Run Client-Mode Benchmark")
+OPTION(only_generate, "only-generate", -8, "Generate World And Exit (Server-Mode Only)")
+OPTION(force_headless, "force-headless", -9, "Force Disable Game Rendering")
+OPTION(force_non_headless, "force-non-headless", -10, "Force Enable Game Rendering")
+OPTION(server_mode, "server", -11, "Run In Server-Mode")
+OPTION(skip_pagesize_check, "skip-pagesize-check", -12, "Skip Page-Size Check (Not Recommended)")

launcher/src/options/parser.cpp

@@ -0,0 +1,45 @@
+#include <argp.h>
+
+#include "parser.h"
+
+// Globals
+const char *argp_program_version = "Reborn v" MCPI_VERSION;
+const char *argp_program_bug_address = "<" MCPI_DISCORD_INVITE ">";
+static char doc[] = "Minecraft: Pi Edition Modding Project";
+
+// Options
+static int env_key = -100;
+static argp_option options_data[] = {
+    {nullptr, 0, nullptr, 0, "Game Options:", 0},
+#define OPTION(ignored, name, key, doc) {name, key, nullptr, 0, doc, 0},
+#include "option-list.h"
+#undef OPTION
+    {nullptr, 0, nullptr, 0, "Environmental Variables:", 0},
+#define ENV(name, doc) {#name, env_key--, nullptr, OPTION_DOC | OPTION_NO_USAGE | (is_env_var_internal(name##_ENV) ? OPTION_HIDDEN : 0), doc, 0},
+#include <libreborn/env-list.h>
+#undef ENV
+    {nullptr, 0, nullptr, 0, "Help Options:", -1},
+    {nullptr, 0, nullptr, 0, nullptr, 0}
+};
+
+// Parse Options
+#define OPTION(name, ignored, key, ...) \
+    case key: \
+        options->name = true; \
+        break;
+static error_t parse_opt(int key, __attribute__((unused)) char *arg, argp_state *state) {
+    options_t *options = (options_t *) state->input;
+    switch (key) {
+#include "option-list.h"
+        default:
+            return ARGP_ERR_UNKNOWN;
+    }
+    return 0;
+}
+#undef OPTION
+static argp argp = {options_data, parse_opt, nullptr, doc, nullptr, nullptr, nullptr};
+options_t parse_options(int argc, char *argv[]) {
+    options_t options = {};
+    argp_parse(&argp, argc, argv, 0, nullptr, &options);
+    return options;
+}

launcher/src/options/parser.h

@@ -0,0 +1,10 @@
+#pragma once
+
+#include <libreborn/libreborn.h>
+
+#define OPTION(name, ...) bool name;
+struct options_t {
+#include "option-list.h"
+};
+#undef OPTION
+options_t parse_options(int argc, char *argv[]);

launcher/src/patchelf.c

@@ -1,136 +0,0 @@
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/stat.h>
-
-#include <libreborn/libreborn.h>
-
-#include "bootstrap.h"
-#include "patchelf.h"
-
-// Duplicate MCPI Executable Into /tmp
-static void duplicate_mcpi_executable(const char *original_path, char *new_path) {
-    // Ensure Temporary Directory
-    {
-        // Check If It Exists
-        struct stat tmp_stat;
-        int exists = stat(MCPI_PATCHED_DIR, &tmp_stat) != 0 ? 0 : S_ISDIR(tmp_stat.st_mode);
-        if (!exists) {
-            // Doesn't Exist
-            if (mkdir(MCPI_PATCHED_DIR, S_IRUSR | S_IWUSR | S_IXUSR) != 0) {
-                ERR("Unable To Create Temporary Folder: %s", strerror(errno));
-            }
-        }
-    }
-
-    // Generate New File
-    int new_file_fd = mkstemp(new_path);
-    if (new_file_fd == -1) {
-        ERR("Unable To Create Temporary File: %s", strerror(errno));
-    }
-    FILE *new_file = fdopen(new_file_fd, "wb");
-    if (new_file == NULL) {
-        ERR("Unable To Open Temporary File: %s", strerror(errno));
-    }
-
-    // Copy Original File
-    {
-        // Open Original File
-        FILE *original_file = fopen(original_path, "rb");
-        if (original_file == NULL) {
-            ERR("Unable To Open File: %s", original_path);
-        }
-
-        // Copy
-#define BUFFER_SIZE 1024
-        char buf[BUFFER_SIZE];
-        size_t bytes_read = 0;
-        while ((bytes_read = fread((void *) buf, 1, BUFFER_SIZE, original_file)) > 0) {
-            fwrite((void *) buf, 1, bytes_read, new_file);
-            if (ferror(new_file) != 0) {
-                ERR("Unable To Write File: %s", new_path);
-            }
-        }
-        if (ferror(original_file) != 0) {
-            ERR("Unable To Read File: %s", original_path);
-        }
-
-        // Close Original File
-        fclose(original_file);
-    }
-
-    // Close New File
-    fclose(new_file);
-    close(new_file_fd);
-}
-
-// Fix MCPI Dependencies
-#define patch_mcpi_elf_dependencies_with_extra_patchelf_args(...) \
-    ({ \
-        const char *const _macro_command[] = { \
-            "patchelf", \
-            ##__VA_ARGS__, \
-            "--remove-needed", "libbcm_host.so", \
-            "--remove-needed", "libX11.so.6", \
-            "--remove-needed", "libEGL.so", \
-            "--remove-needed", "libGLESv2.so", \
-            "--remove-needed", "libSDL-1.2.so.0", \
-            "--add-needed", "libmedia-layer-core.so", \
-            new_path, \
-            NULL \
-        }; \
-        int _macro_return_code = 0; \
-        char *_macro_output = run_command(_macro_command, &_macro_return_code); \
-        if (_macro_output != NULL) { \
-            free(_macro_output); \
-        } \
-        _macro_return_code; \
-    })
-void patch_mcpi_elf_dependencies(const char *original_path, char *new_path, const char *linker) {
-    // Duplicate MCPI executable into /tmp so it can be modified.
-    duplicate_mcpi_executable(original_path, new_path);
-
-    // Run patchelf
-    int return_code;
-    if (linker == NULL) {
-        return_code = patch_mcpi_elf_dependencies_with_extra_patchelf_args();
-    } else {
-        return_code = patch_mcpi_elf_dependencies_with_extra_patchelf_args("--set-interpreter", linker);
-    }
-    if (!is_exit_status_success(return_code)) {
-        char *exit_status_line = NULL;
-        get_exit_status_string(return_code, &exit_status_line);
-        ERR("patchelf Failed%s", exit_status_line);
-    }
-
-    // Fix Permissions
-    if (chmod(new_path, S_IRUSR | S_IXUSR) != 0) {
-        ERR("Unable To Set File Permissions: %s: %s", new_path, strerror(errno));
-    }
-}
-
-// Get Interpreter
-char *patch_get_interpreter(const char *file) {
-    // Run
-    const char *const command[] = {
-        "patchelf",
-        "--print-interpreter",
-        file,
-        NULL
-    };
-    int return_code;
-    char *output = run_command(command, &return_code);
-    if (!is_exit_status_success(return_code)) {
-        char *exit_status_line = NULL;
-        get_exit_status_string(return_code, &exit_status_line);
-        ERR("patchelf Failed%s", exit_status_line);
-    }
-    if (output != NULL) {
-        // Trim
-        int length = strlen(output);
-        if (output[length - 1] == '\n') {
-            output[length - 1] = '\0';
-        }
-    }
-    // Return
-    return output;
-}

launcher/src/patchelf.cpp

@@ -0,0 +1,98 @@
+#include <cstdlib>
+#include <sys/stat.h>
+#include <ranges>
+
+#include <LIEF/ELF.hpp>
+
+#include <dlfcn.h>
+#include <link.h>
+
+#include <libreborn/libreborn.h>
+
+#include "patchelf.h"
+
+// Duplicate MCPI Executable Into /tmp
+static void duplicate_mcpi_executable(char *new_path) {
+    // Ensure Temporary Directory
+    ensure_directory(MCPI_PATCHED_DIR);
+
+    // Generate New File
+    const int new_file_fd = mkstemp(new_path);
+    if (new_file_fd == -1) {
+        ERR("Unable To Create Temporary File: %s", strerror(errno));
+    }
+    close(new_file_fd);
+}
+
+// Fix MCPI Dependencies
+static std::vector<std::string> needed_libraries = {
+    "libmedia-layer-core.so",
+    "libpng12.so.0",
+    "libstdc++.so.6",
+    "libm.so.6",
+    "libgcc_s.so.1",
+    "libc.so.6",
+    "libpthread.so.0"
+};
+static std::vector<std::string> function_prefixes_to_patch = {
+    "SDL_",
+    "gl"
+};
+void patch_mcpi_elf_dependencies(const std::string &original_path, char *new_path, const std::string &interpreter, const std::vector<std::string> &rpath, const std::vector<std::string> &mods) {
+    // Duplicate MCPI executable into /tmp so it can be modified.
+    duplicate_mcpi_executable(new_path);
+
+    // Load Binary
+    std::unique_ptr<LIEF::ELF::Binary> binary = LIEF::ELF::Parser::parse(original_path);
+
+    // Set Interpreter
+    if (!interpreter.empty()) {
+        binary->interpreter(interpreter);
+    }
+
+    // Remove Existing Needed Libraries
+    std::vector<std::string> to_remove;
+    for (const LIEF::ELF::DynamicEntry &entry : binary->dynamic_entries()) {
+        const LIEF::ELF::DynamicEntryLibrary *library = dynamic_cast<const LIEF::ELF::DynamicEntryLibrary *>(&entry);
+        if (library) {
+            to_remove.push_back(library->name());
+        }
+    }
+    for (const std::string &library : to_remove) {
+        binary->remove_library(library);
+    }
+
+    // Setup RPath
+    binary->add(LIEF::ELF::DynamicEntryRpath(rpath));
+
+    // Add Libraries
+    std::vector<std::string> all_libraries;
+    for (const std::vector<std::string> &list : {mods, needed_libraries}) {
+        all_libraries.insert(all_libraries.end(), list.begin(), list.end());
+    }
+    for (const std::string &library : all_libraries | std::views::reverse) {
+        binary->add_library(library);
+    }
+
+    // Fix Symbol Names
+    for (LIEF::ELF::Symbol &symbol : binary->dynamic_symbols()) {
+        if (symbol.is_function()) {
+            for (const std::string &prefix : function_prefixes_to_patch) {
+                if (symbol.name().rfind(prefix, 0) == 0) {
+                    symbol.name("media_" + symbol.name());
+                    break;
+                }
+            }
+        }
+    }
+
+    // Write Binary
+    LIEF::ELF::Builder builder{*binary};
+    builder.build();
+    builder.write(new_path);
+
+    // Fix Permissions
+    if (chmod(new_path, S_IRUSR | S_IXUSR) != 0) {
+        ERR("Unable To Set File Permissions: %s: %s", new_path, strerror(errno));
+    }
+}

launcher/src/patchelf.h

@@ -1,14 +1,8 @@
 #pragma once
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <string>
+#include <vector>
 
 #define MCPI_PATCHED_DIR "/tmp/.minecraft-pi-patched"
 
-void patch_mcpi_elf_dependencies(const char *original_path, char *new_path, const char *linker);
-char *patch_get_interpreter(const char *file);
-
-#ifdef __cplusplus
-}
-#endif
+void patch_mcpi_elf_dependencies(const std::string &original_path, char *new_path, const std::string &interpreter, const std::vector<std::string> &rpath, const std::vector<std::string> &mods);

launcher/src/sdk.cpp

@@ -0,0 +1,59 @@
+#include <libreborn/libreborn.h>
+
+#include "bootstrap.h"
+#include "util.h"
+
+// Log
+#define LOG(is_debug, ...) \
+    { \
+        if (is_debug) { \
+            DEBUG(__VA_ARGS__); \
+        } else { \
+            INFO(__VA_ARGS__); \
+        } \
+    }
+
+// Copy SDK Into ~/.minecraft-pi
+#define HOME_SUBDIRECTORY_FOR_SDK (std::string(get_home_subdirectory_for_game_data()) + "/sdk")
+void copy_sdk(const std::string &binary_directory, const bool log_with_debug) {
+    // Ensure SDK Directory
+    std::string sdk_path;
+    {
+        sdk_path = std::string(getenv(_MCPI_HOME_ENV)) + HOME_SUBDIRECTORY_FOR_SDK;
+        const char *const command[] = {"mkdir", "-p", sdk_path.c_str(), nullptr};
+        run_simple_command(command, "Unable To Create SDK Directory");
+    }
+
+    // Lock File
+    const std::string lock_file_path = sdk_path + "/.lock";
+    const int lock_file_fd = lock_file(lock_file_path.c_str());
+
+    // Output Directory
+    const std::string output = sdk_path + "/" MCPI_SDK_DIR;
+    // Source Directory
+    const std::string source = binary_directory + "/sdk/.";
+
+    // Clean
+    {
+        const char *const command[] = {"rm", "-rf", output.c_str(), nullptr};
+        run_simple_command(command, "Unable To Clean SDK Output Directory");
+    }
+
+    // Make Directory
+    {
+        const char *const command[] = {"mkdir", "-p", output.c_str(), nullptr};
+        run_simple_command(command, "Unable To Create SDK Output Directory");
+    }
+
+    // Copy
+    {
+        const char *const command[] = {"cp", "-ar", source.c_str(), output.c_str(), nullptr};
+        run_simple_command(command, "Unable To Copy SDK");
+    }
+
+    // Log
+    LOG(log_with_debug, "Copied SDK To: %s", output.c_str());
+
+    // Unlock File
+    unlock_file(lock_file_path.c_str(), lock_file_fd);
+}

launcher/src/server/launcher.c

@@ -1,19 +0,0 @@
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <libreborn/libreborn.h>
-
-#include "../bootstrap.h"
-
-int main(int argc, char *argv[]) {
-    // Pre-Bootstrap
-    pre_bootstrap(argc, argv);
-
-    // Set Home To Current Directory, So World Data Is Stored There
-    char *launch_directory = getcwd(NULL, 0);
-    set_and_print_env("HOME", launch_directory);
-    free(launch_directory);
-
-    // Bootstrap
-    bootstrap(argc, argv);
-}