diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt | 36 |
1 files changed, 25 insertions, 11 deletions
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 4bc3fe36a..ef02cf2ba 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 @@ -745,20 +745,34 @@ private fun getEventsDisplayPair(): List<ScoreboardElementType> { private fun getEventsShowWhen() = ScoreboardEvents.getEvent().isNotEmpty() private fun getMayorDisplayPair() = buildList { - add( - ((MayorAPI.currentMayor?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } - ?: "<hidden>") + - (if (mayorConfig.showTimeTillNextMayor) { - "§7 (§e${MayorAPI.timeTillNextMayor.format(maxUnits = 2)}§7)" - } else { - "" - })) to HorizontalAlignment.LEFT - ) + val currentMayorName = MayorAPI.currentMayor?.mayorName?.let { MayorAPI.mayorNameWithColorCode(it) } ?: "<hidden>" + val timeTillNextMayor = if (mayorConfig.showTimeTillNextMayor) { + "§7 (§e${MayorAPI.nextMayorTimestamp.timeUntil().format(maxUnits = 2)}§7)" + } else { + "" + } + + add((currentMayorName + timeTillNextMayor) to HorizontalAlignment.LEFT) + if (mayorConfig.showMayorPerks) { - MayorAPI.currentMayor?.activePerks?.forEach { - add(" §7- §e${it.perkName}" to HorizontalAlignment.LEFT) + MayorAPI.currentMayor?.activePerks?.forEach { perk -> + add(" §7- §e${perk.perkName}" to HorizontalAlignment.LEFT) } } + + if (!mayorConfig.showExtraMayor) return@buildList + val jerryExtraMayor = MayorAPI.jerryExtraMayor + val extraMayor = jerryExtraMayor.first ?: return@buildList + + val extraMayorName = extraMayor.mayorName.let { MayorAPI.mayorNameWithColorCode(it) } + val extraTimeTillNextMayor = if (mayorConfig.showTimeTillNextMayor) { + "§7 (§6${jerryExtraMayor.second.timeUntil().format(maxUnits = 2)}§7)" + } else { + "" + } + + add((extraMayorName + extraTimeTillNextMayor) to HorizontalAlignment.LEFT) + } private fun getMayorShowWhen() = |