From d4084e697899f6dc3ceb87b4d229e0fe3819440a Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Thu, 12 Oct 2023 10:54:08 +0200 Subject: moved sendTitle into LorenzUtils --- .../java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt | 3 +-- .../java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt | 3 +-- .../at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt | 5 ++--- .../java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc') 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 f87e249a4..5f8db82de 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ServerRestartTitle.kt @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.data.TitleUtils import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher @@ -28,7 +27,7 @@ class ServerRestartTitle { val totalSeconds = minutes * 60 + seconds if (totalSeconds > 120 && totalSeconds % 30 != 0) return val time = TimeUtils.formatDuration(totalSeconds.toLong() * 1000) - TitleUtils.sendTitle("§cServer Restart in §b$time", 2.seconds) + LorenzUtils.sendTitle("§cServer Restart in §b$time", 2.seconds) } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt index c571a2d63..3759d432e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/SkyBlockKickDuration.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.TitleUtils import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent @@ -69,7 +68,7 @@ class SkyBlockKickDuration { } private fun warn() { - TitleUtils.sendTitle("§eTry rejoining SkyBlock now!", 3.seconds) + LorenzUtils.sendTitle("§eTry rejoining SkyBlock now!", 3.seconds) } fun isEnabled() = config.enabled diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt index d393fdd7f..73382b654 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt @@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.features.misc.trevor import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.ScoreboardData -import at.hannibal2.skyhanni.data.TitleUtils import at.hannibal2.skyhanni.events.CheckRenderEntityEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -88,7 +87,7 @@ object TrevorFeatures { if (event.message == "§aReturn to the Trapper soon to get a new animal to hunt!") { TrevorSolver.resetLocation() if (config.trapperMobDiedMessage) { - TitleUtils.sendTitle("§2Mob Died ", 5.seconds) + LorenzUtils.sendTitle("§2Mob Died ", 5.seconds) SoundUtils.playBeepSound() } trapperReady = true @@ -168,7 +167,7 @@ object TrevorFeatures { if (timeUntilNextReady <= 0 && trapperReady) { if (timeUntilNextReady == 0) { - TitleUtils.sendTitle("§2Trapper Ready", 3.seconds) + LorenzUtils.sendTitle("§2Trapper Ready", 3.seconds) SoundUtils.playBeepSound() } currentStatus = TrapperStatus.READY diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt index f86ea9087..0dd7ba5e8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorSolver.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.features.misc.trevor -import at.hannibal2.skyhanni.data.TitleUtils import at.hannibal2.skyhanni.utils.EntityUtils import at.hannibal2.skyhanni.utils.LocationUtils import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer +import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth import at.hannibal2.skyhanni.utils.LorenzUtils.derpy import at.hannibal2.skyhanni.utils.LorenzVec @@ -69,7 +69,7 @@ object TrevorSolver { } if (canSee) { if (mobLocation != CurrentMobArea.FOUND) { - TitleUtils.sendTitle("§2Saw ${currentMob!!.mobName}!", 3.seconds) + LorenzUtils.sendTitle("§2Saw ${currentMob!!.mobName}!", 3.seconds) } mobLocation = CurrentMobArea.FOUND mobCoordinates = entity.position.toLorenzVec() -- cgit