From 5fa84401988ad1a056c32ea273935a57d7893445 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Thu, 24 Aug 2023 00:10:00 -0400
Subject: Add alternate hypixel address argument

---
 src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
index e85020aa..2a961182 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java
@@ -28,6 +28,7 @@ import java.util.List;
  * Utility variables and methods for retrieving Skyblock related information.
  */
 public class Utils {
+	private static final String ALTERNATE_HYPIXEL_ADDRESS = System.getProperty("skyblocker.alternateHypixelAddress", "");
     private static final String PROFILE_PREFIX = "Profile: ";
     private static boolean isOnHypixel = false;
     private static boolean isOnSkyblock = false;
@@ -129,10 +130,9 @@ public class Utils {
             return;
         }
         String string = sidebar.toString();
-        String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : "";
 
         if (sidebar.isEmpty()) return;
-        if (serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io")) {
+        if (isConnectedToHypixel(client)) {
             if (!isOnHypixel) {
                 isOnHypixel = true;
             }
@@ -154,6 +154,13 @@ public class Utils {
             leaveSkyblock();
         }
     }
+    
+    private static boolean isConnectedToHypixel(MinecraftClient client) {
+    	String serverAddress = (client.getCurrentServerEntry() != null) ? client.getCurrentServerEntry().address.toLowerCase() : "";
+    	boolean isOnHypixel = (serverAddress.equalsIgnoreCase(ALTERNATE_HYPIXEL_ADDRESS) || serverAddress.contains("hypixel.net") || serverAddress.contains("hypixel.io"));
+    	
+    	return isOnHypixel;
+    }
 
     private static void leaveSkyblock() {
         if (isOnSkyblock) {
-- 
cgit