Renamed hypixel and skyblock.

5 files changed, 11 insertions, 19 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index c59444b99..298b01686 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -86,7 +86,7 @@ public class SkyHanniMod {
         new BazaarApi();
         loadModule(this);
         loadModule(new ChatManager());
-        loadModule(new HypixelData());
+        loadModule(new HyPixelData());
         loadModule(new DungeonData());
         loadModule(new ScoreboardData());
         loadModule(new ApiDataLoader());
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
index bbb3db69d..e1c466762 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt
@@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import net.minecraftforge.fml.common.network.FMLNetworkEvent
 
-class HypixelData {
+class HyPixelData {
 
     companion object {
         var hypixel = false
@@ -37,7 +37,7 @@ class HypixelData {
         }
     }
 
-    var loggerIslandChange = LorenzLogger("debug/island_change")
+    private var loggerIslandChange = LorenzLogger("debug/island_change")
 
     @SubscribeEvent
     fun onConnect(event: FMLNetworkEvent.ClientConnectedToServerEvent) {
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 27e520ad0..8e6cd4d4a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.features.misc.MarkedPlayerManager
 import at.hannibal2.skyhanni.utils.LocationUtils
@@ -10,7 +9,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import net.minecraft.client.Minecraft
 import net.minecraft.client.entity.EntityOtherPlayerMP
-import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
 import java.util.regex.Pattern
@@ -62,11 +60,6 @@ class PlayerDeathMessages {
         }
     }
 
-    @SubscribeEvent
-    fun onWorldChange(event: WorldEvent.Load) {
-        HypixelData.skyBlock = false
-    }
-
     private fun checkOtherPlayers() {
         val location = LocationUtils.playerLocation()
         for (otherPlayer in Minecraft.getMinecraft().theWorld.loadedEntityList
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 cbfa28c9a..245fa85af 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
@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.features.event.diana
 
-import at.hannibal2.skyhanni.data.HypixelData
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.LocationUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -44,7 +43,7 @@ class BurrowWarpHelper {
 
     @SubscribeEvent
     fun onStatusBar(event: LorenzChatEvent) {
-        if (!HypixelData.skyBlock) return
+        if (!LorenzUtils.inSkyBlock) 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/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 4d0c5a2ff..8140cddfa 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.utils
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.HypixelData
+import at.hannibal2.skyhanni.data.HyPixelData
 import at.hannibal2.skyhanni.features.dungeon.DungeonData
 import at.hannibal2.skyhanni.utils.StringUtils.removeColor
 import net.minecraft.client.Minecraft
@@ -15,29 +15,29 @@ import java.text.SimpleDateFormat
 object LorenzUtils {
 
     val isHyPixel: Boolean
-        get() = HypixelData.hypixel && Minecraft.getMinecraft().thePlayer != null
+        get() = HyPixelData.hypixel && Minecraft.getMinecraft().thePlayer != null
 
     val inSkyBlock: Boolean
-        get() = isHyPixel && HypixelData.skyBlock
+        get() = isHyPixel && HyPixelData.skyBlock
 
     val inDungeons: Boolean
         get() = inSkyBlock && DungeonData.inDungeon()
 
     val skyBlockIsland: String
-        get() = HypixelData.skyBlockIsland
+        get() = HyPixelData.skyBlockIsland
 
     //TODO add cache
     val skyBlockArea: String
-        get() = HypixelData.readSkyBlockArea()
+        get() = HyPixelData.readSkyBlockArea()
 
     val inKuudraFight: Boolean
         get() = skyBlockIsland == "Instanced"
 
     val noTradeMode: Boolean
-        get() = HypixelData.noTrade
+        get() = HyPixelData.noTrade
 
     val isBingoProfile: Boolean
-        get() = inSkyBlock && HypixelData.bingo
+        get() = inSkyBlock && HyPixelData.bingo
 
     const val DEBUG_PREFIX = "[SkyHanni Debug] §7"
     private val log = LorenzLogger("chat/mod_sent")