aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-07-25 04:22:54 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-07-25 04:22:54 +0200
commit2ceaf10eb8cc7a78f0679a07c85c95edb1a03003 (patch)
tree078760f77b75acaccaaa48c87b40b4fa47481eda
parenta2ea62c88e4b7d25b27ccfde3d4d94d39c0a419f (diff)
downloadskyhanni-2ceaf10eb8cc7a78f0679a07c85c95edb1a03003.tar.gz
skyhanni-2ceaf10eb8cc7a78f0679a07c85c95edb1a03003.tar.bz2
skyhanni-2ceaf10eb8cc7a78f0679a07c85c95edb1a03003.zip
repeatSeconds
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt5
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/misc/tiarelay/TiaRelayHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt2
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt2
33 files changed, 35 insertions, 36 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
index c3cbab117..c0561d83a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt
@@ -85,7 +85,7 @@ class CropAccessoryData {
// Handle inventory detection
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
- if (!event.isMod(20)) return
+ if (!event.repeatSeconds(1)) return
if (!LorenzUtils.inSkyBlock) return
accessoryInInventory = bestCropAccessory(InventoryUtils.getItemsInOwnInventory())
if (accessoryInInventory == CropAccessory.NONE) return
diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt
index ac6c82044..a0b8ae9bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/MayorElection.kt
@@ -32,7 +32,7 @@ class MayorElection {
fun onTick(event: LorenzTickEvent) {
if (!LorenzUtils.onHypixel) return
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
check()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
index 82d2f4760..fa20cf268 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -112,7 +112,7 @@ class BingoNextStepHelper {
if (!LorenzUtils.isBingoProfile) return
if (!config.enabled) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
update()
updateIslandsVisited()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index 41a601b0b..1a1d8043f 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -42,7 +42,7 @@ class MinionCraftHelper {
hasMinionInInventory = mainInventory.mapNotNull { it?.name }.any { isMinionName(it) }
}
- if (event.isMod(60 * 2)) {
+ if (event.repeatSeconds(2)) {
val mainInventory = Minecraft.getMinecraft()?.thePlayer?.inventory?.mainInventory ?: return
hasItemsForMinion = loadFromInventory(mainInventory).first.isNotEmpty()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index 7403d2cb6..ac83feb51 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -24,7 +24,7 @@ class PlayerDeathMessages {
fun onTick(event: LorenzTickEvent) {
if (!isHideFarDeathsEnabled()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
checkOtherPlayers()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index f013abf07..7d88dced4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -48,7 +48,7 @@ object InquisitorWaypointShare {
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
inquisitorsNearby = inquisitorsNearby.editCopy { removeIf { it.isDead } }
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt
index b8c443eba..b1879691d 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/BarnFishingTimer.kt
@@ -23,7 +23,7 @@ class BarnFishingTimer {
if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.fishing.barnTimer) return
- if (event.isMod(60)) checkIsland()
+ if (event.repeatSeconds(3)) checkIsland()
if (!rightLocation) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
index bbebcc9b4..2a5a3bbf1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt
@@ -66,7 +66,7 @@ class GardenNextJacobContest {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (!event.isMod(40)) return
+ if (!event.repeatSeconds(2)) return
if (inCalendar) return
update()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
index 21bbf3e08..b88bc6bed 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/FarmingContestAPI.kt
@@ -24,7 +24,7 @@ object FarmingContestAPI {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
if (!LorenzUtils.inSkyBlock) return
if (!GardenAPI.inGarden()) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
index 0bacfe260..4517155e9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt
@@ -67,7 +67,7 @@ object CropMoneyDisplay {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (!event.isMod(20 * 5)) return
+ if (!event.repeatSeconds(5)) return
if (GardenAPI.getCurrentlyFarmedCrop() == null && !config.moneyPerHourAlwaysOn) return
diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
index 563e0e214..d34939d8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/HighlightMiningCommissionMobs.kt
@@ -46,7 +46,7 @@ class HighlightMiningCommissionMobs {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (!event.isMod(40)) return
+ if (!event.repeatSeconds(2)) return
val entities = EntityUtils.getEntities<EntityLivingBase>()
for ((type, entity) in active.flatMap { type -> entities.map { type to it } }) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
index a00477b07..dcfa2c6c5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt
@@ -38,7 +38,7 @@ class CityProjectFeatures {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!LorenzUtils.inSkyBlock) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
checkDailyReminder()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
index 8916fb0ec..7c14e3378 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt
@@ -75,7 +75,7 @@ class MarkedPlayerManager {
fun onTick(event: LorenzTickEvent) {
if (!LorenzUtils.inSkyBlock) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
findPlayers()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 0cc9dd7fe..736c14dec 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -128,7 +128,7 @@ class NonGodPotEffectDisplay {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (!event.isMod(20)) return
+ if (!event.repeatSeconds(1)) return
update()
}
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 fd392c876..2272cdd62 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt
@@ -18,7 +18,7 @@ class ServerRestartTitle {
if (!LorenzUtils.inSkyBlock) return
if (!config.serverRestartTitle) return
- if (!event.isMod(20)) return
+ if (!event.repeatSeconds(1)) return
for (line in ScoreboardData.sidebarLinesFormatted) {
pattern.matchMatcher(line) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt
index d23f8afc5..4457d5aef 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt
@@ -34,7 +34,6 @@ import at.hannibal2.skyhanni.utils.OSUtils
import at.hannibal2.skyhanni.utils.RenderUtils.renderStringsAndItems
import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
import at.hannibal2.skyhanni.utils.StringUtils.removeColor
-import at.hannibal2.skyhanni.utils.TabListData
import at.hannibal2.skyhanni.utils.renderables.Renderable
import io.github.moulberry.notenoughupdates.util.Utils
import io.github.moulberry.notenoughupdates.util.XPInformation
@@ -240,7 +239,7 @@ object GhostCounter {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
skillXPPattern.matchMatcher(skillText) {
val gained = group("gained").formatNumber().toDouble()
val current = group("current")
@@ -278,7 +277,7 @@ object GhostCounter {
inMist = Minecraft.getMinecraft().thePlayer.posY <= 110 // some area don't show as 'The Mist' in the scoreboard
update()
}
- if (event.isMod(40)) {
+ if (event.repeatSeconds(2)) {
calculateXP()
calculateETA()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/tiarelay/TiaRelayHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/tiarelay/TiaRelayHelper.kt
index 9d5b1e902..0d725b7d8 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/tiarelay/TiaRelayHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/tiarelay/TiaRelayHelper.kt
@@ -54,7 +54,7 @@ class TiaRelayHelper {
if (!LorenzUtils.inSkyBlock) return
if (!SkyHanniMod.feature.misc.tiaRelayHelper) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
if (InventoryUtils.openInventoryName().contains("Network Relay")) {
inInventory = true
} else {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
index 14ed0e2ff..fb6095059 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangBlazes.kt
@@ -26,7 +26,7 @@ class AshfangBlazes {
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
checkNearAshfang()
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
index dc4ff43d7..82d5113c4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangHideParticles.kt
@@ -19,7 +19,7 @@ class AshfangHideParticles {
fun onTick(event: LorenzTickEvent) {
if (!LorenzUtils.inSkyBlock) return
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
nearAshfang = DamageIndicatorManager.getDistanceTo(BossType.NETHER_ASHFANG) < 40
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
index 579c6858b..491c310b7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
@@ -68,7 +68,7 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
updateRender()
}
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
TabListData.getTabList()
.filter { it.contains("Reputation:") }
.forEach {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
index 048210679..5c0b7bf83 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
@@ -51,11 +51,11 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
checkInventoryForTrophyFish()
}
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
checkInventoryForFetchItem()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
index 18c7deff2..c4ab2bac4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/VampireSlayerFeatures.kt
@@ -83,7 +83,7 @@ object VampireSlayerFeatures {
}
}
}
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
entityList.editCopy { removeIf { it.isDead } }
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
index 2ee01875d..0b2b868d9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/RiftLarva.kt
@@ -25,7 +25,7 @@ class RiftLarva {
checkHand()
if (!hasHookInHand) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
findLarvas()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
index e96ae7e31..78c4dbfb7 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingCaveDefenseBlocks.kt
@@ -32,7 +32,7 @@ class LivingCaveDefenseBlocks {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
staticBlocks = staticBlocks.editCopy { removeIf { it.entity.isDead } }
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
index 8005c2ee0..5b2eb4562 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt
@@ -58,7 +58,7 @@ class LivingMetalSuitProgress {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (!event.isMod(20)) return
+ if (!event.repeatSeconds(1)) return
val old = progressMap
progressMap = buildMap {
for (armor in InventoryUtils.getArmor().filterNotNull()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
index b67755d7b..4c4efec12 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/stillgorechateau/RiftBloodEffigies.kt
@@ -84,7 +84,7 @@ class RiftBloodEffigies {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
- if (!event.isMod(20)) return
+ if (!event.repeatSeconds(1)) return
if (!isEnabled()) return
for (entity in EntityUtils.getEntitiesNearby<EntityArmorStand>(LocationUtils.playerLocation(), 6.0)) {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
index 1b3e08953..bc9a4f5b0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/westvillage/KloonHacking.kt
@@ -28,7 +28,7 @@ class KloonHacking {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!RiftAPI.inRift()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
checkHelmet()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
index e2a2ebf55..591476665 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/wyldwoods/RiftOdonata.kt
@@ -25,7 +25,7 @@ class RiftOdonata {
checkHand()
if (!hasBottleInHand) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
findOdonatas()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
index 8d72af8d0..6531194b1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt
@@ -82,7 +82,7 @@ object CruxTalismanDisplay {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (!event.isMod(40)) return
+ if (!event.repeatSeconds(2)) return
if (!InventoryUtils.getItemsInOwnInventory().any { it.getInternalName().startsWith(partialName) }) return
displayLine.clear()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
index 2cb9bf05c..6f99abe18 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -66,7 +66,7 @@ class SlayerQuestWarning {
if (!(LorenzUtils.inSkyBlock)) return
if (dirtySidebar) {
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
checkSidebar()
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
index ba56b561f..38471c117 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
@@ -32,7 +32,7 @@ class SlayerRngMeterDisplay {
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
if (lastItemDroppedTime != 0L) {
if (System.currentTimeMillis() > lastItemDroppedTime + 4_000) {
lastItemDroppedTime = 0L
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt
index 1a4a6c70f..f9ab78ac1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerClearView.kt
@@ -16,7 +16,7 @@ class BlazeSlayerClearView {
@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!LorenzUtils.inSkyBlock) return
- if (event.isMod(60)) {
+ if (event.repeatSeconds(3)) {
nearBlaze = DamageIndicatorManager.getDistanceTo(
BossType.SLAYER_BLAZE_1,
BossType.SLAYER_BLAZE_2,
diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
index 56f490e9b..63df99ab0 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt
@@ -65,7 +65,7 @@ class SummoningMobManager {
if (!isEnabled()) return
if (SkyHanniMod.feature.summonings.summoningMobDisplay) {
- if (event.isMod(20)) {
+ if (event.repeatSeconds(1)) {
updateData()
}
}