minecraft-datapack-language 16.0.2__py3-none-any.whl → 16.0.4__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 = '16.0.2'
-__version_tuple__ = version_tuple = (16, 0, 2)
+__version__ = version = '16.0.4'
+__version_tuple__ = version_tuple = (16, 0, 4)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/ast_nodes.py

@@ -94,6 +94,13 @@ class WhileLoop(ASTNode):
     body: List[ASTNode]
 
 
+@dataclass
+class ScheduledWhileLoop(ASTNode):
+    """Scheduled-while loop that iterates via Minecraft's schedule command each tick."""
+    condition: Any  # Expression
+    body: List[ASTNode]
+
+
 @dataclass
 class HookDeclaration(ASTNode):
     """Hook declaration (on_load, on_tick)."""

minecraft_datapack_language/mdl_compiler.py

@@ -11,7 +11,7 @@ from typing import Dict, List, Any, Optional
 from .ast_nodes import (
     Program, PackDeclaration, NamespaceDeclaration, TagDeclaration,
     VariableDeclaration, VariableAssignment, VariableSubstitution, FunctionDeclaration,
-    FunctionCall, IfStatement, WhileLoop, HookDeclaration, RawBlock, MacroLine,
+    FunctionCall, IfStatement, WhileLoop, ScheduledWhileLoop, HookDeclaration, RawBlock, MacroLine,
     SayCommand, BinaryExpression, LiteralExpression, ParenthesizedExpression
 )
 from .dir_map import get_dir_map, DirMap
@@ -270,15 +270,8 @@ class MDLCompiler:
         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"
-        # Always include namespace:load (contains scoreboard initialization), plus any explicit on_load hooks
+        # Always reference namespace:load (which handles scoreboard init and calls on_load hooks internally)
         values = [f"{self.current_namespace}:load"]
-        if has_on_load:
-            # Add explicit on_load hooks as additional entries
-            for hook in hooks:
-                if hook.hook_type == "on_load":
-                    hook_ref = f"{hook.namespace}:{hook.name}"
-                    if hook_ref not in values:  # Avoid duplicates
-                        values.append(hook_ref)
         with open(load_tag_file, 'w') as f:
             json.dump({"values": values}, f, indent=2)
         
@@ -352,6 +345,8 @@ class MDLCompiler:
             return self._if_statement_to_command(statement)
         elif isinstance(statement, WhileLoop):
             return self._while_loop_to_command(statement)
+        elif isinstance(statement, ScheduledWhileLoop):
+            return self._scheduled_while_to_command(statement)
         elif isinstance(statement, FunctionCall):
             return self._function_call_to_command(statement)
         else:
@@ -614,6 +609,62 @@ class MDLCompiler:
         self._store_generated_function(loop_function_name, loop_body_lines)
         
         return "\n".join(lines)
+
+    def _scheduled_while_to_command(self, while_loop: ScheduledWhileLoop) -> str:
+        """Convert scheduledwhile to tick-scheduled loop to avoid recursion limits.
+        Strategy:
+        - Generate a unique loop function that contains the body, then conditionally schedules itself 1t later.
+        - Entry statement schedules the first tick run.
+        - Breakout occurs naturally by not scheduling when condition is false.
+        """
+        loop_function_name = self._generate_while_function_name()
+
+        # Schedule first iteration for next tick
+        lines: List[str] = []
+        lines.append(f"schedule function {self.current_namespace}:{loop_function_name} 1t")
+
+        # Build the loop function body
+        loop_body_lines: List[str] = [f"# Function: {self.current_namespace}:{loop_function_name}"]
+
+        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)
+                loop_body_lines.append(cmd)
+            elif isinstance(stmt, VariableDeclaration):
+                cmd = self._variable_declaration_to_command(stmt)
+                loop_body_lines.append(cmd)
+            elif isinstance(stmt, SayCommand):
+                cmd = self._say_command_to_command(stmt)
+                loop_body_lines.append(cmd)
+            elif isinstance(stmt, RawBlock):
+                loop_body_lines.append(stmt.content)
+            elif isinstance(stmt, IfStatement):
+                cmd = self._if_statement_to_command(stmt)
+                loop_body_lines.append(cmd)
+            elif isinstance(stmt, WhileLoop):
+                cmd = self._while_loop_to_command(stmt)
+                loop_body_lines.append(cmd)
+            elif isinstance(stmt, ScheduledWhileLoop):
+                cmd = self._scheduled_while_to_command(stmt)
+                loop_body_lines.append(cmd)
+            elif isinstance(stmt, FunctionCall):
+                cmd = self._function_call_to_command(stmt)
+                loop_body_lines.append(cmd)
+        self._temp_sink_stack.pop()
+
+        cond_str, invert_then = self._build_condition(while_loop.condition)
+        if invert_then:
+            # Inverted means schedule unless condition (NOT desired). We want continue-when-true.
+            # cond_str represents equality in inverted case; continue when not(cond) → use unless.
+            loop_body_lines.append(f"execute unless {cond_str} run schedule function {self.current_namespace}:{loop_function_name} 1t")
+        else:
+            loop_body_lines.append(f"execute if {cond_str} run schedule function {self.current_namespace}:{loop_function_name} 1t")
+
+        self._store_generated_function(loop_function_name, loop_body_lines)
+        return "\n".join(lines)
     
     def _is_scoreboard_condition(self, expression: Any) -> bool:
         """Check if an expression is a scoreboard comparison."""

minecraft_datapack_language/mdl_lexer.py

@@ -33,6 +33,7 @@ class TokenType:
     IF = "IF"
     ELSE = "ELSE"
     WHILE = "WHILE"
+    SCHEDULED_WHILE = "SCHEDULED_WHILE"
     ON_LOAD = "ON_LOAD"
     ON_TICK = "ON_TICK"
     EXEC = "EXEC"
@@ -599,6 +600,7 @@ class MDLLexer:
             'if': TokenType.IF,
             'else': TokenType.ELSE,
             'while': TokenType.WHILE,
+            'scheduledwhile': TokenType.SCHEDULED_WHILE,
             'on_load': TokenType.ON_LOAD,
             'on_tick': TokenType.ON_TICK,
             'exec': TokenType.EXEC,

minecraft_datapack_language/mdl_parser.py

@@ -9,7 +9,7 @@ from .mdl_errors import MDLParserError
 from .ast_nodes import (
     ASTNode, Program, PackDeclaration, NamespaceDeclaration, TagDeclaration,
     VariableDeclaration, VariableAssignment, VariableSubstitution, FunctionDeclaration,
-    FunctionCall, IfStatement, WhileLoop, HookDeclaration, RawBlock, MacroLine,
+    FunctionCall, IfStatement, WhileLoop, ScheduledWhileLoop, HookDeclaration, RawBlock, MacroLine,
     SayCommand, TellrawCommand, ExecuteCommand, ScoreboardCommand,
     BinaryExpression, UnaryExpression, ParenthesizedExpression, LiteralExpression,
     ScopeSelector
@@ -87,6 +87,8 @@ class MDLParser:
                     statements.append(self._parse_if_statement())
                 elif self._peek().type == TokenType.WHILE:
                     statements.append(self._parse_while_loop())
+                elif self._peek().type == TokenType.SCHEDULED_WHILE:
+                    statements.append(self._parse_scheduled_while_loop())
                 elif self._peek().type == TokenType.DOLLAR and self._peek(1).type == TokenType.EXCLAMATION:
                     statements.append(self._parse_raw_block())
                 elif self._peek().type == TokenType.IDENTIFIER:
@@ -348,6 +350,18 @@ class MDLParser:
         self._expect(TokenType.RBRACE, "Expected '}' to end while body")
         
         return WhileLoop(condition=condition, body=body)
+
+    def _parse_scheduled_while_loop(self) -> ScheduledWhileLoop:
+        """Parse scheduledwhile loop: scheduledwhile condition { body }"""
+        self._expect(TokenType.SCHEDULED_WHILE, "Expected 'scheduledwhile' keyword")
+        
+        condition = self._parse_expression()
+        
+        self._expect(TokenType.LBRACE, "Expected '{' to start while body")
+        body = self._parse_block()
+        self._expect(TokenType.RBRACE, "Expected '}' to end while body")
+        
+        return ScheduledWhileLoop(condition=condition, body=body)
     
     def _parse_hook_declaration(self) -> HookDeclaration:
         """Parse hook declaration: on_load/on_tick namespace:name<scope>;"""
@@ -524,6 +538,8 @@ class MDLParser:
                 statements.append(self._parse_if_statement())
             elif self._peek().type == TokenType.WHILE:
                 statements.append(self._parse_while_loop())
+            elif self._peek().type == TokenType.SCHEDULED_WHILE:
+                statements.append(self._parse_scheduled_while_loop())
             elif self._peek().type == TokenType.EXEC:
                 statements.append(self._parse_function_call())
             elif self._peek().type == TokenType.MACRO_LINE:

{minecraft_datapack_language-16.0.2.dist-info → minecraft_datapack_language-16.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.2
+Version: 16.0.4
 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-16.0.4.dist-info/RECORD

@@ -0,0 +1,18 @@
+minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
+minecraft_datapack_language/_version.py,sha256=L1SqJ5yirtp0CEsOA8Rvu0Ugibk5GmwrYFW7YofqfpU,706
+minecraft_datapack_language/ast_nodes.py,sha256=L5izavSeXDr766vsfRvJrcnflXNJyXcy0WSfyJPq2ZA,4484
+minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
+minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
+minecraft_datapack_language/mdl_compiler.py,sha256=rYNaxvVRje2ot1RaUHibF4HItxca2MovntH0kjx65Vc,47808
+minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
+minecraft_datapack_language/mdl_lexer.py,sha256=rfsW2QNcZxa9HAHpU9HFReshQSmjOrrK6xY_r43mKFk,23485
+minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
+minecraft_datapack_language/mdl_parser.py,sha256=Krk7Y_E9OKNCcsDOCT7ATvQLbJII951AU2qzEY00GLE,26068
+minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
+minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
+minecraft_datapack_language-16.0.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.4.dist-info/METADATA,sha256=QeiAuNVchg2GoUT3GuculpnG2bCduaghGAALoTcyy9Q,8343
+minecraft_datapack_language-16.0.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.4.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.4.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.4.dist-info/RECORD,,

minecraft_datapack_language-16.0.2.dist-info/RECORD

@@ -1,18 +0,0 @@
-minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=gTTJVB75BNER1i08XUYQNvwb6V_T8h-gkDQrn1Jaars,706
-minecraft_datapack_language/ast_nodes.py,sha256=UzUxKLkjBisUd5Gu7sAiNXIIPIjNoRzELq4LfIFcnSY,4290
-minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
-minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=9o7Q6e-jdZDn3dgitvA6KS_yGR-pQEm3pmHF3trguKs,45102
-minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
-minecraft_datapack_language/mdl_lexer.py,sha256=dVwdgUmdQI7EJaFtoKZpq6rj5156YVjt44mMee-MDIs,23388
-minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
-minecraft_datapack_language/mdl_parser.py,sha256=axyjdrcgqeOpbmWolasiIZAjV_RpFaP5QiafLPXAhms,25223
-minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
-minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.2.dist-info/METADATA,sha256=b9ipiRrA7uorGpPRXtBRwUsA_yQF9_LAEu4KL96yskQ,8343
-minecraft_datapack_language-16.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.2.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.2.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.2.dist-info/RECORD,,