minecraft-datapack-language 15.3.8__py3-none-any.whl → 15.3.10__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.3.8'
-__version_tuple__ = version_tuple = (15, 3, 8)
+__version__ = version = '15.3.10'
+__version_tuple__ = version_tuple = (15, 3, 10)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -218,7 +218,7 @@ 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:
+def _process_say_command_with_variables(content: str, selector: str, variable_scopes: Dict[str, str] = None) -> str:
     """Process say command content with variable substitution, converting to tellraw with score components."""
     import re
     
@@ -229,7 +229,33 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     if content.startswith('"') and content.endswith('"'):
         content = content[1:-1]  # Remove surrounding quotes
     
-    # Find all variable references like $variable$ or $variable<selector>$
+    # First, check for MDL-style variable references (no $ symbols)
+    # Look for common variable names that might be in the content
+    if variable_scopes:
+        for var_name, var_scope in variable_scopes.items():
+            if var_name in content:
+                # Found a variable reference, convert to score component
+                if var_scope == 'global':
+                    var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+                else:
+                    var_selector = var_scope
+                
+                # Split content around the variable
+                parts = content.split(var_name)
+                if len(parts) == 2:
+                    # Build tellraw components
+                    components = []
+                    if parts[0]:  # Text before variable
+                        components.append(f'{{"text":"{parts[0]}"}}')
+                    # Variable as score component
+                    components.append(f'{{"score":{{"name":"{var_selector}","objective":"{var_name}"}}}}')
+                    if parts[1]:  # Text after variable
+                        components.append(f'{{"text":"{parts[1]}"}}')
+                    
+                    components_str = ','.join(components)
+                    return f'tellraw @a [{components_str}]'
+    
+    # Fallback: Look for traditional $variable$ syntax
     var_pattern = r'\$([^$]+)\$'
     matches = re.findall(var_pattern, content)
     
@@ -303,7 +329,7 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
             content = command[4:]  # Remove "say " prefix
             print(f"DEBUG: Say command content: {repr(content)}")
             # Convert to Minecraft tellraw format
-            processed_command = _process_say_command_with_variables(content, selector)
+            processed_command = _process_say_command_with_variables(content, selector, variable_scopes)
             print(f"DEBUG: Processed say command: {repr(processed_command)}")
             commands.append(processed_command)
         elif command.startswith('tellraw @a ') or command.startswith('tellraw @ a '):
@@ -805,29 +831,29 @@ def _ast_to_pack(ast: Dict[str, Any], mdl_files: List[Path]) -> Pack:
                             else:
                                 # Simple function call without scope
                                 function.commands.append(f"function {func_namespace}:{func_name}")
-                                                 elif statement.get('type') == 'variable_assignment':
-                             # Handle variable assignments
-                             var_name = statement['name']
-                             value = statement['value']
-                             
-                             # Determine selector based on variable scope
-                             var_selector = "@s"  # Default
-                             if 'variables' in ast:
-                                 for var_decl in ast['variables']:
-                                     if var_decl.get('name') == var_name:
-                                         var_scope = var_decl.get('scope')
-                                         if var_scope == 'global':
-                                             var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
-                                         elif var_scope:
-                                             var_selector = var_scope
-                                         break
-                             
-                             if hasattr(value, 'value'):
-                                 # Simple literal value
-                                 function.commands.append(f"scoreboard players set {var_name} {var_selector} {value.value}")
-                             else:
-                                 # Complex expression - add a placeholder
-                                 function.commands.append(f"# Variable assignment: {var_name} = {value}")
+                        elif statement.get('type') == 'variable_assignment':
+                            # Handle variable assignments
+                            var_name = statement['name']
+                            value = statement['value']
+                            
+                            # Determine selector based on variable scope
+                            var_selector = "@s"  # Default
+                            if 'variables' in ast:
+                                for var_decl in ast['variables']:
+                                    if var_decl.get('name') == var_name:
+                                        var_scope = var_decl.get('scope')
+                                        if var_scope == 'global':
+                                            var_selector = "@e[type=armor_stand,tag=mdl_server,limit=1]"
+                                        elif var_scope:
+                                            var_selector = var_scope
+                                        break
+                            
+                            if hasattr(value, 'value'):
+                                # Simple literal value
+                                function.commands.append(f"scoreboard players set {var_name} {var_selector} {value.value}")
+                            else:
+                                # Complex expression - add a placeholder
+                                function.commands.append(f"# Variable assignment: {var_name} = {value}")
                         else:
                             # Add a placeholder for other statement types
                             function.commands.append(f"# Statement: {statement.get('type', 'unknown')}")

{minecraft_datapack_language-15.3.8.dist-info → minecraft_datapack_language-15.3.10.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=5Brn3tTXfQ-8VOitx7xWNfzbtGKr8Ew9f_ekMlcHt4Q,706
+minecraft_datapack_language/_version.py,sha256=jlQaM5mHBhSD-7nY4sOnfZHzOvMmAugJtfBhm4Zwqis,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=T3xVSRDigJpyph4Nam_Sf9dXXHE7Qu3QwvfCmCGXno4,46032
+minecraft_datapack_language/cli_build.py,sha256=bPgcawetrB3c076uqSGILFNAPIfYpn8So4wICa93Bqw,47329
 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=Ap7EDpC5wbu1qFmC8htzd8rRqSyYugt58h0AppfDD6s,40171
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.3.8.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.3.8.dist-info/METADATA,sha256=lCeuK6MGu76vUYdj3vX1jOBrvLGelya7GhhFoC5_BNQ,35229
-minecraft_datapack_language-15.3.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.3.8.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.3.8.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.3.8.dist-info/RECORD,,
+minecraft_datapack_language-15.3.10.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.3.10.dist-info/METADATA,sha256=s11HAIHRS-uAI_zTVPeIJkp9ol4X6rGxwZ9PEHKLfCo,35230
+minecraft_datapack_language-15.3.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.3.10.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.3.10.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.3.10.dist-info/RECORD,,