From 96657cbf86bc471e7db0da0fda52c1af66eb65b8 Mon Sep 17 00:00:00 2001
From: quqiOnfree <quqiOnfree@outlook.com>
Date: Wed, 3 Sep 2025 00:10:13 +0800
Subject: [PATCH] fix motd bug

---
 create_image.py   | 14 +++++---------
 motd_formatter.py | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/create_image.py b/create_image.py
index 7725c67..005f118 100644
--- a/create_image.py
+++ b/create_image.py
@@ -31,7 +31,7 @@ def draw_text_with_shadow(image: Image.Image,
                           text: str,
                           posx: int | float,
                           posy: int | float,
-                          font):
+                          font: ImageFont.ImageFont | ImageFont.FreeTypeFont):
     draw = ImageDraw.Draw(image)
     draw.text((posx + 2, posy + 2), text, font=font, fill='black')
     draw.text((posx, posy), text, font=font, fill='white')
@@ -40,16 +40,12 @@ def draw_motd_text_with_shadow(image: Image.Image,
                                text: str,
                                posx: int | float,
                                posy: int | float,
-                               font):
+                               font: ImageFont.ImageFont | ImageFont.FreeTypeFont):
     draw = ImageDraw.Draw(image)
-    w1, _, w2, _ = draw.textbbox((0, 0), text.strip(), font=font)
-    weight = w2 - w1
-    motd_list = foramt_motd(text.strip(), weight)
+    motd_list = foramt_motd(text.strip(), draw)
     for pos, color, text in motd_list:
-        w1, _, w2, _ = draw.textbbox((0, 0), text, font=font)
-        weight = w2 - w1
-        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))
+        draw.text((posx + pos + 1, posy + 1), text, font=font, fill='black')
+        draw.text((posx + pos, posy), text, font=font, fill=getrgb(color))
 
 def create_image(background: bytes,
                  icon: str | None,
diff --git a/motd_formatter.py b/motd_formatter.py
index 9ba2aab..88bbd70 100644
--- a/motd_formatter.py
+++ b/motd_formatter.py
@@ -1,3 +1,5 @@
+from PIL import ImageDraw, ImageFont
+
 def format_color(color_code: str) -> str:
     """
     将Minecraft颜色代码转换为对应的颜色名称
@@ -30,7 +32,10 @@ def format_color(color_code: str) -> str:
     }
     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 文本，去除多余的空格和换行符
     
@@ -41,23 +46,25 @@ def foramt_motd(data: str, weight: int) -> list[tuple[int, str, str]]:
         list: 格式化后的 MOTD 文本
     """
     iter = 0
-    character_count = 0
     motd_list = []
     color_state = "#FFFFFF"
     data_size = len(data)
+    weight_count = 0
     while iter < data_size:
         if data[iter] == "§":
             if iter + 1 < data_size:
                 color = data[iter + 1]
                 text = ""
                 iter += 2
-                character_count += 1
                 while iter < data_size and data[iter] != "§" and data[iter] != "\n":
                     text += data[iter]
                     iter += 1
                 if color != "l":
                     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:
                 iter += 1
         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":
                 text += data[iter]
                 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