dfpyre 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

dfpyre/items.py

@@ -316,7 +316,7 @@ def item_from_dict(item_dict: Dict) -> object:
         else:
             param = parameter(item_data['name'], param_type, item_data['plural'], False, description, note)
         return param
-    elif item_id == 'bl_tag':
+    elif item_id in {'bl_tag', 'hint'}:
         return
     else:
         raise PyreException(f'Unrecognized item id `{item_id}`')

dfpyre/pyre.py

@@ -226,8 +226,6 @@ def _get_template_item(template_code: str, name: str, author: str) -> NbtItem:
     return template_item
 
 
-# TODO: 
-# - add inserting codeblocks at any index
 class DFTemplate:
     """
     Represents a DiamondFire code template.
@@ -306,21 +304,19 @@ class DFTemplate:
 
         self._set_template_name(first_block)
 
-        print(f'{COL_SUCCESS}Template built successfully.{COL_RESET}')
-
         json_string = json.dumps(template_dict, separators=(',', ':'))
         return _df_encode(json_string)
     
 
-    def build_and_send(self, method: Literal['recode', 'codeclient'], includeTags: bool=True) -> int:
+    def build_and_send(self, method: Literal['recode', 'codeclient'], include_tags: bool=True) -> int:
         """
         Builds this template and sends it to DiamondFire automatically.
         
-        :param bool includeTags: If True, include item tags in code blocks. Otherwise omit them.
+        :param bool include_tags: If True, include item tags in code blocks. Otherwise omit them.
         """
-        templateCode = self.build(includeTags)
-        templateItem = _get_template_item(templateCode, self.name, self.author)
-        return templateItem.send_to_minecraft(method, 'pyre')
+        template_code = self.build(include_tags)
+        template_item = _get_template_item(template_code, self.name, self.author)
+        return template_item.send_to_minecraft(method, 'pyre')
     
 
     def clear(self):
@@ -330,138 +326,144 @@ class DFTemplate:
         self.__init__()
     
 
-    def _openbracket(self, btype: Literal['norm', 'repeat']='norm'):
+    def _add_codeblock(self, codeblock: CodeBlock, index: int|None):
+        if index is None:
+            self.codeblocks.append(codeblock)
+        else:
+            self.codeblocks.insert(index, codeblock)
+    
+
+    def _openbracket(self, index: int|None, btype: Literal['norm', 'repeat']='norm'):
         bracket = CodeBlock('bracket', data={'id': 'bracket', 'direct': 'open', 'type': btype})
-        self.codeblocks.append(bracket)
+        self._add_codeblock(bracket, index)
         self.bracket_stack.append(btype)
     
 
     # command methods
-    def player_event(self, name: str):
+    def player_event(self, name: str, index: int|None=None):
         cmd = CodeBlock(name, data={'id': 'block', 'block': 'event', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def entity_event(self, name: str):
+    def entity_event(self, name: str, index: int|None=None):
         cmd = CodeBlock(name, data={'id': 'block', 'block': 'entity_event', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def function(self, name: str, *args):
+    def function(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock('func', args, data={'id': 'block', 'block': 'func', 'data': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def process(self, name: str, *args):
+    def process(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock('process', args, data={'id': 'block', 'block': 'process', 'data': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def call_function(self, name: str, *args):
+    def call_function(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock('call_func', args, data={'id': 'block', 'block': 'call_func', 'data': name})
-        self.codeblocks.append(cmd)
-    
+        self._add_codeblock(cmd, index)    
 
-    def start_process(self, name: str):
+    def start_process(self, name: str, index: int|None=None):
         cmd = CodeBlock('start_process', data={'id': 'block', 'block': 'start_process', 'data': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
 
 
-    def player_action(self, name: str, *args, target: Target=DEFAULT_TARGET):
+    def player_action(self, name: str, *args, target: Target=DEFAULT_TARGET, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock(name, args, target=target, data={'id': 'block', 'block': 'player_action', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def game_action(self, name: str, *args):
+    def game_action(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'game_action', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def entity_action(self, name: str, *args, target: Target=DEFAULT_TARGET):
+    def entity_action(self, name: str, *args, target: Target=DEFAULT_TARGET, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock(name, args, target=target, data={'id': 'block', 'block': 'entity_action', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def if_player(self, name: str, *args, target: Target=DEFAULT_TARGET, inverted: bool=False):
+    def if_player(self, name: str, *args, target: Target=DEFAULT_TARGET, inverted: bool=False, index: int|None=None):
         args = _convert_data_types(args)
         data = {'id': 'block', 'block': 'if_player', 'action': name}
         _add_inverted(data, inverted)
         cmd = CodeBlock(name, args, target=target, data=data)
-        self.codeblocks.append(cmd)
-        self._openbracket()
+        self._add_codeblock(cmd, index)
+        self._openbracket(index)
     
 
-    def if_variable(self, name: str, *args, inverted: bool=False):
+    def if_variable(self, name: str, *args, inverted: bool=False, index: int|None=None):
         args = _convert_data_types(args)
         data = {'id': 'block', 'block': 'if_var', 'action': name}
         _add_inverted(data, inverted)
         cmd = CodeBlock(name, args, data=data)
-        self.codeblocks.append(cmd)
-        self._openbracket()
+        self._add_codeblock(cmd, index)
+        self._openbracket(index)
     
 
-    def if_game(self, name: str, *args, inverted: bool=False):
+    def if_game(self, name: str, *args, inverted: bool=False, index: int|None=None):
         args = _convert_data_types(args)
         data = {'id': 'block', 'block': 'if_game', 'action': name}
         _add_inverted(data, inverted)
         cmd = CodeBlock(name, args, data=data)
-        self.codeblocks.append(cmd)
-        self._openbracket()
+        self._add_codeblock(cmd, index)
+        self._openbracket(index)
     
 
-    def if_entity(self, name: str, *args, target: Target=DEFAULT_TARGET, inverted: bool=False):
+    def if_entity(self, name: str, *args, target: Target=DEFAULT_TARGET, inverted: bool=False, index: int|None=None):
         args = _convert_data_types(args)
         data = {'id': 'block', 'block': 'if_entity', 'action': name}
         _add_inverted(data, inverted)
         cmd = CodeBlock(name, args, target=target, data=data)
-        self.codeblocks.append(cmd)
-        self._openbracket()
+        self._add_codeblock(cmd, index)
+        self._openbracket(index)
 
 
-    def else_(self):
+    def else_(self, index: int|None=None):
         cmd = CodeBlock('else', data={'id': 'block', 'block': 'else'})
-        self.codeblocks.append(cmd)
-        self._openbracket()
+        self._add_codeblock(cmd, index)
+        self._openbracket(index)
     
 
-    def repeat(self, name: str, *args, sub_action: str=None):
+    def repeat(self, name: str, *args, sub_action: str=None, index: int|None=None):
         args = _convert_data_types(args)
         data = {'id': 'block', 'block': 'repeat', 'action': name}
         if sub_action is not None:
             data['subAction'] = sub_action
         cmd = CodeBlock(name, args, data=data)
-        self.codeblocks.append(cmd)
-        self._openbracket('repeat')
+        self._add_codeblock(cmd, index)
+        self._openbracket(index, 'repeat')
 
 
-    def bracket(self, *args):
+    def bracket(self, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock('bracket', data={'id': 'bracket', 'direct': 'close', 'type': self.bracket_stack.pop()})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def control(self, name: str, *args):
+    def control(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'control', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def select_object(self, name: str, *args):
+    def select_object(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'select_obj', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
 
-    def set_variable(self, name: str, *args):
+    def set_variable(self, name: str, *args, index: int|None=None):
         args = _convert_data_types(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'set_var', 'action': name})
-        self.codeblocks.append(cmd)
+        self._add_codeblock(cmd, index)
     
     
     def generate_script(self, output_path: str, indent_size: int=4, literal_shorthand: bool=True, var_shorthand: bool=False):

dfpyre/scriptgen.py

@@ -45,12 +45,14 @@ def argument_item_to_string(flags: GeneratorFlags, arg_item: object) -> str:
         return f'{class_name}.from_nbt("""{arg_item.get_nbt()}""")'
     
     if isinstance(arg_item, string):
-        return f'{class_name}("{arg_item.value}")'
+        value = arg_item.value.replace('\n', '\\n')
+        return f'{class_name}("{value}")'
     
     if isinstance(arg_item, text):
+        value = arg_item.value.replace('\n', '\\n')
         if flags.literal_shorthand:
-            return f'"{arg_item.value}"'
-        return f'{class_name}("{arg_item.value}")'
+            return f'"{value}"'
+        return f'{class_name}("{value}")'
     
     if isinstance(arg_item, num):
         if not re.match(NUMBER_REGEX, str(arg_item.value)):
@@ -136,7 +138,7 @@ def generate_script(template, flags: GeneratorFlags) -> str:
         codeblock_args = [argument_item_to_string(flags, i) for i in codeblock.args]
         if codeblock_args:
             method_args.extend(codeblock_args)
-        if method_name in TARGET_CODEBLOCKS:
+        if method_name in TARGET_CODEBLOCKS and codeblock.target.name != 'SELECTION':
             method_args.append(f'target=Target.{codeblock.target.name}')
         
         line = f't.{method_name}({", ".join(method_args)})'

{dfpyre-0.6.0.dist-info → dfpyre-0.6.2.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.6.0
-Summary: A package for external creation of code templates for the DiamondFire Minecraft server.
+Version: 0.6.2
+Summary: A package for creating and modifying code templates for the DiamondFire Minecraft server.
 Home-page: https://github.com/Amp63/pyre
 License: MIT
 Keywords: diamondfire,minecraft,template,item
@@ -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.2.4,<0.3.0)
+Requires-Dist: mcitemlib (>=0.2.5,<0.3.0)
 Project-URL: Repository, https://github.com/Amp63/pyre
 Description-Content-Type: text/markdown
 

dfpyre-0.6.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+dfpyre/__init__.py,sha256=apPsSxJ1Tztfl71MoORoSmDfX7LyKLYlLwOGeLQUitw,25
+dfpyre/data/data.json,sha256=M4EHXKkh7Cx7y3BQ6c3csvmNmSqP2oE4txLI9MZcDDA,30347
+dfpyre/items.py,sha256=ZL8bqRIzIGRCVOcF-KEY41SDnuLeVgkLQ1NAuhgobng,9225
+dfpyre/pyre.py,sha256=non7jsEZQGE77bi5pRxdozyvupapkdzJB4g3FLsbS74,17614
+dfpyre/scriptgen.py,sha256=TG_qYp2GChkwCD0f9WVCJOORDDL4RueuJeRkddB4YJw,5568
+dfpyre/style.py,sha256=mLW1CFvvi8_9fk8JaH10I5S4WI0YBdQIXHtI3G_4sR8,980
+dfpyre-0.6.2.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
+dfpyre-0.6.2.dist-info/METADATA,sha256=MiZUI08sBfME-FIUMIZehvParMxtG2LetdR31aBxHgM,11346
+dfpyre-0.6.2.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+dfpyre-0.6.2.dist-info/RECORD,,

dfpyre-0.6.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-dfpyre/__init__.py,sha256=apPsSxJ1Tztfl71MoORoSmDfX7LyKLYlLwOGeLQUitw,25
-dfpyre/data/data.json,sha256=M4EHXKkh7Cx7y3BQ6c3csvmNmSqP2oE4txLI9MZcDDA,30347
-dfpyre/items.py,sha256=t9KsvhPOEe36_E7CNdgxNmEKtOF6nMvNZURyYFiXJb4,9215
-dfpyre/pyre.py,sha256=wn75bzj4dteAMtOELuV7Q0Xe46FBcFbdzHlcc7yRnU4,16970
-dfpyre/scriptgen.py,sha256=OS9VfFSTjIaxa28FqMxfIQ0bdfIJsI0ZqJo3UhHTYJ4,5450
-dfpyre/style.py,sha256=mLW1CFvvi8_9fk8JaH10I5S4WI0YBdQIXHtI3G_4sR8,980
-dfpyre-0.6.0.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
-dfpyre-0.6.0.dist-info/METADATA,sha256=c0t4TVbXxz_KB-kYtz7MjJP_4kqIU463b156zMJJKD8,11344
-dfpyre-0.6.0.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-dfpyre-0.6.0.dist-info/RECORD,,