xtex/azalea
1
0
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2024-09-19 22:52:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include property names in blocks

Browse source
This commit is contained in:
mat 2022-06-11 15:29:42 -05:00
parent b852bdc481
commit e79e58da36
2 changed files with 188 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

328
azalea-block/src/blocks.rs
View file

File diff suppressed because it is too large Load diff

32
codegen/lib/code/blocks.py
View file

@ -1,7 +1,6 @@
from lib.utils import upper_first_letter from lib.utils import to_snake_case, upper_first_letter, get_dir_location, to_camel_case
from lib.utils import get_dir_location
from lib.utils import to_camel_case
from ..mappings import Mappings from ..mappings import Mappings
import re
BLOCKS_RS_DIR = get_dir_location('../azalea-block/src/blocks.rs') BLOCKS_RS_DIR = get_dir_location('../azalea-block/src/blocks.rs')
@ -32,31 +31,48 @@ def generate_blocks(blocks_burger: dict, blocks_report: dict, mappings: Mappings
# Find properties # Find properties
properties = {} properties = {}
# This dict looks like { 'FloweringAzaleaLeavesDistance': 'distance' }
property_struct_names_to_names = {}
for block_id, block_data_burger in blocks_burger.items(): for block_id, block_data_burger in blocks_burger.items():
block_data_report = blocks_report[f'minecraft:{block_id}'] block_data_report = blocks_report[f'minecraft:{block_id}']
block_properties = {} block_properties = {}
for property_name in list(block_data_report.get('properties', {}).keys()): for property_struct_name in list(block_data_report.get('properties', {}).keys()):
property_burger = None property_burger = None
for property in block_data_burger['states']: for property in block_data_burger['states']:
if property['name'] == property_name: if property['name'] == property_struct_name:
property_burger = property property_burger = property
break break
if property_burger is None: if property_burger is None:
print('Error: The reports have states for a block, but Burger doesn\'t!', block_data_burger) print('Error: The reports have states for a block, but Burger doesn\'t!', block_data_burger)
continue continue
# assert property_burger is not None # assert property_burger is not None
property_variants = block_data_report['properties'][property_name] property_variants = block_data_report['properties'][property_struct_name]
property_struct_name = get_property_struct_name(property_burger, block_data_burger) property_struct_name = get_property_struct_name(property_burger, block_data_burger)
block_properties[property_struct_name] = property_variants block_properties[property_struct_name] = property_variants
property_name = property_burger['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)]
property_struct_names_to_names[property_struct_name] = property_name
properties.update(block_properties) properties.update(block_properties)
# Property codegen # Property codegen
new_make_block_states_macro_code.append(' Properties => {') new_make_block_states_macro_code.append(' Properties => {')
for property_name, property_variants in properties.items(): for property_struct_name, property_variants in properties.items():
# face => Face {
# Floor,
# Wall,
# Ceiling,
# },
property_name = property_struct_names_to_names[property_struct_name]
new_make_block_states_macro_code.append( new_make_block_states_macro_code.append(
f' {to_camel_case(property_name)} {{') f' {property_name} => {property_struct_name} {{')
for variant in property_variants: for variant in property_variants:
new_make_block_states_macro_code.append( new_make_block_states_macro_code.append(