misc: try-catch api stuff

Polyfrost · Apr 14, 2023 · b9990b0 · b9990b0
1 parent 306d83e
commit b9990b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 mod_name = EvergreenHUD
 mod_id = evergreenhud
-mod_version = 1.0.0-beta4
+mod_version = 1.0.0-beta5
 
 polyfrost.defaults.loom=0
 

diff --git a/src/main/kotlin/cc/polyfrost/evergreenhud/utils/PinkuluAPIManager.kt b/src/main/kotlin/cc/polyfrost/evergreenhud/utils/PinkuluAPIManager.kt
@@ -15,7 +15,11 @@ object PinkuluAPIManager {
     fun initialize() {
         EventManager.INSTANCE.register(this)
         Multithreading.runAsync {
-            rawJson = NetworkUtils.getJsonElement("https://maps.pinkulu.com/trans-rights-are-human-rights.json").asJsonArray // so true bestie
+            try {
+                rawJson = NetworkUtils.getJsonElement("https://maps.pinkulu.com/trans-rights-are-human-rights.json").asJsonArray // so true bestie
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
         }
     }
 
@@ -47,10 +51,14 @@ object PinkuluAPIManager {
 
     private fun checkCached() {
         if (rawJson == null) return
-        val locraw = LocrawUtil.INSTANCE.locrawInfo
-        if (locraw == null || locraw.mapName.isNullOrBlank() || locraw.gameType == null) return
-        if (cachedMap == null || (cachedMap!!.get("name").asString != locraw.mapName && cachedMap!!.get("gameType").asString != locraw.gameType.serverName)) {
-            cachedMap = rawJson!!.firstOrNull { it.asJsonObject.get("name").asString == locraw.mapName && it.asJsonObject.get("gameType").asString == locraw.gameType.serverName }?.asJsonObject
+        try {
+            val locraw = LocrawUtil.INSTANCE.locrawInfo
+            if (locraw == null || locraw.mapName.isNullOrBlank() || locraw.gameType == null) return
+            if (cachedMap == null || (cachedMap!!.get("name").asString != locraw.mapName && cachedMap!!.get("gameType").asString != locraw.gameType.serverName)) {
+                cachedMap = rawJson!!.firstOrNull { it.asJsonObject.get("name").asString == locraw.mapName && it.asJsonObject.get("gameType").asString == locraw.gameType.serverName }?.asJsonObject
+            }
+        } catch (e: Exception) {
+            cachedMap = null
         }
     }
 }