aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/data
diff options
context:
space:
mode:
authorhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-06-13 21:50:16 +0200
committerhannibal2 <24389977+hannibal00212@users.noreply.github.com>2024-06-13 21:50:16 +0200
commit31344fc364cde2cef243a49f1e7d4c4fbb390699 (patch)
tree2736d7f215cae69dfc11487accbf3d715b0290d5 /src/main/java/at/hannibal2/skyhanni/data
parent5bd6a4cd3807d128ba55c336946531a8838c51c7 (diff)
downloadskyhanni-31344fc364cde2cef243a49f1e7d4c4fbb390699.tar.gz
skyhanni-31344fc364cde2cef243a49f1e7d4c4fbb390699.tar.bz2
skyhanni-31344fc364cde2cef243a49f1e7d4c4fbb390699.zip
formatting
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/data')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt4
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt31
-rw-r--r--src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt2
3 files changed, 18 insertions, 19 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
index a7e09b3f0..0f53a3e0c 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt
@@ -95,14 +95,14 @@ object GuiEditManager {
SkyHanniMod.screenToOpen = GuiPositionEditor(
currentPositions.values().toList(),
2,
- Minecraft.getMinecraft().currentScreen as? GuiContainer
+ Minecraft.getMinecraft().currentScreen as? GuiContainer,
)
if (hotkeyReminder && lastHotkeyReminded.passedSince() > 30.minutes) {
lastHotkeyReminded = SimpleTimeMark.now()
ChatUtils.chat(
"§eTo edit hidden GUI elements:\n" +
" §7- §e1. Set a key in /sh edit.\n" +
- " §7- §e2. Click that key while the GUI element is visible."
+ " §7- §e2. Click that key while the GUI element is visible.",
)
}
}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 8ade8f55e..94dc84efc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -40,6 +40,7 @@ import kotlin.time.Duration.Companion.seconds
object HypixelData {
private val patternGroup = RepoPattern.group("data.hypixeldata")
+
// TODO add regex tests
private val serverNameConnectionPattern by patternGroup.pattern(
"servername.connection",
@@ -134,15 +135,15 @@ object HypixelData {
var skyBlockArea: String? = null
var skyBlockAreaWithSymbol: String? = null
- // Data from locraw
- var locrawData: JsonObject? = null
+ // Data from locraw
+ var locrawData: JsonObject? = null
private var locraw: MutableMap<String, String> = listOf(
"server",
- "gametype",
- "lobbyname",
- "lobbytype",
- "mode",
- "map",
+ "gametype",
+ "lobbyname",
+ "lobbytype",
+ "mode",
+ "map",
).associateWith { "" }.toMutableMap()
val server get() = locraw["server"] ?: ""
@@ -169,14 +170,14 @@ object HypixelData {
return
}
- ErrorManager.logErrorWithData(
- Exception("NoServerId"),
- "Could not find server id",
- "islandType" to LorenzUtils.skyBlockIsland,
- "tablist" to TabListData.getTabList(),
- "scoreboard" to ScoreboardData.sidebarLinesFormatted,
- )
- }
+ ErrorManager.logErrorWithData(
+ Exception("NoServerId"),
+ "Could not find server id",
+ "islandType" to LorenzUtils.skyBlockIsland,
+ "tablist" to TabListData.getTabList(),
+ "scoreboard" to ScoreboardData.sidebarLinesFormatted,
+ )
+ }
fun getPlayersOnCurrentServer(): Int {
var amount = 0
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 31499adb1..72abf6bab 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -28,8 +28,6 @@ object ScoreboardData {
private val minecraftColorCodesPattern = "(?i)[0-9a-fkmolnr]".toPattern()
-
-
fun formatLines(rawList: List<String>): List<String> {
val list = mutableListOf<String>()
for (line in rawList) {