Merge branch 'main' into 1.19.1

1 files changed, 12 insertions, 7 deletions

diff --git a/codegen/newpacket.py b/codegen/newpacket.py
index 2e4c77d7..48d97640 100644
--- a/codegen/newpacket.py
+++ b/codegen/newpacket.py
@@ -1,17 +1,22 @@
-from lib import download, code  # type: ignore
+import lib.code.version
+import lib.code.packet
+import lib.code.utils
+import lib.download
+import lib.extract
 import sys
-import os
 
-mappings = download.get_mappings_for_version('1.18.2')
-burger_data = download.get_burger_data_for_version('1.18.2')
+version_id = lib.code.version.get_version_id()
+
+mappings = lib.download.get_mappings_for_version(version_id)
+burger_data = lib.extract.get_burger_data_for_version(version_id)
 
 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_packet(burger_packets_data, mappings,
-                                   packet_id, direction, state)
+lib.code.packet.generate_packet(burger_packets_data, mappings,
+                                packet_id, direction, state)
 
-code.fmt()
+lib.code.utils.fmt()
 
 print('Done!')