summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/mining
diff options
context:
space:
mode:
authorCalMWolfs <94038482+CalMWolfs@users.noreply.github.com>2024-06-14 05:58:40 +1000
committerGitHub <noreply@github.com>2024-06-13 21:58:40 +0200
commitb48e43dff9baf2710809debe47a4bd5b329d70a0 (patch)
treed6470d8e3f41ae3982cecab685ca034318397196 /src/main/java/at/hannibal2/skyhanni/features/mining
parent31344fc364cde2cef243a49f1e7d4c4fbb390699 (diff)
downloadskyhanni-b48e43dff9baf2710809debe47a4bd5b329d70a0.tar.gz
skyhanni-b48e43dff9baf2710809debe47a4bd5b329d70a0.tar.bz2
skyhanni-b48e43dff9baf2710809debe47a4bd5b329d70a0.zip
Backend: Remove deprecated time utils format (#1898)
* remove deprecated time utils format * cleanup file * mix merge * make it default to right amount * fix merge * fix merge * revert 2 changes * revert other thing --------- Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/mining')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt12
1 files changed, 7 insertions, 5 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 14999c107..94b292fdf 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt
@@ -18,11 +18,12 @@ import at.hannibal2.skyhanni.utils.LorenzVec
import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings
import at.hannibal2.skyhanni.utils.SkyBlockTime
-import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.TimeUtils.format
import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
import net.minecraft.entity.item.EntityArmorStand
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import java.util.Collections
+import kotlin.time.Duration.Companion.milliseconds
@SkyHanniModule
object KingTalismanHelper {
@@ -91,7 +92,7 @@ object KingTalismanHelper {
private fun checkOffset() {
val king = EntityUtils.getEntitiesNearby<EntityArmorStand>(LorenzVec(129.6, 196.0, 196.7), 2.0)
- .filter { it.name.startsWith("§6§lKing ") }.firstOrNull() ?: return
+ .firstOrNull { it.name.startsWith("§6§lKing ") } ?: return
val foundKing = kingPattern.matchMatcher(king.name) {
group("name")
} ?: return
@@ -140,10 +141,11 @@ object KingTalismanHelper {
val current = king == currentKing
val missingTimeFormat = if (current) {
- val time = TimeUtils.formatDuration(timeUntil - 1000 * 60 * 20 * (kingCircles.size - 1))
+ val changedTime = timeUntil - 1000 * 60 * 20 * (kingCircles.size - 1)
+ val time = changedTime.milliseconds.format(maxUnits = 2)
"§7(§b$time remaining§7)"
} else {
- val time = TimeUtils.formatDuration(timeUntil, maxUnits = 2)
+ val time = timeUntil.milliseconds.format(maxUnits = 2)
"§7(§bin $time§7)"
}
@@ -164,7 +166,7 @@ object KingTalismanHelper {
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)
+ val time = until.milliseconds.format(maxUnits = 2)
return "§cNext missing king: §7$nextKing §7(§bin $time§7)"
}