dfpyre 0.7.8__py3-none-any.whl → 0.7.10__py3-none-any.whl

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')
@@ -86,6 +97,8 @@ def argument_item_to_string(flags: GeneratorFlags, arg_item: object) -> str:
         return f'{class_name}("{arg_item.name}", {arg_item.dur}, {arg_item.amp})'
     
     if isinstance(arg_item, gamevalue):
+        if arg_item.target == 'Default':
+            return f'{class_name}("{arg_item.name}")'
         return f'{class_name}("{arg_item.name}", "{arg_item.target}")'
     
     if isinstance(arg_item, parameter):

{dfpyre-0.7.8.dist-info → dfpyre-0.7.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.7.8
+Version: 0.7.10
 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.2,<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.8.dist-info → dfpyre-0.7.10.dist-info}/RECORD

@@ -3,10 +3,10 @@ dfpyre/actiondump.py,sha256=YR5h0ZjgyqNkHUCkLLKS0ovMFZQ8WSKuJQzGncT27cA,2664
 dfpyre/data/actiondump_min.json,sha256=hFcIbG_G55FWwqRSW6X77ZrKkQiXLs4CGgJrZgyR2Gg,1938799
 dfpyre/items.py,sha256=WIiuslk6qyPUWSndDFEUqz_TNGUgIb0YgXrwh2Lokfs,11746
 dfpyre/pyre.py,sha256=swF4up0nHY0NJHLR08YrMZfot62GYaqavEVwGZdXUIw,18773
-dfpyre/scriptgen.py,sha256=HHWiJwuZFF3w7f-i7QVDZ_7UE6KNjHIIdAQ_2THPLI8,6027
+dfpyre/scriptgen.py,sha256=bUjT9iIzd5fhXOG2hQ7hWY8C-hwTRJlI0i6Fjthulic,6509
 dfpyre/style.py,sha256=YRSKEg5r8rkZH62WkRQYbTPgTWVVGVXLnx4edShs0NM,1001
 dfpyre/util.py,sha256=KThtsPQh4Ep3UXPvJGw5jrzEcM4cDqDG5IG1FXUQROI,610
-dfpyre-0.7.8.dist-info/LICENSE,sha256=nqCBVqcbIX-9lhVDarggfrjgNZoPlKKlyl0-hOPS2wQ,1081
-dfpyre-0.7.8.dist-info/METADATA,sha256=Hmws7qplMD4LOfvr1FARipRsq_HALxpC8K_et5ldpGY,11754
-dfpyre-0.7.8.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
-dfpyre-0.7.8.dist-info/RECORD,,
+dfpyre-0.7.10.dist-info/LICENSE,sha256=nqCBVqcbIX-9lhVDarggfrjgNZoPlKKlyl0-hOPS2wQ,1081
+dfpyre-0.7.10.dist-info/METADATA,sha256=8Nx4Q8QFHk4fKoMb1FDin0mUcjcgtNTzv0Idd0QnqJo,11755
+dfpyre-0.7.10.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+dfpyre-0.7.10.dist-info/RECORD,,