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

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

@@ -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.11/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.3.10"
+tag: "v15.3.10"
+updated_at: "2025-09-02T00:59:15Z"

{minecraft_datapack_language-15.3.9 → minecraft_datapack_language-15.3.11}/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 = 'g7f06eb0e0'
+__commit_id__ = commit_id = 'g7b587633a'

{minecraft_datapack_language-15.3.9 → minecraft_datapack_language-15.3.11}/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 → minecraft_datapack_language-15.3.11/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -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 → minecraft_datapack_language-15.3.11}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -353,6 +353,7 @@ test_examples/test_output_scoped_fixed.zip
 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/basic_hello.zip
 test_examples/test_output/raw_commands.zip
 test_examples/test_output/scoped_calls.zip
@@ -407,6 +408,11 @@ test_examples/test_output_variables_fixed/data/minecraft/tags/function/load.json
 test_examples/test_output_variables_fixed/data/variables/function/load.mcfunction
 test_examples/test_output_variables_fixed/data/variables/function/main.mcfunction
 test_examples/test_output_variables_fixed/data/variables/function/reset.mcfunction
+test_examples/test_output_variables_fixed_v2/pack.mcmeta
+test_examples/test_output_variables_fixed_v2/data/minecraft/tags/function/load.json
+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
 tests/__init__.py
 tests/test_basic.py
 tests/test_cli_comprehensive.py

{minecraft_datapack_language-15.3.9/test_examples/test_output_scoped_fixed_v2 → minecraft_datapack_language-15.3.11/test_examples/test_output/scoped_calls}/data/scoped_calls/function/increment_global.mcfunction

@@ -1,3 +1,3 @@
 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 @s globalTimer 1
+scoreboard players add @e[type=armor_stand,tag=mdl_server,limit=1] globalTimer 1
 tellraw @a [{"text":"Global timer updated !"}]

{minecraft_datapack_language-15.3.9/test_examples/test_output_variables_fixed → minecraft_datapack_language-15.3.11/test_examples/test_output/variables}/data/variables/function/main.mcfunction

@@ -1,7 +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 @s globalCounter 1
+scoreboard players add @e[type=armor_stand,tag=mdl_server,limit=1] globalCounter 1
 scoreboard players add @s playerCounter 1
-scoreboard players add @s teamCounter 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"}]

{minecraft_datapack_language-15.3.9/test_examples/test_output_variables_fixed → minecraft_datapack_language-15.3.11/test_examples/test_output/variables}/data/variables/function/reset.mcfunction

@@ -1,5 +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 @s globalCounter 0
+scoreboard players set @e[type=armor_stand,tag=mdl_server,limit=1] globalCounter 0
 scoreboard players set @s playerCounter 0
-scoreboard players set @s teamCounter 0
+scoreboard players set @a[team=red] teamCounter 0
 tellraw @a [{"text":"All counters reset !"}]

{minecraft_datapack_language-15.3.9 → minecraft_datapack_language-15.3.11}/test_examples/test_output/while_loops/data/while_loops/function/main.mcfunction

@@ -1,5 +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}
 tellraw @a [{"text":"Starting while loop demo . . ."}]
-scoreboard players set @s counter 0
+scoreboard players set @e[type=armor_stand,tag=mdl_server,limit=1] counter 0
 execute if score @e[type=armor_stand,tag=mdl_server,limit=1] counter < @e[type=armor_stand,tag=mdl_server,limit=1] maxCount run function while_loops:test_main_while_2
 tellraw @a [{"text":"Loop finished !"}]

{minecraft_datapack_language-15.3.9 → minecraft_datapack_language-15.3.11}/test_examples/test_output/while_loops/data/while_loops/function/test_main_while_2.mcfunction

@@ -1,3 +1,3 @@
-scoreboard players add @s counter 1
+scoreboard players add @e[type=armor_stand,tag=mdl_server,limit=1] counter 1
 tellraw @a [{"text":"Loop iteration: counter"}]
 execute if score @e[type=armor_stand,tag=mdl_server,limit=1] counter < @e[type=armor_stand,tag=mdl_server,limit=1] maxCount run function while_loops:test_main_while_2

minecraft_datapack_language-15.3.11/test_examples/test_output_variables_fixed_v2/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.3.11/test_examples/test_output_variables_fixed_v2/data/variables/function/load.mcfunction

@@ -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

minecraft_datapack_language-15.3.11/test_examples/test_output_variables_fixed_v2/data/variables/function/main.mcfunction

@@ -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"}]

minecraft_datapack_language-15.3.11/test_examples/test_output_variables_fixed_v2/data/variables/function/reset.mcfunction

@@ -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 !"}]

minecraft_datapack_language-15.3.11/test_examples/test_output_variables_fixed_v2/pack.mcmeta

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

minecraft_datapack_language-15.3.9/docs/_data/version.yml

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