Skip to content

fix: compat mcstatus v13 module path changes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
This-is-XiaoDeng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: compat mcstatus v13 module path changes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions nonebot_plugin_picmcstat/draw.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@

from mcstatus import BedrockServer, JavaServer
from mcstatus.motd import Motd
from mcstatus.status_response import JavaStatusResponse

try:
from mcstatus.status_response import JavaStatusResponse
except ModuleNotFoundError:
from mcstatus.responses import JavaStatusResponse # type: ignore[no-redef]
from nonebot import get_driver
from nonebot.log import logger
from PIL.Image import Resampling
Expand All @@ -28,7 +32,10 @@
)

if TYPE_CHECKING:
from mcstatus.bedrock_status import BedrockStatusResponse
try:
from mcstatus.bedrock_status import BedrockStatusResponse
except ModuleNotFoundError:
from mcstatus.responses import BedrockStatusResponse # type: ignore[no-redef]
from pil_utils.typing import ColorType

MARGIN = 32
Expand Down
5 changes: 4 additions & 1 deletion nonebot_plugin_picmcstat/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
ParsedMotdComponent,
WebColor,
)
from mcstatus.motd.transformers import PlainTransformer
try:
from mcstatus.motd.transformers import PlainTransformer
except ModuleNotFoundError:
from mcstatus.motd._transformers import PlainTransformer # type: ignore[no-redef]
from nonebot import logger

from .config import config
Expand Down