code cleanup

5 files changed, 9 insertions, 18 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt
index f7f6060c6..6ce193280 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossDamageIndicator.kt
@@ -83,8 +83,7 @@ class BossDamageIndicator {
             )
             RenderUtils.drawLabel(
                 pos,
-                text,
-                color.toColor(),
+                color.getChatColor() + text,
                 partialTicks,
                 true,
                 6f
@@ -104,7 +103,6 @@ class BossDamageIndicator {
             RenderUtils.drawLabel(
                 pos,
                 bossName,
-                LorenzColor.WHITE.toColor(),
                 partialTicks,
                 true,
                 scale2,
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
index 2560a44ed..ac9c95e8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
@@ -216,7 +216,6 @@ class BossFinder {
                 }
             }
 
-            //TODO testing and make right and so
             if (entity is EntityWither) {
                 if (entity.hasNameTagWith(4, "§8[§7Lv100§8] §c§5Vanquisher§r ")) {
                     return EntityResult(bossType = BossType.NETHER_VANQUISHER)
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
index cdb005b3f..ea6c61b4c 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
@@ -17,5 +17,4 @@ enum class BossType(val bossName: String) {
 
     HUB_REVENANT_HORROR("§5Revenant Horror 5"),//TODO add other variants like voidgloom?
     HUB_HEADLESS_HORSEMAN("§6Headless Horseman"),
-
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
index c7f92e5e7..271a97020 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
@@ -1,18 +1,14 @@
 package at.hannibal2.skyhanni.test
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.gui.utils.Utils
 import at.hannibal2.skyhanni.events.PacketEvent
-import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.GuiRender.renderString
-import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.ItemUtils.getLore
-import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
+import at.hannibal2.skyhanni.utils.LorenzDebug
+import at.hannibal2.skyhanni.utils.LorenzLogger
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.client.Minecraft
-import net.minecraft.entity.EntityLivingBase
-import net.minecraft.entity.item.EntityArmorStand
-import net.minecraft.entity.monster.EntityMagmaCube
 import net.minecraft.nbt.NBTTagCompound
 import net.minecraftforge.client.event.RenderGameOverlayEvent
 import net.minecraftforge.fml.common.eventhandler.EventPriority
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
index 430c45777..63eff42f5 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/RenderUtils.kt
@@ -324,26 +324,25 @@ object RenderUtils {
     fun drawLabel(
         pos: Vec3,
         text: String,
-        color: Color,
         partialTicks: Float,
         shadow: Boolean = false,
         scale: Float = 1f,
         yOff: Float = 0f,
     ) {
-        var mc = Minecraft.getMinecraft()
-        val player = mc.thePlayer
+        val minecraft = Minecraft.getMinecraft()
+        val player = minecraft.thePlayer
         val x =
             pos.xCoord - player.lastTickPosX + (pos.xCoord - player.posX - (pos.xCoord - player.lastTickPosX)) * partialTicks
         val y =
             pos.yCoord - player.lastTickPosY + (pos.yCoord - player.posY - (pos.yCoord - player.lastTickPosY)) * partialTicks
         val z =
             pos.zCoord - player.lastTickPosZ + (pos.zCoord - player.posZ - (pos.zCoord - player.lastTickPosZ)) * partialTicks
-        val renderManager = mc.renderManager
         val f1 = 0.0266666688
-        val width = mc.fontRendererObj.getStringWidth(text) / 2
+        val width = minecraft.fontRendererObj.getStringWidth(text) / 2
         GlStateManager.pushMatrix()
         GlStateManager.translate(x, y, z)
         GL11.glNormal3f(0f, 1f, 0f)
+        val renderManager = minecraft.renderManager
         GlStateManager.rotate(-renderManager.playerViewY, 0f, 1f, 0f)
         GlStateManager.rotate(renderManager.playerViewX, 1f, 0f, 0f)
         GlStateManager.scale(-f1, -f1, -f1)
@@ -352,7 +351,7 @@ object RenderUtils {
         GlStateManager.disableLighting()
         GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0)
         GlStateManager.enableTexture2D()
-        mc.fontRendererObj.drawString(text, (-width).toFloat(), yOff, color.rgb, shadow)
+        minecraft.fontRendererObj.drawString(text, (-width).toFloat(), yOff, LorenzColor.WHITE.toColor().rgb, shadow)
         GlStateManager.disableBlend()
         GlStateManager.popMatrix()
     }