From d2b07f76613f6e8d30cc4b9d7f4ee1b3a727ec13 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sun, 14 Jul 2024 05:06:27 -0400 Subject: [PATCH] minecraft.h/.cpp Changes --- CMakeLists.txt | 2 +- dependencies/symbol-processor/src | 2 +- libreborn/include/libreborn/patch.h | 76 +++++-------------- libreborn/include/libreborn/util.h | 2 +- libreborn/src/patch/code-block.cpp | 10 +-- libreborn/src/patch/patch.cpp | 62 +++++++-------- mods/include/mods/misc/misc.h | 3 + mods/src/bucket/bucket.cpp | 6 +- mods/src/cake/cake.cpp | 4 +- mods/src/death/death.cpp | 4 +- mods/src/game-mode/game-mode.cpp | 4 +- mods/src/init/init.cpp | 2 + mods/src/input/drop.cpp | 2 +- mods/src/misc/misc.cpp | 7 +- mods/src/title-screen/title-screen.cpp | 2 +- mods/src/touch/touch.cpp | 6 +- .../src/network/raknet/RakNet_RakString.def | 2 +- 17 files changed, 84 insertions(+), 112 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db6ab12e..ee2c9b6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ string(CONCAT COMPILE_FLAGS_SETUP # C Standard "add_definitions(-D_GNU_SOURCE)\n" "set(CMAKE_C_STANDARD 99)\n" - "set(CMAKE_CXX_STANDARD 11)\n" + "set(CMAKE_CXX_STANDARD 20)\n" # Skip RPath "set(CMAKE_SKIP_BUILD_RPATH TRUE)" diff --git a/dependencies/symbol-processor/src b/dependencies/symbol-processor/src index 6098f57b..11342dbb 160000 --- a/dependencies/symbol-processor/src +++ b/dependencies/symbol-processor/src @@ -1 +1 @@ -Subproject commit 6098f57b03cae72668c6d2c1624a3a3f01d13fa9 +Subproject commit 11342dbb78b8897ddf75fb4c1b72d40915fab245 diff --git a/libreborn/include/libreborn/patch.h b/libreborn/include/libreborn/patch.h index 2f840700..cac7abdc 100644 --- a/libreborn/include/libreborn/patch.h +++ b/libreborn/include/libreborn/patch.h @@ -5,82 +5,48 @@ #if defined(REBORN_HAS_PATCH_CODE) && defined(__cplusplus) #include -#include // Init void reborn_init_patch(); // Replace Call Located At start With A Call To target -void _overwrite_call(const char *file, int line, void *start, void *target); -#define overwrite_call(...) \ - _overwrite_call(__FILE__, __LINE__, __VA_ARGS__) +void overwrite_call(void *start, void *target); // Replace All Calls To Method start With target -void *_overwrite_calls_manual(const char *file, int line, void *start, void *target); -#define overwrite_calls_manual(...) \ - _overwrite_calls_manual(__FILE__, __LINE__, __VA_ARGS__) -template -void _overwrite_calls(const char *file, int line, std::string (*set_overwrite)(const overwrite_t &, const std::function &), const overwrite_t &target) { - std::string ret = set_overwrite(target, [&file, &line](void *start, void *target2) { - return _overwrite_calls_manual(file, line, start, target2); - }); - if (!ret.empty()) { - ERR("%s", ret.c_str()); +void *overwrite_calls_manual(void *start, void *target, bool allow_no_callsites = false); +template +void overwrite_calls(T &target, typename T::overwrite_type replacement) { + DEBUG("Overwriting Method: %s", target.get_name()); + if (!target.overwrite(replacement)) { + ERR("Unable To Overwrite Method: %s", target.get_name()); } } -#define overwrite_calls(start, ...) \ - _overwrite_calls< \ - __overwrite_##start##_t \ - >( \ - __FILE__, __LINE__, \ - __set_overwrite_for_##start, \ - __VA_ARGS__ \ - ) + +// Thunk Enabler +void *reborn_thunk_enabler(void *target, void *thunk); // Replace All Calls To start With target Within [to, from) -void _overwrite_calls_within_manual(const char *file, int line, void *from, void *to, void *start, void *target); -#define overwrite_calls_within_manual(...) \ - _overwrite_calls_within(__FILE__, __LINE__, __VA_ARGS__) -template -void _overwrite_calls_within(const char *file, int line, void *from, void *to, start_t start, start_t target) { - _overwrite_calls_within_manual(file, line, from, to, (void *) start, (void *) target); +void overwrite_calls_within_manual(void *from, void *to, void *start, void *target); +template +void _overwrite_calls_within(void *from, void *to, const T &start, typename T::ptr_type target) { + overwrite_calls_within_manual(from, to, (void *) start, (void *) target); } -#define overwrite_calls_within(from, to, start, ...) \ - _overwrite_calls_within< \ - __raw_##start##_t \ - >( \ - __FILE__, __LINE__, \ - from, to, \ - start, \ - __VA_ARGS__ \ - ) // Get Target Address From BL Instruction void *extract_from_bl_instruction(unsigned char *from); // Patch Instruction -void _patch(const char *file, int line, void *start, unsigned char patch[4]); -#define patch(...) \ - _patch(__FILE__, __LINE__, __VA_ARGS__) +void patch(void *start, unsigned char patch[4]); // Patch 4 Bytes Of Data -void _patch_address(const char *file, int line, void *start, void *target); -#define patch_address(...) \ - _patch_address(__FILE__, __LINE__, __VA_ARGS__) +void patch_address(void *start, void *target); // Patch VTable Entry -// This does not affect sub-classes. -template -void _patch_vtable(const char *file, int line, start_t *start, start_t target) { - _patch_address(file, line, (void *) start, (void *) target); +// This does not affect subclasses. +template +void patch_vtable(const T &start, typename T::ptr_type target) { + DEBUG("Patching VTable: %s", start.get_name()); + patch_address((void *) start.get_vtable_addr(), (void *) target); } -#define patch_vtable(start, ...) \ - _patch_vtable< \ - __raw_##start##_t \ - >( \ - __FILE__, __LINE__, \ - start##_vtable_addr, \ - __VA_ARGS__ \ - ) #endif diff --git a/libreborn/include/libreborn/util.h b/libreborn/include/libreborn/util.h index b2b7eb42..3c2ac4c5 100644 --- a/libreborn/include/libreborn/util.h +++ b/libreborn/include/libreborn/util.h @@ -84,7 +84,7 @@ void ensure_directory(const char *path); /* Allocate VTable */ \ if (vtable == NULL) { \ /* Init */ \ - vtable = dup_##parent##_vtable(parent##_vtable_base); \ + vtable = dup_vtable(parent##_vtable_base); \ ALLOC_CHECK(vtable); \ /* Setup */ \ _setup_##name##_vtable(vtable); \ diff --git a/libreborn/src/patch/code-block.cpp b/libreborn/src/patch/code-block.cpp index ebc33966..578f5324 100644 --- a/libreborn/src/patch/code-block.cpp +++ b/libreborn/src/patch/code-block.cpp @@ -5,28 +5,28 @@ // Limit To 512 overwrite_calls() Uses #define CODE_BLOCK_SIZE 4096 -static unsigned char *code_block = NULL; +static unsigned char *code_block = nullptr; #define CODE_SIZE 8 static int code_block_remaining = CODE_BLOCK_SIZE; // Create Long Overwrite At Current Position static void long_overwrite(void *start, void *target) { unsigned char patch_data[4] = {0x04, 0xf0, 0x1f, 0xe5}; // "ldr pc, [pc, #-0x4]" - _patch(NULL, -1, start, patch_data); - _patch_address(NULL, -1, (void *) (((unsigned char *) start) + 4), target); + patch(start, patch_data); + patch_address((void *) (((unsigned char *) start) + 4), target); } void *update_code_block(void *target) { // BL Instructions can only access a limited portion of memory. // So this allocates memory closer to the original instruction, // that when run, will jump into the actual target. - if (code_block == NULL) { + if (code_block == nullptr) { code_block = (unsigned char *) mmap((void *) 0x200000, CODE_BLOCK_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (code_block == MAP_FAILED) { ERR("Unable To Allocate Code Block: %s", strerror(errno)); } DEBUG("Code Block Allocated At: 0x%08x", (uint32_t) code_block); // Store Segment - segment_data data; + segment_data data = {}; data.start = code_block; data.end = (void *) (((uintptr_t) code_block) + CODE_BLOCK_SIZE); data.is_executable = true; diff --git a/libreborn/src/patch/patch.cpp b/libreborn/src/patch/patch.cpp index fb0cf80f..6682c2d3 100644 --- a/libreborn/src/patch/patch.cpp +++ b/libreborn/src/patch/patch.cpp @@ -10,20 +10,20 @@ #include "patch-internal.h" // Overwrite Specific B(L) Instruction -static void _overwrite_call_internal(const char *file, int line, void *start, void *target, int use_b_instruction) { +static void _overwrite_call_internal(void *start, void *target, const bool use_b_instruction) { // Add New Target To Code Block void *code_block = update_code_block(target); // Patch uint32_t new_instruction = generate_bl_instruction(start, code_block, use_b_instruction); - _patch(file, line, start, (unsigned char *) &new_instruction); + patch(start, (unsigned char *) &new_instruction); // Increment Code Block Position increment_code_block(); } -void _overwrite_call(const char *file, int line, void *start, void *target) { - int use_b_instruction = ((unsigned char *) start)[3] == B_INSTRUCTION; - _overwrite_call_internal(file, line, start, target, use_b_instruction); +void overwrite_call(void *start, void *target) { + const bool use_b_instruction = ((unsigned char *) start)[3] == B_INSTRUCTION; + _overwrite_call_internal(start, target, use_b_instruction); } // .rodata Information @@ -38,11 +38,11 @@ void _overwrite_call(const char *file, int line, void *start, void *target) { uint32_t *addr = (uint32_t *) i; \ if (*addr == (uintptr_t) target) { \ /* Found VTable Entry */ \ - _patch_address(file, line, addr, replacement); \ + patch_address(addr, replacement); \ found++; \ } \ } -static int _patch_vtables(const char *file, int line, void *target, void *replacement) { +static int _patch_vtables(void *target, void *replacement) { int found = 0; scan_vtables(RODATA); scan_vtables(DATA_REL_RO); @@ -51,11 +51,11 @@ static int _patch_vtables(const char *file, int line, void *target, void *replac #undef scan_vtables // Patch Calls Within Range -static int _overwrite_calls_within_internal(const char *file, int line, void *from, void *to, void *target, void *replacement) { +static int _overwrite_calls_within_internal(void *from, void *to, void *target, void *replacement) { int found = 0; for (uintptr_t i = (uintptr_t) from; i < (uintptr_t) to; i = i + 4) { unsigned char *addr = (unsigned char *) i; - int use_b_instruction = addr[3] == B_INSTRUCTION; + const int use_b_instruction = addr[3] == B_INSTRUCTION; // Check If Instruction is B Or BL if (addr[3] == BL_INSTRUCTION || use_b_instruction) { uint32_t check_instruction = generate_bl_instruction(addr, target, use_b_instruction); @@ -64,7 +64,7 @@ static int _overwrite_calls_within_internal(const char *file, int line, void *fr if (addr[0] == check_instruction_array[0] && addr[1] == check_instruction_array[1] && addr[2] == check_instruction_array[2]) { // Patch Instruction uint32_t new_instruction = generate_bl_instruction(addr, replacement, use_b_instruction); - _patch(file, line, addr, (unsigned char *) &new_instruction); + patch(addr, (unsigned char *) &new_instruction); found++; } } @@ -76,57 +76,54 @@ static int _overwrite_calls_within_internal(const char *file, int line, void *fr #define TEXT_START 0xde60 #define TEXT_END 0x1020c0 // Overwrite All B(L) Intrusctions That Target The Specified Address -#define NO_CALLSITE_ERROR "(%s:%i) Unable To Find Callsites For %p" -void *_overwrite_calls_manual(const char *file, int line, void *start, void *target) { +#define NO_CALLSITE_ERROR() ERR("Unable To Find Callsites") +void *overwrite_calls_manual(void *start, void *target, const bool allow_no_callsites) { // Add New Target To Code Block void *code_block = update_code_block(target); // Patch Code - int found = _overwrite_calls_within_internal(file, line, (void *) TEXT_START, (void *) TEXT_END, start, code_block); + int found = _overwrite_calls_within_internal((void *) TEXT_START, (void *) TEXT_END, start, code_block); // Patch VTables - found += _patch_vtables(file, line, start, code_block); + found += _patch_vtables(start, code_block); // Increment Code Block Position increment_code_block(); // Check - if (found < 1) { - ERR(NO_CALLSITE_ERROR, file, line, start); + if (found < 1 && !allow_no_callsites) { + NO_CALLSITE_ERROR(); } // Return return code_block; } -void _overwrite_calls_within_manual(const char *file, int line, void *from /* inclusive */, void *to /* exclusive */, void *target, void *replacement) { +void overwrite_calls_within_manual(void *from /* inclusive */, void *to /* exclusive */, void *target, void *replacement) { // Add New Target To Code Block void *code_block = update_code_block(replacement); // Patch - int found = _overwrite_calls_within_internal(file, line, from, to, target, code_block); + const int found = _overwrite_calls_within_internal(from, to, target, code_block); // Check if (found < 1) { - ERR(NO_CALLSITE_ERROR, file, line, target); + NO_CALLSITE_ERROR(); } // Increment Code Block Position increment_code_block(); } -// Print Patch Debug Data -#define PATCH_PRINTF(file, line, start, str) if (file != NULL) DEBUG("(%s:%i): Patching (%p) - " str ": %02x %02x %02x %02x", file, line, start, data[0], data[1], data[2], data[3]); - // Patch Instruction static void safe_mprotect(void *addr, size_t len, int prot) { - long page_size = sysconf(_SC_PAGESIZE); - long diff = ((uintptr_t) addr) % page_size; + const long page_size = sysconf(_SC_PAGESIZE); + const long diff = uintptr_t(addr) % page_size; void *aligned_addr = (void *) (((uintptr_t) addr) - diff); size_t aligned_len = len + diff; - int ret = mprotect(aligned_addr, aligned_len, prot); + const int ret = mprotect(aligned_addr, aligned_len, prot); if (ret == -1) { ERR("Unable To Set Permissions: %p: %s", addr, strerror(errno)); } } -void _patch(const char *file, int line, void *start, unsigned char patch[4]) { +void patch(void *start, unsigned char patch[4]) { if (((uint32_t) start) % 4 != 0) { ERR("Invalid Address: %p", start); } @@ -142,14 +139,12 @@ void _patch(const char *file, int line, void *start, unsigned char patch[4]) { } // Allow Writing To Code Memory - uint32_t size = 4; + const uint32_t size = 4; safe_mprotect(start, size, prot | PROT_WRITE); // Patch unsigned char *data = (unsigned char *) start; - PATCH_PRINTF(file, line, start, "original"); memcpy(data, patch, 4); - PATCH_PRINTF(file, line, start, "result"); // Reset Code Memory Permissions safe_mprotect(start, size, prot); @@ -159,8 +154,13 @@ void _patch(const char *file, int line, void *start, unsigned char patch[4]) { } // Patch Address -void _patch_address(const char *file, int line, void *start, void *target) { +void patch_address(void *start, void *target) { uint32_t addr = (uint32_t) target; unsigned char *patch_data = (unsigned char *) &addr; - _patch(file, line, start, patch_data); + patch(start, patch_data); } + +// Thunks +void *reborn_thunk_enabler(void *target, void *thunk) { + return overwrite_calls_manual(target, thunk, true); +} \ No newline at end of file diff --git a/mods/include/mods/misc/misc.h b/mods/include/mods/misc/misc.h index c6ac41bb..17733648 100644 --- a/mods/include/mods/misc/misc.h +++ b/mods/include/mods/misc/misc.h @@ -10,6 +10,9 @@ int32_t misc_get_real_selected_slot(Player *player); void misc_render_background(int color, Minecraft *minecraft, int x, int y, int width, int height); extern bool is_in_chat; + +typedef RakNet_RakString *(*RakNet_RakString_constructor_t)(RakNet_RakString *self, const char *format, ...); +extern RakNet_RakString_constructor_t RakNet_RakString_constructor; } void misc_run_on_update(const std::function &func); diff --git a/mods/src/bucket/bucket.cpp b/mods/src/bucket/bucket.cpp index 99173795..6cc61f5e 100644 --- a/mods/src/bucket/bucket.cpp +++ b/mods/src/bucket/bucket.cpp @@ -136,7 +136,7 @@ static int BucketItem_getUseDuration(__attribute__((unused)) FoodItem *item, Ite static ItemInstance BucketItem_useTimeDepleted(FoodItem *item, ItemInstance *item_instance, Level *level, Player *player) { if (item_instance->auxiliary == 1) { - *item_instance = (*FoodItem_useTimeDepleted_vtable_addr)(item, item_instance, level, player); + *item_instance = FoodItem_useTimeDepleted.get()(item, item_instance, level, player); // Set it to a empty bucket item_instance->auxiliary = 0; item_instance->count = 1; @@ -154,7 +154,7 @@ static bool BucketItem_isFood(__attribute__((unused)) FoodItem *item) { static ItemInstance *BucketItem_use(FoodItem *item, ItemInstance *item_instance, __attribute__((unused)) Level *level, Player *player) { if (item_instance->auxiliary == 1) { - return (*FoodItem_use_vtable_addr)(item, item_instance, level, player); + return FoodItem_use.get()(item, item_instance, level, player); } return item_instance; } @@ -188,7 +188,7 @@ static FoodItem *create_bucket(int32_t id, int32_t texture_x, int32_t texture_y, // Construct FoodItem *item = new FoodItem; ALLOC_CHECK(item); - Item_constructor((Item *) item, id); // FoodItem's Constructor Was Inlined + Item_constructor.get()((Item *) item, id); // FoodItem's Constructor Was Inlined // Set VTable item->vtable = get_bucket_vtable(); diff --git a/mods/src/cake/cake.cpp b/mods/src/cake/cake.cpp index 996a1fc0..f22888ec 100644 --- a/mods/src/cake/cake.cpp +++ b/mods/src/cake/cake.cpp @@ -102,7 +102,7 @@ static int Cake_use(__attribute__((unused)) Tile *tile, Level *level, int x, int // Eat player->foodData.eat(3); // Set the new tile - int data = level->getData(x, y, z); + const int data = level->getData(x, y, z); if (data >= 5) { // Remove the cake, it has been completely gobbled up level->setTileAndData(x, y, z, 0, 0); @@ -123,7 +123,7 @@ static void make_cake() { cake->texture = texture; // Set VTable - cake->vtable = dup_Tile_vtable(Tile_vtable_base); + cake->vtable = dup_vtable(Tile_vtable_base); ALLOC_CHECK(cake->vtable); // Set shape diff --git a/mods/src/death/death.cpp b/mods/src/death/death.cpp index 2d67e0cf..ed14bbf3 100644 --- a/mods/src/death/death.cpp +++ b/mods/src/death/death.cpp @@ -93,7 +93,7 @@ static void Player_actuallyHurt_injection(Self *player, int32_t damage) { int32_t old_health = player->health; // Call Original Method - (*Mob_actuallyHurt_vtable_addr)((Mob *) player, damage); + Mob_actuallyHurt.get()((Mob *) player, damage); if (is_hurt) { return; } @@ -122,7 +122,7 @@ void init_death() { // Death Messages if (feature_has("Implement Death Messages", server_auto)) { patch_vtable(ServerPlayer_die, [](ServerPlayer *player, Entity *cause) { - Player_die_injection(*Player_die_vtable_addr, player, cause); + Player_die_injection(Player_die.get(), player, cause); }); overwrite_calls(LocalPlayer_die, Player_die_injection); patch_vtable(LocalPlayer_actuallyHurt, Player_actuallyHurt_injection); diff --git a/mods/src/game-mode/game-mode.cpp b/mods/src/game-mode/game-mode.cpp index 3dae0142..c6847908 100644 --- a/mods/src/game-mode/game-mode.cpp +++ b/mods/src/game-mode/game-mode.cpp @@ -21,7 +21,7 @@ static void set_is_survival(bool new_is_survival) { patch((void *) 0x16ee4, size_patch); // Replace Default CreatorMode Constructor With CreatorMode Or SurvivalMode Constructor - overwrite_call((void *) 0x16ef4, new_is_survival ? (void *) SurvivalMode_constructor : (void *) CreatorMode_constructor); + overwrite_call((void *) 0x16ef4, new_is_survival ? (void *) SurvivalMode_constructor.get() : (void *) CreatorMode_constructor.get()); is_survival = new_is_survival; } @@ -54,7 +54,7 @@ void init_game_mode() { overwrite_calls(Minecraft_setIsCreativeMode, Minecraft_setIsCreativeMode_injection); // Replace CreatorLevel With ServerLevel (This Fixes Beds And Mob Spawning) - overwrite_call((void *) 0x16f84, (void *) ServerLevel_constructor); + overwrite_call((void *) 0x16f84, (void *) ServerLevel_constructor.get()); // Allocate Correct Size For ServerLevel uint32_t level_size = sizeof(ServerLevel); diff --git a/mods/src/init/init.cpp b/mods/src/init/init.cpp index 6cd82d14..b53cafb1 100644 --- a/mods/src/init/init.cpp +++ b/mods/src/init/init.cpp @@ -1,8 +1,10 @@ #include #include #include +#include __attribute__((constructor)) static void init() { + thunk_enabler = reborn_thunk_enabler; media_ensure_loaded(); reborn_init_patch(); run_tests(); diff --git a/mods/src/input/drop.cpp b/mods/src/input/drop.cpp index ab6c920c..34b5bb22 100644 --- a/mods/src/input/drop.cpp +++ b/mods/src/input/drop.cpp @@ -15,7 +15,7 @@ void input_set_is_ctrl(const bool val) { // Handle Drop Item Presses static void _handle_drop(Minecraft *minecraft) { - if (!creative_is_restricted() || !Minecraft_isCreativeMode(minecraft)) { + if (!creative_is_restricted() || !minecraft->isCreativeMode()) { // Get Player LocalPlayer *player = minecraft->player; if (player != nullptr) { diff --git a/mods/src/misc/misc.cpp b/mods/src/misc/misc.cpp index 96c1fc07..601551b5 100644 --- a/mods/src/misc/misc.cpp +++ b/mods/src/misc/misc.cpp @@ -90,7 +90,7 @@ static void Gui_renderHearts_injection(Gui_renderHearts_t original, Gui *gui) { original(gui); } static GuiComponent_blit_t get_blit_with_classic_hud_offset() { - return use_classic_hud ? Gui_renderHearts_GuiComponent_blit_hearts_injection : GuiComponent_blit; + return use_classic_hud ? Gui_renderHearts_GuiComponent_blit_hearts_injection : GuiComponent_blit.get(); } #define PINK_HEART_FULL 70 #define PINK_HEART_HALF 79 @@ -130,7 +130,7 @@ static void Gui_renderChatMessages_injection(Gui_renderChatMessages_t original, // Handle Classic HUD if (use_classic_hud) { Minecraft *minecraft = gui->minecraft; - if (!Minecraft_isCreativeMode(minecraft)) { + if (!minecraft->isCreativeMode()) { y_offset -= (HUD_ELEMENT_HEIGHT * 2) + NEW_HUD_PADDING; } } @@ -231,6 +231,7 @@ static void LoginPacket_read_injection(LoginPacket_read_t original, LoginPacket // RakNet::RakString's format constructor is often given unsanitized user input and is never used for formatting, // this is a massive security risk, allowing clients to run arbitrary format specifiers, this disables the // formatting functionality. +RakNet_RakString_constructor_t RakNet_RakString_constructor = (RakNet_RakString_constructor_t) 0xea5cc; static RakNet_RakString *RakNet_RakString_injection(RakNet_RakString *rak_string, const char *format, ...) { // Call Original Method return RakNet_RakString_constructor(rak_string, "%s", format); @@ -363,7 +364,7 @@ static void anGenBuffers_injection(__attribute__((unused)) Common_anGenBuffers_t // Fix Graphics Bug When Switching To First-Person While Sneaking static void PlayerRenderer_render_injection(PlayerRenderer *model_renderer, Entity *entity, float param_2, float param_3, float param_4, float param_5, float param_6) { - (*HumanoidMobRenderer_render_vtable_addr)((HumanoidMobRenderer *) model_renderer, entity, param_2, param_3, param_4, param_5, param_6); + HumanoidMobRenderer_vtable_base->render((HumanoidMobRenderer *) model_renderer, entity, param_2, param_3, param_4, param_5, param_6); HumanoidModel *model = model_renderer->model; model->is_sneaking = false; } diff --git a/mods/src/title-screen/title-screen.cpp b/mods/src/title-screen/title-screen.cpp index 934e74fd..2a28d6c8 100644 --- a/mods/src/title-screen/title-screen.cpp +++ b/mods/src/title-screen/title-screen.cpp @@ -70,7 +70,7 @@ static Screen *last_screen = nullptr; static std::string current_splash; static void StartMenuScreen_render_Screen_render_injection(Screen *screen, int x, int y, float param_1) { // Call Original Method - (*Screen_render_vtable_addr)(screen, x, y, param_1); + Screen_render.get()(screen, x, y, param_1); // Load Splashes static std::vector splashes; diff --git a/mods/src/touch/touch.cpp b/mods/src/touch/touch.cpp index aa3e6e55..47ef6a77 100644 --- a/mods/src/touch/touch.cpp +++ b/mods/src/touch/touch.cpp @@ -73,10 +73,10 @@ void init_touch() { // Force Touch Inventory if (feature_has("Force Touch GUI Inventory", server_disabled)) { overwrite_call((void *) 0x2943c, (void *) operator_new_IngameBlockSelectionScreen_injection); - overwrite_call((void *) 0x29444, (void *) Touch_IngameBlockSelectionScreen_constructor); + overwrite_call((void *) 0x29444, (void *) Touch_IngameBlockSelectionScreen_constructor.get()); // Make "Craft" And "Armor" Buttons Use Classic GUI Style (Button And TButton Have The Same Size) - overwrite_call((void *) 0x3b060, (void *) Button_constructor); - overwrite_call((void *) 0x3b08c, (void *) Button_constructor); + overwrite_call((void *) 0x3b060, (void *) Button_constructor.get()); + overwrite_call((void *) 0x3b08c, (void *) Button_constructor.get()); } // Force Touch Button Behavior diff --git a/symbols/src/network/raknet/RakNet_RakString.def b/symbols/src/network/raknet/RakNet_RakString.def index 46802056..edd79cd0 100644 --- a/symbols/src/network/raknet/RakNet_RakString.def +++ b/symbols/src/network/raknet/RakNet_RakString.def @@ -1,4 +1,4 @@ -constructor (const char *format, ...) = 0xea5cc; +//constructor (const char *format, ...) = 0xea5cc; method void Assign(const char *str) = 0xe9e34;