Add Sign To Expanded Creative Inventory

CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT MCPI_HEADLESS_MODE)
 endif()
 
 # App ID
-set(DEFAULT_APP_ID "com.thebrokenrail.MCPIReborn")
+set(DEFAULT_APP_ID "com.thebrokenrail.MCPIRebornLegacy")
 if(MCPI_SERVER_MODE)
     string(APPEND DEFAULT_APP_ID "Server")
 else()
@@ -43,7 +43,7 @@ endif()
 set(MCPI_APP_ID "${DEFAULT_APP_ID}" CACHE STRING "App ID")
 
 # App Title
-set(DEFAULT_APP_TITLE "Minecraft: Pi Edition: Reborn")
+set(DEFAULT_APP_TITLE "Minecraft: Pi Edition: Reborn Legacy")
 if(MCPI_SERVER_MODE)
     string(APPEND DEFAULT_APP_TITLE " (Server)")
 else()
@@ -52,7 +52,7 @@ endif()
 set(MCPI_APP_TITLE "${DEFAULT_APP_TITLE}" CACHE STRING "App Title")
 
 # Specify Variant Name
-set(MCPI_VARIANT_NAME "minecraft-pi-reborn")
+set(MCPI_VARIANT_NAME "minecraft-pi-reborn-legacy")
 if(MCPI_SERVER_MODE)
     string(APPEND MCPI_VARIANT_NAME "-server")
 else()
@@ -200,7 +200,7 @@ if(BUILD_ARM_COMPONENTS)
         # Compile Flags
         "${COMPILE_FLAGS_SETUP}\n"
         # Log
-        "message(STATUS \"Using Reborn SDK v${MCPI_VERSION}\")\n"
+        "message(STATUS \"Using Reborn Legacy SDK v${MCPI_VERSION}\")\n"
         # Include Targets
         "include(\"\${CMAKE_CURRENT_LIST_DIR}/sdk-targets.cmake\")\n"
     )

Dockerfile

@@ -16,4 +16,4 @@ WORKDIR /data
 
 # Setup Entrypoint
 ENTRYPOINT ["/usr/bin/tini", "--"]
-CMD ["/app/usr/bin/minecraft-pi-reborn-server"]
+CMD ["/app/usr/bin/minecraft-pi-reborn-legacy-server"]

Jenkinsfile

@@ -24,11 +24,11 @@ pipeline {
                         sh 'apt-get update && apt-get install -y docker.io'
                         sh 'rm -rf ./out/server-amd64'
                         sh './scripts/build.sh server amd64'
-                        sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-server .'
+                        sh 'docker build --no-cache --tag thebrokenrail/minecraft-pi-reborn-legacy-server .'
                         withCredentials([usernamePassword(credentialsId: 'docker_hub_login', usernameVariable: 'DOCKER_HUB_USERNAME', passwordVariable: 'DOCKER_HUB_PASSWORD')]) {
                             sh 'docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"'
                         }
-                        sh 'docker push thebrokenrail/minecraft-pi-reborn-server'
+                        sh 'docker push thebrokenrail/minecraft-pi-reborn-legacy-server'
                     }
                 }
             }

README.md

@@ -2,7 +2,7 @@
     <img alt="Start Screen" src="images/start.png">
 </p>
 
-# Minecraft: Pi Edition: Reborn
+# Minecraft: Pi Edition: Reborn Legacy
 Minecraft: Pi Edition Modding Project
 
 ## Documentation

dependencies/minecraft-pi/CMakeLists.txt

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

docs/DEDICATED_SERVER.md

@@ -1,15 +1,15 @@
 # Dedicated Server
 The dedicated server is a version of Minecraft: Pi Edition modified to run in a headless environment. It loads settings from a ``server.properties`` file.
 
-This server is also compatible with MCPE Alpha v0.6.1[^1].
+This server is also compatible with MCPE Alpha v0.5.0[^1].
 
 ## Setup
 
 ### Debian Package
-To use, install and run ``minecraft-pi-reborn-server``. It will generate the world and ``server.properties`` in the current directory.
+To use, install and run ``minecraft-pi-reborn-legacy-server``. It will generate the world and ``server.properties`` in the current directory.
 
 ### Docker Image
-An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-server).
+An official Docker image is also provided: [thebrokenrail/minecraft-pi-reborn-legacy-server](https://hub.docker.com/r/thebrokenrail/minecraft-pi-reborn-legacy-server).
 
 ## Server Limitations
 * Player data is not saved because of limitations with MCPE LAN worlds

docs/INSTALL.md

@@ -1,7 +1,7 @@
 # Installation
 
 ## AppImage
-Download packages [here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/master/lastSuccessfulBuild/artifact/out/).
+Download packages [here](https://jenkins.thebrokenrail.com/job/minecraft-pi-reborn/job/legacy/lastSuccessfulBuild/artifact/out/).
 
 ### System Requirements
 * Debian Buster/Ubuntu 18.04 Or Higher

docs/SOUND.md

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

example-mods/README.md

@@ -8,12 +8,12 @@ This is an example of a mod that cane be built using the modding SDK.
 ## The SDK
 The modding SDK is a collection of exported CMake targets that allows anyone to create their own MCPI mod!
 
-The SDK is copied to ``~/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake`` whenever MCPI-Reborn is started.
+The SDK is copied to ``~/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake`` whenever MCPI-Reborn is started.
 
 ## How do I use this?
 ```sh
 mkdir build
 cd build
 cmake ..
-cp libexpanded-creative.so ~/.minecraft-pi/mods
+cp libexpanded-creative.so ~/.minecraft-pi/legacy-mods
 ```

example-mods/chat-commands/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 project(chat-commands)
 
 # Include SDK
-include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake")
+include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
 
 # Build
 add_library(chat-commands SHARED chat-commands.cpp)

example-mods/expanded-creative/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 project(expanded-creative)
 
 # Include SDK
-include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake")
+include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
 
 # Build
 add_library(expanded-creative SHARED expanded-creative.cpp)

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

@@ -378,146 +378,6 @@ static void Inventory_setupDefault_FillingContainer_addItem_call_injection(unsig
     bread_instance->id = 297;
     (*FillingContainer_addItem)(filling_container, bread_instance);
 
-    ItemInstance *diamondHelm_instance = new ItemInstance;
-    ALLOC_CHECK(diamondHelm_instance);
-    diamondHelm_instance->count = 255;
-    diamondHelm_instance->auxiliary = 0;
-    diamondHelm_instance->id = 310;
-    (*FillingContainer_addItem)(filling_container, diamondHelm_instance);
-
-    ItemInstance *diamondChest_instance = new ItemInstance;
-    ALLOC_CHECK(diamondChest_instance);
-    diamondChest_instance->count = 255;
-    diamondChest_instance->auxiliary = 0;
-    diamondChest_instance->id = 311;
-    (*FillingContainer_addItem)(filling_container, diamondChest_instance);
-
-    ItemInstance *diamondLeg_instance = new ItemInstance;
-    ALLOC_CHECK(diamondLeg_instance);
-    diamondLeg_instance->count = 255;
-    diamondLeg_instance->auxiliary = 0;
-    diamondLeg_instance->id = 312;
-    (*FillingContainer_addItem)(filling_container, diamondLeg_instance);
-
-    ItemInstance *diamondBoot_instance = new ItemInstance;
-    ALLOC_CHECK(diamondBoot_instance);
-    diamondBoot_instance->count = 255;
-    diamondBoot_instance->auxiliary = 0;
-    diamondBoot_instance->id = 313;
-    (*FillingContainer_addItem)(filling_container, diamondBoot_instance);
-
-    ItemInstance *leatherCap_instance = new ItemInstance;
-    ALLOC_CHECK(leatherCap_instance);
-    leatherCap_instance->count = 255;
-    leatherCap_instance->auxiliary = 0;
-    leatherCap_instance->id = 298;
-    (*FillingContainer_addItem)(filling_container, leatherCap_instance);
-
-    ItemInstance *leatherShirt_instance = new ItemInstance;
-    ALLOC_CHECK(leatherShirt_instance);
-    leatherShirt_instance->count = 255;
-    leatherShirt_instance->auxiliary = 0;
-    leatherShirt_instance->id = 299;
-    (*FillingContainer_addItem)(filling_container, leatherShirt_instance);
-
-    ItemInstance *leatherPants_instance = new ItemInstance;
-    ALLOC_CHECK(leatherPants_instance);
-    leatherPants_instance->count = 255;
-    leatherPants_instance->auxiliary = 0;
-    leatherPants_instance->id = 300;
-    (*FillingContainer_addItem)(filling_container, leatherPants_instance);
-
-    ItemInstance *leatherBoots_instance = new ItemInstance;
-    ALLOC_CHECK(leatherBoots_instance);
-    leatherBoots_instance->count = 255;
-    leatherBoots_instance->auxiliary = 0;
-    leatherBoots_instance->id = 301;
-    (*FillingContainer_addItem)(filling_container, leatherBoots_instance);
-
-    ItemInstance *chainHelm_instance = new ItemInstance;
-    ALLOC_CHECK(chainHelm_instance);
-    chainHelm_instance->count = 255;
-    chainHelm_instance->auxiliary = 0;
-    chainHelm_instance->id = 302;
-    (*FillingContainer_addItem)(filling_container, chainHelm_instance);
-
-    ItemInstance *chainShirt_instance = new ItemInstance;
-    ALLOC_CHECK(chainShirt_instance);
-    chainShirt_instance->count = 255;
-    chainShirt_instance->auxiliary = 0;
-    chainShirt_instance->id = 303;
-    (*FillingContainer_addItem)(filling_container, chainShirt_instance);
-
-    ItemInstance *chainLegs_instance = new ItemInstance;
-    ALLOC_CHECK(chainLegs_instance);
-    chainLegs_instance->count = 255;
-    chainLegs_instance->auxiliary = 0;
-    chainLegs_instance->id = 304;
-    (*FillingContainer_addItem)(filling_container, chainLegs_instance);
-
-    ItemInstance *chainBoots_instance = new ItemInstance;
-    ALLOC_CHECK(chainBoots_instance);
-    chainBoots_instance->count = 255;
-    chainBoots_instance->auxiliary = 0;
-    chainBoots_instance->id = 305;
-    (*FillingContainer_addItem)(filling_container, chainBoots_instance);
-
-    ItemInstance *goldHelm_instance = new ItemInstance;
-    ALLOC_CHECK(goldHelm_instance);
-    goldHelm_instance->count = 255;
-    goldHelm_instance->auxiliary = 0;
-    goldHelm_instance->id = 314;
-    (*FillingContainer_addItem)(filling_container, goldHelm_instance);
-
-    ItemInstance *goldChest_instance = new ItemInstance;
-    ALLOC_CHECK(goldChest_instance);
-    goldChest_instance->count = 255;
-    goldChest_instance->auxiliary = 0;
-    goldChest_instance->id = 315;
-    (*FillingContainer_addItem)(filling_container, goldChest_instance);
-
-    ItemInstance *goldLegs_instance = new ItemInstance;
-    ALLOC_CHECK(goldLegs_instance);
-    goldLegs_instance->count = 255;
-    goldLegs_instance->auxiliary = 0;
-    goldLegs_instance->id = 316;
-    (*FillingContainer_addItem)(filling_container, goldLegs_instance);
-
-    ItemInstance *goldBoots_instance = new ItemInstance;
-    ALLOC_CHECK(goldBoots_instance);
-    goldBoots_instance->count = 255;
-    goldBoots_instance->auxiliary = 0;
-    goldBoots_instance->id = 317;
-    (*FillingContainer_addItem)(filling_container, goldBoots_instance);
-
-    ItemInstance *ironHelm_instance = new ItemInstance;
-    ALLOC_CHECK(ironHelm_instance);
-    ironHelm_instance->count = 255;
-    ironHelm_instance->auxiliary = 0;
-    ironHelm_instance->id = 306;
-    (*FillingContainer_addItem)(filling_container, ironHelm_instance);
-
-    ItemInstance *ironChest_instance = new ItemInstance;
-    ALLOC_CHECK(ironChest_instance);
-    ironChest_instance->count = 255;
-    ironChest_instance->auxiliary = 0;
-    ironChest_instance->id = 307;
-    (*FillingContainer_addItem)(filling_container, ironChest_instance);
-
-    ItemInstance *ironLegs_instance = new ItemInstance;
-    ALLOC_CHECK(ironLegs_instance);
-    ironLegs_instance->count = 255;
-    ironLegs_instance->auxiliary = 0;
-    ironLegs_instance->id = 308;
-    (*FillingContainer_addItem)(filling_container, ironLegs_instance);
-
-    ItemInstance *ironBoots_instance = new ItemInstance;
-    ALLOC_CHECK(ironBoots_instance);
-    ironBoots_instance->count = 255;
-    ironBoots_instance->auxiliary = 0;
-    ironBoots_instance->id = 309;
-    (*FillingContainer_addItem)(filling_container, ironBoots_instance);
-
     ItemInstance *flint2_instance = new ItemInstance;
     ALLOC_CHECK(flint2_instance);
     flint2_instance->count = 255;

example-mods/recipes/CMakeLists.txt

@@ -8,7 +8,7 @@ set(CMAKE_CXX_COMPILER arm-linux-gnueabihf-g++)
 project(recipes)
 
 # Include SDK
-include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-client/sdk/sdk.cmake")
+include("$ENV{HOME}/.minecraft-pi/sdk/lib/minecraft-pi-reborn-legacy-client/sdk/sdk.cmake")
 
 # Build
 add_library(recipes SHARED recipes.cpp)

launcher/src/bootstrap.c

@@ -109,7 +109,7 @@ void pre_bootstrap(int argc, char *argv[]) {
     for (int i = 1; i < argc; i++) {
         if (strcmp(argv[i], "--version") == 0 || strcmp(argv[i], "-v") == 0) {
             // Print
-            printf("Reborn v%s\n", MCPI_VERSION);
+            printf("Reborn Legacy v%s\n", MCPI_VERSION);
             fflush(stdout);
             exit(EXIT_SUCCESS);
         }
@@ -388,7 +388,7 @@ void bootstrap(int argc, char *argv[]) {
             {
                 // Get Mods Folder
                 char *mods_folder = NULL;
-                safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/mods/", getenv("HOME"));
+                safe_asprintf(&mods_folder, "%s" HOME_SUBDIRECTORY_FOR_GAME_DATA "/legacy-mods/", getenv("HOME"));
                 // Load Mods From ./mods
                 load(&preload, mods_folder);
                 // Free Mods Folder

launcher/src/client/available-feature-flags

@@ -1,16 +1,17 @@
 FALSE Full Touch GUI
-TRUE Fix Bow & Arrow
 TRUE Fix Attacking
 FALSE Force Mob Spawning
+TRUE Fancy Graphics
 TRUE Disable Autojump By Default
 TRUE Display Nametags By Default
-TRUE Fix Sign Placement
 TRUE Show Block Outlines
 FALSE Expand Creative Inventory
 FALSE Remove Creative Mode Restrictions
+FALSE Peaceful Mode
 TRUE Animated Water
 TRUE Remove Invalid Item Background
 TRUE Disable "gui_blocks" Atlas
+TRUE Smooth Lighting
 FALSE 3D Anaglyph
 TRUE Fix Camera Rendering
 TRUE Implement Chat
@@ -28,9 +29,9 @@ TRUE Implement Sound Engine
 TRUE Close Current Screen On Death
 FALSE Disable Raw Mouse Motion (Not Recommended)
 TRUE Fix Furnace Not Checking Item Auxiliary
+FALSE Disable Hosting LAN Worlds
 TRUE Improved Cursor Rendering
 TRUE Disable V-Sync
-TRUE Fix Options Screen
 TRUE Force Touch GUI Inventory
 TRUE Fix Pause Menu
 TRUE Improved Title Background

launcher/src/crash-report.c

@@ -26,7 +26,7 @@ static void show_report(const char *log_filename) {
         "--width", CRASH_REPORT_DIALOG_WIDTH,
         "--height", CRASH_REPORT_DIALOG_HEIGHT,
         "--text-info",
-        "--text", "Minecraft: Pi Edition: Reborn has crashed!\n\nNeed help? Consider asking on the <a href=\"https://discord.com/invite/aDqejQGMMy\">Discord server</a>!",
+        "--text", "Minecraft: Pi Edition: Reborn Legacy has crashed!\n\nNeed help? Consider asking on the <a href=\"https://discord.com/invite/aDqejQGMMy\">Discord server</a>!",
         "--filename", log_filename,
         "--no-wrap",
         "--font", "Monospace",

mods/CMakeLists.txt

@@ -20,7 +20,7 @@ if(NOT MCPI_HEADLESS_MODE)
     target_link_libraries(compat screenshot)
 endif()
 if(NOT MCPI_SERVER_MODE)
-    target_link_libraries(compat input sign chat home dl)
+    target_link_libraries(compat input chat home dl)
 endif()
 
 add_library(readdir SHARED src/readdir/readdir.c)
@@ -62,12 +62,9 @@ else()
         target_link_libraries(camera screenshot)
     endif()
 
-    add_library(input SHARED src/input/input.cpp src/input/bow.c src/input/attack.c src/input/toggle.c src/input/misc.c src/input/drop.cpp)
+    add_library(input SHARED src/input/input.cpp src/input/attack.c src/input/toggle.c src/input/misc.c src/input/drop.cpp)
     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)
-
     add_library(touch SHARED src/touch/touch.cpp)
     target_link_libraries(touch mods-headers reborn-patch symbols feature)
 
@@ -90,8 +87,8 @@ target_link_libraries(death mods-headers reborn-patch symbols feature)
 add_library(misc SHARED src/misc/misc.c src/misc/misc.cpp src/misc/logging.cpp src/misc/api.cpp)
 target_link_libraries(misc mods-headers reborn-patch symbols media-layer-core feature)
 
-add_library(options SHARED src/options/options.c src/options/options.cpp)
-target_link_libraries(options mods-headers reborn-patch symbols feature home)
+add_library(options SHARED src/options/options.c)
+target_link_libraries(options mods-headers reborn-patch symbols feature)
 
 add_library(bucket SHARED src/bucket/bucket.cpp)
 target_link_libraries(bucket mods-headers reborn-patch symbols feature misc)
@@ -112,7 +109,7 @@ target_link_libraries(init mods-headers reborn-util compat game-mode misc death
 if(MCPI_SERVER_MODE)
     target_link_libraries(init server)
 else()
-    target_link_libraries(init multiplayer sound camera input sign touch textures atlas benchmark)
+    target_link_libraries(init multiplayer sound camera input touch textures atlas benchmark)
 endif()
 
 ## Install Mods
@@ -120,7 +117,7 @@ set(MODS_TO_INSTALL init compat readdir feature game-mode misc override death op
 if(MCPI_SERVER_MODE)
     list(APPEND MODS_TO_INSTALL server)
 else()
-    list(APPEND MODS_TO_INSTALL multiplayer sound camera input sign touch textures atlas benchmark)
+    list(APPEND MODS_TO_INSTALL multiplayer sound camera input touch textures atlas benchmark)
 endif()
 if(NOT MCPI_HEADLESS_MODE)
     list(APPEND MODS_TO_INSTALL screenshot)

mods/include/mods/init/init.h

@@ -15,7 +15,6 @@ void init_server();
 void init_multiplayer();
 void init_sound();
 void init_input();
-void init_sign();
 void init_creative();
 void init_camera();
 void init_touch();

mods/include/mods/input/input.h

@@ -7,7 +7,6 @@ extern "C" {
 typedef void (*input_tick_function_t)(unsigned char *minecraft);
 void input_run_on_tick(input_tick_function_t function);
 
-void input_set_is_right_click(int val);
 void input_hide_gui();
 void input_third_person();
 int input_back();

mods/include/mods/misc/misc.h

@@ -15,6 +15,7 @@ void misc_run_on_recipes_setup(misc_update_function_t function); // obj == Recip
 void misc_run_on_furnace_recipes_setup(misc_update_function_t function); // obj == FurnaceRecipes *
 void misc_run_on_creative_inventory_setup(misc_update_function_t function); // obj == FillingContainer *
 void misc_run_on_tiles_setup(misc_update_function_t function); // obj == NULL
+void misc_run_on_internal_after_tiles_setup(misc_update_function_t function); // obj == NULL
 void misc_run_on_items_setup(misc_update_function_t function); // obj == NULL
 
 void Level_saveLevelData_injection(unsigned char *level);

mods/include/mods/sign/sign.h

@@ -1,11 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void sign_key_press(char key);
-
-#ifdef __cplusplus
-}
-#endif

mods/src/atlas/atlas.cpp

@@ -57,9 +57,9 @@ static void Tesselator_color_injection(unsigned char *tesselator, int32_t r, int
     // Call Original Method
     (*Tesselator_color)(tesselator, r, g, b, a);
 }
-static void Tesselator_begin_injection(unsigned char *tesselator, int32_t mode) {
+static void Tesselator_begin_injection(unsigned char *tesselator) {
     // Call Original Method
-    (*Tesselator_begin)(tesselator, mode);
+    (*Tesselator_begin)(tesselator);
 
     // Fix Furnace UI
     if (item_color_fix_mode != 0) {
@@ -96,14 +96,14 @@ void init_atlas() {
 
     // Disable The gui_blocks Atlas Which Contains Pre-Rendered Textures For Blocks In The Inventory
     if (feature_has("Disable \"gui_blocks\" Atlas", server_disabled)) {
-        unsigned char disable_gui_blocks_atlas_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop"
-        patch((void *) 0x63c2c, disable_gui_blocks_atlas_patch);
+        unsigned char disable_gui_blocks_atlas_patch[4] = {0x45, 0x00, 0x00, 0xea}; // "b 0x7f740"
+        patch((void *) 0x7f624, disable_gui_blocks_atlas_patch);
         // Fix Grass And Leaves Inventory Rendering When The gui_blocks Atlas Is Disabled
         overwrite_calls((void *) ItemRenderer_renderGuiItemCorrect, (void *) ItemRenderer_renderGuiItemCorrect_injection);
         // Fix Furnace UI
         overwrite_calls((void *) Tesselator_begin, (void *) Tesselator_begin_injection);
         overwrite_calls((void *) Tesselator_color, (void *) Tesselator_color_injection);
-        overwrite_call((void *) 0x32324, (void *) FurnaceScreen_render_ItemRenderer_renderGuiItem_one_injection);
-        overwrite_call((void *) 0x1e21c, (void *) InventoryPane_renderBatch_Tesselator_color_injection);
+        overwrite_call((void *) 0x3bff4, (void *) FurnaceScreen_render_ItemRenderer_renderGuiItem_one_injection);
+        overwrite_call((void *) 0x23c0c, (void *) InventoryPane_renderBatch_Tesselator_color_injection);
     }
 }

mods/src/bucket/bucket.cpp

@@ -147,7 +147,7 @@ static unsigned char *create_bucket(int32_t id, int32_t texture_x, int32_t textu
     // Construct
     unsigned char *item = (unsigned char *) ::operator new(ITEM_SIZE);
     ALLOC_CHECK(item);
-    (*Item)(item, id);
+    new ((std::string *) (item + Item_description_id_property_offset)) std::string;
 
     // Set VTable
     *(unsigned char **) item = get_bucket_vtable();
@@ -160,10 +160,16 @@ static unsigned char *create_bucket(int32_t id, int32_t texture_x, int32_t textu
     // Setup
     (*Item_setIcon)(item, texture_x, texture_y);
     (*Item_setDescriptionId)(item, name);
+    *(int32_t *) (item + Item_id_property_offset) = id + 0x100;
     *(int32_t *) (item + Item_is_stacked_by_data_property_offset) = 1;
-    *(int32_t *) (item + Item_category_property_offset) = 2;
+    *(int32_t *) (item + Item_is_hand_equipped_property_offset) = 0;
+    *(int32_t *) (item + Item_category_property_offset) = 1;
     *(int32_t *) (item + Item_max_damage_property_offset) = 0;
-    *(int32_t *) (item + Item_max_stack_size_property_offset) = 1;
+    *(int32_t *) (item + Item_max_stack_size_property_offset) = 16;
+    *(unsigned char **) (item + Item_crafting_remaining_item_property_offset) = NULL;
+
+    // Register
+    Item_items[*(int32_t *) (item + Item_id_property_offset)] = item;
 
     // Return
     return item;
@@ -174,9 +180,9 @@ static void Item_initItems_injection(__attribute__((unused)) unsigned char *null
 
 // Change Max Stack Size Based On Auxiliary
 static int32_t ItemInstance_getMaxStackSize_injection(ItemInstance *item_instance) {
-    if (item_instance->id == *(int32_t *) (bucket + Item_id_property_offset) && item_instance->auxiliary == 0) {
+    if (item_instance->id == *(int32_t *) (bucket + Item_id_property_offset) && item_instance->auxiliary != 0) {
         // Custom Value
-        return 16;
+        return 1;
     } else {
         // Call Original Method
         return (*ItemInstance_getMaxStackSize)(item_instance);
@@ -300,7 +306,7 @@ void init_bucket() {
         // Creative Inventory
         misc_run_on_creative_inventory_setup(Inventory_setupDefault_FillingContainer_addItem_call_injection);
         // Make Liquids Selectable
-        overwrite_call((void *) 0x7f5b0, (void *) Mob_pick_Level_clip_injection);
+        overwrite_call((void *) 0xab594, (void *) Mob_pick_Level_clip_injection);
         misc_run_on_tick(handle_tick);
         // Prevent Breaking Liquid
         overwrite_calls((void *) Minecraft_handleMouseDown, (void *) Minecraft_handleMouseDown_injection);
@@ -308,6 +314,6 @@ void init_bucket() {
         misc_run_on_recipes_setup(Recipes_injection);
         // Custom Furnace Fuel
         overwrite_calls((void *) FurnaceTileEntity_getBurnDuration, (void *) FurnaceTileEntity_getBurnDuration_injection);
-        overwrite_call((void *) 0xd351c, (void *) FurnaceTileEntity_tick_ItemInstance_setNull_injection);
+        overwrite_call((void *) 0x14048c, (void *) FurnaceTileEntity_tick_ItemInstance_setNull_injection);
     }
 }

mods/src/camera/camera.cpp

@@ -43,6 +43,6 @@ void init_camera() {
         // Enable TripodCameraRenderer
         overwrite_calls((void *) EntityRenderDispatcher, (void *) EntityRenderDispatcher_injection);
         // Display Smoke From TripodCamera Higher
-        overwrite_call((void *) 0x87dc4, (void *) TripodCamera_tick_Level_addParticle_call_injection);
+        overwrite_call((void *) 0xbcf18, (void *) TripodCamera_tick_Level_addParticle_call_injection);
     }
 }

mods/src/chat/chat.cpp

@@ -87,7 +87,8 @@ static void CommandServer_parse_CommandServer_dispatchPacket_injection(unsigned
 
 // Handle ChatPacket Server-Side
 static void ServerSideNetworkHandler_handle_ChatPacket_injection(unsigned char *server_side_network_handler, RakNet_RakNetGUID *rak_net_guid, unsigned char *chat_packet) {
-    unsigned char *player = (*ServerSideNetworkHandler_getPlayer)(server_side_network_handler, rak_net_guid);
+    unsigned char *level = *(unsigned char **) (server_side_network_handler + ServerSideNetworkHandler_level_property_offset);
+    unsigned char *player = (*NetEventCallback_findPlayer)(server_side_network_handler, level, rak_net_guid);
     if (player != NULL) {
         char *username = *(char **) (player + Player_username_property_offset);
         char *message = *(char **) (chat_packet + ChatPacket_message_property_offset);
@@ -138,9 +139,9 @@ void init_chat() {
     if (_chat_enabled) {
         // Disable Original ChatPacket Loopback
         unsigned char disable_chat_packet_loopback_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop"
-        patch((void *) 0x6b490, disable_chat_packet_loopback_patch);
+        patch((void *) 0x8c118, disable_chat_packet_loopback_patch);
         // Manually Send (And Loopback) ChatPacket
-        overwrite_call((void *) 0x6b518, (void *) CommandServer_parse_CommandServer_dispatchPacket_injection);
+        overwrite_call((void *) 0x8c1a4, (void *) CommandServer_parse_CommandServer_dispatchPacket_injection);
         // Re-Broadcast ChatPacket
         patch_address(ServerSideNetworkHandler_handle_ChatPacket_vtable_addr, (void *) ServerSideNetworkHandler_handle_ChatPacket_injection);
         // Send Messages On Input Tick

mods/src/compat/bcm_host.c

@@ -8,11 +8,11 @@ static void do_nothing() {
 // Patch bcm_host Calls
 __attribute__((constructor)) static void patch_bcm_host_calls() {
     // Disable bcm_host Calls
-    overwrite_call((void *) 0xdfec, (void *) do_nothing); // bcm_host_init
-    overwrite_call((void *) 0x12418, (void *) do_nothing); // bcm_host_deinit
-    overwrite_call((void *) 0x125a8, (void *) do_nothing); // graphics_get_display_size
-    overwrite_call((void *) 0x125dc, (void *) do_nothing); // vc_dispmanx_display_open
-    overwrite_call((void *) 0x125e8, (void *) do_nothing); // vc_dispmanx_update_start
-    overwrite_call((void *) 0x12618, (void *) do_nothing); // vc_dispmanx_element_add
-    overwrite_call((void *) 0x12624, (void *) do_nothing); // vc_dispmanx_update_submit_sync
+    overwrite_call((void *) 0xdbe8, (void *) do_nothing); // bcm_host_init
+    overwrite_call((void *) 0x11c54, (void *) do_nothing); // bcm_host_deinit
+    overwrite_call((void *) 0x11de4, (void *) do_nothing); // graphics_get_display_size
+    overwrite_call((void *) 0x11e18, (void *) do_nothing); // vc_dispmanx_display_open
+    overwrite_call((void *) 0x11e28, (void *) do_nothing); // vc_dispmanx_update_start
+    overwrite_call((void *) 0x11e58, (void *) do_nothing); // vc_dispmanx_element_add
+    overwrite_call((void *) 0x11e64, (void *) do_nothing); // vc_dispmanx_update_submit_sync
 }

mods/src/compat/compat.c

@@ -29,7 +29,6 @@ HOOK(SDL_ShowCursor, int, (int toggle)) {
 #include <media-layer/core.h>
 
 #include <mods/input/input.h>
-#include <mods/sign/sign.h>
 #include <mods/chat/chat.h>
 #include <mods/home/home.h>
 
@@ -89,20 +88,12 @@ HOOK(SDL_PollEvent, int, (SDL_Event *event)) {
             }
             case SDL_MOUSEBUTTONDOWN:
             case SDL_MOUSEBUTTONUP: {
-                // Track Right-Click State
-                if (event->button.button == SDL_BUTTON_RIGHT) {
-                    input_set_is_right_click(event->button.state != SDL_RELEASED);
-                } else if (event->button.button == SDL_BUTTON_LEFT) {
+                // Track Left-Click State
+                if (event->button.button == SDL_BUTTON_LEFT) {
                     input_set_is_left_click(event->button.state != SDL_RELEASED);
                 }
                 break;
             }
-            case SDL_USEREVENT: {
-                // SDL_UserEvent Is Never Used In MCPI, So It Is Repurposed For Character Events
-                sign_key_press((char) event->user.code);
-                handled = 1;
-                break;
-            }
         }
 
         if (handled) {

mods/src/compat/egl.c

@@ -23,17 +23,17 @@ static EGLBoolean eglSwapBuffers_injection(__attribute__((unused)) EGLDisplay di
 __attribute__((constructor)) static void patch_egl_calls() {
     // Disable EGL Calls
     unsigned char nop_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop"
-    patch((void *) 0x1250c, nop_patch); // eglTerminate
-    patch((void *) 0x12580, nop_patch); // eglBindAPI
-    overwrite_call((void *) 0x12638, (void *) eglCreateWindowSurface_injection); // eglCreateWindowSurface
-    patch((void *) 0x12578, nop_patch); // eglChooseConfig
-    patch((void *) 0x1255c, nop_patch); // eglInitialize
-    patch((void *) 0x124f0, nop_patch); // eglMakeCurrent #1
-    patch((void *) 0x12654, nop_patch); // eglMakeCurrent #2
-    overwrite_call((void *) 0x124dc, (void *) eglSwapBuffers_injection); // eglSwapBuffers #1
-    overwrite_call((void *) 0x14b6c, (void *) eglSwapBuffers_injection); // eglSwapBuffers #2
-    overwrite_call((void *) 0x1254c, (void *) eglGetDisplay_injection); // eglGetDisplay
-    patch((void *) 0x124fc, nop_patch); // eglDestroySurface #1
-    patch((void *) 0x12504, nop_patch); // eglDestroySurface #2
-    overwrite_call((void *) 0x12594, (void *) eglCreateContext_injection); // eglCreateContext
+    patch((void *) 0x11d3c, nop_patch); // eglTerminate
+    patch((void *) 0x11dbc, nop_patch); // eglBindAPI
+    overwrite_call((void *) 0x11e78, (void *) eglCreateWindowSurface_injection); // eglCreateWindowSurface
+    patch((void *) 0x11db4, nop_patch); // eglChooseConfig
+    patch((void *) 0x11d98, nop_patch); // eglInitialize
+    patch((void *) 0x11d20, nop_patch); // eglMakeCurrent #1
+    patch((void *) 0x11e90, nop_patch); // eglMakeCurrent #2
+    overwrite_call((void *) 0x11d0c, (void *) eglSwapBuffers_injection); // eglSwapBuffers #1
+    overwrite_call((void *) 0x14ce4, (void *) eglSwapBuffers_injection); // eglSwapBuffers #2
+    overwrite_call((void *) 0x11d7c, (void *) eglGetDisplay_injection); // eglGetDisplay
+    patch((void *) 0x11d2c, nop_patch); // eglDestroySurface #1
+    patch((void *) 0x11d34, nop_patch); // eglDestroySurface #2
+    overwrite_call((void *) 0x11dd0, (void *) eglCreateContext_injection); // eglCreateContext
 }

mods/src/compat/x11.c

@@ -23,6 +23,6 @@ static int XGetWindowAttributes_injection(__attribute__((unused)) void *display,
 // Patch X11 Calls
 __attribute__((constructor)) static void patch_x11_calls() {
     // Disable X11 Calls
-    overwrite_call((void *) 0x132a4, (void *) XGetWindowAttributes_injection); // XGetWindowAttributes
-    overwrite_call((void *) 0x132d4, (void *) XTranslateCoordinates_injection); // XTranslateCoordinates
+    overwrite_call((void *) 0x12f2c, (void *) XGetWindowAttributes_injection); // XGetWindowAttributes
+    overwrite_call((void *) 0x12f64, (void *) XTranslateCoordinates_injection); // XTranslateCoordinates
 }

mods/src/creative/creative.cpp

@@ -1,3 +1,5 @@
+#include <vector>
+
 #include <libreborn/libreborn.h>
 #include <symbols/minecraft.h>
 
@@ -18,6 +20,7 @@ static void inventory_add_item(unsigned char *inventory, unsigned char *item, bo
 // Expand Creative Inventory
 static void Inventory_setupDefault_FillingContainer_addItem_call_injection(unsigned char *filling_container) {
     // Add Items
+    inventory_add_item(filling_container, *Item_sign, false);
     inventory_add_item(filling_container, *Item_flintAndSteel, false);
     inventory_add_item(filling_container, *Item_snowball, false);
     inventory_add_item(filling_container, *Item_egg, false);
@@ -37,7 +40,6 @@ static void Inventory_setupDefault_FillingContainer_addItem_call_injection(unsig
     // Add Tiles
     inventory_add_item(filling_container, *Tile_water, true);
     inventory_add_item(filling_container, *Tile_lava, true);
-    inventory_add_item(filling_container, *Tile_calmWater, true);
     inventory_add_item(filling_container, *Tile_calmLava, true);
     inventory_add_item(filling_container, *Tile_glowingObsidian, true);
     inventory_add_item(filling_container, *Tile_web, true);
@@ -79,21 +81,37 @@ static void Inventory_setupDefault_FillingContainer_addItem_call_injection(unsig
 }
 #endif
 
-// Hook Specific TileItem Constructor
-static unsigned char *Tile_initTiles_TileItem_injection(unsigned char *tile_item, int32_t id) {
+// Store All Default TileItems
+static std::vector<unsigned char *> &get_default_tile_items() {
+    static std::vector<unsigned char *> tile_items;
+    return tile_items;
+}
+// Hook Specific TileItem :;operator new
+static unsigned char *Tile_initTiles_operator_new_injection(__attribute__((unused)) uint32_t size) {
     // Call Original Method
-    unsigned char *ret = (*TileItem)(tile_item, id);
+    unsigned char *ret = (unsigned char *) ::operator new(AUX_DATA_TILE_ITEM_SIZE);
 
-    // Switch VTable
-    *(unsigned char **) tile_item = AuxDataTileItem_vtable;
-    // Configure Item
-    *(bool *) (tile_item + Item_is_stacked_by_data_property_offset) = true;
-    *(int32_t *) (tile_item + Item_max_damage_property_offset) = 0;
-    *(unsigned char **) (tile_item + AuxDataTileItem_icon_tile_property_offset) = Tile_tiles[id + 0x100];
+    // Store
+    get_default_tile_items().push_back(ret);
 
     // Return
     return ret;
 }
+// Modify All Default TileItems
+static void Tile_initTiles_injection(__attribute__((unused)) unsigned char *null) {
+    // Loop
+    for (unsigned char *tile_item : get_default_tile_items()) {
+        // Get ID
+        int32_t id = *(int32_t *) (tile_item + Item_id_property_offset);
+        // Switch VTable
+        *(unsigned char **) tile_item = AuxDataTileItem_vtable;
+        // Configure Item
+        *(bool *) (tile_item + Item_is_stacked_by_data_property_offset) = true;
+        *(int32_t *) (tile_item + Item_max_damage_property_offset) = 0;
+        *(unsigned char **) (tile_item + AuxDataTileItem_icon_tile_property_offset) = Tile_tiles[id];
+    }
+    get_default_tile_items().clear();
+}
 
 // Check Restriction Status
 static int is_restricted = 1;
@@ -112,11 +130,10 @@ void init_creative() {
         // Use AuxDataTileItem by default instead of TileItem, so tiles in the Creative
         // Inventory can have arbitrary auxiliary values.
         {
-            // Fix Size
-            unsigned char size_patch[4] = {AUX_DATA_TILE_ITEM_SIZE, 0x00, 0xa0, 0xe3}; // "mov r0, #AUX_DATA_TILE_ITEM_SIZE"
-            patch((void *) 0xc6f64, size_patch);
-            // Hook Constructor
-            overwrite_call((void *) 0xc6f74, (void *) Tile_initTiles_TileItem_injection);
+            // Hook TileItem ::operator new To Store TileItems
+            overwrite_call((void *) 0x1295a4, (void *) Tile_initTiles_operator_new_injection);
+            // Modify Stored TileItems
+            misc_run_on_internal_after_tiles_setup(Tile_initTiles_injection);
         }
     }
 
@@ -124,34 +141,35 @@ void init_creative() {
     if (feature_has("Remove Creative Mode Restrictions", server_disabled)) {
         unsigned char nop_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop"
         // Remove Restrictions
-        patch((void *) 0x43ee8, nop_patch);
-        patch((void *) 0x43f3c, nop_patch);
-        patch((void *) 0x43f8c, nop_patch);
-        patch((void *) 0x43fd8, nop_patch);
-        patch((void *) 0x99010, nop_patch);
+        patch((void *) 0x59e68, nop_patch);
+        patch((void *) 0x59ebc, nop_patch);
+        patch((void *) 0x59f10, nop_patch);
+        unsigned char allow_eating_patch[4] = {0x02, 0x00, 0x00, 0xea}; // "b 0xddcbc"
+        patch((void *) 0xddcac, allow_eating_patch);
         // Fix UI
-        patch((void *) 0x341c0, nop_patch);
-        patch((void *) 0x3adb4, nop_patch);
-        patch((void *) 0x3b374, nop_patch);
+        patch((void *) 0x4cb88, nop_patch);
+        unsigned char fix_ui_patch[4] = {0x05, 0x00, 0x55, 0xe1}; // "cmp r5, r5"
+        patch((void *) 0x4bf20, fix_ui_patch);
         // Fix Inventory
+        patch((void *) 0xcce90, nop_patch);
+        patch((void *) 0xd5548, nop_patch);
+        unsigned char inv_creative_check_r3_patch[4] = {0x03, 0x00, 0x53, 0xe1}; // "cmp r3, r3"
+        patch((void *) 0xd497c, inv_creative_check_r3_patch);
+        unsigned char inv_creative_check_r5_patch[4] = {0x05, 0x00, 0x55, 0xe1}; // "cmp r5, r5"
+        patch((void *) 0xd4d94, inv_creative_check_r5_patch);
+        patch((void *) 0xd50ac, nop_patch);
         patch((void *) 0x8d080, nop_patch);
         patch((void *) 0x8d090, nop_patch);
-        patch((void *) 0x91d48, nop_patch);
-        patch((void *) 0x92098, nop_patch);
-        unsigned char inv_creative_check_r3_patch[4] = {0x03, 0x00, 0x53, 0xe1}; // "cmp r3, r3"
-        patch((void *) 0x923c0, inv_creative_check_r3_patch);
-        patch((void *) 0x92828, nop_patch);
-        patch((void *) 0x92830, nop_patch);
         // Display Slot Count
-        patch((void *) 0x1e3f4, nop_patch);
-        unsigned char slot_count_patch[4] = {0x18, 0x00, 0x00, 0xea}; // "b 0x27110"
-        patch((void *) 0x270a8, slot_count_patch);
-        patch((void *) 0x33954, nop_patch);
+        patch((void *) 0x23d4c, nop_patch);
+        patch((void *) 0x2c570, nop_patch);
+        patch((void *) 0x3eec0, nop_patch);
         // Maximize Creative Inventory Stack Size
-        unsigned char maximize_stack_patch[4] = {0xff, 0xc0, 0xa0, 0xe3}; // "mov r12, 0xff"
-        patch((void *) 0x8e104, maximize_stack_patch);
+        unsigned char maximize_stack_patch[4] = {0xff, 0x60, 0xa0, 0xe3}; // "mov r6, 0xff"
+        patch((void *) 0xccf80, maximize_stack_patch);
         // Allow Nether Reactor
-        patch((void *) 0xc0290, nop_patch);
+        unsigned char nether_reactor_patch[4] = {0x00, 0x00, 0xa0, 0xe3}; // "mov r0, #0x0"
+        patch((void *) 0x12283c, nether_reactor_patch);
         // Disable Other Restrictions
         is_restricted = 0;
     }

mods/src/game-mode/game-mode.c

@@ -14,14 +14,14 @@ static void set_is_survival(int new_is_survival) {
 
         // Correct Inventpry UI
         unsigned char inventory_patch[4] = {new_is_survival ? 0x00 : 0x01, 0x30, 0xa0, 0xe3}; // "mov r3, #0x0" or "mov r3, #0x1"
-        patch((void *) 0x16efc, inventory_patch);
+        patch((void *) 0x178c0, inventory_patch);
 
         // Use Correct Size For GameMode Object
         unsigned char size_patch[4] = {new_is_survival ? SURVIVAL_MODE_SIZE : CREATOR_MODE_SIZE, 0x00, 0xa0, 0xe3}; // "mov r0, #SURVIVAL_MODE_SIZE" or "mov r0, #CREATOR_MODE_SIZE"
-        patch((void *) 0x16ee4, size_patch);
+        patch((void *) 0x178a8, size_patch);
 
         // Replace Default CreatorMode Constructor With CreatorMode Or SurvivalMode Constructor
-        overwrite_call((void *) 0x16ef4, new_is_survival ? SurvivalMode : CreatorMode);
+        overwrite_call((void *) 0x178b8, new_is_survival ? SurvivalMode : CreatorMode);
 
         is_survival = new_is_survival;
     }
@@ -54,11 +54,11 @@ void init_game_mode() {
         overwrite_calls((void *) Minecraft_setIsCreativeMode, (void *) Minecraft_setIsCreativeMode_injection);
 
         // Replace CreatorLevel With ServerLevel (This Fixes Beds And Mob Spawning)
-        overwrite_call((void *) 0x16f84, (void *) ServerLevel);
+        overwrite_call((void *) 0x17950, (void *) ServerLevel);
 
         // Allocate Correct Size For ServerLevel
         uint32_t level_size = SERVER_LEVEL_SIZE;
-        patch_address((void *) 0x17004, (void *) level_size);
+        patch_address((void *) 0x17a38, (void *) level_size);
 
         // Disable CreatorMode-Specific API Features (Polling Block Hits) In SurvivalMode, This Is Preferable To Crashing
         overwrite_calls((void *) Minecraft_getCreator, (void *) Minecraft_getCreator_injection);
@@ -72,7 +72,7 @@ void init_game_mode() {
 
     // Allow Joining Survival Servers
     if (feature_has("Allow Joining Survival Servers", server_enabled)) {
-        unsigned char server_patch[4] = {0x0f, 0x00, 0x00, 0xea}; // "b 0x6dcb4"
-        patch((void *) 0x6dc70, server_patch);
+        unsigned char server_patch[4] = {0x16, 0x00, 0x00, 0xea}; // "b 0x8e998"
+        patch((void *) 0x8e938, server_patch);
     }
 }

mods/src/home/home.c

@@ -24,10 +24,8 @@ __attribute__((destructor)) static void _free_home() {
 // Init
 void init_home() {
     // Store Data In ~/.minecraft-pi Instead Of ~/.minecraft
-    patch_address((void *) default_path, (void *) HOME_SUBDIRECTORY_FOR_GAME_DATA);
+    patch_address((void *) full_data_path, (void *) home_get());
 
     // The override code resolves assets manually,
     // making changing directory redundant.
-    unsigned char nop_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop"
-    patch((void *) 0xe0ac, nop_patch);
 }

mods/src/init/init.c

@@ -15,7 +15,6 @@ __attribute__((constructor)) static void init() {
     init_multiplayer();
     init_sound();
     init_input();
-    init_sign();
     init_creative();
     init_camera();
     init_touch();

mods/src/input/bow.c

@@ -1,37 +0,0 @@
-#include <libreborn/libreborn.h>
-#include <symbols/minecraft.h>
-
-#include <mods/feature/feature.h>
-#include "input-internal.h"
-#include <mods/input/input.h>
-
-// Store Right-Click Status
-static int is_right_click = 0;
-void input_set_is_right_click(int val) {
-    is_right_click = val;
-}
-
-// Enable Bow & Arrow Fix
-static int fix_bow = 0;
-
-// Handle Bow & Arrow
-static void _handle_bow(unsigned char *minecraft) {
-    if (fix_bow && !is_right_click) {
-        // GameMode Is Offset From minecraft By 0x160
-        // Player Is Offset From minecraft By 0x18c
-        unsigned char *game_mode = *(unsigned char **) (minecraft + Minecraft_game_mode_property_offset);
-        unsigned char *player = *(unsigned char **) (minecraft + Minecraft_player_property_offset);
-        if (player != NULL && game_mode != NULL && (*Player_isUsingItem)(player)) {
-            unsigned char *game_mode_vtable = *(unsigned char **) game_mode;
-            GameMode_releaseUsingItem_t GameMode_releaseUsingItem = *(GameMode_releaseUsingItem_t *) (game_mode_vtable + GameMode_releaseUsingItem_vtable_offset);
-            (*GameMode_releaseUsingItem)(game_mode, player);
-        }
-    }
-}
-
-// Init
-void _init_bow() {
-    // Enable Bow & Arrow Fix
-    fix_bow = feature_has("Fix Bow & Arrow", server_disabled);
-    input_run_on_tick(_handle_bow);
-}

mods/src/input/input-internal.h

@@ -5,7 +5,6 @@ extern "C" {
 #endif
 
 __attribute__((visibility("internal"))) void _init_attack();
-__attribute__((visibility("internal"))) void _init_bow();
 __attribute__((visibility("internal"))) void _init_misc();
 __attribute__((visibility("internal"))) void _init_toggle();
 __attribute__((visibility("internal"))) void _init_drop();

mods/src/input/input.cpp

@@ -40,9 +40,6 @@ void init_input() {
     // Item Dropping
     _init_drop();
 
-    // Enable Bow & Arrow Fix
-    _init_bow();
-
     // Loop
     overwrite_calls((void *) Minecraft_tickInput, (void *) Minecraft_tickInput_injection);
 

mods/src/input/misc.c

@@ -88,7 +88,7 @@ void _init_misc() {
         overwrite_calls((void *) Gui_handleClick, (void *) Gui_handleClick_injection);
     }
     // Disable Item Dropping Using The Cursor When Cursor Is Hidden
-    overwrite_call((void *) 0x27800, (void *) Gui_tickItemDrop_Minecraft_isCreativeMode_call_injection);
+    overwrite_call((void *) 0x2b130, (void *) Gui_tickItemDrop_Minecraft_isCreativeMode_call_injection);
 
     input_run_on_tick(_handle_back);
     input_run_on_tick(_handle_mouse_grab);

mods/src/misc/api.cpp

@@ -83,6 +83,7 @@ static void Inventory_setupDefault_FillingContainer_addItem_call_injection(unsig
 
 // Run Functions On Tiles Setup
 SETUP_CALLBACK(tiles_setup);
+SETUP_CALLBACK(internal_after_tiles_setup);
 // Handle Custom Tiles Setup Behavior
 static void Tile_initTiles_injection() {
     // Run Functions
@@ -90,6 +91,9 @@ static void Tile_initTiles_injection() {
 
     // Call Original Method
     (*Tile_initTiles)();
+
+    // Run Functions
+    handle_misc_internal_after_tiles_setup(NULL);
 }
 
 // Run Functions On Items Setup
@@ -113,7 +117,7 @@ void _init_misc_api() {
     overwrite_calls((void *) Recipes, (void *) Recipes_injection);
     overwrite_calls((void *) FurnaceRecipes, (void *) FurnaceRecipes_injection);
     // Handle Custom Creative Inventory Setup Behavior
-    overwrite_call((void *) 0x8e0fc, (void *) Inventory_setupDefault_FillingContainer_addItem_call_injection);
+    overwrite_call((void *) 0xcdcf4, (void *) Inventory_setupDefault_FillingContainer_addItem_call_injection);
     // Handle Custom Item/Tile Init Behavior
     overwrite_calls((void *) Tile_initTiles, (void *) Tile_initTiles_injection);
     overwrite_calls((void *) Item_initItems, (void *) Item_initItems_injection);

mods/src/misc/misc.c

@@ -36,17 +36,6 @@ static void Gui_renderHearts_GuiComponent_blit_hearts_injection(unsigned char *c
     // Call Original Method
     (*GuiComponent_blit)(component, x_dest, y_dest, x_src, y_src, width_dest, height_dest, width_src, height_src);
 }
-static void Gui_renderHearts_GuiComponent_blit_armor_injection(unsigned char *component, int32_t x_dest, int32_t y_dest, int32_t x_src, int32_t y_src, int32_t width_dest, int32_t height_dest, int32_t width_src, int32_t height_src) {
-    unsigned char *minecraft = *(unsigned char **) (component + Gui_minecraft_property_offset);
-    x_dest -= DEFAULT_HUD_PADDING + HUD_ELEMENT_WIDTH;
-    float width = ((float) *(int32_t *) (minecraft + Minecraft_screen_width_property_offset)) * *InvGuiScale;
-    float height = ((float) *(int32_t *) (minecraft + Minecraft_screen_height_property_offset)) * *InvGuiScale;
-    x_dest += width - ((width - (NUMBER_OF_SLOTS * SLOT_WIDTH)) / 2) - HUD_ELEMENT_WIDTH;
-    y_dest -= DEFAULT_HUD_PADDING;
-    y_dest += height - HUD_ELEMENT_HEIGHT - TOOLBAR_HEIGHT - NEW_HUD_PADDING;
-    // Call Original Method
-    (*GuiComponent_blit)(component, x_dest, y_dest, x_src, y_src, width_dest, height_dest, width_src, height_src);
-}
 static void Gui_renderBubbles_GuiComponent_blit_injection(unsigned char *component, int32_t x_dest, int32_t y_dest, int32_t x_src, int32_t y_src, int32_t width_dest, int32_t height_dest, int32_t width_src, int32_t height_src) {
     unsigned char *minecraft = *(unsigned char **) (component + Gui_minecraft_property_offset);
     x_dest -= DEFAULT_HUD_PADDING;
@@ -297,6 +286,11 @@ int32_t misc_get_real_selected_slot(unsigned char *player) {
     return selected_slot;
 }
 
+// Stop Checking GL Renderer
+static bool AppPlatform_isPowerVR_injection(__attribute__((unused)) unsigned char *app_platform) {
+    return 0;
+}
+
 // Init
 static void nop() {
 }
@@ -304,17 +298,16 @@ void init_misc() {
     // Remove Invalid Item Background (A Red Background That Appears For Items That Are Not Included In The gui_blocks Atlas)
     if (feature_has("Remove Invalid Item Background", server_disabled)) {
         unsigned char invalid_item_background_patch[4] = {0x00, 0xf0, 0x20, 0xe3}; // "nop"
-        patch((void *) 0x63c98, invalid_item_background_patch);
+        patch((void *) 0x7f7e8, invalid_item_background_patch);
     }