Fix more issues with library not loading

Author: BluSpring

library/src/main/kotlin/xyz/bluspring/unitytranslate/library/UnityTranslateLib.kt

@@ -62,6 +62,35 @@ class UnityTranslateLib(val path: Path) {
 
     companion object {
         val logger: Logger = LoggerFactory.getLogger(UnityTranslateLib::class.java)
+        private val platformLibs: List<String>
+            get() {
+                val osName = System.getProperty("os.name").lowercase()
+                val osArch = System.getProperty("os.arch").lowercase()
+                val isWindows = osName.contains("win")
+                val isMac = osName.contains("mac")
+
+                val dir = "unitytranslate/${if (isWindows) "windows" else if (isMac) "osx" else "linux"}-${osArch}"
+
+                return if (osArch == "amd64") {
+                    if (isWindows)
+                        listOf(
+                            "$dir/UnityTranslateLib.dll",
+                            "$dir/ctranslate2.dll",
+                            "$dir/cudnn64_9.dll",
+                            "$dir/libiomp5md.dll"
+                        )
+                    else if (isMac)
+                        listOf()
+                    else
+                        listOf(
+                            "$dir/libUnityTranslateLib.so",
+                            "$dir/libctranslate2.so",
+                            "$dir/libcudnn.so",
+                            "$dir/libgomp.so"
+                        )
+                } else emptyList()
+            }
+        private val cachedPlatformLibs = platformLibs
 
         // Modified from ImGui-java's library loading - https://github.com/SpaiR/imgui-java/blob/main/imgui-binding/src/main/java/imgui/ImGui.java
         init {
@@ -86,8 +115,14 @@ class UnityTranslateLib(val path: Path) {
                             throw joined
                         }
 
+                        val osName = System.getProperty("os.name").lowercase()
+                        val osArch = System.getProperty("os.arch").lowercase()
+                        val isWindows = osName.contains("win")
+                        val isMac = osName.contains("mac")
+                        val dir = "unitytranslate/${if (isWindows) "windows" else if (isMac) "osx" else "linux"}-${osArch}/"
+
                         for (lib in platformLibs.reversed()) {
-                            System.load(extractedPath.resolve(lib).absolutePathString())
+                            System.load(extractedPath.resolve(lib.removePrefix(dir)).absolutePathString())
                         }
                     }
                 }
@@ -108,35 +143,6 @@ class UnityTranslateLib(val path: Path) {
             return System.getProperty("unitytranslate.library.name", "${libPrefix}UnityTranslateLib${libSuffix}")
         }
 
-        private val platformLibs: List<String>
-            get() {
-                val osName = System.getProperty("os.name").lowercase()
-                val osArch = System.getProperty("os.arch").lowercase()
-                val isWindows = osName.contains("win")
-                val isMac = osName.contains("mac")
-
-                val dir = "unitytranslate/${if (isWindows) "windows" else if (isMac) "osx" else "linux"}-${osArch}"
-
-                return if (osArch == "amd64") {
-                    if (isWindows)
-                        listOf(
-                            "$dir/UnityTranslateLib.dll",
-                            "$dir/ctranslate2.dll",
-                            "$dir/cudnn64_9.dll",
-                            "$dir/libiomp5md.dll"
-                        )
-                    else if (isMac)
-                        listOf()
-                    else
-                        listOf(
-                            "$dir/libUnityTranslateLib.so",
-                            "$dir/libctranslate2.so",
-                            "$dir/libcudnn.so",
-                            "$dir/libgomp.so"
-                        )
-                } else emptyList()
-            }
-
         private fun tryLoadFromClassPath(fullLibName: String): Path {
             val classLoader = UnityTranslateLib::class.java.classLoader
             val libs = platformLibs
@@ -170,8 +176,6 @@ class UnityTranslateLib(val path: Path) {
             return tmpDir
         }
 
-        private val cachedPlatformLibs = platformLibs
-
         fun isAvailable(): Boolean {
             return cachedPlatformLibs.isNotEmpty()
         }