From 6991c7375d35706b63f8d4347df72696cbdde860 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 11 Apr 2023 03:46:54 +0200 Subject: Added support for custom hypixel ip addresses (looking at ilovecatgirls.xyz) --- src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt | 2 +- src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/utils') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt index 77fc27298..1f03ed837 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtil.kt @@ -81,6 +81,6 @@ object APIUtil { fun toggleApiErrorMessages() { showApiErrors = !showApiErrors - LorenzUtils.chat("§e[SkyHanni] HyPixel API error messages " + if (showApiErrors) "§chidden" else "§ashown") + LorenzUtils.chat("§e[SkyHanni] Hypixel API error messages " + if (showApiErrors) "§chidden" else "§ashown") } } \ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index a856ae481..b44e9e52e 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -22,11 +22,14 @@ import java.util.* object LorenzUtils { - val isHyPixel: Boolean - get() = HypixelData.hypixel && Minecraft.getMinecraft().thePlayer != null + val isHypixel: Boolean + get() = (HypixelData.hypixelLive || HypixelData.hypixelAlpha) && Minecraft.getMinecraft().thePlayer != null + + val isOnAlphaServer: Boolean + get() = isHypixel && HypixelData.hypixelAlpha val inSkyBlock: Boolean - get() = isHyPixel && HypixelData.skyBlock + get() = isHypixel && HypixelData.skyBlock val inDungeons: Boolean get() = inSkyBlock && DungeonData.inDungeon() -- cgit