Created EntityMaxHealthUpdateEvent, started with better logic for colored mobs.

3 files changed, 11 insertions, 7 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
index c91865dce..c27d464d7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/EntityUtils.kt
@@ -78,18 +78,19 @@ object EntityUtils {
 
     fun EntityLivingBase.hasBossHealth(health: Int): Boolean = this.hasMaxHealth(health, true)
 
-    fun EntityLivingBase.hasMaxHealth(health: Int, boss: Boolean = false): Boolean {
-        if (this.baseMaxHealth == health.toDouble()) return true
+    //TODO remove baseMaxHealth
+    fun EntityLivingBase.hasMaxHealth(health: Int, boss: Boolean = false, maxHealth: Int = baseMaxHealth): Boolean {
+        if (maxHealth == health) return true
 
         //Derpy
-        if (this.baseMaxHealth == health.toDouble() * 2) return true
+        if (maxHealth == health * 2) return true
 
         if (!boss) {
             //Corrupted
-            if (this.baseMaxHealth == health.toDouble() * 3) return true
+            if (maxHealth == health * 3) return true
 
             //Derpy + Corrupted
-            if (this.baseMaxHealth == health.toDouble() * 2 * 3) return true
+            if (maxHealth == health * 2 * 3) return true
         }
 
         return false
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
index d8e21e46f..87ae37da7 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt
@@ -134,4 +134,6 @@ object ItemUtils {
         set(value) {
             setStackDisplayName(value)
         }
+
+    fun isSkyBlockMenuItem(stack: ItemStack?): Boolean = stack?.getInternalName() == "SKYBLOCK_MENU"
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index cf557e1cb..a650e1c19 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -105,8 +105,9 @@ object LorenzUtils {
     // TODO replace all calls with regex
     fun String.between(start: String, end: String): String = this.split(start, end)[1]
 
-    val EntityLivingBase.baseMaxHealth: Double
-        get() = this.getEntityAttribute(SharedMonsterAttributes.maxHealth).baseValue
+    //TODO change to Int
+    val EntityLivingBase.baseMaxHealth: Int
+        get() = this.getEntityAttribute(SharedMonsterAttributes.maxHealth).baseValue.toInt()
 
     fun formatPercentage(percentage: Double): String = formatPercentage(percentage, "0.00")