Skip to content

Commit a7ca097

Browse files
SystemFileBSystemFileB
committed
1.12
1 parent 6dd1e18 commit a7ca097

File tree

4 files changed

+85
-55
lines changed

4 files changed

+85
-55
lines changed

‎.github/workflows/build.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main # 假设您的主分支是 main
77

88
jobs:
9-
build-and-release:
9+
mctoast-snapshot-builder:
1010
runs-on: ubuntu-latest
1111

1212
steps:
@@ -21,14 +21,21 @@ jobs:
2121
- name: 安装依赖
2222
run: |
2323
python -m pip install --upgrade pip
24-
pip install setuptools wheel pillow
24+
pip install setuptools wheel pillow build
2525
2626
- name: 构建
2727
run: |
28-
python setup.py bdist_wheel
28+
python -m build --sdist --wheel
2929
30-
- name: 上传 Artifact
30+
- name: 上传 Artifact Wheel
3131
uses: actions/upload-artifact@v4
3232
with:
3333
name: mctoast-snapshot
3434
path: dist/*.whl
35+
36+
- name: 上传 Artifact 源代码
37+
uses: actions/upload-artifact@v4
38+
with:
39+
name: mctoast-snapshot-source
40+
path: dist/*.tar.gz
41+

‎README.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
$ pip install mctoast
99
# 安装快照 (请将后面的路径换为实际的)
1010
$ pip install /path/to/mctoast-wheel.whl
11+
# 从github仓库安装 (有时候未经测试，也有可能无法运行)
12+
$ pip install git+https://github.com/SystemFileB/mctoast.git@main
1113
```
1214

1315
## 🖼️画廊
@@ -27,8 +29,13 @@ mctoast模仿的效果:
2729
- 若遇到了相关的许可证问题，请第一时间[提交issue](https://github.com/SystemFileB/mctoast/issues)并加上 版权或许可证问题 标签
2830

2931
## 📰更新日志
32+
### 1.12
33+
- 紧急修复：setup.py并没有包含`__init__.py`和`__main__.py`文件，导致无法使用
34+
- 重新加入1.11的更改
35+
- 修复：python -m mctoast无法弹出参数自定义的toast
36+
3037
### 1.11.1
31-
- 撤回1.11的更改
38+
- 紧急修复：撤回1.11的更改
3239

3340
### 1.11
3441
- 允许你直接运行mctoast，而非python -m mctoast
@@ -40,11 +47,11 @@ mctoast模仿的效果:
4047
- 紧急修复：mctoast.init()报错
4148

4249
### 1.10
43-
- 库的修改
44-
    - 为`generate_image`添加了默认值
45-
    - `generate_image(return_mode=RETURN_BYTE)`修复，现在返回的就是正常的图片字节
46-
    - 加入`generate_image(return_mode=RETURN_SAVETIFILE,filename="awasome.png")`语法，可以将图片保存为文件了
47-
    - 加入`generate_image(resize=False)`，在new_toast里使用的时候这个值为`True`，你一般不用修改，除非你也要把它缩放到320x64
50+
- 库的修改
51+
- 为`generate_image`添加了默认值
52+
- `generate_image(return_mode=RETURN_BYTE)`修复，现在返回的就是正常的图片字节
53+
- 加入`generate_image(return_mode=RETURN_SAVETIFILE,filename="awasome.png")`语法，可以将图片保存为文件了
54+
- 加入`generate_image(resize=False)`，在new_toast里使用的时候这个值为`True`，你一般不用修改，除非你也要把它缩放到320x64
4855
- 允许你使用`python -m mctoast`生成toast图片或弹出toast
4956
- <p style="color:gray">据说执行 python -m mctoast --moo 有彩蛋，你要不要试试</p>
5057
- 移除了Herobrine (

‎mctoast/__main__.py

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -67,44 +67,54 @@
6767
6868
Rickrolled LOL
6969
"""
70-
print("MCToast 生成器 1.11.1\n")
71-
toasts=(mctoast.ADVANCEMENT,mctoast.RECIPE,mctoast.SYSTEM)
72-
toast=mctoast.ADVANCEMENT
73-
image=None
74-
text1="进度已达成！"
75-
color1="yellow"
76-
text2="MCToast示例"
77-
color2="white"
78-
savepath=None
79-
if len(sys.argv)>1:
80-
argv=sys.argv[1:]
81-
for arg in argv:
82-
if arg.startswith("--toast=") or arg.startswith("-t="):
83-
toast=arg.split("=")[1]
84-
elif arg.startswith("--image=") or arg.startswith("-i="):
85-
image=arg.split("=")[1]
86-
elif arg.startswith("--title=") or arg.startswith("-t1="):
87-
text1=arg.split("=")[1]
88-
elif arg.startswith("--title-color=") or arg.startswith("-c1="):
89-
color1=arg.split("=")[1]
90-
elif arg.startswith("--text=") or arg.startswith("-t2="):
91-
text2=arg.split("=")[1]
92-
elif arg.startswith("--text-color=") or arg.startswith("-c2="):
93-
color2=arg.split("=")[1]
94-
elif arg.startswith("--help") or arg.startswith("-h") or arg.startswith("-?"):
95-
print(help)
96-
exit(0)
97-
elif arg=="--moo":
98-
print(moo)
99-
exit(0)
100-
else:
101-
savepath=arg
102-
else:
103-
print("WARNING: 未指定参数，将弹出默认Toast，请使用 --help 查看帮助")
104-
if savepath==None:
105-
mctoast.init()
106-
mctoast.new_toast()
107-
mctoast.wait_no_toast()
108-
else:
109-
mctoast.generate_image(toast,image,text1,color1,text2,color2,mctoast.RETURN_SAVETOFILE, False, savepath)
110-
print("已保存:",savepath)
70+
def mian():
71+
global help,moo
72+
print("MCToast 生成器 1.12\n")
73+
toasts=(mctoast.ADVANCEMENT,mctoast.RECIPE,mctoast.SYSTEM)
74+
toast=mctoast.ADVANCEMENT
75+
image=None
76+
text1="进度已达成！"
77+
color1="yellow"
78+
text2="MCToast示例"
79+
color2="white"
80+
savepath=None
81+
if len(sys.argv)>1:
82+
argv=sys.argv[1:]
83+
for arg in argv:
84+
if arg.startswith("--toast=") or arg.startswith("-t="):
85+
try:
86+
toast=toasts[int(arg.split("=")[1])]
87+
except ValueError:
88+
print("ERROR: 无效的Toast类型")
89+
exit(1)
90+
print(toast)
91+
elif arg.startswith("--image=") or arg.startswith("-i="):
92+
image=arg.split("=")[1]
93+
elif arg.startswith("--title=") or arg.startswith("-t1="):
94+
text1=arg.split("=")[1]
95+
elif arg.startswith("--title-color=") or arg.startswith("-c1="):
96+
color1=arg.split("=")[1]
97+
elif arg.startswith("--text=") or arg.startswith("-t2="):
98+
text2=arg.split("=")[1]
99+
elif arg.startswith("--text-color=") or arg.startswith("-c2="):
100+
color2=arg.split("=")[1]
101+
elif arg.startswith("--help") or arg.startswith("-h") or arg.startswith("-?"):
102+
print(help)
103+
exit(0)
104+
elif arg=="--moo":
105+
print(moo)
106+
exit(0)
107+
else:
108+
savepath=arg
109+
else:
110+
print("WARNING: 未指定参数，将弹出默认Toast，请使用 --help 查看帮助")
111+
if savepath==None:
112+
mctoast.init()
113+
mctoast.new_toast(toast,image,text1,color1,text2,color2)
114+
mctoast.wait_no_toast()
115+
else:
116+
mctoast.generate_image(toast,image,text1,color1,text2,color2,mctoast.RETURN_SAVETOFILE, False, savepath)
117+
print("已保存:",savepath)
118+
119+
if __name__=="__main__":
120+
mian()

‎setup.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
import setuptools
2-
print("MCToast Setup.py By SystemFileB")
3-
print()
42
with open("README.md", "r", encoding="utf-8") as f:
53
long_description = f.read()
64
f.close()
75

86
setuptools.setup(
97
name="mctoast",
10-
version="1.11.1",
8+
version="1.12",
119
description="把Minecraft的Toast带到现实里！",
1210
long_description=long_description,
1311
long_description_content_type="text/markdown",
1412
author="SystemFileB",
15-
packages=setuptools.find_namespace_packages(where=".",include=['mctoast.*']),
13+
packages=setuptools.find_namespace_packages(include=["mctoast","mctoast.*"]),
1614
package_data={
1715
'mctoast': ['*'], # 包含mctoast目录下的所有文件
1816
},
@@ -26,5 +24,13 @@
2624
fullname="Minecraft Toast (tkinter)",
2725
url="https://github.com/SystemFileB/mctoast",
2826
include_package_data=True,
27+
entry_points={
28+
'console_scripts': [
29+
'mctoast = mctoast.__main__:mian'
30+
],
31+
'gui_scripts': [
32+
'mctoastw = mctoast.__main__:mian'
33+
],
34+
}
2935

3036
)

0 commit comments

Comments
 (0)