Fix Arch documentation

pacman -Sy is a bad command and should never be ran as it syncs the repositories but doesn't actually  upgrade the software on the system which could royally screw up an unknowing Arch noob's system.

.gitignore

@@ -12,4 +12,3 @@
 /*.AppImage
 /core*
 /qemu_*
-/cmake/.prebuilt-armhf-toolchain

.gitmodules

@@ -1,15 +1,16 @@
 [submodule "dependencies/libpng/src"]
 	path = dependencies/libpng/src
-	url = https://github.com/glennrp/libpng.git
+	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/libpng.git
 [submodule "dependencies/zlib/src"]
 	path = dependencies/libpng/zlib/src
 	url = https://github.com/madler/zlib.git
+	ignore = dirty
 [submodule "dependencies/glfw/src"]
 	path = media-layer/core/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
+	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/zenity.git
 [submodule "launcher/dependencies/patchelf/src"]
 	path = launcher/dependencies/patchelf/src
 	url = https://github.com/NixOS/patchelf.git

CMakeLists.txt

@@ -99,10 +99,14 @@ project(minecraft-pi-reborn)
 include(cmake/util.cmake)
 
 # Sanity Checks
-if(BUILD_NATIVE_COMPONENTS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND NOT MCPI_IS_MIXED_BUILD)
+set(IS_ARM_TARGETING FALSE)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")
+    set(IS_ARM_TARGETING TRUE)
+endif()
+if(BUILD_NATIVE_COMPONENTS AND NOT IS_ARM_TARGETING 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")
+if(BUILD_ARM_COMPONENTS AND NOT IS_ARM_TARGETING)
     message(FATAL_ERROR "ARM-Targeting Compiler Required")
 endif()
 
@@ -115,30 +119,37 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${DEFAULT_PREFIX}" CACHE PATH "" FORCE)
 endif()
 
-# Optimizations
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_compile_options(-O3 -s)
-else()
-    add_compile_options(-g)
-endif()
+# Required Compile Flags
+string(CONCAT COMPILE_FLAGS_SETUP
+    # Optimizations
+    "if(CMAKE_BUILD_TYPE STREQUAL \"Release\")\n"
+    "    add_compile_options(-O3 -s)\n"
+    "else()\n"
+    "    add_compile_options(-g)\n"
+    "endif()\n"
 
-# Use LLD When Using Clang
-if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    add_link_options("-fuse-ld=lld")
-endif()
+    # PIC
+    "set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)\n"
 
-# PIC
-set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
+    # 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 11)\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")
+if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\")
     # Prevents False Positives
     if(CMAKE_C_COMPILER_VERSION VERSION_GREATER 10.0)
         add_compile_options(-Wno-stringop-overflow)
@@ -147,10 +158,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)
+
+# Buld Dependencies
+add_subdirectory(dependencies)
 
 # Version
 set_property(
@@ -189,5 +199,14 @@ 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"
+        # 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()

VERSION

@@ -1 +1 @@
-2.4.0
+2.4.3

cmake/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/prebuilt-armhf-toolchain.cmake

@@ -1,48 +1,41 @@
-# 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}")
+# 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 If Needed
+include(FetchContent)
+set(FETCHCONTENT_QUIET FALSE)
+FetchContent_Declare(
+    prebuilt-armhf-toolchain
+    URL "${toolchain_url}"
+    URL_HASH "SHA256=${toolchain_sha256}"
+)
+FetchContent_MakeAvailable(prebuilt-armhf-toolchain)
+set(FETCHCONTENT_QUIET TRUE)
+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_TOOLCHAIN_FILE "${toolchain_dir}/toolchain.cmake" CACHE STRING "" FORCE)
+
 # Build Sysroot
-if(NOT EXISTS "${sysroot_dir}")
+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
@@ -56,7 +49,6 @@ if(NOT EXISTS "${sysroot_dir}")
 
     # Delete Unneeded Files
     file(REMOVE_RECURSE "${sysroot_dir}/usr/lib/audit")
-    file(REMOVE_RECURSE "${sysroot_dir}/usr/lib/gconv")
 
     # Strip Files
     file(GLOB_RECURSE files LIST_DIRECTORIES FALSE "${sysroot_dir}/*")
@@ -68,6 +60,13 @@ if(NOT EXISTS "${sysroot_dir}")
             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)

cmake/util.cmake

@@ -8,3 +8,19 @@ function(install_symlink target link)
     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()

dependencies/libpng/CMakeLists.txt

@@ -11,26 +11,15 @@ add_compile_options(-w)
 # 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)
+set(PNG_BUILD_ZLIB 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!
+set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/src" "${CMAKE_CURRENT_BINARY_DIR}/zlib/src")
 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()
+# Use Symbol Versioning
+set_target_properties(png12 PROPERTIES LINK_OPTIONS "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libpng.vers")
 
 # Ensure Build
 add_custom_target(png12-build ALL DEPENDS png12)

dependencies/libpng/src

@@ -1 +1 @@
-Subproject commit 5bb5bf345aef1e62adcfe30791f4364730a2aede
+Subproject commit 6c445538879f9e916f8e62723d2ac7cd77d96191

dependencies/zenity/src

@@ -1 +1 @@
-Subproject commit d673e9aab842d7151d92eb9164872dc05e748db2
+Subproject commit 27cd9e88a72538b00d172dee67d94cb4ce6bc9b9

docs/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+**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
+
 **2.4.0**
 * [Modding SDK](../example-mods/README.md)
 * Cache Blacklist/Whitelist

docs/INSTALL.md

@@ -7,15 +7,15 @@ Download packages [here](https://jenkins.thebrokenrail.com/job/minecraft-pi-rebo
 * Debian Buster/Ubuntu 18.04 Or Higher
 * QEMU User-Mode
   * Debian/Ubuntu: ``sudo apt install qemu-user``
-  * Arch: ``sudo pacman -Sy qemu-user``
+  * Arch: ``sudo pacman -S qemu-user``
 * Client-Only Dependencies
   * Graphics Drivers
   * GTK+ 3
     * Debian/Ubuntu: ``sudo apt install libgtk-3-0``
-    * Arch: ``sudo pacman -Sy gtk3``
+    * Arch: ``sudo pacman -S gtk3``
   * OpenAL
     * Debian/Ubuntu: ``sudo apt install libopenal1``
-    * Arch: ``sudo pacman -Sy openal``
+    * Arch: ``sudo pacman -S openal``
 
 ### Running
 Follow [these](https://docs.appimage.org/introduction/quickstart.html#how-to-run-an-appimage) instructions.

example-mods/README.md

@@ -1,5 +1,5 @@
 # Example Mods
-This is an example of a mod that cane be built using the modding SDK.
+This is an example of a mod 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.

launcher/CMakeLists.txt

@@ -8,14 +8,8 @@ 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")
+    embed_resource(launcher src/client/available-feature-flags)
+    target_sources(launcher PRIVATE src/client/launcher.cpp)
 endif()
 target_link_libraries(launcher reborn-util)
 # RPath
@@ -44,7 +38,7 @@ else()
     file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
         "Terminal=false\n"
         "StartupNotify=false\n"
-        "StartupWMClass=${MCPI_APP_TITLE}\n"
+        "StartupWMClass=${MCPI_APP_ID}\n"
     )
 endif()
 install(

launcher/dependencies/patchelf/src

@@ -1 +1 @@
-Subproject commit 734daa3d0f79cf1a0c81f927d846ace5d6a2c8e1
+Subproject commit c2b419dc2a0d6095eaa69b65ad5854ce847bdd01

launcher/src/bootstrap.c

@@ -14,38 +14,6 @@
 #include "patchelf.h"
 #include "crash-report.h"
 
-// Set Environmental Variable
-static void trim(char **value) {
-    // Remove Trailing Colon
-    int length = strlen(*value);
-    if ((*value)[length - 1] == ':') {
-        (*value)[length - 1] = '\0';
-    }
-    if ((*value)[0] == ':') {
-        *value = &(*value)[1];
-    }
-}
-void set_and_print_env(const char *name, char *value) {
-    // Set Variable With No Trailing Colon
-    static const char *unmodified_name_prefix = "MCPI_";
-    if (!starts_with(name, unmodified_name_prefix)) {
-        trim(&value);
-    }
-
-    // Print New Value
-    DEBUG("Set %s = %s", name, value);
-
-    // Set The Value
-    setenv(name, value, 1);
-}
-
-// Get Environmental Variable
-static char *get_env_safe(const char *name) {
-    // Get Variable Or Blank String If Not Set
-    char *ret = getenv(name);
-    return ret != NULL ? ret : "";
-}
-
 // Get All Mods In Folder
 static void load(char **ld_preload, char *folder) {
     int folder_name_length = strlen(folder);
@@ -85,7 +53,7 @@ static void load(char **ld_preload, char *folder) {
                             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));
+                            WARN("Unable To Access: %s: %s", name, strerror(errno));
                             errno = 0;
                         }
                     }
@@ -133,6 +101,10 @@ 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) {
@@ -174,12 +146,12 @@ void pre_bootstrap(int argc, char *argv[]) {
     // Configure PATH
     {
         // Add Library Directory
-        char *new_path;
+        char *new_path = NULL;
         safe_asprintf(&new_path, "%s/bin", binary_directory);
         // Add Existing PATH
         {
-            char *value = get_env_safe("PATH");
-            if (strlen(value) > 0) {
+            char *value = getenv("PATH");
+            if (value != NULL && strlen(value) > 0) {
                 string_append(&new_path, ":%s", value);
             }
         }
@@ -331,78 +303,120 @@ void bootstrap(int argc, char *argv[]) {
     free(resolved_path);
 
     // Configure Library Search Path
-    char *library_path = NULL;
     {
         // Log
         DEBUG("Setting Linker Search Paths...");
 
         // Prepare
-        char *new_ld_path = NULL;
+        char *transitive_ld_path = NULL;
+        char *mcpi_ld_path = NULL;
 
-        // Add Native Library Directory
-        safe_asprintf(&new_ld_path, "%s/lib/native", binary_directory);
-
-        // Add LD_LIBRARY_PATH
+        // Library Search Path For Native Components
         {
-            char *value = get_env_safe("LD_LIBRARY_PATH");
-            if (strlen(value) > 0) {
-                string_append(&new_ld_path, ":%s", value);
+            // 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);
         }
 
-        // Set LD_LIBRARY_PATH (Used For Everything Except MCPI)
-        set_and_print_env("LD_LIBRARY_PATH", new_ld_path);
+        // Library Search Path For ARM Components
+        {
+            // Add ARM Library Directory
+            safe_asprintf(&mcpi_ld_path, "%s/lib/arm", binary_directory);
 
-        // Add ARM Library Directory
-        // (This Overrides LD_LIBRARY_PATH Using ld.so's --library-path Option)
-        safe_asprintf(&library_path, "%s/lib/arm", binary_directory);
-
-        // Add ARM Sysroot Libraries (Ensure Priority) (Ignore On Actual ARM System)
+            // Add ARM Sysroot Libraries (Ensure Priority) (Ignore On Actual ARM System)
 #ifdef MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
-        string_append(&library_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);
+            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 Remaining LD_LIBRARY_PATH
-        string_append(&library_path, ":%s", new_ld_path);
+            // Add Host LD_LIBRARY_PATH
+            {
+                char *value = getenv("LD_LIBRARY_PATH");
+                if (value != NULL && strlen(value) > 0) {
+                    string_append(&mcpi_ld_path, ":%s", value);
+                }
+            }
 
-        // Free LD_LIBRARY_PATH
-        free(new_ld_path);
+            // 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 MCPI's Preloaded Objects
-    char *preload = NULL;
+    // Configure Preloaded Objects
     {
         // Log
         DEBUG("Locating Mods...");
 
-        // ~/.minecraft-pi/mods
-        {
-            // Get Mods Folder
-            char *mods_folder = NULL;
-            safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/mods/", getenv("HOME"));
-            // Load Mods From ./mods
-            load(&preload, mods_folder);
-            // Free Mods Folder
-            free(mods_folder);
-        }
+        // Native Components
+        char *host_ld_preload = getenv("LD_PRELOAD");
+        set_and_print_env("MCPI_NATIVE_LD_PRELOAD", host_ld_preload);
 
-        // Built-In Mods
+        // ARM Components
         {
-            // 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);
-        }
+            // Prepare
+            char *preload = NULL;
 
-        // Add LD_PRELOAD
-        {
-            char *value = get_env_safe("LD_PRELOAD");
-            if (strlen(value) > 0) {
-                string_append(&preload, ":%s", value);
+            // ~/.minecraft-pi/mods
+            {
+                // Get Mods Folder
+                char *mods_folder = NULL;
+                safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/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);
         }
     }
 
@@ -414,23 +428,17 @@ void bootstrap(int argc, char *argv[]) {
 
     // Arguments
     int argv_start = 1; // argv = &new_args[argv_start]
-    int real_argv_start = argv_start + 5; // ld.so Arguments
-    const char *new_args[real_argv_start /* 1 Potential Prefix Argument (QEMU) */ + argc + 1 /* NULL-Terminator */]; //
+    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 + real_argv_start] = argv[i];
+        new_args[i + argv_start] = argv[i];
     }
     // NULL-Terminator
-    new_args[real_argv_start + argc] = NULL;
+    new_args[argv_start + argc] = NULL;
 
     // Set Executable Argument
-    new_args[argv_start] = patch_get_interpreter(new_mcpi_exe_path);
-    new_args[argv_start + 1] = "--preload";
-    new_args[argv_start + 2] = preload;
-    new_args[argv_start + 3] = "--library-path";
-    new_args[argv_start + 4] = library_path;
-    new_args[real_argv_start] = new_mcpi_exe_path;
+    new_args[argv_start] = new_mcpi_exe_path;
 
     // Non-ARM Systems Need QEMU
 #ifndef __ARM_ARCH
@@ -438,6 +446,20 @@ void bootstrap(int argc, char *argv[]) {
     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.h

@@ -4,8 +4,6 @@
 extern "C" {
 #endif
 
-void set_and_print_env(const char *name, char *value);
-
 void pre_bootstrap(int argc, char *argv[]);
 void bootstrap(int argc, char *argv[]);
 

launcher/src/client/launcher.cpp

@@ -37,7 +37,7 @@ 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;
+extern size_t available_feature_flags_len;
 static void load_available_feature_flags(std::function<void(std::string)> callback) {
     // Get Path
     char *binary_directory = get_binary_directory();
@@ -112,7 +112,7 @@ 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];

launcher/src/crash-report.c

@@ -22,7 +22,7 @@ static void show_report(const char *log_filename) {
     const char *command[] = {
         "zenity",
         "--title", DIALOG_TITLE,
-        "--name", MCPI_APP_TITLE,
+        "--name", MCPI_APP_ID,
         "--width", CRASH_REPORT_DIALOG_WIDTH,
         "--height", CRASH_REPORT_DIALOG_HEIGHT,
         "--text-info",

launcher/src/server/launcher.c

@@ -1,6 +1,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <libreborn/libreborn.h>
+
 #include "../bootstrap.h"
 
 int main(int argc, char *argv[]) {

libreborn/include/libreborn/config.h.in

@@ -6,5 +6,6 @@
 #cmakedefine MCPI_USE_PREBUILT_ARMHF_TOOLCHAIN
 #cmakedefine MCPI_USE_GLES1_COMPATIBILITY_LAYER
 #cmakedefine MCPI_APP_TITLE "@MCPI_APP_TITLE@"
+#cmakedefine MCPI_APP_ID "@MCPI_APP_ID@"
 #cmakedefine MCPI_VERSION "@MCPI_VERSION@"
 #cmakedefine MCPI_SDK_DIR "@MCPI_SDK_DIR@"

libreborn/include/libreborn/exec.h

@@ -16,7 +16,15 @@
 extern "C" {
 #endif
 
+// Set Environmental Variable
+void set_and_print_env(const char *name, const char *value);
+
 // Safe execvpe()
+#define for_each_special_environmental_variable(handle) \
+    handle("LD_LIBRARY_PATH"); \
+    handle("GCONV_PATH"); \
+    handle("LD_PRELOAD");
+void setup_exec_environment(int is_arm_component);
 __attribute__((noreturn)) void safe_execvpe(const char *const argv[], const char *const envp[]);
 
 // Chop Off Last Component
@@ -24,9 +32,6 @@ void chop_last_component(char **str);
 // Get Binary Directory (Remember To Free)
 char *get_binary_directory();
 
-// Safe execvpe() Relative To Binary
-__attribute__((noreturn)) void safe_execvpe_relative_to_binary(const char *const argv[], const char *const envp[]);
-
 // Run Command And Get Output
 char *run_command(const char *const command[], int *exit_status);
 #define is_exit_status_success(status) (WIFEXITED(status) && WEXITSTATUS(status) == 0)

libreborn/include/libreborn/string.h

@@ -3,6 +3,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <iconv.h>
+#include <stdint.h>
 
 #include "util.h"
 
@@ -33,6 +35,11 @@ extern "C" {
 // Sanitize String
 void sanitize_string(char **str, int max_length, unsigned int allow_newlines);
 
+// CP437
+void safe_iconv(iconv_t cd, char *input, size_t input_size, char *output, size_t output_size);
+char *to_cp437(const char *input);
+char *from_cp437(const char *input);
+
 // Starts With
 int starts_with(const char *str, const char *prefix);
 

libreborn/src/util/exec.c

@@ -2,7 +2,32 @@
 
 #include <libreborn/exec.h>
 
+// Set Environmental Variable
+static void setenv_safe(const char *name, const char *value) {
+    if (value != NULL) {
+        setenv(name, value, 1);
+    } else {
+        unsetenv(name);
+    }
+}
+void set_and_print_env(const char *name, const char *value) {
+    // Print New Value
+    DEBUG("Set %s = %s", name, value != NULL ? value : "(unset)");
+
+    // Set The Value
+    setenv_safe(name, value);
+}
+
 // Safe execvpe()
+#define handle_environmental_variable(var) \
+    { \
+        const char *full_var = is_arm_component ? "MCPI_ARM_" var : "MCPI_NATIVE_" var; \
+        const char *var_value = getenv(full_var); \
+        set_and_print_env(var, var_value); \
+    }
+void setup_exec_environment(int is_arm_component) {
+    for_each_special_environmental_variable(handle_environmental_variable);
+}
 __attribute__((noreturn)) void safe_execvpe(const char *const argv[], const char *const envp[]) {
     // Log
     DEBUG("Running Command:");
@@ -45,29 +70,6 @@ char *get_binary_directory() {
     return exe;
 }
 
-// Safe execvpe() Relative To Binary
-__attribute__((noreturn)) void safe_execvpe_relative_to_binary(const char *const argv[], const char *const envp[]) {
-    // Get Binary Directory
-    char *binary_directory = get_binary_directory();
-    // Create Full Path
-    char *full_path = NULL;
-    safe_asprintf(&full_path, "%s/%s", binary_directory, argv[0]);
-    // Free Binary Directory
-    free(binary_directory);
-
-    // Build New argv
-    int argc;
-    for (argc = 0; argv[argc] != NULL; argc++);
-    const char *new_argv[argc + 1];
-    for (int i = 1; i < argc; i++) {
-        new_argv[i] = argv[i];
-    }
-    new_argv[0] = full_path;
-    new_argv[argc] = NULL;
-    // Run
-    safe_execvpe(new_argv, envp);
-}
-
 // Run Command And Get Output
 char *run_command(const char *const command[], int *exit_status) {
     // Store Output
@@ -85,6 +87,9 @@ char *run_command(const char *const command[], int *exit_status) {
         close(output_pipe[0]);
         close(output_pipe[1]);
 
+        // Setup Environment
+        setup_exec_environment(0);
+
         // Run
         safe_execvpe(command, (const char *const *) environ);
     } else {

libreborn/src/util/string.c

@@ -1,8 +1,9 @@
+#include <iconv.h>
+#include <stdint.h>
+
 #include <libreborn/string.h>
 
 // Sanitize String
-#define MINIMUM_SAFE_CHARACTER 32
-#define MAXIMUM_SAFE_CHARACTER 126
 void sanitize_string(char **str, int max_length, unsigned int allow_newlines) {
     // Store Message Length
     int length = strlen(*str);
@@ -12,18 +13,135 @@ void sanitize_string(char **str, int max_length, unsigned int allow_newlines) {
         length = max_length;
     }
     // Loop Through Message
-    for (int i = 0; i < length; i++) {
-        if (allow_newlines && ((*str)[i] == '\n' || (*str)[i] == '\r')) {
-            continue;
-        }
-        unsigned char c = (unsigned char) (*str)[i];
-        if (c < MINIMUM_SAFE_CHARACTER || c > MAXIMUM_SAFE_CHARACTER) {
-            // Replace Illegal Character
-            (*str)[i] = '?';
+    if (!allow_newlines) {
+        for (int i = 0; i < length; i++) {
+            if ((*str)[i] == '\n' || (*str)[i] == '\r') {
+                // Replace Newline
+                (*str)[i] = ' ';
+            }
         }
     }
 }
 
+// Minecraft-Flavored CP437
+void safe_iconv(iconv_t cd, char *input, size_t input_size, char *output, size_t output_size) {
+    iconv(cd, &input, &input_size, &output, &output_size);
+}
+#define CP437_CHARACTERS 256
+static const char *cp437_characters_map[CP437_CHARACTERS] = {
+    "\0", "☺", "☻", "♥", "♦", "♣", "♠", "•", "◘", "○", "\n", "♂", "♀", "\r", "♫", "☼",
+    "►", "◄", "↕", "‼", "¶", "§", "▬", "↨", "↑", "↓", "→", "←", "∟", "↔", "▲", "▼",
+    " ", "!", "\"", "#", "$", "%", "&", "'", "(", ")", "*", "+", ",", "-", ".", "/",
+    "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ":", ";", "<", "=", ">", "?",
+    "@", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O",
+    "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "[", "\\", "]", "^", "_",
+    "`", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o",
+    "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z", "{", "|", "}", "~", "⌂",
+    "Ç", "ü", "é", "â", "ä", "à", "å", "ç", "ê", "ë", "è", "ï", "î", "ì", "Ä", "Å",
+    "É", "æ", "Æ", "ô", "ö", "ò", "û", "ù", "ÿ", "Ö", "Ü", "¢", "£", "¥", "₧", "ƒ",
+    "á", "í", "ó", "ú", "ñ", "Ñ", "ª", "º", "¿", "⌐", "¬", "½", "¼", "¡", "«", "»",
+    "░", "▒", "▓", "│", "┤", "╡", "╢", "╖", "╕", "╣", "║", "╗", "╝", "╜", "╛", "┐",
+    "└", "┴", "┬", "├", "─", "┼", "╞", "╟", "╚", "╔", "╩", "╦", "╠", "═", "╬", "╧",
+    "╨", "╤", "╥", "╙", "╘", "╒", "╓", "╫", "╪", "┘", "┌", "█", "▄", "▌", "▐", "▀",
+    "α", "ß", "Γ", "π", "Σ", "σ", "µ", "τ", "Φ", "Θ", "Ω", "δ", "∞", "φ", "ε", "∩",
+    "≡", "±", "≥", "≤", "⌠", "⌡", "÷", "≈", "°", "∙", "·", "√", "ⁿ", "²", "■", "©"
+};
+static uint32_t *get_cp437_characters_codepoint_map() {
+    static uint32_t map[CP437_CHARACTERS];
+    static int is_setup = 0;
+    if (!is_setup) {
+        // Build Map
+        iconv_t cd = iconv_open("UTF-32LE", "UTF-8");
+        if (cd != (iconv_t) -1) {
+            size_t str_size = 4;
+            uint32_t *str = (uint32_t *) malloc(str_size);
+            ALLOC_CHECK(str);
+            for (int i = 0; i < CP437_CHARACTERS; i++) {
+                // Convert to UTF-32, Then Extract Codepoint
+                safe_iconv(cd, (char *) cp437_characters_map[i], strlen(cp437_characters_map[i]), (char *) str, str_size);
+                // Extract
+                map[i] = str[0];
+            }
+            // Free
+            free(str);
+            iconv_close(cd);
+        } else {
+            IMPOSSIBLE();
+        }
+        is_setup = 1;
+    }
+    return map;
+}
+char *to_cp437(const char *input) {
+    // Convert To UTF-32 For Easier Parsing
+    size_t in_size = strlen(input);
+    size_t utf32_str_size = in_size * 4;
+    size_t real_utf32_str_size = utf32_str_size + 4 /* NULL-terminator */;
+    uint32_t *utf32_str = (uint32_t *) malloc(real_utf32_str_size);
+    ALLOC_CHECK(utf32_str);
+    memset(utf32_str, 0, real_utf32_str_size);
+    iconv_t cd = iconv_open("UTF-32LE", "UTF-8");
+    if (cd != (iconv_t) -1) {
+        safe_iconv(cd, (char *) input, in_size, (char *) utf32_str, utf32_str_size);
+        iconv_close(cd);
+    } else {
+        IMPOSSIBLE();
+    }
+    // Allocate String
+    size_t cp437_str_size;
+    for (cp437_str_size = 0; utf32_str[cp437_str_size] != 0; cp437_str_size++);
+    size_t real_cp437_str_size = cp437_str_size + 1 /* NULL-terminator */;
+    char *cp437_str = (char *) malloc(real_cp437_str_size);
+    ALLOC_CHECK(cp437_str);
+    memset(cp437_str, 0, real_cp437_str_size);
+    // Handle Characters
+    for (size_t i = 0; utf32_str[i] != 0; i++) {
+        uint32_t codepoint = utf32_str[i];
+        for (int j = 0; j < CP437_CHARACTERS; j++) {
+            uint32_t test_codepoint = get_cp437_characters_codepoint_map()[j];
+            if (codepoint == test_codepoint) {
+                cp437_str[i] = j;
+                break;
+            }
+        }
+        if (cp437_str[i] == '\0') {
+            cp437_str[i] = '?';
+        }
+    }
+    // Free
+    free(utf32_str);
+    // Return
+    return cp437_str;
+}
+char *from_cp437(const char *input) {
+    // Convert To UTF-32 For Easier Parsing
+    size_t in_size = strlen(input);
+    size_t utf32_str_size = in_size * 4;
+    size_t real_utf32_str_size = utf32_str_size + 4 /* NULL-terminator */;
+    uint32_t *utf32_str = (uint32_t *) malloc(real_utf32_str_size);
+    ALLOC_CHECK(utf32_str);
+    memset(utf32_str, 0, real_utf32_str_size);
+    // Handle Characters
+    for (size_t i = 0; input[i] != '\0'; i++) {
+        utf32_str[i] = get_cp437_characters_codepoint_map()[(uint32_t) input[i]];
+    }
+    // Convert To UTF-8
+    size_t out_size = utf32_str_size;
+    size_t real_out_size = utf32_str_size + 1 /* NULL-terminator */;
+    char *output = (char *) malloc(real_out_size);
+    ALLOC_CHECK(output);
+    memset(output, 0, real_out_size);
+    iconv_t cd = iconv_open("UTF-8", "UTF-32LE");
+    if (cd != (iconv_t) -1) {
+        safe_iconv(cd, (char *) utf32_str, utf32_str_size, output, out_size);
+        iconv_close(cd);
+    } else {
+        IMPOSSIBLE();
+    }
+    // Return
+    return output;
+}
+
 // Starts With
 int starts_with(const char *str, const char *prefix) {
     return strncmp(prefix, str, strlen(prefix)) == 0;

media-layer/core/dependencies/glfw/src

@@ -1 +1 @@
-Subproject commit c50d53160fa9b579dda0d0a4f9a7c2512940df8e
+Subproject commit c18851f52ec9704eb06464058a600845ec1eada1

media-layer/core/gles/CMakeLists.txt

@@ -14,6 +14,11 @@ endif()
 add_library(GLESv1_CM SHARED ${GLES_SRC})
 if(NOT MCPI_HEADLESS_MODE)
     target_link_libraries(GLESv1_CM PRIVATE glfw PUBLIC reborn-util PRIVATE dl PRIVATE m)
+    # Shaders
+    if(MCPI_USE_GLES1_COMPATIBILITY_LAYER)
+        embed_resource(GLESv1_CM src/compatibility-layer/shaders/main.vsh)
+        embed_resource(GLESv1_CM src/compatibility-layer/shaders/main.fsh)
+    endif()
 endif()
 
 # Common

media-layer/core/gles/src/compatibility-layer/draw.c

@@ -54,16 +54,16 @@ static void log_shader(GLuint shader, const char *name) {
         ERR("Failed To Compile %s Shader", name);
     }
 }
-static GLuint compile_shader(const char *vertex_shader_text, const char *fragment_shader_text) {
+static GLuint compile_shader(const char *vertex_shader_text, const int vertex_shader_length, const char *fragment_shader_text, const int fragment_shader_length) {
     // Vertex Shader
     const GLuint vertex_shader = real_glCreateShader()(REAL_GL_VERTEX_SHADER);
-    real_glShaderSource()(vertex_shader, 1, &vertex_shader_text, NULL);
+    real_glShaderSource()(vertex_shader, 1, &vertex_shader_text, &vertex_shader_length);
     real_glCompileShader()(vertex_shader);
     log_shader(vertex_shader, "Vertex");
 
     // Fragment Shader
     const GLuint fragment_shader = real_glCreateShader()(REAL_GL_FRAGMENT_SHADER);
-    real_glShaderSource()(fragment_shader, 1, &fragment_shader_text, NULL);
+    real_glShaderSource()(fragment_shader, 1, &fragment_shader_text, &fragment_shader_length);
     real_glCompileShader()(fragment_shader);
     log_shader(fragment_shader, "Fragment");
 
@@ -78,70 +78,14 @@ static GLuint compile_shader(const char *vertex_shader_text, const char *fragmen
 }
 
 // Shader
+extern unsigned char main_vsh[];
+extern size_t main_vsh_len;
+extern unsigned char main_fsh[];
+extern size_t main_fsh_len;
 static GLuint get_shader() {
     static GLuint program = 0;
     if (program == 0) {
-        static const char *vertex_shader_text =
-            "#version 100\n"
-            "precision mediump float;\n"
-            // Matrices
-            "uniform mat4 u_projection;\n"
-            "uniform mat4 u_model_view;\n"
-            "uniform mat4 u_texture;\n"
-            // Texture
-            "attribute vec3 a_vertex_coords;\n"
-            "attribute vec2 a_texture_coords;\n"
-            "varying vec4 v_texture_pos;\n"
-            // Color
-            "attribute vec4 a_color;\n"
-            "varying vec4 v_color;\n"
-            // Fog
-            "varying vec4 v_fog_eye_position;\n"
-            // Main
-            "void main() {\n"
-            "    v_texture_pos = u_texture * vec4(a_texture_coords.xy, 0.0, 1.0);\n"
-            "    gl_Position = u_projection * u_model_view * vec4(a_vertex_coords.xyz, 1.0);\n"
-            "    v_color = a_color;\n"
-            "    v_fog_eye_position = u_model_view * vec4(a_vertex_coords.xyz, 1.0);\n"
-            "}";
-        static const char *fragment_shader_text =
-            "#version 100\n"
-            "precision mediump float;\n"
-            // Texture
-            "uniform bool u_has_texture;"
-            "uniform sampler2D u_texture_unit;\n"
-            // Color
-            "varying vec4 v_color;\n"
-            "varying vec4 v_texture_pos;\n"
-            // Alpha Test
-            "uniform bool u_alpha_test;\n"
-            // Fog
-            "uniform bool u_fog;\n"
-            "uniform vec4 u_fog_color;\n"
-            "uniform bool u_fog_is_linear;\n"
-            "uniform float u_fog_start;\n"
-            "uniform float u_fog_end;\n"
-            "varying vec4 v_fog_eye_position;\n"
-            // Main
-            "void main(void) {\n"
-            "    gl_FragColor = v_color;\n"
-            "    if (u_has_texture) {\n"
-            "        gl_FragColor *= texture2D(u_texture_unit, v_texture_pos.xy);\n"
-            "    }\n"
-            "    if (u_alpha_test && gl_FragColor.a <= 0.1) {\n"
-            "        discard;\n"
-            "    }\n"
-            "    if (u_fog) {\n"
-            "        float fog_factor;\n"
-            "        if (u_fog_is_linear) {\n"
-            "            fog_factor = (u_fog_end - length(v_fog_eye_position)) / (u_fog_end - u_fog_start);\n"
-            "        } else {\n"
-            "            fog_factor = exp(-u_fog_start * length(v_fog_eye_position));\n"
-            "        }\n"
-            "        gl_FragColor = mix(gl_FragColor, u_fog_color, 1.0 - clamp(fog_factor, 0.0, 1.0));\n"
-            "    }\n"
-            "}";
-        program = compile_shader(vertex_shader_text, fragment_shader_text);
+        program = compile_shader((const char *) main_vsh, main_vsh_len, (const char *) main_fsh, main_fsh_len);
     }
     return program;
 }

media-layer/core/gles/src/compatibility-layer/shaders/main.fsh

@@ -0,0 +1,39 @@
+#version 100
+precision mediump float;
+// Texture
+uniform bool u_has_texture;
+uniform sampler2D u_texture_unit;
+// Color
+varying vec4 v_color;
+varying vec4 v_texture_pos;
+// Alpha Test
+uniform bool u_alpha_test;
+// Fog
+uniform bool u_fog;
+uniform vec4 u_fog_color;
+uniform bool u_fog_is_linear;
+uniform float u_fog_start;
+uniform float u_fog_end;
+varying vec4 v_fog_eye_position;
+// Main
+void main(void) {
+    gl_FragColor = v_color;
+    // Texture
+    if (u_has_texture) {
+        gl_FragColor *= texture2D(u_texture_unit, v_texture_pos.xy);
+    }
+    // Alpha Test
+    if (u_alpha_test && gl_FragColor.a <= 0.1) {
+        discard;
+    }
+    // Fog
+    if (u_fog) {
+        float fog_factor;
+        if (u_fog_is_linear) {
+            fog_factor = (u_fog_end - length(v_fog_eye_position)) / (u_fog_end - u_fog_start);
+        } else {
+            fog_factor = exp(-u_fog_start * length(v_fog_eye_position));
+        }
+        gl_FragColor = mix(gl_FragColor, u_fog_color, 1.0 - clamp(fog_factor, 0.0, 1.0));
+    }
+}

media-layer/core/gles/src/compatibility-layer/shaders/main.vsh

@@ -0,0 +1,22 @@
+#version 100
+precision mediump float;
+// Matrices
+uniform mat4 u_projection;
+uniform mat4 u_model_view;
+uniform mat4 u_texture;
+// Texture
+attribute vec3 a_vertex_coords;
+attribute vec2 a_texture_coords;
+varying vec4 v_texture_pos;
+// Color
+attribute vec4 a_color;
+varying vec4 v_color;
+// Fog
+varying vec4 v_fog_eye_position;
+// Main
+void main(void) {
+    v_texture_pos = u_texture * vec4(a_texture_coords.xy, 0.0, 1.0);
+    gl_Position = u_projection * u_model_view * vec4(a_vertex_coords.xyz, 1.0);
+    v_color = a_color;
+    v_fog_eye_position = u_model_view * vec4(a_vertex_coords.xyz, 1.0);
+}

media-layer/core/src/media.c

@@ -155,16 +155,42 @@ static void glfw_key(__attribute__((unused)) GLFWwindow *window, int key, int sc
         event.key.keysym.mod = glfw_modifier_to_sdl_modifier(mods);
         event.key.keysym.sym = glfw_key_to_sdl_key(key);
         SDL_PushEvent(&event);
-        if (key == GLFW_KEY_BACKSPACE && !up) {
-            character_event((char) '\b');
-        }
     }
 }
 
 // Pass Text To Minecraft
+static void codepoint_to_utf8(unsigned char *const buffer, const unsigned int code) {
+    // https://stackoverflow.com/a/42013433/16198887
+    if (code <= 0x7f) {
+        buffer[0] = code;
+    } else if (code <= 0x7ff) {
+        buffer[0] = 0xc0 | (code >> 6); // 110xxxxx
+        buffer[1] = 0x80 | (code & 0x3f); // 10xxxxxx
+    } else if (code <= 0xffff) {
+        buffer[0] = 0xe0 | (code >> 12); // 1110xxxx
+        buffer[1] = 0x80 | ((code >> 6) & 0x3f); // 10xxxxxx
+        buffer[2] = 0x80 | (code & 0x3f); // 10xxxxxx
+    } else if (code <= 0x10ffff) {
+        buffer[0] = 0xf0 | (code >> 18); // 11110xxx
+        buffer[1] = 0x80 | ((code >> 12) & 0x3f); // 10xxxxxx
+        buffer[2] = 0x80 | ((code >> 6) & 0x3f); // 10xxxxxx
+        buffer[3] = 0x80 | (code & 0x3f); // 10xxxxxx
+    }
+}
 static void glfw_char(__attribute__((unused)) GLFWwindow *window, unsigned int codepoint) {
     if (is_interactable) {
-        character_event((char) codepoint);
+        // Convert
+        size_t str_size = 4 /* Maximum UTF-8 character size */ + 1 /* NULL-terminator */;
+        char str[str_size];
+        memset(str, 0, str_size);
+        codepoint_to_utf8((unsigned char *) str, codepoint);
+        char *cp437_str = to_cp437(str);
+        // Send Event·
+        for (int i = 0; cp437_str[i] != '\0'; i++) {
+            character_event(cp437_str[i]);
+        }
+        // Free
+        free(cp437_str);
     }
 }
 
@@ -290,6 +316,9 @@ void SDL_WM_SetCaption(const char *title, __attribute__((unused)) const char *ic
     // Extra Settings
     glfwWindowHint(GLFW_AUTO_ICONIFY, GLFW_FALSE);
     glfwWindowHint(GLFW_ALPHA_BITS, 0); // Fix Transparent Window On Wayland
+    // App ID
+    glfwWindowHintString(GLFW_X11_CLASS_NAME, MCPI_APP_ID);
+    glfwWindowHintString(GLFW_WAYLAND_APP_ID, MCPI_APP_ID);
 
     // Create Window
     glfw_window = glfwCreateWindow(DEFAULT_WIDTH, DEFAULT_HEIGHT, title, NULL, NULL);

media-layer/proxy/src/server/server.cpp

@@ -71,6 +71,9 @@ static void start_media_layer_proxy_client(int read, int write) {
         safe_asprintf(&write_str, "%i", write);
         const char *argv[] = {"media-layer-proxy-client", read_str, write_str, NULL};
 
+        // Setup Environment
+        setup_exec_environment(0);
+
         // Run
         safe_execvpe(argv, (const char *const *) environ);
     } else {

mods/CMakeLists.txt

@@ -66,7 +66,7 @@ else()
     target_link_libraries(input mods-headers reborn-patch symbols creative feature misc media-layer-core)
 
     add_library(sign SHARED src/sign/sign.cpp)
-    target_link_libraries(sign mods-headers reborn-patch symbols feature input)
+    target_link_libraries(sign mods-headers reborn-patch symbols feature input media-layer-core)
 
     add_library(touch SHARED src/touch/touch.cpp)
     target_link_libraries(touch mods-headers reborn-patch symbols feature)
@@ -108,7 +108,7 @@ add_library(test SHARED src/test/test.c)
 target_link_libraries(test mods-headers reborn-patch home)
 
 add_library(init SHARED src/init/init.c)
-target_link_libraries(init mods-headers compat game-mode misc death options chat creative bucket home version test media-layer-core)
+target_link_libraries(init mods-headers reborn-util compat game-mode misc death options chat creative bucket home version test media-layer-core)
 if(MCPI_SERVER_MODE)
     target_link_libraries(init server)
 else()

mods/src/bucket/bucket.cpp

@@ -32,15 +32,14 @@ static int32_t BucketItem_getIcon(__attribute__((unused)) unsigned char *item, i
 static int32_t BucketItem_useOn(__attribute__((unused)) unsigned char *item, ItemInstance *item_instance, unsigned char *player, unsigned char *level, int32_t x, int32_t y, int32_t z, int32_t hit_side, __attribute__((unused)) float hit_x, __attribute__((unused)) float hit_y, __attribute__((unused)) float hit_z) {
     if (item_instance->count < 1) {
         return 0;
-    }
-    if (item_instance->auxiliary == 0) {
+    } else if (item_instance->auxiliary == 0) {
         // Empty Bucket
         int32_t new_auxiliary = 0;
         int32_t tile = (*Level_getTile)(level, x, y, z);
         if (tile == *(int32_t *) (*Tile_calmWater + Tile_id_property_offset)) {
             new_auxiliary = *(int32_t *) (*Tile_water + Tile_id_property_offset);
         } else if (tile == *(int32_t *) (*Tile_calmLava + Tile_id_property_offset)) {
-            new_auxiliary = *(int32_t *) (*Tile_water + Tile_id_property_offset);
+            new_auxiliary = *(int32_t *) (*Tile_lava + Tile_id_property_offset);
         }
         if (new_auxiliary != 0) {
             // Valid
@@ -108,6 +107,9 @@ static int32_t BucketItem_useOn(__attribute__((unused)) unsigned char *item, Ite
             Material_isSolid_t Material_isSolid = *(Material_isSolid_t *) (material_vtable + Material_isSolid_vtable_offset);
             valid = !(*Material_isSolid)(material);
         }
+        if (item_instance->auxiliary != *(int32_t *) (*Tile_water + Tile_id_property_offset) && item_instance->auxiliary != *(int32_t *) (*Tile_lava + Tile_id_property_offset)) {
+            valid = false;
+        }
         if (valid) {
             (*Level_setTileAndData)(level, x, y, z, item_instance->auxiliary, 0);
             item_instance->auxiliary = 0;

mods/src/chat/ui.c

@@ -29,7 +29,7 @@ static void *chat_thread(__attribute__((unused)) void *nop) {
     const char *command[] = {
         "zenity",
         "--title", DIALOG_TITLE,
-        "--name", MCPI_APP_TITLE,
+        "--name", MCPI_APP_ID,
         "--entry",
         "--text", "Enter Chat Message:",
         NULL
@@ -48,7 +48,9 @@ static void *chat_thread(__attribute__((unused)) void *nop) {
             // Don't Allow Empty Strings
             if (length > 0) {
                 // Submit
-                _chat_queue_message(output);
+                char *safe_output = to_cp437(output);
+                _chat_queue_message(safe_output);
+                free(safe_output);
             }
         }
         // Free Output

mods/src/game-mode/ui.cpp

@@ -88,7 +88,7 @@ static void *create_world_thread(__attribute__((unused)) void *nop) {
             const char *command[] = {
                 "zenity",
                 "--title", DIALOG_TITLE,
-                "--name", MCPI_APP_TITLE,
+                "--name", MCPI_APP_ID,
                 "--entry",
                 "--text", "Enter World Name:",
                 "--entry-text", DEFAULT_WORLD_NAME,
@@ -115,7 +115,7 @@ static void *create_world_thread(__attribute__((unused)) void *nop) {
             const char *command[] = {
                 "zenity",
                 "--title", DIALOG_TITLE,
-                "--name", MCPI_APP_TITLE,
+                "--name", MCPI_APP_ID,
                 "--list",
                 "--radiolist",
                 "--width", GAME_MODE_DIALOG_SIZE,
@@ -148,7 +148,7 @@ static void *create_world_thread(__attribute__((unused)) void *nop) {
             const char *command[] = {
                 "zenity",
                 "--title", DIALOG_TITLE,
-                "--name", MCPI_APP_TITLE,
+                "--name", MCPI_APP_ID,
                 "--entry",
                 "--only-numerical",
                 "--text", "Enter Seed (Leave Blank For Random):",
@@ -186,7 +186,9 @@ static void *create_world_thread(__attribute__((unused)) void *nop) {
         pthread_mutex_lock(&create_world_state_lock);
         reset_create_world_state();
         create_world_state.dialog_state = DIALOG_SUCCESS;
-        create_world_state.name = world_name;
+        char *safe_name = to_cp437(world_name);
+        create_world_state.name = safe_name;
+        free(world_name);
         create_world_state.game_mode = game_mode;
         create_world_state.seed = seed;
         pthread_mutex_unlock(&create_world_state_lock);

mods/src/misc/logging.cpp

@@ -20,7 +20,9 @@ static void Gui_addMessage_injection(unsigned char *gui, std::string const& text
         Gui_addMessage_recursing = true;
 
         // Print Log Message
-        fprintf(stderr, "[CHAT]: %s\n", new_message);
+        char *safe_message = from_cp437(new_message);
+        fprintf(stderr, "[CHAT]: %s\n", safe_message);
+        free(safe_message);
 
         // Call Original Method
         (*Gui_addMessage)(gui, std::string(new_message));

mods/src/options/options.c

@@ -39,6 +39,10 @@ static char *get_username() {
     }
     return username;
 }
+static char *safe_username = NULL;
+__attribute__((destructor)) static void _free_safe_username() {
+    free(safe_username);
+}
 
 static int anaglyph;
 static int render_distance;
@@ -102,7 +106,8 @@ void init_options() {
     if (strcmp(*default_username, "StevePi") != 0) {
         ERR("Default Username Is Invalid");
     }
-    patch_address((void *) default_username, (void *) username);
+    safe_username = to_cp437(username);
+    patch_address((void *) default_username, (void *) safe_username);
 
     // Disable Autojump By Default
     if (feature_has("Disable Autojump By Default", server_disabled)) {

mods/src/server/server.cpp

@@ -64,7 +64,11 @@ static ServerProperties &get_server_properties() {
 
 // Get World Name
 static std::string get_world_name() {
-    return get_server_properties().get_string("world-name", DEFAULT_WORLD_NAME);
+    std::string name = get_server_properties().get_string("world-name", DEFAULT_WORLD_NAME);
+    char *safe_name_c = to_cp437(name.c_str());
+    std::string safe_name = safe_name_c;
+    free(safe_name_c);
+    return safe_name;
 }
 
 // Create/Start World
@@ -120,8 +124,12 @@ static std::vector<unsigned char *> get_players_in_level(unsigned char *level) {
     return *(std::vector<unsigned char *> *) (level + Level_players_property_offset);
 }
 // Get Player's Username
-static std::string *get_player_username(unsigned char *player) {
-    return (std::string *) (player + Player_username_property_offset);
+static std::string get_player_username(unsigned char *player) {
+    std::string *username = (std::string *) (player + Player_username_property_offset);
+    char *safe_username_c = from_cp437(username->c_str());
+    std::string safe_username = safe_username_c;
+    free(safe_username_c);
+    return safe_username;
 }
 // Get Level From Minecraft
 static unsigned char *get_level(unsigned char *minecraft) {
@@ -137,7 +145,7 @@ static void find_players(unsigned char *minecraft, std::string target_username,
     for (std::size_t i = 0; i < players.size(); i++) {
         // Iterate Players
         unsigned char *player = players[i];
-        std::string username = *get_player_username(player);
+        std::string username = get_player_username(player);
         if (all_players || username == target_username) {
             // Run Callback
             (*callback)(minecraft, username, player);
@@ -326,8 +334,11 @@ static void handle_commands(unsigned char *minecraft) {
                 } else if (data.rfind(say_command, 0) == 0) {
                     // Format Message
                     std::string message = "[Server] " + data.substr(say_command.length());
+                    char *safe_message = to_cp437(message.c_str());
                     // Post Message To Chat
-                    (*ServerSideNetworkHandler_displayGameMessage)(server_side_network_handler, message);
+                    (*ServerSideNetworkHandler_displayGameMessage)(server_side_network_handler, safe_message);
+                    // Free
+                    free(safe_message);
                 } else if (data == list_command) {
                     // List Players
                     INFO("All Players:");
@@ -584,7 +595,7 @@ static void server_init() {
 // Init Server
 void init_server() {
     server_init();
-    setenv("MCPI_FEATURE_FLAGS", get_features(), 1);
-    setenv("MCPI_RENDER_DISTANCE", "Tiny", 1);
-    setenv("MCPI_USERNAME", get_motd().c_str(), 1);
+    set_and_print_env("MCPI_FEATURE_FLAGS", get_features());
+    set_and_print_env("MCPI_RENDER_DISTANCE", "Tiny");
+    set_and_print_env("MCPI_USERNAME", get_motd().c_str());
 }

mods/src/sign/sign.cpp

@@ -1,5 +1,6 @@
 #include <vector>
 
+#include <SDL/SDL.h>
 #include <libreborn/libreborn.h>
 #include <symbols/minecraft.h>
 
@@ -8,6 +9,16 @@
 #include <mods/input/input.h>
 #include <mods/sign/sign.h>
 
+// Handle Backspace
+static int32_t sdl_key_to_minecraft_key_injection(int32_t sdl_key) {
+    if (sdl_key == SDLK_BACKSPACE) {
+        return 8;
+    } else {
+        // Call Original Method
+        return (*sdl_key_to_minecraft_key)(sdl_key);
+    }
+}
+
 // Open Sign Screen
 static void LocalPlayer_openTextEdit_injection(unsigned char *local_player, unsigned char *sign) {
     if (*(int32_t *) (sign + TileEntity_id_property_offset) == 4) {
@@ -19,18 +30,10 @@ static void LocalPlayer_openTextEdit_injection(unsigned char *local_player, unsi
     }
 }
 
-#define BACKSPACE_KEY 8
-
-static int is_valid_key(char key) {
-    return (key >= 32 && key <= 126) || key == BACKSPACE_KEY;
-}
-
 // Store Text Input
 std::vector<char> input;
 void sign_key_press(char key) {
-    if (is_valid_key(key)) {
-        input.push_back(key);
-    }
+    input.push_back(key);
 }
 static void clear_input(__attribute__((unused)) unsigned char *minecraft) {
     input.clear();
@@ -41,16 +44,11 @@ static void TextEditScreen_updateEvents_injection(unsigned char *screen) {
     // Call Original Method
     (*Screen_updateEvents)(screen);
 
-    if (*(char *)(screen + 4) == '\0') {
+    if (!*(bool *)(screen + Screen_passthrough_input_property_offset)) {
         unsigned char *vtable = *(unsigned char **) screen;
         for (char key : input) {
-            if (key == BACKSPACE_KEY) {
-                // Handle Backspace
-                (*(Screen_keyPressed_t *) (vtable + Screen_keyPressed_vtable_offset))(screen, BACKSPACE_KEY);
-            } else {
-                // Handle Normal Key
-                (*(Screen_keyboardNewChar_t *) (vtable + Screen_keyboardNewChar_vtable_offset))(screen, key);
-            }
+            // Handle Normal Key
+            (*(Screen_keyboardNewChar_t *) (vtable + Screen_keyboardNewChar_vtable_offset))(screen, key);
         }
     }
     clear_input(NULL);
@@ -59,10 +57,12 @@ static void TextEditScreen_updateEvents_injection(unsigned char *screen) {
 // Init
 void init_sign() {
     if (feature_has("Fix Sign Placement", server_disabled)) {
+        // Handle Backspace
+        overwrite_calls((void *) sdl_key_to_minecraft_key, (void *) sdl_key_to_minecraft_key_injection);
         // Fix Signs
         patch_address(LocalPlayer_openTextEdit_vtable_addr, (void *) LocalPlayer_openTextEdit_injection);
         patch_address(TextEditScreen_updateEvents_vtable_addr, (void *) TextEditScreen_updateEvents_injection);
-        // Clear input On Input Tick
+        // Clear Input On Input Tick
         input_run_on_tick(clear_input);
     }
 }

scripts/build.sh

@@ -11,20 +11,22 @@ build() {
     cd "build/${MODE}-${ARCH}"
 
     # Create Prefix
-    local prefix="$(cd ../../; pwd)/out/${MODE}-${ARCH}"
-    rm -rf "${prefix}"
-    mkdir -p "${prefix}"
+    if [ -z "${DESTDIR+x}" ]; then
+        export DESTDIR="$(cd ../../; pwd)/out/${MODE}-${ARCH}"
+        rm -rf "${DESTDIR}"
+        mkdir -p "${DESTDIR}"
+    fi
 
     # Build ARM Components
     cd arm
     cmake --build .
-    DESTDIR="${prefix}" cmake --install .
+    cmake --install .
     cd ../
 
     # Build Native Components
     cd native
     cmake --build .
-    DESTDIR="${prefix}" cmake --install .
+    cmake --install .
     cd ../
 
     # Exit

scripts/install-dependencies.sh

@@ -30,8 +30,7 @@ run() {
 
     # Host Dependencies Needed For Compile
     queue_pkg \
-        libwayland-bin \
-        xxd
+        libwayland-bin
 
     # Host Dependencies Needed For Running
     queue_pkg \

symbols/include/symbols/minecraft.h

@@ -18,6 +18,9 @@ static renderCursor_t renderCursor = (renderCursor_t) 0x480c4;
 typedef void (*sleepMs_t)(int32_t x);
 static sleepMs_t sleepMs = (sleepMs_t) 0x13cf4;
 
+typedef int32_t (*sdl_key_to_minecraft_key_t)(int32_t sdl_key);
+static sdl_key_to_minecraft_key_t sdl_key_to_minecraft_key = (sdl_key_to_minecraft_key_t) 0x1243c;
+
 static char **default_path = (char **) 0xe264; // /.minecraft/
 static char **default_username = (char **) 0x18fd4; // StevePi
 static char **minecraft_pi_version = (char **) 0x39d94; // v0.1.1 alpha
@@ -554,6 +557,7 @@ static uint32_t Screen_rendered_buttons_property_offset = 0x18; // std::vector<B
 static uint32_t Screen_selectable_buttons_property_offset = 0x30; // std::vector<Button *>
 static uint32_t Screen_width_property_offset = 0x8; // int32_t
 static uint32_t Screen_height_property_offset = 0xc; // int32_t
+static uint32_t Screen_passthrough_input_property_offset = 0x10; // bool
 
 // Button