resolved more conflicts

Author: Yangff

UE4SS/src/Mod/LuaMod.cpp

@@ -3045,7 +3045,8 @@ No overload found for function 'RegisterHook'.
             {
                 ++m_last_generic_hook_id;
                 auto [callback_data, _] = LuaMod::m_script_hook_callbacks.emplace(UEStringToSystemString(unreal_function->GetFullName()), LuaCallbackData{lua, nullptr, {}});
-                callback_data->second.registry_indexes.emplace_back(LuaMod::LuaCallbackData::RegistryIndex{lua_callback_registry_index, m_last_generic_hook_id});
+                callback_data->second.registry_indexes.emplace_back(hook_lua,
+                                                                    LuaMod::LuaCallbackData::RegistryIndex{lua_callback_registry_index, m_last_generic_hook_id});
                 generic_pre_id = m_last_generic_hook_id;
                 generic_post_id = m_last_generic_hook_id;
                 Output::send<LogLevel::Verbose>(SYSSTR("[RegisterHook] Registered script hook ({}, {}) for {}\n"),

UE4SS/src/UE4SSProgram.cpp

@@ -639,13 +639,6 @@ namespace RC
                     Unreal::UEngine::VTableLayoutMap.emplace(item_ue, offset);
                 });
 
-                Output::send<Color::Blue>(SYSSTR("UEngine\n"));
-                uint32_t uengine_size = retrieve_vtable_layout_from_ini(SYSSTR("UEngine"), [&](uint32_t index, SystemStringType& item, UEStringType& item_ue) {
-                    uint32_t offset = calculate_virtual_function_offset(index, uobjectbase_size, uobjectbaseutility_size, uobject_size);
-                    Output::send(SYSSTR("UEngine::{} = 0x{:X}\n"), item, offset);
-                    Unreal::UEngine::VTableLayoutMap.emplace(item_ue, offset);
-                });
-
                 Output::send<Color::Blue>(SYSSTR("UScriptStruct::ICppStructOps\n"));
                 retrieve_vtable_layout_from_ini(SYSSTR("UScriptStruct::ICppStructOps"), [&](uint32_t index, SystemStringType& item, UEStringType& item_ue) {
                     uint32_t offset = calculate_virtual_function_offset(index, 0);