PyPI - minecraft-datapack-language - Versions diffs - 15.3.10__tar.gz → 15.3.12__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.3.10
+Version: 15.3.12
 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

@@ -0,0 +1,3 @@
+current: "15.3.11"
+tag: "v15.3.11"
+updated_at: "2025-09-02T01:00:23Z"

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
-__version__ = version = '15.3.10'
-__version_tuple__ = version_tuple = (15, 3, 10)
+__version__ = version = '15.3.12'
+__version_tuple__ = version_tuple = (15, 3, 12)
-__commit_id__ = commit_id = 'g492fc7742'
+__commit_id__ = commit_id = 'g623752b07'

@@ -223,39 +223,14 @@ def _process_say_command_with_variables(content: str, selector: str, variable_sc
     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
-    # First, check for MDL-style variable references (no $ symbols)
-    # Look for common variable names that might be in the content
-    if variable_scopes:
-        for var_name, var_scope in variable_scopes.items():
-            if var_name in content:
-                # Found a variable reference, convert to score component
-                if var_scope == 'global':
-                    var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
-                else:
-                    var_selector = var_scope
-                # Split content around the variable
-                parts = content.split(var_name)
-                if len(parts) == 2:
-                    # Build tellraw components
-                    components = []
-                    if parts[0]:  # Text before variable
-                        components.append(f'{{"text":"{parts[0]}"}}')
-                    # Variable as score component
-                    components.append(f'{{"score":{{"name":"{var_selector}","objective":"{var_name}"}}}}')
-                    if parts[1]:  # Text after variable
-                        components.append(f'{{"text":"{parts[1]}"}}')
-                    components_str = ','.join(components)
-                    return f'tellraw @a [{components_str}]'
-    # Fallback: Look for traditional $variable$ syntax
+    # Look for traditional $variable$ syntax
     var_pattern = r'\$([^$]+)\$'
     matches = re.findall(var_pattern, content)
@@ -301,8 +276,19 @@ def _process_say_command_with_variables(content: str, selector: str, variable_sc
                 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)
@@ -328,6 +314,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
             # Convert say command to tellraw command
             content = command[4:]  # Remove "say " prefix
             print(f"DEBUG: Say command content: {repr(content)}")
+            print(f"DEBUG: Raw command from AST: {repr(statement['command'])}")
             # Convert to Minecraft tellraw format
             processed_command = _process_say_command_with_variables(content, selector, variable_scopes)
             print(f"DEBUG: Processed say command: {repr(processed_command)}")

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.3.10
+Version: 15.3.12
 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

@@ -354,6 +354,7 @@ test_examples/test_output_scoped_fixed_v2.zip
 test_examples/test_output_validation.py
 test_examples/test_output_variables_fixed.zip
 test_examples/test_output_variables_fixed_v2.zip
+test_examples/test_output_variables_fixed_v3.zip
 test_examples/test_output/basic_hello.zip
 test_examples/test_output/raw_commands.zip
 test_examples/test_output/scoped_calls.zip
@@ -413,6 +414,11 @@ test_examples/test_output_variables_fixed_v2/data/minecraft/tags/function/load.j
 test_examples/test_output_variables_fixed_v2/data/variables/function/load.mcfunction
 test_examples/test_output_variables_fixed_v2/data/variables/function/main.mcfunction
 test_examples/test_output_variables_fixed_v2/data/variables/function/reset.mcfunction
+test_examples/test_output_variables_fixed_v3/pack.mcmeta
+test_examples/test_output_variables_fixed_v3/data/minecraft/tags/function/load.json
+test_examples/test_output_variables_fixed_v3/data/variables/function/load.mcfunction
+test_examples/test_output_variables_fixed_v3/data/variables/function/main.mcfunction
+test_examples/test_output_variables_fixed_v3/data/variables/function/reset.mcfunction
 tests/__init__.py
 tests/test_basic.py
 tests/test_cli_comprehensive.py

@@ -0,0 +1,7 @@
+{
+  "values": [
+    "variables:load",
+    "variables:main",
+    "variables:load"
+  ]
+}

@@ -0,0 +1,4 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+scoreboard objectives add globalCounter dummy
+scoreboard objectives add playerCounter dummy
+scoreboard objectives add teamCounter dummy

@@ -0,0 +1,7 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+scoreboard players add @e[type=armor_stand,tag=mdl_server,limit=1] globalCounter 1
+scoreboard players add @s playerCounter 1
+scoreboard players add @a[team=red] teamCounter 1
+tellraw @a [{"text":"Global counter: globalCounter"}]
+tellraw @a [{"text":"Player counter: playerCounter"}]
+tellraw @a [{"text":"Team counter: teamCounter"}]

@@ -0,0 +1,5 @@
+execute unless entity @e[type=armor_stand,tag=mdl_server,limit=1] run summon armor_stand ~ 320 ~ {Tags:["mdl_server"],Invisible:1b,Marker:1b,NoGravity:1b,Invulnerable:1b}
+scoreboard players set @e[type=armor_stand,tag=mdl_server,limit=1] globalCounter 0
+scoreboard players set @s playerCounter 0
+scoreboard players set @a[team=red] teamCounter 0
+tellraw @a [{"text":"All counters reset !"}]

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Example showing variable scopes"
+  }
+}

@@ -1,3 +0,0 @@
-current: "15.3.9"
-tag: "v15.3.9"
-updated_at: "2025-09-02T00:57:03Z"

minecraft-datapack-language 15.3.10__tar.gz → 15.3.12__tar.gz

minecraft-datapack-language 15.3.10tar.gz → 15.3.12tar.gz