Merge pull request #54 from LifeIsAParadox/1.6.0-update

1.6.0 update

2 files changed, 22 insertions, 17 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java
index e3aa4da4..9c488f34 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Events.java
@@ -1,7 +1,6 @@
 package me.xmrvizzy.skyblocker.utils;
 
 import me.xmrvizzy.skyblocker.SkyblockerMod;
-import me.xmrvizzy.skyblocker.config.SkyblockerConfig;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.text.*;
 import org.slf4j.Logger;
@@ -9,11 +8,11 @@ import org.slf4j.LoggerFactory;
 
 public class Events {
     public static MinecraftClient client = MinecraftClient.getInstance();
-    public static Logger logger = LoggerFactory.getLogger(SkyblockerMod.NAMESPACE);
+    public static Logger LOGGER = LoggerFactory.getLogger(SkyblockerMod.NAMESPACE);
 
     public static void onSkyblockJoin(){
         Utils.isOnSkyblock = true;
-        logger.info("Joined Skyblock");
+        LOGGER.info("[Skyblocker] Joined Skyblock");
         if (UpdateChecker.shouldUpdate()){
             TranslatableText linkMessage = new TranslatableText("skyblocker.update.update_message");
             TranslatableText linkMessageEnding = new TranslatableText("skyblocker.update.update_message_end");
@@ -21,12 +20,14 @@ public class Events {
             TranslatableText hoverText = new TranslatableText("skyblocker.update.hover_text");
             linkMessage.append(link.styled(style -> style.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://modrinth.com/mod/skyblocker-liap/versions")).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverText)))).append(linkMessageEnding);
 
-            client.player.sendMessage(linkMessage, false);
+            if (client.player != null) {
+                client.player.sendMessage(linkMessage, false);
+            }
         }
     }
 
     public static void onSkyblockDisconnect(){
-        logger.info("Disconnected from Skyblock");
+        LOGGER.info("[Skyblocker] Disconnected from Skyblock");
         SkyblockerMod.getInstance().discordRPCManager.stop();
         Utils.isOnSkyblock = false;
         Utils.isInDungeons = false;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index 21c30ada..66d04b50 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -45,12 +45,13 @@ public class Utils {
         String location = null;
         List<String> sidebarLines = getSidebar();
         try {
-            assert sidebarLines != null;
-            for (String sidebarLine : sidebarLines) {
-                if (sidebarLine.contains("⏣")) location = sidebarLine;
+            if( sidebarLines != null) {
+                for (String sidebarLine : sidebarLines) {
+                    if (sidebarLine.contains("⏣")) location = sidebarLine;
+                }
+                if (location == null) location = "Unknown";
+                location = location.replace('⏣', ' ').strip();
             }
-            if (location == null) location = "Unknown";
-            location = location.replace('⏣', ' ').strip();
         } catch (IndexOutOfBoundsException e) {
             e.printStackTrace();
         }
@@ -63,10 +64,12 @@ public class Utils {
 
         List<String> sidebarLines = getSidebar();
         try {
-            assert sidebarLines != null;
-            for (String sidebarLine : sidebarLines) {
-                if (sidebarLine.contains("Piggy:")) purseString = sidebarLine;
-                if (sidebarLine.contains("Purse:")) purseString = sidebarLine;
+
+            if (sidebarLines != null) {
+                for (String sidebarLine : sidebarLines) {
+                    if (sidebarLine.contains("Piggy:")) purseString = sidebarLine;
+                    if (sidebarLine.contains("Purse:")) purseString = sidebarLine;
+                }
             }
             if (purseString != null) purse = Double.parseDouble(purseString.replaceAll("[^0-9.]", "").strip());
             else purse = 0;
@@ -82,9 +85,10 @@ public class Utils {
         String bitsString = null;
         List<String> sidebarLines = getSidebar();
         try {
-            assert sidebarLines != null;
-            for (String sidebarLine : sidebarLines) {
-                if (sidebarLine.contains("Bits")) bitsString = sidebarLine;
+            if (sidebarLines != null) {
+                for (String sidebarLine : sidebarLines) {
+                    if (sidebarLine.contains("Bits")) bitsString = sidebarLine;
+                }
             }
             if (bitsString != null) {
                 bits = Integer.parseInt(bitsString.replaceAll("[^0-9.]", "").strip());