Fix UUID API

Update version to v1.1.0

build.gradle.kts

@@ -1,15 +1,22 @@
 plugins {
-    val kotlinVersion = "1.5.30"
+    val kotlinVersion = "1.8.10"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.9.2"
+    id("net.mamoe.mirai-console") version "2.16.0"
 }
 
-group = "top.jie65535"
+group = "top.jie65535.mirai"
-version = "0.1.0"
+version = "1.1.0"
 
 repositories {
     maven("https://maven.aliyun.com/repository/public")
     mavenCentral()
 }
+
+dependencies {
+
+    val ktorVersion = "2.3.8"
+    implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
+    implementation("io.ktor:ktor-client-okhttp-jvm:$ktorVersion")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/kotlin/JMSCommand.kt

@@ -76,8 +76,17 @@ object JMSCommand : CompositeCommand(
     }
 
     private suspend fun CommandSender.sendImage(data: ByteArray) {
+        try {
+            if (data.isEmpty()) {
+                subject?.sendMessage("未查询到数据")
+                return
+            }
+
             data.toExternalResource().use {
                 subject?.sendImage(it)
             }
+        } catch (e: Throwable) {
+            subject?.sendMessage(String(data))
+        }
     }
 }

src/main/kotlin/JMinecraftSkin.kt

@@ -9,7 +9,7 @@ object JMinecraftSkin : KotlinPlugin(
     JvmPluginDescription(
         id = "top.jie65535.mirai-console-jms-plugin",
         name = "J Minecraft Skin",
-        version = "0.1.0",
+        version = "1.1.0",
     ) {
         author("jie65535")
         info("MC皮肤查询插件")
@@ -19,7 +19,7 @@ object JMinecraftSkin : KotlinPlugin(
     override fun onEnable() {
         JMSPluginData.reload()
         JMSCommand.register()
-        logger.info { "Plugin loaded" }
+        logger.info { "Plugin loaded. https://github.com/jie65535/mirai-console-jcf-plugin" }
     }
 
     override fun onDisable() {

src/main/kotlin/MinecraftSkinService.kt

@@ -11,25 +11,25 @@ object MinecraftSkinService {
      * 获取头像
      */
     fun getAvatars(uuid: String)
-        = HttpUtil.get("https://crafatar.com/avatars/$uuid")
+        = HttpUtil.get("https://crafatar.com/avatars/$uuid?overlay")
 
     /**
      * 获取玩家头模型渲染图
      */
     fun getHeadRenders(uuid: String)
-        = HttpUtil.get("https://crafatar.com/renders/head/$uuid")
+        = HttpUtil.get("https://crafatar.com/renders/head/$uuid?overlay")
 
     /**
      * 获取玩家皮肤模型渲染图
      */
     fun getBodyRenders(uuid: String)
-        = HttpUtil.get("https://crafatar.com/renders/body/$uuid")
+        = HttpUtil.get("https://crafatar.com/renders/body/$uuid?overlay")
 
     /**
      * 获取玩家皮肤源文件
      */
     fun getSkins(uuid: String)
-        = HttpUtil.get("https://crafatar.com/skin/$uuid")
+        = HttpUtil.get("https://crafatar.com/skins/$uuid")
 
     /**
      * 获取玩家皮肤源文件

src/main/kotlin/MinecraftUuidService.kt

@@ -1,12 +1,10 @@
 package top.jie65535
 
-import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonElement
+import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import net.mamoe.mirai.console.util.cast
 
 /**
  * Minecraft UUID Service
@@ -18,20 +16,22 @@ object MinecraftUuidService {
     /**
      * 根据游戏角色名获取UUID
      */
-    @OptIn(ExperimentalSerializationApi::class)
     fun getUuid(username: String) : String {
         var uuid = JMSPluginData.idMap[username]
         if (uuid != null) {
             return uuid
         }
 
-        val retJson = HttpUtil.get("https://tenapi.cn/mc/?uid=$username").decodeToString()
+        val retJson = HttpUtil.get("https://tenapi.cn/v2/mc/?uid=$username").decodeToString()
         val response = Json.decodeFromString<JsonObject>(retJson)
         if (response["code"]!!.jsonPrimitive.content == "200") {
-            uuid = response["id"]!!.jsonPrimitive.content
+            val elem = response["id"]!!.jsonPrimitive
+            if (elem == JsonNull) throw Exception("Player UUID Not Found!")
+            uuid = elem.content
         } else {
             throw Exception(response["msg"]!!.jsonPrimitive.content)
         }
+
         JMSPluginData.idMap[username] = uuid
         return uuid
     }