aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/dulkirmod/features
diff options
context:
space:
mode:
authoringlettronald <inglettronald@gmail.com>2023-04-18 12:46:19 -0500
committeringlettronald <inglettronald@gmail.com>2023-04-18 12:46:19 -0500
commit3586217aa1d08458d81a4eb15e5b38e42793f68b (patch)
tree435bf47a5a1b9033d4e6b0a2d5212e099039961f /src/main/kotlin/dulkirmod/features
parente933913ebe88f6b465ee862374bbd26c57906cae (diff)
downloadDulkirMod-3586217aa1d08458d81a4eb15e5b38e42793f68b.tar.gz
DulkirMod-3586217aa1d08458d81a4eb15e5b38e42793f68b.tar.bz2
DulkirMod-3586217aa1d08458d81a4eb15e5b38e42793f68b.zip
change to location semantics
Diffstat (limited to 'src/main/kotlin/dulkirmod/features')
-rw-r--r--src/main/kotlin/dulkirmod/features/HideHealerFairy.kt4
-rw-r--r--src/main/kotlin/dulkirmod/features/chat/DungeonKeyDisplay.kt2
-rw-r--r--src/main/kotlin/dulkirmod/features/chat/ThrottleNotif.kt2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/kotlin/dulkirmod/features/HideHealerFairy.kt b/src/main/kotlin/dulkirmod/features/HideHealerFairy.kt
index 43475b1..d77d0f7 100644
--- a/src/main/kotlin/dulkirmod/features/HideHealerFairy.kt
+++ b/src/main/kotlin/dulkirmod/features/HideHealerFairy.kt
@@ -2,7 +2,7 @@ package dulkirmod.features
import dulkirmod.DulkirMod.Companion.config
-import dulkirmod.utils.TabListUtils.isInDungeons
+import dulkirmod.utils.TabListUtils
import net.minecraft.entity.Entity
import net.minecraft.entity.item.EntityArmorStand
import net.minecraft.init.Items
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
object HideHealerFairy {
fun handle(entity: Entity, cir: CallbackInfoReturnable<Boolean>) {
if (!config.hideHealerFairy) return
- if (!isInDungeons) return
+ if (TabListUtils.area != "Dungeon") return
if (entity is EntityArmorStand) {
if (entity.heldItem != null && entity.heldItem.item === Items.skull) {
val stack = entity.heldItem
diff --git a/src/main/kotlin/dulkirmod/features/chat/DungeonKeyDisplay.kt b/src/main/kotlin/dulkirmod/features/chat/DungeonKeyDisplay.kt
index 2ba01f0..d31de56 100644
--- a/src/main/kotlin/dulkirmod/features/chat/DungeonKeyDisplay.kt
+++ b/src/main/kotlin/dulkirmod/features/chat/DungeonKeyDisplay.kt
@@ -10,7 +10,7 @@ object DungeonKeyDisplay {
private val altOpenMessage = "The BLOOD DOOR has been opened!".toRegex()
var hasKey = false;
fun handle(stringUnformatted: String) {
- if (!TabListUtils.isInDungeons) {
+ if (TabListUtils.area != "Dungeon") {
hasKey = false
return
}
diff --git a/src/main/kotlin/dulkirmod/features/chat/ThrottleNotif.kt b/src/main/kotlin/dulkirmod/features/chat/ThrottleNotif.kt
index 736ee43..a6697ef 100644
--- a/src/main/kotlin/dulkirmod/features/chat/ThrottleNotif.kt
+++ b/src/main/kotlin/dulkirmod/features/chat/ThrottleNotif.kt
@@ -10,7 +10,7 @@ object ThrottleNotif {
private var lastThrottle: Long = 0
fun handle(event: ClientChatReceivedEvent, unformatted: String) {
if (unformatted == "This menu has been throttled! Please slow down..." && DulkirMod.config.throttleNotifier
- && TabListUtils.isInDungeons
+ && TabListUtils.area == "Dungeon"
) {
event.isCanceled = true
if (!DulkirConfig.throttleNotifierSpam && System.currentTimeMillis() - lastThrottle > 8000) {