fix bugs & add extension functions for TextComponent

Author: Aliorpse

src/main/kotlin/tech/aliorpse/mcutils/model/server/TextComponentAdapter.kt

@@ -40,11 +40,11 @@ internal class TextComponentAdapter {
                 "text" -> {
                     val rawText = reader.nextString()
                     val parsed = rawText.toTextComponent()
-                    text = parsed.text
-                    color = parsed.color
-                    styles += parsed.styles
-                    if (parsed.extra.isNotEmpty()) {
-                        extra = parsed.extra
+
+                    text = rawText.takeIf { "§" !in rawText } ?: parsed.text.also {
+                        color = parsed.color
+                        styles += parsed.styles
+                        if (parsed.extra.isNotEmpty()) extra = parsed.extra
                     }
                 }
                 "color" -> color = reader.readColor()
@@ -64,21 +64,21 @@ internal class TextComponentAdapter {
     }
 
     private fun JsonReader.readStyle(name: String): TextStyle? {
-        return if (this.nextBoolean()) styleMap[name] else null
+        return if (nextBoolean()) styleMap[name] else null
     }
 
     private fun JsonReader.readColor(): String {
-        val colorString = this.nextString()
+        val colorString = nextString()
         return colors[colorString] ?: colorString
     }
 
     private fun JsonReader.readExtras(): List<TextComponent> {
         val list = mutableListOf<TextComponent>()
-        this.beginArray()
-        while (this.hasNext()) {
+        beginArray()
+        while (hasNext()) {
             fromJson(this)?.let { list.add(it) }
         }
-        this.endArray()
+        endArray()
         return list
     }
 

src/main/kotlin/tech/aliorpse/mcutils/utils/TextComponent.kt

@@ -7,7 +7,7 @@ import java.util.EnumSet
 /**
  * Coverts string with "§" to a [TextComponent].
  */
-internal fun String.toTextComponent(): TextComponent {
+fun String.toTextComponent(): TextComponent {
     val components = mutableListOf<TextComponent>()
     var currentText = StringBuilder()
     var currentColor = ""
@@ -21,22 +21,20 @@ internal fun String.toTextComponent(): TextComponent {
 
             if (currentText.isNotEmpty()) {
                 components += TextComponent(
-                    text = currentText.toString(),
-                    color = currentColor,
-                    styles = EnumSet.copyOf(currentStyles)
+                    text = currentText.toString(), color = currentColor, styles = EnumSet.copyOf(currentStyles)
                 )
                 currentText = StringBuilder()
             }
 
-            // §r 重置
+            // §r reset
             if (code == 'r') {
                 currentColor = ""
                 currentStyles.clear()
             } else {
-                // §0-§f 颜色
-                colorMap[code]?.let { currentColor = it }
-                // §k-§o 样式
-                styleMap[code]?.let { currentStyles += it }
+                // §0-§f colors
+                originalColorMap[code]?.let { currentColor = it }
+                // §k-§o styles
+                originalStyleMap[code]?.let { currentStyles += it }
             }
         } else {
             currentText.append(c)
@@ -45,35 +43,78 @@ internal fun String.toTextComponent(): TextComponent {
 
     if (currentText.isNotEmpty()) {
         components += TextComponent(
-            text = currentText.toString(),
-            color = currentColor,
-            styles = EnumSet.copyOf(currentStyles)
+            text = currentText.toString(), color = currentColor, styles = EnumSet.copyOf(currentStyles)
         )
     }
 
     return if (components.size == 1) {
         components[0]
     } else {
         TextComponent(
-            text = "",
-            color = "",
-            styles = EnumSet.noneOf(TextStyle::class.java),
-            extra = components
+            text = "", color = "", styles = EnumSet.noneOf(TextStyle::class.java), extra = components
         )
     }
 }
 
-private val colorMap = mapOf(
-    '0' to "#000000", '1' to "#0000AA", '2' to "#00AA00", '3' to "#00AAAA",
-    '4' to "#AA0000", '5' to "#AA00AA", '6' to "#FFAA00", '7' to "#AAAAAA",
-    '8' to "#555555", '9' to "#5555FF", 'a' to "#55FF55", 'b' to "#55FFFF",
-    'c' to "#FF5555", 'd' to "#FF55FF", 'e' to "#FFFF55", 'f' to "#FFFFFF"
+private val originalColorMap = mapOf(
+    '0' to "#000000",
+    '1' to "#0000AA",
+    '2' to "#00AA00",
+    '3' to "#00AAAA",
+    '4' to "#AA0000",
+    '5' to "#AA00AA",
+    '6' to "#FFAA00",
+    '7' to "#AAAAAA",
+    '8' to "#555555",
+    '9' to "#5555FF",
+    'a' to "#55FF55",
+    'b' to "#55FFFF",
+    'c' to "#FF5555",
+    'd' to "#FF55FF",
+    'e' to "#FFFF55",
+    'f' to "#FFFFFF"
 )
 
-private val styleMap = mapOf(
+private val originalStyleMap = mapOf(
     'l' to TextStyle.BOLD,
     'o' to TextStyle.ITALIC,
     'n' to TextStyle.UNDERLINED,
     'm' to TextStyle.STRIKETHROUGH,
     'k' to TextStyle.OBFUSCATED
 )
+
+/**
+ * Converts [TextComponent] to a HTML element.
+ */
+fun TextComponent.toHtml(): String {
+    var html = escapeHtml(text).replace(" ", "&nbsp;").replace("\n", "<br />")
+
+    if (extra.isNotEmpty()) {
+        html += extra.joinToString("") { it.toHtml() }
+    }
+
+    if (TextStyle.OBFUSCATED in styles) html = """<span class="obfuscated">$html</span>"""
+    if (TextStyle.STRIKETHROUGH in styles) html = "<s>$html</s>"
+    if (TextStyle.UNDERLINED in styles) html = "<u>$html</u>"
+    if (TextStyle.ITALIC in styles) html = "<i>$html</i>"
+    if (TextStyle.BOLD in styles) html = "<b>$html</b>"
+
+    return if (color.isNotEmpty()) {
+        """<span style="color:$color">$html</span>"""
+    } else {
+        html
+    }
+}
+
+private fun escapeHtml(text: String): String = buildString {
+    for (c in text) {
+        when (c) {
+            '<' -> append("&lt;")
+            '>' -> append("&gt;")
+            '&' -> append("&amp;")
+            '"' -> append("&quot;")
+            '\'' -> append("&#39;")
+            else -> append(c)
+        }
+    }
+}

src/test/kotlin/tech/aliorpse/mcutils/player/PlayerProfileTest.kt

@@ -1,5 +1,6 @@
 package tech.aliorpse.mcutils.player
 
+import kotlinx.coroutines.runBlocking
 import tech.aliorpse.mcutils.modules.player.Player
 import kotlin.test.Test
 
@@ -9,7 +10,7 @@ class PlayerProfileTest {
      */
     @Test
     fun getProfileTest() {
-        val result = Player.getProfileBlocking("ec042e1200ac4a249cc83eb1fab0bd88")
+        val result = runBlocking { Player.getProfile("ec042e1200ac4a249cc83eb1fab0bd88") }
         println(result)
         assert(result.name.isNotEmpty())
     }

src/test/kotlin/tech/aliorpse/mcutils/server/ServerStatusTest.kt

@@ -1,18 +1,17 @@
 package tech.aliorpse.mcutils.server
 
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import tech.aliorpse.mcutils.modules.server.BedrockServer
 import tech.aliorpse.mcutils.modules.server.JavaServer
+import tech.aliorpse.mcutils.utils.toHtml
 import kotlin.test.Test
 
 class ServerStatusTest {
     @Test
     fun javaGetStatusTest() {
-        val result = runBlocking { JavaServer.getStatus("wdsj.net") }
+        val result = runBlocking { JavaServer.getStatus("hypixel.net") }
 
-        println(result)
+        println(result.description.toHtml())
         assert(result.version.protocol > 0)
     }