minecraft-datapack-language 15.1.80__tar.gz → 15.1.82__tar.gz

{minecraft_datapack_language-15.1.80/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.1.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.80
+Version: 15.1.82
 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.1.82/data/test/function/test_main_while_0.mcfunction

@@ -0,0 +1,2 @@
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] counter matches ..2 run function test:test_main_while_0
+execute if score @e[type=armor_stand,tag=mdl_server,limit=1] counter matches ..2 run function test:test_main_while_0

minecraft_datapack_language-15.1.82/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.1.81"
+tag: "v15.1.81"
+updated_at: "2025-09-01T23:27:18Z"

{minecraft_datapack_language-15.1.80 → minecraft_datapack_language-15.1.82}/minecraft_datapack_language/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '15.1.80'
-__version_tuple__ = version_tuple = (15, 1, 80)
+__version__ = version = '15.1.82'
+__version_tuple__ = version_tuple = (15, 1, 82)
 
-__commit_id__ = commit_id = 'g3fec53f32'
+__commit_id__ = commit_id = 'g6cad1cb76'

{minecraft_datapack_language-15.1.80 → minecraft_datapack_language-15.1.82}/minecraft_datapack_language/cli_build.py

@@ -237,20 +237,35 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
         # No variables, return simple tellraw
         return f'tellraw @a [{{"text":"{content}"}}]'
     
-    # Split content by variable references while preserving the structure
-    parts = re.split(var_pattern, content)
+    # Use re.sub to replace variables with placeholders, then split by placeholders
+    # This avoids the issue with re.split including captured groups
+    placeholder_content = content
+    var_placeholders = []
+    
+    for i, match in enumerate(matches):
+        placeholder = f"__VAR_{i}__"
+        var_placeholders.append((placeholder, match))
+        placeholder_content = placeholder_content.replace(f"${match}$", placeholder, 1)
+    
+    # Split by placeholders to get text parts
+    text_parts = placeholder_content
+    for placeholder, var_name in var_placeholders:
+        text_parts = text_parts.replace(placeholder, f"|{var_name}|")
+    
+    # Now split by the pipe delimiters
+    parts = text_parts.split('|')
     
     # Build tellraw components
     components = []
-    var_index = 0
     
     for i, part in enumerate(parts):
-        if part:  # Add text component if not empty
-            components.append(f'{{"text":"{part}"}}')
-        
-        # Add score component if this is followed by a variable
-        if i < len(parts) - 1 and var_index < len(matches):
-            var_name = matches[var_index]
+        if i % 2 == 0:
+            # Text part
+            if part:  # Add text component if not empty
+                components.append(f'{{"text":"{part}"}}')
+        else:
+            # Variable part
+            var_name = part
             
             # Check if variable has scope selector
             if '<' in var_name and var_name.endswith('>'):
@@ -262,8 +277,6 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
             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}"}}}}')
-            
-            var_index += 1
     
     # Combine all components
     components_str = ','.join(components)
@@ -464,9 +477,9 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         if function_commands:
             # Only add armor stand setup to main functions that need it
             # Don't add to helper functions or functions in the "other" namespace
-            should_add_armor_stand = (namespace != "other" and 
-                                    func_name in ["main", "init", "load"] or 
-                                    any(cmd for cmd in function_commands if "scoreboard" in cmd or "tellraw" in cmd))
+                        should_add_armor_stand = (namespace != "other" and 
+                                     (func_name in ["main", "init", "load"] or 
+                                      any(cmd for cmd in function_commands if "scoreboard" in cmd or "tellraw" in cmd)))
             
             final_commands = []
             if should_add_armor_stand:
@@ -604,8 +617,8 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     body = while_statement['body']
     
     # Generate unique function names
-    loop_func_name = f"{function_name}_while_{statement_index}"
-    loop_body_func_name = f"{function_name}_while_body_{statement_index}"
+    loop_func_name = f"{namespace}_{function_name}_while_{statement_index}"
+    loop_body_func_name = f"{namespace}_{function_name}_while_body_{statement_index}"
     
     # Process loop body
     body_commands = []

{minecraft_datapack_language-15.1.80 → minecraft_datapack_language-15.1.82/minecraft_datapack_language.egg-info}/PKG-INFO

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

@@ -54,6 +54,9 @@ test_simple_output3.zip
 test_simple_output4.zip
 test_simple_output5.zip
 test_verbose.zip
+test_while_debug.mdl
+test_while_debug.zip
+test_while_debug_output.zip
 ./minecraft_datapack_language/__init__.py
 ./minecraft_datapack_language/_version.py
 ./minecraft_datapack_language/ast_nodes.py
@@ -237,6 +240,7 @@ data/test/function/test_if_else_else_3.mcfunction
 data/test/function/test_if_else_if_1.mcfunction
 data/test/function/test_if_else_if_2.mcfunction
 data/test/function/test_if_else_if_3.mcfunction
+data/test/function/test_main_while_0.mcfunction
 data/test/function/test_nested_if_else_1.mcfunction
 data/test/function/test_nested_if_else_2.mcfunction
 data/test/function/test_nested_if_else_2_else_0.mcfunction
@@ -735,6 +739,14 @@ test_verbose/data/test1/function/test1_tick_while_1.mcfunction
 test_verbose/data/test1/function/tick.mcfunction
 test_verbose/data/test1/function/tick_if_2.mcfunction
 test_verbose/data/test1/function/tick_if_end_2.mcfunction
+test_while_debug/pack.mcmeta
+test_while_debug/data/hello_world/function/load.mcfunction
+test_while_debug/data/hello_world/function/main.mcfunction
+test_while_debug/data/minecraft/tags/function/load.json
+test_while_debug_output/pack.mcmeta
+test_while_debug_output/data/minecraft/tags/function/load.json
+test_while_debug_output/data/test/function/load.mcfunction
+test_while_debug_output/data/test/function/main.mcfunction
 test_while_loops_fixed/pack.mcmeta
 test_while_loops_fixed/data/minecraft/tags/function/load.json
 test_while_loops_fixed/data/while_loops/function/countdown.mcfunction

minecraft_datapack_language-15.1.82/test_while_debug/data/hello_world/function/load.mcfunction

@@ -0,0 +1 @@
+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}

minecraft_datapack_language-15.1.82/test_while_debug/data/hello_world/function/main.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":"Hello, World!"}]
+tellraw @a "Welcome to MDL!"

minecraft_datapack_language-15.1.82/test_while_debug/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.1.82/test_while_debug/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "A simple hello world datapack"
+  }
+}

minecraft_datapack_language-15.1.82/test_while_debug.mdl

@@ -0,0 +1,10 @@
+pack "While Test" "Testing while loops" 82;
+namespace "test";
+var num counter = 0;
+function "main" {
+    while "$counter$ < 3" {
+        say "Counter: $counter$";
+        counter = $counter$ + 1;
+    }
+}
+on_load "test:main";

minecraft_datapack_language-15.1.82/test_while_debug_output/data/minecraft/tags/function/load.json

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

minecraft_datapack_language-15.1.82/test_while_debug_output/data/test/function/load.mcfunction

@@ -0,0 +1,2 @@
+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 counter dummy

minecraft_datapack_language-15.1.82/test_while_debug_output/data/test/function/main.mcfunction

@@ -0,0 +1,2 @@
+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] counter matches ..2 run function test:main_while_0

minecraft_datapack_language-15.1.82/test_while_debug_output/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+  "pack": {
+    "pack_format": 82,
+    "description": "Testing while loops"
+  }
+}

minecraft_datapack_language-15.1.80/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.1.79"
-tag: "v15.1.79"
-updated_at: "2025-09-01T23:18:59Z"