PyPI - minecraft-datapack-language - Versions diffs - 15.3.11__tar.gz → 15.3.13__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.3.11
+Version: 15.3.13
 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.12"
+tag: "v15.3.12"
+updated_at: "2025-09-02T01:02:07Z"

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
-__version__ = version = '15.3.11'
-__version_tuple__ = version_tuple = (15, 3, 11)
+__version__ = version = '15.3.13'
+__version_tuple__ = version_tuple = (15, 3, 13)
-__commit_id__ = commit_id = 'g7b587633a'
+__commit_id__ = commit_id = 'gf7324472f'

@@ -314,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)}")

@@ -499,7 +499,7 @@ class MDLLexer:
                 self.column += 1
             self.current += 1
-        # Scan content until we find a semicolon
+        # Scan content until we find a semicolon, but preserve $variable$ syntax
         content_parts = []
         while self.current < len(source):
             char = source[self.current]
@@ -508,6 +508,35 @@ class MDLLexer:
                 # Found the end of the say command
                 break
+            # Check for variable substitution syntax
+            if char == '$':
+                # This might be the start of a variable substitution
+                # Look ahead to see if it's a valid variable name
+                temp_current = self.current + 1
+                temp_column = self.column + 1
+                variable_name = ""
+                # Scan potential variable name
+                while (temp_current < len(source) and
+                       (source[temp_current].isalnum() or source[temp_current] == '_')):
+                    variable_name += source[temp_current]
+                    temp_current += 1
+                # Check if we have a valid variable substitution
+                if (variable_name and
+                    temp_current < len(source) and
+                    source[temp_current] == '$' and
+                    (not variable_name[0].isdigit())):
+                    # This is a valid variable substitution, preserve the $variable$ syntax
+                    content_parts.append(char)
+                    content_parts.append(variable_name)
+                    content_parts.append('$')
+                    # Update position
+                    self.current = temp_current + 1
+                    self.column = temp_current + 1
+                    continue
             # Add character to content
             content_parts.append(char)

@@ -354,6 +354,8 @@ 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_variables_fixed_v4.zip
 test_examples/test_output/basic_hello.zip
 test_examples/test_output/raw_commands.zip
 test_examples/test_output/scoped_calls.zip
@@ -413,6 +415,16 @@ 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
+test_examples/test_output_variables_fixed_v4/pack.mcmeta
+test_examples/test_output_variables_fixed_v4/data/minecraft/tags/function/load.json
+test_examples/test_output_variables_fixed_v4/data/variables/function/load.mcfunction
+test_examples/test_output_variables_fixed_v4/data/variables/function/main.mcfunction
+test_examples/test_output_variables_fixed_v4/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.10"
-tag: "v15.3.10"
-updated_at: "2025-09-02T00:59:15Z"

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

minecraft-datapack-language 15.3.11tar.gz → 15.3.13tar.gz