diff options
| author | J10a1n15 <45315647+j10a1n15@users.noreply.github.com> | 2024-04-17 18:14:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 18:14:16 +0200 |
| commit | 734fdf613cc660430447adbd3191b5bc7c1817de (patch) | |
| tree | 28d6f09db94148a2ec98dd4c9189bef0290ad5b1 /src/main/java/at/hannibal2/skyhanni/features/gui | |
| parent | 6c968778dab9c04b0ff4fec7b4eb61f36e23660d (diff) | |
| download | skyhanni-734fdf613cc660430447adbd3191b5bc7c1817de.tar.gz skyhanni-734fdf613cc660430447adbd3191b5bc7c1817de.tar.bz2 skyhanni-734fdf613cc660430447adbd3191b5bc7c1817de.zip | |
Feature: Cold Overlay (#1438)
Co-authored-by: martimavocado <39881008+martimavocado@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/gui')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt | 4 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt index 5cd86d99e..50a51042b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/RenderBackground.kt @@ -56,7 +56,7 @@ class RenderBackground { GlStateManager.pushAttrib() GlStateManager.color(1f, 1f, 1f, 1f) - + GL11.glDepthMask(false) if (backgroundConfig.enabled) { if (backgroundConfig.useCustomBackgroundImage) { @@ -81,7 +81,7 @@ class RenderBackground { ) } } - + GL11.glDepthMask(true) GlStateManager.popMatrix() GlStateManager.popAttrib() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt index e9b4df0a9..b2187a4bd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt @@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.data.HypixelData.Companion.getPlayersOnCurrentServe import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.MaxwellAPI import at.hannibal2.skyhanni.data.MayorAPI +import at.hannibal2.skyhanni.data.MiningAPI.getCold import at.hannibal2.skyhanni.data.PartyAPI import at.hannibal2.skyhanni.data.PurseAPI import at.hannibal2.skyhanni.data.QuiverAPI @@ -449,11 +450,11 @@ private fun getHeatShowWhen() = inAnyIsland(IslandType.CRYSTAL_HOLLOWS) && ScoreboardData.sidebarLinesFormatted.any { ScoreboardPattern.heatPattern.matches(it) } private fun getColdDisplayPair(): List<ScoreboardElementType> { - val cold = getGroupFromPattern(ScoreboardData.sidebarLinesFormatted, ScoreboardPattern.coldPattern, "cold") + val cold = -getCold() return listOf( when { - informationFilteringConfig.hideEmptyLines && cold == "0" -> "<hidden>" + informationFilteringConfig.hideEmptyLines && cold == 0 -> "<hidden>" displayConfig.displayNumbersFirst -> "§b$cold❄ Cold" else -> "Cold: §b$cold❄" } to HorizontalAlignment.LEFT |