minecraft-datapack-language 15.1.87__tar.gz → 15.1.89__tar.gz

{minecraft_datapack_language-15.1.87/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.1.89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.87
+Version: 15.1.89
 Summary: Compile JavaScript-style MDL language or Python API into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

minecraft_datapack_language-15.1.89/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.1.88"
+tag: "v15.1.88"
+updated_at: "2025-09-01T23:40:58Z"

{minecraft_datapack_language-15.1.87 → minecraft_datapack_language-15.1.89}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.1.87'
-__version_tuple__ = version_tuple = (15, 1, 87)
+__version__ = version = '15.1.89'
+__version_tuple__ = version_tuple = (15, 1, 89)
 
-__commit_id__ = commit_id = 'gd723b3ddc'
+__commit_id__ = commit_id = 'g3f9bd624e'

{minecraft_datapack_language-15.1.87 → minecraft_datapack_language-15.1.89}/minecraft_datapack_language/cli_build.py

@@ -283,7 +283,7 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     return f'tellraw @a [{components_str}]'
 
 
-def _process_statement(statement: Any, namespace: str, function_name: str, statement_index: int = 0, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:
+def _process_statement(statement: Any, namespace: str, function_name: str, statement_index: int = 0, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None, output_dir: Path = None) -> List[str]:
     """Process a single statement and return Minecraft commands."""
     if variable_scopes is None:
         variable_scopes = {}
@@ -384,13 +384,13 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         # Create conditional function
         if_commands = []
         for i, stmt in enumerate(then_body):
-            if_commands.extend(_process_statement(stmt, namespace, if_func_name, i, is_tag_function, selector, variable_scopes, build_context))
+            if_commands.extend(_process_statement(stmt, namespace, if_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
         
         # Write conditional function
         if if_commands:
-            # Use the output directory from build context
-            if hasattr(build_context, 'output_dir'):
-                if_dir = build_context.output_dir / "data" / namespace / "function"
+            # Use the output directory parameter
+            if output_dir:
+                if_dir = output_dir / "data" / namespace / "function"
             else:
                 if_dir = Path(f"data/{namespace}/function")
             ensure_dir(str(if_dir))
@@ -401,7 +401,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         if else_body:
             else_commands = []
             for i, stmt in enumerate(else_body):
-                else_commands.extend(_process_statement(stmt, namespace, else_func_name, i, is_tag_function, selector, variable_scopes, build_context))
+                else_commands.extend(_process_statement(stmt, namespace, else_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
             
             if else_commands:
                 with open(if_dir / f"{else_func_name}.mcfunction", 'w', encoding='utf-8') as f:
@@ -418,7 +418,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
     
     elif statement['type'] == 'while_loop' or statement['type'] == 'while_statement':
         # Handle while loops using recursion
-        loop_commands = _process_while_loop_recursion(statement, namespace, function_name, statement_index, is_tag_function, selector, variable_scopes, build_context)
+        loop_commands = _process_while_loop_recursion(statement, namespace, function_name, statement_index, is_tag_function, selector, variable_scopes, build_context, output_dir)
         commands.extend(loop_commands)
     
     elif statement['type'] == 'function_call':
@@ -464,7 +464,7 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         for i, statement in enumerate(func_body):
             try:
                 print(f"DEBUG: Processing statement {i} of type {statement.get('type', 'unknown')}: {statement}")
-                commands = _process_statement(statement, namespace, func_name, i, False, "@s", {}, build_context)
+                commands = _process_statement(statement, namespace, func_name, i, False, "@s", {}, build_context, output_dir)
                 function_commands.extend(commands)
                 print(f"Generated {len(commands)} commands for statement {i} in function {func_name}: {commands}")
             except Exception as e:
@@ -605,7 +605,7 @@ def _collect_conditional_functions(if_statement, namespace: str, function_name:
     return conditional_functions
 
 
-def _process_while_loop_recursion(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:
+def _process_while_loop_recursion(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None, output_dir: Path = None) -> List[str]:
     """Process while loops using recursive function calls."""
     if variable_scopes is None:
         variable_scopes = {}
@@ -616,44 +616,34 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     condition = while_statement['condition']
     body = while_statement['body']
     
-    print(f"DEBUG: _process_while_loop_recursion called with namespace={namespace}, function_name={function_name}, statement_index={statement_index}")
-    
     # Generate unique function names - they should be the same according to the test
     loop_func_name = f"test_{function_name}_while_{statement_index}"
     
-    print(f"DEBUG: Generated function name: loop_func_name={loop_func_name}")
-    
     # Process loop body
     body_commands = []
     for i, stmt in enumerate(body):
-        body_commands.extend(_process_statement(stmt, namespace, loop_func_name, i, is_tag_function, selector, variable_scopes, build_context))
-    
-    print(f"DEBUG: Generated body_commands: {body_commands}")
+        body_commands.extend(_process_statement(stmt, namespace, loop_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
     
     # Add the recursive call to the loop body
     minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
     body_commands.append(f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}")
     
-    print(f"DEBUG: Final body_commands with recursive call: {body_commands}")
-    
     # Write the single loop function
     if body_commands:
-        # Use the output directory from build context
-        if hasattr(build_context, 'output_dir'):
-            func_dir = build_context.output_dir / "data" / namespace / "function"
+        # Use the output directory parameter
+        if output_dir:
+            func_dir = output_dir / "data" / namespace / "function"
         else:
             func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
-        print(f"DEBUG: Writing loop function to: {func_dir / f'{loop_func_name}.mcfunction'}")
         with open(func_dir / f"{loop_func_name}.mcfunction", 'w', encoding='utf-8') as f:
             f.write('\n'.join(body_commands))
-        print(f"DEBUG: Successfully wrote loop function file")
     
     # Return the command to start the loop with conditional execution
     return [f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}"]
 
 
-def _process_while_loop_schedule(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:
+def _process_while_loop_schedule(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None, output_dir: Path = None) -> List[str]:
     """Process while loops using scheduled functions."""
     if variable_scopes is None:
         variable_scopes = {}
@@ -671,7 +661,7 @@ def _process_while_loop_schedule(while_statement, namespace: str, function_name:
     # Process loop body
     body_commands = []
     for i, stmt in enumerate(body):
-        body_commands.extend(_process_statement(stmt, namespace, loop_body_func_name, i, is_tag_function, selector, variable_scopes, build_context))
+        body_commands.extend(_process_statement(stmt, namespace, loop_body_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
     
     # Add the loop continuation command
     minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
@@ -679,9 +669,9 @@ def _process_while_loop_schedule(while_statement, namespace: str, function_name:
     
     # Write loop body function
     if body_commands:
-        # Use the output directory from build context
-        if hasattr(build_context, 'output_dir'):
-            func_dir = build_context.output_dir / "data" / namespace / "function"
+        # Use the output directory parameter
+        if output_dir:
+            func_dir = output_dir / "data" / namespace / "function"
         else:
             func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
@@ -746,7 +736,7 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                 for i, statement in enumerate(func['body']):
                     try:
                         # Use the same processing logic as the build system
-                        commands = _process_statement(statement, namespace_name, function_name, i, False, "@s", {}, BuildContext())
+                        commands = _process_statement(statement, namespace_name, function_name, i, False, "@s", {}, BuildContext(), None)
                         function.commands.extend(commands)
                     except Exception as e:
                         # If processing fails, try to add as simple command

{minecraft_datapack_language-15.1.87 → minecraft_datapack_language-15.1.89/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.87
+Version: 15.1.89
 Summary: Compile JavaScript-style MDL language or Python API into a Minecraft datapack (1.21+ ready). Features variables, control flow, error handling, and VS Code extension.
 Project-URL: Homepage, https://www.mcmdl.com
 Project-URL: Documentation, https://www.mcmdl.com/docs

{minecraft_datapack_language-15.1.87 → minecraft_datapack_language-15.1.89}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ test_verbose.zip
 test_while_debug.mdl
 test_while_debug.zip
 test_while_debug_final.zip
+test_while_debug_final2.zip
 test_while_debug_output.zip
 test_while_debug_output2.zip
 ./minecraft_datapack_language/__init__.py
@@ -750,6 +751,10 @@ test_while_debug_final/pack.mcmeta
 test_while_debug_final/data/minecraft/tags/function/load.json
 test_while_debug_final/data/test/function/load.mcfunction
 test_while_debug_final/data/test/function/main.mcfunction
+test_while_debug_final2/pack.mcmeta
+test_while_debug_final2/data/minecraft/tags/function/load.json
+test_while_debug_final2/data/test/function/load.mcfunction
+test_while_debug_final2/data/test/function/main.mcfunction
 test_while_debug_output/pack.mcmeta
 test_while_debug_output/data/minecraft/tags/function/load.json
 test_while_debug_output/data/test/function/load.mcfunction

minecraft_datapack_language-15.1.89/test_while_debug_output2/data/minecraft/tags/function/load.json

@@ -0,0 +1,7 @@
+{
+  "values": [
+    "test:load",
+    "test:main",
+    "While Test:load"
+  ]
+}

minecraft_datapack_language-15.1.89/test_while_debug_output2/data/test/function/load.mcfunction

@@ -0,0 +1,2 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+scoreboard objectives add counter dummy

minecraft_datapack_language-15.1.89/test_while_debug_output2/data/test/function/main.mcfunction

@@ -0,0 +1,2 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] counter matches ..2 run function test:test_main_while_0

minecraft_datapack_language-15.1.89/test_while_debug_output2/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Testing while loops"
+  }
+}

minecraft_datapack_language-15.1.87/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.1.86"
-tag: "v15.1.86"
-updated_at: "2025-09-01T23:37:51Z"