minecraft-datapack-language 15.1.78__tar.gz → 15.1.80__tar.gz

{minecraft_datapack_language-15.1.78/minecraft_datapack_language.egg-info → minecraft_datapack_language-15.1.80}/PKG-INFO

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

@@ -0,0 +1,3 @@
+current: "15.1.79"
+tag: "v15.1.79"
+updated_at: "2025-09-01T23:18:59Z"

{minecraft_datapack_language-15.1.78 → minecraft_datapack_language-15.1.80}/docs/_includes/head-custom.html

@@ -577,7 +577,7 @@ code.language-mcfunction .token.keyword,
 
 pre code.language-mcfunction .token.builtin,
 code.language-mcfunction .token.builtin,
-.language-mdl .token.builtin {
+.language-mcfunction .token.builtin {
   color: #6f42c1 !important;
   font-weight: 500 !important;
 }
@@ -620,6 +620,12 @@ code.language-mcfunction .token.comment,
   font-style: italic !important;
 }
 
+[data-theme="dark"] pre code.language-mcfunction .token.comment,
+[data-theme="dark"] code.language-mcfunction .token.comment,
+[data-theme="dark"] .language-mcfunction .token.comment {
+  color: #8b949e !important;
+}
+
 pre code.language-mcfunction .token.number,
 code.language-mcfunction .token.number,
 .language-mcfunction .token.number {

{minecraft_datapack_language-15.1.78 → minecraft_datapack_language-15.1.80}/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.78'
-__version_tuple__ = version_tuple = (15, 1, 78)
+__version__ = version = '15.1.80'
+__version_tuple__ = version_tuple = (15, 1, 80)
 
-__commit_id__ = commit_id = 'g6f9fca445'
+__commit_id__ = commit_id = 'g3fec53f32'

{minecraft_datapack_language-15.1.78 → minecraft_datapack_language-15.1.80}/minecraft_datapack_language/cli_build.py

@@ -155,14 +155,16 @@ def _generate_scoreboard_objectives(ast: Dict[str, Any], output_dir: Path) -> Li
     """Generate scoreboard objectives for all variables."""
     scoreboard_commands = []
     
-    # Collect all variable names
-    variables = set()
+    # Collect all variable names in order of appearance
+    variables = []
+    seen_variables = set()
     
-    # From variable declarations
+    # From variable declarations (preserve order)
     if 'variables' in ast:
         for var_decl in ast['variables']:
-            if 'name' in var_decl:
-                variables.add(var_decl['name'])
+            if 'name' in var_decl and var_decl['name'] not in seen_variables:
+                variables.append(var_decl['name'])
+                seen_variables.add(var_decl['name'])
     
     # From functions (scan for variable usage)
     if 'functions' in ast:
@@ -171,7 +173,9 @@ def _generate_scoreboard_objectives(ast: Dict[str, Any], output_dir: Path) -> Li
                 for statement in func['body']:
                     # Look for variable assignments and usage
                     if statement['type'] == 'variable_assignment':
-                        variables.add(statement['name'])
+                        if statement['name'] not in seen_variables:
+                            variables.append(statement['name'])
+                            seen_variables.add(statement['name'])
                     elif statement['type'] == 'command':
                         # Scan command for variable substitutions
                         command = statement['command']
@@ -180,10 +184,12 @@ def _generate_scoreboard_objectives(ast: Dict[str, Any], output_dir: Path) -> Li
                         for var_name in var_matches:
                             # Extract base name from scoped variables
                             base_name = _extract_base_variable_name(var_name)
-                            variables.add(base_name)
+                            if base_name not in seen_variables:
+                                variables.append(base_name)
+                                seen_variables.add(base_name)
     
-    # Create scoreboard objectives
-    for var_name in sorted(variables):
+    # Create scoreboard objectives in the order they were found
+    for var_name in variables:
         scoreboard_commands.append(f"scoreboard objectives add {var_name} dummy")
     
     return scoreboard_commands
@@ -228,50 +234,8 @@ def _process_say_command_with_variables(content: str, selector: str) -> str:
     matches = re.findall(var_pattern, content)
     
     if not matches:
-        # 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:
-            # Process the content by replacing each variable with a score component
-            components = []
-            processed_content = content
-            
-            # Sort variables by their position in the content to process them in order
-            var_positions = []
-            for var_name in set(word_matches):  # Remove duplicates
-                pos = processed_content.find(var_name)
-                if pos >= 0:
-                    var_positions.append((pos, var_name))
-            
-            var_positions.sort()  # Sort by position
-            
-            last_pos = 0
-            for pos, var_name in var_positions:
-                # Add text before this variable
-                if pos > last_pos:
-                    text_before = processed_content[last_pos:pos]
-                    if text_before:
-                        components.append(f'{{"text":"{text_before}"}}')
-                
-                # Add score component for variable
-                components.append(f'{{"score":{{"name":"@e[type=armor_stand,tag=mdl_server,limit=1]","objective":"{var_name}"}}}}')
-                
-                last_pos = pos + len(var_name)
-            
-            # Add remaining text after last variable
-            if last_pos < len(processed_content):
-                remaining_text = processed_content[last_pos:]
-                if remaining_text:
-                    components.append(f'{{"text":"{remaining_text}"}}')
-            
-            # 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}"}}]'
+        # 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-15.1.78 → minecraft_datapack_language-15.1.80/minecraft_datapack_language.egg-info}/PKG-INFO

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

@@ -1,3 +0,0 @@
-current: "15.1.77"
-tag: "v15.1.77"
-updated_at: "2025-09-01T22:20:36Z"