dfpyre 0.8.6__py3-none-any.whl → 0.8.7__py3-none-any.whl

dfpyre/items.py

@@ -42,12 +42,13 @@ class String:
     """
     type = 'txt'
 
-    def __init__(self, value: str):
+    def __init__(self, value: str, slot: int|None=None):
         self.value = value
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type, "data": {"name": self.value}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
     
     def __repr__(self) -> str:
@@ -62,14 +63,15 @@ class Text:
     """
     type = 'comp'
 
-    def __init__(self, value: str):
+    def __init__(self, value: str, slot: int|None=None):
         if is_ampersand_coded(value):
             value = ampersand_to_minimessage(value)
         self.value = value
+        self.slot = slot
     
     def format(self, slot: int|None):
       formatted_dict = {"item": {"id": self.type, "data": {"name": self.value}}}
-      _add_slot(formatted_dict, slot)
+      _add_slot(formatted_dict, self.slot or slot)
       return formatted_dict
 
     def __repr__(self) -> str:
@@ -82,12 +84,13 @@ class Number:
     """
     type = 'num'
 
-    def __init__(self, num: int|float|str):
+    def __init__(self, num: int|float|str, slot: int|None=None):
         self.value = num
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type, "data": {"name": str(self.value)}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -102,9 +105,13 @@ class Item(NbtItem):
     """
     type = 'item'
 
+    def __init__(self, item_id: str, count: int=1, slot: int | None=None):
+        super().__init__(item_id, count)
+        self.slot = slot
+
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type, "data": {"item": self.get_snbt()}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -191,7 +198,7 @@ class Item(NbtItem):
                 print(f'{COL_ERROR}Could not connect to CodeClient API. Possible problems:')
                 print(f'    - Minecraft is not open')
                 print(f'    - CodeClient is not installed (get it here: https://modrinth.com/mod/codeclient)')
-                print(f'    - CodeClient API is not enabled (enable it in CodeClient general settings)')
+                print(f'    - CodeClient API is not enabled (enable it in CodeClient general settings){COL_RESET}')
                 return 1
             
             print(f'Connection failed: {e}')
@@ -204,12 +211,13 @@ class Location:
     """
     type = 'loc'
 
-    def __init__(self, x: float=0, y: float=0, z: float=0, pitch: float=0, yaw: float=0):
+    def __init__(self, x: float=0, y: float=0, z: float=0, pitch: float=0, yaw: float=0, slot: int | None=None):
         self.x = float(x)
         self.y = float(y)
         self.z = float(z)
         self.pitch = float(pitch)
         self.yaw = float(yaw)
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict =  {"item": {
@@ -225,7 +233,7 @@ class Location:
                 }
             }
         }}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -240,16 +248,18 @@ class Variable:
     """
     type = 'var'
 
-    def __init__(self, name: str, scope: Literal['unsaved', 'game', 'saved', 'local', 'line']='unsaved'):
+    def __init__(self, name: str, scope: Literal['unsaved', 'game', 'saved', 'local', 'line']='unsaved', slot: int | None=None):
         self.name = name
 
         if scope == 'game':
             scope = 'unsaved'
         self.scope = scope
+        
+        self.slot = slot
 
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type,"data": {"name": self.name, "scope": self.scope}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -264,14 +274,15 @@ class Sound:
     """
     type = 'snd'
 
-    def __init__(self, name: str, pitch: float=1.0, vol: float=2.0):
+    def __init__(self, name: str, pitch: float=1.0, vol: float=2.0, slot: int | None=None):
         self.name = name
         self.pitch = pitch
         self.vol = vol
+        self.slot = slot
 
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type,"data": {"sound": self.name, "pitch": self.pitch, "vol": self.vol}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -285,12 +296,13 @@ class Particle:
     Represents a DiamondFire particle object.
     """
     type = 'part'
-    def __init__(self, particle_data: dict):
+    def __init__(self, particle_data: dict, slot: int | None=None):
         self.particle_data = particle_data
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type, "data": self.particle_data}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -303,14 +315,15 @@ class Potion:
     """
     type = 'pot'
 
-    def __init__(self, name: str, dur: int=1000000, amp: int=0):
+    def __init__(self, name: str, dur: int=1000000, amp: int=0, slot: int | None=None):
         self.name = name
         self.dur = dur
         self.amp = amp
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type,"data": {"pot": self.name, "dur": self.dur, "amp": self.amp}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -325,13 +338,14 @@ class GameValue:
     """
     type = 'g_val'
 
-    def __init__(self, name: str, target: str='Default'):
+    def __init__(self, name: str, target: str='Default', slot: int | None=None):
         self.name = name
         self.target = target
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type, "data": {"type": self.name, "target": self.target}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -344,14 +358,15 @@ class Vector:
     """
     type = 'vec'
 
-    def __init__(self, x: float=0.0, y: float=0.0, z: float=0.0):
+    def __init__(self, x: float=0.0, y: float=0.0, z: float=0.0, slot: int | None=None):
         self.x = float(x)
         self.y = float(y)
         self.z = float(z)
+        self.slot = slot
     
     def format(self, slot: int|None):
         formatted_dict = {"item": {"id": self.type, "data": {"x": self.x, "y": self.y, "z": self.z}}}
-        _add_slot(formatted_dict, slot)
+        _add_slot(formatted_dict, self.slot or slot)
         return formatted_dict
 
     def __repr__(self) -> str:
@@ -360,6 +375,7 @@ class Vector:
 Vec = Vector  # Vector alias
 
 
+
 PARAMETER_TYPE_LOOKUP = ['txt', 'comp', 'num', 'loc', 'vec', 'snd', 'part', 'pot', 'item', 'any', 'var', 'list', 'dict']
 
 class ParameterType(Enum):
@@ -386,7 +402,8 @@ class Parameter:
     """
     type = 'pn_el'
 
-    def __init__(self, name: str, param_type: ParameterType, plural: bool=False, optional: bool=False, description: str="", note: str="", default_value=None):
+    def __init__(self, name: str, param_type: ParameterType, plural: bool=False, optional: bool=False, 
+                 description: str="", note: str="", default_value=None, slot: int | None=None):
         self.name = name
         self.param_type = param_type
         self.plural = plural
@@ -394,7 +411,7 @@ class Parameter:
         self.description = description
         self.note = note
         self.default_value = convert_argument(default_value)
-      
+        self.slot = slot
     
     def format(self, slot: int):
         formatted_dict = {"item": {
@@ -404,9 +421,10 @@ class Parameter:
                 "type": self.param_type.get_string_value(),
                 "plural": self.plural,
                 "optional": self.optional,
-            }},
-            "slot": slot
+            }}
         }
+        _add_slot(formatted_dict, self.slot or slot)
+
         if self.description:
             formatted_dict['item']['data']['description'] = self.description
         if self.note:

{dfpyre-0.8.6.dist-info → dfpyre-0.8.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.8.6
+Version: 0.8.7
 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.8.6.dist-info → dfpyre-0.8.7.dist-info}/RECORD

@@ -2,12 +2,12 @@ dfpyre/__init__.py,sha256=apPsSxJ1Tztfl71MoORoSmDfX7LyKLYlLwOGeLQUitw,25
 dfpyre/action_literals.py,sha256=jvI3ZI1_rnDqS58q5Z0_bb5jgKJ2pu_pgN-1whXpEDQ,16212
 dfpyre/actiondump.py,sha256=MVI1kVJBNpab882Tgqo-xtemiBN2W1_2OcopBcRupWQ,2587
 dfpyre/data/actiondump_min.json,sha256=hFcIbG_G55FWwqRSW6X77ZrKkQiXLs4CGgJrZgyR2Gg,1938799
-dfpyre/items.py,sha256=9HR5vKR1zHOfhd2RW-j1a7klDTXvGlML3qNmF4C1XXk,15024
+dfpyre/items.py,sha256=u8pZ8zcgh-CgzTQKHvG04iEGY3cUEtdMYm63rOid1_E,15891
 dfpyre/pyre.py,sha256=mVyoW3VQqX-Qg9DzEAfmLSalaVXy96Aw5WUB4kcNc5s,24612
 dfpyre/scriptgen.py,sha256=YwgKDQAYBNVtkU7q__DmC9Bv30Wck9MlSvpdzOAncNw,7585
 dfpyre/style.py,sha256=mLW1CFvvi8_9fk8JaH10I5S4WI0YBdQIXHtI3G_4sR8,980
 dfpyre/util.py,sha256=EpX4XGwwX0A9MlObuQTEuHj4Q-55wj29m8am8ULPmz8,791
-dfpyre-0.8.6.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
-dfpyre-0.8.6.dist-info/METADATA,sha256=ZG8A6oSldYFpW1a_lTbfvgIV2w_4nLj-fyb8ab6a0zI,11948
-dfpyre-0.8.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dfpyre-0.8.6.dist-info/RECORD,,
+dfpyre-0.8.7.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
+dfpyre-0.8.7.dist-info/METADATA,sha256=C1A1W6MPB7fT2vJYccq4gdPshYurhBCqfiUJOuiFWKo,11948
+dfpyre-0.8.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dfpyre-0.8.7.dist-info/RECORD,,