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

1 files changed, 43 insertions, 22 deletions

diff --git a/codegen/lib/code/shapes.py b/codegen/lib/code/shapes.py
index 83521dac..06170552 100755
--- a/codegen/lib/code/shapes.py
+++ b/codegen/lib/code/shapes.py
@@ -7,8 +7,8 @@ COLLISION_BLOCKS_RS_DIR = get_dir_location(
     '../azalea-physics/src/collision/blocks.rs')
 
 
-def generate_block_shapes(blocks: dict, shapes: dict, block_states_report, block_datas_burger, mappings: Mappings):
-    blocks, shapes = simplify_shapes(blocks, shapes)
+def generate_block_shapes(blocks: dict, shapes: dict, aabbs: dict, block_states_report, block_datas_burger, mappings: Mappings):
+    blocks, shapes = simplify_shapes(blocks, shapes, aabbs)
 
     code = generate_block_shapes_code(
         blocks, shapes, block_states_report, block_datas_burger, mappings)
@@ -16,33 +16,54 @@ def generate_block_shapes(blocks: dict, shapes: dict, block_states_report, block
         f.write(code)
 
 
-def simplify_shapes(blocks: dict, shapes: dict):
-    shape_to_new_id = {}
+def simplify_shapes(blocks: dict, shapes: dict, aabbs: dict):
     new_id_increment = 0
 
     new_shapes = {}
     old_id_to_new_id = {}
 
-    for shape_id, shape in sorted(shapes.items(), key=lambda shape: int(shape[0])):
-        # tuples are hashable
-        shape_as_tuple = tuple(map(tuple, shape))
-        if shape_as_tuple not in shape_to_new_id:
-            shape_to_new_id[shape_as_tuple] = new_id_increment
-            old_id_to_new_id[shape_id] = new_id_increment
-            new_shapes[new_id_increment] = shape
-            new_id_increment += 1
-        else:
-            old_id_to_new_id[shape_id] = shape_to_new_id[shape_as_tuple]
+    old_id_to_new_id[None] = 0
+    new_shapes[0] = ()
+    new_id_increment += 1
+
+    used_shape_ids = set()
+    # determine the used shape ids
+    for block_id, block_data in blocks.items():
+        block_id = block_id.split(':')[-1]
+        block_shapes = [state.get('collision_shape')
+                        for state in block_data['states'].values()]
+        for s in block_shapes:
+            used_shape_ids.add(s)
+
+    for shape_id, shape in enumerate(shapes):
+        if shape_id not in used_shape_ids: continue
+        # pixlyzer gives us shapes as an index or list of indexes into the
+        # aabbs list
+        # and aabbs look like { "from": number or [x, y, z], "to": (number or vec3) }
+        # convert them to [x1, y1, z1, x2, y2, z2]
+        shape = [shape] if isinstance(shape, int) else shape
+        shape = [aabbs[shape_aabb] for shape_aabb in shape]
+        shape = tuple([(
+            (tuple(part['from']) if isinstance(
+                part['from'], list) else ((part['from'],)*3))
+            + (tuple(part['to']) if isinstance(part['to'], list)
+               else ((part['to'],)*3))
+        ) for part in shape])
+
+        old_id_to_new_id[shape_id] = new_id_increment
+        new_shapes[new_id_increment] = shape
+        new_id_increment += 1
 
     # now map the blocks to the new shape ids
-    for block_id, shape_ids in blocks.items():
-        if isinstance(shape_ids, int):
-            blocks[block_id] = old_id_to_new_id[str(shape_ids)]
-        else:
-            blocks[block_id] = [old_id_to_new_id[str(shape_id)]
-                                for shape_id in shape_ids]
+    new_blocks = {}
+    for block_id, block_data in blocks.items():
+        block_id = block_id.split(':')[-1]
+        block_shapes = [state.get('collision_shape')
+                        for state in block_data['states'].values()]
+        new_blocks[block_id] = [old_id_to_new_id[shape_id]
+                                for shape_id in block_shapes]
 
-    return blocks, new_shapes
+    return new_blocks, new_shapes
 
 
 def generate_block_shapes_code(blocks: dict, shapes: dict, block_states_report, block_datas_burger, mappings: Mappings):
@@ -116,7 +137,7 @@ def generate_code_for_shape(shape_id: str, parts: list[list[float]]):
     code = ''
     code += f'static SHAPE{shape_id}: Lazy<VoxelShape> = Lazy::new(|| {{'
     steps = []
-    if parts == []:
+    if parts == ():
         steps.append('collision::empty_shape()')
     else:
         steps.append(f'collision::box_shape({make_arguments(parts[0])})')