minecraft-datapack-language 15.3.9__py3-none-any.whl → 15.3.11__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.3.9'
-__version_tuple__ = version_tuple = (15, 3, 9)
+__version__ = version = '15.3.11'
+__version_tuple__ = version_tuple = (15, 3, 11)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -218,18 +218,19 @@ def _generate_load_function(scoreboard_commands: List[str], output_dir: Path, na
         f.write('\n'.join(load_content))
 
 
-def _process_say_command_with_variables(content: str, selector: str) -> str:
+def _process_say_command_with_variables(content: str, selector: str, variable_scopes: Dict[str, str] = None) -> str:
     """Process say command content with variable substitution, converting to tellraw with score components."""
     import re
     
     print(f"DEBUG: _process_say_command_with_variables called with content: {repr(content)}, selector: {selector}")
+    print(f"DEBUG: Variable scopes available: {variable_scopes}")
     
     # Clean up the content - remove quotes if present
     content = content.strip()
     if content.startswith('"') and content.endswith('"'):
         content = content[1:-1]  # Remove surrounding quotes
     
-    # Find all variable references like $variable$ or $variable<selector>$
+    # Look for traditional $variable$ syntax
     var_pattern = r'\$([^$]+)\$'
     matches = re.findall(var_pattern, content)
     
@@ -275,8 +276,19 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
                 var_selector = var_parts[1][:-1]  # Remove trailing >
                 components.append(f'{{"score":{{"name":"{var_selector}","objective":"{base_var}"}}}}')
             else:
-                # Simple variable: $variable$ - use server armor stand
-                components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
+                # Simple variable: $variable$ - determine selector based on declared scope
+                var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"  # Default to global
+                if variable_scopes and var_name in variable_scopes:
+                    declared_scope = variable_scopes[var_name]
+                    if declared_scope == 'global':
+                        var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+                    else:
+                        var_selector = declared_scope
+                    print(f"DEBUG: Variable {var_name} using declared scope {declared_scope} -> selector {var_selector}")
+                else:
+                    print(f"DEBUG: Variable {var_name} has no declared scope, using default global selector")
+                
+                components.append(f'{{"score":{{"name":"{var_selector}","objective":"{var_name}"}}}}')
     
     # Join components and create tellraw command
     components_str = ','.join(components)
@@ -303,7 +315,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
             content = command[4:]  # Remove "say " prefix
             print(f"DEBUG: Say command content: {repr(content)}")
             # Convert to Minecraft tellraw format
-            processed_command = _process_say_command_with_variables(content, selector)
+            processed_command = _process_say_command_with_variables(content, selector, variable_scopes)
             print(f"DEBUG: Processed say command: {repr(processed_command)}")
             commands.append(processed_command)
         elif command.startswith('tellraw @a ') or command.startswith('tellraw @ a '):

{minecraft_datapack_language-15.3.9.dist-info → minecraft_datapack_language-15.3.11.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=u8xiMMddLianRPLPTYMkNK6NmyrjVCeWMdyb4ntk6sM,706
+minecraft_datapack_language/_version.py,sha256=wty85STj39LbQK_ZS5i7nysrTGZlh7A4qzbRAjbOAog,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=wZBmhF3xVQ7VCZkHAZmbSmnYZQu9iKdi8akpRAE8j8g,45985
+minecraft_datapack_language/cli_build.py,sha256=NLgpYfXCKiZhWD_8K_GKLvUmUlQvFNTVwQ_hCHoodhY,46785
 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=Ap7EDpC5wbu1qFmC8htzd8rRqSyYugt58h0AppfDD6s,40171
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.3.9.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.3.9.dist-info/METADATA,sha256=S-yC7e80Hs0QR7bT6K9ZoW5vIz0SZxI42zweDTl0kKQ,35229
-minecraft_datapack_language-15.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.3.9.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.3.9.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.3.9.dist-info/RECORD,,
+minecraft_datapack_language-15.3.11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.3.11.dist-info/METADATA,sha256=cZYXpnKp5sARVj6FAhyNxQrLdM8Yp4xjiogmh6R7548,35230
+minecraft_datapack_language-15.3.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.3.11.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.3.11.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.3.11.dist-info/RECORD,,