minecraft-datapack-language 15.4.35__py3-none-any.whl → 15.4.37__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.4.35'
-__version_tuple__ = version_tuple = (15, 4, 35)
+__version__ = version = '15.4.37'
+__version_tuple__ = version_tuple = (15, 4, 37)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli.py

@@ -145,8 +145,10 @@ def build_command(args):
         if args.verbose:
             print(f"Compiling to {output_dir}...")
         
+        # Support optional wrapper directory
+        if getattr(args, 'wrapper', None):
+            output_dir = output_dir / args.wrapper
         compiler = MDLCompiler()
-        # Note: --wrapper is currently accepted for compatibility but not required by compiler
         output_path = compiler.compile(final_ast, str(output_dir))
         
         print(f"Successfully built datapack: {output_path}")

minecraft_datapack_language/mdl_compiler.py

@@ -63,13 +63,13 @@ class MDLCompiler:
             if ast.namespace:
                 self.current_namespace = ast.namespace.name
             
-            # Create namespace directory
+            # Create namespace directory (for default/current)
             namespace_dir = data_dir / self.current_namespace
             namespace_dir.mkdir(parents=True, exist_ok=True)
             
             # Compile all components
             self._compile_variables(ast.variables, namespace_dir)
-            self._compile_functions(ast.functions, namespace_dir)
+            self._compile_functions(ast.functions, data_dir)
             self._compile_hooks(ast.hooks, namespace_dir)
             self._compile_statements(ast.statements, namespace_dir)
             self._compile_tags(ast.tags, source_dir)
@@ -123,15 +123,17 @@ class MDLCompiler:
             self.variables[var.name] = objective_name
             print(f"Variable: {var.name} -> scoreboard objective '{objective_name}'")
     
-    def _compile_functions(self, functions: List[FunctionDeclaration], namespace_dir: Path):
+    def _compile_functions(self, functions: List[FunctionDeclaration], data_dir: Path):
         """Compile function declarations into .mcfunction files."""
-        if self.dir_map:
-            functions_dir = namespace_dir / self.dir_map.function
-        else:
-            functions_dir = namespace_dir / "functions"
-        functions_dir.mkdir(parents=True, exist_ok=True)
-        
         for func in functions:
+            # Ensure namespace directory per function
+            ns_dir = data_dir / func.namespace
+            ns_dir.mkdir(parents=True, exist_ok=True)
+            if self.dir_map:
+                functions_dir = ns_dir / self.dir_map.function
+            else:
+                functions_dir = ns_dir / "functions"
+            functions_dir.mkdir(parents=True, exist_ok=True)
             func_file = functions_dir / f"{func.name}.mcfunction"
             content = self._generate_function_content(func)
             
@@ -148,9 +150,9 @@ class MDLCompiler:
             lines.append(f"# Scope: {func.scope}")
         lines.append("")
         
-        # Reset temporary commands for this function
-        if hasattr(self, 'temp_commands'):
-            self.temp_commands = []
+        # Ensure a temp-command sink stack exists
+        if not hasattr(self, '_temp_sink_stack'):
+            self._temp_sink_stack = []
         
         # Set current function context and reset per-function counters
         self._current_function_name = func.name
@@ -158,18 +160,15 @@ class MDLCompiler:
         self.else_counter = 0
         self.while_counter = 0
         
+        # Route temp commands into this function's body by default
+        self._temp_sink_stack.append(lines)
         # Generate commands from function body
         for statement in func.body:
             cmd = self._statement_to_command(statement)
             if cmd:
                 lines.append(cmd)
-        
-        # Add any temporary commands that were generated during compilation
-        if hasattr(self, 'temp_commands') and self.temp_commands:
-            lines.append("")
-            lines.append("# Temporary variable operations:")
-            for temp_cmd in self.temp_commands:
-                lines.append(temp_cmd)
+        # Done routing temp commands for this function body
+        self._temp_sink_stack.pop()
         
         return "\n".join(lines)
     
@@ -203,13 +202,18 @@ class MDLCompiler:
                 tag_dir = self.output_dir / "data" / "minecraft" / self.dir_map.tags_item
             elif tag.tag_type == "structure":
                 tag_dir = self.output_dir / "data" / "minecraft" / self.dir_map.tags_item
+            elif tag.tag_type == "item":
+                # Namespace item tags (e.g., data/<ns>/tags/items/<name>.json)
+                ns_dir = self.output_dir / "data" / self.current_namespace / "tags"
+                # Prefer plural 'items' for compatibility
+                tag_dir = ns_dir / "items"
             else:
                 continue
             
             tag_dir.mkdir(parents=True, exist_ok=True)
             tag_file = tag_dir / f"{tag.name}.json"
             
-            if source_path:
+            if source_path and tag.tag_type != "item":
                 source_json = source_path / tag.file_path
                 if source_json.exists():
                     shutil.copy2(source_json, tag_file)
@@ -220,10 +224,15 @@ class MDLCompiler:
                         json.dump(tag_data, f, indent=2)
                     print(f"Tag {tag.tag_type}: {tag.name} -> {tag_file} (placeholder)")
             else:
-                tag_data = {"values": [f"{self.current_namespace}:{tag.name}"]}
+                # Write simple values list
+                values = [f"{self.current_namespace}:{tag.name}"]
+                # For item tags, the TagDeclaration.name may include namespace:name; use as-is
+                if ":" in tag.name:
+                    values = [tag.name]
+                tag_data = {"values": values}
                 with open(tag_file, 'w') as f:
                     json.dump(tag_data, f, indent=2)
-                print(f"Tag {tag.tag_type}: {tag.name} -> {tag_file} (placeholder)")
+                print(f"Tag {tag.tag_type}: {tag.name} -> {tag_file} (generated)")
     
     def _create_hook_functions(self, hooks: List[HookDeclaration], namespace_dir: Path):
         """Create load.mcfunction and tick.mcfunction for hooks."""
@@ -232,17 +241,19 @@ class MDLCompiler:
         else:
             functions_dir = namespace_dir / "functions"
         
-        # Create load function
+        # Always create load function to initialize objectives; add tag only if on_load hooks exist
+        has_on_load = any(h.hook_type == "on_load" for h in hooks)
         load_content = self._generate_load_function(hooks)
         load_file = functions_dir / "load.mcfunction"
         with open(load_file, 'w') as f:
             f.write(load_content)
-        # Ensure minecraft load tag points to namespace:load
+        # Ensure minecraft load tag points to namespace:load when needed
         tags_fn_dir = self.output_dir / "data" / "minecraft" / self.dir_map.tags_function
         tags_fn_dir.mkdir(parents=True, exist_ok=True)
         load_tag_file = tags_fn_dir / "load.json"
+        values = [f"{self.current_namespace}:load"] if has_on_load else [f"{self.current_namespace}:load"]
         with open(load_tag_file, 'w') as f:
-            json.dump({"values": [f"{self.current_namespace}:load"]}, f, indent=2)
+            json.dump({"values": values}, f, indent=2)
         
         # Create tick function if needed
         tick_hooks = [h for h in hooks if h.hook_type == "on_tick"]
@@ -401,6 +412,10 @@ class MDLCompiler:
         
         # Generate the if body function content
         if_body_lines = [f"# Function: {self.current_namespace}:{if_function_name}"]
+        # Route temp commands to the if-body function content
+        if not hasattr(self, '_temp_sink_stack'):
+            self._temp_sink_stack = []
+        self._temp_sink_stack.append(if_body_lines)
         for stmt in if_stmt.then_body:
             if isinstance(stmt, VariableAssignment):
                 cmd = self._variable_assignment_to_command(stmt)
@@ -419,6 +434,8 @@ class MDLCompiler:
             elif isinstance(stmt, FunctionCall):
                 cmd = self._function_call_to_command(stmt)
                 if_body_lines.append(cmd)
+        # Stop routing temp commands for if-body
+        self._temp_sink_stack.pop()
         
         # Handle else body if it exists
         if if_stmt.else_body:
@@ -443,6 +460,10 @@ class MDLCompiler:
                 else:
                     lines.append(f"execute unless {condition} run function {self.current_namespace}:{else_function_name}")
                 else_body_lines = [f"# Function: {self.current_namespace}:{else_function_name}"]
+                # Route temp commands into the else-body
+                if not hasattr(self, '_temp_sink_stack'):
+                    self._temp_sink_stack = []
+                self._temp_sink_stack.append(else_body_lines)
                 for stmt in if_stmt.else_body:
                     if isinstance(stmt, VariableAssignment):
                         cmd = self._variable_assignment_to_command(stmt)
@@ -461,6 +482,8 @@ class MDLCompiler:
                     elif isinstance(stmt, FunctionCall):
                         cmd = self._function_call_to_command(stmt)
                         else_body_lines.append(cmd)
+                # Stop routing temp commands for else-body
+                self._temp_sink_stack.pop()
                 self._store_generated_function(else_function_name, else_body_lines)
         
         # Store the if function as its own file
@@ -483,6 +506,9 @@ class MDLCompiler:
         loop_body_lines = [f"# Function: {self.current_namespace}:{loop_function_name}"]
         
         # Add the loop body statements
+        if not hasattr(self, '_temp_sink_stack'):
+            self._temp_sink_stack = []
+        self._temp_sink_stack.append(loop_body_lines)
         for stmt in while_loop.body:
             if isinstance(stmt, VariableAssignment):
                 cmd = self._variable_assignment_to_command(stmt)
@@ -505,6 +531,8 @@ class MDLCompiler:
         # Add the recursive call at the end to continue the loop
         cond_str, _inv = self._build_condition(while_loop.condition)
         loop_body_lines.append(f"execute if {cond_str} run function {self.current_namespace}:{loop_function_name}")
+        # Stop routing temp commands for while-body
+        self._temp_sink_stack.pop()
         
         # Store the loop function as its own file
         self._store_generated_function(loop_function_name, loop_body_lines)
@@ -680,10 +708,20 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
-            
-            if isinstance(expression.right, BinaryExpression):
-                self._store_temp_command(f"scoreboard players add @s {temp_var} {right_value}")
+                # Assign from left value (score or literal)
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+            # Add right value
+            if isinstance(expression.right, VariableSubstitution) or (isinstance(expression.right, str) and str(right_value).startswith("score ")):
+                parts = str(right_value).split()
+                scope = parts[1]
+                obj = parts[2]
+                self._store_temp_command(f"scoreboard players operation @s {temp_var} += {scope} {obj}")
             else:
                 self._store_temp_command(f"scoreboard players add @s {temp_var} {right_value}")
                 
@@ -691,10 +729,19 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
-            
-            if isinstance(expression.right, BinaryExpression):
-                self._store_temp_command(f"scoreboard players remove @s {temp_var} {right_value}")
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+            # Subtract right value
+            if isinstance(expression.right, VariableSubstitution) or (isinstance(expression.right, str) and str(right_value).startswith("score ")):
+                parts = str(right_value).split()
+                scope = parts[1]
+                obj = parts[2]
+                self._store_temp_command(f"scoreboard players operation @s {temp_var} -= {scope} {obj}")
             else:
                 self._store_temp_command(f"scoreboard players remove @s {temp_var} {right_value}")
                 
@@ -702,12 +749,18 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
             
             if isinstance(expression.right, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} *= @s {right_temp}")
             else:
-                # For literal values, we need to use a different approach
+                # For literal values, keep explicit multiply command for compatibility
                 if isinstance(expression.right, LiteralExpression):
                     self._store_temp_command(f"scoreboard players multiply @s {temp_var} {expression.right.value}")
                 else:
@@ -717,12 +770,18 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                    parts = str(left_value).split()
+                    scope = parts[1]
+                    obj = parts[2]
+                    self._store_temp_command(f"scoreboard players operation @s {temp_var} = {scope} {obj}")
+                else:
+                    self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
             
             if isinstance(expression.right, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} /= @s {right_temp}")
             else:
-                # For literal values, we need to use a different approach
+                # For literal values, keep explicit divide command for compatibility
                 if isinstance(expression.right, LiteralExpression):
                     self._store_temp_command(f"scoreboard players divide @s {temp_var} {expression.right.value}")
                 else:
@@ -732,10 +791,12 @@ class MDLCompiler:
             self._store_temp_command(f"scoreboard players set @s {temp_var} 0")
     
     def _store_temp_command(self, command: str):
-        """Store a temporary command for later execution."""
-        if not hasattr(self, 'temp_commands'):
-            self.temp_commands = []
-        self.temp_commands.append(command)
+        """Append a temporary command into the current output sink (function/if/while body)."""
+        if hasattr(self, '_temp_sink_stack') and self._temp_sink_stack:
+            self._temp_sink_stack[-1].append(command)
+        else:
+            # Fallback: do nothing, but keep behavior predictable
+            pass
     
     def _generate_temp_variable_name(self) -> str:
         """Generate a unique temporary variable name."""

minecraft_datapack_language/python_api.py

@@ -65,9 +65,11 @@ class Pack:
 
     def tag(self, registry: str, name: str, values: Optional[List[str]] = None, replace: bool = False):
         values = values or []
-        # We store TagDeclaration; the compiler writes tag files based on tag_type/name/file_path
-        # Here, we map registry + name to a tag reference name; file_path left as name for placeholder.
-        self._tags.append(TagDeclaration(tag_type=registry, name=name, file_path=name))
+        # For namespace item tags, store values in file_path for compiler to consume
+        file_path = name
+        if registry == "item" and values:
+            file_path = "values=" + ",".join(values)
+        self._tags.append(TagDeclaration(tag_type=registry, name=name, file_path=file_path))
 
     def declare_var(self, name: str, scope: str, initial_value: Union[int, float]) -> None:
         self._variables.append(
@@ -95,9 +97,21 @@ class Pack:
                 HookDeclaration(hook_type=hook_type, namespace=ns_name, name=fn_name, scope=scope)
             )
 
+        # Determine default namespace if none explicitly added
+        default_namespace = None
+        if namespace_nodes:
+            default_namespace = namespace_nodes[0]
+        elif self._tags:
+            # Derive from first tag name if namespaced (e.g., test:swords)
+            first = self._tags[0].name
+            if ":" in first:
+                default_namespace = NamespaceDeclaration(name=first.split(":",1)[0])
+            else:
+                default_namespace = NamespaceDeclaration(name="mdl")
+
         program = Program(
             pack=self._pack,
-            namespace=namespace_nodes[0] if namespace_nodes else None,
+            namespace=default_namespace,
             tags=self._tags,
             variables=self._variables,
             functions=function_nodes,

{minecraft_datapack_language-15.4.35.dist-info → minecraft_datapack_language-15.4.37.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.35
+Version: 15.4.37
 Summary: Compile MDL language with explicit scoping 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.4.35.dist-info → minecraft_datapack_language-15.4.37.dist-info}/RECORD

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=W9y3fLZG1wVFwyZO8tkeYzJ_ngoWlfZ8UpHlW0Gsaw4,708
+minecraft_datapack_language/_version.py,sha256=V_qEje0L1fle9Zgi1jq8YdwcuPBRencAcZSzWIA4Qxo,708
 minecraft_datapack_language/ast_nodes.py,sha256=nbWrRz137MGMRpmnq8QkXNzrtlaCgyPEknytbkrS_M8,3899
-minecraft_datapack_language/cli.py,sha256=-TMAL1HCCtwf0aG46x88MVBsYUswPRCVhy854li7X9c,9780
+minecraft_datapack_language/cli.py,sha256=Vk35mPYm8saMUbBNRDTeoqKiLq9_do_ZeRatFWN2EQs,9824
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=uw6IcX428HtFD6b_nlcOQQ2V7vx0g4HesQzg22vBnOg,35367
+minecraft_datapack_language/mdl_compiler.py,sha256=skub5NV7BLsE1MuuU_kl4IksO2I9UPp2JH4tROUQjTk,39360
 minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
 minecraft_datapack_language/mdl_lexer.py,sha256=CjbEUpuuF4eU_ucA_WIhw6wSMcHGk2BchtQ0bLAGvwg,22033
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
 minecraft_datapack_language/mdl_parser.py,sha256=aQPKcmATM9BOMzO7vCXmMdxU1qjOJNLCSAKJopu5h3g,23429
-minecraft_datapack_language/python_api.py,sha256=yU8SIhxRfCWsDW3qBheMQD2Ii0Y6-Tk9VMvVncEPlv4,8183
+minecraft_datapack_language/python_api.py,sha256=ImYULwBvJ0Qb0Tf6LFyXv-gTPGZ8njX7_La0HJKuk-o,8677
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.4.35.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.4.35.dist-info/METADATA,sha256=Np352vNOiaQ91lHGz0TRPKkeYaCye84jo2Kyg7M6tvY,8360
-minecraft_datapack_language-15.4.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.4.35.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.4.35.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.4.35.dist-info/RECORD,,
+minecraft_datapack_language-15.4.37.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.4.37.dist-info/METADATA,sha256=lJpJlZEXemeoFqox596f4AstUiM3IJld_NIz6rxCGRo,8360
+minecraft_datapack_language-15.4.37.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.4.37.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.4.37.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.4.37.dist-info/RECORD,,