fix: patch native mac correctly (hopefully!)

blurite · Jul 9, 2024 · 2363368 · 2363368
1 parent 1816656
commit 2363368
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/patch/patch-native/src/main/kotlin/net/rsprox/patch/native/NativePatcher.kt b/patch/patch-native/src/main/kotlin/net/rsprox/patch/native/NativePatcher.kt
@@ -1,31 +1,40 @@
 package net.rsprox.patch.native
 
 import com.github.michaelbull.logging.InlineLogger
+import net.rsprox.patch.NativeClientType
 import net.rsprox.patch.PatchResult
 import net.rsprox.patch.Patcher
 import java.nio.file.LinkOption
 import java.nio.file.Path
 import kotlin.io.path.isRegularFile
 
-public class NativePatcher : Patcher {
+public class NativePatcher : Patcher<NativeClientType> {
     override fun patch(
         path: Path,
         rsa: String,
         javConfigUrl: String,
         worldListUrl: String,
         port: Int,
+        metadata: NativeClientType,
     ): PatchResult {
         if (!path.isRegularFile(LinkOption.NOFOLLOW_LINKS)) {
             throw IllegalArgumentException("Path $path does not point to a file.")
         }
         logger.debug { "Attempting to patch $path" }
         val bytes = path.toFile().readBytes()
         val result = patchModulus(bytes, rsa)
-        patchLocalhost(bytes)
+        when (metadata) {
+            NativeClientType.WIN -> {
+                patchLocalhost(bytes)
+                patchJs5Port(bytes, port)
+                patchGamePort(bytes, port)
+            }
+            NativeClientType.MAC -> {
+                patchMacPort(bytes, port)
+            }
+        }
         patchJavConfig(bytes, javConfigUrl)
         patchWorldList(bytes, worldListUrl)
-        patchJs5Port(bytes, port)
-        patchGamePort(bytes, port)
         logger.debug { "Successfully patched $path" }
         path.toFile().writeBytes(bytes)
         return PatchResult.Success(
@@ -50,6 +59,14 @@ public class NativePatcher : Patcher {
         logger.debug { "Replaced game port 43594 with $port" }
     }
 
+    private fun patchMacPort(
+        bytes: ByteArray,
+        port: Int,
+    ) {
+        bytes.patchPort(0xBE, port)
+        logger.debug { "Replaced game port 43594 with $port" }
+    }
+
     private fun ByteArray.patchPort(
         opcode: Int,
         port: Int,

diff --git a/...prox/proxy/downloader/NativeClientType.kt → ...tlin/net/rsprox/patch/NativeClientType.kt b/...prox/proxy/downloader/NativeClientType.kt → ...tlin/net/rsprox/patch/NativeClientType.kt
@@ -1,4 +1,4 @@
-package net.rsprox.proxy.downloader
+package net.rsprox.patch
 
 public enum class NativeClientType(
     public val systemShortName: String,

diff --git a/patch/src/main/kotlin/net/rsprox/patch/Patcher.kt b/patch/src/main/kotlin/net/rsprox/patch/Patcher.kt
@@ -2,12 +2,13 @@ package net.rsprox.patch
 
 import java.nio.file.Path
 
-public fun interface Patcher {
+public fun interface Patcher<T> {
     public fun patch(
         path: Path,
         rsa: String,
         javConfigUrl: String,
         worldListUrl: String,
         port: Int,
+        metadata: T,
     ): PatchResult
 }
diff --git a/proxy/src/main/kotlin/net/rsprox/proxy/downloader/NativeClientDownloader.kt b/proxy/src/main/kotlin/net/rsprox/proxy/downloader/NativeClientDownloader.kt
@@ -1,6 +1,7 @@
 package net.rsprox.proxy.downloader
 
 import com.github.michaelbull.logging.InlineLogger
+import net.rsprox.patch.NativeClientType
 import net.rsprox.proxy.config.CLIENTS_DIRECTORY
 import java.nio.ByteBuffer
 import java.nio.file.Files