mcpywrap 0.2.0__tar.gz → 0.2.2__tar.gz

{mcpywrap-0.2.0 → mcpywrap-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap
-Version: 0.2.0
+Version: 0.2.2
 Summary: A wrapper for Minecraft China Edition Addons management
 Author-email: boybook <boybook@easecation.net>
 License: MIT
@@ -20,7 +20,6 @@ Requires-Dist: tomli-w
 Requires-Dist: setuptools
 Requires-Dist: PyQt5>=5.15.0
 Requires-Dist: psutil>=5.8.0
-Requires-Dist: amulet-nbt>=2.1.4
 Requires-Dist: rich>=10.0.0
 
 # 🧰 mcpywrap 

{mcpywrap-0.2.0 → mcpywrap-0.2.2}/mcpywrap/builders/AddonsPack.py

@@ -78,10 +78,13 @@ class AddonsPack(object):
             return True
         return False
 
-    def copy_behavior_to(self, target_dir: str):
-        """复制行为包和资源包到目标目录"""
+    def copy_behavior_to(self, target_dir: str, rename: str = None):
+        """
+        复制行为包和资源包到目标目录
+        target_dir为父目录
+        """
         if self.behavior_pack_dir:
-            target_path = os.path.join(target_dir, os.path.basename(self.behavior_pack_dir))
+            target_path = os.path.join(target_dir, os.path.basename(self.behavior_pack_dir) if not rename else rename)
             os.makedirs(target_path, exist_ok=True)
 
             # 使用自定义复制函数而不是shutil.copytree
@@ -106,10 +109,13 @@ class AddonsPack(object):
                         else:
                             shutil.copy2(src_file, dest_file)
 
-    def copy_resource_to(self, target_dir: str):
-        """复制资源包到目标目录"""
+    def copy_resource_to(self, target_dir: str, rename: str = None):
+        """
+        复制资源包到目标目录
+        target_dir为父目录
+        """
         if self.resource_pack_dir:
-            target_path = os.path.join(target_dir, os.path.basename(self.resource_pack_dir))
+            target_path = os.path.join(target_dir, os.path.basename(self.resource_pack_dir) if not rename else rename)
             os.makedirs(target_path, exist_ok=True)
 
             # 使用自定义复制函数而不是shutil.copytree

mcpywrap-0.2.2/mcpywrap/builders/MapPack.py

@@ -0,0 +1,173 @@
+# -*- coding: utf-8 -*-
+
+import os
+import shutil
+import click
+import json
+
+from ..mcstudio.symlinks import setup_map_packs_symlinks
+
+class MapPack(object):
+
+    pkg_name: str
+    path: str
+    
+    behavior_packs_dir: str
+    resource_packs_dir: str
+
+    behavior_packs = []
+    resource_packs = []
+
+    def __init__(self, pkg_name: str, path: str):
+        self.pkg_name = pkg_name
+        self.path = path
+
+        # 读取配置文件
+        self.behavior_packs_dir = os.path.join(self.path, "behavior_packs")
+        self.resource_packs_dir = os.path.join(self.path, "resource_packs")
+
+        if not os.path.exists(self.behavior_packs_dir):
+            os.makedirs(self.behavior_packs_dir)
+
+        # 遍历行为包目录
+        for pack in os.listdir(self.behavior_packs_dir):
+            pack_path = os.path.join(self.behavior_packs_dir, pack)
+            if os.path.isdir(pack_path):
+                self.behavior_packs.append(pack_path)
+        
+        if not os.path.exists(self.resource_packs_dir):
+            os.makedirs(self.resource_packs_dir)
+
+        # 遍历资源包目录
+        for pack in os.listdir(self.resource_packs_dir):
+            pack_path = os.path.join(self.resource_packs_dir, pack)
+            if os.path.isdir(pack_path):
+                self.resource_packs.append(pack_path)
+
+    def copy_level_data_to(self, target_dir: str):
+        """
+        复制地图数据到目标目录
+        """
+        # level.dat
+        level_dat_path = os.path.join(target_dir, "level.dat")
+        if not os.path.exists(level_dat_path):
+            origin_level_dat_path = os.path.join(self.path, "level.dat")
+            if os.path.exists(origin_level_dat_path):
+                shutil.copy2(origin_level_dat_path, level_dat_path)
+        # levelname.txt
+        levelname_txt_path = os.path.join(target_dir, "levelname.txt")
+        if not os.path.exists(levelname_txt_path):
+            origin_levelname_txt_path = os.path.join(self.path, "levelname.txt")
+            if os.path.exists(origin_levelname_txt_path):
+                shutil.copy2(origin_levelname_txt_path, levelname_txt_path)
+        # db
+        level_db_dir = os.path.join(target_dir, "db")
+        if not os.path.exists(level_db_dir) and os.path.exists(os.path.join(self.path, "db")):
+            shutil.copytree(os.path.join(self.path, "db"), level_db_dir)
+
+    def copy_resource_packs_to(self, target_map_dir: str):
+        """
+        复制资源包到目标目录
+        """
+        for pack in self.resource_packs:
+            pack_name = os.path.basename(pack)
+            target_pack_dir = os.path.join(target_map_dir, "resource_packs", pack_name)
+            # 先删除目标目录下的包
+            if os.path.exists(target_pack_dir):
+                shutil.rmtree(target_pack_dir)
+            shutil.copytree(pack, target_pack_dir)
+    
+    def copy_behavior_packs_to(self, target_map_dir: str):
+        """
+        复制行为包到目标目录
+        """
+        for pack in self.behavior_packs:
+            pack_name = os.path.basename(pack)
+            target_pack_dir = os.path.join(target_map_dir, "behavior_packs", pack_name)
+            # 先删除目标目录下的包
+            if os.path.exists(target_pack_dir):
+                shutil.rmtree(target_pack_dir)
+            shutil.copytree(pack, target_pack_dir)
+
+    
+    def setup_packs_symlinks_to(self, level_id: str, target_dir: str):
+        """
+        设置行为包和资源包的符号链接到目标目录（本体到远程）
+        """
+        setup_map_packs_symlinks(self.path, level_id, target_dir)
+
+    def setup_world_packs_config(self):
+        """根据当前path，生成世界需加载的pack的配置文件"""
+        behavior_packs_config = []
+        if os.path.exists(self.behavior_packs_dir):
+            behavior_packs_config = _find_and_extract_pack_info(self.behavior_packs_dir)
+            if behavior_packs_config:
+                world_behavior_packs_path = os.path.join(self.path, "world_behavior_packs.json")
+                with open(world_behavior_packs_path, 'w', encoding='utf-8') as f:
+                    json.dump(behavior_packs_config, f, ensure_ascii=False, indent=4)
+        
+        resource_packs_config = []
+        if os.path.exists(self.resource_packs_dir):
+            resource_packs_config = _find_and_extract_pack_info(self.resource_packs_dir)
+            if resource_packs_config:
+                world_resource_packs_path = os.path.join(self.path, "world_resource_packs.json")
+                with open(world_resource_packs_path, 'w', encoding='utf-8') as f:
+                    json.dump(resource_packs_config, f, ensure_ascii=False, indent=4)
+        
+        return behavior_packs_config, resource_packs_config
+
+def _find_and_extract_pack_info(packs_dir):
+    """
+    搜索指定目录中的所有包，并从manifest.json中提取信息
+    
+    Args:
+        packs_dir: 包目录路径
+        
+    Returns:
+        list: 包配置列表
+    """
+    packs_config = []
+    
+    # 遍历目录下的所有子目录
+    for pack_name in os.listdir(packs_dir):
+        pack_path = os.path.join(packs_dir, pack_name)
+        
+        # 只处理目录
+        if not os.path.isdir(pack_path):
+            continue
+        
+        # 查找manifest.json或pack_manifest.json
+        manifest_path = os.path.join(pack_path, "manifest.json")
+        if not os.path.exists(manifest_path):
+            manifest_path = os.path.join(pack_path, "pack_manifest.json")
+            if not os.path.exists(manifest_path):
+                continue
+        
+        try:
+            with open(manifest_path, 'r', encoding='utf-8') as f:
+                manifest = json.load(f)
+            
+            # 提取UUID和版本信息
+            if 'header' in manifest:
+                pack_id = manifest['header'].get('uuid')
+                version = manifest['header'].get('version', [0, 0, 1])
+                
+                # 确保版本是列表格式
+                if isinstance(version, list):
+                    version_array = version
+                elif isinstance(version, dict) and 'major' in version and 'minor' in version and 'patch' in version:
+                    version_array = [version['major'], version['minor'], version['patch']]
+                else:
+                    version_array = [0, 0, 1]  # 默认版本
+                
+                if pack_id:
+                    pack_config = {
+                        "pack_id": pack_id,
+                        "type": "Addon",
+                        "version": version_array
+                    }
+                    packs_config.append(pack_config)
+        except Exception as e:
+            click.echo(f"⚠️ 读取包配置失败: {pack_name} - {str(e)}", style="yellow")
+    
+    return packs_config

{mcpywrap-0.2.0 → mcpywrap-0.2.2}/mcpywrap/builders/__init__.py

@@ -3,8 +3,8 @@
 构建模块包，提供项目构建、文件处理和监控功能
 """
 
-from .project_builder import ProjectBuilder
+from .project_builder import AddonProjectBuilder
 from .watcher import ProjectWatcher, FileWatcher
 from .dependency_manager import DependencyManager
 
-__all__ = ['ProjectBuilder', 'ProjectWatcher', 'FileWatcher', 'DependencyManager']
+__all__ = ['AddonProjectBuilder', 'ProjectWatcher', 'FileWatcher', 'DependencyManager']

{mcpywrap-0.2.0 → mcpywrap-0.2.2}/mcpywrap/builders/dependency_manager.py

@@ -11,13 +11,14 @@ from pathlib import Path
 from typing import Dict, List, Optional, Set
 import click
 
+from ..config import CONFIG_FILE, check_has_mcpywrap_config
 from .AddonsPack import AddonsPack
 
 class DependencyNode:
     """依赖树节点"""
     def __init__(self, name: str, addon_pack: AddonsPack, parent=None):
         self.name = name
-        self.addon_pack = addon_pack
+        self.addon_pack: AddonsPack = addon_pack
         self.parent = parent
         self.children: List[DependencyNode] = []
         
@@ -30,6 +31,39 @@ class DependencyNode:
         
     def __repr__(self):
         return self.__str__()
+    
+
+def _decode_direct_url(direct_url_path: str) -> Optional[str]:
+    with open(direct_url_path, 'r', encoding='utf-8') as f:
+        try:
+            direct_url = json.load(f)
+            # 读取其中的url
+            if "url" in direct_url:
+                url = direct_url["url"]
+                # 处理file://开头的路径
+                if url.startswith("file:///"):
+                    # 移除file:/// 前缀
+                    if sys.platform == "win32":
+                        # Windows 路径处理 (例如 file:///D:/path)
+                        url = url[8:]  # 去除 file:///
+                    else:
+                        url = "/" + url[8:]  # 保留根目录斜杠
+                    url = os.path.abspath(url)
+                # 兼容处理旧格式 file://
+                elif url.startswith("file://"):
+                    url = url[7:]
+                # 对URL进行解码，处理%编码的特殊字符
+                from urllib.parse import unquote
+                url = unquote(url)
+                url = os.path.abspath(url)
+
+                # 确保路径格式一致
+                if sys.platform == "win32":
+                    url = url.replace("\\", "/")
+
+                return url
+        except json.JSONDecodeError:
+            logging.warning(f"无法解析 {direct_url_path} 的JSON内容")
 
 class DependencyManager:
     """依赖管理器"""
@@ -37,7 +71,7 @@ class DependencyManager:
         self.dependency_map: Dict[str, AddonsPack] = {}
         self.root_node: Optional[DependencyNode] = None
         self.processed_deps: Set[str] = set()
-        
+
     def find_dependency_path(self, package_name: str) -> Optional[str]:
         """
         查找依赖包的真实路径，支持常规安装和pip install -e (编辑安装)
@@ -62,39 +96,13 @@ class DependencyManager:
                     # 处理direct_url.json获取包路径
                     direct_url_path = dist_info / "direct_url.json"
                     if direct_url_path.exists():
-                        with open(direct_url_path, 'r', encoding='utf-8') as f:
-                            try:
-                                direct_url = json.load(f)
-                                # 读取其中的url
-                                if "url" in direct_url:
-                                    url = direct_url["url"]
-                                    # 处理file://开头的路径
-                                    if url.startswith("file:///"):
-                                        # 移除file:/// 前缀
-                                        if sys.platform == "win32":
-                                            # Windows 路径处理 (例如 file:///D:/path)
-                                            url = url[8:]  # 去除 file:///
-                                        else:
-                                            url = "/" + url[8:]  # 保留根目录斜杠
-                                        url = os.path.abspath(url)
-                                    # 兼容处理旧格式 file://
-                                    elif url.startswith("file://"):
-                                        url = url[7:]
-                                    # 对URL进行解码，处理%编码的特殊字符
-                                    from urllib.parse import unquote
-                                    url = unquote(url)
-                                    url = os.path.abspath(url)
-
-                                    # 确保路径格式一致
-                                    if sys.platform == "win32":
-                                        url = url.replace("\\", "/")
-
-                                    return url
-                            except json.JSONDecodeError:
-                                logging.warning(f"无法解析 {direct_url_path} 的JSON内容")
-                                continue
+                        origin_path = _decode_direct_url(str(direct_url_path))
+                        if origin_path:
+                            # 返回绝对路径
+                            return origin_path
+                        continue
         return None
-                
+    
     def build_dependency_tree(self, project_name: str, project_path: str, dependencies: List[str]) -> DependencyNode:
         """
         构建依赖树
@@ -171,4 +179,31 @@ class DependencyManager:
         
     def get_dependency_tree(self) -> Optional[DependencyNode]:
         """获取依赖树"""
-        return self.root_node
+        return self.root_node
+
+
+def find_all_mcpywrap_packages() -> List[str]:
+        packages = []
+        # 得到site-packages路径
+        for site_package_dir in __import__('site').getsitepackages():
+            site_packages = Path(site_package_dir)
+            for dist_info in site_packages.glob("*.dist-info"):
+                # 读取METADATA文件获取真实包名
+                metadata_path = dist_info / "METADATA"
+                if metadata_path.exists():
+                    pkg_name = None
+                    with open(metadata_path, 'r', encoding='utf-8') as f:
+                        for line in f:
+                            if line.startswith("Name:"):
+                                pkg_name = line.split(":", 1)[1].strip()
+                                break
+                    if pkg_name is None:
+                        continue
+                    # 处理direct_url.json获取包路径
+                    direct_url_path = dist_info / "direct_url.json"
+                    if direct_url_path.exists():
+                        origin_path = _decode_direct_url(str(direct_url_path))
+                        if origin_path:
+                            if check_has_mcpywrap_config(os.path.join(origin_path, CONFIG_FILE)):
+                                packages.append(pkg_name)
+        return packages

{mcpywrap-0.2.0 → mcpywrap-0.2.2}/mcpywrap/builders/file_merge.py

@@ -121,6 +121,12 @@ def try_merge_file(source_file, target_file, source_dependency_name=None) -> Tup
             _write_lang_file(target_file, merged_lang)
             return True, f"成功合并 {base_name} 到 {os.path.basename(target_file)}"
         
+        if base_name.endswith('.png') or base_name.endswith('.jpg') or base_name.endswith('.jpeg') or base_name.endswith('.tga'):
+            # 直接覆盖，并给出警告
+            shutil.copy2(source_file, target_file)
+            click.secho(f"⚠️ 警告: {base_name} 图片文件重复，正在覆盖", fg="yellow")
+            return True, f"强制覆盖 {base_name} 到 {os.path.basename(target_file)}"
+        
         # 读取源文件和目标文件的JSON内容
         source_json = _read_json_file(source_file)
         target_json = _read_json_file(target_file)