Can't have shit working with Java

XorTroll · Aug 20, 2023 · b921e75 · b921e75
1 parent 7a29e66
commit b921e75
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/emuiigen/pom.xml b/emuiigen/pom.xml
@@ -102,7 +102,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.12.0</version>
+            <version>2.13.0</version>
         </dependency>
         <dependency>
             <groupId>commons-net</groupId>

diff --git a/emuiigen/src/AmiiboAPI.kt b/emuiigen/src/AmiiboAPI.kt
@@ -2,9 +2,9 @@ package com.xortroll.emuiibo.emuiigen
 
 import org.json.JSONObject
 import org.json.JSONArray
+import java.io.File
 import java.io.FileWriter
 import java.io.FileInputStream
-import java.net.URLDecoder
 import java.nio.file.Path
 import java.nio.file.Paths
 import org.apache.commons.io.IOUtils
@@ -35,8 +35,8 @@ class AmiiboAPI {
         }
 
         fun readApi() : Map<String, List<AmiiboAPIEntry>>? {
-            val cur_path = Path.of(URLDecoder.decode(this::class.java.getProtectionDomain().getCodeSource().getLocation().getPath(), "UTF-8")).parent;
-            val local_api_json_path = Paths.get(cur_path.toAbsolutePath().toString(), "api.json").toString();
+            val cur_path = File(this::class.java.getProtectionDomain().getCodeSource().getLocation().toURI()).parentFile.absolutePath;
+            val local_api_json_path = Paths.get(cur_path, "api.json").toString();
 
             try {
                 val raw_json = Utils.netDownloadString(Url);

diff --git a/emuiigen/src/Utils.kt b/emuiigen/src/Utils.kt
@@ -24,14 +24,8 @@ class Utils {
             ).toUShort()
         }
 
-        fun netDownloadBytes(url: String) : ByteArray {
-            val strm = URL(url).openStream();
-            return IOUtils.toByteArray(strm);
-        }
-
         fun netDownloadString(url: String) : String {
-            val strm = URL(url).openStream();
-            return IOUtils.toString(strm, StandardCharsets.UTF_8);
+            return IOUtils.toString(URL(url));
         }
 
         fun netDownloadFile(url: String, path: String) {