4 Commits

Author SHA1 Message Date
adef471210 Fix UUID API
Update version to v1.1.0
2024-02-22 09:17:07 +08:00
feb2d309e0 Update version to v1.0.0
Update dependencies
Fix null UUID error
2023-09-03 01:13:52 +08:00
8c143bb4d4 更新版本到 0.1.2
更新依赖
2023-01-29 01:49:25 +00:00
502milk
9b281361ce 修复获取skin失败 2023-01-29 09:15:38 +08:00
6 changed files with 22 additions and 13 deletions

View File

@@ -1,15 +1,22 @@
plugins { plugins {
val kotlinVersion = "1.5.30" 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.10.0" id("net.mamoe.mirai-console") version "2.16.0"
} }
group = "top.jie65535" group = "top.jie65535.mirai"
version = "0.1.1" version = "1.1.0"
repositories { repositories {
maven("https://maven.aliyun.com/repository/public") maven("https://maven.aliyun.com/repository/public")
mavenCentral() mavenCentral()
} }
dependencies {
val ktorVersion = "2.3.8"
implementation("io.ktor:ktor-client-core-jvm:$ktorVersion")
implementation("io.ktor:ktor-client-okhttp-jvm:$ktorVersion")
}

View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

0
gradlew vendored Normal file → Executable file
View File

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.1", version = "1.1.0",
) { ) {
author("jie65535") author("jie65535")
info("MC皮肤查询插件") info("MC皮肤查询插件")
@@ -19,7 +19,7 @@ object JMinecraftSkin : KotlinPlugin(
override fun onEnable() { override fun onEnable() {
JMSPluginData.reload() JMSPluginData.reload()
JMSCommand.register() JMSCommand.register()
logger.info { "Plugin loaded" } logger.info { "Plugin loaded. https://github.com/jie65535/mirai-console-jcf-plugin" }
} }
override fun onDisable() { override fun onDisable() {

View File

@@ -29,11 +29,11 @@ object MinecraftSkinService {
* 获取玩家皮肤源文件 * 获取玩家皮肤源文件
*/ */
fun getSkins(uuid: String) fun getSkins(uuid: String)
= HttpUtil.get("https://crafatar.com/skin/$uuid") = HttpUtil.get("https://crafatar.com/skins/$uuid")
/** /**
* 获取玩家皮肤源文件 * 获取玩家皮肤源文件
*/ */
fun getCapes(uuid: String) fun getCapes(uuid: String)
= HttpUtil.get("https://crafatar.com/capes/$uuid") = HttpUtil.get("https://crafatar.com/capes/$uuid")
} }

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,20 +16,22 @@ 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) {
return uuid 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) 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
} }