1.20.80.20 preview and 1.20.80.21 preview

Author: ddf8196

src/Loader.cpp

@@ -63,16 +63,22 @@ void __attribute__((constructor)) init() {
 
     #if __arm__
         //ResourcePackManager::ResourcePackManager
-        //1.20.50.20 preview
-        ResourcePackManager_ResourcePackManager = FindSig(minecraftpeDetails, "F0 B5 03 AF 2D E9 00 07 90 B0 05 46 AD 48 98 46 92 46 78 44 00 68 00 68 0F 90 08 69");
+        ResourcePackManager_ResourcePackManager = FindSignatures(minecraftpeDetails,
+            //1.20.50.20 preview
+            "F0 B5 03 AF 2D E9 00 07 90 B0 05 46 AD 48 98 46 92 46 78 44 00 68 00 68 0F 90 08 69"
+        );
 
         //AppPlatform::readAssetFile
-        //1.20.50.20 preview
-        AppPlatform_readAssetFile = FindSig(minecraftpeDetails, "F0 B5 03 AF 4D F8 04 8D 9C B0 04 46 6E 48 78 44 00 68 00 68 1B 90 00 20 CD E9 08 00");
-        if (!AppPlatform_readAssetFile) {
+        AppPlatform_readAssetFile = FindSignatures(minecraftpeDetails,
+            //1.20.50.20 preview
+            "F0 B5 03 AF 4D F8 04 8D 9C B0 04 46 6E 48 78 44 00 68 00 68 1B 90 00 20 CD E9 08 00",
             //1.20.50.03
-            AppPlatform_readAssetFile = FindSig(minecraftpeDetails, "F0 B5 03 AF 4D F8 04 8D 9C B0 04 46 5E 48 78 44 00 68 00 68 1B 90 00 20 CD E9 08 00");
-        }
+            "F0 B5 03 AF 4D F8 04 8D 9C B0 04 46 5E 48 78 44 00 68 00 68 1B 90 00 20 CD E9 08 00",
+            //1.20.80.20 preview
+            "F0 B5 03 AF 4D F8 04 8D 9E B0 04 46 6E 48 78 44 00 68 00 68 1D 90 00 20 CD E9 09 00",
+            //1.20.80.21 preview
+            "F0 B5 03 AF 4D F8 04 8D A0 B0 04 46 85 48 78 44 00 68 00 68 1F 90 00 20 CD E9 09 00",
+        );
 
         if (ResourcePackManager_ResourcePackManager) {
             ResourcePackManager_ResourcePackManager += 1;
@@ -82,12 +88,20 @@ void __attribute__((constructor)) init() {
         }
     #elif __aarch64__
         //ResourcePackManager::ResourcePackManager
-        //1.20.50.20 preview
-        ResourcePackManager_ResourcePackManager = FindSig(minecraftpeDetails, "FF 03 03 D1 FD 7B 07 A9 FD C3 01 91 F9 43 00 F9 F8 5F 09 A9 F6 57 0A A9 F4 4F 0B A9 59 D0 3B D5 F6 03 03 2A 28 17 40 F9 F5 03 02 AA F3 03 00 AA A8 83 1F F8 28 10 40 F9");
+        ResourcePackManager_ResourcePackManager = FindSignatures(minecraftpeDetails,
+            //1.20.50.20 preview
+            "FF 03 03 D1 FD 7B 07 A9 FD C3 01 91 F9 43 00 F9 F8 5F 09 A9 F6 57 0A A9 F4 4F 0B A9 59 D0 3B D5 F6 03 03 2A 28 17 40 F9 F5 03 02 AA F3 03 00 AA A8 83 1F F8 28 10 40 F9"
+        );
 
         //AppPlatform::readAssetFile
-        //1.20.50.20 preview
-        AppPlatform_readAssetFile = FindSig(minecraftpeDetails, "FF 03 04 D1 FD 7B 0C A9 FD 03 03 91 FC 5F 0D A9 F6 57 0E A9 F4 4F 0F A9 57 D0 3B D5 F3 03 08 AA E8 16 40 F9 A8 83 1F F8 FF 7F 02 A9");
+        AppPlatform_readAssetFile = FindSignatures(minecraftpeDetails,
+            //1.20.50.20 preview
+            "FF 03 04 D1 FD 7B 0C A9 FD 03 03 91 FC 5F 0D A9 F6 57 0E A9 F4 4F 0F A9 57 D0 3B D5 F3 03 08 AA E8 16 40 F9 A8 83 1F F8 FF 7F 02 A9",
+            //1.20.80.20 preview
+            "FF ?? 04 D1 FD 7B ?? A9 FD ?? 03 91 FC 5F ?? A9 F6 57 ?? A9 F4 4F ?? A9 57 D0 3B D5 F3 03 08 AA E8 16 40 F9 A8 83 1F F8",
+            //1.20.80.21 preview
+            "FF 83 04 D1 FD 7B 0E A9 FD 83 03 91 FC 5F 0F A9 F6 57 10 A9 F4 4F 11 A9 57 D0 3B D5 F3 03 08 AA E8 16 40 F9 A8 83 1F F8"
+        );
     #else
         #error unsupported architecture
     #endif

src/Util.h

@@ -1,13 +1,19 @@
+#pragma once
+
 #include <cstdint>
 #include <vector>
+#include <string>
 #include "frida-gum.h"
 
-inline uintptr_t FindSig(const GumModuleDetails* moduleInfo, const char* signature) {
+#define FindSignature FindSig
+#define FindSignatures(moduleInfo, ...) FindSigs(moduleInfo, {__VA_ARGS__})
+
+inline uintptr_t FindSig(const GumModuleDetails* moduleInfo, const std::string& signature) {
     uintptr_t moduleBase = (uintptr_t)moduleInfo->range->base_address;
     size_t moduleSize = moduleInfo->range->size;
 
     std::vector<uint16_t> pattern;
-    for (int i = 0; i < strlen(signature); i++) {
+    for (int i = 0; i < signature.size(); i++) {
         if (signature[i] == ' ')
             continue;
         if (signature[i] == '?') {
@@ -45,4 +51,14 @@ inline uintptr_t FindSig(const GumModuleDetails* moduleInfo, const char* signatu
     }
 
     return 0;
-}
+}
+
+inline uintptr_t FindSigs(const GumModuleDetails* moduleInfo, const std::initializer_list<std::string>& signatures) {
+    uintptr_t ptr = 0;
+    for (auto& sig : signatures) {
+        if ((ptr = FindSig(moduleInfo, sig))) {
+            break;
+        }
+    }
+    return ptr;
+}