minecraft-datapack-language 15.3.4__tar.gz → 15.3.6__tar.gz

{minecraft_datapack_language-15.3.4/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.3.6}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "15.3.5"
+tag: "v15.3.5"
+updated_at: "2025-09-02T00:48:50Z"

{minecraft_datapack_language-15.3.4 → minecraft_datapack_language-15.3.6}/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.4'
-__version_tuple__ = version_tuple = (15, 3, 4)
+__version__ = version = '15.3.6'
+__version_tuple__ = version_tuple = (15, 3, 6)
 
-__commit_id__ = commit_id = 'g39480a1e0'
+__commit_id__ = commit_id = 'g69edfa238'

{minecraft_datapack_language-15.3.4 → minecraft_datapack_language-15.3.6}/minecraft_datapack_language/cli_build.py

@@ -424,6 +424,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
     elif statement['type'] == 'function_call':
         func_name = statement['name']
         scope = statement.get('scope')
+        func_namespace = statement.get('namespace', namespace)  # Use specified namespace or current namespace
         
         if scope:
             # Handle scoped function call
@@ -435,10 +436,10 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
                 selector = scope
             
             # Generate execute as command
-            commands.append(f"execute as {selector} run function {namespace}:{func_name}")
+            commands.append(f"execute as {selector} run function {func_namespace}:{func_name}")
         else:
             # Simple function call without scope
-            commands.append(f"function {namespace}:{func_name}")
+            commands.append(f"function {func_namespace}:{func_name}")
     
     elif statement['type'] == 'raw_text':
         # Raw Minecraft commands
@@ -473,12 +474,21 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         func_name = func['name']
         func_body = func.get('body', [])
         
+        # Collect variable scopes from the AST
+        variable_scopes = {}
+        if 'variables' in ast:
+            for var_decl in ast['variables']:
+                var_name = var_decl['name']
+                var_scope = var_decl.get('scope')
+                if var_scope:
+                    variable_scopes[var_name] = var_scope
+        
         # Generate function content
         function_commands = []
         for i, statement in enumerate(func_body):
             try:
                 print(f"DEBUG: Processing statement {i} of type {statement.get('type', 'unknown')}: {statement}")
-                commands = _process_statement(statement, namespace, func_name, i, False, "@s", {}, build_context, output_dir)
+                commands = _process_statement(statement, namespace, func_name, i, False, "@s", variable_scopes, build_context, output_dir)
                 function_commands.extend(commands)
                 print(f"Generated {len(commands)} commands for statement {i} in function {func_name}: {commands}")
             except Exception as e:
@@ -764,6 +774,7 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                         elif statement.get('type') == 'function_call':
                             func_name = statement['name']
                             scope = statement.get('scope')
+                            func_namespace = statement.get('namespace', namespace_name)  # Use specified namespace or current namespace
                             
                             if scope:
                                 # Handle scoped function call
@@ -775,10 +786,10 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                                     selector = scope
                                 
                                 # Generate execute as command
-                                function.commands.append(f"execute as {selector} run function {namespace_name}:{func_name}")
+                                function.commands.append(f"execute as {selector} run function {func_namespace}:{func_name}")
                             else:
                                 # Simple function call without scope
-                                function.commands.append(f"function {namespace_name}:{func_name}")
+                                function.commands.append(f"function {func_namespace}:{func_name}")
                         elif statement.get('type') == 'variable_assignment':
                             # Handle variable assignments
                             var_name = statement['name']

{minecraft_datapack_language-15.3.4 → minecraft_datapack_language-15.3.6}/minecraft_datapack_language/mdl_parser_js.py

@@ -610,6 +610,15 @@ class MDLParser:
                     suggestion="Use format: function \"namespace:function_name<@selector>\""
                 )
         
+        # Extract function name from namespace:function_name format
+        if ':' in name:
+            namespace_parts = name.split(':', 1)
+            if len(namespace_parts) == 2:
+                namespace_name = namespace_parts[0]
+                function_name = namespace_parts[1]
+                # Store both namespace and function name
+                return {"type": "function_call", "name": function_name, "scope": scope, "namespace": namespace_name}
+        
         self._match(TokenType.SEMICOLON)
         
         return {"type": "function_call", "name": name, "scope": scope}

{minecraft_datapack_language-15.3.4 → minecraft_datapack_language-15.3.6/minecraft_datapack_language.egg-info}/PKG-INFO

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

@@ -349,6 +349,8 @@ test_examples/03_scoped_function_calls.mdl
 test_examples/04_while_loops.mdl
 test_examples/05_raw_commands.mdl
 test_examples/06_comprehensive_example.mdl
+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/basic_hello.zip
 test_examples/test_output/raw_commands.zip
@@ -385,6 +387,20 @@ test_examples/test_output/while_loops/data/while_loops/function/test_countdown_w
 test_examples/test_output/while_loops/data/while_loops/function/test_main_while_2.mcfunction
 test_examples/test_output/while_loops/data/while_loops/function/while_loops_countdown_while_1.mcfunction
 test_examples/test_output/while_loops/data/while_loops/function/while_loops_main_while_2.mcfunction
+test_examples/test_output_scoped_fixed/pack.mcmeta
+test_examples/test_output_scoped_fixed/data/minecraft/tags/function/load.json
+test_examples/test_output_scoped_fixed/data/scoped_calls/function/increment_global.mcfunction
+test_examples/test_output_scoped_fixed/data/scoped_calls/function/increment_player.mcfunction
+test_examples/test_output_scoped_fixed/data/scoped_calls/function/load.mcfunction
+test_examples/test_output_scoped_fixed/data/scoped_calls/function/main.mcfunction
+test_examples/test_output_scoped_fixed/data/scoped_calls/function/show_scores.mcfunction
+test_examples/test_output_scoped_fixed_v2/pack.mcmeta
+test_examples/test_output_scoped_fixed_v2/data/minecraft/tags/function/load.json
+test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/increment_global.mcfunction
+test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/increment_player.mcfunction
+test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/load.mcfunction
+test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/main.mcfunction
+test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/show_scores.mcfunction
 tests/__init__.py
 tests/test_basic.py
 tests/test_cli_comprehensive.py

{minecraft_datapack_language-15.3.4 → minecraft_datapack_language-15.3.6}/test_examples/test_output/scoped_calls/data/scoped_calls/function/main.mcfunction

@@ -1,5 +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}
 tellraw @a [{"text":"Starting scoped function demo . . ."}]
-function scoped_calls:scoped_calls:increment_player<@s>
-function scoped_calls:scoped_calls:increment_global<global>
-function scoped_calls:scoped_calls:show_scores<@a>
+execute as @s run function scoped_calls:increment_player
+
+execute as @e[type=armor_stand,tag=mdl_server,limit=1] run function scoped_calls:increment_global
+
+execute as @a run function scoped_calls:show_scores

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/data/scoped_calls/function/increment_global.mcfunction

@@ -0,0 +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
+tellraw @a [{"text":"Global timer updated !"}]

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/data/scoped_calls/function/increment_player.mcfunction

@@ -0,0 +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 playerScore 10
+tellraw @a [{"text":"Your score increased !"}]

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/data/scoped_calls/function/load.mcfunction

@@ -0,0 +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 objectives add playerScore dummy
+scoreboard objectives add globalTimer dummy

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/data/scoped_calls/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}
+tellraw @a [{"text":"Starting scoped function demo . . ."}]
+execute as @s run function scoped_calls:scoped_calls:increment_player
+execute as @e[type=armor_stand,tag=mdl_server,limit=1] run function scoped_calls:scoped_calls:increment_global
+execute as @a run function scoped_calls:scoped_calls:show_scores

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/data/scoped_calls/function/show_scores.mcfunction

@@ -0,0 +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}
+tellraw @a [{"text":"Player score: playerScore"}]
+tellraw @a [{"text":"Global timer: globalTimer"}]

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Example showing scoped function calls"
+  }
+}

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/increment_global.mcfunction

@@ -0,0 +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
+tellraw @a [{"text":"Global timer updated !"}]

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/increment_player.mcfunction

@@ -0,0 +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 playerScore 10
+tellraw @a [{"text":"Your score increased !"}]

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/load.mcfunction

@@ -0,0 +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 objectives add playerScore dummy
+scoreboard objectives add globalTimer dummy

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/data/scoped_calls/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}
+tellraw @a [{"text":"Starting scoped function demo . . ."}]
+execute as @s run function scoped_calls:increment_player
+
+execute as @e[type=armor_stand,tag=mdl_server,limit=1] run function scoped_calls:increment_global
+
+execute as @a run function scoped_calls:show_scores

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/data/scoped_calls/function/show_scores.mcfunction

@@ -0,0 +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}
+tellraw @a [{"text":"Player score: playerScore"}]
+tellraw @a [{"text":"Global timer: globalTimer"}]

minecraft_datapack_language-15.3.6/test_examples/test_output_scoped_fixed_v2/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Example showing scoped function calls"
+  }
+}

minecraft_datapack_language-15.3.4/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.3.3"
-tag: "v15.3.3"
-updated_at: "2025-09-02T00:27:19Z"