fixup rebase

Author: Yangff

UE4SS/include/Mod/LuaMod.hpp

@@ -94,8 +94,8 @@ namespace RC
         static inline std::unordered_map<SystemStringType, LuaCallbackData> m_custom_command_lua_pre_callbacks;
         static inline std::vector<SimpleLuaAction> m_game_thread_actions{};
         // This is storage that persists through hot-reloads.
-        static inline std::unordered_map<std::string, SharedLuaVariable> m_shared_lua_variables{};
-        static inline std::unordered_map<StringType, LuaCallbackData> m_custom_event_callbacks{};
+        static inline std::unordered_map<SystemStringType, SharedLuaVariable> m_shared_lua_variables{};
+        static inline std::unordered_map<SystemStringType, LuaCallbackData> m_custom_event_callbacks{};
         static inline std::vector<LuaCallbackData> m_load_map_pre_callbacks{};
         static inline std::vector<LuaCallbackData> m_load_map_post_callbacks{};
         static inline std::vector<LuaCallbackData> m_init_game_state_pre_callbacks{};

UE4SS/src/Mod/LuaMod.cpp

@@ -26,12 +26,14 @@
 #include <LuaType/LuaModRef.hpp>
 #include <LuaType/LuaUClass.hpp>
 #include <LuaType/LuaUObject.hpp>
+#include <LuaType/LuaFURL.hpp>
+
 
 #ifdef HAS_CPPMOD
-#include <LuaType/LuaFURL.hpp>
 #include <Mod/CppMod.hpp>
 #endif
 
+
 #include <Mod/LuaMod.hpp>
 #pragma warning(disable : 4005)
 #include <GUI/Dumpers.hpp>

deps/first/ASMHelper/src/ASMHelper.cpp

@@ -8,7 +8,7 @@
 
 namespace RC::ASM
 {
-    auto get_first_instruction_at_address(void* in_instruction_ptr) -> std::pair<Instruction, std::array<ZydisDecodedOperand, ZYDIS_MAX_OPERAND_COUNT>>
+    auto get_first_instruction_at_address(void* in_instruction_ptr) -> Instruction
     {
         auto instruction_ptr = static_cast<uint8_t*>(in_instruction_ptr);
         ZydisDecoder decoder{};
@@ -25,9 +25,9 @@ namespace RC::ASM
 
     auto resolve_absolute_address(void* in_instruction_ptr) -> void*
     {
-        auto [instruction, operands] = get_first_instruction_at_address(in_instruction_ptr);
+        auto instruction = get_first_instruction_at_address(in_instruction_ptr);
         ZyanU64 resolved_address{};
-        if (ZYAN_SUCCESS(ZydisCalcAbsoluteAddress(&instruction.raw, &operands[0], std::bit_cast<ZyanU64>(in_instruction_ptr), &resolved_address)))
+        if (ZYAN_SUCCESS(ZydisCalcAbsoluteAddress(&instruction.raw, &instruction.operands[0], std::bit_cast<ZyanU64>(in_instruction_ptr), &resolved_address)))
         {
             return std::bit_cast<void*>(resolved_address);
         }
@@ -49,7 +49,7 @@ namespace RC::ASM
 
     auto resolve_function_address_from_potential_jmp(void* function_ptr) -> void*
     {
-        auto [instruction, _] = get_first_instruction_at_address(function_ptr);
+        auto instruction = get_first_instruction_at_address(function_ptr);
         if (instruction.raw.mnemonic == ZYDIS_MNEMONIC_JMP || instruction.raw.mnemonic == ZYDIS_MNEMONIC_CALL)
         {
             if (auto resolved_address = resolve_jmp(instruction.address); resolved_address)