add adjustable base color

U5B · Apr 26, 2023 · 848b380 · 848b380
1 parent 35504dc
commit 848b380
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/kotlin/net/usbwire/base/config/VigilanceConfig.kt b/src/main/kotlin/net/usbwire/base/config/VigilanceConfig.kt
@@ -25,6 +25,9 @@ object VigilanceConfig : Vigilant(File(configFile)) {
   var healthForcedHitbox = false
 
 
+  @Property(type = PropertyType.COLOR, name = "Base Health Color", description = "By default, white does not show hitbox. Change the color here to make hitboxes show.", category = "GlowHealth")
+  var healthBaseColor = Color.WHITE
+
   @Property(type = PropertyType.COLOR, name = "Good Health Color", description = "", category = "GlowHealth")
   var healthGoodColor = Color.GREEN
   @Property(type = PropertyType.PERCENT_SLIDER, name = "Good Health Percentage", description = "", category = "GlowHealth")

diff --git a/src/main/kotlin/net/usbwire/base/util/Hitbox.kt b/src/main/kotlin/net/usbwire/base/util/Hitbox.kt
@@ -26,7 +26,7 @@ object Hitbox {
     val red = color.red / 255.0F
     val green = color.green / 255.0F
     val blue = color.blue / 255.0F
-    val alpha = 1.toFloat()
+    val alpha = color.alpha / 255.0F
     WorldRenderer.drawBox(matrices, vertices, box, red, green, blue, alpha)
     return true
   }
@@ -36,14 +36,14 @@ object Hitbox {
     val maxHealth = entity.maxHealth
     val percentHealth = health / maxHealth
     if (percentHealth >= VigilanceConfig.healthGoodPercent) {
-      return Color.WHITE
+      return VigilanceConfig.healthBaseColor
     } else if (percentHealth >= VigilanceConfig.healthLowPercent && percentHealth <= VigilanceConfig.healthGoodPercent) {
       return VigilanceConfig.healthGoodColor
     } else if (percentHealth >= VigilanceConfig.healthCriticalPercent && percentHealth <= VigilanceConfig.healthLowPercent) {
       return VigilanceConfig.healthLowColor
     } else if (percentHealth <= VigilanceConfig.healthCriticalPercent) { // assuming its red
       return VigilanceConfig.healthCriticalColor
     }
-    return Color.WHITE
+    return VigilanceConfig.healthBaseColor // fallback if something went wrong!
   }
 }