aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-11 03:48:13 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-04-11 03:48:19 +0200
commit5de353bf51c3a203226e9d308b09733f619a4535 (patch)
treed627b2d3ebc6f65b7516d0b7f468868c21713b39 /src/main/java/at
parentf0c5d57c0cbf186886ea1ac8ff6fd6f09b74e0c5 (diff)
downloadskyhanni-5de353bf51c3a203226e9d308b09733f619a4535.tar.gz
skyhanni-5de353bf51c3a203226e9d308b09733f619a4535.tar.bz2
skyhanni-5de353bf51c3a203226e9d308b09733f619a4535.zip
typo
Diffstat (limited to 'src/main/java/at')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt6
7 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 86bcd9598..b7f80625b 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -54,7 +54,7 @@ class HypixelData {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
val message = event.message.removeColor().lowercase()
if (message.startsWith("your profile was changed to:")) {
@@ -81,7 +81,7 @@ class HypixelData {
checkHypixel()
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
val inSkyBlock = checkScoreboard()
if (inSkyBlock) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 7a746299e..bee625d3d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -11,7 +11,7 @@ class ChatFilter {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
val blockReason = block(event.message)
if (blockReason != "") {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
index 4f45cdde4..a4bce1680 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
@@ -10,7 +10,7 @@ class DungeonChatFilter {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
// Workaround since the potion message gets always sent in that moment when skyblock is set as false
if (!LorenzUtils.inSkyBlock && !event.message.startsWith("§aYour active Potion Effects")) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
index 508927613..076e807c8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ButtonOnPause.kt
@@ -13,7 +13,7 @@ class ButtonOnPause {
@SubscribeEvent
fun onGuiAction(event: GuiScreenEvent.ActionPerformedEvent.Post) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu && event.button.id == buttonId) {
ConfigGuiManager.openConfigGui()
@@ -22,7 +22,7 @@ class ButtonOnPause {
@SubscribeEvent
fun onGuiInitPost(event: GuiScreenEvent.InitGuiEvent.Post) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
if (SkyHanniMod.feature.misc.configButtonOnPause && event.gui is GuiIngameMenu) {
val x = event.gui.width - 105
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt
index 648b051bb..7e335c5e5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt
@@ -11,7 +11,7 @@ class PasteIntoSigns {
@SubscribeEvent
fun onTick(event: TickEvent.ClientTickEvent) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
if (!SkyHanniMod.feature.misc.pasteIntoSigns) return
if (Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) && Keyboard.isKeyDown(Keyboard.KEY_V)) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
index 511c43aab..6f33f06d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
@@ -37,7 +37,7 @@ class SummoningMobManager {
@SubscribeEvent
fun onChatMessage(event: LorenzChatEvent) {
- if (!LorenzUtils.isHypixel) return
+ if (!LorenzUtils.onHypixel) return
val message = event.message
val matcher = spawnPatter.matcher(message)
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index b44e9e52e..552782025 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -22,14 +22,14 @@ import java.util.*
object LorenzUtils {
- val isHypixel: Boolean
+ val onHypixel: Boolean
get() = (HypixelData.hypixelLive || HypixelData.hypixelAlpha) && Minecraft.getMinecraft().thePlayer != null
val isOnAlphaServer: Boolean
- get() = isHypixel && HypixelData.hypixelAlpha
+ get() = onHypixel && HypixelData.hypixelAlpha
val inSkyBlock: Boolean
- get() = isHypixel && HypixelData.skyBlock
+ get() = onHypixel && HypixelData.skyBlock
val inDungeons: Boolean
get() = inSkyBlock && DungeonData.inDungeon()