1.01

Author: SystemFileB

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build and Release
+name: Snapshot Build / 快照构建
 
 on:
   push:
@@ -13,23 +13,21 @@ jobs:
     - name: 检查代码
       uses: actions/checkout@v4
 
-    - name: Set up Python
+    - name: 设置 Python
       uses: actions/setup-python@v4
       with:
         python-version: '3.x'
 
-    - name: Install dependencies
+    - name: 安装依赖
       run: |
-        apt-get update
-        apt-get install -y python-full
         python -m pip install --upgrade pip
         pip install setuptools wheel pillow
 
-    - name: Build wheel package
+    - name: 构建
       run: |
         python setup.py bdist_wheel
 
-    - name: Upload Artifacts
+    - name: 上传 Artifact
       uses: actions/upload-artifact@v4
       with:
         name: mctoast-snapshot

.gitignore

@@ -1,3 +1,4 @@
 dist
 build
-*.egg-info
+*.egg-info
+__pycache__

MANIFEST.in

@@ -0,0 +1 @@
+recursive-include mctoast/assets *

README.md

@@ -2,10 +2,31 @@
 一个基于tkinter的，用于显示minecraft风格的toast的库  
 目前被[CamMoitor](https://github.com/SystemFileB/CamMonitor_Server)使用
 
+## 📦安装
+```
+$ pip install mctoast //现在我还没有上传pypi，你可以试试手动构建，或出门右转github action
+$ pip install mctoast-1.0-py3-none-any.whl //现在先用这个
+```
+
+## 🖼️画廊
+原版效果:  
+![原版](./img/game.gif)
+
+mctoast模仿的效果:  
+![mctoast](./img/lib.gif)
+
 ## ⚙️使用方法
 见wiki
 
 ## ⚠️版权信息
-- 这个库与Mojang,Microsoft**没有任何关系**，且**不使用**client.jar，.minecraft/assets文件夹下的**任何文件**    
+- 这个库与Mojang,Microsoft**没有任何关系**，且在正式的库中(我在示范中使用了红色床的图片)**不使用**client.jar，.minecraft/assets文件夹下的**任何文件**    
 - Toast纹理来自[VanillaXBR](https://modrinth.com/resourcepack/vanillaxbr)，基于[CC-BY-NC-4.0](https://creativecommons.org/licenses/by-nc/4.0/legalcode)许可证开源
-- 若遇到了相关的许可证问题，请第一时间[提交issue](https://github.com/SystemFileB/mctoast/issues)并加上 版权或许可证问题 标签
+- 若遇到了相关的许可证问题，请第一时间[提交issue](https://github.com/SystemFileB/mctoast/issues)并加上 版权或许可证问题 标签
+
+## 更新日志
+
+### 1.01
+- 修复：进度图片显示不正常
+
+### 1.00
+- 第一次发布

demo/1.png

@@ -0,0 +1,6 @@
+# 注意：这个文件夹的1.png来自Minecraft Wiki，相关的版权归Mojang Studios所有
+
+import mctoast
+mctoast.init()
+mctoast.new_toast(mctoast.ADVANCEMENT,"1.png",text1="进度已达成！",text2="甜蜜的梦") #后面的建议用关键字传参
+mctoast.wait_no_toast() #实际使用中可能不会使用

demo/test.py

@@ -1,4 +1,14 @@
-#!/usr/bin/python3
+"""一个基于tkinter的，用于显示minecraft风格的toast的库  
+目前被CamMoitor使用
+
+这个库与Mojang,Microsoft没有任何关系，且在这里不使用client.jar，.minecraft/assets文件夹下的任何文件
+Toast纹理来自VanillaXBR，基于CC-BY-NC-4.0许可证开源
+若遇到了相关的许可证问题，请第一时间提交issue并加上 版权或许可证问题 标签
+
+VanillaXBR: https://modrinth.com/resourcepack/vanillaxbr 
+CC-BY-NC-4.0: https://creativecommons.org/licenses/by-nc/4.0/legalcode 
+提交issue: https://github.com/SystemFileB/mctoast/issues """
+
 import tkinter as tk
 import os
 import time
@@ -13,39 +23,61 @@
 ADVANCEMENT = pathjoin(path, "assets","mctoast","textures","advancement.png")
 RECIPE = pathjoin(path, "assets","mctoast","textures","recipe.png")
 SYSTEM = pathjoin(path, "assets","mctoast","textures","system.png")
+RETURN_PHOTOIMAGE=0
+RETURN_IMAGE=1
+RETURN_BYTE=2
 
-def generate_image(toast, image_path, text1, color1, text2, color2):
-        """生成Toast图片"""
-        # 打开背景图片并缩放
-        background_image = Image.open(toast).resize((320, 64))
-        
-        # 打开小图片并缩放
-        if image_path:
-            small_image = Image.open(image_path).resize((30, 30))
-            background_image.paste(small_image, (17, 17))
-        
-        # 创建一个绘图对象
-        draw = ImageDraw.Draw(background_image)
-        
-        # 加载字体
-        font = ImageFont.truetype(pathjoin(path,"assets","mctoast","fonts","unifont.otf"), 15)
-        
-        if toast==SYSTEM:
-            if text1 and color1:
-                draw.text((34, 13), text1, fill=color1, font=font)
-            if text2 and color2:
-                draw.text((34, 35), text2, fill=color2, font=font)
-        else:
-            # 在指定位置绘制文字
-            if text1 and color1:
-                draw.text((60, 13), text1, fill=color1, font=font)
-            if text2 and color2:
-                draw.text((60, 35), text2, fill=color2, font=font)
-        
-        # 将 Pillow 图片转换为 PhotoImage
-        return ImageTk.PhotoImage(background_image)
+def generate_image(toast:str, image_path:str, text1:str, color1:str, text2:str, color2:str, return_mode=RETURN_IMAGE):
+    """生成Toast图片
+    toast:str           背景图片(ADVANCEMENT,RECIPE,SYSTEM)
+    image_path:str      图片路径(对应原版的物品位置)
+    text1:str           第一行文本
+    color1:str          第一行文本颜色
+    text2:str           第二行文本
+    color2:str          第二行文本颜色
+    return_mode:int     返回模式(RETURN_IMAGE,RETURN_PHOTOIMAGE,RETURN_BYTE)
+    """
+    # 打开背景图片并缩放
+    background_image = Image.open(toast)
+    if background_image.mode != 'RGBA':
+        background_image = background_image.convert("RGBA")
+    
+    # 打开小图片并缩放
+    if image_path:
+        small_image = Image.open(image_path).resize((57, 57),Image.Resampling.NEAREST)
+        # 确保图片为RGBA模式
+        if small_image.mode != 'RGBA':
+            small_image = small_image.convert("RGBA")
+        background_image.paste(small_image, (34, 33),mask=small_image)
+    
+    # 创建一个绘图对象
+    draw = ImageDraw.Draw(background_image)
+    
+    # 加载字体
+    font = ImageFont.truetype(pathjoin(path, "assets", "mctoast", "fonts", "unifont.otf"), 30)
+    
+    if toast == SYSTEM:
+        if text1 and color1:
+            draw.text((68, 26), text1, fill=color1, font=font)
+        if text2 and color2:
+            draw.text((68, 70), text2, fill=color2, font=font)
+    else:
+        # 在指定位置绘制文字
+        if text1 and color1:
+            draw.text((120, 26), text1, fill=color1, font=font)
+        if text2 and color2:
+            draw.text((120, 70), text2, fill=color2, font=font)
+    
+    # 将 Pillow 图片转换为 PhotoImage
+    if return_mode==RETURN_IMAGE:
+        return background_image.resize((320, 64),Image.Resampling.NEAREST)
+    elif return_mode==RETURN_BYTE:
+        return background_image.resize((320, 64),Image.Resampling.NEAREST).tobytes()
+    else:
+        return ImageTk.PhotoImage(background_image.resize((320, 64),Image.Resampling.NEAREST))
 
 class ToastWindowUI:
+    """Toast界面类"""
     def __init__(self, master=None, data_pool=None):
         # build ui
         self.root = tk.Tk(master)
@@ -76,7 +108,7 @@ def new_toast(self, toast=ADVANCEMENT, image_path=None, text1="一个弹窗", co
             for i in range(5):
                 if toasts[i] == None:
                     # 使用 Pillow 生成图片
-                    photo=generate_image(toast, image_path, text1, color1, text2, color2)
+                    photo=generate_image(toast, image_path, text1, color1, text2, color2, RETURN_PHOTOIMAGE)
                     self.root.deiconify()
                     toasts[i] = self.canvas.create_image(320, i*64, anchor="nw", image=photo)
                     event.set()
@@ -132,36 +164,37 @@ def set_no_focus(self):
 
 window=None
 def _init():
+    """别调用"""
     global window
     window=ToastWindowUI()
     window.main()
 
 def init():
+    """初始化窗口"""
     thread.start_new_thread(_init,())
     while type(window)!=ToastWindowUI:
         pass
 
-def new_toast(toast=ADVANCEMENT, image_path=None, text1="一个弹窗", color1="yellow", text2="MCToast示例", color2="white"):
+def new_toast(toast=ADVANCEMENT, image_path:str=None, text1="一个弹窗", color1="yellow", text2="MCToast示例", color2="white"):
+    """新弹窗
+    toast:str           背景图片(ADVANCEMENT,RECIPE,SYSTEM)
+    image_path:str      图片路径(对应原版的物品位置)
+    text1:str           第一行文本
+    color1:str          第一行文本颜色
+    text2:str           第二行文本
+    color2:str          第二行文本颜色"""
     global window
-    #thread.start_new_thread(window.new_toast,(toast, image_path, text1, color1, text2, color2))
-    #window.new_toast(toast, image_path, text1, color1, text2, color2)
     e=Event()
     t=Thread(target=window.new_toast,args=(toast, image_path, text1, color1, text2, color2, e))
     t.start()
     e.wait()
 
 def quit():
+    """退出(好像根本不需要)"""
     global window
     window.stop()
 
 def wait_no_toast():
+    """等待所有toast消失"""
     global window
-    window.wait_no_toast()
-
-if __name__ == "__main__":
-    # demo
-    init()
-    for i in range(1,11):
-        new_toast(toast=SYSTEM, text2=f"第{i}")
-        time.sleep(0.5)
-    wait_no_toast()
+    window.wait_no_toast()

img/lib.gif

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="mctoast",
-    version="1.0",
+    version="1.01",
     description="把Minecraft的Toast带到现实里！",
     long_description=long_description,
     long_description_content_type="text/markdown",