From aaaf1b0f8765e76eac852051f3c939897fa5ce48 Mon Sep 17 00:00:00 2001 From: J10a1n15 <45315647+j10a1n15@users.noreply.github.com> Date: Mon, 15 Apr 2024 20:11:21 +0200 Subject: Improvement: Added Linebreaks functionality for Custom Scoreboard Title/Footer (#1373) --- .../gui/customscoreboard/ScoreboardElements.kt | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/gui') 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 d958c0c9c..e9b4df0a9 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 @@ -309,14 +309,16 @@ enum class ScoreboardElement( } } -private fun getTitleDisplayPair() = if (displayConfig.titleAndFooter.useHypixelTitleAnimation) { - listOf(ScoreboardData.objectiveTitle to displayConfig.titleAndFooter.alignTitleAndFooter) -} else { - listOf( - displayConfig.titleAndFooter.customTitle.get().toString() - .replace("&", "§") to displayConfig.titleAndFooter.alignTitleAndFooter - ) -} +private fun getTitleDisplayPair(): List = + if (displayConfig.titleAndFooter.useHypixelTitleAnimation) { + listOf(ScoreboardData.objectiveTitle to displayConfig.titleAndFooter.alignTitleAndFooter) + } else { + listOf(displayConfig.titleAndFooter.customTitle.get().toString() + .replace("&", "§") + .split("\\n") + .map { it to displayConfig.titleAndFooter.alignTitleAndFooter } + ).flatten() + } private fun getProfileDisplayPair() = listOf(CustomScoreboardUtils.getProfileTypeSymbol() + HypixelData.profileName.firstLetterUppercase() to HorizontalAlignment.LEFT) @@ -764,10 +766,13 @@ private fun getPartyShowWhen() = if (DungeonAPI.inDungeon()) { } } -private fun getFooterDisplayPair() = listOf( - displayConfig.titleAndFooter.customFooter.get().toString() - .replace("&", "§") to displayConfig.titleAndFooter.alignTitleAndFooter -) +private fun getFooterDisplayPair(): List = + listOf(displayConfig.titleAndFooter.customFooter.get().toString() + .replace("&", "§") + .split("\\n") + .map { it to displayConfig.titleAndFooter.alignTitleAndFooter } + ).flatten() + private fun getExtraDisplayPair(): List { if (unknownLines.isEmpty()) return listOf("" to HorizontalAlignment.LEFT) -- cgit