feat: Add skull parser

2 files changed, 8 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) {
diff --git a/src/main/kotlin/util/uuid.kt b/src/main/kotlin/util/uuid.kt
index cccfdd2..14aa83d 100644
--- a/src/main/kotlin/util/uuid.kt
+++ b/src/main/kotlin/util/uuid.kt
@@ -3,6 +3,12 @@ package moe.nea.firmament.util
 import java.math.BigInteger
 import java.util.UUID
 
+fun parsePotentiallyDashlessUUID(unknownFormattedUUID: String): UUID {
+	if ("-" in unknownFormattedUUID)
+		return UUID.fromString(unknownFormattedUUID)
+	return parseDashlessUUID(unknownFormattedUUID)
+}
+
 fun parseDashlessUUID(dashlessUuid: String): UUID {
 	val most = BigInteger(dashlessUuid.substring(0, 16), 16)
 	val least = BigInteger(dashlessUuid.substring(16, 32), 16)