diff options
Diffstat (limited to 'codegen/lib/code/blocks.py')
| -rwxr-xr-x | codegen/lib/code/blocks.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/codegen/lib/code/blocks.py b/codegen/lib/code/blocks.py index c32a3bbc..d5fca732 100755 --- a/codegen/lib/code/blocks.py +++ b/codegen/lib/code/blocks.py @@ -20,7 +20,6 @@ def generate_blocks(blocks_burger: dict, blocks_report: dict, ordered_blocks: li new_make_block_states_macro_code = [] new_make_block_states_macro_code.append('make_block_states! {') - # Find properties properties = {} @@ -84,7 +83,6 @@ def generate_blocks(blocks_burger: dict, blocks_report: dict, ordered_blocks: li new_make_block_states_macro_code.append( f' "{property_name}" => {property_shape_code},') - new_make_block_states_macro_code.append(' },') # Block codegen @@ -101,7 +99,6 @@ def generate_blocks(blocks_burger: dict, blocks_report: dict, ordered_blocks: li if state.get('default'): default_property_variants = state.get('properties', {}) - properties_code = '{' for property_name in list(block_data_report.get('properties', {}).keys()): property_burger = None @@ -163,6 +160,7 @@ def generate_blocks(blocks_burger: dict, blocks_report: dict, ordered_blocks: li with open(BLOCKS_RS_DIR, 'w') as f: f.write('\n'.join(new_code)) + def get_property_struct_name(property: Optional[dict], block_data_burger: dict, property_variants: list[str], mappings: Mappings) -> str: # these are hardcoded because otherwise they cause conflicts # some names inspired by https://github.com/feather-rs/feather/blob/main/feather/blocks/src/generated/table.rs @@ -184,16 +182,23 @@ def get_property_struct_name(property: Optional[dict], block_data_burger: dict, return 'ChestType' if property_variants == ['compare', 'subtract']: return 'ComparatorType' + if 'harp' in property_variants and 'didgeridoo' in property_variants: + return 'Sound' if property is None: return ''.join(map(to_camel_case, property_variants)) - property_name = None for class_name in [block_data_burger['class']] + block_data_burger['super']: property_name = mappings.get_field( class_name, property['field_name']) if property_name: break + if property_name is None: + if 'declared_in' in property: + property_name = mappings.get_field( + property['declared_in'], property['field_name']) + if property_name is None: + property_name = property['name'] assert property_name property_name = to_camel_case(property_name.lower()) if property['type'] == 'int': |