dfpyre 0.3.1__tar.gz → 0.3.3__tar.gz

{dfpyre-0.3.1 → dfpyre-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.3.1
+Version: 0.3.3
 Summary: A package for externally creating code templates for the DiamondFire Minecraft server.
 Home-page: https://github.com/Amp63/pyre
 Author: Amp

{dfpyre-0.3.1 → dfpyre-0.3.3}/dfpyre/pyre.py

@@ -20,7 +20,7 @@ COL_RESET = '\x1b[0m'
 COL_SUCCESS = '\x1b[32m'
 COL_ERROR = '\x1b[31m'
 
-CODEBLOCK_DATA_PATH = 'dfpyre/data/data.json'
+CODEBLOCK_DATA_PATH = os.path.join(os.path.dirname(__file__), 'data/data.json')
 
 VARIABLE_TYPES = {'txt', 'num', 'item', 'loc', 'var', 'snd', 'part', 'pot', 'g_val', 'vec'}
 TEMPLATE_STARTERS = {'event', 'entity_event', 'func', 'process'}
@@ -46,16 +46,39 @@ def _loadCodeblockData():
 
 TAGDATA, TAGDATA_KEYS, TAGDATA_EXTRAS_KEYS = _loadCodeblockData()
 
-def sendToDf(templateCode: str, name: str='Unnamed Template'):
+def sendToDf(templateCode: str, name: str='Unnamed Template', author: str='pyre'):
     """
     Sends a template to DiamondFire via recode item api.
 
-    :param str templateCode: The code for the template in base64 format.
+    :param str templateCode: The code for the template as a base64 string.
     :param str name: The name of the template.
+    :param str author: The author of this template.
     """
+    templateData = f"""{{\
+Count:1b,\
+id:"minecraft:yellow_shulker_box",\
+tag:{{\
+display:{{\
+Name:'{{"extra":[{{"italic":false,"color":"#FF5C00","text":">> "}},{{"italic":false,"color":"#FFC700","text":"{name}"}}],"text":""}}',\
+Lore:[
+'{{"extra":[{{"italic":false,"color":"gray","text":"This template was generated by "}},{{"italic":false,"color":"gold","text":"pyre"}},{{"italic":false,"color":"gray","text":"."}}],"text":""}}',\
+'{{"extra":[{{"italic":false,"color":"gray","text":"https://github.com/Amp63/pyre"}},{{"italic":false,"underlined":false,"strikethrough":false,"obfuscated":false,"color":"gray","text":""}}],"text":""}}'\
+]\
+}},\
+PublicBukkitValues:{{\
+"hypercube:codetemplatedata":'{{\
+"author":"{author}",\
+"name":"{name}",\
+"version":1,\
+"code":"{templateCode}"\
+}}'\
+}}\
+}}\
+}}\
+"""
     itemName = 'pyre Template - ' + name
-    templateData = f"{{\"name\":\"{itemName}\",\"data\":\"{templateCode}\"}}"
-    data = {"type": "template", "source": f"pyre - {name}","data": templateData}
+    data = {'type': 'nbt', 'source': itemName, 'data': templateData}
+
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
         s.connect(('127.0.0.1', 31372))
@@ -64,7 +87,7 @@ def sendToDf(templateCode: str, name: str='Unnamed Template'):
         s.close()
         return
     
-    s.send((str(data) + '\n').encode())
+    s.send((str(data) + '\n').encode('utf_8'))
     received = json.loads(s.recv(1024).decode())
     status = received['status']
     if status == 'success':
@@ -72,18 +95,28 @@ def sendToDf(templateCode: str, name: str='Unnamed Template'):
     else:
         error = received['error']
         print(f'{COL_ERROR}Error sending template: {error}{COL_RESET}')
+    
     s.close()
     time.sleep(0.5)
 
 
+class CodeBlock:
+    def __init__(self, name: str, *args, target: str='Default', data={}):
+        self.name = name
+        self.args = args
+        self.target = target
+        self.data = data
+
+
 class DFTemplate:
     """
     Represents a DiamondFire code template.
     """
-    def __init__(self):
-        self.commands = []
+    def __init__(self, name=None):
+        self.codeBlocks = []
         self.closebracket = None
         self.definedVars = {}
+        self.name = name
 
 
     def build(self) -> Tuple[str, str]:
@@ -93,7 +126,7 @@ class DFTemplate:
         :return: Tuple containing compressed template code and template name.
         """
         mainDict = {'blocks': []}
-        for cmd in self.commands:
+        for cmd in self.codeBlocks:
             block = {'args': {'items': []}}
             
             # add keys from cmd.data
@@ -101,7 +134,7 @@ class DFTemplate:
                 block[key] = cmd.data[key]
 
             # bracket data
-            if cmd.data.get('direct') != None:
+            if cmd.data.get('direct') is not None:
                 block['direct'] = cmd.data['direct']
                 block['type'] = cmd.data['type']
             
@@ -146,8 +179,10 @@ class DFTemplate:
         print(f'{COL_SUCCESS}Template built successfully.{COL_RESET}')
 
         templateName = 'Unnamed'
-        if not mainDict['blocks'][0]['block'] in TEMPLATE_STARTERS:
+        if mainDict['blocks'][0]['block'] not in TEMPLATE_STARTERS:
             _warn('Template does not start with an event, function, or process.')
+        elif self.name is not None:
+            templateName = self.name
         else:
             try:
                 templateName = mainDict['blocks'][0]['block'] + '_' + mainDict['blocks'][0]['action']
@@ -194,29 +229,29 @@ class DFTemplate:
 
     def _openbracket(self, btype: str='norm'):
         bracket = CodeBlock('Bracket', data={'id': 'bracket', 'direct': 'open', 'type': btype})
-        self.commands.append(bracket)
+        self.codeBlocks.append(bracket)
         self.closebracket = btype
     
 
     # command methods
     def playerEvent(self, name: str):
         cmd = CodeBlock(name, data={'id': 'block', 'block': 'event', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def entityEvent(self, name: str):
         cmd = CodeBlock(name, data={'id': 'block', 'block': 'entity_event', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def function(self, name: str):
         cmd = CodeBlock('function', data={'id': 'block', 'block': 'func', 'data': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def process(self, name: str):
         cmd = CodeBlock('process', data={'id': 'block', 'block': 'process', 'data': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def callFunction(self, name: str, parameters={}):
@@ -225,63 +260,63 @@ class DFTemplate:
                 self.setVariable('=', var(key, scope='local'), parameters[key])
         
         cmd = CodeBlock('call_func', data={'id': 'block', 'block': 'call_func', 'data': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def startProcess(self, name: str):
         cmd = CodeBlock('start_process', data={'id': 'block', 'block': 'start_process', 'data': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
 
 
     def playerAction(self, name: str, *args, target: str='Default'):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, target=target, data={'id': 'block', 'block': 'player_action', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def gameAction(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'game_action', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def entityAction(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'entity_action', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def ifPlayer(self, name: str, *args, target: str='Default'):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, target=target, data={'id': 'block', 'block': 'if_player', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
         self._openbracket()
     
 
     def ifVariable(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'if_var', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
         self._openbracket()
     
 
     def ifGame(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'if_game', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
         self._openbracket()
     
 
     def ifEntity(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'if_entity', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
         self._openbracket()
 
 
     def else_(self):
         cmd = CodeBlock('else', data={'id': 'block', 'block': 'else'})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
         self._openbracket()
     
 
@@ -291,35 +326,34 @@ class DFTemplate:
         if subAction is not None:
             data['subAction'] = subAction
         cmd = CodeBlock(name, args, data=data)
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
         self._openbracket('repeat')
 
 
     def bracket(self, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock('Bracket', data={'id': 'bracket', 'direct': 'close', 'type': self.closebracket})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def control(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'control', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def selectObject(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'select_obj', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
     def setVariable(self, name: str, *args):
         args = self._convertDataTypes(args)
         cmd = CodeBlock(name, args, data={'id': 'block', 'block': 'set_var', 'action': name})
-        self.commands.append(cmd)
+        self.codeBlocks.append(cmd)
     
 
-    # extra methods
     def return_(self, returndata={}):
         for key in returndata:
             self.setVariable('=', var(key, scope='local'), returndata[key])
@@ -329,12 +363,4 @@ class DFTemplate:
     def define_(self, name: str, value=0, scope: str='unsaved', createSetVar: bool=True):
         if createSetVar:
             self.setVariable('=', var(name, scope=scope), value)
-        self.definedVars[name] = var(name, scope=scope)
-
-
-class CodeBlock:
-    def __init__(self, name: str, *args, target: str='Default', data={}):
-        self.name = name
-        self.args = args
-        self.target = target
-        self.data = data
+        self.definedVars[name] = var(name, scope=scope)

{dfpyre-0.3.1 → dfpyre-0.3.3}/dfpyre.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dfpyre
-Version: 0.3.1
+Version: 0.3.3
 Summary: A package for externally creating code templates for the DiamondFire Minecraft server.
 Home-page: https://github.com/Amp63/pyre
 Author: Amp

{dfpyre-0.3.1 → dfpyre-0.3.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='dfpyre',
-    version='0.3.1',
+    version='0.3.3',
     description='A package for externally creating code templates for the DiamondFire Minecraft server.',
     author='Amp',
     url='https://github.com/Amp63/pyre',