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

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.dist-info → minecraft_datapack_language-16.0.2.dist-info}/METADATA

@@ -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.dist-info → minecraft_datapack_language-16.0.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
 minecraft_datapack_language/__init__.py,sha256=0KVXBE4ScRaRUrf83aA2tVB-y8A_jplyaxVvtHH6Uw0,1199
-minecraft_datapack_language/_version.py,sha256=LxizsVtm7l6cekUdZKE9n7g_QwjmCqQimKl5KLxvXgY,706
+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=9o9NXd9_szEKEmmZ0HPanFA9W8UOPOVA5Jbw-9XyM1w,42414
+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.0.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-16.0.0.dist-info/METADATA,sha256=ugCGZfxrD0TCOEA96G5HCegjM-cwASnEKscVk78cepc,8343
-minecraft_datapack_language-16.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-16.0.0.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-16.0.0.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-16.0.0.dist-info/RECORD,,
+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,,