girineko/McStatus-Img
1
0
Fork 0
mirror of https://github.com/Murasame-Dev/McStatus-Img.git synced 2025-12-16 21:27:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix motd bug

Browse source
This commit is contained in:
quqiOnfree 2025-09-03 00:10:13 +08:00
parent 81801de266
commit 96657cbf86
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
create_image.py
View file

@ -31,7 +31,7 @@ def draw_text_with_shadow(image: Image.Image,
text: str, text: str,
posx: int | float, posx: int | float,
posy: int | float, posy: int | float,
font): font: ImageFont.ImageFont | ImageFont.FreeTypeFont):
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
draw.text((posx + 2, posy + 2), text, font=font, fill='black') draw.text((posx + 2, posy + 2), text, font=font, fill='black')
draw.text((posx, posy), text, font=font, fill='white') draw.text((posx, posy), text, font=font, fill='white')
@ -40,16 +40,12 @@ def draw_motd_text_with_shadow(image: Image.Image,
text: str, text: str,
posx: int | float, posx: int | float,
posy: int | float, posy: int | float,
font): font: ImageFont.ImageFont | ImageFont.FreeTypeFont):
draw = ImageDraw.Draw(image) draw = ImageDraw.Draw(image)
w1, _, w2, _ = draw.textbbox((0, 0), text.strip(), font=font) motd_list = foramt_motd(text.strip(), draw)
weight = w2 - w1
motd_list = foramt_motd(text.strip(), weight)
for pos, color, text in motd_list: for pos, color, text in motd_list:
w1, _, w2, _ = draw.textbbox((0, 0), text, font=font) draw.text((posx + pos + 1, posy + 1), text, font=font, fill='black')
weight = w2 - w1 draw.text((posx + pos, posy), text, font=font, fill=getrgb(color))
draw.text((posx + pos + 1 - weight, posy + 1), text, font=font, fill='black')
draw.text((posx + pos - weight, posy), text, font=font, fill=getrgb(color))
def create_image(background: bytes, def create_image(background: bytes,
icon: str | None, icon: str | None,

20
motd_formatter.py
View file

@ -1,3 +1,5 @@
from PIL import ImageDraw, ImageFont
def format_color(color_code: str) -> str: def format_color(color_code: str) -> str:
""" """
将Minecraft颜色代码转换为对应的颜色名称 将Minecraft颜色代码转换为对应的颜色名称
@ -30,7 +32,10 @@ def format_color(color_code: str) -> str:
} }
return color_map.get(color_code.lower(), 'white') return color_map.get(color_code.lower(), 'white')
def foramt_motd(data: str, weight: int) -> list[tuple[int, str, str]]: def foramt_motd(data: str,
draw: ImageDraw.ImageDraw,
font: ImageFont.ImageFont | ImageFont.FreeTypeFont
) -> list[tuple[int, str, str]]:
""" """
格式化 MOTD 文本，去除多余的空格和换行符 格式化 MOTD 文本，去除多余的空格和换行符
@ -41,23 +46,25 @@ def foramt_motd(data: str, weight: int) -> list[tuple[int, str, str]]:
list: 格式化后的 MOTD 文本 list: 格式化后的 MOTD 文本
""" """
iter = 0 iter = 0
character_count = 0
motd_list = [] motd_list = []
color_state = "#FFFFFF" color_state = "#FFFFFF"
data_size = len(data) data_size = len(data)
weight_count = 0
while iter < data_size: while iter < data_size:
if data[iter] == "§": if data[iter] == "§":
if iter + 1 < data_size: if iter + 1 < data_size:
color = data[iter + 1] color = data[iter + 1]
text = "" text = ""
iter += 2 iter += 2
character_count += 1
while iter < data_size and data[iter] != "§" and data[iter] != "\n": while iter < data_size and data[iter] != "§" and data[iter] != "\n":
text += data[iter] text += data[iter]
iter += 1 iter += 1
if color != "l": if color != "l":
color_state = format_color(color) color_state = format_color(color)
motd_list.append(((iter - character_count * 2) / data_size * weight, color_state, text)) w1, _, w2, _ = draw.textbbox((0, 0), text, font=font)
seg_weight = w2 - w1
weight_count += seg_weight
motd_list.append((weight_count, color_state, text))
else: else:
iter += 1 iter += 1
else: else:
@ -65,5 +72,8 @@ def foramt_motd(data: str, weight: int) -> list[tuple[int, str, str]]:
while iter < data_size and data[iter] != "§" and data[iter] != "\n": while iter < data_size and data[iter] != "§" and data[iter] != "\n":
text += data[iter] text += data[iter]
iter += 1 iter += 1
motd_list.append(((iter - character_count * 2) / data_size * weight, "white", text)) w1, _, w2, _ = draw.textbbox((0, 0), text, font=font)
seg_weight = w2 - w1
weight_count += seg_weight
motd_list.append((weight_count, "#FFFFFF", text))
return motd_list return motd_list