diff options
| author | Linnea Gräf <nea@nea.moe> | 2024-10-04 20:58:00 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2024-10-04 20:58:00 +0200 |
| commit | 3a3d0bdf021558f9ab5ddd8e8549ade491fd8a57 (patch) | |
| tree | f054f4660e9747be10a7e7b24b0a001670476ca9 /src/main/kotlin/util/data | |
| parent | 67dd2f68d68ae48d7b9881a34502d6c25e335745 (diff) | |
| download | firmament-tapcube.tar.gz firmament-tapcube.tar.bz2 firmament-tapcube.zip | |
Add tapcubed stufftapcube
[no changelog]
Diffstat (limited to 'src/main/kotlin/util/data')
| -rw-r--r-- | src/main/kotlin/util/data/ProfileSpecificDataHolder.kt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt b/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt index 1cd4f22..2566e4c 100644 --- a/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt +++ b/src/main/kotlin/util/data/ProfileSpecificDataHolder.kt @@ -22,10 +22,10 @@ abstract class ProfileSpecificDataHolder<S>( private val configDefault: () -> S ) : IDataHolder<S?> { - var allConfigs: MutableMap<UUID, S> + var allConfigs: MutableMap<String, S> override val data: S? - get() = SBData.profileId?.let { + get() = SBData.genericProfileId?.let { allConfigs.computeIfAbsent(it) { configDefault() } } @@ -36,7 +36,7 @@ abstract class ProfileSpecificDataHolder<S>( private val configDirectory: Path get() = Firmament.CONFIG_DIR.resolve("profiles").resolve(configName) - private fun readValues(): MutableMap<UUID, S> { + private fun readValues(): MutableMap<String, S> { if (!configDirectory.exists()) { configDirectory.createDirectories() } @@ -45,7 +45,7 @@ abstract class ProfileSpecificDataHolder<S>( .filter { it.extension == "json" } .mapNotNull { try { - UUID.fromString(it.nameWithoutExtension) to Firmament.json.decodeFromString(dataSerializer, it.readText()) + (it.nameWithoutExtension) to Firmament.json.decodeFromString(dataSerializer, it.readText()) } catch (e: Exception) { /* Expecting IOException and SerializationException, but Kotlin doesn't allow multi catches*/ IDataHolder.badLoads.add(configName) Firmament.logger.error( |