diff options
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt | 24 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt | 4 |
2 files changed, 18 insertions, 10 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt index 7c41245fc..c9ae8c2c7 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt @@ -120,21 +120,27 @@ object ConfigUpdaterMigrator { logger.log("Starting config transformation from $i to ${i + 1}") val storage = accumulator["storage"]?.asJsonObject val dynamicPrefix: Map<String, List<String>> = mapOf( - "#profile" to - (storage?.get("players")?.asJsonObject?.entrySet() + "#profile" to ( + storage?.get("players")?.asJsonObject?.entrySet() ?.flatMap { player -> player.value.asJsonObject["profiles"]?.asJsonObject?.entrySet()?.map { "storage.players.${player.key}.profiles.${it.key}" } ?: listOf() } - ?: listOf()), - "#player" to - (storage?.get("players")?.asJsonObject?.entrySet()?.map { "storage.players.${it.key}" } - ?: listOf()), + ?: listOf() + ), + "#player" to ( + storage?.get("players")?.asJsonObject?.entrySet()?.map { "storage.players.${it.key}" } + ?: listOf() + ), ) - val migration = ConfigFixEvent(accumulator, JsonObject().also { - it.add("lastVersion", JsonPrimitive(i + 1)) - }, i, 0, dynamicPrefix).also { it.postAndCatch() } + val migration = ConfigFixEvent( + accumulator, + JsonObject().also { + it.add("lastVersion", JsonPrimitive(i + 1)) + }, + i, 0, dynamicPrefix + ).also { it.postAndCatch() } logger.log("Transformations scheduled: ${migration.new}") val mergesPerformed = merge(migration.old, migration.new) logger.log("Migration done with $mergesPerformed merges and ${migration.movesPerformed} moves performed") diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt index 4974c80f2..44565aa95 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt @@ -507,7 +507,9 @@ object Commands { private fun developersCodingHelp() { registerCommand("shrepopatterns", "See where regexes are loaded from") { RepoPatternGui.open() } registerCommand("shtest", "Unused test command.") { SkyHanniDebugsAndTests.testCommand(it) } - registerCommand("shtestrabbitpaths", "Tests pathfinding to rabbit eggs. Use a number 0-14.") { HoppityEggLocator.testPathfind(it) } + registerCommand("shtestrabbitpaths", "Tests pathfinding to rabbit eggs. Use a number 0-14.") { + HoppityEggLocator.testPathfind(it) + } registerCommand( "shtestitem", "test item internal name resolving", |