dfpyre 0.7.7__tar.gz → 0.7.9__tar.gz

{dfpyre-0.7.7 → dfpyre-0.7.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.7.7
+Version: 0.7.9
 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.3.1,<0.4.0)
+Requires-Dist: mcitemlib (>=0.3.3,<0.4.0)
 Project-URL: Repository, https://github.com/Amp63/pyre
 Description-Content-Type: text/markdown
 

{dfpyre-0.7.7 → dfpyre-0.7.9}/dfpyre/scriptgen.py

@@ -4,6 +4,7 @@ from dfpyre.items import *
 from dfpyre.actiondump import get_default_tags
 
 SCRIPT_START = '''from dfpyre import *
+
 t = DFTemplate()
 '''
 
@@ -39,10 +40,20 @@ class GeneratorFlags:
     var_shorthand: bool
 
 
+def item_to_string(class_name: str, i: item):
+    i.nbt.data.pop('~DF_NBT', None)
+    stripped_id = i.get_id().replace('minecraft:', '')
+    if i.nbt.key_set() == {'~id', '~count'}:
+        if i.get_count() == 1:
+            return f'{class_name}("{stripped_id}")'
+        return f'{class_name}("{stripped_id}", {i.get_count()})'
+    return f'{class_name}.from_nbt("""{i.get_nbt()}""")'
+
+
 def argument_item_to_string(flags: GeneratorFlags, arg_item: object) -> str:
     class_name = arg_item.__class__.__name__
     if isinstance(arg_item, item):
-        return f'{class_name}.from_nbt("""{arg_item.get_nbt()}""")'
+        return item_to_string(class_name, arg_item)
     
     if isinstance(arg_item, string):
         value = arg_item.value.replace('\n', '\\n')

{dfpyre-0.7.7 → dfpyre-0.7.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dfpyre"
-version = "0.7.7"
+version = "0.7.9"
 description = "A package for creating and modifying code templates for the DiamondFire Minecraft server."
 authors = ["Amp"]
 readme = "README.md"
@@ -12,7 +12,7 @@ exclude = ['examples']
 
 [tool.poetry.dependencies]
 python = "^3.10"
-mcitemlib = "^0.3.1"
+mcitemlib = "^0.3.3"
 
 
 [build-system]