Merge pull request #17 from Mrwang2408/PR

1.21.50.07 and 1.21.60.21
ddf8196 · Dec 4, 2024 · b4b85f6 · b4b85f6
2 parents ec3ef20 + 39c0936
commit b4b85f6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
         with:
           tag_name: ${{ github.run_number }}
           name: Release ${{ github.run_number }}
-          body: Support 1.21.1 release and 1.21.10.24 preview
+          body: Support 1.21.50 release and 1.21.60.21 preview
           draft: false
           prerelease: false
           files: |

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 A Frida module let Minecraft read the .material.bin file from the resource pack, just like how we load third-party shaders before.
 
 > [!NOTE]
-> Release 10 supports 1.21.1, 1.21.2, 1.21.20 release and 1.21.10.24 preview.
+> Release 15 supports 1.21.20, 1.21.30, 1.21.40, 1.21.50 release and 1.21.60.21 preview.
 
 <!--maybe check latest preview support?-->
 

diff --git a/src/Loader.cpp b/src/Loader.cpp
@@ -68,19 +68,31 @@ void __attribute__((constructor)) init() {
         //ResourcePackManager::ResourcePackManager
         ResourcePackManager_ResourcePackManager = FindSignatures(minecraftpeDetails,
             //1.20.50-1.20.81
-            "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",
+            //"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",
             //1.21.0-1.21.31
-            "F0 B5 03 AF 2D E9 00 07 90 B0 05 46 AE 48 98 46 92 46 78 44 00 68 00 68 0F 90 08 69",
+            //"F0 B5 03 AF 2D E9 00 07 90 B0 05 46 AE 48 98 46 92 46 78 44 00 68 00 68 0F 90 08 69",
             //1.21.40-1.21.41
-            "F0 B5 03 AF 2D E9 00 0F 8F B0 05 46 B1 48 98 46 92 46 78 44 00 68 00 68 0E 90 08 69" 
+            //"F0 B5 03 AF 2D E9 00 0F 8F B0 05 46 B1 48 98 46 92 46 78 44 00 68 00 68 0E 90 08 69",
+            //1.21.50.07
+            //"F0 B5 03 AF 2D E9 00 0F 8F B0 05 46 B0 48 98 46 92 46 78 44 00 68 00 68 0E 90 08 69",
+            //1.21.60.21preview
+            //"F0 B5 03 AF 2D E9 00 0F 8F B0 05 46 BE 48 98 46 92 46 78 44 00 68 00 68 0E 90 08 69",
+            //1.20.50-1.21.50-1.21.60.21  arm32  ::ResourcePackManager
+            "F0 B5 03 AF 2D E9 00 ?? ?? B0 05 46 ?? 48 98 46 92 46 78 44 00 68 00 68 ?? 90 08 69"
         );
 
         //AppPlatform::readAssetFile
         AppPlatform_readAssetFile = FindSignatures(minecraftpeDetails,
+            //1.20.50.21preview
+            //"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-1.20.73
-            "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-1.21.41
-            "F0 B5 03 AF 4D F8 04 8D A0 B0 04 46 75 48 78 44 00 68 00 68 1F 90 00 20 CD E9 09 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-1.21.50
+            //"F0 B5 03 AF 4D F8 04 8D A0 B0 04 46 75 48 78 44 00 68 00 68 1F 90 00 20 CD E9 09 00",
+			//1.21.60.21preview
+            //"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",
+            //1.20.50-1.21.50-1.21.60.21  arm32  ::readAssetFile
+            "F0 B5 03 AF 4D F8 04 8D ?? B0 04 46 ?? 48 78 44 00 68 00 68 ?? 90 00 20 CD E9 ?? 00"
         );
 
         if (ResourcePackManager_ResourcePackManager) {
@@ -92,15 +104,17 @@ void __attribute__((constructor)) init() {
     #elif __aarch64__
         //ResourcePackManager::ResourcePackManager
         ResourcePackManager_ResourcePackManager = FindSignatures(minecraftpeDetails,
-            //1.20.50-1.21.41
-            "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"
+            //1.20.50-1.21.50
+            "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",
+			//1.21.60.21preview
+            "FF 83 02 D1 FD 7B 06 A9 FD 83 01 91 F8 5F 07 A9 F6 57 08 A9 F4 4F 09 A9 58 D0 3B D5 F6 03 03 2A 08 17 40 F9 F5 03 02 AA F3 03 00 AA A8 83 1F F8 28 10 40 F9 28 01 00 B4"
         );
 
         //AppPlatform::readAssetFile
         AppPlatform_readAssetFile = FindSignatures(minecraftpeDetails,
             //1.20.50-1.20.73
             "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-1.21.41
+            //1.20.80-1.21.50
             "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 FF FF 02 A9"
         );
     #else