dfpyre 0.6.2__tar.gz → 0.6.3__tar.gz

{dfpyre-0.6.2 → dfpyre-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.6.2
+Version: 0.6.3
 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.6.2 → dfpyre-0.6.3}/dfpyre/items.py

@@ -32,6 +32,9 @@ class item(NbtItem):
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.get_id()}, {self.get_count()})'
+
 
 class string:
     """
@@ -46,6 +49,9 @@ class string:
         formatted_dict = {"item": {"id": self.type, "data": {"name": self.value}}}
         _add_slot(formatted_dict, slot)
         return formatted_dict
+    
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}("{self.value}")'
 
 
 class text:
@@ -64,6 +70,9 @@ class text:
       _add_slot(formatted_dict, slot)
       return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}("{self.value}")'
+
 
 class num:
     """
@@ -79,6 +88,9 @@ class num:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.value})'
+
 
 class loc:
     """
@@ -110,6 +122,9 @@ class loc:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.x}, {self.y}, {self.z}, {self.pitch}, {self.yaw})'
+
 
 class var:
     """
@@ -126,6 +141,9 @@ class var:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.scope}, "{self.name}")'
+
 
 class sound:
     """
@@ -143,6 +161,9 @@ class sound:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}(pitch: {self.pitch}, volume: {self.vol})'
+
 
 class particle:
     """
@@ -157,6 +178,9 @@ class particle:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.particle_data})'
+
 
 class potion:
     """
@@ -174,6 +198,9 @@ class potion:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}(effect: {self.name}, duration: {self.dur}, amplifier: {self.amp})'
+
 
 class gamevalue:
     """
@@ -190,6 +217,9 @@ class gamevalue:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.name}, target: {self.target})'
+
 
 class vector:
     """
@@ -207,6 +237,9 @@ class vector:
         _add_slot(formatted_dict, slot)
         return formatted_dict
 
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.x}, {self.y}, {self.z})'
+
 
 PARAMETER_TYPE_LOOKUP = ['txt', 'comp', 'num', 'loc', 'vec', 'snd', 'part', 'pot', 'item', 'any', 'var', 'list', 'dict']
 
@@ -263,6 +296,10 @@ class parameter:
             formatted_dict['item']['data']['default_value'] = self.default_value.format(None)['item']
         
         return formatted_dict
+    
+    def __repr__(self) -> str:
+        raw_type = str(self.param_type).partition('.')[2]
+        return f'{self.__class__.__name__}({self.name}, type: {raw_type})'
 
 
 def _some_or(value: Any, none_value: Any):

{dfpyre-0.6.2 → dfpyre-0.6.3}/dfpyre/pyre.py

@@ -188,7 +188,8 @@ def _build_block(codeblock: CodeBlock, include_tags: bool):
                 final_args = final_args[:(27-len(tags))]  # trim list if over 27 elements
             final_args.extend(tags)  # add tags to end
     
-    built_block['args'] = {'items': final_args}
+    if final_args:
+        built_block['args'] = {'items': final_args}
     return built_block
 
 
@@ -262,7 +263,11 @@ class DFTemplate:
                 codeblock_name = block_dict['block']
             elif 'action' in block_dict:
                 codeblock_name = block_dict['action']
-            codeblock = CodeBlock(codeblock_name, args, target, block_dict)
+            
+            if codeblock_name == 'bracket' or block_dict['block'] == 'else':
+                codeblock = CodeBlock(codeblock_name, data=block_dict)
+            else:
+                codeblock = CodeBlock(codeblock_name, args, target, block_dict)
             template.codeblocks.append(codeblock)
         
         return template

{dfpyre-0.6.2 → dfpyre-0.6.3}/pyproject.toml

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