v3.0.11

README.md

@@ -1,14 +1,12 @@
 ### Games and regions
-- **3rd**: glb/sea/tw/kr/jp **v6.8.0**, **cn v6.9.0 broken**
-- **SR**: os/cn **v1.2.0** (potentially unsafe, but no bans were reported since v1.1.0) 
+- **3rd**: glb/sea/tw/kr/jp **v7.0.0+**, cn **v7.1.0+**
+- **SR**: os/cn **v1.5.0** (WARNING: currently potentially unsafe, there were some concerning changes in the last update)
 
-~~You can expect newer versions of 3rd to work immediately after release with the same jadeite binary. However, that is not the case for SR: you will have to update your jadeite binary to run newer versions.~~ 6.9.0 investigation is in progress, please wait. #25
+You can expect newer versions to work immediately after release with the same jadeite binary if the version is specified with a + above.
 
 ### Information
 The anticheat the games use is fundamentally incompatible with Wine in multiple ways. This tool launches the game without it (`injector`) and imitates it's behaviour (`game_payload`).
 
-**SR-specific**: this tool disables the use of DirectX shared resources in a rather hacky way. It is required, as there is no (and most likely never will be) shared resources support in DirectX translation layers (WineD3D/DXVK). Refer to [configuration](#configuration) if you wish to run the game without the fix.
-
 **Using third-party software (such as this tool) with the games violates their Terms of Service**. Therefore, **you may receive a ban**. No bans were ever reported with 3rd, however the legacy patch for SR did cause many. **Use at your own risk and only if you understand all the possible consequences**.
 
 **This is not a cheating tool**. Using it with Windows is not possible, and Windows support is not planned or intended in any way. However, as it does not perform any on-disk file modifications, you may reuse the same game install for Windows if you have a dual-boot setup.
@@ -18,7 +16,9 @@ The anticheat the games use is fundamentally incompatible with Wine in multiple
 
 **Wine 8.0+ is recommended**, as lower versions leak "The Wine project" as the device identifier. Not critical, but taking a precaution never hurt anyone. **DXVK is strongly recommended.**
 
-**3rd-specific**: In some cases, and if you're not using Proton GE, **a fix for Media Foundation may be required to play videos. The Game may crash without it.**  You can download it from [here](https://github.com/z0z0z/mf-install). You might need to [limit the number of cores available to the game](https://github.com/z0z0z/mf-install/issues/44) if your CPU has more than 8. **IMPORTANT: do not run the mfplat fix under Proton GE. Doing so may irreparably damage your game installation!**
+**3rd-specific**: 
+- ~~In some cases, and if you're not using Proton GE, a fix for Media Foundation may be required to play videos. The Game may crash without it.  You can download it from [here](https://github.com/z0z0z/mf-install).~~ **Unfortunately, it appears like the fix is no longer available, please use [Wine-GE-Proton](https://github.com/GloriousEggroll/wine-ge-custom) instead.** 
+- You might need to [limit the number of cores available to the game](https://github.com/z0z0z/mf-install/issues/44) if your CPU has more than 8.
 
 Manual usage instructions:
 - Download the game you want to run
@@ -36,9 +36,6 @@ These environment variables can be used to configure the behaviour of the tool.
 
 - `WAIT_BEFORE_RESUME=1` - show a messagebox and wait for user input before resuming the game process. Useful on my side for debugging
 
-**SR-exclusive**:
-- `SRFIX_DISABLE=1` - disable shared resources fix. Not recommended. Doing so will most likely cause the game to not run at all
-
 ### Internals
 This tool consists of three parts: the main injector (`injector/src/exe.c`), the launcher payload (`injector/src/dll.c`) and the game payload (`game_payload`).
 

game_payload/src/hi3.c

@@ -1,30 +1,20 @@
 #include <utils.h>
 #include <msg.h>
+#include <pe.h>
+#include <main.h>
 
 #include <game.h>
 
-const char *HI3_TXS_SECTION_NAME_OLD = ".bh3";
-const char *HI3_TXS_SECTION_NAME_NEW = ".ace";
-
 const char *HI3_BASE_MODULE_NAME = "BH3Base.dll";
 const char *HI3_ASSEMBLY_PATH    = "BH3_Data\\Native\\UserAssembly.dll";
+const char *HI3_TXS_SECTION_NAME = ".ace";
 const char *HI3_TVM_SECTION_NAME = ".tvm0";
 
 
 void hi3_fill_data(struct game_data *buf) {
-    // !!! TEMPORARY WORKAROUND FOR HI3 6.8.0 -> 6.9.0
-    const uint32_t NEW_CHECKSUM = 0x885b4c63;
-
-    uint32_t crc = utils_file_crc32c(L"UnityPlayer.dll");
-
-    if (crc == NEW_CHECKSUM) {
-        buf->txs_section_name = HI3_TXS_SECTION_NAME_NEW;
-    } else {
-        buf->txs_section_name = HI3_TXS_SECTION_NAME_OLD;
-    }
-
     buf->base_module_name = HI3_BASE_MODULE_NAME;
     buf->assembly_path = HI3_ASSEMBLY_PATH;
+    buf->txs_section_name = HI3_TXS_SECTION_NAME;
     buf->tvm_section_name = HI3_TVM_SECTION_NAME;
 
     buf->unityplayer_callback = NULL;

game_payload/src/hsr.c

@@ -9,6 +9,8 @@ const char *HSR_ASSEMBLY_PATH    = "GameAssembly.dll";
 const char *HSR_TXS_SECTION_NAME = ".ace";
 const char *HSR_TVM_SECTION_NAME = ".tvm0";
 
+#define HSR_VERSION "1.5.0"
+
 enum hsr_region {
     HSR_INVALID,
     HSR_OS,
@@ -21,15 +23,15 @@ struct crc_region_pair {
 };
 
 const struct crc_region_pair HSR_REGIONS[] = {
-    { 0x9eb3084e, HSR_OS }, // os v1.2.0
-    { 0x14be07e9, HSR_CN }  // cn v1.2.0
+    { 0xb90cbc61, HSR_OS }, // os v1.5.0
+    { 0xee3eebfb, HSR_CN }  // cn v1.5.0
 };
 
 #define JUMP_SIZE (6 + sizeof(void*))
 
 // Temporarily hardcoded offset
-// v1.2.0, same for os and cn
-#define WTSUD_PATCH_OFFSET 0x16430
+// v1.5.0, same for os and cn
+#define WTSUD_PATCH_OFFSET 0x1b800 // 0x16550 will also work
 
 char wtsud_original_bytes[JUMP_SIZE];
 char *wtsud_patch_addr;
@@ -47,12 +49,12 @@ static void _wtsud_stub() {
 }
 
 static void _unityplayer_callback(HMODULE unityModule) {
-    if (utils_env_enabled("SRFIX_DISABLE")) {
-        msg_info_a("Shared resources fix disabled. The game may not work");
+    if (utils_env_enabled("CHECKSUM_PATCH_DISABLE")) {
+        msg_info_a("DirectX library verification patch disabled. The game will not work");
         return;
     }
 
-    // Remove dependency on shared resources by patching WriteTextureStatisticUserData
+    // Remove check by patching WriteTextureStatisticUserData
     unload_ctr_inc();
 
     wtsud_patch_addr = ((char*)unityModule) + WTSUD_PATCH_OFFSET;
@@ -86,7 +88,7 @@ void hsr_fill_data(struct game_data *buf) {
     }
     
     if (id == HSR_INVALID) {
-        msg_err_a("Invalid UnityPlayer.dll checksum: 0x%08x. This usually happens when the patch is outdated", crc);
+        msg_err_a("Invalid UnityPlayer.dll checksum: 0x%08x. This patch is intended to be used with HSR v" HSR_VERSION, crc);
     }
 
     buf->base_module_name = HSR_BASE_MODULE_NAME;

meson.build

@@ -1,4 +1,4 @@
-project('jadeite', 'c', version: '3.0.6')
+project('jadeite', 'c', version: '3.0.11')
 
 nasm = find_program('nasm')
 gen_res = find_program('gen_resources.sh')

metadata.json

@@ -1,42 +1,42 @@
 {
     "jadeite": {
-        "version": "3.0.6"
+        "version": "3.0.11"
     },
     "games": {
         "hi3rd": {
             "global": {
                 "status": "verified",
-                "version": "6.8.0"
+                "version": "7.0.0"
             },
             "sea": {
                 "status": "verified",
-                "version": "6.8.0"
+                "version": "7.0.0"
             },
             "china": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.1.0"
             },
             "taiwan": {
                 "status": "verified",
-                "version": "6.8.0"
+                "version": "7.0.0"
             },
             "korea": {
                 "status": "verified",
-                "version": "6.8.0"
+                "version": "7.0.0"
             },
             "japan": {
                 "status": "verified",
-                "version": "6.8.0"
+                "version": "7.0.0"
             }
         },
         "hsr": {
             "global": {
-                "status": "verified",
-                "version": "1.2.0"
+                "status": "concerning",
+                "version": "1.5.0"
             },
             "china": {
-                "status": "verified",
-                "version": "1.2.0"
+                "status": "concerning",
+                "version": "1.5.0"
             }
         }
     }