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/lib/code/utils.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'codegen/lib/code/utils.py')

diff --git a/codegen/lib/code/utils.py b/codegen/lib/code/utils.py
index e4671488..d91e0634 100644
--- a/codegen/lib/code/utils.py
+++ b/codegen/lib/code/utils.py
@@ -147,3 +147,17 @@ def write_packet_file(state, packet_name_snake_case, code):
 
 def fmt():
     os.system(f'cd {get_dir_location("..")} && cargo fmt')
+
+
+def clean_property_name(property_name):
+    # if the name ends with _<number>, remove that part
+    ending = property_name.split('_')[-1]
+    if ending.isdigit():
+        property_name = property_name[:-(len(ending) + 1)]
+
+    # `type` is a reserved keyword, so we use kind instead ¯\_(ツ)_/¯
+    if property_name == 'type':
+        property_name = 'kind'
+    
+    return property_name
+
-- 
cgit v1.2.3