mcpywrap 0.2.1__tar.gz → 0.2.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap
-Version: 0.2.1
+Version: 0.2.2
 Summary: A wrapper for Minecraft China Edition Addons management
 Author-email: boybook <boybook@easecation.net>
 License: MIT

{mcpywrap-0.2.1 → 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)

{mcpywrap-0.2.1 → mcpywrap-0.2.2}/mcpywrap/builders/project_builder.py

@@ -127,9 +127,10 @@ class AddonProjectBuilder:
 
 class MapProjectBuilder:
     """项目构建器"""
-    def __init__(self, source_dir: str, target_dir: str):
+    def __init__(self, source_dir: str, target_dir: str, merge: bool = False):
         self.source_dir = source_dir
         self.target_dir = target_dir
+        self.merge = merge
         self.config = read_config(os.path.join(source_dir, CONFIG_FILE))
         self.project_name = self.config.get('project', {}).get('name', 'current_project')
         self.dependency_manager = DependencyManager()
@@ -189,11 +190,19 @@ class MapProjectBuilder:
         # 复制地图核心数据
         click.secho('📦 复制地图核心数据...', fg="yellow")
         source_map.copy_level_data_to(self.target_dir)
+
+        main_behavior_pack_dir = None
+        main_resource_pack_dir = None
         
         # 复制原始行为包和资源包
         click.secho('📦 复制地图行为包和资源包...', fg="yellow")
         source_map.copy_behavior_packs_to(self.target_dir)
         source_map.copy_resource_packs_to(self.target_dir)
+
+        if source_map.behavior_packs:
+            main_behavior_pack_dir = os.path.join(self.target_dir, "behavior_packs", os.path.basename(source_map.behavior_packs[0]))
+        if source_map.resource_packs:
+            main_resource_pack_dir = os.path.join(self.target_dir, "resource_packs", os.path.basename(source_map.resource_packs[0]))
         
         # 处理依赖
         dependencies = self.dependency_manager.get_all_dependencies()
@@ -219,10 +228,18 @@ class MapProjectBuilder:
                             click.secho(f" 📦 {dep_node.name}: {dep_addon.path}", fg="green")
                             # 合并到地图特定的包目录结构
                             # 避免重名
-                            rename_behavior = os.path.basename(dep_addon.behavior_pack_dir) + "_" + dep_addon.pkg_name if os.path.basename(dep_addon.behavior_pack_dir) == "behavior_pack" or os.path.basename(dep_addon.behavior_pack_dir) == "BehaviorPack" else None
-                            dep_addon.copy_behavior_to(target_map.behavior_packs_dir, rename=rename_behavior)
-                            rename_resource = os.path.basename(dep_addon.resource_pack_dir) + "_" + dep_addon.pkg_name if os.path.basename(dep_addon.resource_pack_dir) == "resource_pack" or os.path.basename(dep_addon.resource_pack_dir) == "ResourcePack" else None
-                            dep_addon.copy_resource_to(target_map.resource_packs_dir, rename=rename_resource)
+                            if self.merge and main_behavior_pack_dir:
+                                dep_addon.merge_behavior_into(main_behavior_pack_dir)
+                            else:
+                                rename_behavior = os.path.basename(dep_addon.behavior_pack_dir) + "_" + dep_addon.pkg_name if os.path.basename(dep_addon.behavior_pack_dir) == "behavior_pack" or os.path.basename(dep_addon.behavior_pack_dir) == "BehaviorPack" else None
+                                dep_addon.copy_behavior_to(target_map.behavior_packs_dir, rename=rename_behavior)
+                                main_behavior_pack_dir = os.path.join(target_map.behavior_packs_dir, rename_behavior if rename_behavior else os.path.basename(dep_addon.behavior_pack_dir))
+                            if self.merge and main_resource_pack_dir:
+                                dep_addon.merge_resource_into(main_resource_pack_dir)
+                            else:
+                                rename_resource = os.path.basename(dep_addon.resource_pack_dir) + "_" + dep_addon.pkg_name if os.path.basename(dep_addon.resource_pack_dir) == "resource_pack" or os.path.basename(dep_addon.resource_pack_dir) == "ResourcePack" else None
+                                dep_addon.copy_resource_to(target_map.resource_packs_dir, rename=rename_resource)
+                                main_resource_pack_dir = os.path.join(target_map.resource_packs_dir, rename_resource if rename_resource else os.path.basename(dep_addon.resource_pack_dir))
             else:
                 # 如果没有依赖树（异常情况），则按照扁平方式处理
                 click.secho(f"⚠️ 警告: 无法构建依赖树，将按扁平方式处理依赖", fg="yellow")

{mcpywrap-0.2.1 → mcpywrap-0.2.2}/mcpywrap/commands/build_cmd.py

@@ -11,7 +11,8 @@ from ..builders.project_builder import AddonProjectBuilder, MapProjectBuilder
 base_dir = os.getcwd()
 
 @click.command()
-def build_cmd():
+@click.option('--merge', '-m', is_flag=True, help='强制合并所有资源文件')
+def build_cmd(merge):
     """构建为 MCStudio 工程"""
     if not config_exists():
         click.secho('❌ 错误: 未找到配置文件。请先运行 `mcpywrap init` 初始化项目。', fg="red")
@@ -30,16 +31,17 @@ def build_cmd():
     target_dir = os.path.normpath(os.path.join(base_dir, target_dir))
 
     # 实际构建
-    build(base_dir, target_dir)
+    build(base_dir, target_dir, force_merge=merge)
 
     
-def build(source_dir, target_dir):
+def build(source_dir, target_dir, force_merge: bool = False):
     """
     执行项目构建
     
     Args:
         source_dir: 源代码目录
         target_dir: 目标目录
+        force_merge: 是否强制合并资源文件
         
     Returns:
         bool: 是否构建成功
@@ -55,7 +57,7 @@ def build(source_dir, target_dir):
         builder = AddonProjectBuilder(source_dir, target_dir)
         success, error = builder.build()
     elif project_type == "map":
-        builder = MapProjectBuilder(source_dir, target_dir)
+        builder = MapProjectBuilder(source_dir, target_dir, force_merge)
         success, error = builder.build()
     else:
         click.secho('❌ 暂未支持: 当前仅支持Addons和Map项目的构建', fg="red")

{mcpywrap-0.2.1 → mcpywrap-0.2.2}/mcpywrap.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap
-Version: 0.2.1
+Version: 0.2.2
 Summary: A wrapper for Minecraft China Edition Addons management
 Author-email: boybook <boybook@easecation.net>
 License: MIT

{mcpywrap-0.2.1 → mcpywrap-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcpywrap"
-version = "0.2.1"
+version = "0.2.2"
 description = "A wrapper for Minecraft China Edition Addons management"
 readme = "README.md"
 authors = [{name = "boybook", email = "boybook@easecation.net"}]