mcpywrap 0.2.2__tar.gz → 0.2.3__tar.gz

mcpywrap-0.2.3/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 EaseCation®️
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mcpywrap
-Version: 0.2.2
+Version: 0.2.3
 Summary: A wrapper for Minecraft China Edition Addons management
 Author-email: boybook <boybook@easecation.net>
 License: MIT
@@ -11,8 +11,8 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: click>=8.0.0
-Requires-Dist: 3to2>=1.1.1
 Requires-Dist: watchdog>=2.0.0
 Requires-Dist: twine>=3.4.0
 Requires-Dist: tomli
@@ -21,6 +21,7 @@ Requires-Dist: setuptools
 Requires-Dist: PyQt5>=5.15.0
 Requires-Dist: psutil>=5.8.0
 Requires-Dist: rich>=10.0.0
+Dynamic: license-file
 
 # 🧰 mcpywrap 
 
@@ -34,7 +35,7 @@ mcpywrap 是基于 Python 生态的《我的世界》中国版 ModSDK/资源包
 ## 🌟 核心特性
 
 - 🧩 **模块化开发** - 基于 Addons 维度的依赖管理（基于包管理和依赖的开发与测试流程）
-- 🔄 **语法无忧** - 开发阶段支持 Python3 语法，构建时自动转换为 Python2
+- 🔄 **现代语法** - 支持 Python3 现代语法特性，提升开发体验
 - 📦 **生态兼容** - 无缝对接 PyPI 生态，支持标准 `pyproject.toml` 配置
 - 🚀 **智能构建** - 一键打包符合 MCStudio 规范的成品 Addons
 - 🔥 **热重载开发** - 实时监控代码变更，支持 MCStudio 热更新
@@ -44,7 +45,7 @@ mcpywrap 是基于 Python 生态的《我的世界》中国版 ModSDK/资源包
 ### 传统开发痛点
 - 📜 **代码复用困难** - 通过 **文件拷贝** 导致版本管理混乱
 - 🚧 **协作效率低下** - 多项目 **重复代码** 维护成本高
-- ⚠️ **语法限制** - 中国版仅支持 Python2，缺乏现代语法支持
+- ⚠️ **代码质量** - 缺乏现代开发工具和语法支持
 
 ### mcpywrap 解决方案
 1. **标准化开发**  

{mcpywrap-0.2.2 → mcpywrap-0.2.3}/README.md

@@ -10,7 +10,7 @@ mcpywrap 是基于 Python 生态的《我的世界》中国版 ModSDK/资源包
 ## 🌟 核心特性
 
 - 🧩 **模块化开发** - 基于 Addons 维度的依赖管理（基于包管理和依赖的开发与测试流程）
-- 🔄 **语法无忧** - 开发阶段支持 Python3 语法，构建时自动转换为 Python2
+- 🔄 **现代语法** - 支持 Python3 现代语法特性，提升开发体验
 - 📦 **生态兼容** - 无缝对接 PyPI 生态，支持标准 `pyproject.toml` 配置
 - 🚀 **智能构建** - 一键打包符合 MCStudio 规范的成品 Addons
 - 🔥 **热重载开发** - 实时监控代码变更，支持 MCStudio 热更新
@@ -20,7 +20,7 @@ mcpywrap 是基于 Python 生态的《我的世界》中国版 ModSDK/资源包
 ### 传统开发痛点
 - 📜 **代码复用困难** - 通过 **文件拷贝** 导致版本管理混乱
 - 🚧 **协作效率低下** - 多项目 **重复代码** 维护成本高
-- ⚠️ **语法限制** - 中国版仅支持 Python2，缺乏现代语法支持
+- ⚠️ **代码质量** - 缺乏现代开发工具和语法支持
 
 ### mcpywrap 解决方案
 1. **标准化开发**  

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

@@ -8,11 +8,10 @@ import shutil
 import click
 from typing import Dict, List, Tuple, Optional
 
-from ..config import read_config, CONFIG_FILE, get_use_3to2
+from ..config import read_config, CONFIG_FILE
 from .AddonsPack import AddonsPack
 from .MapPack import MapPack
 from .dependency_manager import DependencyManager, DependencyNode
-from ..utils.py3to2_util import py3_to_2
 from ..utils.utils import run_command
 
 
@@ -115,12 +114,6 @@ class AddonProjectBuilder:
                     dep_addon.merge_behavior_into(self.target_addon.behavior_pack_dir)
                     dep_addon.merge_resource_into(self.target_addon.resource_pack_dir)
         
-        # 转换Python文件(如果需要)
-        if get_use_3to2():
-            click.secho("🔄 将Python 3代码转换为Python 2...", fg="yellow")
-            success, output = _convert_project_py3_to_py2(self.target_dir)
-            if not success:
-                return False, output
         
         return True, None
     
@@ -260,15 +253,6 @@ class MapProjectBuilder:
         if resource_packs_config:
             click.secho(f"✅ 配置了 {len(resource_packs_config)} 个资源包", fg="green")
         
-        # 转换Python文件(如果需要)
-        if get_use_3to2():
-            click.secho("🔄 将Python 3代码转换为Python 2...", fg="yellow")
-            # 注意：这里我们需要转换地图中的行为包目录
-            behavior_packs_dir = os.path.join(self.target_dir, "behavior_packs")
-            if os.path.exists(behavior_packs_dir):
-                success, output = _convert_project_py3_to_py2(behavior_packs_dir)
-                if not success:
-                    return False, output
         
         return True, None
 
@@ -321,26 +305,3 @@ def _get_ordered_dependencies(root_node: DependencyNode) -> List[List[Dependency
     levels.reverse()
     return levels
 
-def _convert_project_py3_to_py2(directory):
-    """将整个项目中的Python文件转换为Python 2"""
-    try:
-        # 首先尝试使用直接的Python API调用
-        from lib3to2.main import main
-        # main函数接受包名和参数列表
-        # 第一个参数是包名 'lib3to2' (这是3to2所有修复器的位置)
-        # 第二个参数是命令行参数列表
-        exit_code = main('lib3to2.fixes', ['-w', '-n', '-j', '4', '--no-diffs', directory, '--nofix=metaclass'])
-        
-        return exit_code == 0, "转换完成" if exit_code == 0 else f"转换失败，错误代码: {exit_code}"
-    except Exception as e:
-        # 如果直接调用失败，则尝试命令行方式（作为备选）
-        try:
-            # 方法1：直接命令行调用
-            success, output = run_command(["3to2", "-w", "-n", directory])
-            if not success:
-                # 方法2：使用shell=True参数
-                success, output = run_command(["3to2", "-w", "-n", directory], shell=True)
-
-            return success, output
-        except Exception as cmd_e:
-            return False, f"Python API调用失败: {str(e)}\n命令行调用也失败: {str(cmd_e)}"

mcpywrap-0.2.3/mcpywrap/commands/add_cmd.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+"""
+安装依赖命令模块
+"""
+import click
+import subprocess
+import sys
+from ..config import config_exists, add_dependency, get_project_dependencies
+from ..utils.pip_error_parser import display_pip_error, suggest_common_fixes
+
+@click.command()
+@click.argument('package', required=True)
+def add_cmd(package):
+    """安装依赖并添加到项目配置中"""
+    # 检查项目是否已初始化
+    if not config_exists():
+        click.echo(click.style('❌ 项目尚未初始化，请先运行 mcpy init', fg='red', bold=True))
+        return
+    
+    # 检查依赖是否已存在
+    dependencies = get_project_dependencies()
+    
+    if package in dependencies:
+        click.echo(click.style(f'ℹ️  依赖 {package} 已存在于项目配置中', fg='blue'))
+    else:
+        # 添加依赖到配置
+        if add_dependency(package):
+            click.echo(click.style(f'✅ 依赖 {package} 已添加到项目配置', fg='green'))
+        else:
+            click.echo(click.style(f'❌ 添加依赖 {package} 失败', fg='red'))
+    
+    # 实际安装依赖
+    click.echo(click.style(f'📦 正在安装 {package}...', fg='cyan'))
+    
+    try:
+        # 捕获pip输出以便进行错误分析
+        result = subprocess.run(
+            [sys.executable, '-m', 'pip', 'install', package],
+            capture_output=True,
+            text=True,
+            encoding='utf-8',
+            check=True
+        )
+        click.echo(click.style(f'✅ {package} 安装成功！', fg='green', bold=True))
+    except subprocess.CalledProcessError as e:
+        click.echo(click.style(f'❌ 依赖包 {package} 安装失败', fg='red', bold=True))
+        
+        # 显示友好的错误信息
+        error_output = e.stderr if e.stderr else e.stdout
+        display_pip_error(error_output, show_raw_output=False)
+        
+        # 询问是否显示详细错误信息
+        if click.confirm(click.style("❓ 是否查看详细错误信息以便调试？", fg="magenta"), default=False):
+            click.echo()
+            click.echo(click.style("📋 完整错误输出:", fg='cyan', bold=True))
+            click.echo(click.style("-" * 40, fg='cyan'))
+            if e.stderr:
+                click.echo("STDERR:")
+                click.echo(e.stderr)
+            if e.stdout:
+                click.echo("STDOUT:")
+                click.echo(e.stdout)
+            click.echo(click.style("-" * 40, fg='cyan'))
+        
+        # 显示通用解决建议
+        suggest_common_fixes()
+        
+        click.echo(click.style(f'💡 您可以尝试手动运行: pip install {package}', fg='yellow'))

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

@@ -4,7 +4,7 @@
 """
 import os
 import click
-from ..config import config_exists, get_mcpywrap_config, get_project_type
+from ..config import config_exists, get_mcpywrap_config, get_project_type, ensure_map_setuptools_sync
 from ..builders.project_builder import AddonProjectBuilder, MapProjectBuilder
 
 
@@ -18,6 +18,9 @@ def build_cmd(merge):
         click.secho('❌ 错误: 未找到配置文件。请先运行 `mcpywrap init` 初始化项目。', fg="red")
         return False
     
+    # 确保 map 项目的 setuptools 配置同步
+    ensure_map_setuptools_sync(interactive=True)
+    
     # 获取mcpywrap特定配置
     mcpywrap_config = get_mcpywrap_config()
     

{mcpywrap-0.2.2 → mcpywrap-0.2.3}/mcpywrap/commands/default_cmd.py

@@ -2,7 +2,7 @@
 
 import click
 import os
-from ..config import update_config, config_exists, read_config, get_project_type
+from ..config import update_config, config_exists, read_config, get_project_type, ensure_map_setuptools_sync
 from .init_cmd import init as init_project
 from ..minecraft.netease_modsdk import check_installed_modsdk, get_available_versions, download_and_install_package
 from ..utils.project_setup import find_and_configure_behavior_pack, install_project_dev_mode
@@ -26,6 +26,9 @@ def default_cmd():
     else:
         click.echo(click.style('🔄 正在刷新项目...', fg='blue'))
 
+        # 确保 map 项目的 setuptools 配置同步
+        ensure_map_setuptools_sync(interactive=True)
+
         # 加载现有配置
         config = read_config()
         project_type = get_project_type()

{mcpywrap-0.2.2 → mcpywrap-0.2.3}/mcpywrap/commands/dev_cmd.py

@@ -6,7 +6,7 @@
 import os
 import time
 import click
-from ..config import get_mcpywrap_config, config_exists, read_config, get_project_type, CONFIG_FILE
+from ..config import get_mcpywrap_config, config_exists, read_config, get_project_type, CONFIG_FILE, ensure_map_setuptools_sync
 from ..builders.watcher import ProjectWatcher
 from .build_cmd import build
 
@@ -31,6 +31,9 @@ def dev_cmd():
         click.secho('❌ 错误: 未找到配置文件。请先运行 `mcpywrap init` 初始化项目。', fg="red")
         return False
     
+    # 确保 map 项目的 setuptools 配置同步
+    ensure_map_setuptools_sync(interactive=True)
+    
     # 获取mcpywrap特定配置
     mcpywrap_config = get_mcpywrap_config()
 

{mcpywrap-0.2.2 → mcpywrap-0.2.3}/mcpywrap/commands/init_cmd.py

@@ -28,6 +28,7 @@ from ..utils.project_setup import (
     get_default_author, get_default_email, get_default_project_name, find_behavior_pack_dir,
     update_behavior_pack_config, install_project_dev_mode
 )
+from ..config import update_map_setuptools_config
 from ..minecraft.template.mod_template import open_ui_crate_mod
 
 # 创建控制台对象
@@ -228,20 +229,7 @@ def init():
     else:
         console.print("[dim]未添加任何依赖项[/]")
     
-    # 询问是否使用3to2转换
-    use_3to2 = Confirm.ask(
-        "[magenta]❓ 是否使用3to2自动将Python 3代码转换为Python 2？[/]", 
-        default=False, 
-        console=console
-    )
-    
-    if use_3to2:
-        console.print("[green]✅ 已启用3to2转换[/]")
-    else:
-        console.print("[yellow]ℹ️ 已禁用3to2转换[/]")
-    
     project_info['dependencies'] = dependencies
-    project_info['use_3to2'] = use_3to2
 
     # 第4阶段：项目类型检测
     current_stage += 1
@@ -450,16 +438,14 @@ def init():
             'readme': "README.md",
             'requires-python': python_requires,
             'dependencies': dependencies,
-            'license': {'text': license_name},
+            'license': license_name,
             'classifiers': [
-                f"License :: OSI Approved :: {license_name} License",
                 "Programming Language :: Python",
                 "Programming Language :: Python :: 3",
             ]
         },
         'tool': {
             'mcpywrap': {
-                'use_3to2': use_3to2,
                 'project_type': project_type
             }
         }
@@ -476,10 +462,19 @@ def init():
     if project_url:
         config['project']['urls'] = {'Homepage': project_url}
     
-    # 如果是addon类型，更新行为包配置
+    # 根据项目类型配置 setuptools
     if project_type == "addon" and behavior_pack_dir:
         rel_path = update_behavior_pack_config(config, base_dir, behavior_pack_dir, target_dir)
         console.print(f"[green]📦 已配置自动包发现于: [bold white]{rel_path}[/][/]")
+    elif project_type == "map":
+        # 为 map 项目添加基本的 setuptools 配置，排除地图目录
+        config.setdefault('tool', {})['setuptools'] = {
+            'packages': {
+                'find': {
+                    'exclude': ["behavior_packs*", "resource_packs*", "db*"]
+                }
+            }
+        }
     
     # 创建.gitignore文件
     if Confirm.ask(
@@ -566,6 +561,11 @@ work.mcscfg
         install_project_dev_mode()
         install_progress.update(install_task, completed=1)
     
+    # 为 map 项目自动扫描和配置 behavior_packs
+    if project_type == "map":
+        console.print("\n[cyan]🔍 扫描 behavior_packs 目录...[/]")
+        update_map_setuptools_config(interactive=False)
+    
     # 总结
     console.print(Panel.fit(
         f"[bold green]✅ 初始化完成！[/]\n\n"

mcpywrap-0.2.3/mcpywrap/commands/remove_cmd.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+"""
+删除依赖命令模块
+"""
+import click
+import subprocess
+import sys
+from ..config import config_exists, remove_dependency, get_project_dependencies
+from ..utils.pip_error_parser import display_pip_error, suggest_common_fixes
+
+@click.command()
+@click.argument('package', required=True)
+@click.option('--uninstall', '-u', is_flag=True, help='同时卸载依赖包')
+def remove_cmd(package, uninstall):
+    """从项目配置中删除依赖并可选择卸载"""
+    # 检查项目是否已初始化
+    if not config_exists():
+        click.echo(click.style('❌ 项目尚未初始化，请先运行 mcpy init', fg='red', bold=True))
+        return
+    
+    # 检查依赖是否存在
+    dependencies = get_project_dependencies()
+    
+    if package not in dependencies:
+        click.echo(click.style(f'❌ 依赖 {package} 不存在于项目配置中', fg='red'))
+        return
+        
+    # 从配置中删除依赖
+    if remove_dependency(package):
+        click.echo(click.style(f'✅ 依赖 {package} 已从项目配置中移除', fg='green'))
+    else:
+        click.echo(click.style(f'❌ 移除依赖 {package} 失败', fg='red'))
+        return
+    
+    # 如果指定了卸载选项，则卸载包
+    if uninstall:
+        click.echo(click.style(f'🗑️  正在卸载 {package}...', fg='cyan'))
+        try:
+            # 捕获pip输出以便进行错误分析
+            result = subprocess.run(
+                [sys.executable, '-m', 'pip', 'uninstall', '-y', package],
+                capture_output=True,
+                text=True,
+                encoding='utf-8',
+                check=True
+            )
+            click.echo(click.style(f'✅ {package} 卸载成功！', fg='green', bold=True))
+        except subprocess.CalledProcessError as e:
+            click.echo(click.style(f'❌ 依赖包 {package} 卸载失败', fg='red', bold=True))
+            
+            # 显示友好的错误信息
+            error_output = e.stderr if e.stderr else e.stdout
+            display_pip_error(error_output, show_raw_output=False)
+            
+            # 询问是否显示详细错误信息
+            if click.confirm(click.style("❓ 是否查看详细错误信息以便调试？", fg="magenta"), default=False):
+                click.echo()
+                click.echo(click.style("📋 完整错误输出:", fg='cyan', bold=True))
+                click.echo(click.style("-" * 40, fg='cyan'))
+                if e.stderr:
+                    click.echo("STDERR:")
+                    click.echo(e.stderr)
+                if e.stdout:
+                    click.echo("STDOUT:")
+                    click.echo(e.stdout)
+                click.echo(click.style("-" * 40, fg='cyan'))
+            
+            click.echo(click.style(f'💡 您可以尝试手动运行: pip uninstall {package}', fg='yellow'))

{mcpywrap-0.2.2 → mcpywrap-0.2.3}/mcpywrap/commands/run_cmd.py

@@ -13,7 +13,7 @@ from datetime import datetime
 
 from ..builders import DependencyManager
 from ..builders.MapPack import MapPack
-from ..config import config_exists, read_config, get_project_dependencies, get_project_type, get_project_name
+from ..config import config_exists, read_config, get_project_dependencies, get_project_type, get_project_name, ensure_map_setuptools_sync
 from ..builders.AddonsPack import AddonsPack
 from ..mcstudio.game import open_game, open_safaia
 from ..mcstudio.mcs import get_mcs_download_path, get_mcs_game_engine_dirs, get_mcs_game_engine_data_path, is_windows
@@ -369,6 +369,9 @@ def run_cmd(new, list, delete, force, clean_all, instance_prefix):
         console.print("❌ 项目尚未初始化，请先运行 mcpy init", style="red bold")
         return
 
+    # 确保 map 项目的 setuptools 配置同步
+    ensure_map_setuptools_sync(interactive=True)
+
     project_name = get_project_name()
     
     # 创建运行时配置目录