minecraft-datapack-language 15.4.16__py3-none-any.whl → 15.4.17__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.4.16'
-__version_tuple__ = version_tuple = (15, 4, 16)
+__version__ = version = '15.4.17'
+__version_tuple__ = version_tuple = (15, 4, 17)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -402,7 +402,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         else_body = statement.get('else_body', [])
         
         # Convert condition to Minecraft syntax
-        minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
+        minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector, variable_scopes)
         
         # Generate unique function names for conditional blocks
         if_func_name = f"{function_name}_if_{statement_index}"
@@ -705,7 +705,7 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
         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)
+    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector, variable_scopes)
     body_commands.append(f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}")
     
     # Write the single loop function
@@ -744,7 +744,7 @@ def _process_while_loop_schedule(while_statement, namespace: str, function_name:
         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)
+    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector, variable_scopes)
     body_commands.append(f"execute {minecraft_condition} run schedule function {namespace}:{loop_body_func_name} 1t")
     
     # Write loop body function

minecraft_datapack_language/cli_help.py

@@ -295,10 +295,10 @@ def show_check_help():
     print(color.info("  Error 1: MDLSyntaxError in test.mdl:15:8"))
     print(color.info("  Missing closing brace for if statement"))
     print(color.info("  Context:"))
-    print(f"     {color.line_number('13')}:   if (score > 10) {{")
+    print(f"     {color.line_number('13')}:   if \"$score<@s>$ > 10\" \{")
     print(f"     {color.line_number('14')}:     say \"High score!\"")
-    print(f"     {color.line_number('15')}:     score = 0")
-    print(f"     {color.line_number('16')}:   }}")
+    print(f"     {color.line_number('15')}:     score<@s> = 0")
+    print(f"     {color.line_number('16')}:   ")
     print()
     print(color.suggestion("  Suggestion: Add closing brace '}' after line 15"))
     print()

minecraft_datapack_language/cli_utils.py

@@ -118,7 +118,7 @@ def _process_variable_substitutions(command: str, selector: str = "@s") -> str:
     return command
 
 
-def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s") -> str:
+def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s", variable_scopes: dict = None) -> str:
     """Convert MDL condition syntax to Minecraft scoreboard syntax."""
     # Remove extra whitespace and normalize
     condition = condition.strip()
@@ -130,13 +130,30 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
     # Replace variable references with proper scoreboard syntax
     def replace_var(match):
         var_name = match.group(1)
-        # Remove scope selector if present
+        print(f"DEBUG: Processing variable in condition: '{var_name}'")
+        # Check if variable has explicit scope selector
         if '<' in var_name and var_name.endswith('>'):
             var_parts = var_name.split('<', 1)
             base_var = var_parts[0]
-            return f"@e[type=armor_stand,tag=mdl_server,limit=1] {base_var}"
+            scope_selector = var_parts[1][:-1]  # Remove trailing >
+            print(f"DEBUG: Found explicit scope: base_var='{base_var}', scope_selector='{scope_selector}'")
+            # Resolve special selectors
+            if scope_selector == "global":
+                scope_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+            result = f"{scope_selector} {base_var}"
+            print(f"DEBUG: Returning scoped result: '{result}'")
+            return result
         else:
-            return f"@e[type=armor_stand,tag=mdl_server,limit=1] {var_name}"
+            # Use declared scope if available, otherwise default to current selector
+            if variable_scopes and var_name in variable_scopes:
+                declared_scope = variable_scopes[var_name]
+                if declared_scope == 'global':
+                    return f"@e[type=armor_stand,tag=mdl_server,limit=1] {var_name}"
+                else:
+                    return f"{declared_scope} {var_name}"
+            else:
+                # Default to current selector
+                return f"{selector} {var_name}"
     
     # Apply variable substitution
     condition = re.sub(var_pattern, replace_var, condition)

{minecraft_datapack_language-15.4.16.dist-info → minecraft_datapack_language-15.4.17.dist-info}/METADATA

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

@@ -1,13 +1,13 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=weFSQFkVMGkr5RZCGmtURQLX_IcKlr7mjb1PFMlMcAQ,708
+minecraft_datapack_language/_version.py,sha256=qzQijokRTC2WnDluucaX_VHSYUpHFNoswy95G3WDQrg,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=HvrQdINx8EmF4OW6IZCx_S6Rs4NZQ-eB1PSlcDMnCmA,47939
+minecraft_datapack_language/cli_build.py,sha256=u0XIOH_zTARPC6dvWf-411OqrF7RjT7Z9Hkp6hTeZsI,47990
 minecraft_datapack_language/cli_check.py,sha256=bPq9gHsxQ1CIiftkrAtRCifWkVAyjp5c8Oay2NNQ1qs,6277
 minecraft_datapack_language/cli_colors.py,sha256=Hr8awY966bGSnVdXL3WnmRhSP1wH56vTQKGt5z-kIQM,7878
-minecraft_datapack_language/cli_help.py,sha256=txMS87SvPvGuHLGtSbhvT7evFHHEzwHRBZGfW0ObJpk,20041
+minecraft_datapack_language/cli_help.py,sha256=20meIcRnr8G_20T3zg7MGOIH11ZCRwQzblOQ9adRrlo,20051
 minecraft_datapack_language/cli_new.py,sha256=_pj5EeXESAG00C80_os9jONIXAMcsu2eoR8xVJWDw6g,9347
-minecraft_datapack_language/cli_utils.py,sha256=nl22j96vpCW0XRMpD_zjwamnMU4e4LXEjACsnwiFGzs,9931
+minecraft_datapack_language/cli_utils.py,sha256=Zv6pIDfgiaa-Ke9fZOJCVHZw0Q-dfTZM9E8ml9RACOg,10905
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
 minecraft_datapack_language/expression_processor.py,sha256=GN6cuRNvgI8TrV6YnEHrA9P0X-ACTT7rCBh4WlOPjSI,20140
 minecraft_datapack_language/linter.py,sha256=7UqbygC5JPCGg-BSOq65NB2xEJBu_OUOYIIgmHItO2M,16567
@@ -17,9 +17,9 @@ minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYa
 minecraft_datapack_language/mdl_parser_js.py,sha256=SQzc67pKls3NVnQaT0xIILGqpZYAmcZn78TQ0KIM4TE,40216
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.4.16.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.4.16.dist-info/METADATA,sha256=LaU-6JUtPHX-SKHZz7EQsYQ2jNpAbmvnT6V21Kck0eA,35230
-minecraft_datapack_language-15.4.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.4.16.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.4.16.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.4.16.dist-info/RECORD,,
+minecraft_datapack_language-15.4.17.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.4.17.dist-info/METADATA,sha256=loKEO4VCfktBjYP1n9z17lkYnLpbzesD2UEqqxbRF50,35230
+minecraft_datapack_language-15.4.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.4.17.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.4.17.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.4.17.dist-info/RECORD,,