minecraft-datapack-language 16.0.0__tar.gz → 16.0.2__tar.gz

{minecraft_datapack_language-16.0.0/minecraft_datapack_language.egg-info → minecraft_datapack_language-16.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.0
+Version: 16.0.2
 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.2/docs/_data/version.yml

@@ -0,0 +1,3 @@
+current: "16.0.1"
+tag: "v16.0.1"
+updated_at: "2025-09-07T06:17:05Z"

{minecraft_datapack_language-16.0.0 → minecraft_datapack_language-16.0.2}/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.0'
-__version_tuple__ = version_tuple = (16, 0, 0)
+__version__ = version = '16.0.2'
+__version_tuple__ = version_tuple = (16, 0, 2)
 
-__commit_id__ = commit_id = 'gc1292ffac'
+__commit_id__ = commit_id = 'ge6a944561'

{minecraft_datapack_language-16.0.0 → minecraft_datapack_language-16.0.2}/minecraft_datapack_language/mdl_compiler.py

@@ -270,10 +270,15 @@ 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"
-        # If there are explicit on_load hooks, include them; otherwise reference namespace:load
+        # Always include namespace:load (contains scoreboard initialization), plus any explicit on_load hooks
         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"]
+            # 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)
         
@@ -369,8 +374,16 @@ class MDLCompiler:
             # Return the command to set the target variable from the temp
             return f"scoreboard players operation {scope} {objective} = @s {temp_var}"
         else:
-            # Simple value - use direct assignment
+            # Simple value - use direct assignment or scoreboard copy
             value = self._expression_to_value(assignment.value)
+            # If RHS resolves to a scoreboard reference (e.g., 'score @s some_obj'),
+            # emit an operation copy instead of an invalid 'set ... score ...'
+            if isinstance(value, str) and value.startswith("score "):
+                parts = value.split()
+                if len(parts) >= 3:
+                    src_scope = parts[1]
+                    src_objective = parts[2]
+                    return f"scoreboard players operation {scope} {objective} = {src_scope} {src_objective}"
             return f"scoreboard players set {scope} {objective} {value}"
 
     def _variable_declaration_to_command(self, decl: VariableDeclaration) -> str:
@@ -388,6 +401,13 @@ class MDLCompiler:
         except Exception:
             init = None
         if init is not None:
+            # Initialize from another scoreboard using operation copy
+            if isinstance(init, str) and init.startswith("score "):
+                parts = init.split()
+                if len(parts) >= 3:
+                    src_scope = parts[1]
+                    src_objective = parts[2]
+                    return f"scoreboard players operation {scope} {objective} = {src_scope} {src_objective}"
             return f"scoreboard players set {scope} {objective} {init}"
         return f"# var {decl.name} declared"
     
@@ -772,7 +792,7 @@ class MDLCompiler:
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
                 # Assign from left value (score or literal)
-                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(left_value, str) and left_value.startswith("score ")):
                     parts = str(left_value).split()
                     scope = parts[1]
                     obj = parts[2]
@@ -780,7 +800,7 @@ class MDLCompiler:
                 else:
                     self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
             # Add right value
-            if isinstance(expression.right, VariableSubstitution) or (isinstance(expression.right, str) and str(right_value).startswith("score ")):
+            if isinstance(expression.right, VariableSubstitution) or (isinstance(right_value, str) and right_value.startswith("score ")):
                 parts = str(right_value).split()
                 scope = parts[1]
                 obj = parts[2]
@@ -792,7 +812,7 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(left_value, str) and left_value.startswith("score ")):
                     parts = str(left_value).split()
                     scope = parts[1]
                     obj = parts[2]
@@ -800,7 +820,7 @@ class MDLCompiler:
                 else:
                     self._store_temp_command(f"scoreboard players set @s {temp_var} {left_value}")
             # Subtract right value
-            if isinstance(expression.right, VariableSubstitution) or (isinstance(expression.right, str) and str(right_value).startswith("score ")):
+            if isinstance(expression.right, VariableSubstitution) or (isinstance(right_value, str) and right_value.startswith("score ")):
                 parts = str(right_value).split()
                 scope = parts[1]
                 obj = parts[2]
@@ -812,7 +832,7 @@ class MDLCompiler:
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(left_value, str) and left_value.startswith("score ")):
                     parts = str(left_value).split()
                     scope = parts[1]
                     obj = parts[2]
@@ -825,15 +845,27 @@ class MDLCompiler:
             else:
                 # For literal values, keep explicit multiply command for compatibility
                 if isinstance(expression.right, LiteralExpression):
-                    self._store_temp_command(f"scoreboard players multiply @s {temp_var} {expression.right.value}")
+                    # Normalize number formatting (e.g., 2.0 -> 2)
+                    literal_str = self._expression_to_value(expression.right)
+                    self._store_temp_command(f"scoreboard players multiply @s {temp_var} {literal_str}")
                 else:
-                    self._store_temp_command(f"scoreboard players operation @s {temp_var} *= {right_value}")
+                    # If right_value is a score reference string, strip the leading 'score '
+                    if isinstance(right_value, str) and right_value.startswith("score "):
+                        parts = right_value.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} *= {right_value}")
+                    else:
+                        self._store_temp_command(f"scoreboard players operation @s {temp_var} *= {right_value}")
                 
         elif expression.operator == "DIVIDE":
             if isinstance(expression.left, BinaryExpression):
                 self._store_temp_command(f"scoreboard players operation @s {temp_var} = @s {left_temp}")
             else:
-                if isinstance(expression.left, VariableSubstitution) or (isinstance(expression.left, str) and str(left_value).startswith("score ")):
+                if isinstance(expression.left, VariableSubstitution) or (isinstance(left_value, str) and left_value.startswith("score ")):
                     parts = str(left_value).split()
                     scope = parts[1]
                     obj = parts[2]
@@ -846,9 +878,21 @@ class MDLCompiler:
             else:
                 # For literal values, keep explicit divide command for compatibility
                 if isinstance(expression.right, LiteralExpression):
-                    self._store_temp_command(f"scoreboard players divide @s {temp_var} {expression.right.value}")
+                    # Normalize number formatting (e.g., 2.0 -> 2)
+                    literal_str = self._expression_to_value(expression.right)
+                    self._store_temp_command(f"scoreboard players divide @s {temp_var} {literal_str}")
                 else:
-                    self._store_temp_command(f"scoreboard players operation @s {temp_var} /= {right_value}")
+                    # If right_value is a score reference string, strip the leading 'score '
+                    if isinstance(right_value, str) and right_value.startswith("score "):
+                        parts = right_value.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} /= {right_value}")
+                    else:
+                        self._store_temp_command(f"scoreboard players operation @s {temp_var} /= {right_value}")
         else:
             # For other operators, just set the value
             self._store_temp_command(f"scoreboard players set @s {temp_var} 0")

{minecraft_datapack_language-16.0.0 → minecraft_datapack_language-16.0.2/minecraft_datapack_language.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 16.0.0
+Version: 16.0.2
 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.0 → minecraft_datapack_language-16.0.2}/tests/test_compiler_fixes.py

@@ -48,7 +48,8 @@ function test:complex_math<@s> {
         print(f"Generated content:\n{content}")
         
         # Verify it contains valid Minecraft commands
-        assert "scoreboard players set @s temp_" in content, "Should generate temporary variables"
+        # Temp variables may be assigned via set or operation depending on operands
+        assert ("scoreboard players set @s temp_" in content) or ("scoreboard players operation @s temp_" in content), "Should generate temporary variable assignment"
         # Add operations may use "+=" with another score; accept either form
         assert ("scoreboard players add @s temp_" in content) or ("+= @s" in content), "Should generate add operations"
         assert "scoreboard players operation @s temp_" in content, "Should generate scoreboard operations"
@@ -177,10 +178,11 @@ function test:scope_test<@s> {
         print(f"Generated content:\n{content}")
         
         # Verify scope handling
-        assert "scoreboard players set @a global_score" in content, "Should handle @a scope"
+        # Copy from another score should use operation, not set with 'score ...'
+        assert "scoreboard players operation @a global_score = @s player_score" in content, "Should copy @s->@a via operation"
         # Assignment to player_score uses temp operation then operation set; accept operation form
         assert ("scoreboard players set @s player_score" in content) or ("scoreboard players operation @s player_score =" in content), "Should handle @s scope"
-        assert "score @s player_score" in content, "Should read from @s scope"
+        assert "@s player_score" in content, "Should reference @s player_score somewhere"
         # Read from @a appears in temp operations; accept either explicit read or operation form
         assert ("score @a global_score" in content) or ("= @a global_score" in content)
         

minecraft_datapack_language-16.0.0/docs/_data/version.yml

@@ -1,3 +0,0 @@
-current: "15.4.43"
-tag: "v15.4.43"
-updated_at: "2025-09-06T18:23:47Z"