mcpywrap 0.4.4__tar.gz → 0.4.6__tar.gz

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # 更新记录
 
+## 0.4.6
+
+- macOS 默认安装配套原生运行包 0.4.4，补齐游戏内 Python 2 单调时钟接口，修复统一输入返回 `missing_monotonic_clock`、键盘及玩家/UI 计划无法执行的问题。
+- 补齐原生浮点接口的结构识别规则与回归测试；不使用 CPU 时间、系统日期或游戏帧数作为替代时钟，未知结构仍明确禁用对应能力。
+- 实机验收覆盖计时、重叠移动跳跃、组合键取消释放、移动中攻击、聊天开关和带修饰键的 UI 点击；改进 macOS 冷启动等待、测试角色复位和瞄准目标确认。
+- 已安装旧资源的用户需显式执行 `mcpy --local engine install --catalog https://github.com/EaseCation/mcpelauncher-manifest/releases/download/mcpy-runtime-v0.4.4/catalog.json`，然后使用 `run --new` 创建实例。升级 CLI 不修改旧世界的运行包绑定。
+
+## 0.4.5
+
+- macOS 自动从已校验的开发者 APK 解析游戏图标，转换为多尺寸 ICNS，并用于本地签名的运行副本；保留原始运行包完整性与签名，已有安装可从匹配缓存补全。
+- mcpy 管理界面、调试浮窗与辅助窗口统一应用图标；采用 Icon Composer 27 分层源和 Apple 渲染器生成圆角、反射及高光，提供带 Dock 留白的静态 PNG/ICNS。
+
 ## 0.4.4
 
 - 修复 Windows 与 macOS 之间同步 Git 依赖时的源码校验失败：获取源码时禁用宿主 Git 的换行、编码与过滤转换，统一保留固定提交中的文件字节。

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/MANIFEST.in

@@ -1,4 +1,6 @@
 include LICENSE README.md CHANGELOG.md
+recursive-include mcpywrap/ui/assets *.svg *.png *.icns *.json
+include scripts/build_app_icon.py
 include docs/releasing.md
 include docs/runtime-debug.md
 include docs/runtime-ui.md docs/runtime-player.md

{mcpywrap-0.4.4/mcpywrap.egg-info → mcpywrap-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap
-Version: 0.4.4
+Version: 0.4.6
 Summary: A wrapper for Minecraft China Edition Addons management
 Author-email: boybook <boybook@easecation.net>
 License-Expression: MIT
@@ -219,7 +219,7 @@ Agent通过CLI管理项目和操作游戏。0.4.2起只有一条日常输入流
 
 严禁业务代码依赖mcpy.*：这些方法只存在于临时注入的调试会话。默认backend=game；原始设备测试显式设置windows-sendinput。旧player/ui、key/mouse/input-sequence入口仍兼容，但从默认帮助隐藏。
 
-时间规划中at_ms可省略，按前一步计划结束加delay_ms编译；真正的实际停顿用wait。Mac旧运行包缺单调时钟时新计划明确不支持，不自动切后端或回退CPU时间。
+时间规划中at_ms可省略，按前一步计划结束加delay_ms编译；真正的实际停顿用wait。macOS运行包0.4.4补齐单调时钟，CLI 0.4.6默认指向该版本；已有资源须[显式升级并新建实例](skills/mcpywrap/references/macos-local.md#统一输入时钟修复cli-046--运行包-044)。旧包仍明确不支持，不自动切后端或回退CPU时间。
 
 常用入口：`mcpy --project <目录> --non-interactive <命令> --json`。
 

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/README.md

@@ -191,7 +191,7 @@ Agent通过CLI管理项目和操作游戏。0.4.2起只有一条日常输入流
 
 严禁业务代码依赖mcpy.*：这些方法只存在于临时注入的调试会话。默认backend=game；原始设备测试显式设置windows-sendinput。旧player/ui、key/mouse/input-sequence入口仍兼容，但从默认帮助隐藏。
 
-时间规划中at_ms可省略，按前一步计划结束加delay_ms编译；真正的实际停顿用wait。Mac旧运行包缺单调时钟时新计划明确不支持，不自动切后端或回退CPU时间。
+时间规划中at_ms可省略，按前一步计划结束加delay_ms编译；真正的实际停顿用wait。macOS运行包0.4.4补齐单调时钟，CLI 0.4.6默认指向该版本；已有资源须[显式升级并新建实例](skills/mcpywrap/references/macos-local.md#统一输入时钟修复cli-046--运行包-044)。旧包仍明确不支持，不自动切后端或回退CPU时间。
 
 常用入口：`mcpy --project <目录> --non-interactive <命令> --json`。
 

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/docs/game-backends.md

@@ -36,3 +36,11 @@ smoke.py 的 --client-file/--server-file 通过同一 CLI 等待世界/HUD、分
 两端单人实例共用 cppconfig 的 world_info；存储、启动转换、保存优先级和创建参数见[实例世界设置](instance-world-settings.md)。
 
 版本发现使用 `mcpy --local engine check-updates --json`：实时查询网易 pe/pe_old，返回真实完整版本和 URL；不得递增版本号或猜测 CDN 路径。该命令只检查，不下载或替换实例。新版本 compatibility=not_checked 需实际 APK 校验与结构兼容检查，不能把“发现版本”当作“可运行”。无需先执行此命令：首次 run 的自动安装已经查询 pe。已有本地版本/实例继续运行；缺失的旧版本若不在官方频道中则不可下载，不猜 CDN 路径。
+
+## macOS 游戏图标
+
+安装 APK 时读取 `AndroidManifest.xml` 中 `application/android:icon` 的资源引用，再通过 `resources.arsc` 解析别名和多分辨率变体，选择最大的可解码位图。图标仅来自用户本机已校验的官方 APK，不随 Python wheel 或原生发行包分发。支持 PNG/WebP/JPEG 位图；自适应 XML 存在同资源位图变体时使用该变体，仅有 XML/矢量图时提示暂不支持，不猜用通知或登录图标。
+
+转换结果在每个引擎的 `game` 同级 `icons` 目录保存为透明 PNG 与多尺寸 ICNS（16–1024 像素及 Retina 表示），记录 APK 摘要、资源路径、原始尺寸与输出摘要。保留宽高比和透明度；放大不会增加原始图像细节。已有安装在下一次启动时可从匹配的 APK 缓存自动补全，不需要重装游戏。缓存已删除时可执行 `mcpy engine install --apk <匹配的原 APK>`；缺少图标不会阻止游戏启动。
+
+游戏启动前，在安装锁内按原生运行包和图标摘要创建 `runtimes/<id>/applications/<摘要>/Minecraft China.app` 本地副本，设置中文应用名、`CFBundleIconFile`，重新进行 ad-hoc 签名并验证。之后复用副本，每次启动检查签名。原始运行包的文件、发行完整性清单和签名不变；本地副本只用于实际游戏进程，实例固定的原生运行版本、游戏资源、数据目录和控制协议仍保持原绑定。图标转换或签名失败时向 stderr 记录原因，继续使用原始运行包。无需 Xcode、Android SDK、Pillow 或重新编译原生启动器。

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/docs/qt6-development.md

@@ -52,3 +52,18 @@ mcpy 自身继续使用 MIT；GUI 改为 PySide6-Essentials 和 Shiboken6，选
 后台结果通过显式 Slot 更新主线程界面，发行声明随 wheel 携带于 THIRD_PARTY_NOTICES.md。
 
 交互式 run 的调试小窗复用 SessionController/SessionLogWindow，不启动第二套日志服务。置顶使用原生 QCheckBox，随系统主题显示；关闭小窗只隐藏视图，游戏退出后清理控制器和监控。Ctrl+C 与“保存退出”调用同一停止接口。
+
+## 应用图标
+
+GUI 入口共用 `ui.application.create_application`：Qt 应用名与菜单显示名为 mcpy，管理页、日志小窗、模板和登录提示使用同一图标。Qt 的应用级图标也交给 Cocoa 用于 Dock。直接运行 Python 时，LaunchServices 仍可能把进程名称缓存为 Python；设置 Qt 显示名不等同于已安装独立 mcpy.app。已打开的小窗需要重新启动后应用新图标。
+
+图标源为 `mcpywrap/ui/assets/mcpy.icon`，是可由 Icon Composer 27 编辑的分层文档：深蓝背景、薄荷绿方块、白色命令提示符。背景满幅不透明，前景 SVG 未预裁切；命令提示符保留不透明，以确保小尺寸对比度。不把 Minecraft 游戏图标用作 mcpy 品牌图标。
+
+设计依据 Apple [App icons HIG](https://developer.apple.com/design/human-interface-guidelines/app-icons)（2026-06-08 更新）和 [Icon Composer 文档](https://developer.apple.com/documentation/xcode/creating-your-app-icon-using-icon-composer)：
+
+- 1024×1024 画布、sRGB；圆角遮罩、高光、边缘反射和层间阴影由 Apple 渲染器生成，不自行用固定半径模拟系统连续圆角。
+- 方块范围 x=248–776、y=224–816，主要内容距离未裁切画布边缘至少 208 px。此数值是本设计的留白选择，HIG 并未规定统一的 macOS 安全区百分比。
+- 分层源背景不预留透明外框。导出给传统 Qt/ICNS 的静态图标时，参考 actool 的 macOS 兼容输出，在 1024 画布内将系统渲染图形放入 824×824 区域，四周留 100 px 透明区，防止 Dock 中图标显得过大。分层源与静态兼容文件的留白不能混用。
+- 图标已用 Icon Composer 27 渲染，并通过 Xcode 27 actool 编译。保留 `.icon` 原始分层素材，PNG 和 ICNS 则用于当前 Qt 应用；静态资源不具备随光照变化的动态 Liquid Glass，也不会自动切换 dark/clear/tinted 外观。将来独立打包 mcpy.app 时可接入编译后的 Assets.car，不能仅给 PNG 加反光就宣称支持全部动态外观。
+
+维护者运行 `python scripts/build_app_icon.py` 重建 PNG 和 ICNS，需要本机 Xcode 27 / Icon Composer 27 与 PySide6；运行时无需 Xcode。ICNS 提供 16、32、128、256、512 点的 1×/2× 图像。wheel 包含静态图标和可编辑分层源。

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/docs/runtime-input.md

@@ -10,6 +10,6 @@ Agent 的推荐入口是 `runtime input observe → run → status/cancel`；公
 
 Windows适配在会话worker中保留状态与幂等历史，单个调度线程推进操作；远程input端点只传参数。统一游戏控制层预留防止新旧游戏写请求插入设备计划；已持有的系统键或修饰键拒绝接管。未知释放保持busy，支持stop重试，不扩大为多请求共享输入。
 
-原生Mac时钟primitive和启动器源码补丁在 `native/runtime_input`。旧运行包缺少经过确认的Python单调时钟时，能力明确关闭；实际Apple Silicon的二进制结构规则、编译和实机验收必须单独完成，不以Windows测试代替。原始pointer/text尚未验证的游戏后端能力保持不支持。
+原生Mac时钟primitive和配套启动器/结构规则补丁在 `native/runtime_input`。CLI 0.4.6 默认指向运行包 0.4.4，提供 `launcher.steady_clock`；已在 Apple Silicon / macOS 26.6.2 / 开发包 3.9.100.297020 通过 8 项实机用例，3.10.100.299889 通过结构识别检查。旧运行包仍返回 `missing_monotonic_clock`，需显式升级资源并新建实例；原始pointer/text缺能力时保持不支持。
 
 验证采用假时钟检查时序、调用顺序、部分失败、取消、幂等和快照；可选实机脚本覆盖真实客户端与服务端读回。旧入口不改变其修饰键排序、时间原点或输入后端；仅从默认发现入口隐藏，兼容参考保留。

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """mcpywrap - 我的世界中国版 Addon 开发依赖、构建与游戏测试工具。"""
 
-__version__ = '0.4.4'
+__version__ = '0.4.6'

mcpywrap-0.4.6/mcpywrap/engines/android_icon.py

@@ -0,0 +1,186 @@
+"""Read an APK's declared launcher icon, without an Android SDK or filename guesses.
+
+Prefer the largest raster variant of application/@android:icon. Adaptive XML
+is not a bitmap: use its legacy variant when present, otherwise report that it
+cannot be converted. No unrelated notification/login artwork is substituted.
+"""
+import struct
+from xml.etree import ElementTree
+
+ANDROID = 'http://schemas.android.com/apk/res/android'
+
+
+def _u16(data, offset):
+    return struct.unpack_from('<H', data, offset)[0]
+
+
+def _u32(data, offset):
+    return struct.unpack_from('<I', data, offset)[0]
+
+
+def _chunks(data, start, end):
+    while start < end:
+        kind, header, size = struct.unpack_from('<HHI', data, start)
+        if header < 8 or size < header or start + size > end:
+            raise ValueError('Invalid Android resource chunk')
+        yield kind, header, data[start:start + size]
+        start += size
+
+
+def _strings(data):
+    header = _u16(data, 2)
+    count, flags, start = _u32(data, 8), _u32(data, 16), _u32(data, 20)
+    if header + count * 4 > len(data):
+        raise ValueError('Invalid Android string pool')
+    utf8 = bool(flags & 0x100)
+
+    def length(pos):
+        value = data[pos] if utf8 else _u16(data, pos)
+        width, mask = (1, 0x80) if utf8 else (2, 0x8000)
+        if value & mask:
+            low = data[pos + width] if utf8 else _u16(data, pos + width)
+            return ((value & (mask - 1)) << (width * 8)) | low, pos + width * 2
+        return value, pos + width
+
+    result = []
+    for index in range(count):
+        pos = start + _u32(data, header + index * 4)
+        if pos < start or pos >= len(data):
+            raise ValueError('Invalid Android string offset')
+        size, pos = length(pos)
+        if utf8:
+            size, pos = length(pos)
+        end = pos + size * (1 if utf8 else 2)
+        if end > len(data):
+            raise ValueError('Invalid Android string extent')
+        result.append(data[pos:end].decode('utf-8' if utf8 else 'utf-16-le'))
+    return result
+
+
+def manifest_icon(data):
+    if data.lstrip().startswith(b'<'):
+        application = ElementTree.fromstring(data).find('application')
+        value = application.get('{%s}icon' % ANDROID) if application is not None else None
+        if value and value.startswith('@0x'):
+            return int(value[1:], 16)
+        return value
+    if _u16(data, 0) != 3 or _u32(data, 4) != len(data):
+        raise ValueError('Invalid Android manifest')
+    strings = []
+    for kind, header, chunk in _chunks(data, _u16(data, 2), len(data)):
+        if kind == 1:
+            strings = _strings(chunk)
+        elif kind == 0x102 and strings[_u32(chunk, header + 4)] == 'application':
+            offset, width, count = struct.unpack_from('<HHH', chunk, header + 8)
+            if width < 20 or header + offset + width * count > len(chunk):
+                raise ValueError('Invalid manifest attributes')
+            for index in range(count):
+                at = header + offset + index * width
+                namespace, name = _u32(chunk, at), _u32(chunk, at + 4)
+                if namespace != 0xffffffff and strings[namespace] == ANDROID and strings[name] == 'icon':
+                    kind, value = chunk[at + 15], _u32(chunk, at + 16)
+                    if kind == 1:
+                        return value
+                    if kind == 3:
+                        return strings[value]
+    return None
+
+
+def resource_values(data, resource):
+    """Resolve simple resource references across configurations, including aliases."""
+    if _u16(data, 0) != 2 or _u32(data, 4) != len(data):
+        raise ValueError('Invalid Android resource table')
+    global_strings, packages = [], []
+    for kind, header, chunk in _chunks(data, _u16(data, 2), len(data)):
+        if kind == 1:
+            global_strings = _strings(chunk)
+        elif kind == 0x200:
+            packages.append((header, chunk))
+
+    def resolve(identity, seen):
+        if identity in seen or len(seen) > 16:
+            return []
+        seen = seen | {identity}
+        values = []
+        for header, package in packages:
+            if _u32(package, 8) != identity >> 24:
+                continue
+            type_offset = _u32(package, 284) if header >= 288 else 0
+            for kind, size, chunk in _chunks(package, header, len(package)):
+                if kind != 0x201 or chunk[8] + type_offset != (identity >> 16) & 255:
+                    continue
+                count, start, index = _u32(chunk, 12), _u32(chunk, 16), identity & 0xffff
+                flags = chunk[9]
+                if start < size or start > len(chunk):
+                    raise ValueError('Invalid Android entries')
+                if flags & 1:  # Sparse (entry index, offset / 4) pairs.
+                    if size + count * 4 > start:
+                        raise ValueError('Invalid sparse entries')
+                    offsets = dict(struct.unpack_from('<HH', chunk, size + i * 4) for i in range(count))
+                    offset = offsets.get(index)
+                    if offset is None:
+                        continue
+                    offset *= 4
+                else:
+                    width = 2 if flags & 2 else 4
+                    if size + count * width > start:
+                        raise ValueError('Invalid entry offsets')
+                    if index >= count:
+                        continue
+                    offset = (_u16 if width == 2 else _u32)(chunk, size + index * width)
+                    if offset == (0xffff if width == 2 else 0xffffffff):
+                        continue
+                    if width == 2:
+                        offset *= 4
+                at = start + offset
+                entry_size, entry_flags = struct.unpack_from('<HH', chunk, at)
+                if entry_flags & 1:  # Complex/bag entry.
+                    continue
+                if entry_flags & 8:  # Compact entry packs type into flags, value into key.
+                    value_kind, value = entry_flags >> 8, _u32(chunk, at + 4)
+                else:
+                    if entry_size < 8 or at + entry_size + 8 > len(chunk):
+                        raise ValueError('Invalid resource value')
+                    value_kind, value = chunk[at + entry_size + 3], _u32(chunk, at + entry_size + 4)
+                if value_kind == 3:
+                    values.append(global_strings[value])
+                elif value_kind == 1:
+                    values.extend(resolve(value, seen))
+        return values
+
+    return resolve(resource, set())
+
+
+def read_icon(archive):
+    from PySide6.QtGui import QImageReader
+    from PySide6.QtCore import QBuffer, QByteArray, QIODevice
+
+    def read(name, limit):
+        info = archive.getinfo(name)
+        if info.file_size > limit:
+            raise ValueError('Android icon resource is too large')
+        return archive.read(info)
+
+    icon = manifest_icon(read('AndroidManifest.xml', 4 * 1024**2))
+    if not icon:
+        raise ValueError('APK application does not declare an icon')
+    paths = resource_values(read('resources.arsc', 32 * 1024**2), icon) if isinstance(icon, int) else [icon]
+    candidates = []
+    for path in set(paths):
+        if not path.startswith('res/') or not path.lower().endswith(('.png', '.webp', '.jpg', '.jpeg')):
+            continue
+        raw = read(path, 16 * 1024**2)
+        buffer = QBuffer()
+        buffer.setData(QByteArray(raw))
+        buffer.open(QIODevice.OpenModeFlag.ReadOnly)
+        reader = QImageReader(buffer)
+        size = reader.size()
+        if size.width() <= 0 or size.height() <= 0 or max(size.width(), size.height()) > 4096:
+            continue
+        image = reader.read()
+        if not image.isNull():
+            candidates.append((image.width() * image.height(), path, image))
+    if not candidates:
+        raise ValueError('APK icon has no supported raster variant (adaptive/vector XML is not a bitmap)')
+    _, path, image = max(candidates, key=lambda row: (row[0], row[1]))
+    return path, image

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/engines/install.py

@@ -24,7 +24,7 @@ from .host import EngineError, describe, require_macos
 
 CATALOG_ENV = 'MCPY_RUNTIME_CATALOG'
 DEFAULT_CATALOG = ('https://github.com/EaseCation/mcpelauncher-manifest/releases/download/'
-                   'mcpy-runtime-v0.4.3/catalog.json')
+                   'mcpy-runtime-v0.4.4/catalog.json')
 # Public constant from the official ApkDownload component, verified 2026-10-05.
 # https://mcdev.webapp.163.com/static/js/4.05713153ba17aea6db53.js
 CDN_CONSTANT = 'mEE7Cot48r9j2AvEL2N6jpXEc'
@@ -630,6 +630,7 @@ def install(location=None, apk=None, progress=None):
             finally:
                 if stage.exists(): shutil.rmtree(stage)
         apk_meta = profile['apk']
+        apk_path = None
         if apk:
             apk_path = Path(apk).expanduser().resolve()
             if apk_path.stat().st_size != apk_meta['size'] or digest(apk_path) != apk_meta['sha256']:
@@ -651,6 +652,9 @@ def install(location=None, apk=None, progress=None):
                 _replace(stage, game)
             finally:
                 if stage.exists(): shutil.rmtree(stage)
+        from .macos_icons import optional_icons
+        _phase(progress, '准备游戏图标')
+        optional_icons(game, profile, apk_path)
         _phase(progress, '检查运行兼容性')
         metadata = verify_runtime(destination/'McpyRuntime.app', destination/'McpyRuntime.integrity.json', profile)
         preflight_runtime(destination/'McpyRuntime.app', game, profile, metadata, runtime['id'])

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/engines/macos.py

@@ -64,7 +64,9 @@ def pinned_runtime(item):
         raise EngineError('当前系统低于此实例的最低 macOS 要求', 'os_too_old')
     install.verify_game(game, plan['profile'])
     compatibility = install.preflight_runtime(app, game, plan['profile'], meta, plan['runtime_id'])
-    return {'runtime': str(app), 'game': str(game), 'profile': plan['profile'], 'runtime_id': plan['runtime_id'],
+    from .macos_icons import optional_runtime_application
+    application = optional_runtime_application(app, game)
+    return {'runtime': str(app), 'application': str(application), 'game': str(game), 'profile': plan['profile'], 'runtime_id': plan['runtime_id'],
             'compat_report': compatibility, 'cppconfig_protocol': meta.get('cppconfig_protocol'),
             'network_connect_protocol': meta.get('network_connect_protocol')}
 
@@ -167,6 +169,7 @@ def run(project, *, new=False, listing=False, delete=None, clean_all=False, forc
             finally:
                 if stage.exists(): shutil.rmtree(stage)
             plan = {'runtime': state['runtime'], 'game': state['game'], 'data': str(directory/'data'),
+                    'application': state.get('application'),
                     'cache': str(directory/'cache'), 'engine_version': version,
                     'compat_report': state.get('compat_report')}
             config_path = Path(item['config_path'])
@@ -210,7 +213,8 @@ def launch_session(data):
     helper = app/'Contents/Resources/launcher/run_netease_dev.py'
     if not helper.is_file():
         raise EngineError('运行包缺少启动适配器，请重新安装。', 'runtime_incompatible')
-    command = [sys.executable, str(helper), '--runtime', str(app), '--game-dir', plan['game'],
+    display_app = plan.get('application') or app
+    command = [sys.executable, str(helper), '--runtime', str(display_app), '--game-dir', plan['game'],
                '--data-dir', plan['data'], '--cache-dir', plan['cache'], '--angle-backend', 'metal',
                '--debug-loopback', '--exec-client', '--log', data['engine_log_path']]
     if plan.get('cppconfig'):

mcpywrap-0.4.6/mcpywrap/engines/macos_icons.py

@@ -0,0 +1,159 @@
+"""Local APK artwork and signed, disposable app copies; release files stay immutable."""
+from pathlib import Path
+import plistlib
+import shutil
+import struct
+import subprocess
+import tempfile
+import zipfile
+import zlib
+from xml.etree.ElementTree import ParseError
+
+from . import install
+
+SCHEMA = 1
+
+
+def _png(image):
+    from PySide6.QtCore import QBuffer, QIODevice
+    buffer = QBuffer()
+    buffer.open(QIODevice.OpenModeFlag.WriteOnly)
+    if not image.save(buffer, 'PNG'):
+        raise ValueError('Could not encode application icon')
+    return bytes(buffer.data())
+
+
+def write_icons(image, directory):
+    """Encode RGBA PNG representations at macOS point/Retina sizes in an ICNS."""
+    from PySide6.QtCore import Qt
+    from PySide6.QtGui import QImage, QPainter
+    directory = Path(directory)
+    directory.mkdir(parents=True, exist_ok=True)
+    canvas = QImage(1024, 1024, QImage.Format.Format_ARGB32)
+    canvas.fill(Qt.GlobalColor.transparent)
+    scaled = image.scaled(1024, 1024, Qt.AspectRatioMode.KeepAspectRatio,
+                          Qt.TransformationMode.SmoothTransformation)
+    painter = QPainter(canvas)
+    painter.drawImage((1024 - scaled.width()) // 2, (1024 - scaled.height()) // 2, scaled)
+    painter.end()
+    (directory/'game.png').write_bytes(_png(canvas))
+    chunks = []
+    for tag, size in ((b'icp4', 16), (b'icp5', 32), (b'icp6', 64), (b'ic07', 128),
+                      (b'ic08', 256), (b'ic09', 512), (b'ic10', 1024),
+                      (b'ic11', 32), (b'ic12', 64), (b'ic13', 256), (b'ic14', 512)):
+        raw = _png(canvas.scaled(size, size, Qt.AspectRatioMode.IgnoreAspectRatio,
+                                 Qt.TransformationMode.SmoothTransformation))
+        chunks.append(tag + struct.pack('>I', len(raw) + 8) + raw)
+    payload = b''.join(chunks)
+    (directory/'game.icns').write_bytes(b'icns' + struct.pack('>I', len(payload) + 8) + payload)
+
+
+def _valid_icons(directory, profile):
+    try:
+        receipt = install.read_json(directory/'icon.json')
+        return (receipt['schema'] == SCHEMA and receipt['apk_sha256'] == profile['apk']['sha256']
+                and all(install.digest(directory/name) == receipt['files'][name]
+                        for name in ('game.png', 'game.icns')))
+    except (OSError, ValueError, KeyError, TypeError):
+        return False
+
+
+def prepare_icons(game, profile, apk=None):
+    """Migrate existing installs using a matching cache, without another download."""
+    from .android_icon import read_icon
+    game = Path(game)
+    directory = game.parent/'icons'
+    if _valid_icons(directory, profile):
+        return directory
+    source = Path(apk) if apk else install.home()/'cache'/profile['apk']['filename']
+    if not source.is_file():
+        raise ValueError('找不到匹配 APK；可用 mcpy engine install --apk <原 APK> 补全游戏图标')
+    if source.stat().st_size != profile['apk']['size'] or install.digest(source) != profile['apk']['sha256']:
+        raise ValueError('图标来源 APK 摘要不匹配')
+    game.parent.mkdir(parents=True, exist_ok=True)
+    stage = Path(tempfile.mkdtemp(prefix='.icons-', dir=game.parent))
+    try:
+        with zipfile.ZipFile(source) as archive:
+            resource, image = read_icon(archive)
+        write_icons(image, stage)
+        install.write_json(stage/'icon.json', {
+            'schema': SCHEMA, 'apk_sha256': profile['apk']['sha256'], 'resource': resource,
+            'source_size': [image.width(), image.height()],
+            'files': {name: install.digest(stage/name) for name in ('game.png', 'game.icns')}})
+        install._replace(stage, directory)
+    finally:
+        if stage.exists():
+            shutil.rmtree(stage)
+    return directory
+
+
+def _codesign(*arguments):
+    result = subprocess.run(['/usr/bin/codesign', *map(str, arguments)], capture_output=True, timeout=60)
+    if result.returncode:
+        raise ValueError('本地图标运行包签名失败：' + result.stderr.decode('utf-8', 'replace')[:1000])
+
+
+def runtime_application(app, game):
+    """Build once per verified runtime/icon. Caller holds the engine install lock."""
+    app, game = Path(app), Path(game)
+    profile = install.read_json(game/'installed.json')['profile']
+    icons = prepare_icons(game, profile)
+    identity = {'schema': SCHEMA, 'runtime': install.digest(app.parent/'McpyRuntime.integrity.json'),
+                'icon': install.digest(icons/'game.icns')}
+    import hashlib
+    import json
+    key = hashlib.sha256(json.dumps(identity, sort_keys=True).encode()).hexdigest()
+    destination = app.parent/'applications'/key
+    name = 'Minecraft China.app'
+    derived = destination/name
+    try:
+        if install.read_json(destination/'application.json') == identity:
+            _codesign('--verify', '--deep', '--strict', derived)
+            return derived
+    except (OSError, ValueError, subprocess.SubprocessError):
+        pass
+    if destination.exists():
+        install._require_idle(destination)
+    destination.parent.mkdir(parents=True, exist_ok=True)
+    stage = Path(tempfile.mkdtemp(prefix='.application-', dir=destination.parent))
+    try:
+        target = stage/name
+        shutil.copytree(app, target)
+        shutil.copy2(icons/'game.icns', target/'Contents/Resources/game.icns')
+        plist = target/'Contents/Info.plist'
+        info = plistlib.loads(plist.read_bytes())
+        info.update(CFBundleName='我的世界中国版', CFBundleDisplayName='我的世界中国版',
+                    CFBundleIconFile='game.icns', CFBundleIdentifier='net.easecation.mcpy.game.' + key[:16])
+        plist.write_bytes(plistlib.dumps(info))
+        _codesign('--force', '--sign', '-', '--preserve-metadata=entitlements,flags', '--timestamp=none', target)
+        _codesign('--verify', '--deep', '--strict', target)
+        install.write_json(stage/'application.json', identity)
+        install._replace(stage, destination)
+    finally:
+        if stage.exists():
+            shutil.rmtree(stage)
+    return derived
+
+
+def warn_icon(error):
+    # Called by both JSON CLI and workers; warnings must never contaminate stdout.
+    import sys
+    print('游戏图标暂未应用：' + str(error), file=sys.stderr, flush=True)
+
+
+def optional_icons(game, profile, apk=None):
+    try:
+        return prepare_icons(game, profile, apk)
+    except (OSError, ValueError, KeyError, IndexError, struct.error, zipfile.BadZipFile,
+            zlib.error, ParseError, ImportError) as error:
+        warn_icon(error)
+        return None
+
+
+def optional_runtime_application(app, game):
+    try:
+        return runtime_application(app, game)
+    except (OSError, ValueError, KeyError, IndexError, struct.error, zipfile.BadZipFile,
+            zlib.error, ParseError, ImportError, subprocess.SubprocessError) as error:
+        warn_icon(error)
+        return Path(app)

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/engines/macos_network.py

@@ -34,6 +34,7 @@ def connect(target, *, project_dir=None, packs=(), engine_overrides=None, detach
         session = uuid.uuid4().hex
         directory = sessions.session_path(root, session)
         plan = {'runtime': state['runtime'], 'game': state['game'],
+                'application': state.get('application'),
                 'data': str(directory/'native/data'), 'cache': str(directory/'native/cache'),
                 'engine_version': version, 'compat_report': state.get('compat_report'),
                 'cppconfig': str(directory/'runtime.cppconfig')}

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/mcstudio/auth_interaction.py

@@ -49,8 +49,9 @@ ConvertTo-Json -InputObject $items -Compress
 
 
 def confirm_certificate(certificate):
-    from PySide6.QtWidgets import QApplication, QMessageBox
-    app = QApplication.instance() or QApplication([])
+    from PySide6.QtWidgets import QMessageBox
+    from ..ui.application import create_application
+    app = create_application()
     dialog = QMessageBox()
     dialog.setWindowTitle('启用 MC Studio 登录身份')
     dialog.setIcon(QMessageBox.Icon.Warning)
@@ -81,6 +82,7 @@ def install_certificate(certificate):
 
 
 def show_failure(message):
-    from PySide6.QtWidgets import QApplication, QMessageBox
-    app = QApplication.instance() or QApplication([])
+    from PySide6.QtWidgets import QMessageBox
+    from ..ui.application import create_application
+    app = create_application()
     QMessageBox.warning(None, '暂时无法使用 MC Studio 登录身份', message)

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/mcstudio/bridge_payload/manifest.json

@@ -11,9 +11,9 @@
     "Loader.c": "f2f1f781ce82fc30c62a6ce22bb048d3b023f6ff500e6ec8228da28b4dbf1b4a"
   },
   "files": {
-    "Injector.exe": "aa185d69f11e138df90f446c239d075ef6ab4e5c5e0457981a6c09f52e04b7b9",
-    "Loader.dll": "03956417da34f569dd6e794076f2252ff05cb286fd1a8dc6ce966dc78911330e",
-    "McpyMcsAuth.dll": "b1270f169319e8acebca7d49be966d54c769590d708157c3984e33f9a943c1d7",
+    "Injector.exe": "621284073f4b383c30d25eca393df4d4c979afc5fd8c0fda6f73967845759515",
+    "Loader.dll": "471c4ec3d7c3315f1c77c2e7514f818066f6176f79196b996efdff31247bb379",
+    "McpyMcsAuth.dll": "a051488fb21310f4934d55bf1e5485ae8e5e209b74299699fde0047de27e4108",
     "publisher.cer": "e5aa2ac39df40804ed8b08fe8e43c4a2b8923f0d02a360708486b2db5b6303d7"
   }
 }

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/mcstudio/studio_server_ui.py

@@ -80,7 +80,8 @@ class StudioLoggerUI(LogWindow):
 
 
 def run_studio_server_ui(host='0.0.0.0', port=8000):
-    app = QApplication.instance() or QApplication(sys.argv)
+    from ..ui.application import create_application
+    app = create_application(sys.argv)
     window = StudioLoggerUI(host, port); window.show()
     if sys.platform == 'win32': set_windows_dark_titlebar(int(window.winId()))
     signal.signal(signal.SIGINT, lambda *_: window.close())

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/mcstudio/window_capture/manifest.json

@@ -1,5 +1,5 @@
 {
-  "executable_sha256": "4f4f8b0a8eae4b8d409ae90e222886623c4b53ed66525d8267ffaadc1db65442",
+  "executable_sha256": "059cb625d222865ab52e7689414e3624ec1cdd16e0362840e1621eb09211155c",
   "source_sha256": "0c0b2a02bfecea68b824a486ac1d88cde6bd9fc8ee8e4c9a6939870bd8e710d1",
   "sources": {
     "video_capture.h": "8daee1b8c1c8273bc8d19d39f0559f82c30d7ff900894bcc2cc197d3881532d7",

{mcpywrap-0.4.4 → mcpywrap-0.4.6}/mcpywrap/minecraft/template/mod_template.py

@@ -107,7 +107,8 @@ def open_ui_crate_mod(behavior_pack_path, run_event_loop=True):
     Args:
         behavior_pack_path: 行为包目录的路径
     """
-    app = QApplication.instance() or QApplication(sys.argv)
+    from ...ui.application import create_application
+    app = create_application(sys.argv)
 
     # 设置优先使用的中文字体列表
     preferred_fonts = [