aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me
diff options
context:
space:
mode:
authorAaron <51387595+AzureAaron@users.noreply.github.com>2023-08-24 00:10:00 -0400
committerAaron <51387595+AzureAaron@users.noreply.github.com>2023-08-24 00:10:00 -0400
commit5fa84401988ad1a056c32ea273935a57d7893445 (patch)
treec12135226506f252b67f107cc5b6d3759d8c31dc /src/main/java/me
parent6069d3cf7d2e96ca7ef1975a3dd04e2121a6e3c9 (diff)
downloadSkyblocker-5fa84401988ad1a056c32ea273935a57d7893445.tar.gz
Skyblocker-5fa84401988ad1a056c32ea273935a57d7893445.tar.bz2
Skyblocker-5fa84401988ad1a056c32ea273935a57d7893445.zip
Add alternate hypixel address argument
Diffstat (limited to 'src/main/java/me')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/utils/Utils.java11
1 files changed, 9 insertions, 2 deletions
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) {