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

dfpyre/scriptgen.py

@@ -1,165 +1,165 @@
-import dataclasses
-import re
-from dfpyre.items import *
-from dfpyre.actiondump import get_default_tags
-
-SCRIPT_START = '''from dfpyre import *
-
-t = DFTemplate()
-'''
-
-TEMPLATE_METHOD_LOOKUP = {
-    'event': 'player_event',
-    'entity_event': 'entity_event',
-    'func': 'function',
-    'process': 'process',
-    'call_func': 'call_function',
-    'start_process': 'start_process',
-    'player_action': 'player_action',
-    'game_action': 'game_action',
-    'entity_action': 'entity_action',
-    'if_player': 'if_player',
-    'if_var': 'if_variable',
-    'if_game': 'if_game',
-    'if_entity': 'if_entity',
-    'else': 'else_',
-    'repeat': 'repeat',
-    'control': 'control',
-    'select_obj': 'select_object',
-    'set_var': 'set_variable'
-}
-
-TARGET_CODEBLOCKS = {'player_action', 'entity_action', 'if_player', 'if_entity'}
-VAR_SCOPES = {'unsaved': 'g', 'saved': 's', 'local': 'l', 'line': 'i'}
-
-
-@dataclasses.dataclass
-class GeneratorFlags:
-    indent_size: int
-    literal_shorthand: bool
-    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 item_to_string(class_name, arg_item)
-    
-    if isinstance(arg_item, string):
-        value = arg_item.value.replace('\n', '\\n')
-        return f'{class_name}("{value}")'
-    
-    if isinstance(arg_item, text):
-        value = arg_item.value.replace('\n', '\\n')
-        if flags.literal_shorthand:
-            return f'"{value}"'
-        return f'{class_name}("{value}")'
-    
-    if isinstance(arg_item, num):
-        if not re.match(NUMBER_REGEX, str(arg_item.value)):
-            return f'{class_name}("{arg_item.value}")' 
-        if flags.literal_shorthand:
-            return str(arg_item.value)
-        return f'{class_name}({arg_item.value})'
-    
-    if isinstance(arg_item, loc):
-        loc_components = [arg_item.x, arg_item.y, arg_item.z]
-        if arg_item.pitch != 0:
-            loc_components.append(arg_item.pitch)
-        if arg_item.yaw != 0:
-            loc_components.append(arg_item.yaw)
-        return f'{class_name}({", ".join(str(c) for c in loc_components)})'
-    
-    if isinstance(arg_item, var):
-        if flags.var_shorthand:
-            return f'"${VAR_SCOPES[arg_item.scope]}{arg_item.name}"'
-        if arg_item.scope == 'unsaved':
-            return f'{class_name}("{arg_item.name}")'
-        return f'{class_name}("{arg_item.name}", "{arg_item.scope}")'
-    
-    if isinstance(arg_item, sound):
-        return f'{class_name}("{arg_item.name}", {arg_item.pitch}, {arg_item.vol})'
-    
-    if isinstance(arg_item, particle):
-        return f'{class_name}({arg_item.particle_data})'
-    
-    if isinstance(arg_item, potion):
-        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):
-        param_type_class_name = arg_item.param_type.__class__.__name__
-        param_args = [f'"{arg_item.name}"', f'{param_type_class_name}.{arg_item.param_type.name}']
-        if arg_item.plural:
-            param_args.append('plural=True')
-        if arg_item.optional:
-            param_args.append('optional=True')
-            if arg_item.default_value is not None:
-                param_args.append(f'default_value={argument_item_to_string(flags, arg_item.default_value)}')
-        if arg_item.description:
-            param_args.append(f'description="{arg_item.description}"')
-        if arg_item.note:
-            param_args.append(f'note="{arg_item.note}"')
-        return f'{class_name}({", ".join(param_args)})'
-    
-    if isinstance(arg_item, vector):
-        return f'{class_name}({arg_item.x}, {arg_item.y}, {arg_item.z})'
-
-
-def add_script_line(flags: GeneratorFlags, script_lines: list[str], indent_level: int, line: str, add_comma: bool=True):
-    added_line = ' '*flags.indent_size*indent_level + line
-    if add_comma and indent_level > 0:
-        added_line += ','
-    script_lines.append(added_line)
-
-
-# TODO: add tag values if not default
-def generate_script(template, flags: GeneratorFlags) -> str:
-    indent_level = 0
-    script_lines = []
-    for codeblock in template.codeblocks:
-        if codeblock.name == 'bracket':
-            if codeblock.data['direct'] == 'open':
-                add_script_line(flags, script_lines, indent_level, 't.bracket(', False)
-                indent_level += 1
-            elif codeblock.data['direct'] == 'close':
-                indent_level -= 1
-                add_script_line(flags, script_lines, indent_level, ')')
-            continue
-        if codeblock.name == 'else':
-            add_script_line(flags, script_lines, indent_level, 't.else_()')
-            continue
-
-        method_name = TEMPLATE_METHOD_LOOKUP[codeblock.data['block']]
-        method_args = [f'"{codeblock.name}"']
-        if codeblock.name == 'dynamic':
-            method_args[0] = f'"{codeblock.data["data"]}"'
-        
-        codeblock_args = [argument_item_to_string(flags, i) for i in codeblock.args]
-        if codeblock_args:
-            method_args.extend(codeblock_args)
-        if method_name in TARGET_CODEBLOCKS and codeblock.target.name != 'SELECTION':
-            method_args.append(f'target=Target.{codeblock.target.name}')
-        if codeblock.tags:
-            default_tags = get_default_tags(codeblock.data.get('block'), codeblock.name)
-            written_tags = {t: o for t, o in codeblock.tags.items() if default_tags[t] != o}
-            if written_tags:
-                method_args.append(f'tags={str(written_tags)}')
-        
-        line = f't.{method_name}({", ".join(method_args)})'
-        add_script_line(flags, script_lines, indent_level, line)
-    return SCRIPT_START + '\n'.join(script_lines)
+import dataclasses
+import re
+from dfpyre.items import *
+from dfpyre.actiondump import get_default_tags
+
+SCRIPT_START = '''from dfpyre import *
+
+t = DFTemplate()
+'''
+
+TEMPLATE_METHOD_LOOKUP = {
+    'event': 'player_event',
+    'entity_event': 'entity_event',
+    'func': 'function',
+    'process': 'process',
+    'call_func': 'call_function',
+    'start_process': 'start_process',
+    'player_action': 'player_action',
+    'game_action': 'game_action',
+    'entity_action': 'entity_action',
+    'if_player': 'if_player',
+    'if_var': 'if_variable',
+    'if_game': 'if_game',
+    'if_entity': 'if_entity',
+    'else': 'else_',
+    'repeat': 'repeat',
+    'control': 'control',
+    'select_obj': 'select_object',
+    'set_var': 'set_variable'
+}
+
+TARGET_CODEBLOCKS = {'player_action', 'entity_action', 'if_player', 'if_entity'}
+VAR_SCOPES = {'unsaved': 'g', 'saved': 's', 'local': 'l', 'line': 'i'}
+
+
+@dataclasses.dataclass
+class GeneratorFlags:
+    indent_size: int
+    literal_shorthand: bool
+    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 item_to_string(class_name, arg_item)
+    
+    if isinstance(arg_item, string):
+        value = arg_item.value.replace('\n', '\\n')
+        return f'{class_name}("{value}")'
+    
+    if isinstance(arg_item, text):
+        value = arg_item.value.replace('\n', '\\n')
+        if flags.literal_shorthand:
+            return f'"{value}"'
+        return f'{class_name}("{value}")'
+    
+    if isinstance(arg_item, num):
+        if not re.match(NUMBER_REGEX, str(arg_item.value)):
+            return f'{class_name}("{arg_item.value}")' 
+        if flags.literal_shorthand:
+            return str(arg_item.value)
+        return f'{class_name}({arg_item.value})'
+    
+    if isinstance(arg_item, loc):
+        loc_components = [arg_item.x, arg_item.y, arg_item.z]
+        if arg_item.pitch != 0:
+            loc_components.append(arg_item.pitch)
+        if arg_item.yaw != 0:
+            loc_components.append(arg_item.yaw)
+        return f'{class_name}({", ".join(str(c) for c in loc_components)})'
+    
+    if isinstance(arg_item, var):
+        if flags.var_shorthand:
+            return f'"${VAR_SCOPES[arg_item.scope]}{arg_item.name}"'
+        if arg_item.scope == 'unsaved':
+            return f'{class_name}("{arg_item.name}")'
+        return f'{class_name}("{arg_item.name}", "{arg_item.scope}")'
+    
+    if isinstance(arg_item, sound):
+        return f'{class_name}("{arg_item.name}", {arg_item.pitch}, {arg_item.vol})'
+    
+    if isinstance(arg_item, particle):
+        return f'{class_name}({arg_item.particle_data})'
+    
+    if isinstance(arg_item, potion):
+        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):
+        param_type_class_name = arg_item.param_type.__class__.__name__
+        param_args = [f'"{arg_item.name}"', f'{param_type_class_name}.{arg_item.param_type.name}']
+        if arg_item.plural:
+            param_args.append('plural=True')
+        if arg_item.optional:
+            param_args.append('optional=True')
+            if arg_item.default_value is not None:
+                param_args.append(f'default_value={argument_item_to_string(flags, arg_item.default_value)}')
+        if arg_item.description:
+            param_args.append(f'description="{arg_item.description}"')
+        if arg_item.note:
+            param_args.append(f'note="{arg_item.note}"')
+        return f'{class_name}({", ".join(param_args)})'
+    
+    if isinstance(arg_item, vector):
+        return f'{class_name}({arg_item.x}, {arg_item.y}, {arg_item.z})'
+
+
+def add_script_line(flags: GeneratorFlags, script_lines: list[str], indent_level: int, line: str, add_comma: bool=True):
+    added_line = ' '*flags.indent_size*indent_level + line
+    if add_comma and indent_level > 0:
+        added_line += ','
+    script_lines.append(added_line)
+
+
+# TODO: add tag values if not default
+def generate_script(template, flags: GeneratorFlags) -> str:
+    indent_level = 0
+    script_lines = []
+    for codeblock in template.codeblocks:
+        if codeblock.name == 'bracket':
+            if codeblock.data['direct'] == 'open':
+                add_script_line(flags, script_lines, indent_level, 't.bracket(', False)
+                indent_level += 1
+            elif codeblock.data['direct'] == 'close':
+                indent_level -= 1
+                add_script_line(flags, script_lines, indent_level, ')')
+            continue
+        if codeblock.name == 'else':
+            add_script_line(flags, script_lines, indent_level, 't.else_()')
+            continue
+
+        method_name = TEMPLATE_METHOD_LOOKUP[codeblock.data['block']]
+        method_args = [f'"{codeblock.name}"']
+        if codeblock.name == 'dynamic':
+            method_args[0] = f'"{codeblock.data["data"]}"'
+        
+        codeblock_args = [argument_item_to_string(flags, i) for i in codeblock.args]
+        if codeblock_args:
+            method_args.extend(codeblock_args)
+        if method_name in TARGET_CODEBLOCKS and codeblock.target.name != 'SELECTION':
+            method_args.append(f'target=Target.{codeblock.target.name}')
+        if codeblock.tags:
+            default_tags = get_default_tags(codeblock.data.get('block'), codeblock.name)
+            written_tags = {t: o for t, o in codeblock.tags.items() if default_tags[t] != o}
+            if written_tags:
+                method_args.append(f'tags={str(written_tags)}')
+        
+        line = f't.{method_name}({", ".join(method_args)})'
+        add_script_line(flags, script_lines, indent_level, line)
+    return SCRIPT_START + '\n'.join(script_lines)

dfpyre/style.py

@@ -1,22 +1,22 @@
-import re
-from mcitemlib.style import STYLE_CODE_REGEX, FORMAT_CODES, StyledString
-
-def is_ampersand_coded(s: str) -> bool:
-    return bool(re.match(STYLE_CODE_REGEX, s))
-
-
-def ampersand_to_minimessage(ampersand_code: str) -> str:
-    ampersand_code = ampersand_code.replace('&r', '<reset>')  # bad but should work most of the time
-    styled_string = StyledString.from_codes(ampersand_code)
-    formatted_string_list = []
-    for substring in styled_string.substrings:
-        formatted_substring_list = []
-        for style_type, value in substring.data.items():
-            if style_type in FORMAT_CODES.values() and value:
-                formatted_substring_list.append(f'<{style_type}>')
-            if style_type == 'color':
-                formatted_substring_list.append(f'<{value}>')
-        
-        formatted_substring_list.append(substring.data['text'])
-        formatted_string_list.append(''.join(formatted_substring_list))
+import re
+from mcitemlib.style import STYLE_CODE_REGEX, FORMAT_CODES, StyledString
+
+def is_ampersand_coded(s: str) -> bool:
+    return bool(re.match(STYLE_CODE_REGEX, s))
+
+
+def ampersand_to_minimessage(ampersand_code: str) -> str:
+    ampersand_code = ampersand_code.replace('&r', '<reset>')  # bad but should work most of the time
+    styled_string = StyledString.from_codes(ampersand_code)
+    formatted_string_list = []
+    for substring in styled_string.substrings:
+        formatted_substring_list = []
+        for style_type, value in substring.data.items():
+            if style_type in FORMAT_CODES.values() and value:
+                formatted_substring_list.append(f'<{style_type}>')
+            if style_type == 'color':
+                formatted_substring_list.append(f'<{value}>')
+        
+        formatted_substring_list.append(substring.data['text'])
+        formatted_string_list.append(''.join(formatted_substring_list))
     return ''.join(formatted_string_list)

dfpyre/util.py

@@ -1,28 +1,28 @@
-import base64
-import gzip
-
-
-COL_WARN = '\x1b[33m'
-COL_RESET = '\x1b[0m'
-COL_SUCCESS = '\x1b[32m'
-COL_ERROR = '\x1b[31m'
-
-
-class PyreException(Exception):
-    pass
-
-
-def warn(message: str):
-    print(f'{COL_WARN}! WARNING ! {message}{COL_RESET}')
-
-
-def df_encode(json_string: str) -> str:
-    """
-    Encodes a stringified json.
-    """
-    encoded_string = gzip.compress(json_string.encode('utf-8'))
-    return base64.b64encode(encoded_string).decode('utf-8')
-
-
-def df_decode(encoded_string: str) -> str:
-    return gzip.decompress(base64.b64decode(encoded_string)).decode('utf-8')
+import base64
+import gzip
+
+
+COL_WARN = '\x1b[33m'
+COL_RESET = '\x1b[0m'
+COL_SUCCESS = '\x1b[32m'
+COL_ERROR = '\x1b[31m'
+
+
+class PyreException(Exception):
+    pass
+
+
+def warn(message: str):
+    print(f'{COL_WARN}! WARNING ! {message}{COL_RESET}')
+
+
+def df_encode(json_string: str) -> str:
+    """
+    Encodes a stringified json.
+    """
+    encoded_string = gzip.compress(json_string.encode('utf-8'))
+    return base64.b64encode(encoded_string).decode('utf-8')
+
+
+def df_decode(encoded_string: str) -> str:
+    return gzip.decompress(base64.b64decode(encoded_string)).decode('utf-8')

{dfpyre-0.7.10.dist-info → dfpyre-0.7.11.dist-info}/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2024 Amp
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2024 Amp
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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

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

dfpyre-0.7.11.dist-info/RECORD

@@ -0,0 +1,12 @@
+dfpyre/__init__.py,sha256=apPsSxJ1Tztfl71MoORoSmDfX7LyKLYlLwOGeLQUitw,25
+dfpyre/actiondump.py,sha256=MVI1kVJBNpab882Tgqo-xtemiBN2W1_2OcopBcRupWQ,2587
+dfpyre/data/actiondump_min.json,sha256=hFcIbG_G55FWwqRSW6X77ZrKkQiXLs4CGgJrZgyR2Gg,1938799
+dfpyre/items.py,sha256=StQnkvGAZj3mb7qG3bMyuuiRaSIttyW1Azs139e5c_4,11374
+dfpyre/pyre.py,sha256=0RTXNc335goXwiUddq5Yw8siYDAjVuH0rtT8y4SKI0A,18316
+dfpyre/scriptgen.py,sha256=ArEBAYVVWEhABzcur6rtnZ9uvgg6kyZqqe5G4uyLamw,6344
+dfpyre/style.py,sha256=mLW1CFvvi8_9fk8JaH10I5S4WI0YBdQIXHtI3G_4sR8,980
+dfpyre/util.py,sha256=gHIPPVD0dcLPAaN1M5EnNgxenarwlxfRKN4xno1YJHM,582
+dfpyre-0.7.11.dist-info/LICENSE,sha256=_vuDskB0ja2c-Fgm7Gt8Q8cO9NsLNpZAVyvmZwX7E6o,1060
+dfpyre-0.7.11.dist-info/METADATA,sha256=3u06h2Hu9-_E-oApApvT6xB2yXJcsSpcyPV3C-Y7fjg,11755
+dfpyre-0.7.11.dist-info/WHEEL,sha256=FMvqSimYX_P7y0a7UY-_Mc83r5zkBZsCYPm7Lr0Bsq4,88
+dfpyre-0.7.11.dist-info/RECORD,,

dfpyre-0.7.10.dist-info/RECORD

@@ -1,12 +0,0 @@
-dfpyre/__init__.py,sha256=apPsSxJ1Tztfl71MoORoSmDfX7LyKLYlLwOGeLQUitw,25
-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=bUjT9iIzd5fhXOG2hQ7hWY8C-hwTRJlI0i6Fjthulic,6509
-dfpyre/style.py,sha256=YRSKEg5r8rkZH62WkRQYbTPgTWVVGVXLnx4edShs0NM,1001
-dfpyre/util.py,sha256=KThtsPQh4Ep3UXPvJGw5jrzEcM4cDqDG5IG1FXUQROI,610
-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,,