bigjango13/minecraft-pi-reborn
1
0
Fork 0
forked from minecraft-pi-reborn/minecraft-pi-reborn
Code Pull Requests Activity

Add "Force Touch Inventory"

Browse Source
This commit is contained in:
TheBrokenRail 2022-04-11 19:59:21 -04:00
parent 0150879d2b
commit f455780833
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
launcher/data/client/lib/minecraft-pi-reborn-client/available-feature-flags
View File

@ -31,3 +31,4 @@ TRUE Fix Furnace Not Checking Item Auxiliary
TRUE Improved Cursor Rendering TRUE Improved Cursor Rendering
FALSE Disable V-Sync FALSE Disable V-Sync
TRUE Fix Options Screen TRUE Fix Options Screen
FALSE Force Touch Inventory

2
mods/CMakeLists.txt
View File

@ -47,7 +47,7 @@ else()
add_library(sign SHARED src/sign/sign.cpp) add_library(sign SHARED src/sign/sign.cpp)
target_link_libraries(sign reborn-patch symbols feature input) target_link_libraries(sign reborn-patch symbols feature input)
add_library(touch SHARED src/touch/touch.c) add_library(touch SHARED src/touch/touch.cpp)
target_link_libraries(touch reborn-patch symbols feature) target_link_libraries(touch reborn-patch symbols feature)
add_library(override SHARED src/override/override.c) add_library(override SHARED src/override/override.c)

13
mods/src/touch/touch.c → mods/src/touch/touch.cpp
View File

@ -10,6 +10,11 @@ static int32_t Minecraft_isTouchscreen_injection(__attribute__((unused)) unsigne
return 1; return 1;
} }
// IngameBlockSelectionScreen Memory Allocation Override
static unsigned char *operator_new_IngameBlockSelectionScreen_injection(__attribute__((unused)) uint32_t size) {
return (unsigned char *) ::operator new(TOUCH_INGAME_BLOCK_SELECTION_SCREEN_SIZE);
}
// Init // Init
void init_touch() { void init_touch() {
int touch_gui = feature_has("Touch GUI", server_disabled); int touch_gui = feature_has("Touch GUI", server_disabled);
@ -24,6 +29,12 @@ void init_touch() {
// Show Block Outlines // Show Block Outlines
int block_outlines = feature_has("Show Block Outlines", 0); int block_outlines = feature_has("Show Block Outlines", 0);
unsigned char outline_patch[4] = {block_outlines ? !touch_gui : touch_gui, 0x00, 0x50, 0xe3}; // "cmp r0, #0x1" or "cmp r0, #0x0" unsigned char outline_patch[4] = {(unsigned char) (block_outlines ? !touch_gui : touch_gui), 0x00, 0x50, 0xe3}; // "cmp r0, #0x1" or "cmp r0, #0x0"
patch((void *) 0x4a210, outline_patch); patch((void *) 0x4a210, outline_patch);
// Force Touch Inventory
if (feature_has("Force Touch Inventory", server_disabled)) {
overwrite_call((void *) 0x2943c, (void *) operator_new_IngameBlockSelectionScreen_injection);
overwrite_call((void *) 0x29444, (void *) Touch_IngameBlockSelectionScreen);
}
} }

7
symbols/include/symbols/minecraft.h
View File

@ -495,6 +495,13 @@ static void *StartMenuScreen_init_vtable_addr = (void *) 0x105194;
static uint32_t StartMenuScreen_options_button_property_offset = 0x98; // Button static uint32_t StartMenuScreen_options_button_property_offset = 0x98; // Button
// Touch::IngameBlockSelectionScreen
#define TOUCH_INGAME_BLOCK_SELECTION_SCREEN_SIZE 0x16c
typedef unsigned char *(*Touch_IngameBlockSelectionScreen_t)(unsigned char *screen);
static Touch_IngameBlockSelectionScreen_t Touch_IngameBlockSelectionScreen = (Touch_IngameBlockSelectionScreen_t) 0x3afbc;
// SelectWorldScreen // SelectWorldScreen
static Screen_tick_t SelectWorldScreen_tick = (Screen_tick_t) 0x38a2c; static Screen_tick_t SelectWorldScreen_tick = (Screen_tick_t) 0x38a2c;