aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorJ10a1n15 <45315647+j10a1n15@users.noreply.github.com>2024-03-27 21:55:28 +0100
committerGitHub <noreply@github.com>2024-03-27 21:55:28 +0100
commit73e662d1149bd6730e3b79ee0ecaed62246a7721 (patch)
tree5f2421dc8b4a363199d5e30738c905df4bbcfcee /src/main
parentd278ad0b6e01d6381ae670aa2ba37beec478bd42 (diff)
downloadskyhanni-73e662d1149bd6730e3b79ee0ecaed62246a7721.tar.gz
skyhanni-73e662d1149bd6730e3b79ee0ecaed62246a7721.tar.bz2
skyhanni-73e662d1149bd6730e3b79ee0ecaed62246a7721.zip
Fix: Fixed Server Player Amount not being affected by "display numbers first" (#1285)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt41
1 files changed, 25 insertions, 16 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 4f9d64965..6502b8f74 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
@@ -496,7 +496,10 @@ fun getPlayerAmountDisplayPair() = buildList {
} else {
""
}
- add("§7Players: §a${getPlayersOnCurrentServer()}$max" to HorizontalAlignment.LEFT)
+ if (displayConfig.displayNumbersFirst)
+ add("§a${getPlayersOnCurrentServer()}$max Players" to HorizontalAlignment.LEFT)
+ else
+ add("§7Players: §a${getPlayersOnCurrentServer()}$max" to HorizontalAlignment.LEFT)
}
private fun getVisitDisplayPair() =
@@ -689,21 +692,27 @@ private fun getQuiverShowWhen(): Boolean {
private fun getPowderDisplayPair() = buildList {
val powderTypes: List<Triple<String, String, String>> = listOf(
- Triple("Mithril", "§2", getGroupFromPattern(
- TabListData.getTabList(),
- ScoreboardPattern.mithrilPowderPattern,
- "mithrilpowder"
- ).formatNum()),
- Triple("Gemstone", "§d", getGroupFromPattern(
- TabListData.getTabList(),
- ScoreboardPattern.gemstonePowderPattern,
- "gemstonepowder"
- ).formatNum()),
- Triple("Glacite", "§b", getGroupFromPattern(
- TabListData.getTabList(),
- ScoreboardPattern.glacitePowderPattern,
- "glacitepowder"
- ).formatNum())
+ Triple(
+ "Mithril", "§2", getGroupFromPattern(
+ TabListData.getTabList(),
+ ScoreboardPattern.mithrilPowderPattern,
+ "mithrilpowder"
+ ).formatNum()
+ ),
+ Triple(
+ "Gemstone", "§d", getGroupFromPattern(
+ TabListData.getTabList(),
+ ScoreboardPattern.gemstonePowderPattern,
+ "gemstonepowder"
+ ).formatNum()
+ ),
+ Triple(
+ "Glacite", "§b", getGroupFromPattern(
+ TabListData.getTabList(),
+ ScoreboardPattern.glacitePowderPattern,
+ "glacitepowder"
+ ).formatNum()
+ )
)
if (informationFilteringConfig.hideEmptyLines && powderTypes.all { it.third == "0" }) {