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/genblocks.py | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

(limited to 'codegen/genblocks.py')

diff --git a/codegen/genblocks.py b/codegen/genblocks.py
index 1af0ad10..1024072a 100755
--- a/codegen/genblocks.py
+++ b/codegen/genblocks.py
@@ -7,25 +7,27 @@ import lib.download
 import lib.extract
 import lib.utils
 
-version_id = lib.code.version.get_version_id()
+def generate(version_id):
+    # TODO: pixlyzer is broken so we use old data
+    shape_datas = lib.extract.get_pixlyzer_data(
+        '1.20.3-pre4', 'shapes')
+    pixlyzer_block_datas = lib.extract.get_pixlyzer_data(
+        '1.20.3-pre4', 'blocks')
 
-# TODO: pixlyzer is broken so we use old data
-shape_datas = lib.extract.get_pixlyzer_data(
-    '1.20.3-pre4', 'shapes')
-pixlyzer_block_datas = lib.extract.get_pixlyzer_data(
-    '1.20.3-pre4', 'blocks')
+    block_states_report = lib.extract.get_block_states_report(version_id)
+    registries = lib.extract.get_registries_report(version_id)
+    ordered_blocks = lib.code.blocks.get_ordered_blocks(registries)
 
-mappings = lib.download.get_mappings_for_version(version_id)
-block_states_burger = lib.extract.get_block_states_burger(version_id)
-ordered_blocks = lib.extract.get_ordered_blocks_burger(version_id)
-block_states_report = lib.extract.get_block_states_report(version_id)
+    lib.code.blocks.generate_blocks(
+        block_states_report, pixlyzer_block_datas, ordered_blocks)
 
-lib.code.blocks.generate_blocks(
-    block_states_burger, block_states_report, pixlyzer_block_datas, ordered_blocks, mappings)
+    lib.code.shapes.generate_block_shapes(
+        pixlyzer_block_datas, shape_datas['shapes'], shape_datas['aabbs'], block_states_report)
 
-lib.code.shapes.generate_block_shapes(
-    pixlyzer_block_datas, shape_datas['shapes'], shape_datas['aabbs'], block_states_report, block_states_burger, mappings)
+    lib.code.utils.fmt()
 
-lib.code.utils.fmt()
+    print('Done!')
 
-print('Done!')
+
+if __name__ == '__main__':
+    generate(lib.code.version.get_version_id())
-- 
cgit v1.2.3