minecraft-datapack-language 15.1.79__py3-none-any.whl → 15.1.81__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.79'
-__version_tuple__ = version_tuple = (15, 1, 79)
+__version__ = version = '15.1.81'
+__version_tuple__ = version_tuple = (15, 1, 81)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -155,14 +155,16 @@ def _generate_scoreboard_objectives(ast: Dict[str, Any], output_dir: Path) -> Li
     """Generate scoreboard objectives for all variables."""
     scoreboard_commands = []
     
-    # Collect all variable names
-    variables = set()
+    # Collect all variable names in order of appearance
+    variables = []
+    seen_variables = set()
     
-    # From variable declarations
+    # From variable declarations (preserve order)
     if 'variables' in ast:
         for var_decl in ast['variables']:
-            if 'name' in var_decl:
-                variables.add(var_decl['name'])
+            if 'name' in var_decl and var_decl['name'] not in seen_variables:
+                variables.append(var_decl['name'])
+                seen_variables.add(var_decl['name'])
     
     # From functions (scan for variable usage)
     if 'functions' in ast:
@@ -171,7 +173,9 @@ def _generate_scoreboard_objectives(ast: Dict[str, Any], output_dir: Path) -> Li
                 for statement in func['body']:
                     # Look for variable assignments and usage
                     if statement['type'] == 'variable_assignment':
-                        variables.add(statement['name'])
+                        if statement['name'] not in seen_variables:
+                            variables.append(statement['name'])
+                            seen_variables.add(statement['name'])
                     elif statement['type'] == 'command':
                         # Scan command for variable substitutions
                         command = statement['command']
@@ -180,10 +184,12 @@ def _generate_scoreboard_objectives(ast: Dict[str, Any], output_dir: Path) -> Li
                         for var_name in var_matches:
                             # Extract base name from scoped variables
                             base_name = _extract_base_variable_name(var_name)
-                            variables.add(base_name)
+                            if base_name not in seen_variables:
+                                variables.append(base_name)
+                                seen_variables.add(base_name)
     
-    # Create scoreboard objectives
-    for var_name in sorted(variables):
+    # Create scoreboard objectives in the order they were found
+    for var_name in variables:
         scoreboard_commands.append(f"scoreboard objectives add {var_name} dummy")
     
     return scoreboard_commands
@@ -228,65 +234,38 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     matches = re.findall(var_pattern, content)
     
     if not matches:
-        # Check for common variable names that might have been processed
-        # This handles the case where $counter$ was converted to just "counter"
-        word_pattern = r'\b(counter|health|score|value|num|count|timer|level)\b'
-        word_matches = re.findall(word_pattern, content)
-        
-        if word_matches:
-            # Process the content by replacing each variable with a score component
-            components = []
-            processed_content = content
-            
-            # 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))
-            
-            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)
-            return f'tellraw @a [{components_str}]'
-        else:
-            # No variables, return simple tellraw
-            return f'tellraw @a [{{"text":"{content}"}}]'
+        # 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('>'):
@@ -298,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)
@@ -640,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_{statement_index}"
     
     # Process loop body
     body_commands = []

{minecraft_datapack_language-15.1.79.dist-info → minecraft_datapack_language-15.1.81.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=7PWCRp2xvvtqOU9-v0sUo-hlqnk8pYpE35SXtmgBVfE,708
+minecraft_datapack_language/_version.py,sha256=PouTZRlXiJiT85KKzWG-K7UwauiTv-ftV3RaLTyPh64,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=s90ZjY4jItiYYKtcpM7KrrHiJA7xurvqgCmrOcqsvl4,43188
+minecraft_datapack_language/cli_build.py,sha256=aPlyB5DKoafCpxbFl597kR5-m3eP1YGqtsKOqrQD68Y,42212
 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.79.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.79.dist-info/METADATA,sha256=nVuBxWl4SqJwOqTwwpssvRpUICHDIOZukbPSt30RrwI,35230
-minecraft_datapack_language-15.1.79.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.79.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.79.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.79.dist-info/RECORD,,
+minecraft_datapack_language-15.1.81.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.81.dist-info/METADATA,sha256=ewdotxZ8pwgR6MIp3oHVTvZDPIORWkLlGKv5mrJfFqw,35230
+minecraft_datapack_language-15.1.81.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.81.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.81.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.81.dist-info/RECORD,,