Update version to v1.0.0

Update dependencies
Fix null UUID error
This commit is contained in:
2023-09-03 01:13:02 +08:00
parent 8c143bb4d4
commit feb2d309e0
4 changed files with 13 additions and 17 deletions

View File

@ -1,22 +1,21 @@
plugins { plugins {
val kotlinVersion = "1.7.10" val kotlinVersion = "1.8.10"
kotlin("jvm") version kotlinVersion kotlin("jvm") version kotlinVersion
kotlin("plugin.serialization") 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" group = "top.jie65535.mirai"
version = "0.1.2" version = "1.0.0"
repositories { repositories {
maven("https://maven.aliyun.com/repository/public") maven("https://maven.aliyun.com/repository/public")
mavenCentral() mavenCentral()
} }
val ktorVersion = "2.2.2"
dependencies { 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")
} }

View File

@ -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

View File

@ -9,7 +9,7 @@ object JMinecraftSkin : KotlinPlugin(
JvmPluginDescription( JvmPluginDescription(
id = "top.jie65535.mirai-console-jms-plugin", id = "top.jie65535.mirai-console-jms-plugin",
name = "J Minecraft Skin", name = "J Minecraft Skin",
version = "0.1.2", version = "1.0.0",
) { ) {
author("jie65535") author("jie65535")
info("MC皮肤查询插件") info("MC皮肤查询插件")

View File

@ -1,8 +1,8 @@
package top.jie65535 package top.jie65535
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.decodeFromString import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonNull
import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
@ -16,7 +16,6 @@ object MinecraftUuidService {
/** /**
* 根据游戏角色名获取UUID * 根据游戏角色名获取UUID
*/ */
@OptIn(ExperimentalSerializationApi::class)
fun getUuid(username: String) : String { fun getUuid(username: String) : String {
var uuid = JMSPluginData.idMap[username] var uuid = JMSPluginData.idMap[username]
if (uuid != null) { if (uuid != null) {
@ -26,10 +25,13 @@ object MinecraftUuidService {
val retJson = HttpUtil.get("https://tenapi.cn/mc/?uid=$username").decodeToString() val retJson = HttpUtil.get("https://tenapi.cn/mc/?uid=$username").decodeToString()
val response = Json.decodeFromString<JsonObject>(retJson) val response = Json.decodeFromString<JsonObject>(retJson)
if (response["code"]!!.jsonPrimitive.content == "200") { 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 { } else {
throw Exception(response["msg"]!!.jsonPrimitive.content) throw Exception(response["msg"]!!.jsonPrimitive.content)
} }
JMSPluginData.idMap[username] = uuid JMSPluginData.idMap[username] = uuid
return uuid return uuid
} }