From 08958c2278b15ebeac8a964f392ebb792e479b61 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Wed, 27 Nov 2024 19:31:40 -0600
Subject: Refactor azalea-protocol (#190)

* start updating to 1.21.4

* fix block codegen and stop using block data from burger

* rename packet related modules and structs to be simpler

* ItemSlot -> ItemStack for more consistency with mojmap

* .get() -> .into_packet()

* simplify declare_state_packets by removing packet ids

* rename read_from and write_into to azalea_read and azalea_write

* rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite

* McBuf -> AzBuf

* remove most uses of into_variant

* update codegen and use resourcelocation names for packets

* implement #[limit(i)] attribute for AzBuf derive macro

* fixes for 1.21.4

* fix examples

* update some physics code and fix ChatType

* remove unused imports in codegen

* re-add some things to migrate.py and update +mc version numbers automatically

* downgrade to 1.21.3 lol
---
 codegen/lib/extract.py | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

(limited to 'codegen/lib/extract.py')

diff --git a/codegen/lib/extract.py b/codegen/lib/extract.py
index da69b753..4119ad55 100755
--- a/codegen/lib/extract.py
+++ b/codegen/lib/extract.py
@@ -1,7 +1,7 @@
 # Extracting data from the Minecraft jars
 
 from typing import TYPE_CHECKING
-from lib.download import get_mappings_for_version, get_server_jar, get_burger, get_client_jar, get_pixlyzer, get_yarn_data, get_fabric_api_versions, get_fabric_loader_versions
+from lib.download import get_server_jar, get_burger, get_client_jar, get_pixlyzer, get_yarn_data, get_fabric_api_versions, get_fabric_loader_versions
 from lib.utils import get_dir_location, to_camel_case, upper_first_letter
 from zipfile import ZipFile
 import subprocess
@@ -23,17 +23,16 @@ def generate_data_from_server_jar(version_id: str):
 
 
 def get_block_states_report(version_id: str):
-    generate_data_from_server_jar(version_id)
-    with open(get_dir_location(f'__cache__/generated-{version_id}/reports/blocks.json'), 'r') as f:
-        return json.load(f)
-
-
+    return get_report(version_id, 'blocks')
 def get_registries_report(version_id: str):
+    return get_report(version_id, 'registries')
+def get_packets_report(version_id: str):
+    return get_report(version_id, 'packets')
+def get_report(version_id: str, name: str):
     generate_data_from_server_jar(version_id)
-    with open(get_dir_location(f'__cache__/generated-{version_id}/reports/registries.json'), 'r') as f:
+    with open(get_dir_location(f'__cache__/generated-{version_id}/reports/{name}.json'), 'r') as f:
         return json.load(f)
 
-
 def get_registry_tags(version_id: str, name: str):
     generate_data_from_server_jar(version_id)
     tags_directory = get_dir_location(f'__cache__/generated-{version_id}/data/minecraft/tags/{name}')
@@ -50,17 +49,6 @@ def get_registry_tags(version_id: str, name: str):
                 tags[relative_path[:-5]] = json.load(f)
     return tags
 
-
-def get_block_states_burger(version_id: str):
-    burger_data = get_burger_data_for_version(version_id)
-    return burger_data[0]['blocks']['block']
-
-
-def get_ordered_blocks_burger(version_id: str):
-    burger_data = get_burger_data_for_version(version_id)
-    return burger_data[0]['blocks']['ordered_blocks']
-
-
 python_command = None
 
 
-- 
cgit v1.2.3