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

minecraft_datapack_language/cli_build.py

@@ -195,7 +195,6 @@ def _generate_load_function(scoreboard_commands: List[str], output_dir: Path, na
     
     # 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}")
-    load_content.append("")
     
     # Add scoreboard objectives
     load_content.extend(scoreboard_commands)
@@ -283,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)
@@ -294,11 +297,11 @@ 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.)
             # Convert to proper Minecraft scoreboard commands
@@ -311,14 +314,14 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
                 if operator == 'PLUS':
                     if hasattr(left, 'name') and hasattr(right, 'value'):
                         # counter = counter + 1
-                        commands.append(f"scoreboard players add {var_name} {selector} {right.value}")
+                        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 {var_name} {selector} {right.value}")
+                        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}")
@@ -333,11 +336,11 @@ def _process_statement(statement: Any, namespace: str, function_name: str, state
                 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}")
@@ -434,10 +437,12 @@ def _generate_function_file(ast: Dict[str, Any], output_dir: Path, namespace: st
         function_commands = []
         for i, statement in enumerate(func_body):
             try:
+                if verbose:
+                    print(f"DEBUG: Processing statement {i} of type {statement.get('type', 'unknown')}: {statement}")
                 commands = _process_statement(statement, namespace, func_name, i, False, "@s", {}, build_context)
                 function_commands.extend(commands)
                 if verbose:
-                    print(f"Generated {len(commands)} commands for statement {i} in function {func_name}")
+                    print(f"Generated {len(commands)} commands for statement {i} in function {func_name}: {commands}")
             except Exception as e:
                 if verbose:
                     print(f"Warning: Error processing statement {i} in function {func_name}: {e}")
@@ -447,11 +452,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}")

{minecraft_datapack_language-15.1.64.dist-info → minecraft_datapack_language-15.1.66.dist-info}/METADATA

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

@@ -1,8 +1,8 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=DJ37ZFW0-8bmiU8fhrOkLHBwJ5JCGFDJDrTsKgcDtr4,708
+minecraft_datapack_language/_version.py,sha256=XaWr400473_Igz1L5PwRIHAYUo89bDeGrP21_54xiUE,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=hrD48HTeI4h3jOUU18UVPUx7m6sOD7CuJ1hCCU7iTZ4,39358
+minecraft_datapack_language/cli_build.py,sha256=HC-tIcmUYz1zH9xkQ0PUUXd1E0cMFYfRE6vDb749JlU,40117
 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.64.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.64.dist-info/METADATA,sha256=Y1PLkQMTnvjgUwSwSbVwES8QhXoG3CnJjysLUspxw8w,35230
-minecraft_datapack_language-15.1.64.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.64.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.64.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.64.dist-info/RECORD,,
+minecraft_datapack_language-15.1.66.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.66.dist-info/METADATA,sha256=YjxzdBrfgB5qI2DcvQVJhBGUWLpr7m7DM6L-o3c3R1Q,35230
+minecraft_datapack_language-15.1.66.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.66.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.66.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.66.dist-info/RECORD,,