aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt (renamed from src/main/java/at/hannibal2/skyhanni/data/HyPixelData.kt)2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt14
5 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index ef9e58d10..61f4315d2 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -103,7 +103,7 @@ public class SkyHanniMod {
// utils
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 2b5c3569f..cab37ecc0 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
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt
index 6b94e0707..e34c99880 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/EliteFarmingWeight.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.features.garden
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.HyPixelData
+import at.hannibal2.skyhanni.data.HypixelData
import at.hannibal2.skyhanni.events.GardenToolChangeEvent
import at.hannibal2.skyhanni.events.GuiRenderEvent
import at.hannibal2.skyhanni.features.garden.GardenAPI.Companion.getSpeed
@@ -91,7 +91,7 @@ class EliteFarmingWeight {
if (weight == -1.0) {
if (!isLoadingWeight) {
- val localProfile = HyPixelData.profileName
+ val localProfile = HypixelData.profileName
if (localProfile == "") return
isLoadingWeight = true
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 e77db7969..e2572cb0e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt
@@ -1,7 +1,7 @@
package at.hannibal2.skyhanni.features.misc
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.HyPixelData
+import at.hannibal2.skyhanni.data.HypixelData
import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.OSUtils
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
@@ -12,7 +12,7 @@ class PasteIntoSigns {
@SubscribeEvent
fun onTick(event: TickEvent.ClientTickEvent) {
- if (!HyPixelData.hypixel) return
+ if (!HypixelData.hypixel) 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/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index 13701a95d..a856ae481 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.data.IslandType
import at.hannibal2.skyhanni.features.dungeon.DungeonData
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
@@ -23,29 +23,29 @@ import java.util.*
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: IslandType
- get() = HyPixelData.skyBlockIsland
+ get() = HypixelData.skyBlockIsland
//TODO add cache
val skyBlockArea: String
- get() = HyPixelData.readSkyBlockArea()
+ get() = HypixelData.readSkyBlockArea()
val inKuudraFight: Boolean
get() = skyBlockIsland == IslandType.KUUDRA_ARENA
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")