minecraft-datapack-language 15.1.75__py3-none-any.whl → 15.1.77__py3-none-any.whl

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.75'
-__version_tuple__ = version_tuple = (15, 1, 75)
+__version__ = version = '15.1.77'
+__version_tuple__ = version_tuple = (15, 1, 77)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -234,29 +234,37 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
         word_matches = re.findall(word_pattern, content)
         
         if word_matches:
-            # Found potential variables, convert to score components
+            # Process the content by replacing each variable with a score component
             components = []
-            remaining_content = content
+            processed_content = content
             
-            for var_name in word_matches:
-                # Find the position of this variable in the remaining content
-                var_pos = remaining_content.find(var_name)
-                if var_pos >= 0:
-                    # Add text before variable
-                    if var_pos > 0:
-                        text_before = remaining_content[:var_pos]
-                        if text_before:
-                            components.append(f'{{"text":"{text_before}"}}')
-                    
-                    # Add score component for variable
-                    components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
-                    
-                    # Continue with remaining content after this variable
-                    remaining_content = remaining_content[var_pos + len(var_name):]
+            # Sort variables by their position in the content to process them in order
+            var_positions = []
+            for var_name in set(word_matches):  # Remove duplicates
+                pos = processed_content.find(var_name)
+                if pos >= 0:
+                    var_positions.append((pos, var_name))
             
-            # Add remaining text
-            if remaining_content:
-                components.append(f'{{"text":"{remaining_content}"}}')
+            var_positions.sort()  # Sort by position
+            
+            last_pos = 0
+            for pos, var_name in var_positions:
+                # Add text before this variable
+                if pos > last_pos:
+                    text_before = processed_content[last_pos:pos]
+                    if text_before:
+                        components.append(f'{{"text":"{text_before}"}}')
+                
+                # Add score component for variable
+                components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
+                
+                last_pos = pos + len(var_name)
+            
+            # Add remaining text after last variable
+            if last_pos < len(processed_content):
+                remaining_text = processed_content[last_pos:]
+                if remaining_text:
+                    components.append(f'{{"text":"{remaining_text}"}}')
             
             # Combine all components
             components_str = ','.join(components)
@@ -424,10 +432,12 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         
         # Add the conditional execution command
         if else_body:
-            commands.append(f"execute {minecraft_condition} run function {namespace}:{if_func_name}")
+            commands.append(f"execute if {minecraft_condition} run function {namespace}:{if_func_name}")
             commands.append(f"execute unless {minecraft_condition} run function {namespace}:{else_func_name}")
+            # Add if_end function call for cleanup
+            commands.append(f"function {namespace}:{function_name}_if_end_{statement_index}")
         else:
-            commands.append(f"execute {minecraft_condition} run function {namespace}:{if_func_name}")
+            commands.append(f"execute if {minecraft_condition} run function {namespace}:{if_func_name}")
     
     elif statement['type'] == 'while_loop' or statement['type'] == 'while_statement':
         # Handle while loops using recursion
@@ -488,9 +498,15 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         
         # Write function file
         if function_commands:
-            # Add armor stand setup to the beginning of each function
+            # 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))
+            
             final_commands = []
-            final_commands.append("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}")
+            if should_add_armor_stand:
+                final_commands.append("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}")
             final_commands.extend(function_commands)
             
             if verbose:
@@ -646,16 +662,16 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     # Create the main loop function
     minecraft_condition = _convert_condition_to_minecraft_syntax(condition, selector)
     loop_commands = [
-        f"execute {minecraft_condition} run function {namespace}:{loop_body_func_name}",
-        f"execute {minecraft_condition} run function {namespace}:{loop_func_name}"
+        f"execute if {minecraft_condition} run function {namespace}:{loop_body_func_name}",
+        f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}"
     ]
     
     # Write loop function
     with open(func_dir / f"{loop_func_name}.mcfunction", 'w', encoding='utf-8') as f:
         f.write('\n'.join(loop_commands))
     
-    # Return the command to start the loop
-    return [f"function {namespace}:{loop_func_name}"]
+    # Return the command to start the loop with conditional execution
+    return [f"execute if {minecraft_condition} run function {namespace}:{loop_func_name}"]
 
 
 def _process_while_loop_schedule(while_statement, namespace: str, function_name: str, statement_index: int, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:

{minecraft_datapack_language-15.1.75.dist-info → minecraft_datapack_language-15.1.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.75
+Version: 15.1.77
 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.75.dist-info → minecraft_datapack_language-15.1.77.dist-info}/RECORD

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=bukgiJaLfd44bN73uBPz3hCzin-QTY3ff3p-wP0h-iU,708
+minecraft_datapack_language/_version.py,sha256=MX48oNCAEJyrqB8cvh5XZc3fKpHeRjMav0PQLztoKfo,708
 minecraft_datapack_language/ast_nodes.py,sha256=pgjI2Nlap3ixFPgWqGSkqncG9zB91h5BKgRjtcJqMew,2118
 minecraft_datapack_language/cli.py,sha256=p5A_tEEXugN2NhQFbbgfwi4FxbWYD91RWeKR_A3Vuec,6263
-minecraft_datapack_language/cli_build.py,sha256=KA6tW7Zzdeh3DGwwi05AcKDc3mKn9sAbEn1Nr42DxYE,42285
+minecraft_datapack_language/cli_build.py,sha256=s90ZjY4jItiYYKtcpM7KrrHiJA7xurvqgCmrOcqsvl4,43188
 minecraft_datapack_language/cli_check.py,sha256=bPq9gHsxQ1CIiftkrAtRCifWkVAyjp5c8Oay2NNQ1qs,6277
 minecraft_datapack_language/cli_help.py,sha256=jUTHUQBONAZKVTdQK9tNPXq4c_6xpsafNOvHDjkEldg,12243
 minecraft_datapack_language/cli_new.py,sha256=uaKH0VBC43XBt_Hztc35-BfC9bYlsDdLbAfe_42rrtI,8235
@@ -16,9 +16,9 @@ minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYa
 minecraft_datapack_language/mdl_parser_js.py,sha256=4VMWx6O7A10afTzjGnnwL_Sh52osIO84ObqHp8KoDZw,38677
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.1.75.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.75.dist-info/METADATA,sha256=c50ZFTMwtTzQN9fccyHDjRxMejtQJ2ytAzW49EEhr8Q,35230
-minecraft_datapack_language-15.1.75.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.75.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.75.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.75.dist-info/RECORD,,
+minecraft_datapack_language-15.1.77.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.77.dist-info/METADATA,sha256=uK2ZkCkYfQGenqR7J362qUSKpmnVS78e5JIgOZL1XPI,35230
+minecraft_datapack_language-15.1.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.77.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.77.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.77.dist-info/RECORD,,