diff options
| author | Lorenz <lo.scherf@gmail.com> | 2022-09-11 22:59:37 +0200 |
|---|---|---|
| committer | Lorenz <lo.scherf@gmail.com> | 2022-09-11 22:59:37 +0200 |
| commit | 7693ee41d191cec6584c9d5761e644fe4f738ea9 (patch) | |
| tree | 3a608e88f9bd23625ffa0c669573e7d15308d86c /src/main/java/at/hannibal2/skyhanni/features/slayer | |
| parent | 8b152bcddf4a99a64bda5974fefe1d50cc0a8f19 (diff) | |
| download | skyhanni-7693ee41d191cec6584c9d5761e644fe4f738ea9.tar.gz skyhanni-7693ee41d191cec6584c9d5761e644fe4f738ea9.tar.bz2 skyhanni-7693ee41d191cec6584c9d5761e644fe4f738ea9.zip | |
using method hasMaxHealth
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/slayer')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt index e2fb2719a..faff3885a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt @@ -5,9 +5,9 @@ import at.hannibal2.skyhanni.events.RenderMobColoredEvent import at.hannibal2.skyhanni.events.ResetEntityHurtEvent import at.hannibal2.skyhanni.events.withAlpha import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager +import at.hannibal2.skyhanni.utils.EntityUtils.hasMaxHealth import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils -import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth import net.minecraft.client.Minecraft import net.minecraft.entity.Entity import net.minecraft.entity.EntityLivingBase @@ -39,23 +39,23 @@ class HighlightSlayerMiniboss { val list = mutableListOf<EntityLivingBase>() list.addAll(entityList.filterIsInstance<EntityZombie>().filter { - it.baseMaxHealth % 24_000 == 0.0 || it.baseMaxHealth % 90_000 == 0.0 || it.baseMaxHealth % 360_000 == 0.0 || it.baseMaxHealth % 600_000 == 0.0 || it.baseMaxHealth % 2_400_000 == 0.0 + it.hasMaxHealth(24_000) || it.hasMaxHealth(90_000) || it.hasMaxHealth(360_000) || it.hasMaxHealth(600_000) || it.hasMaxHealth(2_400_000) }) list.addAll(entityList.filterIsInstance<EntitySpider>().filter { - it.baseMaxHealth % 54_000 == 0.0 || it.baseMaxHealth % 144_000 == 0.0 || it.baseMaxHealth % 576_000 == 0.0 + it.hasMaxHealth(54_000) || it.hasMaxHealth(144_000) || it.hasMaxHealth(576_000) }) list.addAll(entityList.filterIsInstance<EntityWolf>().filter { - it.baseMaxHealth % 45_000 == 0.0 || it.baseMaxHealth % 120_000 == 0.0 || it.baseMaxHealth % 450_000 == 0.0 + it.hasMaxHealth(45_000) || it.hasMaxHealth(120_000) || it.hasMaxHealth(450_000) }) list.addAll(entityList.filterIsInstance<EntityEnderman>().filter { - it.baseMaxHealth % 12_000_000 == 0.0 || it.baseMaxHealth % 25_000_000 == 0.0 + it.hasMaxHealth(12_000_000) || it.hasMaxHealth(25_000_000) }) list.addAll(entityList.filterIsInstance<EntityBlaze>().filter { - it.baseMaxHealth % 12_000_000 == 0.0 || it.baseMaxHealth % 25_000_000 == 0.0 + it.hasMaxHealth(12_000_000) || it.hasMaxHealth(25_000_000) }) list.filter { it !in miniBosses && !DamageIndicatorManager.isBoss(it) }.forEach(miniBosses::add) @@ -89,4 +89,4 @@ class HighlightSlayerMiniboss { private fun isEnabled(): Boolean { return LorenzUtils.inSkyblock && SkyHanniMod.feature.misc.slayerMinibossHighlight && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight } -}
\ No newline at end of file +} |
