aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java2
-rw-r--r--src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt17
2 files changed, 9 insertions, 10 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
index ffde9ca1..8de320d0 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/util/SBInfo.java
@@ -362,7 +362,7 @@ public class SBInfo {
}
try {
- List<String> lines = SidebarUtil.readSidebarLines();
+ List<String> lines = SidebarUtil.readSidebarLines(true, false);
boolean tempIsInDungeon = false;
for (String line : lines) {
if (line.contains("Cleared:") && line.contains("%")) {
diff --git a/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt b/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt
index ad371b56..503085f0 100644
--- a/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt
+++ b/src/main/kotlin/io/github/moulberry/notenoughupdates/util/SidebarUtil.kt
@@ -24,18 +24,17 @@ import net.minecraft.scoreboard.Score
import net.minecraft.scoreboard.ScorePlayerTeam
object SidebarUtil {
-
@JvmStatic
- fun readSidebarLines() = readRawSidebarLines(true)
+ @JvmOverloads
+ fun readSidebarLines(cleanColor: Boolean = true, cleanSpecialCharacters: Boolean = true): List<String> {
+ var result = readRawSidebarLines()
+ if (cleanColor) result = result.map { Utils.cleanColour(it) }
+ if (cleanSpecialCharacters) result.map { cleanSB(it) }
+ return result
+ }
@JvmStatic
- fun readRawSidebarLines(cleanColor: Boolean = false): List<String> {
- val list = fetchScoreboardLines().reversed()
- val result = list.map { cleanSB(it) }
- return if (cleanColor) {
- result.map { Utils.cleanColour(it) }
- } else result
- }
+ fun readRawSidebarLines() = fetchScoreboardLines().reversed()
private fun cleanSB(scoreboard: String) =
scoreboard.toCharArray().filter { it.code in 21..126 || it.code == 167 }.joinToString(separator = "")