From 16a28afa0aee12ecf2e74830bb2c7cd94f71277c Mon Sep 17 00:00:00 2001
From: Mathew Tkachuk <me@crx.moe>
Date: Sat, 15 Mar 2025 02:15:04 +0300
Subject: [PATCH] fix: Fix MetaXRAudioWwise patch

---
 .../src/commonMain/kotlin/moe/crx/ovrport/patch/Patch.kt | 9 +++++++--
 .../kotlin/moe/crx/ovrport/patch/PatchStore.kt           | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/Patch.kt b/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/Patch.kt
index 465b371..b243595 100644
--- a/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/Patch.kt
+++ b/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/Patch.kt
@@ -38,7 +38,12 @@ class FileTransformer(val file: File) {
             var matches = true
 
             for (j in i..<bytes.size) {
-                if (inputBytes[j] != "??" && bytes[j] != inputBytes[j].toByte(16)) {
+                val checkIndex = j - i
+                if (checkIndex >= inputBytes.size) {
+                    break
+                }
+
+                if (inputBytes[checkIndex] != "??" && bytes[j].toUByte() != inputBytes[checkIndex].toUByte(16)) {
                     matches = false
                     break
                 }
@@ -46,7 +51,7 @@ class FileTransformer(val file: File) {
 
             if (matches) {
                 val replaced = bytes.slice(0..<i) +
-                        output.split(' ').map { it.toByte(16) } +
+                        output.split(' ').map { it.toUByte(16).toByte() } +
                         bytes.slice(i+inputBytes.size..<bytes.size)
                 file.writeBytes(replaced.toByteArray())
                 return
diff --git a/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/PatchStore.kt b/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/PatchStore.kt
index 27f63d8..7f2ff0f 100644
--- a/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/PatchStore.kt
+++ b/composeApp/src/commonMain/kotlin/moe/crx/ovrport/patch/PatchStore.kt
@@ -237,7 +237,7 @@ object PatchStore {
             }
         }
         PATCHES += Patch("Patch MetaXRAudioWwise") {
-            selectLibrary("liblibMetaXRAudioWwise.so") {
+            selectLibrary("libMetaXRAudioWwise.so") {
                 replaceHex(
                     "57 D0 3B D5 40 EB FF F0 00 0C 2D 91 E8 16 40 F9 A8 83 1F F8 DC 7F 0B 94 00 01 00 B4 E3 03 00 AA 21 EB FF B0",
                     "57 D0 3B D5 20 00 80 D2 1F 20 03 D5 E8 16 40 F9 A8 83 1F F8 1F 20 03 D5 00 01 00 B4 03 00 80 D2 21 EB FF B0"