codegen/extract.py

Preparation for azalea-block

4 files changed, 53 insertions, 19 deletions

diff --git a/codegen/lib/download.py b/codegen/lib/download.py
index 0d6668bd..e05d9a93 100644
--- a/codegen/lib/download.py
+++ b/codegen/lib/download.py
@@ -63,16 +63,13 @@ def get_client_jar(version_id: str):
             f.write(requests.get(client_jar_url).content)
 
 
-def get_burger_data_for_version(version_id: str):
-    if not os.path.exists(get_dir_location(f'downloads/burger-{version_id}.json')):
-        get_burger()
-        get_client_jar(version_id)
-
-        os.system(
-            f'cd {get_dir_location("downloads/Burger")} && python munch.py ../client-{version_id}.jar --output ../burger-{version_id}.json'
-        )
-    with open(get_dir_location(f'downloads/burger-{version_id}.json'), 'r') as f:
-        return json.load(f)
+def get_server_jar(version_id: str):
+    if not os.path.exists(get_dir_location(f'downloads/server-{version_id}.jar')):
+        package_data = get_version_data(version_id)
+        print('\033[92mDownloading server jar...\033[m')
+        server_jar_url = package_data['downloads']['server']['url']
+        with open(get_dir_location(f'downloads/server-{version_id}.jar'), 'wb') as f:
+            f.write(requests.get(server_jar_url).content)
 
 
 def get_mappings_for_version(version_id: str):
diff --git a/codegen/lib/extract.py b/codegen/lib/extract.py
new file mode 100644
index 00000000..82ae257d
--- /dev/null
+++ b/codegen/lib/extract.py
@@ -0,0 +1,34 @@
+# Extracting data from the Minecraft jars
+
+from lib.download import get_server_jar, get_burger, get_client_jar
+from lib.utils import get_dir_location
+import json
+import os
+
+
+def generate_data_from_server_jar(version_id: str):
+    if os.path.exists(get_dir_location(f'downloads/generated-{version_id}')):
+        return
+
+    get_server_jar(version_id)
+    os.system(
+        f'java -jar {get_dir_location(f"downloads/server-{version_id}.jar")} --all --output {get_dir_location(f"downloads/generated-{version_id}")}'
+    )
+
+
+def get_block_states(version_id: str):
+    generate_data_from_server_jar(version_id)
+    with open(get_dir_location(f'downloads/generated-{version_id}/reports/blocks.json'), 'r') as f:
+        return json.load(f)
+
+
+def get_burger_data_for_version(version_id: str):
+    if not os.path.exists(get_dir_location(f'downloads/burger-{version_id}.json')):
+        get_burger()
+        get_client_jar(version_id)
+
+        os.system(
+            f'cd {get_dir_location("downloads/Burger")} && python munch.py ../client-{version_id}.jar --output ../burger-{version_id}.json'
+        )
+    with open(get_dir_location(f'downloads/burger-{version_id}.json'), 'r') as f:
+        return json.load(f)
diff --git a/codegen/migrate.py b/codegen/migrate.py
index 98b701bf..cdffb2de 100644
--- a/codegen/migrate.py
+++ b/codegen/migrate.py
@@ -4,17 +4,18 @@ import lib.code.utils
 import lib.code.version
 import lib.code.packet
 import lib.download
+import lib.extract
 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_burger_data = lib.extract.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_burger_data = lib.extract.get_burger_data_for_version(new_version_id)
 new_packet_list = list(new_burger_data[0]['packets']['packet'].values())
 
 
diff --git a/codegen/newpacket.py b/codegen/newpacket.py
index 2e4c77d7..52d6a2b4 100644
--- a/codegen/newpacket.py
+++ b/codegen/newpacket.py
@@ -1,17 +1,19 @@
-from lib import download, code  # type: ignore
+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')
+mappings = lib.download.get_mappings_for_version('1.18.2')
+burger_data = lib.extract.get_burger_data_for_version('1.18.2')
 
 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!')