1 files changed, 2 insertions, 56 deletions
diff --git a/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt b/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt
index 863ca3b..446bf07 100644
--- a/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt
+++ b/src/texturePacks/java/moe/nea/firmament/features/texturepack/StringMatcher.kt
@@ -14,6 +14,8 @@ import kotlinx.serialization.encoding.Decoder
 import kotlinx.serialization.encoding.Encoder
 import net.minecraft.nbt.NbtString
 import net.minecraft.text.Text
+import moe.nea.firmament.util.json.intoGson
+import moe.nea.firmament.util.json.intoKotlinJson
 import moe.nea.firmament.util.removeColorCodes
 
 @Serializable(with = StringMatcher.Serializer::class)
@@ -144,59 +146,3 @@ interface StringMatcher {
 		}
 	}
 }
-
-fun JsonElement.intoKotlinJson(): kotlinx.serialization.json.JsonElement {
-	when (this) {
-		is JsonNull -> return kotlinx.serialization.json.JsonNull
-		is JsonObject -> {
-			return kotlinx.serialization.json.JsonObject(
-				this.entrySet()
-					.associate { it.key to it.value.intoKotlinJson() })
-		}
-
-		is JsonArray -> {
-			return kotlinx.serialization.json.JsonArray(this.map { it.intoKotlinJson() })
-		}
-
-		is JsonPrimitive -> {
-			if (this.isString)
-				return kotlinx.serialization.json.JsonPrimitive(this.asString)
-			if (this.isBoolean)
-				return kotlinx.serialization.json.JsonPrimitive(this.asBoolean)
-			return kotlinx.serialization.json.JsonPrimitive(this.asNumber)
-		}
-
-		else -> error("Unknown json variant $this")
-	}
-}
-
-fun kotlinx.serialization.json.JsonElement.intoGson(): JsonElement {
-	when (this) {
-		is kotlinx.serialization.json.JsonNull -> return JsonNull.INSTANCE
-		is kotlinx.serialization.json.JsonPrimitive -> {
-			if (this.isString)
-				return JsonPrimitive(this.content)
-			if (this.content == "true")
-				return JsonPrimitive(true)
-			if (this.content == "false")
-				return JsonPrimitive(false)
-			return JsonPrimitive(LazilyParsedNumber(this.content))
-		}
-
-		is kotlinx.serialization.json.JsonObject -> {
-			val obj = JsonObject()
-			for ((k, v) in this) {
-				obj.add(k, v.intoGson())
-			}
-			return obj
-		}
-
-		is kotlinx.serialization.json.JsonArray -> {
-			val arr = JsonArray()
-			for (v in this) {
-				arr.add(v.intoGson())
-			}
-			return arr
-		}
-	}
-}