minecraft-datapack-language 15.4.29__tar.gz → 15.4.31__tar.gz

{minecraft_datapack_language-15.4.29/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.4.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.29
+Version: 15.4.31
 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.31/comprehensive_error_test.mdl

@@ -0,0 +1,30 @@
+pack "comprehensive_error_test" "Testing comprehensive error reporting" 82;
+namespace "comprehensive";
+
+// Test 1: Lexer errors (should be caught)
+var num counter<@s> = 0;
+
+// Test 2: Parser errors (should be caught) - FIXED
+function test:parser_error<@s> {
+    if $counter<@s>$ > 5 {
+        say "High counter!";
+    }
+}
+
+// Test 3: Unclosed string - FIXED
+function test:unclosed_string<@s> {
+    say "This string is now closed";
+}
+
+// Test 4: Invalid scope syntax (should be caught by parser)
+var num bad_scope<@a[invalid=]> = 0;
+
+// Test 5: Missing semicolon - FIXED
+var num missing_semicolon<@s> = 0;
+
+// Test 6: Invalid function call (should be caught by parser)
+function test:invalid_call<@s> {
+    exec test:undefined_function;
+}
+
+on_load test:parser_error<@s>;

minecraft_datapack_language-15.4.31/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.4.30"
+tag: "v15.4.30"
+updated_at: "2025-09-04T03:06:00Z"

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/_docs/cli-reference.md

@@ -47,29 +47,6 @@ mdl build --mdl . -o dist --ignore-warnings
 
 ### Check Command
 
-Validate MDL files without building:
-
-```bash
-mdl check <files>
-```
-
-**Examples:**
-```bash
-# Check single file
-mdl check hello.mdl
-
-# Check current directory
-mdl check .
-
-# Check entire directory
-mdl check myproject/
-
-# Check with warnings suppressed
-mdl check myproject/ --ignore-warnings
-```
-
-### Check Command
-
 Validate MDL files for syntax and semantic errors:
 
 ```bash
@@ -103,9 +80,9 @@ The check command provides comprehensive error reporting with:
 Error 1: MDLSyntaxError in test.mdl:15:8
 Missing closing brace for if statement
 Context:
-  13:   if (score > 10) {
+  13:   if $score<@s>$ > 10 {
   14:     say "High score!"
-  15:     score = 0
+  15:     score<@s> = 0
   16:   }
 
 Suggestion: Add closing brace '}' after line 15
@@ -114,7 +91,7 @@ Error 2: MDLLexerError in test.mdl:22:12
 Unterminated string literal
 Context:
   20:   say "Hello world
-  21:   score = 10
+  21:   score<@s> = 10
   22:   say "Goodbye
 
 Suggestion: Add closing quote '"' at the end of line 20
@@ -230,7 +207,7 @@ Error 2: MDLLexerError in test.mdl:22:12
 Unterminated string literal
 Context:
   20:   say "Hello world
-  21:   score = 10
+  21:   score<@s> = 10
   22:   say "Goodbye
 
 Suggestion: Add closing quote '"' at the end of line 20
@@ -238,10 +215,10 @@ Suggestion: Add closing quote '"' at the end of line 20
 Error 3: MDLValidationError in test.mdl:8:5
 Undefined variable 'player_score'
 Context:
-   6:   score = 10
-   7:   lives = 3
-   8:   player_score = 5
-   9:   say "Score: $score$"
+   6:   score<@s> = 10
+   7:   lives<@s> = 3
+   8:   player_score<@s> = 5
+   9:   say "Score: $score<@s>$"
 
 Suggestion: Declare the variable first with 'variable player_score = 0'
 
@@ -279,11 +256,11 @@ If you prefer to create files manually, you can start with:
 pack "hello" "My first datapack" 82;
 namespace "hello";
 
-function "main" {
-    say Hello, Minecraft!;
+function hello:main<@s> {
+    say "Hello, Minecraft!";
 }
 
-on_load "hello:main";
+on_load hello:main<@s>;
 ```
 
 2. **Check the file:**
@@ -321,26 +298,26 @@ MDL supports explicit scope selectors in if/while conditions, allowing you to ov
 
 ```mdl
 // Variables with different scopes
-var num playerScore = 0;                    // Defaults to @s
-var num globalCounter scope<global> = 0;    // Global scope
-var num teamScore scope<@a[team=red]> = 0;  // Team scope
+var num playerScore<@s> = 0;                    // Defaults to @s
+var num globalCounter<@a> = 0;                  // Global scope
+var num teamScore<@a[team=red]> = 0;            // Team scope
 
-function "main" {
+function hello:main<@s> {
     // Use explicit scope in conditions
-    if "$playerScore<@s>$ > 10" {
+    if $playerScore<@s>$ > 10 {
         say "Current player score is high!";
     }
     
-    if "$globalCounter<global>$ > 100" {
+    if $globalCounter<@a>$ > 100 {
         say "Global counter reached milestone!";
     }
     
-    if "$teamScore<@a[team=red]>$ > 50" {
+    if $teamScore<@a[team=red]>$ > 50 {
         say "Red team is winning!";
     }
     
     // Check another player's score
-    if "$playerScore<@p[name=Steve]>$ > 5" {
+    if $playerScore<@p[name=Steve]>$ > 5 {
         say "Steve has a good score!";
     }
 }

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/_docs/examples.md

@@ -14,12 +14,12 @@ A simple datapack that says hello when loaded:
 pack "hello" "A simple hello world datapack" 82;
 namespace "hello";
 
-function "main" {
-    say Hello, Minecraft!;
+function hello:main<@s> {
+    say "Hello, Minecraft!";
     tellraw @a {"text":"Welcome to my datapack!","color":"green"};
 }
 
-on_load "hello:main";
+on_load hello:main<@s>;
 ```
 
 ## Counter with Scoped Variables
@@ -30,20 +30,20 @@ Demonstrates variables with different scopes:
 pack "counter" "Counter example" 82;
 namespace "counter";
 
-var num globalCounter scope<global> = 0;
-var num playerCounter = 0;  // Defaults to player-specific scope
+var num globalCounter<@a> = 0;
+var num playerCounter<@s> = 0;  // Defaults to player-specific scope
 
-function "increment" {
-    globalCounter<global> = globalCounter<global> + 1;
-    playerCounter<@s> = playerCounter<@s> + 1;
-    say Global: $globalCounter$, Player: $playerCounter$;
+function counter:increment<@s> {
+    globalCounter<@a> = $globalCounter<@a>$ + 1;
+    playerCounter<@s> = $playerCounter<@s>$ + 1;
+    say "Global: $globalCounter<@a>$, Player: $playerCounter<@s>$";
 }
 
-function "show_all" {
-    function "counter:increment<@a>";
+function counter:show_all<@s> {
+    exec counter:increment<@a>;
 }
 
-on_load "counter:increment";
+on_load counter:increment<@s>;
 ```
 
 ## While Loop Example
@@ -54,18 +54,18 @@ A countdown timer using a while loop:
 pack "loops" "Loop example" 82;
 namespace "loops";
 
-var num counter scope<global> = 0;
+var num counter<@a> = 0;
 
-function "countdown" {
-    counter<global> = 5;
-    while "$counter$ > 0" {
-        say Countdown: $counter$;
-        counter<global> = counter<global> - 1;
+function loops:countdown<@s> {
+    counter<@a> = 5;
+    while $counter<@a>$ > 0 {
+        say "Countdown: $counter<@a>$";
+        counter<@a> = $counter<@a>$ - 1;
     }
-    say Blast off!;
+    say "Blast off!";
 }
 
-on_load "loops:countdown";
+on_load loops:countdown<@s>;
 ```
 
 ## Raw Commands
@@ -76,14 +76,14 @@ Using raw Minecraft commands:
 pack "raw" "Raw command example" 82;
 namespace "raw";
 
-function "custom" {
+function raw:custom<@s> {
     // Use raw Minecraft commands
     effect give @s minecraft:speed 10 1;
     particle minecraft:explosion ~ ~ ~ 1 1 1 0 10;
     playsound minecraft:entity.player.levelup player @s ~ ~ ~ 1 1;
 }
 
-on_load "raw:custom";
+on_load raw:custom<@s>;
 ```
 
 ## Complete Game Example
@@ -95,23 +95,23 @@ pack "game" "Complete game example" 82;
 namespace "game";
 
 // Variables
-var num score = 0;  // Defaults to player-specific scope
-var num level = 1;  // Defaults to player-specific scope
-var num globalTimer scope<global> = 0;
+var num score<@s> = 0;  // Defaults to player-specific scope
+var num level<@s> = 1;  // Defaults to player-specific scope
+var num globalTimer<@a> = 0;
 
 // Main game function
 function "start_game" {
     score<@s> = 0;
     level<@s> = 1;
-    say Game started! Level: $level$, Score: $score$;
+            say "Game started! Level: $level<@s>$, Score: $score<@s>$";
 }
 
 // Level up function
 function "level_up" {
-    if "$score$ >= 100" {
+    if $score<@s>$ >= 100 {
         level<@s> = level<@s> + 1;
         score<@s> = score<@s> - 100;
-        say Level up! New level: $level$;
+        say "Level up! New level: $level<@s>$";
         tellraw @a {"text":"Player leveled up!","color":"gold"};
     }
 }
@@ -119,16 +119,16 @@ function "level_up" {
 // Timer function
 function "update_timer" {
     globalTimer<global> = globalTimer<global> + 1;
-    if "$globalTimer$ >= 1200" {  // 60 seconds
+    if $globalTimer<@a>$ >= 1200 {  // 60 seconds
         globalTimer<global> = 0;
-        say Time's up! Final score: $score$;
+        say "Time's up! Final score: $score<@s>$";
     }
 }
 
 // Add score function
 function "add_score" {
     score<@s> = score<@s> + 10;
-    say Score: $score$;
+            say "Score: $score<@s>$";
     function "game:level_up";
 }
 
@@ -146,9 +146,9 @@ pack "teams" "Team system example" 82;
 namespace "teams";
 
 // Team variables
-var num redScore scope<@a[team=red]> = 0;
-var num blueScore scope<@a[team=blue]> = 0;
-var num gameTimer scope<global> = 0;
+var num redScore<@a[team=red]> = 0;
+var num blueScore<@a[team=blue]> = 0;
+var num gameTimer<@a> = 0;
 
 // Initialize teams
 function "init" {
@@ -162,13 +162,13 @@ function "init" {
 function "update" {
     gameTimer<global> = gameTimer<global> + 1;
     
-    if "$gameTimer$ >= 2400" {  // 2 minutes
+    if $gameTimer<@a>$ >= 2400 {  // 2 minutes
         gameTimer<global> = 0;
-        say Game over! Red: $redScore$, Blue: $blueScore$;
+        say "Game over! Red: $redScore<@a[team=red]>$, Blue: $blueScore<@a[team=blue]>$";
         
-        if "$redScore$ > $blueScore$" {
+        if $redScore<@a[team=red]>$ > $blueScore<@a[team=blue]>$ {
             tellraw @a {"text":"Red team wins!","color":"red"};
-        } else if "$blueScore$ > $redScore$" {
+        } else if $blueScore<@a[team=blue]>$ > $redScore<@a[team=red]>$ {
             tellraw @a {"text":"Blue team wins!","color":"blue"};
         } else {
             tellraw @a {"text":"It's a tie!","color":"yellow"};
@@ -179,13 +179,13 @@ function "update" {
 // Add points to red team
 function "red_point" {
     redScore<@a[team=red]> = redScore<@a[team=red]> + 1;
-    say Red team score: $redScore$;
+            say "Red team score: $redScore<@a[team=red]>$";
 }
 
 // Add points to blue team
 function "blue_point" {
     blueScore<@a[team=blue]> = blueScore<@a[team=blue]> + 1;
-    say Blue team score: $blueScore$;
+            say "Blue team score: $blueScore<@a[team=blue]>$";
 }
 
 // Hooks
@@ -202,7 +202,7 @@ Organizing code across multiple files:
 pack "multifile" "Multi-file example" 82;
 namespace "core";
 
-var num playerCount scope<global> = 0;
+var num playerCount<@a> = 0;
 
 function "init" {
     playerCount = 0;
@@ -217,7 +217,7 @@ on_load "core:init";
 namespace "ui";
 
 function "show_hud" {
-    tellraw @a {"text":"Players: $playerCount$","color":"green"};
+    tellraw @a {"text":"Players: $playerCount<@a>$","color":"green"};
 }
 
 function "update_hud" {
@@ -250,8 +250,8 @@ namespace "scopes";
 
 // Variables with different scopes
 var num playerScore = 0;                    // Defaults to @s
-var num globalCounter scope<global> = 0;    // Global scope
-var num teamScore scope<@a[team=red]> = 0;  // Team scope
+var num globalCounter<@a> = 0;                  // Global scope
+var num teamScore<@a[team=red]> = 0;            // Team scope
 
 function "main" {
     // Test explicit scope overrides in if conditions
@@ -280,7 +280,7 @@ function "main" {
     // Use explicit scopes in while loops too
     while "$globalCounter<global>$ < 10" {
         globalCounter<global> = globalCounter<global> + 1;
-        say "Counter: $globalCounter$";
+        say "Counter: $globalCounter<@a>$";
     }
 }
 

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/_docs/getting-started.md

@@ -23,12 +23,12 @@ Create your first MDL file:
 pack "hello" "My first datapack" 82;
 namespace "hello";
 
-function "main" {
-    say Hello, Minecraft!;
+function hello:main<@s> {
+    say "Hello, Minecraft!";
     tellraw @a {"text":"Welcome to my datapack!","color":"green"};
 }
 
-on_load "hello:main";
+on_load hello:main<@s>;
 ```
 
 Compile it:
@@ -47,17 +47,17 @@ Variables store numbers and can be scoped to different entities. MDL uses an **e
 
 ```mdl
 // Player-specific variable (default)
-var num playerScore = 0;
+var num playerScore<@s> = 0;
 
 // Server-wide variable
-var num globalCounter scope<global> = 0;
+var num globalCounter<@a> = 0;
 
 // Team-specific variable
-var num teamScore scope<@a[team=red]> = 0;
+var num teamScore<@a[team=red]> = 0;
 
 // Access variables with explicit scopes
 playerScore<@s> = 42;                    // Player scope
-globalCounter<global> = 100;             // Global scope
+globalCounter<@a> = 100;                 // Global scope
 teamScore<@a[team=red]> = 5;            // Team scope
 ```
 
@@ -66,11 +66,11 @@ teamScore<@a[team=red]> = 5;            // Team scope
 Use `$variable$` to read variable values. Variables automatically resolve to their declared scopes:
 
 ```mdl
-say Your score: $playerScore$;
-tellraw @a {"text":"Global counter: $globalCounter$","color":"gold"};
+say "Your score: $playerScore<@s>$";
+tellraw @a {"text":"Global counter: $globalCounter<@a>$","color":"gold"};
 
-if "$playerScore$ > 100" {
-    say High score!;
+if $playerScore<@s>$ > 100 {
+    say "High score!";
 }
 ```
 
@@ -79,16 +79,16 @@ if "$playerScore$ > 100" {
 Functions contain Minecraft commands:
 
 ```mdl
-function "my_function" {
-    say This is my function!;
+function hello:my_function<@s> {
+    say "This is my function!";
     effect give @s minecraft:speed 10 1;
 }
 
 // Call a function
-function "hello:my_function";
+exec hello:my_function<@s>;
 
 // Call a function for all players
-function "hello:my_function<@a>";
+exec hello:my_function<@a>;
 ```
 
 ### Control Structures
@@ -97,7 +97,7 @@ MDL supports real if/else statements and while loops:
 
 ```mdl
 // If statement
-if "$playerScore$ > 50" {
+if $playerScore<@s>$ > 50 {
     say Great job!;
 } else {
     say Keep trying!;
@@ -157,7 +157,7 @@ namespace "example";
 
 // Variables
 var num playerScore = 0;  // Defaults to player-specific scope
-var num globalTimer scope<global> = 0;
+var num globalTimer<@a> = 0;
 
 // Initialize function
 function "init" {

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/_docs/multi-file-projects.md

@@ -17,7 +17,7 @@ Only the first file needs a pack declaration:
 pack "my_project" "A multi-file project" 82;
 namespace "core";
 
-var num playerCount scope<global> = 0;
+var num playerCount<@a> = 0;
 
 function "init" {
     playerCount<global> = 0;
@@ -109,7 +109,7 @@ Variables from all files are automatically merged:
 
 ```mdl
 // core.mdl
-var num globalTimer scope<global> = 0;
+var num globalTimer<@a> = 0;
 var num playerScore = 0;  // Defaults to player-specific scope
 ```
 
@@ -126,12 +126,12 @@ When working with multiple files, you can use explicit scope selectors in condit
 
 ```mdl
 // core.mdl
-var num globalTimer scope<global> = 0;
+var num globalTimer<@a> = 0;
 var num playerScore = 0;  // Defaults to player-specific scope
 
 function "check_status" {
     // Check global timer
-    if "$globalTimer<global>$ > 1000" {
+    if "$globalTimer<@a>$ > 1000" {
         say "Game has been running for a while!";
     }
     
@@ -170,11 +170,11 @@ Here's a complete example with multiple files:
 pack "adventure" "Adventure game" 82;
 namespace "core";
 
-var num gameState scope<global> = 0;
+var num gameState<@a> = 0;
 var num playerLevel = 1;  // Defaults to player-specific scope
 
 function "init" {
-    gameState<global> = 0;
+    gameState<@a> = 0;
     playerLevel<@s> = 1;
     say Adventure game initialized!;
 }
@@ -243,7 +243,7 @@ mdl build --mdl "main.mdl combat.mdl ui.mdl game.mdl" -o dist
 3. **Clear naming**: Use descriptive file and namespace names
 4. **Shared variables**: Declare shared variables in the main file
 5. **Function organization**: Group related functions in the same file
-6. **Proper scoping**: Use `scope<global>` for server-wide variables, no scope for player-specific variables
+6. **Proper scoping**: Use `<@a>` for server-wide variables, no scope for player-specific variables
 7. **Explicit scope access**: Always access variables with their scope like `variable<scope>`
 
 ## File Structure Example

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/_docs/python-api.md

@@ -133,7 +133,7 @@ def create_advanced_pack():
     
     # Functions with variables and control flow using explicit scopes
     ns.function("variable_demo",
-        "var num counter scope<global> = 0",
+        "var num counter<@a> = 0",
         "counter<global> = 10",
         "counter<global> = counter<global> + 5",
         "if \"$counter$ >= 15\" {",
@@ -154,7 +154,7 @@ def create_advanced_pack():
     )
     
     ns.function("loop_demo",
-        "var num countdown scope<global> = 5",
+        "var num countdown<@a> = 5",
         "while \"$countdown$ > 0\" {",
         "    say Countdown: $countdown$",
         "    countdown<global> = countdown<global> - 1",
@@ -433,7 +433,7 @@ def create_complete_pack():
     # Core namespace
     core = p.namespace("core")
     core.function("init",
-        "var num gameState scope<global> = 0",
+        "var num gameState<@a> = 0",
         "var num playerLevel = 1",
         "gameState<global> = 0",
         "playerLevel<@s> = 1",

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/_docs/vscode-extension.md

@@ -107,7 +107,7 @@ The extension highlights the following MDL elements:
 
 - **Pack declarations**: `pack "Name" description "Desc" pack_format 48`
 - **Namespaces**: `namespace "example"`
-- **Functions**: `function "name":`
+- **Functions**: `function namespace:name<@s>`
 - **Lifecycle hooks**: `on_load`, `on_tick`
 - **Tags**: `tag function "minecraft:tick":`
 - **Comments**: `# This is a comment`

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/docs/index.md

@@ -130,19 +130,18 @@ pip install minecraft-datapack-language
 ```mdl
 // hello.mdl
 pack "My First Pack" "A simple example" 82;
-
 namespace "example";
 
-var num counter = 0;
+var num counter<@s> = 0;
 
-function "hello" {
-    say Hello, Minecraft!;
+function example:hello<@s> {
+    say "Hello, Minecraft!";
     tellraw @a {"text":"Welcome to my datapack!","color":"green"};
-    counter = counter + 1;
-    say Counter: $counter$;
+    counter<@s> = $counter<@s>$ + 1;
+    say "Counter: $counter<@s>$";
 }
 
-on_load "example:hello";
+on_load example:hello<@s>;
 ```
 
 ### Build and Run
@@ -171,11 +170,11 @@ execute unless score @s counter matches 5.. run say Low counter!
 **MDL:**
 ```mdl
 // Clean, readable, and maintainable
-counter = counter + 1;
-if "$counter$ > 5" {
-    say High counter!;
+counter<@s> = $counter<@s>$ + 1;
+if $counter<@s>$ > 5 {
+    say "High counter!";
 } else {
-    say Low counter!;
+    say "Low counter!";
 }
 ```
 
@@ -196,7 +195,7 @@ if "$counter$ > 5" {
 Write real if/else statements and while loops:
 
 ```mdl
-if "$health$ < 10" {
+if $health<@s>$ < 10 {
     say Health is low!;
     effect give @s minecraft:regeneration 10 1;
 } else if "$health$ < 20" {

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/minecraft_datapack_language/__init__.py

@@ -16,6 +16,12 @@ __all__ = [
     "DirMap"
 ]
 
+# CLI entry point
+def main():
+    """CLI entry point for the mdl command."""
+    from .cli import main as cli_main
+    return cli_main()
+
 try:
     from ._version import version as __version__   # written by setuptools-scm
 except Exception:

{minecraft_datapack_language-15.4.29 → minecraft_datapack_language-15.4.31}/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.29'
-__version_tuple__ = version_tuple = (15, 4, 29)
+__version__ = version = '15.4.31'
+__version_tuple__ = version_tuple = (15, 4, 31)
 
-__commit_id__ = commit_id = 'g57db4a809'
+__commit_id__ = commit_id = 'g7e43b014b'