Merge branch 'dev' into crimson_isle_reputation

4 files changed, 15 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
index 908d8b810..d776cfa01 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt
@@ -3,7 +3,7 @@ package at.hannibal2.skyhanni.utils
 import at.hannibal2.skyhanni.SkyHanniMod
 import com.google.gson.JsonObject
 import com.google.gson.JsonParser
-import com.google.gson.stream.MalformedJsonException
+import com.google.gson.JsonSyntaxException
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.client.methods.HttpGet
 import org.apache.http.impl.client.HttpClientBuilder
@@ -43,9 +43,15 @@ object APIUtil {
                     val retSrc = EntityUtils.toString(entity)
                     try {
                         return parser.parse(retSrc) as JsonObject
-                    } catch (e: MalformedJsonException) {
-                        LorenzUtils.error("MalformedJsonException!")
-                        println("MalformedJsonException at '$urlString'")
+                    } catch (e: JsonSyntaxException) {
+                        if (retSrc.contains("<center><h1>502 Bad Gateway</h1></center>")) {
+                            println("502 Bad Gateway at getJSONResponse '$urlString'")
+                            LorenzUtils.error("[SkyHanni] Hypixel API error: 502 Bad Gateway!")
+                        } else {
+                            println("JsonSyntaxException at getJSONResponse '$urlString'")
+                            LorenzUtils.error("[SkyHanni] JsonSyntaxException at getJSONResponse!")
+                            println("result: '$retSrc'")
+                        }
                         e.printStackTrace()
                     }
                 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index cc5483d5c..7dea12015 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -117,7 +117,9 @@ object LorenzUtils {
     fun formatPercentage(percentage: Double, format: String?): String =
         DecimalFormat(format).format(percentage * 100).replace(',', '.') + "%"
 
-    fun formatInteger(i: Int): String = DecimalFormat("#,##0").format(i.toLong()).replace(',', '.')
+    fun formatInteger(i: Int): String = formatInteger(i.toLong())
+
+    fun formatInteger(l: Long): String = DecimalFormat("#,##0").format(l).replace(',', '.')
 
     fun formatDouble(d: Double, format: String?): String =
         DecimalFormat(format).format(d).replace(',', 'x').replace('.', ',').replace('x', '.')
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
index 1036dab62..da359ff1e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/MinecraftConsoleFilter.kt
@@ -150,7 +150,7 @@ class MinecraftConsoleFilter(private val loggerConfigName: String) : Filter {
                 }
             }
             if (SkyHanniMod.feature.dev.filterScoreboardErrors) {
-                if (thrown.toString() == "java.util.concurrent.ExecutionException: java.lang.IllegalArgumentException: A team with the name '") {
+                if (thrown.toString().contains(" java.lang.IllegalArgumentException: A team with the name '")) {
                     filterConsole("IllegalArgumentException because scoreboard team already exists")
                     return Filter.Result.DENY
                 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListUtils.kt
index 15b5a10ef..a81675f74 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/TabListUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListUtils.kt
@@ -34,7 +34,7 @@ object TabListUtils {
         val result: MutableList<String> = ArrayList()
         for (info in players) {
             val name = Minecraft.getMinecraft().ingameGUI.tabList.getPlayerName(info)
-            result.add(name)
+            result.add(LorenzUtils.stripVanillaMessage(name))
         }
         return result
     }