dfpyre 0.8.11__py3-none-any.whl → 0.8.13__py3-none-any.whl

dfpyre/items.py

@@ -454,6 +454,25 @@ class Parameter:
         return f'{self.__class__.__name__}({self.name}, type: {raw_type})'
 
 
+class _Tag:
+    """
+    Represents a CodeBlock action tag.
+    """
+    type = 'bl_tag'
+
+    def __init__(self, tag_data: dict, slot: int | None=None):
+        self.tag_data = tag_data
+        self.slot = slot
+    
+    def format(self, slot: int|None):
+        formatted_dict = {"item": {"id": self.type, "data": self.tag_data}}
+        _add_slot(formatted_dict, self.slot or slot)
+        return formatted_dict
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.tag_data})'
+
+
 def item_from_dict(item_dict: dict, preserve_item_slots: bool) -> Any:
     item_id = item_dict['item']['id']
     item_data = item_dict['item']['data']
@@ -507,12 +526,17 @@ def item_from_dict(item_dict: dict, preserve_item_slots: bool) -> Any:
         param_type = ParameterType(PARAMETER_TYPE_LOOKUP.index(item_data['type']))
         if item_data['optional']:
             if 'default_value' in item_data:
-                default_value_item = item_from_dict(item_data['default_value'], preserve_item_slots)
+                default_value_dict = {'item': item_data['default_value'], 'slot': None}
+                default_value_item = item_from_dict(default_value_dict, preserve_item_slots)
                 return Parameter(item_data['name'], param_type, item_data['plural'], True, description, note, default_value_item, item_slot)
             return Parameter(item_data['name'], param_type, item_data['plural'], True, description, note, slot=item_slot)
         return Parameter(item_data['name'], param_type, item_data['plural'], False, description, note, slot=item_slot)
     
-    elif item_id in {'bl_tag', 'hint'}:  # Ignore tags and hints
+    elif item_id == 'bl_tag':
+        if 'variable' in item_data:
+            return _Tag(item_data, item_slot)
+    
+    elif item_id == 'hint':  # Ignore hints
         return
     
     else:

dfpyre/pyre.py

@@ -16,7 +16,7 @@ from dfpyre.actiondump import CODEBLOCK_DATA, get_default_tags
 from dfpyre.action_literals import *
 
 
-VARIABLE_TYPES = {'txt', 'comp', 'num', 'item', 'loc', 'var', 'snd', 'part', 'pot', 'g_val', 'vec', 'pn_el'}
+VARIABLE_TYPES = {'txt', 'comp', 'num', 'item', 'loc', 'var', 'snd', 'part', 'pot', 'g_val', 'vec', 'pn_el', 'bl_tag'}
 TEMPLATE_STARTERS = {'event', 'entity_event', 'func', 'process'}
 DYNAMIC_CODEBLOCKS = {'func', 'process', 'call_func', 'start_process'}
 
@@ -118,13 +118,20 @@ class CodeBlock:
         
         # add items into args
         final_args = [arg.format(slot) for slot, arg in enumerate(self.args) if arg.type in VARIABLE_TYPES]
+        already_applied_tags: dict[str, dict] = {a['item']['data']['tag']: a for a in final_args if a['item']['id'] == 'bl_tag'}
         
         # check for unrecognized name, add tags
         if self.type not in {'bracket', 'else'}:
             if self.action_name not in CODEBLOCK_DATA[self.type]:
                 _warn_unrecognized_name(self.type, self.action_name)
+            
             elif include_tags:
                 tags = _get_codeblock_tags(self.type, self.action_name, self.tags)
+                for i, tag_data in enumerate(tags):
+                    already_applied_tag_data = already_applied_tags.get(tag_data['item']['data']['tag'])
+                    if already_applied_tag_data is not None:
+                        tags[i] = already_applied_tag_data
+                
                 if len(final_args) + len(tags) > 27:
                     final_args = final_args[:(27-len(tags))]  # trim list if over 27 elements
                 final_args.extend(tags)  # add tags to end
@@ -160,7 +167,7 @@ def _check_applied_tags(tags: list[dict], applied_tags: dict[str, str], codebloc
     return valid_tags
 
 
-def _reformat_codeblock_tags(tags: list[dict], codeblock_type: str, codeblock_action: str, applied_tags: dict[str, str]):
+def _reformat_codeblock_tags(tags: list[dict], codeblock_type: str, codeblock_action: str, applied_tags: dict[str, str]) -> list[dict]:
     """
     Turns tag objects into DiamondFire formatted tag items.
     """
@@ -187,7 +194,7 @@ def _reformat_codeblock_tags(tags: list[dict], codeblock_type: str, codeblock_ac
     return reformatted_tags
 
 
-def _get_codeblock_tags(codeblock_type: str, codeblock_name: str, applied_tags: dict[str, str]):
+def _get_codeblock_tags(codeblock_type: str, codeblock_name: str, applied_tags: dict[str, str]) -> list[dict]:
     """
     Get tags for the specified codeblock type and name.
     """
@@ -244,7 +251,7 @@ class DFTemplate:
 
 
     @staticmethod
-    def from_code(template_code: str, preserve_item_slots: bool=False):
+    def from_code(template_code: str, preserve_item_slots: bool=True):
         """
         Create a template object from an existing template code.
 

{dfpyre-0.8.11.dist-info → dfpyre-0.8.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.8.11
+Version: 0.8.13
 Summary: A package for creating and modifying code templates for the DiamondFire Minecraft server.
 Home-page: https://github.com/Amp63/pyre
 License: MIT
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: mcitemlib (>=0.4.2,<0.5.0)
+Requires-Dist: mcitemlib (>=0.4.3,<0.5.0)
 Project-URL: Repository, https://github.com/Amp63/pyre
 Description-Content-Type: text/markdown
 

{dfpyre-0.8.11.dist-info → dfpyre-0.8.13.dist-info}/RECORD

@@ -2,12 +2,12 @@ dfpyre/__init__.py,sha256=apPsSxJ1Tztfl71MoORoSmDfX7LyKLYlLwOGeLQUitw,25
 dfpyre/action_literals.py,sha256=bwdLVDi2sU_4HUmvyOJtCguPOWJga_fQTPLtzPm4Mr4,52084
 dfpyre/actiondump.py,sha256=zsdvsfVk2eZ3-O_G_azB4SDsFWMRkuzkNf-gqUfOsYc,3401
 dfpyre/data/actiondump_min.json,sha256=a7Wvc_qBuzv-C_puidQ0vq7pYeM1oojeAimYpVykP_o,2478020
-dfpyre/items.py,sha256=UejWtUI7Enh3K_IS0XrrSAIlrDMHILXhnxBX_8-oF_k,16727
-dfpyre/pyre.py,sha256=-KFBI7DBG43EQnZVmc7oxuGbDw4JPVJih4NY6QncL5I,24981
+dfpyre/items.py,sha256=GOUogkwm7TzgC4AmRem623BtGggxtFcgD2uTporNDgs,17409
+dfpyre/pyre.py,sha256=iP7D8Bt36vRZp_gd_M7IgViWYHzSDdh2fT_sDLrAMso,25454
 dfpyre/scriptgen.py,sha256=uCG32PlOdcJJBBKn91458eMgP_Ml4K4-n2Fk3LN0T4g,8054
 dfpyre/style.py,sha256=mLW1CFvvi8_9fk8JaH10I5S4WI0YBdQIXHtI3G_4sR8,980
 dfpyre/util.py,sha256=Jt-gJjbBWvv2Q2HFxU09OUeLje2OZbB3nAvs87IuHqQ,807
-dfpyre-0.8.11.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
-dfpyre-0.8.11.dist-info/METADATA,sha256=LEApaIVksI6mxETBM3YkdAkDakaoFJZW028yp2Zlmyw,11949
-dfpyre-0.8.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dfpyre-0.8.11.dist-info/RECORD,,
+dfpyre-0.8.13.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
+dfpyre-0.8.13.dist-info/METADATA,sha256=bxATIPmf0x6MjjFgj_zQqmFTVq1rXotLQx8S22Eo1qs,11949
+dfpyre-0.8.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dfpyre-0.8.13.dist-info/RECORD,,