From 1f96d1b4a7e0281fe59e0cb3658c104a5e7a75a4 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Mon, 1 Apr 2024 21:08:08 +0200 Subject: add more todos after https://github.com/hannibal002/SkyHanni/pull/1264 --- src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt | 3 ++- src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt | 1 + .../at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt | 1 + .../hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt | 1 + .../java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt | 1 + src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt | 2 ++ 6 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index 16deb3baf..51ed30ff4 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -5,8 +5,8 @@ import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson import at.hannibal2.skyhanni.data.jsonobjects.local.KnownFeaturesJson -import at.hannibal2.skyhanni.data.jsonobjects.other.HypixelApiTrophyFish import at.hannibal2.skyhanni.data.jsonobjects.local.VisualWordsJson +import at.hannibal2.skyhanni.data.jsonobjects.other.HypixelApiTrophyFish import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity import at.hannibal2.skyhanni.features.misc.update.UpdateManager import at.hannibal2.skyhanni.utils.KotlinTypeAdapterFactory @@ -195,6 +195,7 @@ class ConfigManager { jsonHolder[fileType] = firstLoadFile(fileType.file, fileType, fileType.clazz.newInstance()) } + // TODO use SecondPassedEvent fixedRateTimer(name = "skyhanni-config-auto-save", period = 60_000L, initialDelay = 60_000L) { saveConfig(ConfigFileType.FEATURES, "auto-save-60s") } diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt index ba8a30e56..069cae5f8 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt @@ -4,5 +4,6 @@ class LorenzTickEvent(private val tick: Int) : LorenzEvent() { fun isMod(i: Int) = tick % i == 0 + @Deprecated("Use SecondPassedEvent instead", ReplaceWith("")) fun repeatSeconds(i: Int) = isMod(i * 20) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt index 47b182ce4..b866944d5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropSpeed.kt @@ -40,6 +40,7 @@ object GardenCropSpeed { var latestPumpkinDicer = 0.0 init { + // TODO use SecondPassedEvent + passedSince fixedRateTimer(name = "skyhanni-crop-milestone-speed", period = 1000L) { if (isEnabled()) { if (GardenAPI.mushroomCowPet) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt index 3115caadb..2cbc2474d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/bazaar/BazaarDataHolder.kt @@ -54,6 +54,7 @@ class BazaarDataHolder { npcPrices = loadNpcPrices() } + // TODO use SecondPassedEvent fixedRateTimer(name = "skyhanni-bazaar-update", period = 10_000L) { bazaarData.clear() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt index 7e145ba34..50ce4be9d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt @@ -31,6 +31,7 @@ class MovementSpeedDisplay { } init { + // TODO use LorenzTickEvent fixedRateTimer(name = "skyhanni-movement-speed-display", period = 250, initialDelay = 1_000) { checkSpeed() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt index 92620bf49..6943c97e5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt @@ -31,6 +31,7 @@ class TpsCounter { private var display = "" init { + // TODO use SecondPassedEvent + passedSince fixedRateTimer(name = "skyhanni-tps-counter-seconds", period = 1000L) { if (!isEnabled()) return@fixedRateTimer if (packetsFromLastSecond == 0) return@fixedRateTimer @@ -60,6 +61,7 @@ class TpsCounter { "§eTPS: $color$tps" } } + // TODO use DelayedRun fixedRateTimer(name = "skyhanni-tps-counter-ticks", period = 50L) { if (!isEnabled()) return@fixedRateTimer -- cgit