diff --git a/build.gradle.kts b/build.gradle.kts index 5e60fc2..ad0fa78 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,22 +1,21 @@ plugins { - val kotlinVersion = "1.7.10" + val kotlinVersion = "1.8.10" kotlin("jvm") version kotlinVersion kotlin("plugin.serialization") version kotlinVersion - id("net.mamoe.mirai-console") version "2.13.2" + id("net.mamoe.mirai-console") version "2.15.0" } -group = "top.jie65535" -version = "0.1.2" +group = "top.jie65535.mirai" +version = "1.0.0" repositories { maven("https://maven.aliyun.com/repository/public") mavenCentral() } -val ktorVersion = "2.2.2" - dependencies { - implementation("io.ktor:ktor-client-core-jvm:$ktorVersion") - implementation("io.ktor:ktor-client-okhttp:$ktorVersion") + + implementation("io.ktor:ktor-client-core-jvm:2.3.2") + implementation("io.ktor:ktor-client-okhttp-jvm:2.3.2") } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 69a9715..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/src/main/kotlin/JMinecraftSkin.kt b/src/main/kotlin/JMinecraftSkin.kt index 5da5096..22092de 100644 --- a/src/main/kotlin/JMinecraftSkin.kt +++ b/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.2", + version = "1.0.0", ) { author("jie65535") info("MC皮肤查询插件") diff --git a/src/main/kotlin/MinecraftUuidService.kt b/src/main/kotlin/MinecraftUuidService.kt index 6e9406c..debbe4a 100644 --- a/src/main/kotlin/MinecraftUuidService.kt +++ b/src/main/kotlin/MinecraftUuidService.kt @@ -1,8 +1,8 @@ package top.jie65535 -import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonNull import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.jsonPrimitive @@ -16,7 +16,6 @@ object MinecraftUuidService { /** * 根据游戏角色名获取UUID */ - @OptIn(ExperimentalSerializationApi::class) fun getUuid(username: String) : String { var uuid = JMSPluginData.idMap[username] if (uuid != null) { @@ -26,10 +25,13 @@ object MinecraftUuidService { val retJson = HttpUtil.get("https://tenapi.cn/mc/?uid=$username").decodeToString() val response = Json.decodeFromString(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 }