From c9b4dccd7eaeed68ce96cf5167916417d0baa6a7 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:29:47 -0500
Subject: All block shapes & collisions (#22)

* start adding shapes

* add more collision stuff

* DiscreteCubeMerger

* more mergers

* start adding BitSetDiscreteVoxelShape::join

* i love rust :smiley: :smiley: :smiley:

* r

* IT COMPILES????

* fix warning

* fix error

* fix more clippy issues

* add box_shape

* more shape stuff

* make DiscreteVoxelShape an enum

* Update shape.rs

* also make VoxelShape an enum

* implement BitSet::clear

* add more missing things

* it compiles

W

* start block shape codegen

* optimize shape codegen

* make az-block/blocks.rs look better (broken)

* almost new block macro

* make the codegen not generate 'type'

* try to fix

* work more on the blocks macro

* wait it compiles

* fix clippy issues

* shapes codegen works

* well it's almost working

* simplify some shape codegen

* enum type names are correct

* W it compiles

* cargo check no longer warns

* fix some clippy issues

* start making it so the shape impl is on BlockStates

* insane code

* new impl compiles

* fix wrong find_bits + TESTS PASS!

* add a test for slab collision

* fix clippy issues

* ok rust

* fix error that happens when on stairs

* add test for top slabs

* start adding join_is_not_empty

* add more to join_is_not_empty

* top slabs still don't work!!

* x..=0 doesn't work in rust :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley:

* remove comment since i added more useful names

* remove some printlns

* fix walls in some configurations erroring

* fix some warnings

* change comment to \`\`\`ignore instead of \`\`\`no_run

* players are .6 wide not .8

* fix clippy's complaints

* i missed one clippy warning
---
 codegen/genblocks.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'codegen/genblocks.py')

diff --git a/codegen/genblocks.py b/codegen/genblocks.py
index fe5eddd1..6b802771 100644
--- a/codegen/genblocks.py
+++ b/codegen/genblocks.py
@@ -1,4 +1,5 @@
 import lib.code.version
+import lib.code.shapes
 import lib.code.packet
 import lib.code.blocks
 import lib.code.utils
@@ -8,7 +9,8 @@ import lib.utils
 
 version_id = lib.code.version.get_version_id()
 
-lib.extract.get_generator_mod_data(version_id, 'blockCollisionShapes')
+shape_datas = lib.extract.get_generator_mod_data(
+    version_id, 'blockCollisionShapes')
 
 mappings = lib.download.get_mappings_for_version(version_id)
 block_states_burger = lib.extract.get_block_states_burger(version_id)
@@ -18,6 +20,9 @@ block_states_report = lib.extract.get_block_states_report(version_id)
 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)
+
 lib.code.utils.fmt()
 
 print('Done!')
-- 
cgit v1.2.3