diff options
| author | Lorenz <lo.scherf@gmail.com> | 2022-08-07 02:06:30 +0200 |
|---|---|---|
| committer | Lorenz <lo.scherf@gmail.com> | 2022-08-07 02:06:30 +0200 |
| commit | 89eb5094e01253725f7d138368299657be836e17 (patch) | |
| tree | 3661af1281344ccb8c4ba9667041c0700e87d3fe /src/main/java/at/hannibal2/skyhanni/items | |
| parent | 9a3e868e8c66f2995b4ccf7d474974c58f8c08bf (diff) | |
| download | skyhanni-89eb5094e01253725f7d138368299657be836e17.tar.gz skyhanni-89eb5094e01253725f7d138368299657be836e17.tar.bz2 skyhanni-89eb5094e01253725f7d138368299657be836e17.zip | |
add option to disable the background color from ability cooldown display
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/items')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt | 15 |
2 files changed, 13 insertions, 6 deletions
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), |