From 13ffd312b92ba8e9c09bf9c9180cf4fc68c946ef Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Fri, 22 Dec 2023 20:40:21 +0800 Subject: [PATCH 1/5] =?UTF-8?q?Revert=20"=E5=88=A0=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E6=96=87=E4=BB=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 204ba8ba437876d8c63294037476b04c69117c33. --- .../services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 1 + out/production/resources/plugin.yml | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin create mode 100644 out/production/resources/plugin.yml diff --git a/out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin new file mode 100644 index 00000000..15abe748 --- /dev/null +++ b/out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin @@ -0,0 +1 @@ +com.xiaoyv404.mirai.PluginMain \ No newline at end of file diff --git a/out/production/resources/plugin.yml b/out/production/resources/plugin.yml new file mode 100644 index 00000000..979c3700 --- /dev/null +++ b/out/production/resources/plugin.yml @@ -0,0 +1,6 @@ +name: "ComprehensivePlugin" +author: "xiaoyv404" +version: "0.3.0" +main: "com.xiaoyv404.ComprehensivePlugin" +info: "A Comprehensive Plugin!" +depends: [ ] \ No newline at end of file From 51282e97a393099b5d34432fba7a4b8cfa75eb06 Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Fri, 22 Dec 2023 20:48:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt | 6 +++--- src/test/resources/init-data.sql | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt b/src/test/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt index 49d30296..6e90ee84 100644 --- a/src/test/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt +++ b/src/test/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISUTest.kt @@ -65,7 +65,7 @@ internal class ISUTest : BaseTest() { 最后在线时间: 2006-04-16T06:58:39.810 服务器: Test UUID: test - 身份: 妖怪 + 身份: 妖怪贤者 """.trimIndent(), msg.getOrNull(1)?.message?.contentToString() ) @@ -76,7 +76,7 @@ internal class ISUTest : BaseTest() { 最后在线时间: 2006-04-16T06:58:39.810 服务器: Test UUID: test - 身份: 妖怪 + 身份: 妖怪贤者 """.trimIndent(), msg.getOrNull(2)?.message?.contentToString() ) @@ -109,7 +109,7 @@ internal class ISUTest : BaseTest() { msg.getOrNull(4)?.message?.contentToString() ) assertEquals( - "需要权限至少为妖怪", + "需要权限至少为妖怪贤者", msg.getOrNull(5)?.message?.contentToString() ) assertEquals( diff --git a/src/test/resources/init-data.sql b/src/test/resources/init-data.sql index e362ded6..0d72208d 100644 --- a/src/test/resources/init-data.sql +++ b/src/test/resources/init-data.sql @@ -55,7 +55,7 @@ INSERT INTO "Users"("id", "admin", "bot", "warning_times") values (123, true, false, 0); INSERT INTO "MinecraftServerPlayers"("id", "name", "lastLoginTime", "lastLoginServer", "permissions") -values ('test', 'Test', '2006-04-16 06:58:39.810', 'Test', 'Basic'), +values ('test', 'Test', '2006-04-16 06:58:39.810', 'Test', 'OP'), ('test2', 'Test2', '2006-04-16 06:58:39.810', 'Test', 'Default'), ('404', '404', '2006-04-16 06:58:39.810', 'Test', 'Default'), ('2429334909', '2429334909', '2006-04-16 06:58:39.810', 'Test', 'Default'); From f51ba5cfa94ad61e242c2a045ee52a3f37846d20 Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Fri, 22 Dec 2023 20:48:09 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"Revert=20"=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=86=97=E4=BD=99=E6=96=87=E4=BB=B6""?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 13ffd312b92ba8e9c09bf9c9180cf4fc68c946ef. --- .../services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin | 1 - out/production/resources/plugin.yml | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin delete mode 100644 out/production/resources/plugin.yml diff --git a/out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin b/out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin deleted file mode 100644 index 15abe748..00000000 --- a/out/production/resources/META-INF/services/net.mamoe.mirai.console.plugin.jvm.JvmPlugin +++ /dev/null @@ -1 +0,0 @@ -com.xiaoyv404.mirai.PluginMain \ No newline at end of file diff --git a/out/production/resources/plugin.yml b/out/production/resources/plugin.yml deleted file mode 100644 index 979c3700..00000000 --- a/out/production/resources/plugin.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: "ComprehensivePlugin" -author: "xiaoyv404" -version: "0.3.0" -main: "com.xiaoyv404.ComprehensivePlugin" -info: "A Comprehensive Plugin!" -depends: [ ] \ No newline at end of file From 36e264dd78a92391e0de00b562ab2e070d99e5a7 Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Fri, 22 Dec 2023 21:13:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt b/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt index 209db8bf..a3c659b8 100644 --- a/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt +++ b/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt @@ -81,7 +81,7 @@ class ISU : NfApp(), IFshApp { if (more && (MinecraftServerPlayerQQMapping { qq = msg.uid() }.getPermissionByQQ() ?: Permissions.Default) < Permissions.OP ) { - msg.reply("需要权限至少为${Permissions.OP}", true) + msg.reply("需要权限至少为${Permissions.OP.name}", true) return false } From 85f225e45bf7b7b03e7f9f60ae2f1caa55174f5e Mon Sep 17 00:00:00 2001 From: xiaoyv404 Date: Fri, 22 Dec 2023 21:13:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt b/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt index a3c659b8..5a3c2190 100644 --- a/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt +++ b/src/main/kotlin/com/xiaoyv404/mirai/app/minecraftServer/ISU.kt @@ -81,7 +81,7 @@ class ISU : NfApp(), IFshApp { if (more && (MinecraftServerPlayerQQMapping { qq = msg.uid() }.getPermissionByQQ() ?: Permissions.Default) < Permissions.OP ) { - msg.reply("需要权限至少为${Permissions.OP.name}", true) + msg.reply("需要权限至少为${Permissions.OP.permissionName}", true) return false }