👽 Adapt nonebot2 ^2.0.0rc1 && mcstatus ^10.0.1 (fix #9)

Author: j1g5awi

README.md

@@ -2,6 +2,8 @@
 
 基于 [nonebot2](https://github.com/nonebot/nonebot2) 和 [go-cqhttp](https://github.com/Mrs4s/go-cqhttp) 的 Minecraft 服务器状态查询插件
 
+**目前仅能查询 Java 服务器，且非官方 Java 服务端则请自行测试。**
+
 [![License](https://img.shields.io/github/license/Jigsaw111/nonebot_plugin_mcstatus)](LICENSE)
 ![Python Version](https://img.shields.io/badge/python-3.7.3+-blue.svg)
 ![NoneBot Version](https://img.shields.io/badge/nonebot-2.0.0a11+-red.svg)

nonebot_plugin_mcstatus/__init__.py

@@ -1,7 +1,7 @@
 from typing import cast
 
 import nonebot
-from mcstatus import MinecraftServer
+from mcstatus import JavaServer
 from nonebot import get_bots
 from nonebot.adapters.onebot.v11 import (
     Bot,
@@ -16,7 +16,8 @@
 from nonebot_plugin_mcstatus.handle import Handle
 from nonebot_plugin_mcstatus.parser import ArgNamespace, mc_parser
 
-scheduler = require("nonebot_plugin_apscheduler").scheduler
+require("nonebot_plugin_apscheduler")
+from nonebot_plugin_apscheduler import scheduler
 
 # 注册 shell_like 事件响应器
 mc = on_shell_command("mc", parser=mc_parser, priority=5)
@@ -32,7 +33,7 @@ async def _():
         for id in server_list[type]:
             for server in server_list[type][id]:
                 try:
-                    ping = await MinecraftServer.lookup(server.address).async_ping()
+                    ping = await JavaServer.lookup(server.address).async_ping()
                     status = True
                 except:
                     ping = None

nonebot_plugin_mcstatus/handle.py

@@ -1,6 +1,6 @@
 from typing import List, cast
 
-from mcstatus import MinecraftServer
+from mcstatus import JavaServer
 
 from nonebot_plugin_mcstatus.data import Data, Server
 from nonebot_plugin_mcstatus.parser import Namespace
@@ -10,7 +10,7 @@ class Handle:
     @classmethod
     async def check(cls, args: Namespace) -> str:
         try:
-            ping = await MinecraftServer.lookup(args.address).async_ping()
+            ping = await JavaServer.lookup(args.address).async_ping()
             status = True
         except:
             ping = None
@@ -25,7 +25,7 @@ async def check(cls, args: Namespace) -> str:
     @classmethod
     async def add(cls, args: Namespace) -> str:
         try:
-            await MinecraftServer.lookup(args.address).async_ping()
+            await JavaServer.lookup(args.address).async_ping()
             status = True
         except:
             status = False