minecraft-datapack-language 15.4.33__py3-none-any.whl → 15.4.35__py3-none-any.whl

minecraft_datapack_language/__init__.py

@@ -3,6 +3,7 @@ from .mdl_lexer import MDLLexer, Token, TokenType
 from .mdl_parser import MDLParser
 from .ast_nodes import *
 from .dir_map import DirMap
+from .python_api import Pack
 
 __all__ = [
     "MDLLexer", "Token", "TokenType",
@@ -13,7 +14,8 @@ __all__ = [
     "SayCommand", "TellrawCommand", "ExecuteCommand", "ScoreboardCommand",
     "BinaryExpression", "UnaryExpression", "ParenthesizedExpression", "LiteralExpression",
     "ScopeSelector",
-    "DirMap"
+    "DirMap",
+    "Pack"
 ]
 
 # CLI entry point

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.33'
-__version_tuple__ = version_tuple = (15, 4, 33)
+__version__ = version = '15.4.35'
+__version_tuple__ = version_tuple = (15, 4, 35)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/mdl_compiler.py

@@ -152,6 +152,12 @@ class MDLCompiler:
         if hasattr(self, 'temp_commands'):
             self.temp_commands = []
         
+        # Set current function context and reset per-function counters
+        self._current_function_name = func.name
+        self.if_counter = 0
+        self.else_counter = 0
+        self.while_counter = 0
+        
         # Generate commands from function body
         for statement in func.body:
             cmd = self._statement_to_command(statement)
@@ -231,6 +237,12 @@ class MDLCompiler:
         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
+        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"
+        with open(load_tag_file, 'w') as f:
+            json.dump({"values": [f"{self.current_namespace}:load"]}, f, indent=2)
         
         # Create tick function if needed
         tick_hooks = [h for h in hooks if h.hook_type == "on_tick"]
@@ -239,6 +251,10 @@ class MDLCompiler:
             tick_file = functions_dir / "tick.mcfunction"
             with open(tick_file, 'w') as f:
                 f.write(tick_content)
+            # Ensure minecraft tick tag points to namespace:tick
+            tick_tag_file = tags_fn_dir / "tick.json"
+            with open(tick_tag_file, 'w') as f:
+                json.dump({"values": [f"{self.current_namespace}:tick"]}, f, indent=2)
     
     def _generate_load_function(self, hooks: List[HookDeclaration]) -> str:
         """Generate the content of load.mcfunction."""
@@ -487,10 +503,8 @@ class MDLCompiler:
                 loop_body_lines.append(cmd)
         
         # Add the recursive call at the end to continue the loop
-        if self._is_scoreboard_condition(while_loop.condition):
-            loop_body_lines.append(f"execute if score {condition} run function {self.current_namespace}:{loop_function_name}")
-        else:
-            loop_body_lines.append(f"execute if {condition} run function {self.current_namespace}:{loop_function_name}")
+        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}")
         
         # Store the loop function as its own file
         self._store_generated_function(loop_function_name, loop_body_lines)
@@ -507,24 +521,21 @@ class MDLCompiler:
     
     def _generate_if_function_name(self) -> str:
         """Generate a unique name for an if function."""
-        if not hasattr(self, 'if_counter'):
-            self.if_counter = 0
         self.if_counter += 1
-        return f"if_{self.if_counter}"
+        prefix = getattr(self, '_current_function_name', 'fn')
+        return f"{prefix}__if_{self.if_counter}"
     
     def _generate_else_function_name(self) -> str:
         """Generate a unique name for an else function."""
-        if not hasattr(self, 'else_counter'):
-            self.else_counter = 0
         self.else_counter += 1
-        return f"else_{self.else_counter}"
+        prefix = getattr(self, '_current_function_name', 'fn')
+        return f"{prefix}__else_{self.else_counter}"
     
     def _generate_while_function_name(self) -> str:
         """Generate a unique name for a while function."""
-        if not hasattr(self, 'while_counter'):
-            self.while_counter = 0
         self.while_counter += 1
-        return f"while_{self.while_counter}"
+        prefix = getattr(self, '_current_function_name', 'fn')
+        return f"{prefix}__while_{self.while_counter}"
     
     def _store_generated_function(self, name: str, lines: List[str]):
         """Store a generated function as a separate file under the same namespace."""

minecraft_datapack_language/python_api.py

@@ -0,0 +1,207 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Callable, List, Optional, Union
+
+from .ast_nodes import (
+    Program,
+    PackDeclaration,
+    NamespaceDeclaration,
+    TagDeclaration,
+    VariableDeclaration,
+    VariableAssignment,
+    VariableSubstitution,
+    FunctionDeclaration,
+    FunctionCall,
+    IfStatement,
+    WhileLoop,
+    RawBlock,
+    SayCommand,
+    BinaryExpression,
+    LiteralExpression,
+)
+from .mdl_compiler import MDLCompiler
+
+
+# ---------- Expression helpers ----------
+
+def num(value: Union[int, float]) -> LiteralExpression:
+    return LiteralExpression(value=value, type="number")
+
+
+def var_read(name: str, scope: str) -> VariableSubstitution:
+    # scope must look like <@s>, <@a>, <@e[...]>, or <global>
+    return VariableSubstitution(name=name, scope=scope)
+
+
+def binop(left, operator: str, right) -> BinaryExpression:
+    # operator one of: PLUS, MINUS, MULTIPLY, DIVIDE, GREATER, LESS, GREATER_EQUAL, LESS_EQUAL, EQUAL, NOT_EQUAL
+    return BinaryExpression(left=left, operator=operator, right=right)
+
+
+# ---------- Python Bindings ----------
+
+
+class Pack:
+    def __init__(self, name: str, description: str = "", pack_format: int = 82):
+        self._pack = PackDeclaration(name=name, description=description, pack_format=pack_format)
+        self._namespaces: List[Namespace] = []
+        self._variables: List[VariableDeclaration] = []
+        self._tags: List[TagDeclaration] = []
+        self._hooks: List = []  # HookDeclaration built by Namespace
+
+    def namespace(self, name: str) -> "Namespace":
+        ns = Namespace(self, name)
+        self._namespaces.append(ns)
+        return ns
+
+    # Lifecycle hooks reference functions by id "ns:name"
+    def on_load(self, function_id: str, scope: Optional[str] = None):
+        # defer to Namespace to create HookDeclaration during build
+        self._hooks.append(("on_load", function_id, scope))
+
+    def on_tick(self, function_id: str, scope: Optional[str] = None):
+        self._hooks.append(("on_tick", function_id, scope))
+
+    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))
+
+    def declare_var(self, name: str, scope: str, initial_value: Union[int, float]) -> None:
+        self._variables.append(
+            VariableDeclaration(var_type="num", name=name, scope=scope, initial_value=num(initial_value))
+        )
+
+    def build(self, output_dir: str):
+        # Build Program AST
+        namespace_nodes: List[NamespaceDeclaration] = []
+        function_nodes: List[FunctionDeclaration] = []
+        hook_nodes: List = []
+
+        # Namespaces and functions
+        for ns in self._namespaces:
+            namespace_nodes.append(NamespaceDeclaration(name=ns.name))
+            function_nodes.extend(ns._functions)
+            hook_nodes.extend(ns._hooks)
+
+        # Hooks added via Pack-level convenience
+        for hook_type, function_id, scope in self._hooks:
+            ns_name, fn_name = function_id.split(":", 1)
+            from .ast_nodes import HookDeclaration
+
+            hook_nodes.append(
+                HookDeclaration(hook_type=hook_type, namespace=ns_name, name=fn_name, scope=scope)
+            )
+
+        program = Program(
+            pack=self._pack,
+            namespace=namespace_nodes[0] if namespace_nodes else None,
+            tags=self._tags,
+            variables=self._variables,
+            functions=function_nodes,
+            hooks=hook_nodes,
+            statements=[],
+        )
+
+        MDLCompiler(output_dir).compile(program, output_dir)
+
+
+class Namespace:
+    def __init__(self, pack: Pack, name: str):
+        self._pack = pack
+        self.name = name
+        self._functions: List[FunctionDeclaration] = []
+        self._hooks: List = []
+
+    def function(self, name: str, *commands_or_builder: Union[str, Callable[["FunctionBuilder"], None]]):
+        builder = FunctionBuilder(self._pack, self, name)
+
+        # If a single callable is given, treat it as a builder lambda
+        if len(commands_or_builder) == 1 and callable(commands_or_builder[0]):
+            commands_or_builder[0](builder)
+        else:
+            # Interpret simple strings: say "..."; exec ns:name; raw lines fall back to RawBlock
+            for cmd in commands_or_builder:
+                if not isinstance(cmd, str):
+                    continue
+                stripped = cmd.strip().rstrip(";")
+                if stripped.startswith("say "):
+                    msg = stripped[len("say ") :].strip()
+                    if msg.startswith("\"") and msg.endswith("\""):
+                        msg = msg[1:-1]
+                    builder.say(msg)
+                elif stripped.startswith("exec "):
+                    target = stripped[len("exec ") :].strip()
+                    # Optional scope in angle brackets e.g., util:helper<@s>
+                    scope = None
+                    if "<" in target and target.endswith(">"):
+                        scope = target[target.index("<") :]
+                        target = target[: target.index("<")]
+                    builder.exec(target, scope)
+                else:
+                    builder.raw(cmd)
+
+        func_node = FunctionDeclaration(namespace=self.name, name=name, scope=None, body=builder._body)
+        self._functions.append(func_node)
+        return func_node
+
+    # Convenience forwarding
+    def on_load(self, function_id: str, scope: Optional[str] = None):
+        from .ast_nodes import HookDeclaration
+
+        ns_name, fn_name = function_id.split(":", 1)
+        self._hooks.append(HookDeclaration(hook_type="on_load", namespace=ns_name, name=fn_name, scope=scope))
+
+    def on_tick(self, function_id: str, scope: Optional[str] = None):
+        from .ast_nodes import HookDeclaration
+
+        ns_name, fn_name = function_id.split(":", 1)
+        self._hooks.append(HookDeclaration(hook_type="on_tick", namespace=ns_name, name=fn_name, scope=scope))
+
+
+class FunctionBuilder:
+    def __init__(self, pack: Pack, namespace: Namespace, function_name: str):
+        self._pack = pack
+        self._namespace = namespace
+        self._name = function_name
+        self._body: List = []
+
+    # Basics
+    def say(self, message: str):
+        self._body.append(SayCommand(message=message, variables=[]))
+
+    def raw(self, content: str):
+        self._body.append(RawBlock(content=content.rstrip(";")))
+
+    def exec(self, function_id: str, scope: Optional[str] = None):
+        ns, fn = function_id.split(":", 1)
+        self._body.append(FunctionCall(namespace=ns, name=fn, scope=scope))
+
+    # Variables
+    def declare_var(self, name: str, scope: str, initial_value: Union[int, float]):
+        self._pack.declare_var(name, scope, initial_value)
+        # Also set to initial value in this function
+        self.set(name, scope, num(initial_value))
+
+    def set(self, name: str, scope: str, value_expr) -> None:
+        self._body.append(VariableAssignment(name=name, scope=scope, value=value_expr))
+
+    # Control flow
+    def if_(self, condition_expr, then_builder: Callable[["FunctionBuilder"], None], else_builder: Optional[Callable[["FunctionBuilder"], None]] = None):
+        then_fb = FunctionBuilder(self._pack, self._namespace, self._name)
+        then_builder(then_fb)
+        else_body = None
+        if else_builder:
+            else_fb = FunctionBuilder(self._pack, self._namespace, self._name)
+            else_builder(else_fb)
+            else_body = else_fb._body
+        self._body.append(IfStatement(condition=condition_expr, then_body=then_fb._body, else_body=else_body))
+
+    def while_(self, condition_expr, body_builder: Callable[["FunctionBuilder"], None]):
+        body_fb = FunctionBuilder(self._pack, self._namespace, self._name)
+        body_builder(body_fb)
+        self._body.append(WhileLoop(condition=condition_expr, body=body_fb._body))
+
+

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

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

@@ -1,17 +1,18 @@
-minecraft_datapack_language/__init__.py,sha256=YoTmZWZVH6POAVYMvOTEBKdC-cxQsWi2VomSWZDgYFw,1158
-minecraft_datapack_language/_version.py,sha256=oHNM_9N4Gw1WIjw70v38mQJDgIkD6Qbx1TSXwhIvfNI,708
+minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
+minecraft_datapack_language/_version.py,sha256=W9y3fLZG1wVFwyZO8tkeYzJ_ngoWlfZ8UpHlW0Gsaw4,708
 minecraft_datapack_language/ast_nodes.py,sha256=nbWrRz137MGMRpmnq8QkXNzrtlaCgyPEknytbkrS_M8,3899
 minecraft_datapack_language/cli.py,sha256=-TMAL1HCCtwf0aG46x88MVBsYUswPRCVhy854li7X9c,9780
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=nS_D2f_G8lcDxUOiADNJWTJQwTnXoQ-W4amyhw6xJoY,34673
+minecraft_datapack_language/mdl_compiler.py,sha256=uw6IcX428HtFD6b_nlcOQQ2V7vx0g4HesQzg22vBnOg,35367
 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/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.4.33.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.4.33.dist-info/METADATA,sha256=-vx5gJu0ZmkHmVVnlBIaa4rtBEhhfoi32BgXl1NnAqg,8360
-minecraft_datapack_language-15.4.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.4.33.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.4.33.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.4.33.dist-info/RECORD,,
+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,,