From 4afcb477f933dc496827b4936f18685b2360c776 Mon Sep 17 00:00:00 2001
From: Rime <81419447+Emirlol@users.noreply.github.com>
Date: Fri, 19 Jan 2024 08:58:19 +0300
Subject: Changed exception handling to use a logger in Utils and DungeonScore

---
 .../java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java     | 6 ++----
 src/main/java/de/hysky/skyblocker/utils/Utils.java                  | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'src/main/java/de')

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
index fde255d7..48a87c36 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScore.java
@@ -197,10 +197,8 @@ public class DungeonScore {
 		try {
 			DefaultedList<ItemStack> armor = (DefaultedList<ItemStack>) zombie.getArmorItems();
 			return armor.stream().allMatch(ItemStack::isEmpty);
-		} catch (NullPointerException e) {
-			return false;
-		} catch (ClassCastException f) {
-			f.printStackTrace();
+		} catch (Exception f) {
+			LOGGER.error("[Skyblocker] Failed to check if entity is a mimic! Cause: {}", f.getMessage());
 			return false;
 		}
 	}
diff --git a/src/main/java/de/hysky/skyblocker/utils/Utils.java b/src/main/java/de/hysky/skyblocker/utils/Utils.java
index 31157bfc..eaa07ff2 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Utils.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Utils.java
@@ -401,9 +401,9 @@ public class Utils {
             try {
                 JsonObject json = JsonParser.parseString(Http.sendGetRequest("https://api.hypixel.net/v2/resources/skyblock/election")).getAsJsonObject();
                 if (json.get("success").getAsBoolean()) return json.get("mayor").getAsJsonObject().get("name").getAsString();
-                throw new IOException("API call for mayor status failed: " + json.get("cause").getAsString());
-            } catch (IOException | InterruptedException e) {
-                e.printStackTrace();
+                throw new IOException(json.get("cause").getAsString());
+            } catch (Exception e) {
+                LOGGER.error("[Skyblocker] Failed to get mayor status! Cause: {}", e.getMessage());
             }
             return "";
         }).thenAccept(s -> {
-- 
cgit