Support address library

psiberx · Feb 29, 2024 · 4b9f56c · 4b9f56c
1 parent 55e1e00
commit 4b9f56c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -16,12 +16,12 @@ With the mod you can:
 
 ### Compatibility
 
-- Cyberpunk 2077 2.11
+- Cyberpunk 2077 2.12+
 
 ### Installation
 
 1. Install requirements:
-   - [RED4ext](https://docs.red4ext.com/getting-started/installing-red4ext) 1.22.0+
+   - [RED4ext](https://docs.red4ext.com/getting-started/installing-red4ext) 1.23.0+
 2. Extract the release archive `ArchiveXL-x.x.x.zip` into the Cyberpunk 2077 directory.
 
 ## Documentation

diff --git a/lib/Core/Memory/AddressResolver.hpp b/lib/Core/Memory/AddressResolver.hpp
@@ -1,13 +1,11 @@
 #pragma once
 
-#include "Core/Memory/Common.hpp"
-
 namespace Core
 {
 class AddressResolver
 {
 public:
-    virtual uintptr_t ResolveAddress(AddressSegment aSegment, uint32_t aAddressHash) = 0;
+    virtual uintptr_t ResolveAddress(uint32_t aAddressID) = 0;
 
     static void SetDefault(AddressResolver& aResolver);
     static AddressResolver& GetDefault();

diff --git a/lib/Core/Memory/Common.hpp b/lib/Core/Memory/Common.hpp
diff --git a/lib/Core/Raw.hpp b/lib/Core/Raw.hpp
@@ -65,7 +65,7 @@ class RawFunc<A, R (*)(Args...)> : public RawBase
         }
         else
         {
-            address = AddressResolver::GetDefault().ResolveAddress(AddressSegment::Text, target);
+            address = AddressResolver::GetDefault().ResolveAddress(target);
         }
     }
 
@@ -187,7 +187,7 @@ class RawPtr : public RawBase
         }
         else
         {
-            static uintptr_t addr = AddressResolver::GetDefault().ResolveAddress(AddressSegment::Data, target);
+            static uintptr_t addr = AddressResolver::GetDefault().ResolveAddress(target);
             return addr;
         }
     }

diff --git a/lib/Support/RED4ext/RED4extProvider.cpp b/lib/Support/RED4ext/RED4extProvider.cpp
@@ -66,7 +66,7 @@ bool Support::RED4extProvider::HookDetach(uintptr_t aAddress)
     return m_sdk->hooking->Detach(m_plugin, reinterpret_cast<void*>(aAddress));
 }
 
-uintptr_t Support::RED4extProvider::ResolveAddress(Core::AddressSegment aSegment, uint32_t aAddressHash)
+uintptr_t Support::RED4extProvider::ResolveAddress(uint32_t aAddressID)
 {
-    return RED4ext::UniversalRelocBase::Resolve(static_cast<RED4ext::UniversalRelocSegment>(aSegment), aAddressHash);
+    return RED4ext::UniversalRelocBase::Resolve(aAddressID);
 }
diff --git a/lib/Support/RED4ext/RED4extProvider.hpp b/lib/Support/RED4ext/RED4extProvider.hpp
@@ -26,7 +26,7 @@ class RED4extProvider
     bool HookAttach(uintptr_t aAddress, void* aCallback, void** aOriginal) override;
     bool HookDetach(uintptr_t aAddress) override;
 
-    uintptr_t ResolveAddress(Core::AddressSegment aSegment, uint32_t aAddressHash) override;
+    uintptr_t ResolveAddress(uint32_t aAddressID) override;
 
     auto EnableLogging() noexcept
     {

diff --git a/src/App/Project.hpp b/src/App/Project.hpp
@@ -12,5 +12,5 @@ constexpr auto Author = "psiberx";
 constexpr auto NameW = L"ArchiveXL";
 constexpr auto AuthorW = L"psiberx";
 
-constexpr auto Version = semver::from_string_noexcept("1.11.4").value();
+constexpr auto Version = semver::from_string_noexcept("1.12.0").value();
 }
diff --git a/src/App/Version.rc b/src/App/Version.rc
@@ -1,9 +1,9 @@
-#define VER_PRODUCTVERSION     1,11,4,0
-#define VER_FILEVERSION        1,11,4,2402291928
+#define VER_PRODUCTVERSION     1,12,0,0
+#define VER_FILEVERSION        1,12,0,2402292351
 
 #define VER_PRODUCTNAME_STR    "ArchiveXL\0"
-#define VER_PRODUCTVERSION_STR "1.11.4\0"
-#define VER_FILEVERSION_STR    "1.11.4.2402291928\0"
+#define VER_PRODUCTVERSION_STR "1.12.0\0"
+#define VER_FILEVERSION_STR    "1.12.0.2402292351\0"
 
 1 VERSIONINFO
 FILEVERSION     VER_FILEVERSION

diff --git a/src/Red/Addresses/Library.hpp b/src/Red/Addresses/Library.hpp
@@ -12,11 +12,11 @@ constexpr uint32_t AppearanceChanger_GetSuffixValue = 1003499294;
 constexpr uint32_t AppearanceChanger_RegisterPart = 3169139695;
 constexpr uint32_t AppearanceChanger_SelectAppearanceName = 2770550105;
 
-constexpr uint32_t AppearanceChangeSystem_ChangeAppearance = 633157431;
+constexpr uint32_t AppearanceChangeSystem_ChangeAppearance = 386815609;
 
 constexpr uint32_t AppearanceNameVisualTagsPreset_GetVisualTags = 1186798404;
 
-constexpr uint32_t AppearanceResource_FindAppearanceDefinition = 985997606;
+constexpr uint32_t AppearanceResource_FindAppearanceDefinition = 549398675;
 
 constexpr uint32_t AttachmentSlots_InitializeSlots = 3224838039;
 constexpr uint32_t AttachmentSlots_IsSlotEmpty = 4231927464;

diff --git a/src/main.cpp b/src/main.cpp
@@ -40,7 +40,7 @@ RED4EXT_C_EXPORT void RED4EXT_CALL Query(RED4ext::PluginInfo* aInfo)
                                     App::Project::Version.minor,
                                     App::Project::Version.patch);
 
-    aInfo->runtime = RED4EXT_RUNTIME_LATEST;
+    aInfo->runtime = RED4EXT_RUNTIME_INDEPENDENT;
     aInfo->sdk = RED4EXT_SDK_LATEST;
 }
 

diff --git a/vendor/RED4ext.SDK b/vendor/RED4ext.SDK
diff --git a/xmake.lua b/xmake.lua
@@ -1,7 +1,7 @@
 set_xmakever("2.5.9")
 
 set_project("ArchiveXL")
-set_version("1.11.4", {build = "%y%m%d%H%M"})
+set_version("1.12.0", {build = "%y%m%d%H%M"})
 
 set_arch("x64")
 set_languages("cxx2a")
+1 −0		include/RED4ext/Api/Runtime.hpp
+2 −1		include/RED4ext/Api/v0/Runtime.hpp
+4 −4		include/RED4ext/CNamePool-inl.hpp
+7 −7		include/RED4ext/CString-inl.hpp
+5 −5		include/RED4ext/Detail/AddressHashes.hpp
+1 −1		include/RED4ext/DynArray.hpp
+1 −1		include/RED4ext/GameEngine-inl.hpp
+1 −1		include/RED4ext/Handle.hpp
+5 −5		include/RED4ext/ISerializable-inl.hpp
+10 −10		include/RED4ext/JobQueue-inl.hpp
+7 −7		include/RED4ext/Memory/Allocators.hpp
+1 −1		include/RED4ext/Memory/SharedPtr.hpp
+1 −1		include/RED4ext/Memory/Vault-inl.hpp
+2 −2		include/RED4ext/RTTISystem-inl.hpp
+28 −28		include/RED4ext/RTTITypes-inl.hpp
+3 −3		include/RED4ext/RTTITypes.hpp
+27 −27		include/RED4ext/Relocation-inl.hpp
+5 −11		include/RED4ext/Relocation.hpp
+1 −1		include/RED4ext/ResourceDepot-inl.hpp
+1 −1		include/RED4ext/ResourceLoader-inl.hpp
+6 −6		include/RED4ext/ResourceLoader.hpp
+4 −4		include/RED4ext/Scripting/Functions-inl.hpp
+3 −3		include/RED4ext/Scripting/Functions.hpp
+2 −2		include/RED4ext/Scripting/IScriptable-inl.hpp
+2 −2		include/RED4ext/Scripting/Natives/Generated/cp/PlayerSystem.hpp
+1 −1		include/RED4ext/Scripting/Natives/Generated/quest/ICharacterConditionType.hpp
+1 −1		include/RED4ext/Scripting/OpcodeHandlers-inl.hpp
+1 −1		include/RED4ext/Scripting/Stack-inl.hpp
+1 −1		include/RED4ext/SortedArray.hpp
+2 −2		include/RED4ext/SystemUpdate-inl.hpp
+3 −3		include/RED4ext/TweakDB-inl.hpp