From 6d98f8c77e1633238f4bcda1c16f47e3034d56be Mon Sep 17 00:00:00 2001 From: xavo95 Date: Fri, 15 Nov 2024 16:01:07 +0100 Subject: [PATCH] Tentative support for 1.4 --- Cargo.toml | 5 ++--- _archive/offsets.rs | 41 +++++++++++++++++++++++++++++++++++++++++ build.bat | 6 ++---- src/offsets.rs | 40 +++++++++++++--------------------------- 4 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 _archive/offsets.rs diff --git a/Cargo.toml b/Cargo.toml index d7e9871..9aade8e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,9 +9,8 @@ crate-type = ["cdylib"] [features] cn_beta_1_4_0 = [] -cn_beta_1_3_0 = [] -cn_live_1_3_0 = [] -os_live_1_3_0 = [] +cn_live_1_4_0 = [] +os_live_1_4_0 = [] enable-sdk = [] only-sig-bypass = [] regular = ["dep:regex", "dep:widestring"] diff --git a/_archive/offsets.rs b/_archive/offsets.rs new file mode 100644 index 0000000..76c6c7f --- /dev/null +++ b/_archive/offsets.rs @@ -0,0 +1,41 @@ +#[cfg(feature = "cn_beta_1_3_0")] +pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { + f_pak_file_check: 0x3D2F460, + f_pak_file_check_preamble: 0x8148574157565340, + #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] + kuro_http_get: 0xFC8CF0, + #[cfg(all(not(feature = "enable-sdk"), not(feature = "only-sig-bypass"), feature = "regular"))] + disable_sdk: DisableSdkConfiguration{ + sdk_dll: s!("KRSDKEx.dll"), + eula_accept: 0x4A690, + sdk_go_away: 0x8BB80, + } +}; + +#[cfg(feature = "cn_live_1_3_0")] +pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { + f_pak_file_check: 0x3D35DF0, + f_pak_file_check_preamble: 0x8148574157565340, + #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] + kuro_http_get: 0xFC9900, + #[cfg(all(not(feature = "enable-sdk"), not(feature = "only-sig-bypass"), feature = "regular"))] + disable_sdk: DisableSdkConfiguration{ + sdk_dll: s!("KRSDKEx.dll"), + eula_accept: 0x4A690, + sdk_go_away: 0x8B9F0, + } +}; + +#[cfg(feature = "os_live_1_3_0")] +pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { + f_pak_file_check: 0x3CDC430, + f_pak_file_check_preamble: 0x8148574157565340, + #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] + kuro_http_get: 0xFC6C20, + #[cfg(all(not(feature = "enable-sdk"), not(feature = "only-sig-bypass"), feature = "regular"))] + disable_sdk: DisableSdkConfiguration{ + sdk_dll: s!("KRSDK.dll"), + eula_accept: 0x95440, + sdk_go_away: 0xA1280 + } +}; \ No newline at end of file diff --git a/build.bat b/build.bat index a37619e..cee836d 100644 --- a/build.bat +++ b/build.bat @@ -15,12 +15,10 @@ EXIT /B 0 SETLOCAL ENABLEDELAYEDEXPANSION : Build for cn_beta_1_4_0 call:cargoReleaseBuild "cn_beta_1_4_0,%~1" %~1 - : Build for cn_beta_1_3_0 - call:cargoReleaseBuild "cn_beta_1_3_0,%~1" %~1 : Build for cn_live_1_3_0 - call:cargoReleaseBuild "cn_live_1_3_0,%~1" %~1 + call:cargoReleaseBuild "cn_live_1_4_0,%~1" %~1 : Build for os_live_1_3_0 - call:cargoReleaseBuild "os_live_1_3_0,%~1" %~1 + call:cargoReleaseBuild "os_live_1_4_0,%~1" %~1 ENDLOCAL EXIT /B 0 diff --git a/src/offsets.rs b/src/offsets.rs index 1d71333..ddfc3fc 100644 --- a/src/offsets.rs +++ b/src/offsets.rs @@ -19,7 +19,7 @@ pub(crate) struct InjectConfiguration { #[cfg(feature = "cn_beta_1_4_0")] pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { - f_pak_file_check: 0x3E37D90, // 0x3E37D90 + f_pak_file_check: 0x3E37D90, f_pak_file_check_preamble: 0x8148574157565340, #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] kuro_http_get: 0xFE9E00, @@ -31,44 +31,30 @@ pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { } }; -#[cfg(feature = "cn_beta_1_3_0")] +#[cfg(feature = "cn_live_1_4_0")] pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { - f_pak_file_check: 0x3D2F460, - f_pak_file_check_preamble: 0x8148574157565340, + f_pak_file_check: 0x3E3FCB0, + f_pak_file_check_preamble: 0x5741544156535540, #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] - kuro_http_get: 0xFC8CF0, + kuro_http_get: 0xFED3E0, #[cfg(all(not(feature = "enable-sdk"), not(feature = "only-sig-bypass"), feature = "regular"))] disable_sdk: DisableSdkConfiguration{ sdk_dll: s!("KRSDKEx.dll"), - eula_accept: 0x4A690, - sdk_go_away: 0x8BB80, + eula_accept: 0x4A6D0, + sdk_go_away: 0x8BB40, } }; -#[cfg(feature = "cn_live_1_3_0")] +#[cfg(feature = "os_live_1_4_0")] pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { - f_pak_file_check: 0x3D35DF0, - f_pak_file_check_preamble: 0x8148574157565340, + f_pak_file_check: 0x3DE6650, + f_pak_file_check_preamble: 0x5741544156535540, #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] - kuro_http_get: 0xFC9900, - #[cfg(all(not(feature = "enable-sdk"), not(feature = "only-sig-bypass"), feature = "regular"))] - disable_sdk: DisableSdkConfiguration{ - sdk_dll: s!("KRSDKEx.dll"), - eula_accept: 0x4A690, - sdk_go_away: 0x8B9F0, - } -}; - -#[cfg(feature = "os_live_1_3_0")] -pub(crate) const CONFIG: InjectConfiguration = InjectConfiguration { - f_pak_file_check: 0x3CDC430, - f_pak_file_check_preamble: 0x8148574157565340, - #[cfg(all(not(feature = "only-sig-bypass"), feature = "regular"))] - kuro_http_get: 0xFC6C20, + kuro_http_get: 0xFEA7A0, #[cfg(all(not(feature = "enable-sdk"), not(feature = "only-sig-bypass"), feature = "regular"))] disable_sdk: DisableSdkConfiguration{ sdk_dll: s!("KRSDK.dll"), - eula_accept: 0x95440, - sdk_go_away: 0xA1280 + eula_accept: 0x959D0, + sdk_go_away: 0xA1810 } }; \ No newline at end of file