minecraft-datapack-language 15.4.39__tar.gz → 15.4.41__tar.gz

{minecraft_datapack_language-15.4.39/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.4.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.39
+Version: 15.4.41
 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
@@ -146,17 +146,17 @@ namespace "game";
 var num player_score<@s> = 0;
 var num team_score<@a[team=red]> = 0;
 
-function game:start<@s> {
+function game:start {
     player_score<@s> = 100;
     say "Welcome! Your score is $player_score<@s>$";
 }
 
-on_load game:start<@s>;
+on_load game:start;
 ```
 
 ### Control Structures
 ```mdl
-function game:check_score<@s> {
+function game:check_score {
     if $player_score<@s>$ > 10 {
         say "Great score!";
         player_score<@s> = $player_score<@s>$ + 5;
@@ -185,7 +185,7 @@ tag structure "wizard_tower" "structures/wizard_tower.json";
 
 ### Raw Blocks and Say Commands
 ```mdl
-function game:special_effect<@s> {
+function game:special_effect {
     $!raw
     execute as @s run particle minecraft:explosion ~ ~ ~ 1 1 1 0 10
     execute as @s run playsound minecraft:entity.player.levelup player @s ~ ~ ~ 1 1

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/README.md

@@ -125,17 +125,17 @@ namespace "game";
 var num player_score<@s> = 0;
 var num team_score<@a[team=red]> = 0;
 
-function game:start<@s> {
+function game:start {
     player_score<@s> = 100;
     say "Welcome! Your score is $player_score<@s>$";
 }
 
-on_load game:start<@s>;
+on_load game:start;
 ```
 
 ### Control Structures
 ```mdl
-function game:check_score<@s> {
+function game:check_score {
     if $player_score<@s>$ > 10 {
         say "Great score!";
         player_score<@s> = $player_score<@s>$ + 5;
@@ -164,7 +164,7 @@ tag structure "wizard_tower" "structures/wizard_tower.json";
 
 ### Raw Blocks and Say Commands
 ```mdl
-function game:special_effect<@s> {
+function game:special_effect {
     $!raw
     execute as @s run particle minecraft:explosion ~ ~ ~ 1 1 1 0 10
     execute as @s run playsound minecraft:entity.player.levelup player @s ~ ~ ~ 1 1

minecraft_datapack_language-15.4.41/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "15.4.40"
+tag: "v15.4.40"
+updated_at: "2025-09-06T06:16:43Z"

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/docs/_docs/cli-reference.md

@@ -22,6 +22,8 @@ Build MDL files into Minecraft datapacks:
 
 ```bash
 mdl build --mdl <files> -o <output_dir>
+# Zips by default -> creates <output_dir>.zip
+# Use --no-zip to skip archive creation
 ```
 
 **Examples:**
@@ -148,6 +150,7 @@ my_awesome_pack/
 | `-o <dir>` | Output directory | `-o dist` |
 | `--verbose` | Show detailed output | `--verbose` |
 | `--wrapper <name>` | Custom wrapper name | `--wrapper mypack` |
+| `--no-zip` | Skip creating zip archive (zip is default) | `--no-zip` |
 | `--ignore-warnings` | Suppress warning messages | `--ignore-warnings` |
 
 ### Check Options
@@ -256,7 +259,7 @@ If you prefer to create files manually, you can start with:
 pack "hello" "My first datapack" 82;
 namespace "hello";
 
-function hello:main<@s> {
+function hello:main {
     say "Hello, Minecraft!";
 }
 
@@ -302,7 +305,7 @@ 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 hello:main<@s> {
+function hello:main {
     // Use explicit scope in conditions
     if $playerScore<@s>$ > 10 {
         say "Current player score is high!";

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/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 hello:main<@s> {
+function hello:main {
     say "Hello, Minecraft!";
     tellraw @a {"text":"Welcome to my datapack!","color":"green"};
 }
 
-on_load hello:main<@s>;
+on_load hello:main;
 ```
 
 ## Counter with Scoped Variables
@@ -33,17 +33,17 @@ namespace "counter";
 var num globalCounter<@a> = 0;
 var num playerCounter<@s> = 0;  // Defaults to player-specific scope
 
-function counter:increment<@s> {
+function counter:increment {
     globalCounter<@a> = $globalCounter<@a>$ + 1;
     playerCounter<@s> = $playerCounter<@s>$ + 1;
     say "Global: $globalCounter<@a>$, Player: $playerCounter<@s>$";
 }
 
-function counter:show_all<@s> {
+function counter:show_all {
     exec counter:increment<@a>;
 }
 
-on_load counter:increment<@s>;
+on_load counter:increment;
 ```
 
 ## While Loop Example
@@ -56,7 +56,7 @@ namespace "loops";
 
 var num counter<@a> = 0;
 
-function loops:countdown<@s> {
+function loops:countdown {
     counter<@a> = 5;
     while $counter<@a>$ > 0 {
         say "Countdown: $counter<@a>$";
@@ -65,7 +65,7 @@ function loops:countdown<@s> {
     say "Blast off!";
 }
 
-on_load loops:countdown<@s>;
+on_load loops:countdown;
 ```
 
 ## Raw Commands
@@ -76,14 +76,14 @@ Using raw Minecraft commands:
 pack "raw" "Raw command example" 82;
 namespace "raw";
 
-function raw:custom<@s> {
+function raw:custom {
     // 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<@s>;
+on_load raw:custom;
 ```
 
 ## Complete Game Example

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/docs/_docs/getting-started.md

@@ -23,12 +23,12 @@ Create your first MDL file:
 pack "hello" "My first datapack" 82;
 namespace "hello";
 
-function hello:main<@s> {
+function hello:main {
     say "Hello, Minecraft!";
     tellraw @a {"text":"Welcome to my datapack!","color":"green"};
 }
 
-on_load hello:main<@s>;
+on_load hello:main;
 ```
 
 Compile it:
@@ -79,7 +79,7 @@ if $playerScore<@s>$ > 100 {
 Functions contain Minecraft commands:
 
 ```mdl
-function hello:my_function<@s> {
+function hello:my_function {
     say "This is my function!";
     effect give @s minecraft:speed 10 1;
 }

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/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 namespace:name<@s>`
+- **Functions**: `function namespace:name`
 - **Lifecycle hooks**: `on_load`, `on_tick`
 - **Tags**: `tag function "minecraft:tick":`
 - **Comments**: `# This is a comment`

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/docs/index.md

@@ -134,14 +134,14 @@ namespace "example";
 
 var num counter<@s> = 0;
 
-function example:hello<@s> {
+function example:hello {
     say "Hello, Minecraft!";
     tellraw @a {"text":"Welcome to my datapack!","color":"green"};
     counter<@s> = $counter<@s>$ + 1;
     say "Counter: $counter<@s>$";
 }
 
-on_load example:hello<@s>;
+on_load example:hello;
 ```
 
 ### Build and Run

minecraft_datapack_language-15.4.41/examples/hello_world.mdl

@@ -0,0 +1,23 @@
+// Hello World example with scope selectors
+pack "hello_world" "A simple hello world datapack" 15;
+namespace "hello_world";
+
+// Global counter accessible by all players
+var num globalCounter<@a> = 0;
+
+function hello_world:main {
+    // Increment global counter
+    globalCounter<@a> = $globalCounter<@a>$ + 1;
+    
+    say "Hello, Minecraft!";
+    say "Welcome to my datapack!";
+    say "Global counter: $globalCounter<@a>$";
+}
+
+function hello_world:greet_player {
+    // Player-specific greeting
+    say "Welcome, player! You are visitor number $globalCounter<@a>$";
+}
+
+on_load hello_world:main;
+on_tick hello_world:greet_player<@a>;

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/examples/simple_counter.mdl

@@ -10,25 +10,25 @@ var num playerCounter<@s> = 0;
 
 function "increment_global" {
     // Increment the global counter
-    globalCounter<@a> = globalCounter<@a> + 1;
-    say Global counter: $globalCounter$;
+    globalCounter<@a> = $globalCounter<@a>$ + 1;
+    say "Global counter: $globalCounter<@a>$";
 }
 
 function "increment_player" {
     // Increment the player-specific counter
-    playerCounter<@s> = playerCounter<@s> + 1;
-    say Your counter: $playerCounter$;
+    playerCounter<@s> = $playerCounter<@s>$ + 1;
+    say "Your counter: $playerCounter<@s>$";
 }
 
 function "show_both" {
     // Show both counters
-    say Global: $globalCounter$, Player: $playerCounter$;
+    say "Global: $globalCounter<@a>$, Player: $playerCounter<@s>$";
 }
 
 function "reset_player" {
     // Reset player counter to global value
-    playerCounter<@s> = globalCounter<@a>;
-    say Reset to global value: $playerCounter$;
+    playerCounter<@s> = $globalCounter<@a>$;
+    say "Reset to global value: $playerCounter<@s>$";
 }
 
 function "run_for_all" {

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/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.39'
-__version_tuple__ = version_tuple = (15, 4, 39)
+__version__ = version = '15.4.41'
+__version_tuple__ = version_tuple = (15, 4, 41)
 
-__commit_id__ = commit_id = 'g71436ae0d'
+__commit_id__ = commit_id = 'gb4437b04f'

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/minecraft_datapack_language/cli.py

@@ -7,6 +7,7 @@ import argparse
 import sys
 import os
 from pathlib import Path
+import shutil
 from .mdl_lexer import MDLLexer
 from .mdl_parser import MDLParser
 from .mdl_compiler import MDLCompiler
@@ -37,6 +38,7 @@ Examples:
     build_parser.add_argument('-o', '--output', required=True, help='Output directory for the datapack')
     build_parser.add_argument('--verbose', action='store_true', help='Show detailed output')
     build_parser.add_argument('--wrapper', help='Optional wrapper directory name for the datapack output')
+    build_parser.add_argument('--no-zip', action='store_true', help='Do not create a zip archive (zip is created by default)')
     
     # Check command
     check_parser = subparsers.add_parser('check', help='Check MDL files for syntax errors')
@@ -150,6 +152,14 @@ def build_command(args):
             output_dir = output_dir / args.wrapper
         compiler = MDLCompiler()
         output_path = compiler.compile(final_ast, str(output_dir))
+
+        # Zip the datapack by default unless disabled
+        if not getattr(args, 'no_zip', False):
+            base_name = str(Path(output_path))
+            # Create archive next to the output directory (base_name.zip)
+            archive_path = shutil.make_archive(base_name, 'zip', root_dir=str(Path(output_path)))
+            if args.verbose:
+                print(f"Created archive: {archive_path}")
         
         print(f"Successfully built datapack: {output_path}")
         return 0

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/minecraft_datapack_language/mdl_compiler.py

@@ -225,10 +225,11 @@ class MDLCompiler:
                     print(f"Tag {tag.tag_type}: {tag.name} -> {tag_file} (placeholder)")
             else:
                 # 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]
+                # For item tags, the TagDeclaration.name may include namespace:name
+                # The output filename should be the local name (after ':') if present
+                name_for_file = tag.name.split(":", 1)[1] if ":" in tag.name else tag.name
+                tag_file = tag_dir / f"{name_for_file}.json"
+                values = [tag.name if ":" in tag.name else f"{self.current_namespace}:{tag.name}"]
                 tag_data = {"values": values}
                 with open(tag_file, 'w') as f:
                     json.dump(tag_data, f, indent=2)
@@ -249,11 +250,14 @@ 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 when needed
+        # 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"
-        values = [f"{self.current_namespace}:load"] if has_on_load else [f"{self.current_namespace}:load"]
+        # If there are explicit on_load hooks, include them; otherwise reference namespace:load
+        values = [f"{self.current_namespace}:load"]
+        if has_on_load:
+            values = [f"{hook.namespace}:{hook.name}" for hook in hooks if hook.hook_type == "on_load"]
         with open(load_tag_file, 'w') as f:
             json.dump({"values": values}, f, indent=2)
         

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/minecraft_datapack_language/python_api.py

@@ -129,33 +129,108 @@ class Namespace:
         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
+    def function(self, name: str, *commands_or_builder: Union[str, Callable["FunctionBuilder"], None]):
+        # Case 1: builder callable - use FunctionBuilder API directly
         if len(commands_or_builder) == 1 and callable(commands_or_builder[0]):
+            builder = FunctionBuilder(self._pack, self, name)
             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
+
+        # Case 2: string-based function body - try parsing as MDL source to build real AST
+        body_lines: List[str] = []
+        for cmd in commands_or_builder:
+            if isinstance(cmd, str):
+                body_lines.append(cmd)
+
+        if body_lines:
+            try:
+                from .mdl_parser import MDLParser
+                pack_decl = self._pack._pack
+
+                # Heuristic: attempt MDL parse only if there are control structures or var declarations
+                looks_like_mdl = any(
+                    l.strip().startswith(("var ", "if ", "while ", "on_load", "on_tick")) or
+                    l.strip().endswith("{") or l.strip() == "}" or "$" in l
+                    for l in body_lines
+                )
+                if looks_like_mdl:
+                    normalized: List[str] = []
+                    for line in body_lines:
+                        s = line.strip()
+                        if not s:
+                            continue
+                        if s.startswith("say "):
+                            msg = s[len("say ") :].strip()
+                            if not (msg.startswith('"') and msg.endswith('"')):
+                                msg = f'"{msg}"'
+                            normalized.append(f"say {msg};")
+                        elif s.startswith("exec "):
+                            if not s.endswith(";"):
+                                s = s + ";"
+                            normalized.append(s)
+                        elif s.startswith("var "):
+                            if not s.endswith(";"):
+                                s = s + ";"
+                            normalized.append(s)
+                        elif s.endswith("{") or s == "}" or s.endswith("}"):
+                            normalized.append(s)
+                        else:
+                            # Heuristic: detect assignment like name<scope> = expr
+                            try:
+                                import re as _re
+                                if _re.match(r'^[A-Za-z_][A-Za-z0-9_]*(<[^>]+>)?\s*=\s*', s):
+                                    if not s.endswith(";"):
+                                        s = s + ";"
+                                    normalized.append(s)
+                                else:
+                                    # Unknown command; wrap as single-line raw so parser accepts it
+                                    normalized.append(f"$!raw {s} raw!$")
+                            except Exception:
+                                normalized.append(f"$!raw {s} raw!$")
+
+                    src_lines = [
+                        f'pack "{pack_decl.name}" "{pack_decl.description}" {pack_decl.pack_format};',
+                        f'namespace "{self.name}";',
+                        f'function {self.name}:{name} {{'
+                    ]
+                    src_lines.extend(normalized)
+                    src_lines.append('}')
+                    source = "\n".join(src_lines)
+                    parser = MDLParser("<python_api>")
+                    ast = parser.parse(source)
+                    if ast.variables:
+                        self._pack._variables.extend(ast.variables)
+                    if ast.tags:
+                        self._pack._tags.extend(ast.tags)
+                    if ast.hooks:
+                        self._pack._hooks.extend([(h.hook_type, f"{h.namespace}:{h.name}", h.scope) for h in ast.hooks])
+                    if ast.functions:
+                        fn = ast.functions[0]
+                        self._functions.append(fn)
+                        return fn
+            except Exception:
+                pass
+
+        # Fallback: interpret simple strings
+        builder = FunctionBuilder(self._pack, self, name)
+        for cmd in body_lines:
+            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()
+                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)

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.4.39
+Version: 15.4.41
 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
@@ -146,17 +146,17 @@ namespace "game";
 var num player_score<@s> = 0;
 var num team_score<@a[team=red]> = 0;
 
-function game:start<@s> {
+function game:start {
     player_score<@s> = 100;
     say "Welcome! Your score is $player_score<@s>$";
 }
 
-on_load game:start<@s>;
+on_load game:start;
 ```
 
 ### Control Structures
 ```mdl
-function game:check_score<@s> {
+function game:check_score {
     if $player_score<@s>$ > 10 {
         say "Great score!";
         player_score<@s> = $player_score<@s>$ + 5;
@@ -185,7 +185,7 @@ tag structure "wizard_tower" "structures/wizard_tower.json";
 
 ### Raw Blocks and Say Commands
 ```mdl
-function game:special_effect<@s> {
+function game:special_effect {
     $!raw
     execute as @s run particle minecraft:explosion ~ ~ ~ 1 1 1 0 10
     execute as @s run playsound minecraft:entity.player.levelup player @s ~ ~ ~ 1 1

{minecraft_datapack_language-15.4.39 → minecraft_datapack_language-15.4.41}/minecraft_datapack_language.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ test_complex_scenarios.mdl
 test_comprehensive_fixes.mdl
 test_if_else_while.mdl
 test_simple.mdl
+tmp_local_cli_out.zip
 tmp_test1.mdl
 tmp_test1.mdl~
 tmp_test1_confirm.mdl
@@ -363,6 +364,7 @@ structures/diamond_sword.json
 structures/test_structure.json
 structures/workshop.json
 temp_output/pack.mcmeta
+temp_output/data/minecraft/tags/function/load.json
 temp_output/data/test/function/helper.mcfunction
 temp_output/data/test/function/load.mcfunction
 temp_output/data/test/function/main.mcfunction