aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/damageindicator
diff options
context:
space:
mode:
authorLorenz <lo.scherf@gmail.com>2022-08-23 14:21:51 +0200
committerLorenz <lo.scherf@gmail.com>2022-08-23 14:21:51 +0200
commit248d8dfdae2ad3435c70fcec6577fe88f2553fe4 (patch)
tree5d4e9649af9d827343a906cab6a6ae41525b7027 /src/main/java/at/hannibal2/skyhanni/features/damageindicator
parent27d0386297fe7197c1ddb2ab6c52f2bc6a4c81af (diff)
downloadSkyHanni-248d8dfdae2ad3435c70fcec6577fe88f2553fe4.tar.gz
SkyHanni-248d8dfdae2ad3435c70fcec6577fe88f2553fe4.tar.bz2
SkyHanni-248d8dfdae2ad3435c70fcec6577fe88f2553fe4.zip
added option to hide mob nametags close to minions
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/damageindicator')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt10
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt (renamed from src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossFinder.kt)2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index 78e8ca648..8f397de02 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -33,20 +33,20 @@ import kotlin.math.max
class DamageIndicatorManager {
var data = mutableMapOf<UUID, EntityData>()
- private var bossFinder: BossFinder? = null
+ private var mobFinder: MobFinder? = null
private val decimalFormat = DecimalFormat("0.0")
private val maxHealth = mutableMapOf<UUID, Int>()
private val damagePattern = Pattern.compile("✧?(\\d+[⚔+✧❤♞☄✷ﬗ]*)")
@SubscribeEvent
fun onWorldLoad(event: WorldEvent.Load) {
- bossFinder = BossFinder()
+ mobFinder = MobFinder()
data.clear()
}
@SubscribeEvent(receiveCanceled = true)
fun onChatMessage(event: LorenzChatEvent) {
- bossFinder?.handleChat(event.message)
+ mobFinder?.handleChat(event.message)
}
@SubscribeEvent
@@ -516,7 +516,7 @@ class DamageIndicatorManager {
private fun grabData(entity: EntityLivingBase): EntityData? {
if (data.contains(entity.uniqueID)) return data[entity.uniqueID]
- val entityResult = bossFinder?.tryAdd(entity) ?: return null
+ val entityResult = mobFinder?.tryAdd(entity) ?: return null
return EntityData(
entity,
entityResult.ignoreBlocks,
@@ -542,7 +542,7 @@ class DamageIndicatorManager {
@SubscribeEvent
fun onEntityJoin(event: EntityJoinWorldEvent) {
- bossFinder?.handleNewEntity(event.entity)
+ mobFinder?.handleNewEntity(event.entity)
}
private val dummyDamageCache = mutableListOf<UUID>()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
index 2f151abf4..636fff106 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/MobFinder.kt
@@ -19,7 +19,7 @@ import net.minecraft.entity.passive.EntityHorse
import net.minecraft.entity.passive.EntityWolf
import java.util.*
-class BossFinder {
+class MobFinder {
//F1
private var floor1bonzo1 = false