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

minecraft_datapack_language/cli_build.py

@@ -193,6 +193,9 @@ def _generate_load_function(scoreboard_commands: List[str], output_dir: Path, na
     """Generate the load function with scoreboard setup."""
     load_content = []
     
+    # Add armor stand setup for server-side operations
+    load_content.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}")
+    
     # Add scoreboard objectives
     load_content.extend(scoreboard_commands)
     
@@ -213,15 +216,20 @@ 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
     
+    # Clean up the content - remove quotes if present
+    content = content.strip()
+    if content.startswith('"') and content.endswith('"'):
+        content = content[1:-1]  # Remove surrounding quotes
+    
     # 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}}}]'
+        return f'tellraw @a [{{"text":"{content}"}}]'
     
-    # Split content by variable references
+    # Split content by variable references while preserving the structure
     parts = re.split(var_pattern, content)
     
     # Build tellraw components
@@ -244,8 +252,8 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
                 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}"}}}}')
+                # 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
     
@@ -274,6 +282,10 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
             # Convert to Minecraft tellraw format
             processed_command = _process_say_command_with_variables(content, selector)
             commands.append(processed_command)
+        elif command.startswith('tellraw @a '):
+            # Fix extra space in tellraw commands
+            fixed_command = command.replace('tellraw @ a ', 'tellraw @a ')
+            commands.append(fixed_command)
         else:
             # Process other commands normally
             processed_command = _process_variable_substitutions(command, selector)
@@ -285,26 +297,50 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         
         # Handle different value types
         if isinstance(value, int):
-            commands.append(f"scoreboard players set {var_name} {selector} {value}")
+            commands.append(f"scoreboard players set {selector} {var_name} {value}")
         elif isinstance(value, str) and value.startswith('$') and value.endswith('$'):
             # Variable reference
             ref_var = value[1:-1]  # Remove $ symbols
-            commands.append(f"scoreboard players operation {var_name} {selector} = {ref_var} {selector}")
+            commands.append(f"scoreboard players operation {selector} {var_name} = {selector} {ref_var}")
         elif hasattr(value, '__class__') and 'BinaryExpression' in str(value.__class__):
             # Handle complex expressions (BinaryExpression, etc.)
-            # For now, add a placeholder command
-            commands.append(f"# Complex assignment: {var_name} = {value}")
+            # Convert to proper Minecraft scoreboard commands
+            if hasattr(value, 'left') and hasattr(value, 'right') and hasattr(value, 'operator'):
+                left = value.left
+                right = value.right
+                operator = value.operator
+                
+                # Handle different operators
+                if operator == 'PLUS':
+                    if hasattr(left, 'name') and hasattr(right, 'value'):
+                        # counter = counter + 1
+                        commands.append(f"scoreboard players add {selector} {var_name} {right.value}")
+                    else:
+                        # Complex case - use operation
+                        commands.append(f"# Complex addition: {var_name} = {left} + {right}")
+                elif operator == 'MINUS':
+                    if hasattr(left, 'name') and hasattr(right, 'value'):
+                        # health = health - 10
+                        commands.append(f"scoreboard players remove {selector} {var_name} {right.value}")
+                    else:
+                        # Complex case - use operation
+                        commands.append(f"# Complex subtraction: {var_name} = {left} - {right}")
+                else:
+                    # Other operators - use operation
+                    commands.append(f"# Complex operation: {var_name} = {left} {operator} {right}")
+            else:
+                commands.append(f"# Complex assignment: {var_name} = {value}")
         else:
             # Handle LiteralExpression and other value types
             try:
                 if hasattr(value, 'value'):
                     # LiteralExpression case
                     num_value = int(value.value)
-                    commands.append(f"scoreboard players set {var_name} {selector} {num_value}")
+                    commands.append(f"scoreboard players set {selector} {var_name} {num_value}")
                 else:
                     # Direct value case
                     num_value = int(value)
-                    commands.append(f"scoreboard players set {var_name} {selector} {num_value}")
+                    commands.append(f"scoreboard players set {selector} {var_name} {num_value}")
             except (ValueError, TypeError):
                 # If we can't convert to int, add a placeholder
                 commands.append(f"# Assignment: {var_name} = {value}")
@@ -328,7 +364,11 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
         
         # Write conditional function
         if if_commands:
-            if_dir = Path(f"data/{namespace}/function")
+            # Use the output directory from build context
+            if hasattr(build_context, 'output_dir'):
+                if_dir = build_context.output_dir / "data" / namespace / "function"
+            else:
+                if_dir = Path(f"data/{namespace}/function")
             ensure_dir(str(if_dir))
             with open(if_dir / f"{if_func_name}.mcfunction", 'w', encoding='utf-8') as f:
                 f.write('\n'.join(if_commands))
@@ -410,11 +450,17 @@ 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
+            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}")
+            final_commands.append("")
+            final_commands.extend(function_commands)
+            
             func_dir = output_dir / "data" / namespace / "function"
             ensure_dir(str(func_dir))
             
             with open(func_dir / f"{func_name}.mcfunction", 'w', encoding='utf-8') as f:
-                f.write('\n'.join(function_commands))
+                f.write('\n'.join(final_commands))
             
             if verbose:
                 print(f"Generated function: {namespace}:{func_name}")
@@ -442,6 +488,11 @@ def _generate_hook_files(ast: Dict[str, Any], output_dir: Path, namespace: str,
             if hook['hook_type'] == 'load':
                 load_values.append(hook['function_name'])
     
+    # Add pack-specific load function if pack name is available
+    if 'pack' in ast and 'name' in ast['pack']:
+        pack_name = ast['pack']['name']
+        load_values.append(f"{pack_name}:load")
+    
     load_tag_content = {
         "values": load_values
     }
@@ -540,7 +591,11 @@ def _process_while_loop_recursion(while_statement, namespace: str, function_name
     
     # Write loop body function
     if body_commands:
-        func_dir = Path(f"data/{namespace}/function")
+        # Use the output directory from build context
+        if hasattr(build_context, 'output_dir'):
+            func_dir = build_context.output_dir / "data" / namespace / "function"
+        else:
+            func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
         with open(func_dir / f"{loop_body_func_name}.mcfunction", 'w', encoding='utf-8') as f:
             f.write('\n'.join(body_commands))
@@ -586,7 +641,11 @@ def _process_while_loop_schedule(while_statement, namespace: str, function_name:
     
     # Write loop body function
     if body_commands:
-        func_dir = Path(f"data/{namespace}/function")
+        # Use the output directory from build context
+        if hasattr(build_context, 'output_dir'):
+            func_dir = build_context.output_dir / "data" / namespace / "function"
+        else:
+            func_dir = Path(f"data/{namespace}/function")
         ensure_dir(str(func_dir))
         with open(func_dir / f"{loop_body_func_name}.mcfunction", 'w', encoding='utf-8') as f:
             f.write('\n'.join(body_commands))

minecraft_datapack_language/cli_utils.py

@@ -119,6 +119,24 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
     # Remove extra whitespace and normalize
     condition = condition.strip()
     
+    # Handle variable substitution in conditions (e.g., "$value$ > 3")
+    import re
+    var_pattern = r'\$([^$]+)\$'
+    
+    # Replace variable references with proper scoreboard syntax
+    def replace_var(match):
+        var_name = match.group(1)
+        # Remove scope selector if present
+        if '<' in var_name and var_name.endswith('>'):
+            var_parts = var_name.split('<', 1)
+            base_var = var_parts[0]
+            return f"@e[type=armor_stand,tag=mdl_server,limit=1] {base_var}"
+        else:
+            return f"@e[type=armor_stand,tag=mdl_server,limit=1] {var_name}"
+    
+    # Apply variable substitution
+    condition = re.sub(var_pattern, replace_var)
+    
     # Handle common patterns
     if '==' in condition:
         var1, var2 = condition.split('==', 1)
@@ -128,10 +146,10 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
         # Check if var2 is a number
         try:
             value = int(var2)
-            return f"score {var1} {selector} matches {value}"
+            return f"score {var1} matches {value}"
         except ValueError:
             # Both are variables, compare them
-            return f"score {var1} {selector} = {var2} {selector}"
+            return f"score {var1} = {var2}"
     
     elif '!=' in condition:
         var1, var2 = condition.split('!=', 1)
@@ -140,9 +158,9 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
         
         try:
             value = int(var2)
-            return f"score {var1} {selector} matches ..{value-1} {value+1}.."
+            return f"score {var1} matches ..{value-1} {value+1}.."
         except ValueError:
-            return f"score {var1} {selector} != {var2} {selector}"
+            return f"score {var1} != {var2}"
     
     elif '>' in condition:
         var1, var2 = condition.split('>', 1)
@@ -151,9 +169,9 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
         
         try:
             value = int(var2)
-            return f"score {var1} {selector} matches {value+1}.."
+            return f"score {var1} matches {value+1}.."
         except ValueError:
-            return f"score {var1} {selector} > {var2} {selector}"
+            return f"score {var1} > {var2}"
     
     elif '<' in condition:
         var1, var2 = condition.split('<', 1)
@@ -162,9 +180,9 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
         
         try:
             value = int(var2)
-            return f"score {var1} {selector} matches ..{value-1}"
+            return f"score {var1} matches ..{value-1}"
         except ValueError:
-            return f"score {var1} {selector} < {var2} {selector}"
+            return f"score {var1} < {var2}"
     
     elif '>=' in condition:
         var1, var2 = condition.split('>=', 1)
@@ -173,9 +191,9 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
         
         try:
             value = int(var2)
-            return f"score {var1} {selector} matches {value}.."
+            return f"score {var1} matches {value}.."
         except ValueError:
-            return f"score {var1} {selector} >= {var2} {selector}"
+            return f"score {var1} >= {var2}"
     
     elif '<=' in condition:
         var1, var2 = condition.split('<=', 1)
@@ -184,12 +202,12 @@ def _convert_condition_to_minecraft_syntax(condition: str, selector: str = "@s")
         
         try:
             value = int(var2)
-            return f"score {var1} {selector} matches ..{value}"
+            return f"score {var1} matches ..{value}"
         except ValueError:
-            return f"score {var1} {selector} <= {var2} {selector}"
+            return f"score {var1} <= {var2}"
     
     # Default: treat as a variable that should be non-zero
-    return f"score {condition} {selector} matches 1.."
+    return f"score {condition} matches 1.."
 
 
 def _find_mdl_files(directory: Path) -> List[Path]:

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

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

@@ -1,12 +1,12 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=kT4vFfqTGE0yqzzOA5QjfjVNdwoR0e2Fdpe1CF8Ke6E,708
+minecraft_datapack_language/_version.py,sha256=7XSJDjuzb6Ytmg80BCgGO_aHPtsA2iZo3CHgHS1KD24,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=_U8pYPpjcaaODb6wfyUUzdA1ki8MmF_6_MBdBxmrafY,36574
+minecraft_datapack_language/cli_build.py,sha256=UwAGGnL7PyTnBZ9ArIrPcTx5-mysy_HGWA_f9-AjUak,39959
 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
-minecraft_datapack_language/cli_utils.py,sha256=gLGe2nAn8pLiSJhn-DpNvMxo0th_Gj89I-oSeyPx4zU,9293
+minecraft_datapack_language/cli_utils.py,sha256=OF64njFa_19qGJ-1EBMI8btMs8OUi-0wGoFAQo6525U,9775
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
 minecraft_datapack_language/expression_processor.py,sha256=GN6cuRNvgI8TrV6YnEHrA9P0X-ACTT7rCBh4WlOPjSI,20140
 minecraft_datapack_language/linter.py,sha256=7UqbygC5JPCGg-BSOq65NB2xEJBu_OUOYIIgmHItO2M,16567
@@ -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.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,,
+minecraft_datapack_language-15.1.65.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.65.dist-info/METADATA,sha256=r8kJIxQ6Z_eslXNyagKOtfz_Cq5vX_1f6U9Q33saoRw,35230
+minecraft_datapack_language-15.1.65.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.65.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.65.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.65.dist-info/RECORD,,