minecraft-datapack-language 15.1.69__py3-none-any.whl → 15.1.71__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 = '15.1.69'
-__version_tuple__ = version_tuple = (15, 1, 69)
+__version__ = version = '15.1.71'
+__version_tuple__ = version_tuple = (15, 1, 71)
 
 __commit_id__ = commit_id = None

minecraft_datapack_language/cli_build.py

@@ -228,8 +228,40 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     matches = re.findall(var_pattern, content)
     
     if not matches:
-        # No variables, return simple tellraw
-        return f'tellraw @a [{{"text":"{content}"}}]'
+        # Check for common variable names that might have been processed
+        # This handles the case where $counter$ was converted to just "counter"
+        word_pattern = r'\b(counter|health|score|value|num|count|timer|level)\b'
+        word_matches = re.findall(word_pattern, content)
+        
+        if word_matches:
+            # Found potential variables, convert to score components
+            components = []
+            remaining_content = content
+            
+            for var_name in word_matches:
+                # Split content around the variable name
+                parts = remaining_content.split(var_name, 1)
+                if len(parts) == 2:
+                    # Add text before variable
+                    if parts[0]:
+                        components.append(f'{{"text":"{parts[0]}"}}')
+                    
+                    # Add score component for variable
+                    components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
+                    
+                    # Continue with remaining content
+                    remaining_content = parts[1]
+            
+            # Add remaining text
+            if remaining_content:
+                components.append(f'{{"text":"{remaining_content}"}}')
+            
+            # Combine all components
+            components_str = ','.join(components)
+            return f'tellraw @a [{components_str}]'
+        else:
+            # No variables, return simple tellraw
+            return f'tellraw @a [{{"text":"{content}"}}]'
     
     # Split content by variable references while preserving the structure
     parts = re.split(var_pattern, content)

minecraft_datapack_language/cli_utils.py

@@ -23,6 +23,10 @@ def write_json(path: str, data: Any) -> None:
 def _process_variable_substitutions(command: str, selector: str = "@s") -> str:
     """Process $variable$ and $variable<selector>$ substitutions in commands."""
     
+    # Skip say commands - they have their own variable substitution logic
+    if command.strip().startswith('say '):
+        return command
+    
     # Check if this is a tellraw command with JSON
     if command.strip().startswith('tellraw'):
         # Special handling for tellraw commands with variable substitutions

{minecraft_datapack_language-15.1.69.dist-info → minecraft_datapack_language-15.1.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: minecraft-datapack-language
-Version: 15.1.69
+Version: 15.1.71
 Summary: Compile JavaScript-style MDL language or Python API 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.1.69.dist-info → minecraft_datapack_language-15.1.71.dist-info}/RECORD

@@ -1,12 +1,12 @@
 minecraft_datapack_language/__init__.py,sha256=i-qCchbe5b2Fshgc6yCU9mddOLs2UBt9SAcLqfUIrT0,606
-minecraft_datapack_language/_version.py,sha256=6TxlCSuF8-kojdWBSSn-IN5P1XVgmQA6v2TqLiCUpZ0,708
+minecraft_datapack_language/_version.py,sha256=PKLNGZd-5QsGyNwZB4oYPmxB3tj23RqdTO-egU2I568,708
 minecraft_datapack_language/ast_nodes.py,sha256=pgjI2Nlap3ixFPgWqGSkqncG9zB91h5BKgRjtcJqMew,2118
 minecraft_datapack_language/cli.py,sha256=p5A_tEEXugN2NhQFbbgfwi4FxbWYD91RWeKR_A3Vuec,6263
-minecraft_datapack_language/cli_build.py,sha256=mYZlzS574q0OrHKvmV9UwwnGsAF9sPyrnd6tIb9il6U,40758
+minecraft_datapack_language/cli_build.py,sha256=4TFvbybSTuGftxgxwMrGHqlxwL5qpTuuxtil3OcRFks,42240
 minecraft_datapack_language/cli_check.py,sha256=bPq9gHsxQ1CIiftkrAtRCifWkVAyjp5c8Oay2NNQ1qs,6277
 minecraft_datapack_language/cli_help.py,sha256=jUTHUQBONAZKVTdQK9tNPXq4c_6xpsafNOvHDjkEldg,12243
 minecraft_datapack_language/cli_new.py,sha256=uaKH0VBC43XBt_Hztc35-BfC9bYlsDdLbAfe_42rrtI,8235
-minecraft_datapack_language/cli_utils.py,sha256=OF64njFa_19qGJ-1EBMI8btMs8OUi-0wGoFAQo6525U,9775
+minecraft_datapack_language/cli_utils.py,sha256=R6YTvPvv2x20H3cLTVBDAgNunWbYCa8RrXtilB94OlE,9920
 minecraft_datapack_language/dir_map.py,sha256=HmxFkuvWGkzHF8o_GFb4BpuMCRc6QMw8UbmcAI8JVdY,1788
 minecraft_datapack_language/expression_processor.py,sha256=GN6cuRNvgI8TrV6YnEHrA9P0X-ACTT7rCBh4WlOPjSI,20140
 minecraft_datapack_language/linter.py,sha256=7UqbygC5JPCGg-BSOq65NB2xEJBu_OUOYIIgmHItO2M,16567
@@ -16,9 +16,9 @@ minecraft_datapack_language/mdl_linter.py,sha256=z85xoAglENurCh30bR7kEHZ_JeMxcYa
 minecraft_datapack_language/mdl_parser_js.py,sha256=4VMWx6O7A10afTzjGnnwL_Sh52osIO84ObqHp8KoDZw,38677
 minecraft_datapack_language/pack.py,sha256=nYiXQ3jgJlDfc4m-65f7C2LFhDRioaUU_XVy6Na4SJI,34625
 minecraft_datapack_language/utils.py,sha256=Aq0HAGlXqj9BUTEjaEilpvzEW0EtZYYMMwOqG9db6dE,684
-minecraft_datapack_language-15.1.69.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-minecraft_datapack_language-15.1.69.dist-info/METADATA,sha256=7TlpvweYFL4mHjbE_Y8N-Vq_zX6nNWROZn3pJPeUwU4,35230
-minecraft_datapack_language-15.1.69.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-minecraft_datapack_language-15.1.69.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
-minecraft_datapack_language-15.1.69.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
-minecraft_datapack_language-15.1.69.dist-info/RECORD,,
+minecraft_datapack_language-15.1.71.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+minecraft_datapack_language-15.1.71.dist-info/METADATA,sha256=5lq8XA2l4sxH04WHWxGSsMPpLi4WcfuonumrluNHLe4,35230
+minecraft_datapack_language-15.1.71.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+minecraft_datapack_language-15.1.71.dist-info/entry_points.txt,sha256=c6vjBeCiyQflvPHBRyBk2nJCSfYt3Oc7Sc9V87ySi_U,108
+minecraft_datapack_language-15.1.71.dist-info/top_level.txt,sha256=ADtFI476tbKLLxEAA-aJQAfg53MA3k_DOb0KTFiggfw,28
+minecraft_datapack_language-15.1.71.dist-info/RECORD,,