minecraft-datapack-language 15.1.89__py3-none-any.whl → 15.1.90__py3-none-any.whl

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.89'
-__version_tuple__ = version_tuple = (15, 1, 89)
+__version__ = version = '15.1.90'
+__version_tuple__ = version_tuple = (15, 1, 90)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -261,8 +261,8 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     for i, part in enumerate(parts):
         if i % 2 == 0:
             # Text part
-            if part:  # Add text component if not empty
-                components.append(f'{{"text":"{part}"}}')
+            if part.strip():  # Only add non-empty text parts
+                components.append(f'{{"text": "{part.strip()}"}}')
         else:
             # Variable part
             var_name = part
@@ -278,8 +278,12 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
                 # Simple variable: $variable$ - use server armor stand
                 components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
     
-    # Combine all components
-    components_str = ','.join(components)
+    for var_name in matches:
+        # Add score component for each variable
+        components.append(f'{{"score": {{"name": "@e[type=armor_stand,tag=mdl_server,limit=1]", "objective": "{var_name}"}}}}')
+    
+    # Join components and create tellraw command
+    components_str = ', '.join(components)
     return f'tellraw @a [{components_str}]'
 
 
@@ -643,7 +647,7 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     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, output_dir: Path = 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) -> List[str]:
     """Process while loops using scheduled functions."""
     if variable_scopes is None:
         variable_scopes = {}
@@ -661,7 +665,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, output_dir))
+        body_commands.extend(_process_statement(stmt, namespace, loop_body_func_name, i, is_tag_function, selector, variable_scopes, build_context))
     
     # Add the loop continuation command
     minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
@@ -669,9 +673,9 @@ def _process_while_loop_schedule(while_statement, namespace: str, function_name:
     
     # Write loop body function
     if body_commands:
-        # Use the output directory parameter
-        if output_dir:
-            func_dir = output_dir / "data" / namespace / "function"
+        # Use the output directory from build context
+        if hasattr(build_context, 'output_dir'):
+            func_dir = build_context.output_dir / "data" / namespace / "function"
         else:
             func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
@@ -736,7 +740,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(), None)
+                        commands = _process_statement(statement, namespace_name, function_name, i, False, "@s", {}, BuildContext())
                         function.commands.extend(commands)
                     except Exception as e:
                         # If processing fails, try to add as simple command

{minecraft_datapack_language-15.1.89.dist-info → minecraft_datapack_language-15.1.90.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.89
+Version: 15.1.90
 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.dist-info → minecraft_datapack_language-15.1.90.dist-info}/RECORD

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=ObDGX9vqgStavy3kxAxz1JvfSrbCphoqcEjTATobpMs,708
+minecraft_datapack_language/_version.py,sha256=yOpzMLbfnlKEce2HqQmpEoDiWCl7A90X3NSpFtT_TDs,708
 minecraft_datapack_language/ast_nodes.py,sha256=pgjI2Nlap3ixFPgWqGSkqncG9zB91h5BKgRjtcJqMew,2118
 minecraft_datapack_language/cli.py,sha256=p5A_tEEXugN2NhQFbbgfwi4FxbWYD91RWeKR_A3Vuec,6263
-minecraft_datapack_language/cli_build.py,sha256=Ac4KcP0DQrmyJNVvcWa5C3lJiKNYcKJBSrUyyu8_joQ,41928
+minecraft_datapack_language/cli_build.py,sha256=XDVazfKVMC_3Bb4yGESZ-ApOD4Im4HMuOXXovvuK7v4,42180
 minecraft_datapack_language/cli_check.py,sha256=bPq9gHsxQ1CIiftkrAtRCifWkVAyjp5c8Oay2NNQ1qs,6277
 minecraft_datapack_language/cli_help.py,sha256=jUTHUQBONAZKVTdQK9tNPXq4c_6xpsafNOvHDjkEldg,12243
 minecraft_datapack_language/cli_new.py,sha256=uaKH0VBC43XBt_Hztc35-BfC9bYlsDdLbAfe_42rrtI,8235
@@ -16,9 +16,9 @@ minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYa
 minecraft_datapack_language/mdl_parser_js.py,sha256=4VMWx6O7A10afTzjGnnwL_Sh52osIO84ObqHp8KoDZw,38677
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.1.89.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.89.dist-info/METADATA,sha256=MbIGaFhie0yThP2slKqSU_DXrRaodp-FIxCWYEYf6F8,35230
-minecraft_datapack_language-15.1.89.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.89.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.89.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.89.dist-info/RECORD,,
+minecraft_datapack_language-15.1.90.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.90.dist-info/METADATA,sha256=ZHZk2YphCsjnc3R1VmKHiMFTmGdV_184hC-YKhEY9yw,35230
+minecraft_datapack_language-15.1.90.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.90.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.90.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.90.dist-info/RECORD,,