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

{minecraft_datapack_language-15.3.8/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.3.10}/PKG-INFO

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

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

{minecraft_datapack_language-15.3.8 → minecraft_datapack_language-15.3.10}/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.8'
-__version_tuple__ = version_tuple = (15, 3, 8)
+__version__ = version = '15.3.10'
+__version_tuple__ = version_tuple = (15, 3, 10)
 
-__commit_id__ = commit_id = 'g1ab5dbf08'
+__commit_id__ = commit_id = 'g492fc7742'

{minecraft_datapack_language-15.3.8 → minecraft_datapack_language-15.3.10}/minecraft_datapack_language/cli_build.py

@@ -218,7 +218,7 @@ 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
     
@@ -229,7 +229,33 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     if content.startswith('"') and content.endswith('"'):
         content = content[1:-1]  # Remove surrounding quotes
     
-    # Find all variable references like $variable$ or $variable<selector>$
+    # 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
     var_pattern = r'\$([^$]+)\$'
     matches = re.findall(var_pattern, content)
     
@@ -303,7 +329,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 '):
@@ -805,29 +831,29 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                             else:
                                 # Simple function call without scope
                                 function.commands.append(f"function {func_namespace}:{func_name}")
-                                                 elif statement.get('type') == 'variable_assignment':
-                             # 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} {var_selector} {value.value}")
-                             else:
-                                 # Complex expression - add a placeholder
-                                 function.commands.append(f"# Variable assignment: {var_name} = {value}")
+                        elif statement.get('type') == 'variable_assignment':
+                            # 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} {var_selector} {value.value}")
+                            else:
+                                # Complex expression - add a placeholder
+                                function.commands.append(f"# Variable assignment: {var_name} = {value}")
                         else:
                             # Add a placeholder for other statement types
                             function.commands.append(f"# Statement: {statement.get('type', 'unknown')}")

{minecraft_datapack_language-15.3.8 → minecraft_datapack_language-15.3.10/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.3.8
+Version: 15.3.10
 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.8 → minecraft_datapack_language-15.3.10}/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.8/test_examples/test_output_scoped_fixed_v2 → minecraft_datapack_language-15.3.10/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.8/test_examples/test_output_variables_fixed → minecraft_datapack_language-15.3.10/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.8/test_examples/test_output_variables_fixed → minecraft_datapack_language-15.3.10/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.8 → minecraft_datapack_language-15.3.10}/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.8 → minecraft_datapack_language-15.3.10}/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.10/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.10/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.10/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.10/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.10/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.8/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.3.7"
-tag: "v15.3.7"
-updated_at: "2025-09-02T00:52:47Z"