summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/features/gui
diff options
context:
space:
mode:
authorThunderblade73 <85900443+Thunderblade73@users.noreply.github.com>2024-04-18 22:33:59 +0200
committerGitHub <noreply@github.com>2024-04-18 22:33:59 +0200
commit3fdbf7a2b943fd5fe95ffa9766ef631ca75c090d (patch)
tree293e81a8cf29314b508999975f1507b279284bc8 /src/main/java/at/hannibal2/skyhanni/features/gui
parent9ed4a9462f0e494001cbe470477624c3dd73053a (diff)
downloadskyhanni-3fdbf7a2b943fd5fe95ffa9766ef631ca75c090d.tar.gz
skyhanni-3fdbf7a2b943fd5fe95ffa9766ef631ca75c090d.tar.bz2
skyhanni-3fdbf7a2b943fd5fe95ffa9766ef631ca75c090d.zip
Cleanup (#1485)
Co-authored-by: hannibal2 <24389977+hannibal00212@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/CustomScoreboard.kt13
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt1
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt1
3 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
index 78f0ed6d4..329b09f0e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/CustomScoreboard.kt
@@ -178,7 +178,11 @@ class CustomScoreboard {
val displayConfigPrefix = "$prefix.displayConfig"
val displayPrefix = "$prefix.display"
- event.move(28, "$prefix.displayConfig.showAllActiveEvents", "$prefix.displayConfig.eventsConfig.showAllActiveEvents")
+ event.move(
+ 28,
+ "$prefix.displayConfig.showAllActiveEvents",
+ "$prefix.displayConfig.eventsConfig.showAllActiveEvents"
+ )
event.move(31, "$displayConfigPrefix.arrowAmountDisplay", "$displayPrefix.arrow.amountDisplay")
event.move(31, "$displayConfigPrefix.colorArrowAmount", "$displayPrefix.arrow.colorArrowAmount")
@@ -191,7 +195,11 @@ class CustomScoreboard {
event.move(31, "$displayConfigPrefix.showMaxIslandPlayers", "$displayPrefix.showMaxIslandPlayers")
event.move(31, "$displayConfigPrefix.numberFormat", "$displayPrefix.numberFormat")
event.move(31, "$displayConfigPrefix.lineSpacing", "$displayPrefix.lineSpacing")
- event.move(31, "$displayConfigPrefix.cacheScoreboardOnIslandSwitch", "$displayPrefix.cacheScoreboardOnIslandSwitch")
+ event.move(
+ 31,
+ "$displayConfigPrefix.cacheScoreboardOnIslandSwitch",
+ "$displayPrefix.cacheScoreboardOnIslandSwitch"
+ )
// Categories
event.move(31, "$displayConfigPrefix.alignment", "$displayPrefix.alignment")
event.move(31, "$displayConfigPrefix.titleAndFooter", "$displayPrefix.titleAndFooter")
@@ -224,6 +232,5 @@ class CustomScoreboard {
newArray
}
-
}
}
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 b2187a4bd..6cb8c1b39 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
@@ -774,7 +774,6 @@ private fun getFooterDisplayPair(): List<ScoreboardElementType> =
.map { it to displayConfig.titleAndFooter.alignTitleAndFooter }
).flatten()
-
private fun getExtraDisplayPair(): List<ScoreboardElementType> {
if (unknownLines.isEmpty()) return listOf("<hidden>" to HorizontalAlignment.LEFT)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
index 234d0d95a..5d4847957 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardPattern.kt
@@ -412,7 +412,6 @@ object ScoreboardPattern {
"Time spent sitting|with Ävaeìkx: .*"
)
-
// Stats from the tablist
private val tablistGroup = group.group("tablist")
val gemsPattern by tablistGroup.pattern(