minecraft-datapack-language 15.3.7__tar.gz → 15.3.9__tar.gz

{minecraft_datapack_language-15.3.7/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.3.7
+Version: 15.3.9
 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/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.3.8"
+tag: "v15.3.8"
+updated_at: "2025-09-02T00:55:26Z"

{minecraft_datapack_language-15.3.7 → minecraft_datapack_language-15.3.9}/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.7'
-__version_tuple__ = version_tuple = (15, 3, 7)
+__version__ = version = '15.3.9'
+__version_tuple__ = version_tuple = (15, 3, 9)
 
-__commit_id__ = commit_id = 'g7425b86b2'
+__commit_id__ = commit_id = 'g7f06eb0e0'

{minecraft_datapack_language-15.3.7 → minecraft_datapack_language-15.3.9}/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}")
@@ -799,9 +809,22 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                             # 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} @s {value.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}")

{minecraft_datapack_language-15.3.7 → minecraft_datapack_language-15.3.9/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.3.7
+Version: 15.3.9
 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.7/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.3.6"
-tag: "v15.3.6"
-updated_at: "2025-09-02T00:51:15Z"