dfpyre 0.7.0__tar.gz → 0.7.2__tar.gz

{dfpyre-0.7.0 → dfpyre-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.7.0
+Version: 0.7.2
 Summary: A package for creating and modifying code templates for the DiamondFire Minecraft server.
 Home-page: https://github.com/Amp63/pyre
 License: MIT

{dfpyre-0.7.0 → dfpyre-0.7.2}/dfpyre/actiondump.py

@@ -15,7 +15,7 @@ CODEBLOCK_NAME_LOOKUP = {
     'IF GAME': 'if_game',
     'IF VARIABLE': 'if_var',
     'REPEAT': 'repeat',
-    'SELECT OBJECT': 'select_object',
+    'SELECT OBJECT': 'select_obj',
     'CONTROL': 'control',
     'PLAYER EVENT': 'event',
     'ENTITY EVENT': 'entity_event',
@@ -59,6 +59,11 @@ def parse_actiondump():
         
         codeblock_name = CODEBLOCK_NAME_LOOKUP[action_data['codeblockName']]
         codeblock_data[codeblock_name][action_data['name']] = parsed_action_data
+        if aliases := action_data['aliases']:
+            alias_data = parsed_action_data.copy()
+            alias_data['alias'] = action_data['name']
+            for alias in aliases:
+                codeblock_data[codeblock_name][alias] = alias_data
     
     return codeblock_data
 

{dfpyre-0.7.0 → dfpyre-0.7.2}/dfpyre/items.py

@@ -363,10 +363,10 @@ def item_from_dict(item_dict: dict) -> object:
         note = _some_or(item_data.get('note'), '')
         param_type = ParameterType(PARAMETER_TYPE_LOOKUP.index(item_data['type']))
         if item_data['optional']:
-            param = parameter(item_data['name'], param_type, item_data['plural'], True, description, note, item_from_dict(item_data['default_value']))
-        else:
-            param = parameter(item_data['name'], param_type, item_data['plural'], False, description, note)
-        return param
+            if 'default_value' in item_data:
+                return parameter(item_data['name'], param_type, item_data['plural'], True, description, note, item_from_dict(item_data['default_value']))
+            return parameter(item_data['name'], param_type, item_data['plural'], True, description, note)
+        return parameter(item_data['name'], param_type, item_data['plural'], False, description, note)
     elif item_id in {'bl_tag', 'hint'}:
         return
     else:

{dfpyre-0.7.0 → dfpyre-0.7.2}/dfpyre/pyre.py

@@ -19,7 +19,7 @@ from dfpyre.actiondump import CODEBLOCK_DATA, get_default_tags
 
 VARIABLE_TYPES = {'txt', 'comp', 'num', 'item', 'loc', 'var', 'snd', 'part', 'pot', 'g_val', 'vec', 'pn_el'}
 TEMPLATE_STARTERS = {'event', 'entity_event', 'func', 'process'}
-SINGLE_NAME_CODEBLOCKS = {'func', 'process', 'call_func', 'start_process', 'else'}
+DYNAMIC_CODEBLOCKS = {'func', 'process', 'call_func', 'start_process'}
 
 TARGETS = ['Selection', 'Default', 'Killer', 'Damager', 'Shooter', 'Victim', 'AllPlayers', 'Projectile', 'AllEntities', 'AllMobs', 'LastEntity']
 TARGET_CODEBLOCKS = {'player_action', 'entity_action', 'if_player', 'if_entity'}
@@ -55,7 +55,7 @@ class CodeBlock:
         self.tags = tags
     
     def __repr__(self) -> str:
-        if self.name in SINGLE_NAME_CODEBLOCKS:
+        if self.name in DYNAMIC_CODEBLOCKS:
             if self.name == 'else':
                 return 'CodeBlock(else)'
             return f'CodeBlock({self.name}, {self.data["data"]})'
@@ -78,7 +78,7 @@ class CodeBlock:
         final_args = [arg.format(slot) for slot, arg in enumerate(self.args) if arg.type in VARIABLE_TYPES]
         
         # check for unrecognized name, add tags
-        if codeblock_type is not None:  # for brackets
+        if codeblock_type is not None and codeblock_type != 'else':
             if self.name not in CODEBLOCK_DATA[codeblock_type]:
                 _warn_unrecognized_name(codeblock_type, self.name)
             elif include_tags:
@@ -227,16 +227,18 @@ class DFTemplate:
                         args.append(parsed_item)
             target = Target(TARGETS.index(block_dict['target'])) if 'target' in block_dict else DEFAULT_TARGET
 
-            codeblock_name = 'bracket'
-            if 'block' in block_dict and block_dict['block'] in SINGLE_NAME_CODEBLOCKS:
-                codeblock_name = block_dict['block']
+            codeblock_action = 'bracket'
+            if block_dict.get('block') == 'else':
+                codeblock_action = 'else'
+            elif block_dict.get('block') in DYNAMIC_CODEBLOCKS:
+                codeblock_action = 'dynamic'
             elif 'action' in block_dict:
-                codeblock_name = block_dict['action']
+                codeblock_action = block_dict['action']
             
-            if codeblock_name == 'bracket' or block_dict['block'] == 'else':
-                codeblock = CodeBlock(codeblock_name, data=block_dict)
+            if codeblock_action == 'bracket' or block_dict['block'] == 'else':
+                codeblock = CodeBlock(codeblock_action, data=block_dict)
             else:
-                codeblock = CodeBlock(codeblock_name, args, target, block_dict, tags=block_tags)
+                codeblock = CodeBlock(codeblock_action, args, target, block_dict, tags=block_tags)
             template.codeblocks.append(codeblock)
         
         return template

{dfpyre-0.7.0 → dfpyre-0.7.2}/dfpyre/scriptgen.py

@@ -29,7 +29,6 @@ TEMPLATE_METHOD_LOOKUP = {
 }
 
 TARGET_CODEBLOCKS = {'player_action', 'entity_action', 'if_player', 'if_entity'}
-SINGLE_NAME_CODEBLOCKS = {'func', 'process', 'call_func', 'start_process'}
 VAR_SCOPES = {'unsaved': 'g', 'saved': 's', 'local': 'l', 'line': 'i'}
 
 
@@ -134,7 +133,7 @@ def generate_script(template, flags: GeneratorFlags) -> str:
 
         method_name = TEMPLATE_METHOD_LOOKUP[codeblock.data['block']]
         method_args = [f'"{codeblock.name}"']
-        if codeblock.name in SINGLE_NAME_CODEBLOCKS:
+        if codeblock.name == 'dynamic':
             method_args[0] = f'"{codeblock.data["data"]}"'
         
         codeblock_args = [argument_item_to_string(flags, i) for i in codeblock.args]
@@ -143,7 +142,6 @@ def generate_script(template, flags: GeneratorFlags) -> str:
         if method_name in TARGET_CODEBLOCKS and codeblock.target.name != 'SELECTION':
             method_args.append(f'target=Target.{codeblock.target.name}')
         if codeblock.tags:
-            print(codeblock.tags)
             default_tags = get_default_tags(codeblock.data.get('block'), codeblock.name)
             written_tags = {t: o for t, o in codeblock.tags.items() if default_tags[t] != o}
             if written_tags:

{dfpyre-0.7.0 → dfpyre-0.7.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dfpyre"
-version = "0.7.0"
+version = "0.7.2"
 description = "A package for creating and modifying code templates for the DiamondFire Minecraft server."
 authors = ["Amp"]
 readme = "README.md"