From 963da98e2f20f142bbb4395a57e8cfbd40c91a8a Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:37:47 +0100
Subject: code cleanup
---
.../skyhanni/features/fishing/tracker/SeaCreatureTracker.kt | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
(limited to 'src')
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
index 29ac6bf3b..eb0fe4a51 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/tracker/SeaCreatureTracker.kt
@@ -34,7 +34,7 @@ object SeaCreatureTracker {
private val tracker = SkyHanniTracker("Sea Creature Tracker", { Data() }, { it.fishing.seaCreatureTracker })
{ drawDisplay(it) }
private val trophyArmorNames by RepoPattern.pattern("fishing.trophyfishing.armor", "(BRONZE|SILVER|GOLD|DIAMOND)_HUNTER_(HELMET|CHESTPLATE|LEGGINGS|BOOTS)")
- private var trophyFishingCooldown = SimpleTimeMark.farPast()
+ private var lastArmorCheck = SimpleTimeMark.farPast()
private var isTrophyFishing = false
class Data : TrackerData() {
@@ -167,17 +167,14 @@ object SeaCreatureTracker {
private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && !isTrophyFishing
- private fun isWearingTrophyArmor(): Boolean {
- val armorInternalNames = InventoryUtils.getArmor()
- return armorInternalNames.all { armorInternal ->
- trophyArmorNames.matches(armorInternal?.getInternalName()?.asString().toString())
- }
+ private fun isWearingTrophyArmor(): Boolean = InventoryUtils.getArmor().all {
+ trophyArmorNames.matches(it?.getInternalName()?.asString())
}
@SubscribeEvent
fun onTick (event: LorenzTickEvent) {
- if (trophyFishingCooldown.passedSince() < 3.seconds) return
- trophyFishingCooldown = SimpleTimeMark.now()
+ if (lastArmorCheck.passedSince() < 3.seconds) return
+ lastArmorCheck = SimpleTimeMark.now()
isTrophyFishing = isWearingTrophyArmor()
}
}
--
cgit