From 7d901e39bc10a855b545d7b6c167f45148a1fb0a Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Wed, 7 Dec 2022 21:09:58 -0600
Subject: 1.19.3 (#34)

* start updating to 22w42a

* work a bit more on 22w42a

* player chat packet

* serverbound hello packet

* Update mod.rs

* add more stuff to clientbound player chat packet

* ClientboundPlayerInfoUpdatePacket

* features enabled and container closed

* serverbound chat packets

* make it compile

* 22w43a

* ServerboundChatSessionUpdatePacket

* profile_public_key isn't Option anymore

* Update bitset.rs

* joining a server works

* fix entitydatavalue

* backtraces + fix clientbound chat message

* fix some warnings and add more ecomments

* 22w44a

* generate en_us.json

* add updating guide to codegen/readme

* fix some markdown

* update list of generated things

* metadata stuff

* Replace PJS generator mod with PixLyzer (#38)

* pixlizer extractor

* start working on shape extraction

* fix generating language

* fix pixlyzer shape generation

* use empty_shape

* generate blocks and shapes

* update pixlyzer dir

* Revert "update pixlyzer dir"

This reverts commit ee9a0e7a49936dd8569c610ba9b6455895eeff71.

* fix

* fix

* Revert "fix"

This reverts commit ad12ddcb009ccc4eeb13ddef0871db1d9322ab7d.

* fix

* detect pixlyzer fail

* fix pixlyzer

* 22w45a

* gen entities

* add async-trait dep

* update codegen/readme.md

* explain when rust_log should be used

* remove some unused code

* start fixing pixlyzer issues

* fix a thing in codegen

* almost fixed

* more progress towards 1.19.3

* 1.19.3-pre2

* fixes

* revert some hardcoded property names

* Delete clientbound_player_info_packet.rs

* handle 1.19.3 player info packets

* handle playerinforemove

* start updating to 1.19.3-rc1

* optional registries work

* fix some issues with 1.19.3

chat doesn't work yet

* aaaaaaaaaaaaaaaaa

* oh

* ignore unused shapes

* uncomment generate_blocks

* fix migrate

* 1.19.3-rc2

* fix clippy warnings

* 1.19.3-rc3

* split the azalea-buf macro into separate modules

* improve Recipe in protocol

* 1.19.3
---
 codegen/genblocks.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'codegen/genblocks.py')

diff --git a/codegen/genblocks.py b/codegen/genblocks.py
index 6b802771..45e7683e 100755
--- a/codegen/genblocks.py
+++ b/codegen/genblocks.py
@@ -9,8 +9,10 @@ import lib.utils
 
 version_id = lib.code.version.get_version_id()
 
-shape_datas = lib.extract.get_generator_mod_data(
-    version_id, 'blockCollisionShapes')
+shape_datas = lib.extract.get_pixlyzer_data(
+    version_id, 'shapes')
+pixlyzer_block_datas = lib.extract.get_pixlyzer_data(
+    version_id, 'blocks')
 
 mappings = lib.download.get_mappings_for_version(version_id)
 block_states_burger = lib.extract.get_block_states_burger(version_id)
@@ -21,7 +23,7 @@ lib.code.blocks.generate_blocks(
     block_states_burger, block_states_report, ordered_blocks, mappings)
 
 lib.code.shapes.generate_block_shapes(
-    shape_datas['blocks'], shape_datas['shapes'], block_states_report, block_states_burger, mappings)
+    pixlyzer_block_datas, shape_datas['shapes'], shape_datas['aabbs'], block_states_report, block_states_burger, mappings)
 
 lib.code.utils.fmt()
 
-- 
cgit v1.2.3