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

minecraft_datapack_language/cli_build.py

@@ -209,6 +209,51 @@ 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:
+    """Process say command content with variable substitution, converting to tellraw with score components."""
+    import re
+    
+    # Find all variable references like $variable$ or $variable<selector>$
+    var_pattern = r'\$([^$]+)\$'
+    matches = re.findall(var_pattern, content)
+    
+    if not matches:
+        # No variables, return simple tellraw
+        return f'tellraw @a [{{"text":{content}}}]'
+    
+    # Split content by variable references
+    parts = re.split(var_pattern, content)
+    
+    # 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]
+            
+            # Check if variable has scope selector
+            if '<' in var_name and var_name.endswith('>'):
+                # Scoped variable: $variable<selector>$
+                var_parts = var_name.split('<', 1)
+                base_var = var_parts[0]
+                var_selector = var_parts[1][:-1]  # Remove trailing >
+                components.append(f'{{"score":{{"name":"{var_selector}","objective":"{base_var}"}}}}')
+            else:
+                # Simple variable: $variable$
+                components.append(f'{{"score":{{"name":"{selector}","objective":"{var_name}"}}}}')
+            
+            var_index += 1
+    
+    # Combine all components
+    components_str = ','.join(components)
+    return f'tellraw @a [{components_str}]'
+
+
 def _process_statement(statement: Any, namespace: str, function_name: str, statement_index: int = 0, is_tag_function: bool = False, selector: str = "@s", variable_scopes: Dict[str, str] = None, build_context: BuildContext = None) -> List[str]:
     """Process a single statement and return Minecraft commands."""
     if variable_scopes is None:
@@ -227,8 +272,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
             # Convert say command to tellraw command
             content = command[4:]  # Remove "say " prefix
             # Convert to Minecraft tellraw format
-            tellraw_command = f'tellraw @a [{{"text":{content}}}]'
-            processed_command = _process_variable_substitutions(tellraw_command, selector)
+            processed_command = _process_say_command_with_variables(content, selector)
             commands.append(processed_command)
         else:
             # Process other commands normally
@@ -251,10 +295,16 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
             # For now, add a placeholder command
             commands.append(f"# Complex assignment: {var_name} = {value}")
         else:
-            # Assume it's a number
+            # Handle LiteralExpression and other value types
             try:
-                num_value = int(value)
-                commands.append(f"scoreboard players set {var_name} {selector} {num_value}")
+                if hasattr(value, 'value'):
+                    # LiteralExpression case
+                    num_value = int(value.value)
+                    commands.append(f"scoreboard players set {var_name} {selector} {num_value}")
+                else:
+                    # Direct value case
+                    num_value = int(value)
+                    commands.append(f"scoreboard players set {var_name} {selector} {num_value}")
             except (ValueError, TypeError):
                 # If we can't convert to int, add a placeholder
                 commands.append(f"# Assignment: {var_name} = {value}")

{minecraft_datapack_language-15.1.61.dist-info → minecraft_datapack_language-15.1.63.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=zL9lE38jgcnGmhPyGcicDr7ViwCwscKvo2slxMFB46k,708
+minecraft_datapack_language/_version.py,sha256=kT4vFfqTGE0yqzzOA5QjfjVNdwoR0e2Fdpe1CF8Ke6E,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=GGkMB_2CRXGHFW2coy7jPUp5H3mqIQwE10L64BnYbIU,34573
+minecraft_datapack_language/cli_build.py,sha256=_U8pYPpjcaaODb6wfyUUzdA1ki8MmF_6_MBdBxmrafY,36574
 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.61.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.61.dist-info/METADATA,sha256=cV_levoR2IKLbmCetw_jSYu-1Ap43EbY1UkcPOE0CP8,35230
-minecraft_datapack_language-15.1.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.61.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.61.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.61.dist-info/RECORD,,
+minecraft_datapack_language-15.1.63.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.63.dist-info/METADATA,sha256=4V1-aPYtWcii4iq4tvsnPHLSIfzdJzku230oYucm_aY,35230
+minecraft_datapack_language-15.1.63.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.63.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.63.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.63.dist-info/RECORD,,