aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/util/json/DashlessUUIDSerializer.kt
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2025-05-04 15:40:08 +0200
committerLinnea Gräf <nea@nea.moe>2025-05-04 15:40:08 +0200
commitcea5cd65ccbf8166f58e8c120b00a94ccf0509df (patch)
tree31fe372d4064c8137268f8f61bef167e1a8203d9 /src/main/kotlin/util/json/DashlessUUIDSerializer.kt
parent3743ae88d94c02660046d79b67c76d5bce6cdcc1 (diff)
downloadFirmament-cea5cd65ccbf8166f58e8c120b00a94ccf0509df.tar.gz
Firmament-cea5cd65ccbf8166f58e8c120b00a94ccf0509df.tar.bz2
Firmament-cea5cd65ccbf8166f58e8c120b00a94ccf0509df.zip
feat: Add skull parser
Diffstat (limited to 'src/main/kotlin/util/json/DashlessUUIDSerializer.kt')
-rw-r--r--src/main/kotlin/util/json/DashlessUUIDSerializer.kt6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/kotlin/util/json/DashlessUUIDSerializer.kt b/src/main/kotlin/util/json/DashlessUUIDSerializer.kt
index acb1dc8..6bafebe 100644
--- a/src/main/kotlin/util/json/DashlessUUIDSerializer.kt
+++ b/src/main/kotlin/util/json/DashlessUUIDSerializer.kt
@@ -10,6 +10,7 @@ import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
import moe.nea.firmament.util.parseDashlessUUID
+import moe.nea.firmament.util.parsePotentiallyDashlessUUID
object DashlessUUIDSerializer : KSerializer<UUID> {
override val descriptor: SerialDescriptor =
@@ -17,10 +18,7 @@ object DashlessUUIDSerializer : KSerializer<UUID> {
override fun deserialize(decoder: Decoder): UUID {
val str = decoder.decodeString()
- if ("-" in str) {
- return UUID.fromString(str)
- }
- return parseDashlessUUID(str)
+ return parsePotentiallyDashlessUUID(str)
}
override fun serialize(encoder: Encoder, value: UUID) {