Renamed hypixel and skyblock.

62 files changed, 100 insertions, 100 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt
index 2e4d13da6..30f88f48e 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt
@@ -25,7 +25,7 @@ class EntityMovementData {
 
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
 
         for (entity in entityLocation.keys) {
             if (entity.isDead) continue
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 8026ecac8..bbb3db69d 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -16,7 +16,7 @@ class HypixelData {
 
     companion object {
         var hypixel = false
-        var skyblock = false
+        var skyBlock = false
         var skyBlockIsland: String = ""
 
         //Ironman, Stranded and Bingo
@@ -49,13 +49,13 @@ class HypixelData {
 
     @SubscribeEvent
     fun onWorldChange(event: WorldEvent.Load) {
-        skyblock = false
+        skyBlock = false
     }
 
     @SubscribeEvent
     fun onDisconnect(event: FMLNetworkEvent.ClientDisconnectionFromServerEvent) {
         hypixel = false
-        skyblock = false
+        skyBlock = false
     }
 
     @SubscribeEvent
@@ -90,8 +90,8 @@ class HypixelData {
             checkSidebar()
         }
 
-        if (inSkyBlock == skyblock) return
-        skyblock = inSkyBlock
+        if (inSkyBlock == skyBlock) return
+        skyBlock = inSkyBlock
     }
 
     private fun checkSidebar() {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
index 9b25933ea..1576ff4ca 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
@@ -30,7 +30,7 @@ class ItemRenderBackground {
     @SubscribeEvent
     fun renderOverlayLol(event: RenderRealOverlayEvent) {
         val stack = event.stack
-        if (LorenzUtils.inSkyblock) {
+        if (LorenzUtils.inSkyBlock) {
             if (stack != null) {
                 val color = stack.background
                 if (color != -1) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt
index 69ae9fa2d..30b9ad03f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt
@@ -20,7 +20,7 @@ class ItemTipHelper {
     @SubscribeEvent
     fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) {
         val stack = event.stack ?: return
-        if (!LorenzUtils.inSkyblock || stack.stackSize != 1) return
+        if (!LorenzUtils.inSkyBlock || stack.stackSize != 1) return
 
 //        val uuid = stacremovek.getLore().joinToString { ", " }
         val stackTip: String
@@ -51,7 +51,7 @@ class ItemTipHelper {
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     fun onRenderInventoryItemOverlayPost(event: DrawScreenAfterEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
 
         val gui = Minecraft.getMinecraft().currentScreen
         if (gui !is GuiChest) return
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt
index 16facaf90..f463391e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt
@@ -13,7 +13,7 @@ class MinecraftData {
 
     @SubscribeEvent(receiveCanceled = true)
     fun onSoundPacket(event: PacketEvent.ReceiveEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
 
         val packet = event.packet
         if (packet !is S29PacketSoundEffect) return
@@ -31,7 +31,7 @@ class MinecraftData {
 
     @SubscribeEvent(receiveCanceled = true)
     fun onParticlePacketReceive(event: PacketEvent.ReceiveEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
 
         val packet = event.packet
         if (packet !is S2APacketParticles) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
index b2d397714..9604cb05c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
@@ -14,7 +14,7 @@ class AnvilCombineHelper {
 
     @SubscribeEvent
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
         if (!SkyHanniMod.feature.inventory.anvilCombineHelper) return
 
         if (event.gui !is GuiChest) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
index c5d8c10a1..eb6d98d31 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -78,6 +78,6 @@ class BazaarBestSellMethod {
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && SkyHanniMod.feature.bazaar.bestSellMethod
+        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.bestSellMethod
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
index 3943e7d44..9ee430050 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarCancelledBuyOrderClipboard.kt
@@ -53,6 +53,6 @@ class BazaarCancelledBuyOrderClipboard {
     }
 
     fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && SkyHanniMod.feature.bazaar.cancelledBuyOrderClipboard
+        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.bazaar.cancelledBuyOrderClipboard
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt
index 25abe82e1..bcf1b3e48 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt
@@ -40,7 +40,7 @@ internal class BazaarDataGrabber(private var bazaarMap: MutableMap<String, Bazaa
 
     fun start() {
         fixedRateTimer(name = "skyhanni-bazaar-update", period = 1000L) {
-            if (!LorenzUtils.inSkyblock) {
+            if (!LorenzUtils.inSkyBlock) {
                 return@fixedRateTimer
             }
 
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 f1334cee1..545c5c17a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -10,7 +10,7 @@ class ChatFilter {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!LorenzUtils.isOnHypixel) return
+        if (!LorenzUtils.isHyPixel) return
 
         val blockReason = block(event.message)
         if (blockReason != "") {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 2bcf36102..27e520ad0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -34,7 +34,7 @@ class PlayerDeathMessages {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
 
         val message = event.message
         val matcher = pattern.matcher(message)
@@ -64,7 +64,7 @@ class PlayerDeathMessages {
 
     @SubscribeEvent
     fun onWorldChange(event: WorldEvent.Load) {
-        HypixelData.skyblock = false
+        HypixelData.skyBlock = false
     }
 
     private fun checkOtherPlayers() {
@@ -77,6 +77,6 @@ class PlayerDeathMessages {
     }
 
     private fun isHideFarDeathsEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && SkyHanniMod.feature.chat.hideFarDeathMessages && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight
+        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.chat.hideFarDeathMessages && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 762c75a01..3affefaf4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -268,7 +268,7 @@ class DamageIndicatorManager {
 
     @SubscribeEvent
     fun onTick(event: TickEvent.ClientTickEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
         for (entity in Minecraft.getMinecraft().theWorld.loadedEntityList) {
             if (entity is EntityLivingBase) {
                 checkEntity(entity)
@@ -752,6 +752,6 @@ class DamageIndicatorManager {
     }
 
     fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyblock && SkyHanniMod.feature.damageIndicator.enabled
+        return LorenzUtils.inSkyBlock && SkyHanniMod.feature.damageIndicator.enabled
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusUnopenedChestTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusUnopenedChestTracker.kt
index 8cda8aade..024c05c86 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusUnopenedChestTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/CroesusUnopenedChestTracker.kt
@@ -16,7 +16,7 @@ class CroesusUnopenedChestTracker {
 
     @SubscribeEvent(priority = EventPriority.LOW)
     fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
         if (!SkyHanniMod.feature.dungeon.croesusUnopenedChestTracker) return
 
         if (event.gui !is GuiChest) return
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 1724c074e..9f4e12897 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
@@ -10,10 +10,10 @@ class DungeonChatFilter {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!LorenzUtils.isOnHypixel) return
+        if (!LorenzUtils.isHyPixel) 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
+        if (!LorenzUtils.inSkyBlock && !event.message.startsWith("§aYour active Potion Effects")) return
         if (!SkyHanniMod.feature.chat.dungeonMessages) return
 
         val blockReason = block(event.message)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
index 740296f47..9b9027d83 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonLevelColor.kt
@@ -16,7 +16,7 @@ class DungeonLevelColor {
 
     @SubscribeEvent
     fun onItemTooltip(event: ItemTooltipEvent) {
-        if (!LorenzUtils.inSkyblock) return
+        if (!LorenzUtils.inSkyBlock) return
         if (!SkyHanniMod.feature.dungeon.partyFinderColoredClassLevel) return
 
         if (event.toolTip == null) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/end/VoidlingExtremistColor.kt b/src/main/java/at/hannibal2/skyhanni/features/end/VoidlingExtremistColor.kt
index b91d45dd8..6f6a083d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/end/VoidlingExtremistColor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/end/VoidlingExtremistColor.kt
@@ -54,5 +54,5 @@ class VoidlingExtremistColor {
     }
 
     private fun isEnabled(): Boolean =
-        LorenzUtils.inSkyblock && LorenzUtils.skyBlockIsland == "The End" && SkyHanniMod.feature.misc.voidlingExtremistColor
+        LorenzUtils.inSkyBlock && LorenzUtils.skyBlockIsland == "The End" && SkyHanniMod.feature.misc.voidlingExtremistColor
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index 742fdfe36..cbfa28c9a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -44,7 +44,7 @@ class BurrowWarpHelper {
 
     @SubscribeEvent
     fun onStatusBar(event: LorenzChatEvent) {
-        if (!HypixelData.skyblock) return
+        if (!HypixelData.skyBlock) return
 
         if (event.message == "§cYou haven't unlocked this fast travel destination!") {
             val time = System.currentTimeMillis() - lastWarpTime
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/feature