summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/slayer
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-12 10:54:08 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2023-10-12 10:54:08 +0200
commitd4084e697899f6dc3ceb87b4d229e0fe3819440a (patch)
treeae545bc46674479edf125ae9e1ec8f82e10b7836 /src/main/java/at/hannibal2/skyhanni/features/slayer
parentec19d756630c0477f0f6ff0fbbdff9a44be10fdd (diff)
downloadskyhanni-d4084e697899f6dc3ceb87b4d229e0fe3819440a.tar.gz
skyhanni-d4084e697899f6dc3ceb87b4d229e0fe3819440a.tar.bz2
skyhanni-d4084e697899f6dc3ceb87b4d229e0fe3819440a.zip
moved sendTitle into LorenzUtils
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/slayer')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerBossSpawnSoon.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt11
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt3
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt7
7 files changed, 16 insertions, 18 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerBossSpawnSoon.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerBossSpawnSoon.kt
index 1d8dd0698..7c71632e2 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerBossSpawnSoon.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerBossSpawnSoon.kt
@@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.features.slayer
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.SlayerAPI
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.SlayerProgressChangeEvent
+import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.NumberUtil.formatNumber
import at.hannibal2.skyhanni.utils.SoundUtils
import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher
@@ -29,7 +29,7 @@ class SlayerBossSpawnSoon {
if (completion > config.percent / 100.0) {
if (!warned || (config.repeat && completion != lastCompletion)) {
SoundUtils.playBeepSound()
- TitleUtils.sendTitle("§cSlayer boss soon!", 2.seconds)
+ LorenzUtils.sendTitle("§cSlayer boss soon!", 2.seconds)
warned = true
}
} else {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt
index cd286beab..ed85ba489 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerItemProfitTracker.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.config.Storage.ProfileSpecific.SlayerProfitList
import at.hannibal2.skyhanni.data.ProfileStorageData
import at.hannibal2.skyhanni.data.SlayerAPI
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.GuiRenderEvent
import at.hannibal2.skyhanni.events.PacketEvent
import at.hannibal2.skyhanni.events.PurseChangeCause
@@ -188,7 +187,7 @@ object SlayerItemProfitTracker {
LorenzUtils.chat("§e[SkyHanni] §a+Slayer Drop§7: §r$itemName")
}
if (config.titleWarning && price > config.minimumPriceWarning) {
- TitleUtils.sendTitle("§a+ $itemName", 5.seconds)
+ LorenzUtils.sendTitle("§a+ $itemName", 5.seconds)
}
}
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 60fde86a5..e1cc10b6b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerQuestWarning.kt
@@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.features.slayer
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.ScoreboardData
import at.hannibal2.skyhanni.data.SlayerAPI
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent
import at.hannibal2.skyhanni.events.LorenzChatEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
@@ -135,7 +134,7 @@ class SlayerQuestWarning {
LorenzUtils.chat("§e[SkyHanni] $chatMessage")
if (config.questWarningTitle) {
- TitleUtils.sendTitle("§e$titleMessage", 2.seconds)
+ LorenzUtils.sendTitle("§e$titleMessage", 2.seconds)
}
}
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 ee237c34f..4021209f6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt
@@ -4,7 +4,6 @@ import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.config.Storage
import at.hannibal2.skyhanni.data.ProfileStorageData
import at.hannibal2.skyhanni.data.SlayerAPI
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.GuiRenderEvent
import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
import at.hannibal2.skyhanni.events.LorenzChatEvent
@@ -72,7 +71,7 @@ class SlayerRngMeterDisplay {
val hasItemSelected = item != "" && item != "?"
if (!hasItemSelected && config.warnEmpty) {
LorenzUtils.warning("§c[SkyHanni] No Slayer RNG Meter Item selected!")
- TitleUtils.sendTitle("§cNo RNG Meter Item!", 3.seconds)
+ LorenzUtils.sendTitle("§cNo RNG Meter Item!", 3.seconds)
}
var blockChat = config.hideChat && hasItemSelected
val diff = currentMeter - old
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
index 23aad848c..1f13785c1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/VampireSlayerFeatures.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.slayer
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.ClickType
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.EntityClickEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -142,12 +141,13 @@ object VampireSlayerFeatures {
if (nextClawSend < System.currentTimeMillis()) {
if (shouldSendSound)
playTwinclawsSound()
- if (shouldSendTitle)
- TitleUtils.sendTitle(
+ if (shouldSendTitle) {
+ LorenzUtils.sendTitle(
"§6§lTWINCLAWS",
(1750 - config.twinclawsDelay).milliseconds,
2.6
)
+ }
nextClawSend = System.currentTimeMillis() + 5_000
}
}
@@ -198,8 +198,9 @@ object VampireSlayerFeatures {
else if (canUseSteak && configOtherBoss.steakAlert && taggedEntityList.contains(this.entityId)) true
else canUseSteak && configCoopBoss.steakAlert && containCoop
- if (shouldSendSteakTitle)
- TitleUtils.sendTitle("§c§lSTEAK!", 300.milliseconds, 2.6)
+ if (shouldSendSteakTitle) {
+ LorenzUtils.sendTitle("§c§lSTEAK!", 300.milliseconds, 2.6)
+ }
if (shouldRender) {
RenderLivingEntityHelper.setEntityColor(this, color) { isEnabled() }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt
index 69e800600..d897f0b99 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerFirePitsWarning.kt
@@ -1,7 +1,6 @@
package at.hannibal2.skyhanni.features.slayer.blaze
import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.BossHealthChangeEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.features.damageindicator.BossType
@@ -19,7 +18,7 @@ class BlazeSlayerFirePitsWarning {
private var lastFirePitsWarning = 0L
fun fireFirePits() {
- TitleUtils.sendTitle("§cFire Pits!", 2.seconds)
+ LorenzUtils.sendTitle("§cFire Pits!", 2.seconds)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
index 6e0bdd7d3..6c192fe26 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/enderman/EndermanSlayerFeatures.kt
@@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.features.slayer.enderman
import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.data.IslandType
-import at.hannibal2.skyhanni.data.TitleUtils
import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -17,6 +16,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils
import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
import at.hannibal2.skyhanni.utils.LorenzColor
import at.hannibal2.skyhanni.utils.LorenzLogger
+import at.hannibal2.skyhanni.utils.LorenzUtils
import at.hannibal2.skyhanni.utils.LorenzUtils.editCopy
import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
import at.hannibal2.skyhanni.utils.LorenzUtils.toChromaColor
@@ -65,8 +65,9 @@ class EndermanSlayerFeatures {
flyingBeacons = flyingBeacons.editCopy {
add(entity)
}
- if (beaconConfig.showWarning)
- TitleUtils.sendTitle("§4Beacon", 2.seconds)
+ if (beaconConfig.showWarning) {
+ LorenzUtils.sendTitle("§4Beacon", 2.seconds)
+ }
logger.log("Added flying beacons at ${entity.getLorenzVec()}")
}
}