版本 v1.1.8

1.更新依赖 mirai 从 2.8.3 更新到 2.10.0 2.更新依赖 kotlin 从 1.5.30 更新到 1.6.10 3.更新 github ci 自动编译版本标签 5.添加版权信息 4.优化文档
limbang · Mar 19, 2022 · 7ab6968 · 7ab6968
1 parent 5946d87
commit 7ab6968
Show file tree

Hide file tree

Showing 19 changed files with 177 additions and 57 deletions.
diff --git a/.github/workflows/publish-release-version.yml b/.github/workflows/publish-release-version.yml
@@ -0,0 +1,42 @@
+name: Publish release version
+
+on:
+  # 触发条件
+  push:
+    tags:
+      - 'v*.*.*'
+
+jobs:
+  # 任务名称
+  build:
+    name: Publish mirai plugin
+    # 运行环境
+    runs-on: ubuntu-latest
+    # 步骤
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v2
+      # 设置JDK 版本
+      - name: Setup JDK 11
+        uses: actions/setup-java@v2
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      # 获取标签的版本设置到 output
+      - name: Set output
+        id: vars
+        run: echo ::set-output name=version::$(echo ${GITHUB_REF:11})
+      # 设置权限
+      - name: Setup gradlew permission
+        run: chmod +x gradlew
+        # 编译插件
+      - name: Build mirai plugin
+        run: ./gradlew buildPlugin
+      # 将文件上传到 GitHub release
+      - name: Upload jar to release
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: build/mirai/mirai-console-minecraft-plugin-${{ steps.vars.outputs.version }}.mirai.jar
+          tag: ${{ github.ref }}
+
diff --git a/.gitignore b/.gitignore
@@ -1,58 +1,19 @@
-# Mirai
+# mirai
 bots/
 config/
 data/
 plugins/
-
-
-# Compiled class file
-*.class
-
-# Log file
-*.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.war
-*.nar
-*.ear
-*.zip
-*.tar.gz
-*.rar
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-
-target/
-build/
-
-.idea/
-*.iml
-mirai.iml
-/.idea/
-.idea/*
-/.idea/*
-
-/test
-
-.gradle/
-
 local.properties
 
-# Maven publishing credits
-keys.properties
-/plugins/
+# Gradle
+.gradle
+**/build/
+!src/**/build/
 
-token.txt
-bintray.user.txt
-bintray.key.txt
+# Idea
+.idea/*.xml
+*.iml
+!.idea/copyright/
 
-# For gpg sign
-/build-gpg-sign
-# Name for IDEA direction sorting
-build-secret-keys/
+# mac os
+.DS_Store
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/copyright/mirai-console-mcmod-plugin.xml b/.idea/copyright/mirai-console-mcmod-plugin.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/README.md b/README.md
@@ -1,8 +1,14 @@
-# Mirai Console Minecraft Plugin
-
-Mirai Console Minecraft Plugin
+<div align="center">
 
+[![](https://img.shields.io/github/v/release/limbang/mirai-console-minecraft-plugin?include_prereleases)](https://github.com/limbang/mirai-console-minecraft-plugin/releases)
+![](https://img.shields.io/github/downloads/limbang/mirai-console-minecraft-plugin/total)
+[![](https://img.shields.io/github/license/limbang/mirai-console-minecraft-plugin)](https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE)
+[![](https://img.shields.io/badge/mirai-2.10.0-69c1b9)](https://github.com/mamoe/mirai)
 
+本项目是基于 Mirai Console 编写的插件
+<p>用于 ping 服务器状态,和查看服务器 tps,基于<a href = "https://github.com/Forsaken-Land/doctor">doctor</a>库实现</p>
+<p>戳一戳机器人头像可以获取帮助</p>
+</div>
 
 ## 命令
 
@@ -14,6 +20,12 @@ Mirai Console Minecraft Plugin
 /mc deleteServer <name>    # 删除服务器
 /mc loginInfo    # 查看登陆信息
 ```
+### 使用TPS功能
+1. 使用指令添加登陆信息,比如添加遗落之地的皮肤站演示如下
+```shell
+/mc addLogin nano https://skin.blackyin.xyz/api/yggdrasil/authserver https://skin.blackyin.xyz/api/yggdrasil/sessionserver 账号 密码 
+```
+2. 然后添加服务器的时候用,`addServerLogin`命令添加,loginName 就是刚才设置的 nano,就可以使用了
 
 mc addLogin url参考 [yggdrasil](https://github.com/yushijinhun/authlib-injector/wiki/Yggdrasil-%E6%9C%8D%E5%8A%A1%E7%AB%AF%E6%8A%80%E6%9C%AF%E8%A7%84%E8%8C%83#%E4%BC%9A%E8%AF%9D%E9%83%A8%E5%88%86)
 
@@ -38,3 +50,18 @@ name 可设置如下
 
 TPS 暂时只支持 Forge 端
 
+----
+
+## 功能展示
+
+戳一戳功能：
+![](img/Screenshot_20220319_195629.jpg)
+
+tps 功能：
+![](img/1704DCA5-EC7F-4EF9-BF80-10DAC604836D.png)
+
+直 ping 地址功能：
+![](img/ABCBBD85-E183-41FE-BA3A-9D88853F43B3.png)
+
+ping 全部添加的服务器功能：
+![](img/B12FD04B-B159-4D4A-BE62-EA39510D9106.png)
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,13 +1,13 @@
 plugins {
-    val kotlinVersion = "1.5.30"
+    val kotlinVersion = "1.6.10"
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.8.3"
+    id("net.mamoe.mirai-console") version "2.10.0"
 }
 
 group = "top.limbang"
-version = "1.1.7"
+version = "1.1.8"
 
 repositories {
     maven("https://maven.fanua.top:8015/repository/maven-public/")

diff --git a/img/1704DCA5-EC7F-4EF9-BF80-10DAC604836D.png b/img/1704DCA5-EC7F-4EF9-BF80-10DAC604836D.png
diff --git a/img/ABCBBD85-E183-41FE-BA3A-9D88853F43B3.png b/img/ABCBBD85-E183-41FE-BA3A-9D88853F43B3.png
diff --git a/img/B12FD04B-B159-4D4A-BE62-EA39510D9106.png b/img/B12FD04B-B159-4D4A-BE62-EA39510D9106.png
diff --git a/img/Screenshot_20220319_195629.jpg b/img/Screenshot_20220319_195629.jpg
diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/MinecraftPluginCompositeCommand.kt b/src/main/kotlin/top/limbang/mirai/minecraft/MinecraftPluginCompositeCommand.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft
 
 import net.mamoe.mirai.console.command.CommandSender

diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/MinecraftPluginData.kt b/src/main/kotlin/top/limbang/mirai/minecraft/MinecraftPluginData.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft
 
 import kotlinx.serialization.Serializable

diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/MiraiConsoleMinecraftPlugin.kt b/src/main/kotlin/top/limbang/mirai/minecraft/MiraiConsoleMinecraftPlugin.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft
 
 
@@ -20,7 +29,7 @@ import top.limbang.mirai.minecraft.service.ServerService.pingServer
 object MiraiConsoleMinecraftPlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "top.limbang.mirai-console-minecraft-plugin",
-        version = "1.1.7",
+        version = "1.1.8",
     ) {
         author("limbang")
     }

diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/extension/ByteArrayStreamExtension.kt b/src/main/kotlin/top/limbang/mirai/minecraft/extension/ByteArrayStreamExtension.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft.extension
 
 import java.io.ByteArrayInputStream

diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/extension/ImageExtension.kt b/src/main/kotlin/top/limbang/mirai/minecraft/extension/ImageExtension.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft.extension
 
 

diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/service/ImageService.kt b/src/main/kotlin/top/limbang/mirai/minecraft/service/ImageService.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft.service
 
 import top.limbang.mirai.minecraft.MiraiConsoleMinecraftPlugin

diff --git a/src/main/kotlin/top/limbang/mirai/minecraft/service/ServerService.kt b/src/main/kotlin/top/limbang/mirai/minecraft/service/ServerService.kt
@@ -1,3 +1,12 @@
+/*
+ * Copyright 2020-2022 limbang and contributors.
+ *
+ * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+ * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+ *
+ * https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+ */
+
 package top.limbang.mirai.minecraft.service
 
 import kotlinx.coroutines.GlobalScope

diff --git a/src/main/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/src/main/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin
@@ -1 +1,10 @@
+#
+# Copyright 2020-2022 limbang and contributors.
+#
+# 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
+# Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
+#
+# https://github.com/limbang/mirai-console-minecraft-plugin/blob/master/LICENSE
+#
+
 top.limbang.mirai.minecraft.MiraiConsoleMinecraftPlugin