我脑抽了，我在这实现什么ToJson啊我

Aliorpse · Aliorpse · commit d7af7ebd0f2a · 2025-07-20T04:33:57.000+08:00
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/status/Color.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/status/Color.kt
@@ -67,22 +67,6 @@ sealed interface Color {
      * Custom colors using hex strings.
      */
     data class Custom(override val hex: String) : Color
-
-    companion object {
-        /**
-         * Returns a Color based on the input value, can be named or just hex string.
-         */
-        fun fromString(value: String?): Color? {
-            if (value == null) return null
-            Named.fromName(value)?.let { return it }
-
-            if (value.matches(Regex("^#[0-9a-fA-F]{6}$"))) {
-                return Custom(value.lowercase())
-            }
-
-            return null
-        }
-    }
 }
 
 /**
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/status/ColorAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/status/ColorAdapter.kt
@@ -1,27 +1,27 @@
 package tech.aliorpse.mcutils.model.status
 
-import com.squareup.moshi.JsonAdapter
-import com.squareup.moshi.JsonDataException
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import tech.aliorpse.mcutils.model.status.Color.Custom
+import tech.aliorpse.mcutils.model.status.Color.Named
+import tech.aliorpse.mcutils.module.status.JavaPing.moshi
 
 
-class ColorAdapter : JsonAdapter<Color?>() {
-    override fun fromJson(reader: JsonReader): Color? {
+class ColorAdapter {
+    private val defaultAdapter by lazy { moshi.adapter(Color::class.java) }
+
+    @FromJson
+    fun fromJson(reader: JsonReader): Color? {
         val str = reader.nextString()
-        return Color.fromString(str)
-            ?: throw JsonDataException("Invalid color: $str")
+        return Named.fromName(str)
+            ?: if (str.matches(Regex("^#[0-9a-fA-F]{6}$"))) Custom(str.lowercase())
+            else null
     }
 
-    override fun toJson(writer: JsonWriter, value: Color?) {
-        if (value == null) {
-            writer.nullValue()
-            return
-        }
-        val out = when (value) {
-            is Color.Named -> value.name
-            is Color.Custom -> value.hex
-        }
-        writer.value(out)
+    @ToJson
+    fun toJson(writer: JsonWriter, value: Color?) {
+        defaultAdapter.toJson(writer, value)
     }
 }
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/status/DescriptionAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/status/DescriptionAdapter.kt
@@ -1,15 +1,20 @@
 package tech.aliorpse.mcutils.model.status
 
-import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import tech.aliorpse.mcutils.module.status.JavaPing.moshi
 import tech.aliorpse.mcutils.util.MOTDParser.objToSection
 import tech.aliorpse.mcutils.util.MOTDParser.sectionToObj
 
 class DescriptionAdapter(
-    private val motdAdapter: JsonAdapter<MOTDTextComponent>
-) : JsonAdapter<Description>() {
-    override fun fromJson(reader: JsonReader): Description? {
+    private val motdAdapter: MOTDTextComponentAdapter
+) {
+    private val defaultAdapter by lazy { moshi.adapter(Description::class.java) }
+
+    @FromJson
+    fun fromJson(reader: JsonReader): Description? {
         return when (reader.peek()) {
             JsonReader.Token.STRING -> {
                 val text = reader.nextString()
@@ -26,7 +31,8 @@ class DescriptionAdapter(
         }
     }
 
-    override fun toJson(writer: JsonWriter, value: Description?) {
-        throw NotImplementedError()
+    @ToJson
+    fun toJson(writer: JsonWriter, value: Description?) {
+        defaultAdapter.toJson(writer, value)
     }
 }
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/model/status/MOTDTextComponentAdapter.kt b/src/main/kotlin/tech/aliorpse/mcutils/model/status/MOTDTextComponentAdapter.kt
@@ -1,13 +1,18 @@
 package tech.aliorpse.mcutils.model.status
 
-import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonReader
 import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.ToJson
+import tech.aliorpse.mcutils.module.status.JavaPing.moshi
 
 class MOTDTextComponentAdapter(
     private val colorAdapter: ColorAdapter
-) : JsonAdapter<MOTDTextComponent>() {
-    override fun fromJson(reader: JsonReader): MOTDTextComponent? {
+) {
+    private val defaultAdapter by lazy { moshi.adapter(MOTDTextComponent::class.java) }
+
+    @FromJson
+    fun fromJson(reader: JsonReader): MOTDTextComponent? {
         return when (reader.peek()) {
             JsonReader.Token.STRING -> MOTDTextComponent(text = reader.nextString())
             JsonReader.Token.BEGIN_OBJECT -> readComponentObject(reader)
@@ -18,27 +23,9 @@ class MOTDTextComponentAdapter(
         }
     }
 
-    override fun toJson(writer: JsonWriter, value: MOTDTextComponent?) {
-        if (value == null) {
-            writer.nullValue()
-            return
-        }
-        writer.beginObject()
-        writer.name("text").value(value.text)
-        writer.name("color")
-        colorAdapter.toJson(writer, value.color)
-        writer.name("bold").value(value.bold)
-        writer.name("italic").value(value.italic)
-        writer.name("underlined").value(value.underlined)
-        writer.name("strikethrough").value(value.strikethrough)
-        writer.name("obfuscated").value(value.obfuscated)
-        if (!value.extra.isNullOrEmpty()) {
-            writer.name("extra")
-            writer.beginArray()
-            value.extra.forEach { toJson(writer, it) }
-            writer.endArray()
-        }
-        writer.endObject()
+    @ToJson
+    fun toJson(writer: JsonWriter, value: MOTDTextComponent?) {
+        defaultAdapter.toJson(writer, value)
     }
 
     private fun readComponentObject(reader: JsonReader): MOTDTextComponent {
diff --git a/src/main/kotlin/tech/aliorpse/mcutils/module/status/JavaPing.kt b/src/main/kotlin/tech/aliorpse/mcutils/module/status/JavaPing.kt
@@ -10,11 +10,9 @@ import tech.aliorpse.mcutils.model.status.ColorAdapter
 import tech.aliorpse.mcutils.model.status.Description
 import tech.aliorpse.mcutils.model.status.DescriptionAdapter
 import tech.aliorpse.mcutils.model.status.JavaServerStatus
-import tech.aliorpse.mcutils.model.status.MOTDTextComponent
 import tech.aliorpse.mcutils.model.status.MOTDTextComponentAdapter
 import tech.aliorpse.mcutils.model.status.Players
 import tech.aliorpse.mcutils.model.status.Version
-import tech.aliorpse.mcutils.model.status.Color
 import java.io.ByteArrayOutputStream
 import java.io.DataInputStream
 import java.io.DataOutputStream
@@ -46,13 +44,13 @@ object JavaPing {
     private const val NEXT_STATE_STATUS = 1
 
     private val colorAdapter = ColorAdapter()
-    private val motdAdapter  = MOTDTextComponentAdapter(colorAdapter)
-    private val descAdapter  = DescriptionAdapter(motdAdapter)
+    private val motdAdapter = MOTDTextComponentAdapter(colorAdapter)
+    private val descAdapter = DescriptionAdapter(motdAdapter)
 
     val moshi: Moshi = Moshi.Builder()
-        .add(Color::class.java, colorAdapter)
-        .add(MOTDTextComponent::class.java, motdAdapter)
-        .add(Description::class.java, descAdapter)
+        .add(colorAdapter)
+        .add(motdAdapter)
+        .add(descAdapter)
         .add(KotlinJsonAdapterFactory())
         .build()
 
diff --git a/src/test/kotlin/tech/aliorpse/mcutils/status/ServerPingTest.kt b/src/test/kotlin/tech/aliorpse/mcutils/status/ServerPingTest.kt
@@ -8,6 +8,7 @@ class ServerPingTest {
     @Test
     fun javaGetStatusTest() {
         val result = JavaPing.getStatusBlocking("bedrock.mineseed.org")
+
         println(result)
         assert(result.ping > 0)
     }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ class ServerPingTest {`
`8`	`8`	`@Test`
`9`	`9`	`fun javaGetStatusTest() {`
`10`	`10`	`val result = JavaPing.getStatusBlocking("bedrock.mineseed.org")`
	`11`	`+`
`11`	`12`	`println(result)`
`12`	`13`	`assert(result.ping > 0)`
`13`	`14`	`}`