diff options
| author | mat <github@matdoes.dev> | 2022-05-07 18:26:19 -0500 |
|---|---|---|
| committer | mat <github@matdoes.dev> | 2022-05-07 18:26:19 -0500 |
| commit | c10b732510868819a652b76e31278906914d699d (patch) | |
| tree | 3c1039ec3d200bc16ead375bc0f418194ca68d19 /data-code-generator | |
| parent | aa3ba64aa45abcafb6aa9c1981730d3270a3b0a5 (diff) | |
| download | azalea-drasl-c10b732510868819a652b76e31278906914d699d.tar.xz | |
improve data generator and add packet
Diffstat (limited to 'data-code-generator')
| -rw-r--r-- | data-code-generator/main.py | 8 | ||||
| -rw-r--r-- | data-code-generator/packetcodegen.py | 10 |
2 files changed, 13 insertions, 5 deletions
diff --git a/data-code-generator/main.py b/data-code-generator/main.py index e1668369..07a591e4 100644 --- a/data-code-generator/main.py +++ b/data-code-generator/main.py @@ -2,6 +2,7 @@ from mappings import Mappings import packetcodegen import requests import json +import sys import os # enable this if you already have the burger.json and don't want to wait @@ -34,11 +35,14 @@ if not SKIP_BURGER: client_mappings_url = package_data['downloads']['client_mappings']['url'] mappings = Mappings.parse(requests.get(client_mappings_url).text) - with open('burger.json', 'r') as f: burger_data = json.load(f) burger_packets_data = burger_data[0]['packets']['packet'] -packetcodegen.generate(burger_packets_data, mappings) +packet_ids = list(map(int, sys.argv[1:])) +print(packet_ids) +packetcodegen.generate(burger_packets_data, mappings, packet_ids) os.system('cd .. && cargo fmt') + +print('Done!') diff --git a/data-code-generator/packetcodegen.py b/data-code-generator/packetcodegen.py index 4c59b72b..12855d08 100644 --- a/data-code-generator/packetcodegen.py +++ b/data-code-generator/packetcodegen.py @@ -70,8 +70,7 @@ def write_packet_file(state, packet_name_snake_case, code): f.write(code) -def generate(burger_packets, mappings: Mappings): - packet_ids = [75] +def generate(burger_packets, mappings: Mappings, packet_ids): for packet in burger_packets.values(): if packet['id'] not in packet_ids: continue @@ -79,6 +78,10 @@ def generate(burger_packets, mappings: Mappings): direction = packet['direction'].lower() # serverbound or clientbound state = {'PLAY': 'game'}.get(packet['state'], packet['state'].lower()) + # TODO: have something better to control this + if state != 'game' or direction != 'clientbound': + continue + generated_packet_code = [] uses = set() generated_packet_code.append( @@ -86,7 +89,8 @@ def generate(burger_packets, mappings: Mappings): uses.add(f'packet_macros::{to_camel_case(state)}Packet') obfuscated_class_name = packet['class'].split('.')[0] - class_name = mappings.get_class(obfuscated_class_name).split('.')[-1] + class_name = mappings.get_class( + obfuscated_class_name).split('.')[-1].split('$')[0] generated_packet_code.append( f'pub struct {to_camel_case(class_name)} {{') |