dfpyre 0.8.2__tar.gz → 0.8.4__tar.gz

{dfpyre-0.8.2 → dfpyre-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.8.2
+Version: 0.8.4
 Summary: A package for creating and modifying code templates for the DiamondFire Minecraft server.
 Home-page: https://github.com/Amp63/pyre
 License: MIT
@@ -39,8 +39,10 @@ This module works best with [CodeClient](https://modrinth.com/mod/codeclient) in
 - All code item types
 - Direct sending to DF via recode or codeclient
 - Automatic type conversion (int to num, str to text)
+- Auto completed action names (if your IDE supports type hints)
 - Warnings for unrecognized actions and tags
-- Full tag support
+- Shorthand format for variables
+- Convert existing templates into equivalent Python code (see [Script Generation](#script-generation))
 
 ## Documentation
 ## Basics
@@ -485,6 +487,21 @@ t.generate_script('my_template.py')    # generated python script will be written
 
 This feature is useful for getting a text representation of existing templates.
 
+
+### Inserting Codeblocks
+
+Use the `insert` method to insert additional codeblocks into an existing template. By default, codeblocks will be added to the end of the template.
+
+```py
+from dfpyre import *
+
+my_template = player_event('Join', [
+  player_action('SendMessage', '%default has joined!', target=Target.ALL_PLAYERS)
+])
+my_template.insert(player_action('SendMessage', 'Welcome!'))  # Add a new codeblock to the end
+```
+
+
 ### Function List
 
 - **Events / Function / Process**
@@ -500,7 +517,7 @@ This feature is useful for getting a text representation of existing templates.
   - game_action
   - entity_action
 
-- **Conditionals / Loops**
+- **Control Flow**
   - if_player
   - if_variable
   - if_game

{dfpyre-0.8.2 → dfpyre-0.8.4}/README.md

@@ -21,8 +21,10 @@ This module works best with [CodeClient](https://modrinth.com/mod/codeclient) in
 - All code item types
 - Direct sending to DF via recode or codeclient
 - Automatic type conversion (int to num, str to text)
+- Auto completed action names (if your IDE supports type hints)
 - Warnings for unrecognized actions and tags
-- Full tag support
+- Shorthand format for variables
+- Convert existing templates into equivalent Python code (see [Script Generation](#script-generation))
 
 ## Documentation
 ## Basics
@@ -467,6 +469,21 @@ t.generate_script('my_template.py')    # generated python script will be written
 
 This feature is useful for getting a text representation of existing templates.
 
+
+### Inserting Codeblocks
+
+Use the `insert` method to insert additional codeblocks into an existing template. By default, codeblocks will be added to the end of the template.
+
+```py
+from dfpyre import *
+
+my_template = player_event('Join', [
+  player_action('SendMessage', '%default has joined!', target=Target.ALL_PLAYERS)
+])
+my_template.insert(player_action('SendMessage', 'Welcome!'))  # Add a new codeblock to the end
+```
+
+
 ### Function List
 
 - **Events / Function / Process**
@@ -482,7 +499,7 @@ This feature is useful for getting a text representation of existing templates.
   - game_action
   - entity_action
 
-- **Conditionals / Loops**
+- **Control Flow**
   - if_player
   - if_variable
   - if_game

{dfpyre-0.8.2 → dfpyre-0.8.4}/dfpyre/items.py

@@ -7,7 +7,7 @@ import re
 from typing import Literal, Any
 from dfpyre.style import is_ampersand_coded, ampersand_to_minimessage
 from dfpyre.util import PyreException, warn
-from mcitemlib.itemlib import Item as NbtItem
+from mcitemlib.itemlib import Item as NbtItem, MCItemlibException
 
 
 NUMBER_REGEX = r'^-?\d*\.?\d+$'
@@ -32,21 +32,6 @@ def _add_slot(d: dict, slot: int|None):
         d['slot'] = slot
 
 
-class Item(NbtItem):
-    """
-    Represents a Minecraft item.
-    """
-    type = 'item'
-
-    def format(self, slot: int|None):
-        formatted_dict = {"item": {"id": self.type, "data": {"item": self.get_nbt()}}}
-        _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:
     """
     Represents a DiamondFire string object. (`txt`)
@@ -107,6 +92,71 @@ class Number:
 Num = Number  # Number alias
 
 
+class Item(NbtItem):
+    """
+    Represents a Minecraft item.
+    """
+    type = 'item'
+
+    def format(self, slot: int|None):
+        formatted_dict = {"item": {"id": self.type, "data": {"item": self.get_nbt()}}}
+        _add_slot(formatted_dict, slot)
+        return formatted_dict
+
+    def __repr__(self) -> str:
+        return f'{self.__class__.__name__}({self.get_id()}, {self.get_count()})'
+    
+    def set_tag(self, tag_name: str, tag_value: str|int|float|String|Number):
+        """
+        Add a DiamondFire custom tag to this item.
+        """
+        if isinstance(tag_value, String):
+            tag_value = tag_value.value
+        elif isinstance(tag_value, Number):
+            tag_value = float(tag_value.value)
+        elif isinstance(tag_value, int):
+            tag_value = float(tag_value)
+        
+        try:
+            item_tags = self.get_custom_data('PublicBukkitValues')
+        except MCItemlibException:
+            item_tags = {}
+        
+        item_tags[f'hypercube:{tag_name}'] = tag_value
+        self.set_custom_data('PublicBukkitValues', item_tags)
+    
+    def get_tag(self, tag_name: str) -> str|float|None:
+        """
+        Get a DiamondFire custom tag from this item.
+        """
+        try:
+            item_tags = self.get_custom_data('PublicBukkitValues')
+        except MCItemlibException:
+            return None
+        
+        try:
+            return item_tags[f'hypercube:{tag_name}']
+        except KeyError:
+            return None
+    
+    def remove_tag(self, tag_name: str) -> bool:
+        """
+        Remove a DiamondFire custom tag from this item.
+
+        :return: `True` on success, `False` on fail
+        """
+        try:
+            item_tags = self.get_custom_data('PublicBukkitValues')
+        except MCItemlibException:
+            return False
+
+        try:
+            del item_tags[f'hypercube:{tag_name}']
+            return True
+        except KeyError:
+            return False
+
+
 class Location:
     """
     Represents a DiamondFire location object.
@@ -335,7 +385,7 @@ class Parameter:
         return f'{self.__class__.__name__}({self.name}, type: {raw_type})'
 
 
-def item_from_dict(item_dict: dict) -> object:
+def item_from_dict(item_dict: dict) -> Any:
     item_id = item_dict['id']
     item_data = item_dict['data']
 

{dfpyre-0.8.2 → dfpyre-0.8.4}/dfpyre/pyre.py

@@ -291,6 +291,8 @@ class DFTemplate:
             else:
                 self.codeblocks[index:index+len(insert_codeblocks)] = insert_codeblocks
         elif isinstance(insert_codeblocks, CodeBlock):
+            if index == -1:
+                index = len(self.codeblocks)
             self.codeblocks.insert(index, insert_codeblocks)
         else:
             raise PyreException('Expected CodeBlock or list[CodeBlock] to insert.')

{dfpyre-0.8.2 → dfpyre-0.8.4}/pyproject.toml

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