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

minecraft_datapack_language/cli.py

@@ -235,32 +235,14 @@ def new_command(args):
     template_content = f'''pack "{pack_name}" "Generated by MDL CLI" {pack_format};
 namespace "{project_name}";
 
-// Variables
-var num counter<@s> = 0;
-var num global_timer<@a> = 0;
-
-// Main function
 function {project_name}:main {{
     say "Hello from {project_name}!";
-    
-    // Variable example
-    counter<@s> = 10;
-    say "Counter: $counter<@s>$";
-    
-    // Conditional example
-    if $counter<@s>$ > 5 {{
-        say "High counter!";
-    }} else {{
-        say "Try again!";
-    }}
 }}
 
-// Init function (avoid reserved names like 'load' or 'tick')
 function {project_name}:init {{
-    say "Datapack initialized successfully!";
+    say "Datapack initialized!";
 }}
 
-// Hook to run on load
 on_load {project_name}:init;
 '''
     
@@ -285,24 +267,9 @@ A Minecraft datapack created with MDL (Minecraft Datapack Language).
    - Run `/reload` in-game
 
 3. **Run the main function:**
-   ```bash
+   ```
    /function {project_name}:main
    ```
-
-## Features
-
-- **Variables**: Player-scoped counter and global timer
-- **Control Flow**: If/else statements
-- **Functions**: Main function and load hook
-- **Automatic Execution**: Runs on datapack load
-
-## Development
-
-- Edit `{project_name}.mdl` to modify the datapack
-- Use `mdl check {project_name}.mdl` to validate syntax
-- Use `mdl build --mdl {project_name}.mdl -o dist` to rebuild
-
-For more information, visit: https://www.mcmdl.com
 '''
     
     with open(readme_file, 'w', encoding='utf-8') as f:

minecraft_datapack_language/mdl_compiler.py

@@ -12,7 +12,7 @@ from .ast_nodes import (
     Program, PackDeclaration, NamespaceDeclaration, TagDeclaration,
     VariableDeclaration, VariableAssignment, VariableSubstitution, FunctionDeclaration,
     FunctionCall, IfStatement, WhileLoop, ScheduledWhileLoop, HookDeclaration, RawBlock, MacroLine,
-    SayCommand, BinaryExpression, LiteralExpression, ParenthesizedExpression
+    SayCommand, BinaryExpression, UnaryExpression, LiteralExpression, ParenthesizedExpression
 )
 from .dir_map import get_dir_map, DirMap
 from .mdl_errors import MDLCompilerError
@@ -809,6 +809,42 @@ class MDLCompiler:
             objective = self.variables.get(expression.name, expression.name)
             scope = expression.scope.strip("<>")
             return f"score {scope} {objective}"
+        elif isinstance(expression, UnaryExpression):
+            # Handle logical NOT elsewhere; here support unary minus for arithmetic
+            op = self._normalize_operator(expression.operator)
+            if op == '!':
+                # For values, ! is not meaningful; fallback to boolean temp
+                bool_var = self._compile_boolean_expression(expression)
+                return f"score @s {bool_var}"
+            if op == '-':
+                # If operand is a literal, constant-fold
+                if isinstance(expression.operand, LiteralExpression) and isinstance(expression.operand.value, (int, float)):
+                    try:
+                        v = float(expression.operand.value)
+                        v = -v
+                        if v.is_integer():
+                            return str(int(v))
+                        return str(v)
+                    except Exception:
+                        pass
+                # Otherwise, compute 0 - <operand>
+                rhs = self._expression_to_value(expression.operand)
+                temp_var = self._generate_temp_variable_name()
+                self._store_temp_command(f"scoreboard players set @s {temp_var} 0")
+                if isinstance(expression.operand, VariableSubstitution) or (isinstance(rhs, str) and rhs.startswith("score ")):
+                    parts = str(rhs).split()
+                    if len(parts) >= 3:
+                        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 operation @s {temp_var} -= {rhs}")
+                else:
+                    # rhs is a literal number string
+                    self._store_temp_command(f"scoreboard players remove @s {temp_var} {rhs}")
+                return f"score @s {temp_var}"
+            # Fallback
+            return self._expression_to_value(expression.operand)
         elif isinstance(expression, BinaryExpression):
             # For complex expressions, we need to use temporary variables
             temp_var = self._generate_temp_variable_name()
@@ -898,6 +934,18 @@ class MDLCompiler:
         def unwrap(e: Any) -> Any:
             while isinstance(e, ParenthesizedExpression):
                 e = e.expression
+            # Collapse unary minus literal for better comparisons
+            try:
+                from .ast_nodes import UnaryExpression as _UExpr, LiteralExpression as _LExpr
+                if isinstance(e, _UExpr) and self._normalize_operator(getattr(e, 'operator', None)) == '-' and isinstance(e.operand, _LExpr) and isinstance(e.operand.value, (int, float)):
+                    try:
+                        v = float(e.operand.value)
+                        v = -v
+                        return LiteralExpression(value=v, type="number")
+                    except Exception:
+                        return e
+            except Exception:
+                pass
             return e
 
         # Handle logical operators by compiling to a boolean temp scoreboard var
@@ -915,6 +963,23 @@ class MDLCompiler:
             left = unwrap(expression.left)
             right = unwrap(expression.right)
             op_sym = self._normalize_operator(expression.operator)
+            # Treat a leading logical NOT on a comparator operand as negating the entire comparison
+            # Example: !$a > 0  =>  NOT ( $a > 0 )
+            if op_sym in (">", ">=", "<", "<=", "==", "!="):
+                try:
+                    from .ast_nodes import UnaryExpression as _UnaryExpr
+                except Exception:
+                    _UnaryExpr = None
+                if _UnaryExpr is not None and isinstance(left, _UnaryExpr) and self._normalize_operator(getattr(left, 'operator', None)) == '!':
+                    # Build condition for (left.operand op right) and invert
+                    inner = BinaryExpression(left=left.operand, operator=expression.operator, right=right)
+                    cond_str, inv = self._build_condition(inner)
+                    return (cond_str, not inv)
+                if _UnaryExpr is not None and isinstance(right, _UnaryExpr) and self._normalize_operator(getattr(right, 'operator', None)) == '!':
+                    # Build condition for (left op right.operand) and invert
+                    inner = BinaryExpression(left=left, operator=expression.operator, right=right.operand)
+                    cond_str, inv = self._build_condition(inner)
+                    return (cond_str, not inv)
             # Variable vs literal
             if op_sym and isinstance(left, VariableSubstitution) and isinstance(right, LiteralExpression) and isinstance(right.value, (int, float)):
                 objective = self.variables.get(left.name, left.name)

minecraft_datapack_language/mdl_parser.py

@@ -527,8 +527,8 @@ class MDLParser:
         return expr
 
     def _parse_unary(self) -> Any:
-        """Parse unary expressions (logical NOT)."""
-        if not self._is_at_end() and self._peek().type in [TokenType.NOT]:
+        """Parse unary expressions (logical NOT, unary minus)."""
+        if not self._is_at_end() and self._peek().type in [TokenType.NOT, TokenType.MINUS]:
             operator = self._peek().type
             self._advance()
             operand = self._parse_unary()

{minecraft_datapack_language-16.0.17.dist-info → minecraft_datapack_language-16.0.19.dist-info}/METADATA

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

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=4SuxrqtqwWUwpm2T-Y1T6GX-kvyCaEpo8lvFEXiyIJM,708
+minecraft_datapack_language/_version.py,sha256=Y9AKuL_9dQTuwAdAm-tOXFpJ2Ltnsjm1_Nklu8wputY,708
 minecraft_datapack_language/ast_nodes.py,sha256=L5izavSeXDr766vsfRvJrcnflXNJyXcy0WSfyJPq2ZA,4484
-minecraft_datapack_language/cli.py,sha256=R4QZYtox-Da9B8pr_kCg_9qc9aI-ORTah7kMkhsI5tw,10373
+minecraft_datapack_language/cli.py,sha256=shmQtNNXgw5XNlGquAR52wWtYeNyYusZTwwCZl56mMU,9522
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
-minecraft_datapack_language/mdl_compiler.py,sha256=L1ECOpZUuVe5j_qAn6KdAQwa6BWB8Bk9vId5lUPKaHo,59374
+minecraft_datapack_language/mdl_compiler.py,sha256=AA3SZC7k8O1UbhlY6uEaxCVNsDK6jlPf5HDdi-OS0hk,63367
 minecraft_datapack_language/mdl_errors.py,sha256=r0Gu3KhoX1YLPAVW_iO7Q_fPgaf_Dv9tOGSOdKNSzmw,16114
 minecraft_datapack_language/mdl_lexer.py,sha256=YuRflOkoMOcjECPAZzoAkJciMks5amWMtGbcTIVKmAs,24166
 minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYaLDcGNRAl-RAI,17253
-minecraft_datapack_language/mdl_parser.py,sha256=Bwfk1i6PFsMB3Zs7Z6a3fgngPaWPv-KKqQRQUkFRquM,27272
+minecraft_datapack_language/mdl_parser.py,sha256=vIcPRudxDaezNy85Q5CBcumLhCglofCNITsrRmj9YWw,27302
 minecraft_datapack_language/python_api.py,sha256=Iao1jbdeW6ekeA80BZG6gNqHVjxQJEheB3DbpVsuTZQ,12304
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-16.0.17.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.17.dist-info/METADATA,sha256=uvJtPRYl3ouhthLXW0TqePW6pg0NveScitUYds1Powo,8344
-minecraft_datapack_language-16.0.17.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.17.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.17.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.17.dist-info/RECORD,,
+minecraft_datapack_language-16.0.19.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-16.0.19.dist-info/METADATA,sha256=s1mTXRppWEMJFAMWDt7k3poHbZC1gL1n0WFp6JdB4T8,8344
+minecraft_datapack_language-16.0.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-16.0.19.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-16.0.19.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-16.0.19.dist-info/RECORD,,