From 89eb5094e01253725f7d138368299657be836e17 Mon Sep 17 00:00:00 2001 From: Lorenz Date: Sun, 7 Aug 2022 02:06:30 +0200 Subject: add option to disable the background color from ability cooldown display --- .../skyhanni/items/ItemDisplayOverlayFeatures.kt | 4 ++-- .../skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt | 15 +++++++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/items') diff --git a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt index 6a3f7688c..592d94fad 100644 --- a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt @@ -27,9 +27,9 @@ class ItemDisplayOverlayFeatures { GlStateManager.disableLighting() GlStateManager.disableDepth() GlStateManager.disableBlend() - event.fr.drawStringWithShadow( + event.fontRenderer.drawStringWithShadow( stackTip, - (event.x + 17 - event.fr.getStringWidth(stackTip)).toFloat(), + (event.x + 17 - event.fontRenderer.getStringWidth(stackTip)).toFloat(), (event.y + 9).toFloat(), 16777215 ) diff --git a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt index e744f7ca6..f3d2cdd3f 100644 --- a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt @@ -111,15 +111,22 @@ class ItemAbilityCooldown { val color = itemText.color stackTip = color.getChatColor() + itemText.text - item.background = color.addOpacity(120).rgb + if (SkyHanniMod.feature.abilities.itemAbilityCooldownBackground) { + var opacity = 130 + if (color == LorenzColor.GREEN) { + opacity = 80 + } + item.background = color.addOpacity(opacity).rgb + } if (stackTip.isNotEmpty()) { GlStateManager.disableLighting() GlStateManager.disableDepth() GlStateManager.disableBlend() - event.fr.drawStringWithShadow( + //TODO add option to change the size + event.fontRenderer.drawStringWithShadow( stackTip, - (event.x + 17 - event.fr.getStringWidth(stackTip)).toFloat(), + (event.x + 17 - event.fontRenderer.getStringWidth(stackTip)).toFloat(), (event.y + 9).toFloat(), 16777215 ) @@ -144,7 +151,7 @@ class ItemAbilityCooldown { val cooldownInSeconds: Long, vararg val itemNames: String, var lastClick: Long = 0L, - val actionBarDetection: Boolean = true + val actionBarDetection: Boolean = true, ) { ATOMSPLIT("Soulcry", 4, "Atomsplit Katana", "Vorpal Katana", "Voidedge Katana"), WITHER_IMPACT("Wither Impact", 5, "Hyperion", "Scylla", "Valkyrie", "Astrea", actionBarDetection = false), -- cgit