moved compiler outside aiocraft, tweaks, WIP multiversion, fixed mergy compiler
also removed requests as dependancy
This commit is contained in:
parent
5b00b69216
commit
495fec6b39
5 changed files with 231 additions and 127 deletions
|
|
@ -1,4 +1,4 @@
|
|||
"""Minecraft definitions"""
|
||||
from .packet import Packet
|
||||
from .mctypes import *
|
||||
from .protocol import *
|
||||
from .proto import *
|
||||
|
|
|
|||
|
|
@ -1,124 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
import os
|
||||
import json
|
||||
import keyword
|
||||
|
||||
from typing import List, Dict
|
||||
|
||||
from mctypes import *
|
||||
|
||||
DIR_MAP = {"toClient": "clientbound", "toServer": "serverbound"}
|
||||
PREFACE = """\"\"\"[!] This file is autogenerated\"\"\"\n\n"""
|
||||
IMPORTS = """from typing import Tuple
|
||||
from ....packet import Packet
|
||||
from ....mctypes import *\n"""
|
||||
IMPORT_ALL = """__all__ = [\n\t{all}\n]\n"""
|
||||
OBJECT = """
|
||||
class {name}(Packet):
|
||||
id : int = 0x{id:X}
|
||||
_slots : Tuple[Tuple[str, Type]] = (
|
||||
{slots}
|
||||
)
|
||||
{fields}
|
||||
"""
|
||||
|
||||
TYPE_MAP = {
|
||||
"varint": VarInt,
|
||||
"u8": UnsignedShort,
|
||||
"u16": UnsignedInt,
|
||||
"u32": UnsignedLong,
|
||||
"i16": Short,
|
||||
"i32": Int,
|
||||
"i64": Long,
|
||||
"f32": Float,
|
||||
"f64": Double,
|
||||
"bool": Boolean,
|
||||
"UUID": UUID,
|
||||
"string": String,
|
||||
"nbt": NBTTag,
|
||||
"slot": Slot,
|
||||
"position": Position,
|
||||
"entityMetadataItem": EntityMetadataItem,
|
||||
"entityMetadata": EntityMetadata,
|
||||
}
|
||||
|
||||
def mctype(name:str) -> Type:
|
||||
if not isinstance(name, str):
|
||||
return String # should return TrailingByteArray but still haven't implemented it (:
|
||||
if name in TYPE_MAP:
|
||||
return TYPE_MAP[name]
|
||||
return String # should return TrailingByteArray but still haven't implemented it (:
|
||||
|
||||
def snake_to_camel(name:str) -> str:
|
||||
return "".join(x.capitalize() for x in name.split("_"))
|
||||
|
||||
def parse_slot(slot: dict) -> str:
|
||||
name = slot["name"] if "name" in slot else "anon"
|
||||
if keyword.iskeyword(name):
|
||||
name = "is_" + name
|
||||
t = mctype(slot["type"] if "type" in slot else "restBuffer")
|
||||
return f"(\"{name}\", {t.__name__})"
|
||||
|
||||
def parse_field(slot: dict) -> str:
|
||||
name = slot["name"] if "name" in slot else "anon"
|
||||
if keyword.iskeyword(name):
|
||||
name = "is_" + name
|
||||
t = mctype(slot["type"] if "type" in slot else "restBuffer")
|
||||
return f"{name} : {t._pytype.__name__}"
|
||||
|
||||
class PacketClassWriter:
|
||||
pid : int
|
||||
title : str
|
||||
slots : List[Dict[str, str]]
|
||||
|
||||
def __init__(self, pid:int, title:str, slots:List[Dict[str, str]]):
|
||||
self.pid = pid
|
||||
self.title = title
|
||||
self.slots = slots
|
||||
|
||||
def compile(self) -> str:
|
||||
return PREFACE + \
|
||||
IMPORTS + \
|
||||
OBJECT.format(
|
||||
id=pid,
|
||||
name=self.title,
|
||||
slots=",\n\t\t".join(parse_slot(slot) for slot in self.slots),
|
||||
fields="\n\t".join(parse_field(slot) for slot in self.slots),
|
||||
)
|
||||
|
||||
def _make_module(path:str, contents:dict):
|
||||
os.mkdir(path)
|
||||
if not path.endswith("/"):
|
||||
path += "/"
|
||||
imports = ""
|
||||
for key in contents:
|
||||
imports += f"from .{key} import {contents[key]}\n"
|
||||
with open(path + "__init__.py", "w") as f:
|
||||
f.write(PREFACE + imports)
|
||||
|
||||
if __name__ == "__main__":
|
||||
# TODO load relatively!
|
||||
with open("/home/alemi/projects/minecraft-data/data/pc/1.12.2/protocol.json") as f:
|
||||
data = json.load(f)
|
||||
|
||||
# TODO get the `minecraft` folder
|
||||
_make_module("proto", {"handshaking":"*", "status":"*", "login":"*", "play":"*"})
|
||||
for state in ("handshaking", "status", "login", "play"):
|
||||
_make_module(f"proto/{state}", {"clientbound":"*", "serverbound":"*"})
|
||||
for _direction in ("toClient", "toServer"):
|
||||
direction = DIR_MAP[_direction]
|
||||
buf = data[state][_direction]["types"]["packet"][1][0]["type"][1]["mappings"]
|
||||
registry = { f"packet_{value}" : int(key, 16) for (key, value) in buf.items() }
|
||||
contents = { key : snake_to_camel(key) for key in data[state][_direction]["types"].keys() if key != "packet" }
|
||||
_make_module(f"proto/{state}/{direction}", contents)
|
||||
for p_name in data[state][_direction]["types"].keys():
|
||||
if p_name == "packet":
|
||||
continue # it's the registry entry
|
||||
packet = data[state][_direction]["types"][p_name]
|
||||
pid = registry[p_name]
|
||||
class_name = snake_to_camel(p_name)
|
||||
with open(f"proto/{state}/{direction}/{p_name}.py", "w") as f:
|
||||
f.write(PacketClassWriter(pid, class_name, packet[1]).compile())
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
import struct
|
||||
import asyncio
|
||||
|
||||
from typing import Any
|
||||
|
||||
|
|
|
|||
224
compiler/proto.py
Normal file
224
compiler/proto.py
Normal file
|
|
@ -0,0 +1,224 @@
|
|||
#!/usr/bin/env python
|
||||
import os
|
||||
import json
|
||||
import keyword
|
||||
import logging
|
||||
|
||||
from pathlib import Path
|
||||
from typing import List, Dict, Union
|
||||
|
||||
from aiocraft.mc.mctypes import *
|
||||
|
||||
DIR_MAP = {"toClient": "clientbound", "toServer": "serverbound"}
|
||||
PREFACE = """\"\"\"[!] This file is autogenerated\"\"\"\n\n"""
|
||||
IMPORTS = """from typing import Tuple, Dict
|
||||
from ....packet import Packet
|
||||
from ....mctypes import *\n"""
|
||||
IMPORT_ALL = """__all__ = [\n\t{all}\n]\n"""
|
||||
OBJECT = """
|
||||
class {name}(Packet):
|
||||
{fields}
|
||||
|
||||
_ids : Dict[int, int] = {ids}
|
||||
_slots : Dict[int, Tuple[Tuple[str, Type]]] = {slots}
|
||||
"""
|
||||
|
||||
TYPE_MAP = {
|
||||
"varint": VarInt,
|
||||
"u8": UnsignedShort,
|
||||
"u16": UnsignedInt,
|
||||
"u32": UnsignedLong,
|
||||
"i16": Short,
|
||||
"i32": Int,
|
||||
"i64": Long,
|
||||
"f32": Float,
|
||||
"f64": Double,
|
||||
"bool": Boolean,
|
||||
"UUID": UUID,
|
||||
"string": String,
|
||||
"nbt": NBTTag,
|
||||
"slot": Slot,
|
||||
"position": Position,
|
||||
"entityMetadataItem": EntityMetadataItem,
|
||||
"entityMetadata": EntityMetadata,
|
||||
}
|
||||
|
||||
def mctype(name:str) -> Type:
|
||||
if not isinstance(name, str):
|
||||
return String # should return TrailingByteArray but still haven't implemented it (:
|
||||
if name in TYPE_MAP:
|
||||
return TYPE_MAP[name]
|
||||
return String # should return TrailingByteArray but still haven't implemented it (:
|
||||
|
||||
def snake_to_camel(name:str) -> str:
|
||||
return "".join(x.capitalize() for x in name.split("_"))
|
||||
|
||||
def parse_slot(slot: dict) -> str:
|
||||
name = slot["name"] if "name" in slot else "anon"
|
||||
if keyword.iskeyword(name):
|
||||
name = "is_" + name
|
||||
t = mctype(slot["type"] if "type" in slot else "restBuffer")
|
||||
return f"(\"{name}\", {t.__name__})"
|
||||
|
||||
def parse_field(slot: dict) -> str:
|
||||
name = slot["name"] if "name" in slot else "anon"
|
||||
if keyword.iskeyword(name):
|
||||
name = "is_" + name
|
||||
t = mctype(slot["type"] if "type" in slot else "restBuffer")
|
||||
return f"{name} : {t._pytype.__name__}"
|
||||
|
||||
class PacketClassWriter:
|
||||
title : str
|
||||
ids : str
|
||||
slots : str
|
||||
fields: str
|
||||
|
||||
|
||||
def __init__(self, title:str, ids:str, slots:str, fields:str):
|
||||
self.title = title
|
||||
self.ids = ids
|
||||
self.slots = slots
|
||||
self.fields = fields
|
||||
|
||||
def compile(self) -> str:
|
||||
return PREFACE + \
|
||||
IMPORTS + \
|
||||
OBJECT.format(
|
||||
name=self.title,
|
||||
ids=self.ids,
|
||||
slots=self.slots,
|
||||
fields=self.fields,
|
||||
)
|
||||
|
||||
def _make_module(path:Path, contents:dict):
|
||||
os.mkdir(path)
|
||||
imports = ""
|
||||
for key in contents:
|
||||
imports += f"from .{key} import {contents[key]}\n"
|
||||
with open(path / "__init__.py", "w") as f:
|
||||
f.write(PREFACE + imports)
|
||||
|
||||
def compile():
|
||||
import shutil
|
||||
import zipfile
|
||||
from urllib.request import urlretrieve
|
||||
|
||||
base_path = Path(os.getcwd())
|
||||
mc_path = base_path / 'aiocraft' / 'mc'
|
||||
|
||||
# Retrieve proto definitions from PrismarineJS/minecraft-data
|
||||
urlretrieve("https://github.com/PrismarineJS/minecraft-data/zipball/master", mc_path / "minecraft-data.zip")
|
||||
|
||||
with zipfile.ZipFile(mc_path / 'minecraft-data.zip', 'r') as f:
|
||||
f.extractall(mc_path)
|
||||
|
||||
# First folder starting with PrismarineJS
|
||||
folder_name = next(folder for folder in os.listdir(mc_path) if folder.startswith("PrismarineJS"))
|
||||
|
||||
shutil.rmtree(mc_path / 'proto')
|
||||
|
||||
PACKETS = {
|
||||
"handshaking": {
|
||||
"clientbound": {},
|
||||
"serverbound": {},
|
||||
},
|
||||
"status": {
|
||||
"clientbound": {},
|
||||
"serverbound": {},
|
||||
},
|
||||
"login": {
|
||||
"clientbound": {},
|
||||
"serverbound": {},
|
||||
},
|
||||
"play": {
|
||||
"clientbound": {},
|
||||
"serverbound": {},
|
||||
}
|
||||
}
|
||||
|
||||
# TODO load all versions!
|
||||
all_versions = os.listdir(mc_path / f'{folder_name}/data/pc/')
|
||||
all_versions.remove("common")
|
||||
# _make_module(mc_path / 'proto', { f"v{v.replace('.', '_').replace('-', '_')}":"*" for v in all_versions })
|
||||
|
||||
for v in all_versions:
|
||||
if v == "0.30c":
|
||||
continue # Proto just too antique!
|
||||
if not os.path.isfile(mc_path / f'{folder_name}/data/pc/{v}/protocol.json') \
|
||||
or not os.path.isfile(mc_path / f'{folder_name}/data/pc/{v}/version.json'):
|
||||
continue
|
||||
with open(mc_path / f'{folder_name}/data/pc/{v}/version.json') as f:
|
||||
proto_version = json.load(f)['version']
|
||||
|
||||
with open(mc_path / f'{folder_name}/data/pc/{v}/protocol.json') as f:
|
||||
data = json.load(f)
|
||||
|
||||
for state in ("handshaking", "status", "login", "play"):
|
||||
for _direction in ("toClient", "toServer"):
|
||||
direction = DIR_MAP[_direction]
|
||||
try:
|
||||
buf = data[state][_direction]["types"]["packet"][1][0]["type"][1]["mappings"]
|
||||
except KeyError:
|
||||
logging.exception("Exception building %s|%s|%s definitions", v, state, direction)
|
||||
print("Exception building %s|%s|%s definitions" % (v, state, direction))
|
||||
# _make_module(mc_path / f"proto/{version}/{state}/{direction}", {})
|
||||
continue
|
||||
registry = { f"packet_{value}" : int(key, 16) for (key, value) in buf.items() }
|
||||
for p_name in data[state][_direction]["types"].keys():
|
||||
if p_name == "packet":
|
||||
continue # it's the registry entry
|
||||
if p_name not in registry:
|
||||
logging.warning("Trying to make definitions for packet '%s'", p_name)
|
||||
continue # wtf!
|
||||
packet = data[state][_direction]["types"][p_name]
|
||||
pid = registry[p_name]
|
||||
class_name = snake_to_camel(p_name)
|
||||
if p_name not in PACKETS[state][direction]:
|
||||
PACKETS[state][direction][p_name] = {
|
||||
"name" : class_name,
|
||||
"definitions" : {},
|
||||
}
|
||||
PACKETS[state][direction][p_name]["definitions"][proto_version] = {
|
||||
"id": pid,
|
||||
"slots" : packet[1],
|
||||
}
|
||||
|
||||
with open("/home/dev/HELP.json", "w") as f:
|
||||
json.dump(PACKETS, f, indent=2)
|
||||
|
||||
_make_module(mc_path / 'proto', { k:"*" for k in PACKETS.keys() })
|
||||
for state in PACKETS.keys():
|
||||
_make_module(mc_path / f"proto/{state}", { k:"*" for k in PACKETS[state].keys() })
|
||||
for direction in PACKETS[state].keys():
|
||||
_make_module(mc_path / f"proto/{state}/{direction}", { k:snake_to_camel(k) for k in PACKETS[state][direction].keys() })
|
||||
for packet in PACKETS[state][direction].keys():
|
||||
pkt = PACKETS[state][direction][packet]
|
||||
slots = []
|
||||
fields = set()
|
||||
ids = []
|
||||
for v in sorted(PACKETS[state][direction][packet]["definitions"].keys()):
|
||||
defn = pkt["definitions"][v]
|
||||
ids.append(f"{v} : 0x{defn['id']:02X}")
|
||||
v_slots = []
|
||||
v_fields = []
|
||||
for slot in defn["slots"]:
|
||||
with open("/home/dev/SLOTS", "a") as f:
|
||||
f.write(str(slot) + "\n")
|
||||
v_slots.append(parse_slot(slot))
|
||||
fields.add(parse_field(slot))
|
||||
slots.append(f"{v} : ( {','.join(v_slots)} ),")
|
||||
|
||||
with open(mc_path / f"proto/{state}/{direction}/{packet}.py", "w") as f:
|
||||
f.write(
|
||||
PacketClassWriter(
|
||||
pkt["name"],
|
||||
'{\n\t\t' + ',\n\t\t'.join(ids) + '\n\t}\n',
|
||||
'{\n\t\t' + '\n\t\t'.join(slots) + '\n\t}\n',
|
||||
'\n\t'.join(fields),
|
||||
).compile()
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
7
setup.py
7
setup.py
|
|
@ -1,5 +1,9 @@
|
|||
from setuptools import setup, find_packages
|
||||
|
||||
from compiler.proto import compile
|
||||
|
||||
compile()
|
||||
|
||||
setup(
|
||||
name='aiocraft',
|
||||
version='0.0.1',
|
||||
|
|
@ -9,7 +13,7 @@ setup(
|
|||
author_email='me@alemi.dev',
|
||||
license='MIT',
|
||||
packages=find_packages(),
|
||||
install_requires=['requests'],
|
||||
install_requires=[],
|
||||
classifiers=[
|
||||
'Development Status :: 1 - Planning',
|
||||
'Intended Audience :: Developers',
|
||||
|
|
@ -19,4 +23,3 @@ setup(
|
|||
'Programming Language :: Python :: 3.8',
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue