Resolve merge conflict in minecode/server.py and complete merges

Author: AnCarsenat

minecode/server.py

@@ -700,6 +700,24 @@ def _get_version_description(pack_format: int) -> str:
             },
             "required": ["action"]
         }
+    ),
+    Tool(
+        name="validate_function",
+        description="Validate a Minecraft function file (.mcfunction) using Spyglass API to check command syntax correctness.",
+        inputSchema={
+            "type": "object",
+            "properties": {
+                "function_path": {
+                    "type": "string",
+                    "description": "Path to the .mcfunction file to validate"
+                },
+                "version": {
+                    "type": "string",
+                    "description": "Minecraft version to validate against (e.g., '1.21', '1.20.4')"
+                }
+            },
+            "required": ["function_path", "version"]
+        }
     )
 ]
 
@@ -1247,6 +1265,7 @@ def handle_misode_get_recipes(version: str, recipe_type: str = "all", search: st
         return {"success": False, "error": str(e)}
 
 
+<<<<<<< HEAD
 def get_minecraft_directory(minecraft_dir: str = None) -> Path:
     """Get the Minecraft directory path based on OS"""
     if minecraft_dir:
@@ -1632,6 +1651,105 @@ def handle_launcher_clear_minecraft_logs(launcher_type: str, instance_name: str)
             "error": f"Error clearing logs: {str(e)}",
             "launcher_type": launcher_type,
             "instance_name": instance_name
+=======
+def handle_validate_function(function_path: str, version: str) -> dict:
+    """
+    Validate a Minecraft function file using Spyglass API.
+    
+    Reads the .mcfunction file and validates each command against
+    the command syntax tree from Spyglass API.
+    """
+    import os
+    
+    try:
+        # Check if file exists
+        if not os.path.exists(function_path):
+            return {
+                "success": False,
+                "error": f"File not found: {function_path}"
+            }
+        
+        # Check if file has correct extension
+        if not function_path.endswith('.mcfunction'):
+            return {
+                "success": False,
+                "error": "File must have .mcfunction extension"
+            }
+        
+        # Read the function file
+        with open(function_path, 'r', encoding='utf-8') as f:
+            lines = f.readlines()
+        
+        # Get available commands from Spyglass
+        try:
+            available_commands = spyglass.get_command_names(version)
+        except Exception as e:
+            return {
+                "success": False,
+                "error": f"Failed to fetch command data from Spyglass API: {str(e)}"
+            }
+        
+        # Validate each line
+        errors = []
+        warnings = []
+        valid_commands = []
+        
+        for line_num, line in enumerate(lines, 1):
+            # Strip whitespace and check if line is empty or comment
+            stripped = line.strip()
+            
+            if not stripped or stripped.startswith('#'):
+                # Comments and empty lines are valid
+                continue
+            
+            # Extract the command (first word)
+            parts = stripped.split()
+            if not parts:
+                continue
+            
+            command_name = parts[0].lstrip('/')
+            
+            # Check if command exists in the version
+            if command_name not in available_commands:
+                errors.append({
+                    "line": line_num,
+                    "content": stripped,
+                    "type": "unknown_command",
+                    "message": f"Unknown command: '{command_name}'"
+                })
+            else:
+                # Command exists - basic validation passed
+                valid_commands.append({
+                    "line": line_num,
+                    "command": command_name,
+                    "content": stripped
+                })
+        
+        # Build result
+        result = {
+            "success": True,
+            "file": function_path,
+            "version": version,
+            "total_lines": len(lines),
+            "validated_commands": len(valid_commands),
+            "errors": errors,
+            "warnings": warnings,
+            "is_valid": len(errors) == 0
+        }
+        
+        # Add summary message
+        if len(errors) == 0:
+            result["message"] = f"✓ All {len(valid_commands)} commands are valid for Minecraft {version}"
+        else:
+            result["message"] = f"✗ Found {len(errors)} error(s) in function file"
+        
+        return result
+        
+    except Exception as e:
+        return {
+            "success": False,
+            "error": f"Error validating function: {str(e)}"
+>>>>>>> copilot/add-validate-function-command
         }
 
 
@@ -1729,6 +1847,7 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
                 recipe_type=arguments.get("recipe_type", "all"),
                 search=arguments.get("search")
             )
+<<<<<<< HEAD
         # Minecraft logs tools
         elif name == "get_minecraft_logs":
             result = handle_get_minecraft_logs(
@@ -1760,6 +1879,12 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
             result = handle_launcher_clear_minecraft_logs(
                 launcher_type=arguments["launcher_type"],
                 instance_name=arguments["instance_name"]
+=======
+        elif name == "validate_function":
+            result = handle_validate_function(
+                function_path=arguments["function_path"],
+                version=arguments["version"]
+>>>>>>> copilot/add-validate-function-command
             )
         else:
             raise ValueError(f"Unknown tool: {name}")

readme.md

@@ -15,7 +15,7 @@ MineCode is a [Model Context Protocol (MCP)](https://modelcontextprotocol.io/) s
 - 🔧 **21 MCP Tools** for Minecraft development
 - 📚 **Minecraft Wiki** integration (search, pages, categories)
 - 🐛 **Mojira** bug tracker search
-- 🔍 **Spyglass API** (registries, commands, block states)
+- 🔍 **Spyglass API** (registries, commands, block states, function validation)
 - 🎨 **Misode Generators** (loot tables, recipes, worldgen presets)
 - 📋 **Minecraft Logs** management (read and clear logs for troubleshooting)
 
@@ -105,6 +105,7 @@ Add to `claude_desktop_config.json`:
 | `spyglass_get_registries` | Get registry entries (items, blocks, entities) |
 | `spyglass_get_block_states` | Get block state properties |
 | `spyglass_get_commands` | Get command syntax trees |
+| `validate_function` | Validate function file syntax using Spyglass |
 
 ### Misode Generators
 | Tool | Description |