minecraft-datapack-language 15.3.6__py3-none-any.whl → 15.3.8__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.6'
-__version_tuple__ = version_tuple = (15, 3, 6)
+__version__ = version = '15.3.8'
+__version_tuple__ = version_tuple = (15, 3, 8)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -319,13 +319,23 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         var_name = statement['name']
         value = statement['value']
         
+        # Determine the correct selector for this variable based on its declared scope
+        var_selector = selector  # Default to current selector
+        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} assignment using selector: {var_selector} (declared scope: {variable_scopes.get(var_name, 'none')})")
+        
         # Handle different value types
         if isinstance(value, int):
-            commands.append(f"scoreboard players set {selector} {var_name} {value}")
+            commands.append(f"scoreboard players set {var_selector} {var_name} {value}")
         elif isinstance(value, str) and value.startswith('$') and value.endswith('$'):
             # Variable reference
             ref_var = value[1:-1]  # Remove $ symbols
-            commands.append(f"scoreboard players operation {selector} {var_name} = {selector} {ref_var}")
+            commands.append(f"scoreboard players operation {var_selector} {var_name} = {var_selector} {ref_var}")
         elif hasattr(value, '__class__') and 'BinaryExpression' in str(value.__class__):
             # Handle complex expressions (BinaryExpression, etc.)
             # Convert to proper Minecraft scoreboard commands
@@ -338,17 +348,17 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
                 if operator == 'PLUS':
                     if hasattr(left, 'name') and hasattr(right, 'value'):
                         # counter = counter + 1
-                        commands.append(f"scoreboard players add {selector} {var_name} {right.value}")
+                        commands.append(f"scoreboard players add {var_selector} {var_name} {right.value}")
                     else:
                         # Complex case - use operation
                         commands.append(f"# Complex addition: {var_name} = {left} + {right}")
                 elif operator == 'MINUS':
                     if hasattr(left, 'name') and hasattr(right, 'value'):
                         # health = health - 10
-                        commands.append(f"scoreboard players remove {selector} {var_name} {right.value}")
+                        commands.append(f"scoreboard players remove {var_selector} {var_name} {right.value}")
                     else:
                         # Complex case - use operation
-                        commands.append(f"# Complex subtraction: {var_name} = {left} - {right}")
+                        commands.append(f"# Complex operation: {var_name} = {left} - {right}")
                 else:
                     # Other operators - use operation
                     commands.append(f"# Complex operation: {var_name} = {left} {operator} {right}")
@@ -360,11 +370,11 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
                 if hasattr(value, 'value'):
                     # LiteralExpression case
                     num_value = int(value.value)
-                    commands.append(f"scoreboard players set {selector} {var_name} {num_value}")
+                    commands.append(f"scoreboard players set {var_selector} {var_name} {num_value}")
                 else:
                     # Direct value case
                     num_value = int(value)
-                    commands.append(f"scoreboard players set {selector} {var_name} {num_value}")
+                    commands.append(f"scoreboard players set {var_selector} {var_name} {num_value}")
             except (ValueError, TypeError):
                 # If we can't convert to int, add a placeholder
                 commands.append(f"# Assignment: {var_name} = {value}")
@@ -482,6 +492,11 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
                 var_scope = var_decl.get('scope')
                 if var_scope:
                     variable_scopes[var_name] = var_scope
+                    print(f"DEBUG: Variable {var_name} has scope {var_scope}")
+                else:
+                    print(f"DEBUG: Variable {var_name} has no scope (defaults to @s)")
+        
+        print(f"DEBUG: Collected variable scopes: {variable_scopes}")
         
         # Generate function content
         function_commands = []
@@ -790,16 +805,29 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                             else:
                                 # Simple function call without scope
                                 function.commands.append(f"function {func_namespace}:{func_name}")
-                        elif statement.get('type') == 'variable_assignment':
-                            # Handle variable assignments
-                            var_name = statement['name']
-                            value = statement['value']
-                            if hasattr(value, 'value'):
-                                # Simple literal value
-                                function.commands.append(f"scoreboard players set {var_name} @s {value.value}")
-                            else:
-                                # Complex expression - add a placeholder
-                                function.commands.append(f"# Variable assignment: {var_name} = {value}")
+                                                 elif statement.get('type') == 'variable_assignment':
+                             # Handle variable assignments
+                             var_name = statement['name']
+                             value = statement['value']
+                             
+                             # Determine selector based on variable scope
+                             var_selector = "@s"  # Default
+                             if 'variables' in ast:
+                                 for var_decl in ast['variables']:
+                                     if var_decl.get('name') == var_name:
+                                         var_scope = var_decl.get('scope')
+                                         if var_scope == 'global':
+                                             var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+                                         elif var_scope:
+                                             var_selector = var_scope
+                                         break
+                             
+                             if hasattr(value, 'value'):
+                                 # Simple literal value
+                                 function.commands.append(f"scoreboard players set {var_name} {var_selector} {value.value}")
+                             else:
+                                 # Complex expression - add a placeholder
+                                 function.commands.append(f"# Variable assignment: {var_name} = {value}")
                         else:
                             # Add a placeholder for other statement types
                             function.commands.append(f"# Statement: {statement.get('type', 'unknown')}")

{minecraft_datapack_language-15.3.6.dist-info → minecraft_datapack_language-15.3.8.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=TS_Bj5zM7LLd7rmfHMTCHi-Qpxtxi8wAIBVfacsXbjE,706
+minecraft_datapack_language/_version.py,sha256=5Brn3tTXfQ-8VOitx7xWNfzbtGKr8Ew9f_ekMlcHt4Q,706
 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=KiZhYxCEu2gnz7JPuYSPOe2buyETSY2XjMPw5PunfHw,44281
+minecraft_datapack_language/cli_build.py,sha256=T3xVSRDigJpyph4Nam_Sf9dXXHE7Qu3QwvfCmCGXno4,46032
 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.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.3.6.dist-info/METADATA,sha256=J1TMfHwQSpSrLgCeOaOQB0X67JeNNBBoTArWgZ2RtZs,35229
-minecraft_datapack_language-15.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.3.6.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.3.6.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.3.6.dist-info/RECORD,,
+minecraft_datapack_language-15.3.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.3.8.dist-info/METADATA,sha256=lCeuK6MGu76vUYdj3vX1jOBrvLGelya7GhhFoC5_BNQ,35229
+minecraft_datapack_language-15.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.3.8.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.3.8.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.3.8.dist-info/RECORD,,