chore: migrate ticktasks to new tick api

Skytils · Nov 10, 2023 · adec375 · adec375
1 parent aa29d0d
commit adec375
Show file tree

Hide file tree

Showing 30 changed files with 196 additions and 197 deletions.
diff --git a/src/main/kotlin/gg/skytils/skytilsmod/Skytils.kt b/src/main/kotlin/gg/skytils/skytilsmod/Skytils.kt
@@ -556,7 +556,7 @@ class Skytils {
         val old = mc.currentScreen
         if (event.gui == null && config.reopenOptionsMenu) {
             if (old is ReopenableGUI || (old is AccessorSettingsGui && old.config is Config)) {
-                TickTask(1) {
+                tickTimer(1) {
                     if (mc.thePlayer?.openContainer == mc.thePlayer?.inventoryContainer)
                         displayScreen = OptionsGui()
                 }

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt
@@ -2960,7 +2960,7 @@ object Config : Vigilant(
         addDependency("assumeWitherImpact", "witherShieldCooldown")
 
         registerListener("protectItemBINThreshold") { _: String ->
-            TickTask(1) {
+            tickTimer(1) {
                 val numeric = protectItemBINThreshold.replace(Regex("[^0-9]"), "")
                 protectItemBINThreshold = numeric.ifEmpty { "0" }
                 if (protectItemBINThreshold != "0") fetchLowestBINPrices = true
@@ -2978,7 +2978,7 @@ object Config : Vigilant(
                     val loc = ResourceLocation("skytils:gui/customrarity.png")
                     mc.resourceManager.getResource(loc)
                 }.onFailure {
-                    TickTask(1) {
+                    tickTimer(1) {
                         if (itemRarityShape == 4) {
                             itemRarityShape = old
                             EssentialAPI.getNotifications()

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/BloodHelper.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/BloodHelper.kt
@@ -21,7 +21,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons
 import gg.essential.universal.UMatrixStack
 import gg.essential.universal.UMinecraft
 import gg.skytils.skytilsmod.Skytils
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.MainReceivePacketEvent
 import gg.skytils.skytilsmod.utils.ItemUtil
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -113,11 +113,11 @@ object BloodHelper {
     fun onJoin(event: EntityJoinWorldEvent) {
         if (event.entity !is EntityZombie) return
         (event.entity as EntityZombie).apply {
-            TickTask(1) {
+            tickTimer(1) {
                 val helmet = getEquipmentInSlot(4)
-                if (helmet == null || helmet.item != Items.skull) return@TickTask
+                if (helmet == null || helmet.item != Items.skull) return@tickTimer
                 val texture = ItemUtil.getSkullTexture(helmet)
-                if (texture == null || (watcherSkins.contains(texture))) return@TickTask
+                if (texture == null || (watcherSkins.contains(texture))) return@tickTimer
                 printDevMessage("found watcher", "blood")
                 watchers.add(this)
             }

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonTimer.kt
@@ -19,8 +19,8 @@ package gg.skytils.skytilsmod.features.impl.dungeons
 
 import gg.essential.universal.UChat
 import gg.skytils.skytilsmod.Skytils
-import gg.skytils.skytilsmod.core.TickTask
 import gg.skytils.skytilsmod.core.structure.GuiElement
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.NumberUtil
 import gg.skytils.skytilsmod.utils.NumberUtil.roundToPrecision
@@ -110,7 +110,7 @@ object DungeonTimer {
 
             bossEntryTime != -1L && bossClearTime == -1L && message.contains("§r§c☠ §r§eDefeated §r") -> {
                 bossClearTime = System.currentTimeMillis()
-                TickTask(5) {
+                tickTimer(5) {
                     arrayListOf<String>().apply {
                         if (Skytils.config.dungeonTimer) {
                             add("§7Wither Doors: $witherDoors")

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/MasterMode7Features.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/MasterMode7Features.kt
@@ -24,7 +24,7 @@ import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
 import gg.skytils.skytilsmod.core.GuiManager
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.BlockChangeEvent
 import gg.skytils.skytilsmod.events.impl.CheckRenderEntityEvent
 import gg.skytils.skytilsmod.events.impl.MainReceivePacketEvent
@@ -76,8 +76,8 @@ object MasterMode7Features {
     }
 
     init {
-        TickTask(15, repeats = true) {
-            if (DungeonTimer.phase4ClearTime == -1L || DungeonTimer.scoreShownAt != -1L || mc.thePlayer == null) return@TickTask
+        tickTimer(15, repeats = true) {
+            if (DungeonTimer.phase4ClearTime == -1L || DungeonTimer.scoreShownAt != -1L || mc.thePlayer == null) return@tickTimer
             if (Skytils.config.witherKingDragonSlashAlert) {
                 if (glowstones.any { it.isVecInside(mc.thePlayer.positionVector) }) {
                     GuiManager.createTitle("Dimensional Slash!", 10)

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt
@@ -22,8 +22,8 @@ import gg.essential.elementa.state.State
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
 import gg.skytils.skytilsmod.core.GuiManager
-import gg.skytils.skytilsmod.core.TickTask
 import gg.skytils.skytilsmod.core.structure.GuiElement
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.MainReceivePacketEvent
 import gg.skytils.skytilsmod.features.impl.handlers.MayorInfo
 import gg.skytils.skytilsmod.listeners.DungeonListener
@@ -422,7 +422,7 @@ object ScoreCalculation {
     }
 
     init {
-        TickTask(5, repeats = true) {
+        tickTimer(5, repeats = true) {
             isPaul.set(
                 (MayorInfo.currentMayor == "Paul" && MayorInfo.mayorPerks.contains("EZPZ")) || MayorInfo.jerryMayor?.name == "Paul"
             )

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BlazeSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BlazeSolver.kt
@@ -22,7 +22,7 @@ import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.failPrefix
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -51,15 +51,15 @@ object BlazeSolver {
     var lastKilledBlazeHp = 0
 
     init {
-        TickTask(4, repeats = true) {
+        tickTimer(4, repeats = true) {
             if (Skytils.config.blazeSolver && Utils.inDungeons && DungeonListener.missingPuzzles.contains(
                     "Higher Or Lower"
                 )
             ) {
                 calcOrder()
             }
         }
-        TickTask(20, repeats = true) {
+        tickTimer(20, repeats = true) {
             if (Skytils.config.blazeSolver && Utils.inDungeons && DungeonListener.missingPuzzles.contains(
                     "Higher Or Lower"
                 )

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt
@@ -23,7 +23,7 @@ import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.failPrefix
 import gg.skytils.skytilsmod.Skytils.Companion.mc
 import gg.skytils.skytilsmod.Skytils.Companion.successPrefix
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -55,7 +55,7 @@ object BoulderSolver {
     private var job: Job? = null
 
     init {
-        TickTask(20, repeats = true, task = ::update)
+        tickTimer(20, repeats = true, task = ::update)
     }
 
     @SubscribeEvent

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/CreeperSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/CreeperSolver.kt
@@ -20,7 +20,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons.solvers
 import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.*
@@ -89,7 +89,7 @@ object CreeperSolver {
     }
 
     init {
-        TickTask(20, repeats = true) {
+        tickTimer(20, repeats = true) {
             if (Skytils.config.creeperBeamsSolver && Utils.inDungeons && DungeonListener.missingPuzzles.contains(
                     "Creeper Beams"
                 )

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/IceFillSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/IceFillSolver.kt
@@ -20,7 +20,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons.solvers
 import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.features.impl.misc.Funny
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -48,8 +48,8 @@ object IceFillSolver {
     private var job: Job? = null
 
     init {
-        TickTask(20, repeats = true) {
-            if (!Utils.inDungeons || !Skytils.config.iceFillSolver || mc.thePlayer == null) return@TickTask
+        tickTimer(20, repeats = true) {
+            if (!Utils.inDungeons || !Skytils.config.iceFillSolver || mc.thePlayer == null) return@tickTimer
             val world: World = mc.theWorld
             if (DungeonListener.missingPuzzles.contains("Ice Fill") && (job == null || job?.isCancelled == true || job?.isCompleted == true)) {
                 if (chestPos == null || roomFacing == null) {

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/IcePathSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/IcePathSolver.kt
@@ -20,7 +20,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons.solvers
 import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.features.impl.misc.Funny
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -49,8 +49,8 @@ object IcePathSolver {
     private var silverfishPos: Point? = null
 
     init {
-        TickTask(20, repeats = true) {
-            if (!Utils.inDungeons || !Skytils.config.icePathSolver || mc.thePlayer == null) return@TickTask
+        tickTimer(20, repeats = true) {
+            if (!Utils.inDungeons || !Skytils.config.icePathSolver || mc.thePlayer == null) return@tickTimer
             if (DungeonListener.missingPuzzles.contains("Ice Path")) {
                 val silverfish = mc.theWorld.getEntities(
                     EntitySilverfish::class.java

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/TicTacToeSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/TicTacToeSolver.kt
@@ -20,7 +20,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons.solvers
 
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -48,8 +48,8 @@ object TicTacToeSolver {
     private var bestMove: BlockPos? = null
 
     init {
-        TickTask(20, repeats = true) {
-            if (!Utils.inDungeons || !Skytils.config.ticTacToeSolver || mc.thePlayer == null) return@TickTask
+        tickTimer(20, repeats = true) {
+            if (!Utils.inDungeons || !Skytils.config.ticTacToeSolver || mc.thePlayer == null) return@tickTimer
             if (SuperSecretSettings.azooPuzzoo || DungeonListener.missingPuzzles.contains("Tic Tac Toe")) {
                 updatePuzzleState()
             } else {

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/WaterBoardSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/WaterBoardSolver.kt
@@ -20,7 +20,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons.solvers
 import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
 import gg.skytils.skytilsmod.utils.SuperSecretSettings
@@ -58,10 +58,10 @@ object WaterBoardSolver {
     private var job: Job? = null
 
     init {
-        TickTask(20, repeats = true) {
-            if (!Skytils.config.waterBoardSolver || !Utils.inDungeons) return@TickTask
-            val player = mc.thePlayer ?: return@TickTask
-            val world = mc.theWorld ?: return@TickTask
+        tickTimer(20, repeats = true) {
+            if (!Skytils.config.waterBoardSolver || !Utils.inDungeons) return@tickTimer
+            val player = mc.thePlayer ?: return@tickTimer
+            val world = mc.theWorld ?: return@tickTimer
             if (DungeonListener.missingPuzzles.contains("Water Board") && variant == -1 && (job == null || job?.isCancelled == true || job?.isCompleted == true)) {
                 job = Skytils.launch {
                     prevInWaterRoom = inWaterRoom

diff --git a/...lin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/terminals/AlignmentTaskSolver.kt b/...lin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/terminals/AlignmentTaskSolver.kt
@@ -21,7 +21,7 @@ package gg.skytils.skytilsmod.features.impl.dungeons.solvers.terminals
 import gg.essential.universal.UMatrixStack
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.features.impl.dungeons.DungeonFeatures
 import gg.skytils.skytilsmod.features.impl.dungeons.DungeonTimer
 import gg.skytils.skytilsmod.utils.RenderUtil
@@ -61,12 +61,12 @@ object AlignmentTaskSolver {
     private val directionSet = HashMap<Point, Int>()
 
     init {
-        TickTask(20, repeats = true) {
+        tickTimer(20, repeats = true) {
             if (!Skytils.config.alignmentTerminalSolver || !Utils.inDungeons || mc.thePlayer == null || (!SuperSecretSettings.azooPuzzoo && (DungeonTimer.phase2ClearTime == -1L || DungeonTimer.phase3ClearTime != -1L) || !Utils.equalsOneOf(
                     DungeonFeatures.dungeonFloor,
                     "F7", "M7"
                 ))
-            ) return@TickTask
+            ) return@tickTimer
             if (mc.thePlayer.getDistanceSqToCenter(topLeft) <= 25 * 25) {
                 if (grid.size < 25) {
                     val frames = mc.theWorld.getEntities(EntityItemFrame::class.java) {

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/farming/FarmingFeatures.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/farming/FarmingFeatures.kt
@@ -25,7 +25,7 @@ import gg.skytils.skytilsmod.Skytils.Companion.prefix
 import gg.skytils.skytilsmod.Skytils.Companion.successPrefix
 import gg.skytils.skytilsmod.core.DataFetcher
 import gg.skytils.skytilsmod.core.SoundQueue
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.PacketEvent.ReceiveEvent
 import gg.skytils.skytilsmod.features.impl.handlers.MayorInfo
 import gg.skytils.skytilsmod.utils.SBInfo
@@ -122,7 +122,7 @@ object FarmingFeatures {
             val solution = hungerHikerItems.getOrDefault(hungerHikerItems.keys.find { s: String ->
                 unformatted.contains(s)
             }, null)
-            TickTask(4) {
+            tickTimer(4) {
                 if (solution != null) {
                     UChat.chat("$successPrefix §aThe Hiker needs: §l§2 $solution§a!")
                 } else {

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/farming/GardenFeatures.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/farming/GardenFeatures.kt
@@ -21,7 +21,7 @@ package gg.skytils.skytilsmod.features.impl.farming
 import gg.essential.api.EssentialAPI
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.utils.*
 import net.minecraft.init.Blocks
 import net.minecraft.util.BlockPos
@@ -72,7 +72,7 @@ object GardenFeatures {
     }
 
     init {
-        TickTask(5, repeats = true) {
+        tickTimer(5, repeats = true) {
             if (mc.thePlayer != null) {
                 val inGarden = SBInfo.mode == SkyblockIsland.TheGarden.mode
 

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/farming/VisitorHelper.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/farming/VisitorHelper.kt
@@ -22,8 +22,8 @@ import gg.essential.universal.UMatrixStack
 import gg.essential.universal.UResolution
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.Companion.mc
-import gg.skytils.skytilsmod.core.TickTask
 import gg.skytils.skytilsmod.core.structure.GuiElement
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.GuiContainerEvent
 import gg.skytils.skytilsmod.features.impl.handlers.AuctionData
 import gg.skytils.skytilsmod.features.impl.misc.ContainerSellValue
@@ -55,15 +55,15 @@ object VisitorHelper {
     }
 
     init {
-        TickTask(4, repeats = true) {
-            if (!Skytils.config.visitorOfferHelper) return@TickTask
+        tickTimer(4, repeats = true) {
+            if (!Skytils.config.visitorOfferHelper) return@tickTimer
 
             textLines.clear()
             totalItemCost = 0.0
 
-            if (!inGarden) return@TickTask
+            if (!inGarden) return@tickTimer
 
-            val container = (mc.currentScreen as? GuiChest)?.inventorySlots as? ContainerChest ?: return@TickTask
+            val container = (mc.currentScreen as? GuiChest)?.inventorySlots as? ContainerChest ?: return@tickTimer
             val chestName = container.lowerChestInventory.name
             val npcSummary: ItemStack? = container.getSlot(13).stack
             val acceptOffer: ItemStack? = container.getSlot(29).stack
@@ -75,7 +75,7 @@ object VisitorHelper {
                 textLines.add("§eRewards:")
 
                 val rewardIndex = lore.indexOf("§7Rewards:")
-                if (rewardIndex == -1) return@TickTask
+                if (rewardIndex == -1) return@tickTimer
 
                 lore.drop(rewardIndex + 1)
                     .takeWhile { it != "" }

diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/handlers/MayorInfo.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/handlers/MayorInfo.kt
@@ -23,7 +23,7 @@ import gg.skytils.skytilsmod.Skytils.Companion.client
 import gg.skytils.skytilsmod.Skytils.Companion.json
 import gg.skytils.skytilsmod.Skytils.Companion.mc
 import gg.skytils.skytilsmod.core.SoundQueue
-import gg.skytils.skytilsmod.core.TickTask
+import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.GuiContainerEvent
 import gg.skytils.skytilsmod.utils.*
 import io.ktor.client.call.*
@@ -61,10 +61,10 @@ object MayorInfo {
     private val jerryNextPerkRegex = Regex("§7Next set of perks in §e(?<h>\\d+?)h (?<m>\\d+?)m")
 
     init {
-        TickTask(60 * 20, repeats = true) {
+        tickTimer(60 * 20, repeats = true) {
             if (!Utils.inSkyblock || mc.currentServerData?.serverIP?.lowercase()
                     ?.contains("alpha") == true
-            ) return@TickTask
+            ) return@tickTimer
             if (currentMayor == "Jerry" && System.currentTimeMillis() > newJerryPerks) {
                 if (jerryMayor != null && Skytils.config.displayJerryPerks) {
                     SoundQueue.addToQueue("random.orb", 0.8f, 1f, 1, true)
@@ -134,7 +134,7 @@ object MayorInfo {
 
     fun fetchMayorData() = Skytils.IO.launch {
         val res = json.decodeFromJsonElement<Mayor>(client.get("https://api.hypixel.net/resources/skyblock/election").body<JsonObject>()["mayor"]!!)
-        TickTask(1) {
+        tickTimer(1) {
             currentMayor = res.name
             lastFetchedMayorData = System.currentTimeMillis()
             if (currentMayor != "Jerry") jerryMayor = null
@@ -145,7 +145,7 @@ object MayorInfo {
 
     fun fetchJerryData() = Skytils.IO.launch {
         val res = client.get("https://${Skytils.domain}/api/mayor").body<JerrySession>()
-        TickTask(1) {
+        tickTimer(1) {
             newJerryPerks = res.nextSwitch
             jerryMayor = res.mayor
         }