summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/mining
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/mining')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
index 93e12cc6f..36eaa7a24 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
@@ -23,6 +23,7 @@ import java.util.Collections
class KingTalismanHelper {
private val config get() = SkyHanniMod.feature.mining.kingTalisman
+ private val storage get() = ProfileStorageData.profileSpecific?.mining
companion object {
private var currentOffset: Int? = null
@@ -63,14 +64,14 @@ class KingTalismanHelper {
fun onTick(event: LorenzTickEvent) {
if (!event.isMod(20)) return
if (!isEnabled()) return
- val profileSpecific = ProfileStorageData.profileSpecific ?: return
+ val storage = storage ?: return
val nearby = isNearby()
if (nearby && getCurrentOffset() == null) {
checkOffset()
}
- val kingsTalkedTo = profileSpecific.mining.kingsTalkedTo
+ val kingsTalkedTo = storage.kingsTalkedTo
if (getCurrentOffset() == null) {
val allKings = kingsTalkedTo.size == kingCircles.size
display = if (allKings) emptyList() else listOf("§cVisit the king to sync up.")
@@ -103,10 +104,10 @@ class KingTalismanHelper {
if (!isEnabled()) return
if (getCurrentOffset() == null) return
if (!isNearby()) return
- val profileSpecific = ProfileStorageData.profileSpecific ?: return
+ val storage = storage ?: return
val currentKing = getCurrentKing()
- val kingsTalkedTo = profileSpecific.mining.kingsTalkedTo
+ val kingsTalkedTo = storage.kingsTalkedTo
if (currentKing !in kingsTalkedTo) {
LorenzUtils.debug("Found new king!")
kingsTalkedTo.add(currentKing)
@@ -154,8 +155,8 @@ class KingTalismanHelper {
}
private fun nextMissingText(): String {
- val profileSpecific = ProfileStorageData.profileSpecific ?: error("profileSpecific is null")
- val kingsTalkedTo = profileSpecific.mining.kingsTalkedTo
+ val storage = storage ?: error("profileSpecific is null")
+ val kingsTalkedTo = storage.kingsTalkedTo
val (nextKing, until) = getKingTimes().filter { it.key !in kingsTalkedTo }.sorted().firstNotNullOf { it }
val time = TimeUtils.formatDuration(until, maxUnits = 2)