From fb3b002d94076de463e2af776666387db9e75835 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 24 May 2022 23:05:44 -0500 Subject: start adding migrate --- codegen/migrate.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 codegen/migrate.py (limited to 'codegen/migrate.py') diff --git a/codegen/migrate.py b/codegen/migrate.py new file mode 100644 index 00000000..c0748400 --- /dev/null +++ b/codegen/migrate.py @@ -0,0 +1,52 @@ +import lib.code.utils +import lib.code.version +import lib.download +import sys +import os + +old_version_id = lib.code.version.get_version_id() +old_mappings = lib.download.get_mappings_for_version(old_version_id) +old_burger_data = lib.download.get_burger_data_for_version(old_version_id) +old_packet_list = list(old_burger_data[0]['packets']['packet'].values()) + +new_version_id = sys.argv[1] +new_mappings = lib.download.get_mappings_for_version(new_version_id) +new_burger_data = lib.download.get_burger_data_for_version(new_version_id) +new_packet_list = list(new_burger_data[0]['packets']['packet'].values()) + +old_packet_ids = {} +new_packet_ids = {} + +for packet in old_packet_list: + assert packet['class'].endswith('.class') + packet_name = old_mappings.get_class(packet['class'][:-6]) + old_packet_ids[packet_name] = packet['id'] +for packet in new_packet_list: + assert packet['class'].endswith('.class') + packet_name = new_mappings.get_class(packet['class'][:-6]) + new_packet_ids[packet_name] = packet['id'] + +# find packets that changed ids +for packet_name in old_packet_ids: + if packet_name in new_packet_ids: + if old_packet_ids[packet_name] != new_packet_ids[packet_name]: + print(packet_name, 'id changed from', + old_packet_ids[packet_name], 'to', new_packet_ids[packet_name]) + +print() + +# find removed packets +for packet_name in old_packet_ids: + if packet_name not in new_packet_ids: + print(packet_name, 'removed') + +print() + +# find added packets +for packet_name in new_packet_ids: + if packet_name not in old_packet_ids: + print(packet_name, 'added') + +lib.code.utils.fmt() + +print('Done!') -- cgit v1.2.3 From 479c05474704a5a2f68b79468d2cde05c0ceec62 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 00:21:05 -0500 Subject: Migrate might be working --- codegen/lib/code/packet.py | 72 ++++++++++++++++++++++++++++++++++++++++++++-- codegen/lib/code/utils.py | 2 ++ codegen/lib/utils.py | 25 ++++++++++++++++ codegen/migrate.py | 51 ++++++++++++++++++++------------ codegen/newpacket.py | 4 +-- 5 files changed, 132 insertions(+), 22 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/lib/code/packet.py b/codegen/lib/code/packet.py index 0d3ad138..59c773c1 100644 --- a/codegen/lib/code/packet.py +++ b/codegen/lib/code/packet.py @@ -7,7 +7,7 @@ def make_packet_mod_rs_line(packet_id: int, packet_class_name: str): return f' {padded_hex(packet_id)}: {to_snake_case(packet_class_name)}::{to_camel_case(packet_class_name)},' -def generate(burger_packets, mappings: Mappings, target_packet_id, target_packet_direction, target_packet_state): +def generate_packet(burger_packets, mappings: Mappings, target_packet_id, target_packet_direction, target_packet_state): for packet in burger_packets.values(): if packet['id'] != target_packet_id: continue @@ -109,9 +109,13 @@ def generate(burger_packets, mappings: Mappings, target_packet_id, target_packet f.write('\n'.join(mod_rs)) -def set_packet_ids(packet_ids: list, packet_class_names: list, direction: str, state: str): +def set_packets(packet_ids: list, packet_class_names: list, direction: str, state: str): assert len(packet_ids) == len(packet_class_names) + # sort the packets by id + packet_ids, packet_class_names = [list(x) for x in zip( + *sorted(zip(packet_ids, packet_class_names), key=lambda pair: pair[0]))] + mod_rs_dir = f'../azalea-protocol/src/packets/{state}/mod.rs' with open(mod_rs_dir, 'r') as f: mod_rs = f.read().splitlines() @@ -146,3 +150,67 @@ def set_packet_ids(packet_ids: list, packet_class_names: list, direction: str, s with open(mod_rs_dir, 'w') as f: f.write('\n'.join(new_mod_rs)) + + +def get_packets(direction: str, state: str): + mod_rs_dir = f'../azalea-protocol/src/packets/{state}/mod.rs' + with open(mod_rs_dir, 'r') as f: + mod_rs = f.read().splitlines() + + in_serverbound = False + in_clientbound = False + + packet_ids: list[int] = [] + packet_class_names: list[str] = [] + + for line in mod_rs: + if line.strip() == 'Serverbound => {': + in_serverbound = True + continue + elif line.strip() == 'Clientbound => {': + in_clientbound = True + continue + elif line.strip() in ('}', '},'): + if (in_serverbound and direction == 'serverbound') or (in_clientbound and direction == 'clientbound'): + break + in_serverbound = in_clientbound = False + continue + + if line.strip() == '' or line.strip().startswith('//') or (not in_serverbound and direction == 'serverbound') or (not in_clientbound and direction == 'clientbound'): + continue + + line_packet_id_hex = line.strip().split(':')[0] + assert line_packet_id_hex.startswith('0x') + line_packet_id = int(line_packet_id_hex[2:], 16) + packet_ids.append(line_packet_id) + + packet_class_name = line.strip().split(':')[1].strip() + packet_class_names.append(packet_class_name) + + return packet_ids, packet_class_names + + +def change_packet_ids(id_map: dict[int, int], direction: str, state: str): + existing_packet_ids, existing_packet_class_names = get_packets( + direction, state) + + new_packet_ids = [] + + for packet_id in existing_packet_ids: + new_packet_id = id_map.get(packet_id, packet_id) + new_packet_ids.append(new_packet_id) + + set_packets(new_packet_ids, existing_packet_class_names, direction, state) + + +def remove_packet_ids(packet_ids: list[int], direction: str, state: str): + existing_packet_ids, existing_packet_class_names = get_packets( + direction, state) + + new_packet_ids = [] + + for packet_id in existing_packet_ids: + if packet_id not in packet_ids: + new_packet_ids.append(packet_id) + + set_packets(new_packet_ids, existing_packet_class_names, direction, state) diff --git a/codegen/lib/code/utils.py b/codegen/lib/code/utils.py index 92d1a9e9..28a5ef3c 100644 --- a/codegen/lib/code/utils.py +++ b/codegen/lib/code/utils.py @@ -1,6 +1,8 @@ import os +# utilities specifically for codegen + def burger_type_to_rust_type(burger_type): is_var = False diff --git a/codegen/lib/utils.py b/codegen/lib/utils.py index 051ffe51..ff1a5d36 100644 --- a/codegen/lib/utils.py +++ b/codegen/lib/utils.py @@ -1,5 +1,7 @@ import re +# utilities that could be used for things other than codegen + def to_snake_case(name: str): s = re.sub('([A-Z])', r'_\1', name) @@ -13,3 +15,26 @@ def to_camel_case(name: str): def padded_hex(n: int): return f'0x{n:02x}' + + +class PacketIdentifier: + def __init__(self, packet_id, direction, state): + self.packet_id = packet_id + self.direction = direction + self.state = state + + def __eq__(self, other): + return self.packet_id == other.packet_id and self.direction == other.direction and self.state == other.state + + def __hash__(self): + return hash((self.packet_id, self.direction, self.state)) + + +def group_packets(packets: list[PacketIdentifier]): + packet_groups: dict[tuple[str, str], list[int]] = {} + for packet in packets: + key = (packet.direction, packet.state) + if key not in packet_groups: + packet_groups[key] = [] + packet_groups[key].append(packet.packet_id) + return packet_groups diff --git a/codegen/migrate.py b/codegen/migrate.py index c0748400..6928cea1 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -1,5 +1,7 @@ +from codegen.lib.utils import PacketIdentifier, group_packets import lib.code.utils import lib.code.version +import lib.code.packet import lib.download import sys import os @@ -14,39 +16,52 @@ new_mappings = lib.download.get_mappings_for_version(new_version_id) new_burger_data = lib.download.get_burger_data_for_version(new_version_id) new_packet_list = list(new_burger_data[0]['packets']['packet'].values()) -old_packet_ids = {} -new_packet_ids = {} + +old_packets: dict[PacketIdentifier, str] = {} +new_packets: dict[PacketIdentifier, str] = {} for packet in old_packet_list: assert packet['class'].endswith('.class') packet_name = old_mappings.get_class(packet['class'][:-6]) - old_packet_ids[packet_name] = packet['id'] + old_packets[PacketIdentifier( + packet['id'], packet['direction'], packet['state'])] = packet_name for packet in new_packet_list: assert packet['class'].endswith('.class') packet_name = new_mappings.get_class(packet['class'][:-6]) - new_packet_ids[packet_name] = packet['id'] + new_packets[PacketIdentifier( + packet['id'], packet['direction'], packet['state'])] = packet_name -# find packets that changed ids -for packet_name in old_packet_ids: - if packet_name in new_packet_ids: - if old_packet_ids[packet_name] != new_packet_ids[packet_name]: - print(packet_name, 'id changed from', - old_packet_ids[packet_name], 'to', new_packet_ids[packet_name]) + +# find removed packets +removed_packets: list[PacketIdentifier] = [] +for packet in old_packets: + if packet not in new_packets: + removed_packets.append(packet) +for (direction, state), packets in group_packets(removed_packets).items(): + lib.code.packet.remove_packet_ids(packets, direction, state) print() -# find removed packets -for packet_name in old_packet_ids: - if packet_name not in new_packet_ids: - print(packet_name, 'removed') +# find packets that changed ids +changed_packets: dict[PacketIdentifier, int] = {} +for old_packet, old_packet_name in old_packets.items(): + for new_packet, new_packet_name in new_packets.items(): + if old_packet == new_packet and old_packet.packet_id != new_packet.packet_id: + changed_packets[old_packet] = new_packet.packet_id +for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): + lib.code.packet.remove_packet_ids(packets, direction, state) + print() # find added packets -for packet_name in new_packet_ids: - if packet_name not in old_packet_ids: - print(packet_name, 'added') - +added_packets: list[PacketIdentifier] = [] +for packet in new_packets: + if packet not in old_packets: + added_packets.append(packet) +for packet in added_packets: + lib.code.packet.generate_packet( + new_burger_data, new_mappings, packet.packet_id, packet.direction, packet.state) lib.code.utils.fmt() print('Done!') diff --git a/codegen/newpacket.py b/codegen/newpacket.py index b3a1c64f..2e4c77d7 100644 --- a/codegen/newpacket.py +++ b/codegen/newpacket.py @@ -9,8 +9,8 @@ burger_packets_data = burger_data[0]['packets']['packet'] packet_id, direction, state = int(sys.argv[1]), sys.argv[2], sys.argv[3] print( f'Generating code for packet id: {packet_id} with direction {direction} and state {state}') -code.packetcodegen.generate(burger_packets_data, mappings, - packet_id, direction, state) +code.packetcodegen.generate_packet(burger_packets_data, mappings, + packet_id, direction, state) code.fmt() -- cgit v1.2.3 From dc5a9149a588f727f14f7d6d89908ba8fe87b642 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 00:30:47 -0500 Subject: Fix migrate --- codegen/lib/utils.py | 8 +++++++- codegen/migrate.py | 17 ++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/lib/utils.py b/codegen/lib/utils.py index ff1a5d36..c185c0e5 100644 --- a/codegen/lib/utils.py +++ b/codegen/lib/utils.py @@ -18,7 +18,7 @@ def padded_hex(n: int): class PacketIdentifier: - def __init__(self, packet_id, direction, state): + def __init__(self, packet_id: int, direction: str, state: str): self.packet_id = packet_id self.direction = direction self.state = state @@ -29,6 +29,12 @@ class PacketIdentifier: def __hash__(self): return hash((self.packet_id, self.direction, self.state)) + def __str__(self): + return f'{self.packet_id} {self.direction} {self.state}' + + def __repr__(self): + return f'PacketIdentifier({self.packet_id}, {self.direction}, {self.state})' + def group_packets(packets: list[PacketIdentifier]): packet_groups: dict[tuple[str, str], list[int]] = {} diff --git a/codegen/migrate.py b/codegen/migrate.py index 6928cea1..7cd46058 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -1,4 +1,4 @@ -from codegen.lib.utils import PacketIdentifier, group_packets +from lib.utils import PacketIdentifier, group_packets import lib.code.utils import lib.code.version import lib.code.packet @@ -24,19 +24,19 @@ for packet in old_packet_list: assert packet['class'].endswith('.class') packet_name = old_mappings.get_class(packet['class'][:-6]) old_packets[PacketIdentifier( - packet['id'], packet['direction'], packet['state'])] = packet_name + packet['id'], packet['direction'].lower(), packet['state'].lower())] = packet_name for packet in new_packet_list: assert packet['class'].endswith('.class') packet_name = new_mappings.get_class(packet['class'][:-6]) new_packets[PacketIdentifier( - packet['id'], packet['direction'], packet['state'])] = packet_name - + packet['id'], packet['direction'].lower(), packet['state'].lower())] = packet_name # find removed packets removed_packets: list[PacketIdentifier] = [] for packet in old_packets: - if packet not in new_packets: + if packet not in new_packets or new_packets[packet] != old_packets[packet]: removed_packets.append(packet) + print('Removed packet:', packet) for (direction, state), packets in group_packets(removed_packets).items(): lib.code.packet.remove_packet_ids(packets, direction, state) @@ -48,6 +48,8 @@ for old_packet, old_packet_name in old_packets.items(): for new_packet, new_packet_name in new_packets.items(): if old_packet == new_packet and old_packet.packet_id != new_packet.packet_id: changed_packets[old_packet] = new_packet.packet_id + print('Changed packet id:', old_packet, '->', + new_packet, f'({new_packet_name})') for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): lib.code.packet.remove_packet_ids(packets, direction, state) @@ -57,11 +59,12 @@ print() # find added packets added_packets: list[PacketIdentifier] = [] for packet in new_packets: - if packet not in old_packets: + if packet not in old_packets and new_packets[packet] == old_packets[packet]: added_packets.append(packet) + print('Added packet:', packet) for packet in added_packets: lib.code.packet.generate_packet( - new_burger_data, new_mappings, packet.packet_id, packet.direction, packet.state) + new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) lib.code.utils.fmt() print('Done!') -- cgit v1.2.3 From 8953cf43e25ca93103fbc3551ac658e1b56679df Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 00:35:53 -0500 Subject: Almost --- codegen/lib/code/packet.py | 22 ++++++++++++++-------- codegen/migrate.py | 5 +++-- 2 files changed, 17 insertions(+), 10 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/lib/code/packet.py b/codegen/lib/code/packet.py index 59c773c1..f9135194 100644 --- a/codegen/lib/code/packet.py +++ b/codegen/lib/code/packet.py @@ -7,13 +7,17 @@ def make_packet_mod_rs_line(packet_id: int, packet_class_name: str): return f' {padded_hex(packet_id)}: {to_snake_case(packet_class_name)}::{to_camel_case(packet_class_name)},' +def fix_state(state: str): + return {'PLAY': 'game'}.get(state, state.lower()) + + def generate_packet(burger_packets, mappings: Mappings, target_packet_id, target_packet_direction, target_packet_state): for packet in burger_packets.values(): if packet['id'] != target_packet_id: continue direction = packet['direction'].lower() # serverbound or clientbound - state = {'PLAY': 'game'}.get(packet['state'], packet['state'].lower()) + state = fix_state(packet['state']) if state != target_packet_state or direction != target_packet_direction: continue @@ -109,12 +113,12 @@ def generate_packet(burger_packets, mappings: Mappings, target_packet_id, target f.write('\n'.join(mod_rs)) -def set_packets(packet_ids: list, packet_class_names: list, direction: str, state: str): +def set_packets(packet_ids: list[int], packet_class_names: list[str], direction: str, state: str): assert len(packet_ids) == len(packet_class_names) # sort the packets by id - packet_ids, packet_class_names = [list(x) for x in zip( - *sorted(zip(packet_ids, packet_class_names), key=lambda pair: pair[0]))] + zipped_packets: list[tuple[int, str]] = [list(x) for x in zip( + *sorted(zip(packet_ids, packet_class_names), key=lambda pair: pair[0]))] # type: ignore mod_rs_dir = f'../azalea-protocol/src/packets/{state}/mod.rs' with open(mod_rs_dir, 'r') as f: @@ -127,7 +131,7 @@ def set_packets(packet_ids: list, packet_class_names: list, direction: str, stat if line.strip() == 'Serverbound => {': if direction == 'serverbound': ignore_lines = True - for packet_id, packet_class_name in zip(packet_ids, packet_class_names): + for packet_id, packet_class_name in zipped_packets: new_mod_rs.append( make_packet_mod_rs_line(packet_id, packet_class_name) ) @@ -136,7 +140,7 @@ def set_packets(packet_ids: list, packet_class_names: list, direction: str, stat elif line.strip() == 'Clientbound => {': if direction == 'serverbound': ignore_lines = True - for packet_id, packet_class_name in zip(packet_ids, packet_class_names): + for packet_id, packet_class_name in zipped_packets: new_mod_rs.append( make_packet_mod_rs_line(packet_id, packet_class_name) ) @@ -208,9 +212,11 @@ def remove_packet_ids(packet_ids: list[int], direction: str, state: str): direction, state) new_packet_ids = [] + new_packet_class_names = [] - for packet_id in existing_packet_ids: + for packet_id, packet_class_name in zip(existing_packet_ids, existing_packet_class_names): if packet_id not in packet_ids: new_packet_ids.append(packet_id) + new_packet_class_names.append(packet_class_name) - set_packets(new_packet_ids, existing_packet_class_names, direction, state) + set_packets(new_packet_ids, new_packet_class_names, direction, state) diff --git a/codegen/migrate.py b/codegen/migrate.py index 7cd46058..edcf85a7 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -1,3 +1,4 @@ +from lib.code.packet import fix_state from lib.utils import PacketIdentifier, group_packets import lib.code.utils import lib.code.version @@ -24,12 +25,12 @@ for packet in old_packet_list: assert packet['class'].endswith('.class') packet_name = old_mappings.get_class(packet['class'][:-6]) old_packets[PacketIdentifier( - packet['id'], packet['direction'].lower(), packet['state'].lower())] = packet_name + packet['id'], packet['direction'].lower(), fix_state(packet['state']))] = packet_name for packet in new_packet_list: assert packet['class'].endswith('.class') packet_name = new_mappings.get_class(packet['class'][:-6]) new_packets[PacketIdentifier( - packet['id'], packet['direction'].lower(), packet['state'].lower())] = packet_name + packet['id'], packet['direction'].lower(), fix_state(packet['state']))] = packet_name # find removed packets removed_packets: list[PacketIdentifier] = [] -- cgit v1.2.3 From 856353458cfcc60b5071bdd66ae8176bd3d2287e Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 00:38:27 -0500 Subject: don't error --- codegen/migrate.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/migrate.py b/codegen/migrate.py index edcf85a7..75cbe122 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -34,8 +34,8 @@ for packet in new_packet_list: # find removed packets removed_packets: list[PacketIdentifier] = [] -for packet in old_packets: - if packet not in new_packets or new_packets[packet] != old_packets[packet]: +for packet, packet_name in old_packets.items(): + if packet_name not in old_packets.values(): removed_packets.append(packet) print('Removed packet:', packet) for (direction, state), packets in group_packets(removed_packets).items(): @@ -59,8 +59,8 @@ print() # find added packets added_packets: list[PacketIdentifier] = [] -for packet in new_packets: - if packet not in old_packets and new_packets[packet] == old_packets[packet]: +for packet, packet_name in new_packets.items(): + if packet_name not in old_packets.values(): added_packets.append(packet) print('Added packet:', packet) for packet in added_packets: -- cgit v1.2.3 From 2b34df21885a46f6b71c1c66a332f51d81f73044 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 00:39:33 -0500 Subject: Update migrate.py --- codegen/migrate.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'codegen/migrate.py') diff --git a/codegen/migrate.py b/codegen/migrate.py index 75cbe122..304351d3 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -47,10 +47,11 @@ print() changed_packets: dict[PacketIdentifier, int] = {} for old_packet, old_packet_name in old_packets.items(): for new_packet, new_packet_name in new_packets.items(): - if old_packet == new_packet and old_packet.packet_id != new_packet.packet_id: + if old_packet.direction == new_packet.direction and old_packet.state == new_packet.state and old_packet.packet_id != new_packet.packet_id: changed_packets[old_packet] = new_packet.packet_id print('Changed packet id:', old_packet, '->', new_packet, f'({new_packet_name})') + break for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): lib.code.packet.remove_packet_ids(packets, direction, state) -- cgit v1.2.3 From c851204dd0c4b9eee8acc12c4de56b90e1bf041b Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 20:09:48 -0500 Subject: Fix detecting changed packet ids --- codegen/lib/download.py | 8 ++++++-- codegen/migrate.py | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/lib/download.py b/codegen/lib/download.py index 284591ab..5030f8f3 100644 --- a/codegen/lib/download.py +++ b/codegen/lib/download.py @@ -41,8 +41,12 @@ def get_version_data(version_id: str): print( f'\033[92mGetting data for \033[1m{version_id}..\033[m') - package_url = next( - filter(lambda v: v['id'] == version_id, version_manifest_data['versions']))['url'] + try: + package_url = next( + filter(lambda v: v['id'] == version_id, version_manifest_data['versions']))['url'] + except StopIteration: + raise ValueError( + f'No version with id {version_id} found. Maybe delete downloads/version_manifest.json and try again?') package_data = requests.get(package_url).json() with open(f'downloads/{version_id}.json', 'w') as f: json.dump(package_data, f) diff --git a/codegen/migrate.py b/codegen/migrate.py index 304351d3..c623fd58 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -38,8 +38,8 @@ for packet, packet_name in old_packets.items(): if packet_name not in old_packets.values(): removed_packets.append(packet) print('Removed packet:', packet) -for (direction, state), packets in group_packets(removed_packets).items(): - lib.code.packet.remove_packet_ids(packets, direction, state) +# for (direction, state), packets in group_packets(removed_packets).items(): +# lib.code.packet.remove_packet_ids(packets, direction, state) print() @@ -47,13 +47,13 @@ print() changed_packets: dict[PacketIdentifier, int] = {} for old_packet, old_packet_name in old_packets.items(): for new_packet, new_packet_name in new_packets.items(): - if old_packet.direction == new_packet.direction and old_packet.state == new_packet.state and old_packet.packet_id != new_packet.packet_id: + if old_packet_name == new_packet_name and old_packet.direction == new_packet.direction and old_packet.state == new_packet.state and old_packet.packet_id != new_packet.packet_id: changed_packets[old_packet] = new_packet.packet_id print('Changed packet id:', old_packet, '->', new_packet, f'({new_packet_name})') break -for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): - lib.code.packet.remove_packet_ids(packets, direction, state) +# for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): +# lib.code.packet.remove_packet_ids(packets, direction, state) print() @@ -64,9 +64,9 @@ for packet, packet_name in new_packets.items(): if packet_name not in old_packets.values(): added_packets.append(packet) print('Added packet:', packet) -for packet in added_packets: - lib.code.packet.generate_packet( - new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) +# for packet in added_packets: +# lib.code.packet.generate_packet( +# new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) lib.code.utils.fmt() print('Done!') -- cgit v1.2.3 From 9f192301facdb35157c5de105f6390b2de317ac4 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 20:18:03 -0500 Subject: Fix removed packets --- codegen/migrate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/migrate.py b/codegen/migrate.py index c623fd58..f15844d9 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -35,9 +35,9 @@ for packet in new_packet_list: # find removed packets removed_packets: list[PacketIdentifier] = [] for packet, packet_name in old_packets.items(): - if packet_name not in old_packets.values(): + if packet_name not in new_packets.values(): removed_packets.append(packet) - print('Removed packet:', packet) + print('Removed packet:', packet, packet_name) # for (direction, state), packets in group_packets(removed_packets).items(): # lib.code.packet.remove_packet_ids(packets, direction, state) @@ -63,7 +63,7 @@ added_packets: list[PacketIdentifier] = [] for packet, packet_name in new_packets.items(): if packet_name not in old_packets.values(): added_packets.append(packet) - print('Added packet:', packet) + print('Added packet:', packet, packet_name) # for packet in added_packets: # lib.code.packet.generate_packet( # new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) -- cgit v1.2.3 From 9d0de818f8306a401efcd9244c6e06aa5e8189db Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 20:21:50 -0500 Subject: fixed changing packet ids --- codegen/migrate.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/migrate.py b/codegen/migrate.py index f15844d9..890186b8 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -38,8 +38,8 @@ for packet, packet_name in old_packets.items(): if packet_name not in new_packets.values(): removed_packets.append(packet) print('Removed packet:', packet, packet_name) -# for (direction, state), packets in group_packets(removed_packets).items(): -# lib.code.packet.remove_packet_ids(packets, direction, state) +for (direction, state), packets in group_packets(removed_packets).items(): + lib.code.packet.remove_packet_ids(packets, direction, state) print() @@ -52,8 +52,14 @@ for old_packet, old_packet_name in old_packets.items(): print('Changed packet id:', old_packet, '->', new_packet, f'({new_packet_name})') break -# for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): -# lib.code.packet.remove_packet_ids(packets, direction, state) +for (direction, state), packets in group_packets(list(changed_packets.keys())).items(): + id_map: dict[int, int] = {} + for old_packet_id in packets: + new_packet_id = changed_packets[PacketIdentifier( + old_packet_id, direction, state)] + id_map[old_packet_id] = new_packet_id + + lib.code.packet.change_packet_ids(id_map, direction, state) print() @@ -64,9 +70,9 @@ for packet, packet_name in new_packets.items(): if packet_name not in old_packets.values(): added_packets.append(packet) print('Added packet:', packet, packet_name) -# for packet in added_packets: -# lib.code.packet.generate_packet( -# new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) +for packet in added_packets: + lib.code.packet.generate_packet( + new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) lib.code.utils.fmt() print('Done!') -- cgit v1.2.3 From 054c6e678bc015f674c2d15cb6432a46d81d5934 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 25 May 2022 20:24:41 -0500 Subject: fix set_packets maybe --- codegen/lib/code/packet.py | 6 +++--- codegen/migrate.py | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'codegen/migrate.py') diff --git a/codegen/lib/code/packet.py b/codegen/lib/code/packet.py index af41a390..8563e5b9 100644 --- a/codegen/lib/code/packet.py +++ b/codegen/lib/code/packet.py @@ -117,7 +117,7 @@ def set_packets(packet_ids: list[int], packet_class_names: list[str], direction: assert len(packet_ids) == len(packet_class_names) # sort the packets by id - zipped_packets: list[tuple[int, str]] = [list(x) for x in zip( + packet_ids, packet_class_names = [list(x) for x in zip( *sorted(zip(packet_ids, packet_class_names), key=lambda pair: pair[0]))] # type: ignore mod_rs_dir = f'../azalea-protocol/src/packets/{state}/mod.rs' @@ -132,7 +132,7 @@ def set_packets(packet_ids: list[int], packet_class_names: list[str], direction: new_mod_rs.append(line) if direction == 'serverbound': ignore_lines = True - for packet_id, packet_class_name in zipped_packets: + for packet_id, packet_class_name in zip(packet_ids, packet_class_names): new_mod_rs.append( make_packet_mod_rs_line(packet_id, packet_class_name) ) @@ -143,7 +143,7 @@ def set_packets(packet_ids: list[int], packet_class_names: list[str], direction: new_mod_rs.append(line) if direction == 'serverbound': ignore_lines = True - for packet_id, packet_class_name in zipped_packets: + for packet_id, packet_class_name in zip(packet_ids, packet_class_names): new_mod_rs.append( make_packet_mod_rs_line(packet_id, packet_class_name) ) diff --git a/codegen/migrate.py b/codegen/migrate.py index 890186b8..392af9fe 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -58,7 +58,6 @@ for (direction, state), packets in group_packets(list(changed_packets.keys())).i new_packet_id = changed_packets[PacketIdentifier( old_packet_id, direction, state)] id_map[old_packet_id] = new_packet_id - lib.code.packet.change_packet_ids(id_map, direction, state) -- cgit v1.2.3 From 1e145a82b80fb0402e8a64624454d9bfee77bc72 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 26 May 2022 13:45:48 -0500 Subject: 1.19 --- README.md | 2 +- azalea-client/src/connect.rs | 34 +++++-- azalea-crypto/src/lib.rs | 4 +- azalea-crypto/src/signing.rs | 5 + azalea-protocol/src/mc_buf/read.rs | 35 ++----- azalea-protocol/src/mc_buf/write.rs | 9 ++ .../src/packets/game/clientbound_add_mob_packet.rs | 21 ----- .../game/clientbound_block_changed_ack_packet.rs | 7 ++ .../src/packets/game/clientbound_chat_packet.rs | 17 ---- .../game/clientbound_chat_preview_packet.rs | 8 ++ .../packets/game/clientbound_player_chat_packet.rs | 21 +++++ .../packets/game/clientbound_server_data_packet.rs | 9 ++ .../game/clientbound_set_chunk_cache_center.rs | 9 -- .../clientbound_set_chunk_cache_center_packet.rs | 9 ++ .../clientbound_set_display_chat_preview_packet.rs | 6 ++ .../packets/game/clientbound_system_chat_packet.rs | 9 ++ azalea-protocol/src/packets/game/mod.rs | 102 ++++++++++++--------- .../game/serverbound_chat_command_packet.rs | 18 ++++ .../game/serverbound_chat_preview_packet.rs | 7 ++ .../src/packets/login/serverbound_hello_packet.rs | 15 ++- azalea-protocol/src/packets/mod.rs | 2 +- bot/src/main.rs | 16 ++-- codegen/migrate.py | 5 + 23 files changed, 231 insertions(+), 139 deletions(-) create mode 100644 azalea-crypto/src/signing.rs delete mode 100644 azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs delete mode 100644 azalea-protocol/src/packets/game/clientbound_chat_packet.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_server_data_packet.rs delete mode 100644 azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center_packet.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs create mode 100644 azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs create mode 100644 azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs create mode 100644 azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs (limited to 'codegen/migrate.py') diff --git a/README.md b/README.md index d3ebdf51..2ce2f26e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A Rust crate for creating Minecraft bots.

-*Currently supported Minecraft version: `1.18.2`.* +*Currently supported Minecraft version: `1.19-pre3`.* I named this Azalea because it sounds like a cool word and this is a cool library. This project was heavily inspired by PrismarineJS. diff --git a/azalea-client/src/connect.rs b/azalea-client/src/connect.rs index b8b6e372..a0001804 100755 --- a/azalea-client/src/connect.rs +++ b/azalea-client/src/connect.rs @@ -4,7 +4,8 @@ use azalea_protocol::{ connect::{GameConnection, HandshakeConnection}, packets::{ game::{ - clientbound_chat_packet::ClientboundChatPacket, + clientbound_player_chat_packet::ClientboundPlayerChatPacket, + clientbound_system_chat_packet::ClientboundSystemChatPacket, serverbound_custom_payload_packet::ServerboundCustomPayloadPacket, serverbound_keep_alive_packet::ServerboundKeepAlivePacket, GamePacket, }, @@ -43,10 +44,25 @@ pub struct Client { // game_loop } +#[derive(Debug, Clone)] +pub enum ChatPacket { + System(ClientboundSystemChatPacket), + Player(ClientboundPlayerChatPacket), +} + +// impl ChatPacket { +// pub fn message(&self) -> &str { +// match self { +// ChatPacket::System(p) => &p.content, +// ChatPacket::Player(p) => &p.message, +// } +// } +// } + #[derive(Debug, Clone)] pub enum Event { Login, - Chat(ClientboundChatPacket), + Chat(ChatPacket), } /// Whether we should ignore errors when decoding packets. @@ -75,6 +91,7 @@ impl Client { conn.write( ServerboundHelloPacket { username: account.username.clone(), + public_key: None, } .get(), ) @@ -290,9 +307,6 @@ impl Client { GamePacket::ClientboundLightUpdatePacket(p) => { println!("Got light update packet {:?}", p); } - GamePacket::ClientboundAddMobPacket(p) => { - println!("Got add mob packet {:?}", p); - } GamePacket::ClientboundAddEntityPacket(p) => { println!("Got add entity packet {:?}", p); } @@ -357,9 +371,13 @@ impl Client { GamePacket::ClientboundRemoveEntitiesPacket(p) => { println!("Got remove entities packet {:?}", p); } - GamePacket::ClientboundChatPacket(p) => { - println!("Got chat packet {:?}", p); - tx.send(Event::Chat(p.clone())).unwrap(); + GamePacket::ClientboundPlayerChatPacket(p) => { + println!("Got player chat packet {:?}", p); + tx.send(Event::Chat(ChatPacket::Player(p.clone()))).unwrap(); + } + GamePacket::ClientboundSystemChatPacket(p) => { + println!("Got system chat packet {:?}", p); + tx.send(Event::Chat(ChatPacket::System(p.clone()))).unwrap(); } GamePacket::ClientboundSoundPacket(p) => { println!("Got sound packet {:?}", p); diff --git a/azalea-crypto/src/lib.rs b/azalea-crypto/src/lib.rs index c233b231..a5e797e8 100644 --- a/azalea-crypto/src/lib.rs +++ b/azalea-crypto/src/lib.rs @@ -1,3 +1,5 @@ +mod signing; + use aes::cipher::inout::InOutBuf; use aes::{ cipher::{BlockDecryptMut, BlockEncryptMut, KeyIvInit}, @@ -5,6 +7,7 @@ use aes::{ }; use rand::{rngs::OsRng, RngCore}; use sha1::{Digest, Sha1}; +pub use signing::SaltSignaturePair; fn generate_secret_key() -> [u8; 16] { let mut key = [0u8; 16]; @@ -65,7 +68,6 @@ pub fn create_cipher(key: &[u8]) -> (Aes128CfbEnc, Aes128CfbDec) { ) } -// wow this is terrible pub fn encrypt_packet(cipher: &mut Aes128CfbEnc, packet: &mut [u8]) { let (chunks, rest) = InOutBuf::from(packet).into_chunks(); assert!(rest.is_empty()); diff --git a/azalea-crypto/src/signing.rs b/azalea-crypto/src/signing.rs new file mode 100644 index 00000000..21cd813a --- /dev/null +++ b/azalea-crypto/src/signing.rs @@ -0,0 +1,5 @@ +#[derive(Debug, Clone)] +pub struct SaltSignaturePair { + pub salt: u64, + pub signature: Vec, +} diff --git a/azalea-protocol/src/mc_buf/read.rs b/azalea-protocol/src/mc_buf/read.rs index 1c4fbd6f..350c0998 100644 --- a/azalea-protocol/src/mc_buf/read.rs +++ b/azalea-protocol/src/mc_buf/read.rs @@ -4,6 +4,7 @@ use azalea_core::{ difficulty::Difficulty, game_type::GameType, resource_location::ResourceLocation, serializable_uuid::SerializableUuid, BlockPos, ChunkSectionPos, Direction, Slot, SlotData, }; +use azalea_crypto::SaltSignaturePair; use byteorder::{ReadBytesExt, BE}; use serde::Deserialize; use std::{collections::HashMap, hash::Hash, io::Read}; @@ -311,56 +312,48 @@ impl McBufReadable for Vec { } } -// string impl McBufReadable for String { fn read_into(buf: &mut impl Read) -> Result { buf.read_utf() } } -// ResourceLocation impl McBufReadable for ResourceLocation { fn read_into(buf: &mut impl Read) -> Result { buf.read_resource_location() } } -// u32 impl McBufReadable for u32 { fn read_into(buf: &mut impl Read) -> Result { Readable::read_int(buf).map(|i| i as u32) } } -// u32 varint impl McBufVarReadable for u32 { fn var_read_into(buf: &mut impl Read) -> Result { buf.read_varint().map(|i| i as u32) } } -// u16 impl McBufReadable for u16 { fn read_into(buf: &mut impl Read) -> Result { buf.read_short().map(|i| i as u16) } } -// i16 impl McBufReadable for i16 { fn read_into(buf: &mut impl Read) -> Result { buf.read_short() } } -// u16 varint impl McBufVarReadable for u16 { fn var_read_into(buf: &mut impl Read) -> Result { buf.read_varint().map(|i| i as u16) } } -// Vec varint impl McBufVarReadable for Vec { fn var_read_into(buf: &mut impl Read) -> Result { let length = buf.read_varint()? as usize; @@ -372,70 +365,60 @@ impl McBufVarReadable for Vec { } } -// i64 impl McBufReadable for i64 { fn read_into(buf: &mut impl Read) -> Result { buf.read_long() } } -// u64 impl McBufReadable for u64 { fn read_into(buf: &mut impl Read) -> Result { i64::read_into(buf).map(|i| i as u64) } } -// bool impl McBufReadable for bool { fn read_into(buf: &mut impl Read) -> Result { buf.read_boolean() } } -// u8 impl McBufReadable for u8 { fn read_into(buf: &mut impl Read) -> Result { buf.read_byte() } } -// i8 impl McBufReadable for i8 { fn read_into(buf: &mut impl Read) -> Result { buf.read_byte().map(|i| i as i8) } } -// f32 impl McBufReadable for f32 { fn read_into(buf: &mut impl Read) -> Result { buf.read_float() } } -// f64 impl McBufReadable for f64 { fn read_into(buf: &mut impl Read) -> Result { buf.read_double() } } -// GameType impl McBufReadable for GameType { fn read_into(buf: &mut impl Read) -> Result { GameType::from_id(buf.read_byte()?) } } -// Option impl McBufReadable for Option { fn read_into(buf: &mut impl Read) -> Result { GameType::from_optional_id(buf.read_byte()? as i8) } } -// Option impl McBufReadable for Option { default fn read_into(buf: &mut impl Read) -> Result { let present = buf.read_boolean()?; @@ -447,21 +430,18 @@ impl McBufReadable for Option { } } -// azalea_nbt::Tag impl McBufReadable for azalea_nbt::Tag { fn read_into(buf: &mut impl Read) -> Result { buf.read_nbt() } } -// Difficulty impl McBufReadable for Difficulty { fn read_into(buf: &mut impl Read) -> Result { Ok(Difficulty::by_id(u8::read_into(buf)?)) } } -// Component impl McBufReadable for Component { fn read_into(buf: &mut impl Read) -> Result { let string = buf.read_utf()?; @@ -472,7 +452,6 @@ impl McBufReadable for Component { } } -// Slot impl McBufReadable for Slot { fn read_into(buf: &mut impl Read) -> Result { let present = buf.read_boolean()?; @@ -486,14 +465,12 @@ impl McBufReadable for Slot { } } -// Uuid impl McBufReadable for Uuid { fn read_into(buf: &mut impl Read) -> Result { buf.read_uuid() } } -// BlockPos impl McBufReadable for BlockPos { fn read_into(buf: &mut impl Read) -> Result { let val = u64::read_into(buf)?; @@ -504,7 +481,6 @@ impl McBufReadable for BlockPos { } } -// Direction impl McBufReadable for Direction { fn read_into(buf: &mut impl Read) -> Result { match buf.read_varint()? { @@ -519,7 +495,6 @@ impl McBufReadable for Direction { } } -// ChunkSectionPos impl McBufReadable for ChunkSectionPos { fn read_into(buf: &mut impl Read) -> Result { let long = i64::read_into(buf)?; @@ -530,3 +505,11 @@ impl McBufReadable for ChunkSectionPos { }) } } + +impl McBufReadable for SaltSignaturePair { + fn read_into(buf: &mut impl Read) -> Result { + let salt = u64::read_into(buf)?; + let signature = Vec::::read_into(buf)?; + Ok(SaltSignaturePair { salt, signature }) + } +} diff --git a/azalea-protocol/src/mc_buf/write.rs b/azalea-protocol/src/mc_buf/write.rs index c46297a6..95c39bd2 100644 --- a/azalea-protocol/src/mc_buf/write.rs +++ b/azalea-protocol/src/mc_buf/write.rs @@ -4,6 +4,7 @@ use azalea_core::{ difficulty::Difficulty, game_type::GameType, resource_location::ResourceLocation, serializable_uuid::SerializableUuid, BlockPos, ChunkSectionPos, Direction, Slot, }; +use azalea_crypto::SaltSignaturePair; use byteorder::{BigEndian, WriteBytesExt}; use std::{collections::HashMap, io::Write}; use uuid::Uuid; @@ -436,3 +437,11 @@ impl McBufWritable for ChunkSectionPos { Ok(()) } } + +impl McBufWritable for SaltSignaturePair { + fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { + self.salt.write_into(buf)?; + self.signature.write_into(buf)?; + Ok(()) + } +} diff --git a/azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs b/azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs deleted file mode 100644 index bc0ddcef..00000000 --- a/azalea-protocol/src/packets/game/clientbound_add_mob_packet.rs +++ /dev/null @@ -1,21 +0,0 @@ -use packet_macros::{GamePacket, McBuf}; -use uuid::Uuid; - -#[derive(Clone, Debug, McBuf, GamePacket)] -pub struct ClientboundAddMobPacket { - #[var] - pub id: i32, - pub uuid: Uuid, - // TODO: have an entity type struct - #[var] - pub entity_type: i32, - pub x: f64, - pub y: f64, - pub z: f64, - pub x_rot: i8, - pub y_rot: i8, - pub y_head_rot: i8, - pub x_vel: u16, - pub y_vel: u16, - pub z_vel: u16, -} diff --git a/azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs b/azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs new file mode 100644 index 00000000..a580440c --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_block_changed_ack_packet.rs @@ -0,0 +1,7 @@ +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundBlockChangedAckPacket { + #[var] + pub sequence: i32, +} diff --git a/azalea-protocol/src/packets/game/clientbound_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_chat_packet.rs deleted file mode 100644 index 77c5370c..00000000 --- a/azalea-protocol/src/packets/game/clientbound_chat_packet.rs +++ /dev/null @@ -1,17 +0,0 @@ -use azalea_chat::component::Component; -use packet_macros::{GamePacket, McBuf}; -use uuid::Uuid; - -#[derive(Clone, Debug, McBuf, GamePacket)] -pub struct ClientboundChatPacket { - pub message: Component, - pub type_: ChatType, - pub sender: Uuid, -} - -#[derive(Clone, Debug, Copy, McBuf)] -pub enum ChatType { - Chat = 0, - System = 1, - GameInfo = 2, -} diff --git a/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs b/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs new file mode 100644 index 00000000..58dd0722 --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_chat_preview_packet.rs @@ -0,0 +1,8 @@ +use azalea_chat::component::Component; +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundChatPreviewPacket { + pub query_id: i32, + pub preview: Option, +} diff --git a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs new file mode 100644 index 00000000..e6941f25 --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs @@ -0,0 +1,21 @@ +use azalea_chat::component::Component; +use azalea_crypto::SaltSignaturePair; +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundPlayerChatPacket { + pub signed_content: Component, + pub unsigned_content: Option, + #[var] + pub type_id: i32, + pub sender: ChatSender, + pub timestamp: u64, + pub salt_signature: SaltSignaturePair, +} + +#[derive(Clone, Debug, McBuf)] +pub struct ChatSender { + pub uuid: uuid::Uuid, + pub name: Component, + pub team_name: Option, +} diff --git a/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs b/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs new file mode 100644 index 00000000..4c2d94e6 --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_server_data_packet.rs @@ -0,0 +1,9 @@ +use azalea_chat::component::Component; +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundServerDataPacket { + pub motd: Option, + pub icon_base64: Option, + pub previews_chat: bool, +} diff --git a/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center.rs b/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center.rs deleted file mode 100644 index 7557c16b..00000000 --- a/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center.rs +++ /dev/null @@ -1,9 +0,0 @@ -use packet_macros::{GamePacket, McBuf}; - -#[derive(Clone, Debug, McBuf, GamePacket)] -pub struct ClientboundSetChunkCacheCenterPacket { - #[var] - pub x: i32, - #[var] - pub z: i32, -} diff --git a/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center_packet.rs new file mode 100644 index 00000000..7557c16b --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_set_chunk_cache_center_packet.rs @@ -0,0 +1,9 @@ +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundSetChunkCacheCenterPacket { + #[var] + pub x: i32, + #[var] + pub z: i32, +} diff --git a/azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs new file mode 100644 index 00000000..46a0d582 --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_set_display_chat_preview_packet.rs @@ -0,0 +1,6 @@ +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundSetDisplayChatPreviewPacket { + pub enabled: bool, +} diff --git a/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs new file mode 100644 index 00000000..dfa75a5b --- /dev/null +++ b/azalea-protocol/src/packets/game/clientbound_system_chat_packet.rs @@ -0,0 +1,9 @@ +use azalea_chat::component::Component; +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ClientboundSystemChatPacket { + pub content: Component, + #[var] + pub type_id: i32, +} diff --git a/azalea-protocol/src/packets/game/mod.rs b/azalea-protocol/src/packets/game/mod.rs index 7372435a..eee36788 100755 --- a/azalea-protocol/src/packets/game/mod.rs +++ b/azalea-protocol/src/packets/game/mod.rs @@ -1,10 +1,10 @@ pub mod clientbound_add_entity_packet; -pub mod clientbound_add_mob_packet; pub mod clientbound_add_player_packet; pub mod clientbound_animate_packet; +pub mod clientbound_block_changed_ack_packet; pub mod clientbound_block_update_packet; pub mod clientbound_change_difficulty_packet; -pub mod clientbound_chat_packet; +pub mod clientbound_chat_preview_packet; pub mod clientbound_container_set_content_packet; pub mod clientbound_custom_payload_packet; pub mod clientbound_declare_commands_packet; @@ -23,27 +23,33 @@ pub mod clientbound_move_entity_pos_packet; pub mod clientbound_move_entity_posrot_packet; pub mod clientbound_move_entity_rot_packet; pub mod clientbound_player_abilities_packet; +pub mod clientbound_player_chat_packet; pub mod clientbound_player_info_packet; pub mod clientbound_player_position_packet; pub mod clientbound_recipe_packet; pub mod clientbound_remove_entities_packet; pub mod clientbound_rotate_head_packet; pub mod clientbound_section_blocks_update_packet; +pub mod clientbound_server_data_packet; pub mod clientbound_set_carried_item_packet; -pub mod clientbound_set_chunk_cache_center; +pub mod clientbound_set_chunk_cache_center_packet; pub mod clientbound_set_default_spawn_position_packet; +pub mod clientbound_set_display_chat_preview_packet; pub mod clientbound_set_entity_data_packet; pub mod clientbound_set_entity_link_packet; pub mod clientbound_set_experience_packet; pub mod clientbound_set_health_packet; pub mod clientbound_set_time_packet; pub mod clientbound_sound_packet; +pub mod clientbound_system_chat_packet; pub mod clientbound_teleport_entity_packet; pub mod clientbound_update_advancements_packet; pub mod clientbound_update_attributes_packet; pub mod clientbound_update_recipes_packet; pub mod clientbound_update_tags_packet; pub mod clientbound_update_view_distance_packet; +pub mod serverbound_chat_command_packet; +pub mod serverbound_chat_preview_packet; pub mod serverbound_custom_payload_packet; pub mod serverbound_keep_alive_packet; @@ -52,55 +58,61 @@ use packet_macros::declare_state_packets; declare_state_packets!( GamePacket, Serverbound => { - 0x0a: serverbound_custom_payload_packet::ServerboundCustomPayloadPacket, - 0x0f: serverbound_keep_alive_packet::ServerboundKeepAlivePacket, + 0x03: serverbound_chat_command_packet::ServerboundChatCommandPacket, + 0x05: serverbound_chat_preview_packet::ServerboundChatPreviewPacket, + 0x0c: serverbound_custom_payload_packet::ServerboundCustomPayloadPacket, + 0x11: serverbound_keep_alive_packet::ServerboundKeepAlivePacket, }, Clientbound => { 0x00: clientbound_add_entity_packet::ClientboundAddEntityPacket, - 0x02: clientbound_add_mob_packet::ClientboundAddMobPacket, - 0x04: clientbound_add_player_packet::ClientboundAddPlayerPacket, - 0x06: clientbound_animate_packet::ClientboundAnimatePacket, - 0x0c: clientbound_block_update_packet::ClientboundBlockUpdatePacket, - 0x0e: clientbound_change_difficulty_packet::ClientboundChangeDifficultyPacket, - 0x0f: clientbound_chat_packet::ClientboundChatPacket, - 0x12: clientbound_declare_commands_packet::ClientboundDeclareCommandsPacket, - 0x14: clientbound_container_set_content_packet::ClientboundContainerSetContentPacket, - 0x1a: clientbound_disconnect_packet::ClientboundDisconnectPacket, - 0x1b: clientbound_entity_event_packet::ClientboundEntityEventPacket, - 0x18: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket, - 0x1e: clientbound_game_event_packet::ClientboundGameEventPacket, - 0x20: clientbound_initialize_border_packet::ClientboundInitializeBorderPacket, - 0x21: clientbound_keep_alive_packet::ClientboundKeepAlivePacket, - 0x22: clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket, - 0x23: clientbound_level_event_packet::ClientboundLevelEventPacket, - 0x24: clientbound_level_particles_packet::ClientboundLevelParticlesPacket, - 0x25: clientbound_light_update_packet::ClientboundLightUpdatePacket, - 0x26: clientbound_login_packet::ClientboundLoginPacket, - 0x29: clientbound_move_entity_pos_packet::ClientboundMoveEntityPosPacket, - 0x2a: clientbound_move_entity_posrot_packet::ClientboundMoveEntityPosRotPacket, - 0x2b: clientbound_move_entity_rot_packet::ClientboundMoveEntityRotPacket, - 0x32: clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket, - 0x36: clientbound_player_info_packet::ClientboundPlayerInfoPacket, - 0x38: clientbound_player_position_packet::ClientboundPlayerPositionPacket, - 0x39: clientbound_recipe_packet::ClientboundRecipePacket, - 0x3a: clientbound_remove_entities_packet::ClientboundRemoveEntitiesPacket, - 0x3e: clientbound_rotate_head_packet::ClientboundRotateHeadPacket, - 0x3f: clientbound_section_blocks_update_packet::ClientboundSectionBlocksUpdatePacket, - 0x48: clientbound_set_carried_item_packet::ClientboundSetCarriedItemPacket, - 0x49: clientbound_set_chunk_cache_center::ClientboundSetChunkCacheCenterPacket, - 0x4a: clientbound_update_view_distance_packet::ClientboundUpdateViewDistancePacket, - 0x4b: clientbound_set_default_spawn_position_packet::ClientboundSetDefaultSpawnPositionPacket, + 0x02: clientbound_add_player_packet::ClientboundAddPlayerPacket, + 0x03: clientbound_animate_packet::ClientboundAnimatePacket, + 0x05: clientbound_block_changed_ack_packet::ClientboundBlockChangedAckPacket, + 0x09: clientbound_block_update_packet::ClientboundBlockUpdatePacket, + 0x0b: clientbound_change_difficulty_packet::ClientboundChangeDifficultyPacket, + 0x0c: clientbound_chat_preview_packet::ClientboundChatPreviewPacket, + 0x0f: clientbound_declare_commands_packet::ClientboundDeclareCommandsPacket, + 0x11: clientbound_container_set_content_packet::ClientboundContainerSetContentPacket, + 0x15: clientbound_custom_payload_packet::ClientboundCustomPayloadPacket, + 0x17: clientbound_disconnect_packet::ClientboundDisconnectPacket, + 0x18: clientbound_entity_event_packet::ClientboundEntityEventPacket, + 0x1b: clientbound_game_event_packet::ClientboundGameEventPacket, + 0x1d: clientbound_initialize_border_packet::ClientboundInitializeBorderPacket, + 0x1e: clientbound_keep_alive_packet::ClientboundKeepAlivePacket, + 0x1f: clientbound_level_chunk_with_light_packet::ClientboundLevelChunkWithLightPacket, + 0x20: clientbound_level_event_packet::ClientboundLevelEventPacket, + 0x21: clientbound_level_particles_packet::ClientboundLevelParticlesPacket, + 0x22: clientbound_light_update_packet::ClientboundLightUpdatePacket, + 0x23: clientbound_login_packet::ClientboundLoginPacket, + 0x26: clientbound_move_entity_pos_packet::ClientboundMoveEntityPosPacket, + 0x27: clientbound_move_entity_posrot_packet::ClientboundMoveEntityPosRotPacket, + 0x28: clientbound_move_entity_rot_packet::ClientboundMoveEntityRotPacket, + 0x2f: clientbound_player_abilities_packet::ClientboundPlayerAbilitiesPacket, + 0x30: clientbound_player_chat_packet::ClientboundPlayerChatPacket, + 0x34: clientbound_player_info_packet::ClientboundPlayerInfoPacket, + 0x36: clientbound_player_position_packet::ClientboundPlayerPositionPacket, + 0x37: clientbound_recipe_packet::ClientboundRecipePacket, + 0x38: clientbound_remove_entities_packet::ClientboundRemoveEntitiesPacket, + 0x3c: clientbound_rotate_head_packet::ClientboundRotateHeadPacket, + 0x3d: clientbound_section_blocks_update_packet::ClientboundSectionBlocksUpdatePacket, + 0x3f: clientbound_server_data_packet::ClientboundServerDataPacket, + 0x44: clientbound_set_entity_link_packet::ClientboundSetEntityLinkPacket, + 0x47: clientbound_set_carried_item_packet::ClientboundSetCarriedItemPacket, + 0x48: clientbound_set_chunk_cache_center_packet::ClientboundSetChunkCacheCenterPacket, + 0x49: clientbound_update_view_distance_packet::ClientboundUpdateViewDistancePacket, + 0x4a: clientbound_set_default_spawn_position_packet::ClientboundSetDefaultSpawnPositionPacket, + 0x4b: clientbound_set_display_chat_preview_packet::ClientboundSetDisplayChatPreviewPacket, 0x4d: clientbound_set_entity_data_packet::ClientboundSetEntityDataPacket, - 0x45: clientbound_set_entity_link_packet::ClientboundSetEntityLinkPacket, 0x4f: clientbound_entity_velocity_packet::ClientboundEntityVelocityPacket, 0x51: clientbound_set_experience_packet::ClientboundSetExperiencePacket, 0x52: clientbound_set_health_packet::ClientboundSetHealthPacket, 0x59: clientbound_set_time_packet::ClientboundSetTimePacket, 0x5d: clientbound_sound_packet::ClientboundSoundPacket, - 0x62: clientbound_teleport_entity_packet::ClientboundTeleportEntityPacket, - 0x63: clientbound_update_advancements_packet::ClientboundUpdateAdvancementsPacket, - 0x64: clientbound_update_attributes_packet::ClientboundUpdateAttributesPacket, - 0x66: clientbound_update_recipes_packet::ClientboundUpdateRecipesPacket, - 0x67: clientbound_update_tags_packet::ClientboundUpdateTagsPacket, + 0x5f: clientbound_system_chat_packet::ClientboundSystemChatPacket, + 0x63: clientbound_teleport_entity_packet::ClientboundTeleportEntityPacket, + 0x64: clientbound_update_advancements_packet::ClientboundUpdateAdvancementsPacket, + 0x65: clientbound_update_attributes_packet::ClientboundUpdateAttributesPacket, + 0x67: clientbound_update_recipes_packet::ClientboundUpdateRecipesPacket, + 0x68: clientbound_update_tags_packet::ClientboundUpdateTagsPacket, } -); \ No newline at end of file +); diff --git a/azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs b/azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs new file mode 100644 index 00000000..9ae0b79f --- /dev/null +++ b/azalea-protocol/src/packets/game/serverbound_chat_command_packet.rs @@ -0,0 +1,18 @@ +use std::collections::HashMap; + +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ServerboundChatCommandPacket { + pub command: String, + // TODO: Choose a real timestamp type + pub timestamp: u64, + pub argument_signatures: ArgumentSignatures, + pub signed_preview: bool, +} + +#[derive(Clone, Debug, McBuf)] +pub struct ArgumentSignatures { + pub salt: u64, + pub signatures: HashMap>, +} diff --git a/azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs b/azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs new file mode 100644 index 00000000..60535f69 --- /dev/null +++ b/azalea-protocol/src/packets/game/serverbound_chat_preview_packet.rs @@ -0,0 +1,7 @@ +use packet_macros::{GamePacket, McBuf}; + +#[derive(Clone, Debug, McBuf, GamePacket)] +pub struct ServerboundChatPreviewPacket { + pub query_id: i32, + pub query: String, +} diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs index 5cb660ed..46fb665e 100755 --- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs +++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs @@ -1,7 +1,18 @@ use packet_macros::{LoginPacket, McBuf}; -use std::hash::Hash; -#[derive(Hash, Clone, Debug, McBuf, LoginPacket)] +#[derive(Clone, Debug, McBuf, LoginPacket)] pub struct ServerboundHelloPacket { pub username: String, + pub public_key: Option, +} + +pub struct ProfilePublicKey { + pub data: ProfilePublicKeyData, +} + +#[derive(Clone, Debug, McBuf)] +pub struct ProfilePublicKeyData { + pub expires_at: u64, + pub key: Vec, + pub key_signature: Vec, } diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 16e97068..a06dc940 100755 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -12,7 +12,7 @@ use crate::{ use num_derive::FromPrimitive; use num_traits::FromPrimitive; -pub const PROTOCOL_VERSION: u32 = 758; +pub const PROTOCOL_VERSION: u32 = 1073741911; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, FromPrimitive)] pub enum ConnectionProtocol { diff --git a/bot/src/main.rs b/bot/src/main.rs index 76a5a15d..8ad74ec4 100644 --- a/bot/src/main.rs +++ b/bot/src/main.rs @@ -6,7 +6,7 @@ async fn main() { println!("Hello, world!"); // let address = "95.111.249.143:10000"; - let address = "192.168.2.234:50736"; + let address = "localhost:65519"; // let response = azalea_client::ping::ping_server(&address.try_into().unwrap()) // .await // .unwrap(); @@ -21,13 +21,13 @@ async fn main() { // TODO: have a "loaded" or "ready" event that fires when all chunks are loaded Event::Login => {} Event::Chat(p) => { - println!("{}", p.message.to_ansi(None)); - if p.message.to_ansi(None) == " ok" { - let state = client.state.lock().await; - let world = state.world.as_ref().unwrap(); - let c = world.get_block_state(&BlockPos::new(5, 78, -2)).unwrap(); - println!("block state: {:?}", c); - } + // println!("{}", p.message.to_ansi(None)); + // if p.message.to_ansi(None) == " ok" { + // let state = client.state.lock().await; + // let world = state.world.as_ref().unwrap(); + // let c = world.get_block_state(&BlockPos::new(5, 78, -2)).unwrap(); + // println!("block state: {:?}", c); + // } } } } diff --git a/codegen/migrate.py b/codegen/migrate.py index 392af9fe..98b701bf 100644 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -72,6 +72,11 @@ for packet, packet_name in new_packets.items(): for packet in added_packets: lib.code.packet.generate_packet( new_burger_data[0]['packets']['packet'], new_mappings, packet.packet_id, packet.direction, packet.state) + +lib.code.version.set_protocol_version( + new_burger_data[0]['version']['protocol']) +lib.code.version.set_version_id(new_version_id) + lib.code.utils.fmt() print('Done!') -- cgit v1.2.3