Merge pull request #1084 from UE4SS-RE/ps-update

update patternsleuth

Author: narknon

UE4SS/src/Signatures.cpp

@@ -13,6 +13,7 @@
 #include <Unreal/Signatures.hpp>
 #include <Unreal/UObject.hpp>
 #include <Unreal/UObjectArray.hpp>
+#include <Unreal/UEngine.hpp>
 #include <Unreal/UnrealInitializer.hpp>
 
 #include <Helpers/String.hpp>
@@ -442,5 +443,31 @@ namespace RC
                                 });
                     };
         }
+
+        auto lua_gameengine_tick_scan_script = working_directory / "UE4SS_Signatures/GameEngineTick.lua";
+        if (std::filesystem::exists(lua_gameengine_tick_scan_script))
+        {
+            config.ScanOverrides.gameengine_tick =
+                    [lua_gameengine_tick_scan_script](std::vector<SignatureContainer>& signature_containers,
+                                                                           Unreal::Signatures::ScanResult& scan_result) mutable {
+                        scan_from_lua_script(
+                                lua_gameengine_tick_scan_script,
+                                signature_containers,
+                                [](void* address) {
+                                    Output::send(STR("GameEngine::Tick address: {} "
+                                                     "<- Lua Script\n"),
+                                                 address);
+                                    Unreal::UEngine::TickInternal.assign_address(address);
+                                    return DidLuaScanSucceed::Yes;
+                                },
+                                [&](DidLuaScanSucceed did_lua_scan_succeed) {
+                                    if (did_lua_scan_succeed == DidLuaScanSucceed::No)
+                                    {
+                                        scan_result.Errors.emplace_back("Was unable to find AOB for "
+                                                                        "'GameEngine::Tick' via Lua script");
+                                    }
+                                });
+                    };
+        }
     }
 } // namespace RC

deps/first/patternsleuth

@@ -15,6 +15,7 @@ use patternsleuth::resolvers::{
         fuobject_hash_tables::FUObjectHashTablesGet,
         kismet::GNatives,
         ConsoleManagerSingleton,
+        game_loop::UGameEngineTick,
     },
     ResolveError,
 };
@@ -32,6 +33,7 @@ impl_collector! {
         fuobject_hash_tables_get: FUObjectHashTablesGet,
         gnatives: GNatives,
         console_manager_singleton: ConsoleManagerSingleton,
+        gameengine_tick: UGameEngineTick,
     }
 }
 
@@ -82,20 +84,22 @@ pub struct PsScanConfig {
     fuobject_hash_tables_get: bool,
     gnatives: bool,
     console_manager_singleton: bool,
+    gameengine_tick: bool,
 }
 
 #[repr(C)]
 pub struct PsScanResults {
-    guobject_array: usize,
-    fname_tostring: usize,
-    fname_ctor_wchar: usize,
-    gmalloc: usize,
-    static_construct_object_internal: usize,
-    ftext_fstring: usize,
+    guobject_array: u64,
+    fname_tostring: u64,
+    fname_ctor_wchar: u64,
+    gmalloc: u64,
+    static_construct_object_internal: u64,
+    ftext_fstring: u64,
     engine_version: PsEngineVersion,
-    fuobject_hash_tables_get: usize,
-    gnatives: usize,
-    console_manager_singleton: usize,
+    fuobject_hash_tables_get: u64,
+    gnatives: u64,
+    console_manager_singleton: u64,
+    gameengine_tick: u64,
 }
 
 #[derive(Debug, Default)]
@@ -205,6 +209,13 @@ pub fn ps_scan_internal(ctx: &PsCtx, results: &mut PsScanResults) -> Result<(),
         true
     );
 
+    handle!(
+        gameengine_tick,
+        "GameEngineTick",
+        "GameEngineTick.lua",
+        true
+    );
+
     if errors.0.is_empty() {
         Ok(())
     } else {