diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc')
4 files changed, 25 insertions, 40 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt index acab50046..7c483a63a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt @@ -2,57 +2,40 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.test.command.ErrorManager +import at.hannibal2.skyhanni.events.SecondPassedEvent import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher +import at.hannibal2.skyhanni.utils.StringUtils.matchFirst import at.hannibal2.skyhanni.utils.TimeUtils.format import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds -class ServerRestartTitle { +object ServerRestartTitle { private val config get() = SkyHanniMod.feature.misc - - companion object { - private val restartingGroup = RepoPattern.group("features.misc.serverrestart") - private val restartingPattern by restartingGroup.pattern( - "time", - "§cServer closing: (?<minutes>\\d+):(?<seconds>\\d+) ?§8.*" - ) - val restartingGreedyPattern by restartingGroup.pattern( - "greedy", - "§cServer closing.*" - ) - } + private val patternGroup = RepoPattern.group("features.misc.serverrestart") + private val restartingPattern by patternGroup.pattern( + "time", + "§cServer closing: (?<minutes>\\d+):(?<seconds>\\d+) ?§8.*" + ) + val restartingGreedyPattern by patternGroup.pattern( + "greedy", + "§cServer closing.*" + ) @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + fun onSecondPassed(event: SecondPassedEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.serverRestartTitle) return - if (!event.repeatSeconds(1)) return - - for (line in ScoreboardData.sidebarLinesFormatted) { - restartingPattern.matchMatcher(line) { - try { - val minutes = group("minutes").toInt().minutes - val seconds = group("seconds").toInt().seconds - val totalTime = minutes + seconds - if (totalTime > 2.minutes && totalTime.inWholeSeconds % 30 != 0L) return - val time = totalTime.format() - LorenzUtils.sendTitle("§cServer Restart in §b$time", 2.seconds) - } catch (e: Throwable) { - ErrorManager.logErrorWithData( - e, "Error reading server restart time from scoreboard", - "line" to line, - "restartPattern" to restartingPattern.pattern(), - ) - } - return - } + ScoreboardData.sidebarLinesFormatted.matchFirst(restartingPattern) { + val minutes = group("minutes").toInt().minutes + val seconds = group("seconds").toInt().seconds + val totalTime = minutes + seconds + if (totalTime > 2.minutes && totalTime.inWholeSeconds % 30 != 0L) return + val time = totalTime.format() + LorenzUtils.sendTitle("§cServer Restart in §b$time", 2.seconds) } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 71b0f831d..6106e4c1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -38,7 +38,7 @@ import kotlin.math.roundToLong object EstimatedItemValue { - val config get() = SkyHanniMod.feature.inventory.estimatedItemValues + private val config get() = SkyHanniMod.feature.inventory.estimatedItemValues private var display = emptyList<List<Any>>() private val cache = mutableMapOf<ItemStack, List<List<Any>>>() private var lastToolTipTime = 0L diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt index 1baf781ef..14812cd74 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValueCalculator.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.features.misc.items +import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.CollectionUtils.sortedDesc import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName @@ -54,7 +55,7 @@ import java.util.Locale object EstimatedItemValueCalculator { - private val config get() = EstimatedItemValue.config + private val config get() = SkyHanniMod.feature.inventory.estimatedItemValues private val additionalCostFunctions = listOf( ::addAttributeCost, ::addReforgeStone, diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt index c36fdbbf5..2c3e00803 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedWardrobePrice.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.features.misc.items +import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.LorenzToolTipEvent @@ -13,7 +14,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent class EstimatedWardrobePrice { - private val config get() = EstimatedItemValue.config + private val config get() = SkyHanniMod.feature.inventory.estimatedItemValues var data = mutableMapOf<Int, MutableList<ItemStack>>() @SubscribeEvent |