minecraft-datapack-language 15.4.16__tar.gz → 15.4.18__tar.gz

{minecraft_datapack_language-15.4.16/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.4.18}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "15.4.17"
+tag: "v15.4.17"
+updated_at: "2025-09-02T04:02:57Z"

{minecraft_datapack_language-15.4.16 → minecraft_datapack_language-15.4.18}/docs/_docs/cli-reference.md

@@ -219,9 +219,9 @@ MDL provides comprehensive error handling and reporting:
 Error 1: MDLSyntaxError in test.mdl:15:8
 Missing closing brace for if statement
 Context:
-  13:   if (score > 10) {
+  13:   if "$score<@s>$ > 10" {
   14:     say "High score!"
-  15:     score = 0
+  15:     score<@s> = 0
   16:   }
 
 Suggestion: Add closing brace '}' after line 15

{minecraft_datapack_language-15.4.16 → minecraft_datapack_language-15.4.18}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.4.16'
-__version_tuple__ = version_tuple = (15, 4, 16)
+__version__ = version = '15.4.18'
+__version_tuple__ = version_tuple = (15, 4, 18)
 
-__commit_id__ = commit_id = 'g0453ad24f'
+__commit_id__ = commit_id = 'g72e839817'

{minecraft_datapack_language-15.4.16 → minecraft_datapack_language-15.4.18}/minecraft_datapack_language/cli_build.py

@@ -402,7 +402,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         else_body = statement.get('else_body', [])
         
         # Convert condition to Minecraft syntax
-        minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
+        minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector, variable_scopes)
         
         # Generate unique function names for conditional blocks
         if_func_name = f"{function_name}_if_{statement_index}"
@@ -705,7 +705,7 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
         body_commands.extend(_process_statement(stmt, namespace, loop_func_name, i, is_tag_function, selector, variable_scopes, build_context, output_dir))
     
     # Add the recursive call to the loop body
-    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
+    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector, variable_scopes)
     body_commands.append(f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}")
     
     # Write the single loop function
@@ -744,7 +744,7 @@ def _process_while_loop_schedule(while_statement, namespace: str, function_name:
         body_commands.extend(_process_statement(stmt, namespace, loop_body_func_name, i, is_tag_function, selector, variable_scopes, build_context))
     
     # Add the loop continuation command
-    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
+    minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector, variable_scopes)
     body_commands.append(f"execute {minecraft_condition} run schedule function {namespace}:{loop_body_func_name} 1t")
     
     # Write loop body function

{minecraft_datapack_language-15.4.16 → minecraft_datapack_language-15.4.18}/minecraft_datapack_language/cli_help.py

@@ -295,10 +295,10 @@ def show_check_help():
     print(color.info("  Error 1: MDLSyntaxError in test.mdl:15:8"))
     print(color.info("  Missing closing brace for if statement"))
     print(color.info("  Context:"))
-    print(f"     {color.line_number('13')}:   if (score > 10) {{")
+    print(f"     {color.line_number('13')}:   if \"$score<@s>$ > 10\" {{")
     print(f"     {color.line_number('14')}:     say \"High score!\"")
-    print(f"     {color.line_number('15')}:     score = 0")
-    print(f"     {color.line_number('16')}:   }}")
+    print(f"     {color.line_number('15')}:     score<@s> = 0")
+    print(f"     {color.line_number('16')}:   ")
     print()
     print(color.suggestion("  Suggestion: Add closing brace '}' after line 15"))
     print()

{minecraft_datapack_language-15.4.16 → minecraft_datapack_language-15.4.18}/minecraft_datapack_language/cli_utils.py

@@ -118,7 +118,7 @@ def _process_variable_substitutions(command: str, selector: str = "@s") -> str:
     return command
 
 
-def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s") -> str:
+def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s", variable_scopes: dict = None) -> str:
     """Convert MDL condition syntax to Minecraft scoreboard syntax."""
     # Remove extra whitespace and normalize
     condition = condition.strip()
@@ -130,13 +130,30 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
     # Replace variable references with proper scoreboard syntax
     def replace_var(match):
         var_name = match.group(1)
-        # Remove scope selector if present
+        print(f"DEBUG: Processing variable in condition: '{var_name}'")
+        # Check if variable has explicit scope selector
         if '<' in var_name and var_name.endswith('>'):
             var_parts = var_name.split('<', 1)
             base_var = var_parts[0]
-            return f"@e[type=armor_stand,tag=mdl_server,limit=1] {base_var}"
+            scope_selector = var_parts[1][:-1]  # Remove trailing >
+            print(f"DEBUG: Found explicit scope: base_var='{base_var}', scope_selector='{scope_selector}'")
+            # Resolve special selectors
+            if scope_selector == "global":
+                scope_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+            result = f"{scope_selector} {base_var}"
+            print(f"DEBUG: Returning scoped result: '{result}'")
+            return result
         else:
-            return f"@e[type=armor_stand,tag=mdl_server,limit=1] {var_name}"
+            # Use declared scope if available, otherwise default to current selector
+            if variable_scopes and var_name in variable_scopes:
+                declared_scope = variable_scopes[var_name]
+                if declared_scope == 'global':
+                    return f"@e[type=armor_stand,tag=mdl_server,limit=1] {var_name}"
+                else:
+                    return f"{declared_scope} {var_name}"
+            else:
+                # Default to current selector
+                return f"{selector} {var_name}"
     
     # Apply variable substitution
     condition = re.sub(var_pattern, replace_var, condition)

{minecraft_datapack_language-15.4.16 → minecraft_datapack_language-15.4.18/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.16
+Version: 15.4.18
 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.4.16 → minecraft_datapack_language-15.4.18}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -13,6 +13,9 @@ dist_test.zip
 pyproject.toml
 test_all_registry.mdl
 test_output_scope.zip
+test_scoped_condition.mdl
+test_scoped_output.zip
+test_scoped_output2.zip
 test_single.zip
 test_single_debug.zip
 test_single_debug2.zip
@@ -1264,6 +1267,22 @@ test_examples/test_output_while_loops_fixed/data/while_loops/function/test_count
 test_examples/test_output_while_loops_fixed/data/while_loops/function/test_main_while_2.mcfunction
 test_project/README.md
 test_project/main.mdl
+test_scoped_output/pack.mcmeta
+test_scoped_output/data/minecraft/tags/function/load.json
+test_scoped_output/data/test/function/load.mcfunction
+test_scoped_output/data/test/function/main.mcfunction
+test_scoped_output/data/test/function/main_if_0.mcfunction
+test_scoped_output/data/test/function/main_if_1.mcfunction
+test_scoped_output/data/test/function/main_if_2.mcfunction
+test_scoped_output/data/test/function/main_if_3.mcfunction
+test_scoped_output2/pack.mcmeta
+test_scoped_output2/data/minecraft/tags/function/load.json
+test_scoped_output2/data/test/function/load.mcfunction
+test_scoped_output2/data/test/function/main.mcfunction
+test_scoped_output2/data/test/function/main_if_0.mcfunction
+test_scoped_output2/data/test/function/main_if_1.mcfunction
+test_scoped_output2/data/test/function/main_if_2.mcfunction
+test_scoped_output2/data/test/function/main_if_3.mcfunction
 test_single/pack.mcmeta
 test_single/data/basic_hello/function/load.mcfunction
 test_single/data/basic_hello/function/main.mcfunction

minecraft_datapack_language-15.4.18/test_scoped_condition.mdl

@@ -0,0 +1,30 @@
+pack "test_scoped" "Test scoped variables in conditions" 82;
+namespace "test";
+
+var num playerScore = 0;
+var num globalCounter scope<global> = 0;
+var num teamScore scope<@a[team=red]> = 0;
+
+function "main" {
+    // Test explicit scope in if condition
+    if "$playerScore<@s>$ > 10" {
+        say "Player score is high!";
+    }
+    
+    // Test global scope in if condition
+    if "$globalCounter<global>$ > 100" {
+        say "Global counter is high!";
+    }
+    
+    // Test team scope in if condition
+    if "$teamScore<@a[team=red]>$ > 50" {
+        say "Red team score is high!";
+    }
+    
+    // Test default scope (should use @s)
+    if "$playerScore$ > 5" {
+        say "Player score is above 5!";
+    }
+}
+
+on_load "test:main";

minecraft_datapack_language-15.4.18/test_scoped_output/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.4.18/test_scoped_output/data/test/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 playerScore dummy
+scoreboard objectives add globalCounter dummy
+scoreboard objectives add teamScore dummy

minecraft_datapack_language-15.4.18/test_scoped_output/data/test/function/main.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}
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] playerScore matches 11.. run function test:main_if_0
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] globalCounter matches 101.. run function test:main_if_1
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] teamScore matches 51.. run function test:main_if_2
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] playerScore matches 6.. run function test:main_if_3

minecraft_datapack_language-15.4.18/test_scoped_output/data/test/function/main_if_0.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Player score is high!"}]

minecraft_datapack_language-15.4.18/test_scoped_output/data/test/function/main_if_1.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Global counter is high!"}]

minecraft_datapack_language-15.4.18/test_scoped_output/data/test/function/main_if_2.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Red team score is high!"}]

minecraft_datapack_language-15.4.18/test_scoped_output/data/test/function/main_if_3.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Player score is above 5!"}]

minecraft_datapack_language-15.4.18/test_scoped_output/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test scoped variables in conditions"
+  }
+}

minecraft_datapack_language-15.4.18/test_scoped_output2/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.4.18/test_scoped_output2/data/test/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 playerScore dummy
+scoreboard objectives add globalCounter dummy
+scoreboard objectives add teamScore dummy

minecraft_datapack_language-15.4.18/test_scoped_output2/data/test/function/main.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}
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] playerScore matches 11.. run function test:main_if_0
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] globalCounter matches 101.. run function test:main_if_1
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] teamScore matches 51.. run function test:main_if_2
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] playerScore matches 6.. run function test:main_if_3

minecraft_datapack_language-15.4.18/test_scoped_output2/data/test/function/main_if_0.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Player score is high!"}]

minecraft_datapack_language-15.4.18/test_scoped_output2/data/test/function/main_if_1.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Global counter is high!"}]

minecraft_datapack_language-15.4.18/test_scoped_output2/data/test/function/main_if_2.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Red team score is high!"}]

minecraft_datapack_language-15.4.18/test_scoped_output2/data/test/function/main_if_3.mcfunction

@@ -0,0 +1 @@
+tellraw @a [{"text":"Player score is above 5!"}]

minecraft_datapack_language-15.4.18/test_scoped_output2/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Test scoped variables in conditions"
+  }
+}

minecraft_datapack_language-15.4.16/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.4.15"
-tag: "v15.4.15"
-updated_at: "2025-09-02T03:39:38Z"