.gitignore

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

.gitmodules

@@ -1,16 +1,15 @@
 [submodule "dependencies/libpng/src"]
 	path = dependencies/libpng/src
-	url = https://gitea.thebrokenrail.com/minecraft-pi-reborn/libpng.git
+	url = https://github.com/glennrp/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/minecraft-pi-reborn/zenity.git
+	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

CMakeLists.txt

@@ -99,14 +99,10 @@ project(minecraft-pi-reborn)
 include(cmake/util.cmake)
 
 # Sanity Checks
-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)
+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 IS_ARM_TARGETING)
+if(BUILD_ARM_COMPONENTS AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
     message(FATAL_ERROR "ARM-Targeting Compiler Required")
 endif()
 
@@ -119,37 +115,30 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${DEFAULT_PREFIX}" CACHE PATH "" FORCE)
 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"
+# Optimizations
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    add_compile_options(-O3 -s)
+else()
+    add_compile_options(-g)
+endif()
 
-    # PIC
-    "set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)\n"
+# Use LLD When Using Clang
+if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+    add_link_options("-fuse-ld=lld")
+endif()
 
-    # 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}")
+# PIC
+set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
 # 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)
@@ -158,9 +147,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\")
         add_compile_options(-Wno-array-bounds -Wno-stringop-overread)
     endif()
 endif()
-
-# Buld Dependencies
-add_subdirectory(dependencies)
+add_link_options(-Wl,--no-undefined)
+add_definitions(-D_GNU_SOURCE)
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 11)
 
 # Version
 set_property(
@@ -199,14 +189,5 @@ endif()
 
 # Install SDK
 if(BUILD_ARM_COMPONENTS)
-    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}")
+    install(EXPORT sdk DESTINATION "${MCPI_SDK_DIR}" EXPORT_LINK_INTERFACE_LIBRARIES)
 endif()

VERSION

@@ -1 +1 @@
-2.4.3
+2.4.1

cmake/embed-resource.cmake

@@ -1,12 +0,0 @@
-# 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,41 +1,48 @@
-# 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}")
+# Locations
+set(toolchain_dir "${CMAKE_CURRENT_LIST_DIR}/.prebuilt-armhf-toolchain")
+set(sysroot_dir "${CMAKE_CURRENT_BINARY_DIR}/bundled-armhf-sysroot")
 
 # 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)
+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
-set(sysroot_dir "${CMAKE_CURRENT_BINARY_DIR}/bundled-armhf-sysroot")
-if("${toolchain_dir}/bin/arm-none-linux-gnueabihf-gcc" IS_NEWER_THAN "${sysroot_dir}")
+if(NOT EXISTS "${sysroot_dir}")
     # Create Directory
-    file(REMOVE_RECURSE "${sysroot_dir}")
     file(MAKE_DIRECTORY "${sysroot_dir}")
 
     # Copy Files From Toolchain

cmake/util.cmake

@@ -8,19 +8,3 @@ 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,15 +11,26 @@ add_compile_options(-w)
 # Options
 set(PNG_TESTS FALSE CACHE BOOL "" FORCE)
 set(PNG_NO_STDIO FALSE CACHE BOOL "" FORCE)
-set(PNG_BUILD_ZLIB TRUE 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_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/zlib/src" "${CMAKE_CURRENT_BINARY_DIR}/zlib/src")
+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
 
-# Use Symbol Versioning
-set_target_properties(png12 PROPERTIES LINK_OPTIONS "LINKER:--version-script=${CMAKE_CURRENT_SOURCE_DIR}/libpng.vers")
+# 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)

dependencies/libpng/src

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

dependencies/zenity/src

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

docs/CHANGELOG.md

@@ -1,12 +1,5 @@
 # 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

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 -S 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 -S gtk3``
+    * Arch: ``sudo pacman -Sy gtk3``
   * OpenAL
     * Debian/Ubuntu: ``sudo apt install libopenal1``
-    * Arch: ``sudo pacman -S openal``
+    * Arch: ``sudo pacman -Sy 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 can be built using the modding SDK.
+This is an example of a mod that cane 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,8 +8,14 @@ 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()
-    embed_resource(launcher src/client/available-feature-flags)
-    target_sources(launcher PRIVATE src/client/launcher.cpp)
+    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)
 # RPath
@@ -38,7 +44,7 @@ else()
     file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/launcher.desktop"
         "Terminal=false\n"
         "StartupNotify=false\n"
-        "StartupWMClass=${MCPI_APP_ID}\n"
+        "StartupWMClass=${MCPI_APP_TITLE}\n"
     )
 endif()
 install(

launcher/dependencies/patchelf/src

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

launcher/src/bootstrap.c

@@ -53,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 Access: %s: %s", name, strerror(errno));
+                            WARN("Unable To Acesss: %s: %s", name, strerror(errno));
                             errno = 0;
                         }
                     }
@@ -146,7 +146,7 @@ void pre_bootstrap(int argc, char *argv[]) {
     // Configure PATH
     {
         // Add Library Directory
-        char *new_path = NULL;
+        char *new_path;
         safe_asprintf(&new_path, "%s/bin", binary_directory);
         // Add Existing PATH
         {
@@ -332,6 +332,7 @@ void bootstrap(int argc, char *argv[]) {
         // 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)
@@ -343,7 +344,7 @@ void bootstrap(int argc, char *argv[]) {
             {
                 char *value = getenv("LD_LIBRARY_PATH");
                 if (value != NULL && strlen(value) > 0) {
-                    string_append(&mcpi_ld_path, ":%s", value);
+                    string_append(&transitive_ld_path, ":%s", value);
                 }
             }
 

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 size_t available_feature_flags_len;
+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();
@@ -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_ID);
+    full_command.push_back(MCPI_APP_TITLE);
     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_ID,
+        "--name", MCPI_APP_TITLE,
         "--width", CRASH_REPORT_DIALOG_WIDTH,
         "--height", CRASH_REPORT_DIALOG_HEIGHT,
         "--text-info",

libreborn/include/libreborn/config.h.in

@@ -6,6 +6,5 @@
 #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@"

media-layer/core/dependencies/glfw/src

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

media-layer/core/gles/CMakeLists.txt

@@ -14,11 +14,6 @@ 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 int vertex_shader_length, const char *fragment_shader_text, const int fragment_shader_length) {
+static GLuint compile_shader(const char *vertex_shader_text, const char *fragment_shader_text) {
     // Vertex Shader
     const GLuint vertex_shader = real_glCreateShader()(REAL_GL_VERTEX_SHADER);
-    real_glShaderSource()(vertex_shader, 1, &vertex_shader_text, &vertex_shader_length);
+    real_glShaderSource()(vertex_shader, 1, &vertex_shader_text, NULL);
     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, &fragment_shader_length);
+    real_glShaderSource()(fragment_shader, 1, &fragment_shader_text, NULL);
     real_glCompileShader()(fragment_shader);
     log_shader(fragment_shader, "Fragment");
 
@@ -78,14 +78,70 @@ static GLuint compile_shader(const char *vertex_shader_text, const int vertex_sh
 }
 
 // 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) {
-        program = compile_shader((const char *) main_vsh, main_vsh_len, (const char *) main_fsh, main_fsh_len);
+        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);
     }
     return program;
 }

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

@@ -1,39 +0,0 @@
-#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

@@ -1,22 +0,0 @@
-#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,42 +155,34 @@ 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('\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) {
-        // 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]);
+        // Signs Only Accepts ASCII Characters
+        size_t in_size = 4; // 1 UTF-32LE Codepoint
+        size_t out_size = 4; // 4 ASCII Characters Max
+        size_t real_out_size = out_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("ASCII//TRANSLIT", "UTF-32LE");
+        if (cd != (iconv_t) -1) {
+            safe_iconv(cd, (char *) &codepoint, in_size, output, out_size);
+            iconv_close(cd);
+        } else {
+            IMPOSSIBLE();
+        }
+        for (size_t i = 0; output[i] != '\0'; i++) {
+            character_event(output[i]);
         }
         // Free
-        free(cp437_str);
+        free(output);
     }
 }
 
@@ -316,9 +308,6 @@ 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);

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 media-layer-core)
+    target_link_libraries(sign mods-headers reborn-patch symbols feature input)
 
     add_library(touch SHARED src/touch/touch.cpp)
     target_link_libraries(touch mods-headers reborn-patch symbols feature)

mods/src/bucket/bucket.cpp

@@ -32,14 +32,15 @@ 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;
-    } else if (item_instance->auxiliary == 0) {
+    }
+    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_lava + Tile_id_property_offset);
+            new_auxiliary = *(int32_t *) (*Tile_water + Tile_id_property_offset);
         }
         if (new_auxiliary != 0) {
             // Valid
@@ -107,9 +108,6 @@ 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_ID,
+        "--name", MCPI_APP_TITLE,
         "--entry",
         "--text", "Enter Chat Message:",
         NULL

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_ID,
+                "--name", MCPI_APP_TITLE,
                 "--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_ID,
+                "--name", MCPI_APP_TITLE,
                 "--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_ID,
+                "--name", MCPI_APP_TITLE,
                 "--entry",
                 "--only-numerical",
                 "--text", "Enter Seed (Leave Blank For Random):",

mods/src/sign/sign.cpp

@@ -1,6 +1,5 @@
 #include <vector>
 
-#include <SDL/SDL.h>
 #include <libreborn/libreborn.h>
 #include <symbols/minecraft.h>
 
@@ -9,16 +8,6 @@
 #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) {
@@ -30,10 +19,18 @@ 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) {
-    input.push_back(key);
+    if (is_valid_key(key)) {
+        input.push_back(key);
+    }
 }
 static void clear_input(__attribute__((unused)) unsigned char *minecraft) {
     input.clear();
@@ -44,11 +41,16 @@ static void TextEditScreen_updateEvents_injection(unsigned char *screen) {
     // Call Original Method
     (*Screen_updateEvents)(screen);
 
-    if (!*(bool *)(screen + Screen_passthrough_input_property_offset)) {
+    if (*(char *)(screen + 4) == '\0') {
         unsigned char *vtable = *(unsigned char **) screen;
         for (char key : input) {
-            // Handle Normal Key
-            (*(Screen_keyboardNewChar_t *) (vtable + Screen_keyboardNewChar_vtable_offset))(screen, key);
+            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);
+            }
         }
     }
     clear_input(NULL);
@@ -57,12 +59,10 @@ 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,22 +11,20 @@ build() {
     cd "build/${MODE}-${ARCH}"
 
     # Create Prefix
-    if [ -z "${DESTDIR+x}" ]; then
-        export DESTDIR="$(cd ../../; pwd)/out/${MODE}-${ARCH}"
-        rm -rf "${DESTDIR}"
-        mkdir -p "${DESTDIR}"
-    fi
+    local prefix="$(cd ../../; pwd)/out/${MODE}-${ARCH}"
+    rm -rf "${prefix}"
+    mkdir -p "${prefix}"
 
     # Build ARM Components
     cd arm
     cmake --build .
-    cmake --install .
+    DESTDIR="${prefix}" cmake --install .
     cd ../
 
     # Build Native Components
     cd native
     cmake --build .
-    cmake --install .
+    DESTDIR="${prefix}" cmake --install .
     cd ../
 
     # Exit

scripts/install-dependencies.sh

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

symbols/include/symbols/minecraft.h

@@ -18,9 +18,6 @@ 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
@@ -557,7 +554,6 @@ 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