diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features')
3 files changed, 4 insertions, 4 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 329b09f0e..957808fb5 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 @@ -103,7 +103,6 @@ class CustomScoreboard { internal val maxwellConfig get() = displayConfig.maxwell internal val informationFilteringConfig get() = config.informationFiltering internal val backgroundConfig get() = config.background - internal val devConfig get() = SkyHanniMod.feature.dev } private fun createLines() = buildList<ScoreboardElementType> { 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 6cb8c1b39..41e946a17 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 @@ -18,7 +18,7 @@ import at.hannibal2.skyhanni.data.ScoreboardData import at.hannibal2.skyhanni.data.SlayerAPI import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.Companion.arrowConfig -import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.Companion.devConfig +import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.Companion.config import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.Companion.displayConfig import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.Companion.informationFilteringConfig import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard.Companion.maxwellConfig @@ -778,7 +778,7 @@ private fun getExtraDisplayPair(): List<ScoreboardElementType> { if (unknownLines.isEmpty()) return listOf("<hidden>" to HorizontalAlignment.LEFT) val size = unknownLines.size - if (amountOfUnknownLines != size && devConfig.unknownLinesWarning) { + if (amountOfUnknownLines != size && config.unknownLinesWarning) { val message = "CustomScoreboard detected ${pluralize(unknownLines.size, "unknown line", withNumber = true)}" ErrorManager.logErrorWithData( CustomScoreboardUtils.UndetectedScoreboardLines(message), @@ -787,6 +787,7 @@ private fun getExtraDisplayPair(): List<ScoreboardElementType> { "Island" to HypixelData.skyBlockIsland, "Area" to HypixelData.skyBlockArea, noStackTrace = true, + betaOnly = true, ) amountOfUnknownLines = size } 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 5d4847957..42040f7c8 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 @@ -94,7 +94,7 @@ object ScoreboardPattern { private val dungeonSb = scoreboardGroup.group("dungeon") val m7dragonsPattern by dungeonSb.pattern( "m7dragons", - "^(§cNo Alive Dragons|§8- (§.)+[\\w\\s]+Dragon§a \\w+§.❤)$" + "^(§cNo Alive Dragons|§8- (?:§.)+[\\w\\s]+Dragon§a [\\w,.]+§.❤)$" ) val keysPattern by dungeonSb.pattern( "keys", |