some fixes

3 files changed, 31 insertions, 12 deletions

diff --git a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
index ceb55549..29e98038 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/SkyblockerMod.java
@@ -7,6 +7,8 @@ import me.xmrvizzy.skyblocker.skyblock.dungeon.DungeonBlaze;
 import me.xmrvizzy.skyblocker.utils.Utils;
 import net.minecraft.client.MinecraftClient;
 
+import java.util.Objects;
+
 public class SkyblockerMod {
     public static final String NAMESPACE = "skyblocker";
     private static final SkyblockerMod instance = new SkyblockerMod();
@@ -36,7 +38,7 @@ public class SkyblockerMod {
             } catch (Exception e) {
                 //System.out.println("Blazesolver: " + e);
             }
-        if (ticks % 20 == 0) {
+        if (ticks % 20 == 0 ) {
             rpTimer++;
             if (rpTimer == 5){
                 discordRPCManager.updatePresence();
@@ -44,10 +46,25 @@ public class SkyblockerMod {
             }
             if (client.world != null && !client.isInSingleplayer())
                 Utils.sbChecker();
-            if (!discordRPCManager.isConnected && Utils.isSkyblock && SkyblockerConfig.get().general.richPresence.enableRichPresence) discordRPCManager.start();
+            if (!discordRPCManager.isConnected && Utils.isSkyblock && SkyblockerConfig.get().general.richPresence.enableRichPresence && onHypxiel()) discordRPCManager.start();
             if (discordRPCManager.isConnected && !SkyblockerConfig.get().general.richPresence.enableRichPresence) discordRPCManager.stop();
-            if (client.world == null || client.isInSingleplayer() || !Utils.isSkyblock) if (discordRPCManager.isConnected)discordRPCManager.stop();
+            if (client.world == null || client.isInSingleplayer() || !Utils.isSkyblock || !onHypxiel()) if (discordRPCManager.isConnected)discordRPCManager.stop();
             ticks = 0;
         }
     }
+    public static MinecraftClient client() {
+        try {
+            return MinecraftClient.getInstance();
+        }
+        catch(NullPointerException e) {
+            return null;
+        }
+    }
+    public static boolean onHypxiel() {
+        try {
+            return client() != null && !client().isInSingleplayer() && client().getCurrentServerEntry().address != null && client().getCurrentServerEntry().address.contains("hypixel.net");
+        } catch (NullPointerException exception) {
+            return false;
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
index fc151371..a3599196 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/discord/DiscordRPCManager.java
@@ -47,7 +47,7 @@ public class DiscordRPCManager implements IPCListener{
 
     public String getInfo(){
         String info = null;
-        if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.BITS) info = "Bits: " + Utils.getBits();
+        if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.BITS) info = "Bits: " + dFormat.format(Utils.getBits());
         if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.PURSE) info = "Purse: " + dFormat.format(Utils.getPurse());
         if (SkyblockerConfig.get().general.richPresence.info == SkyblockerConfig.Info.LOCATION) info = "⏣ " + Utils.getLocation();
         return info;
diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index 8f299ac5..71f4954a 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -49,8 +49,8 @@ public class Utils {
         String location = null;
         List<String> sidebarLines = getSidebar();
         try{
-            for (int i = 0; i < sidebarLines.size(); i++) {
-                if(sidebarLines.get(i).contains("⏣")) location = sidebarLines.get(i);
+            for (String sidebarLine : sidebarLines) {
+                if (sidebarLine.contains("⏣")) location = sidebarLine;
             }
             if (location == null) location = "Unknown";
             location = location.replace('⏣', ' ').strip();
@@ -65,9 +65,9 @@ public class Utils {
 
         List<String> sidebarLines = getSidebar();
         try{
-            for (int i = 0; i < sidebarLines.size(); i++) {
-                if(sidebarLines.get(i).contains("Piggy:")) purseString = sidebarLines.get(i);
-                if(sidebarLines.get(i).contains("Purse:")) purseString = sidebarLines.get(i);
+            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,10 +82,12 @@ public class Utils {
         String bitsString = null;
         List<String> sidebarLines = getSidebar();
         try{
-            for (int i = 0; i < sidebarLines.size(); i++) {
-                if(sidebarLines.get(i).contains("Bits")) bitsString = sidebarLines.get(i);
+            for (String sidebarLine : sidebarLines) {
+                if (sidebarLine.contains("Bits")) bitsString = sidebarLine;
+            }
+            if (bitsString !=null) {
+                bits = Integer.parseInt(bitsString.replaceAll("[^0-9.]", "").strip());
             }
-            bits = Integer.parseInt(bitsString.replaceAll("Bits:", "").strip());
         } catch (IndexOutOfBoundsException e) {
             e.printStackTrace();
         }