diff options
| -rw-r--r-- | azalea-block/src/blocks.rs | 38 | ||||
| -rw-r--r-- | codegen/lib/code/blocks.py | 2 |
2 files changed, 20 insertions, 20 deletions
diff --git a/azalea-block/src/blocks.rs b/azalea-block/src/blocks.rs index 7f1ecbac..77fb8276 100644 --- a/azalea-block/src/blocks.rs +++ b/azalea-block/src/blocks.rs @@ -648,7 +648,7 @@ make_block_states! { _6, _7, }, - "berries" => True_False { + "berries" => TrueFalse { True, False, }, @@ -1691,7 +1691,7 @@ make_block_states! { Partial, Full, }, - "axis" => X_Y_Z { + "axis" => XYZ { X, Y, Z, @@ -2568,13 +2568,13 @@ make_block_states! { West=False, }, glow_lichen => BlockBehavior::default(), { - True_False=False, - True_False=False, - True_False=False, - True_False=False, - True_False=False, - True_False=False, - True_False=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, }, oak_fence_gate => BlockBehavior::default(), { FacingCardinal=North, @@ -4651,13 +4651,13 @@ make_block_states! { sculk => BlockBehavior::default(), { }, sculk_vein => BlockBehavior::default(), { - True_False=False, - True_False=False, - True_False=False, - True_False=False, - True_False=False, - True_False=False, - True_False=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, + TrueFalse=False, }, sculk_catalyst => BlockBehavior::default(), { Pulse=False, @@ -4797,10 +4797,10 @@ make_block_states! { }, cave_vines => BlockBehavior::default(), { _0_1_2_3_4_5_6_7_8_9_10_11_12_13_14_15_16_17_18_19_20_21_22_23_24_25=_0, - True_False=False, + TrueFalse=False, }, cave_vines_plant => BlockBehavior::default(), { - True_False=False, + TrueFalse=False, }, spore_blossom => BlockBehavior::default(), { }, @@ -4923,7 +4923,7 @@ make_block_states! { cracked_deepslate_tiles => BlockBehavior::default(), { }, infested_deepslate => BlockBehavior::default(), { - X_Y_Z=Y, + XYZ=Y, }, smooth_basalt => BlockBehavior::default(), { }, diff --git a/codegen/lib/code/blocks.py b/codegen/lib/code/blocks.py index b3df15cf..f6d6bb4b 100644 --- a/codegen/lib/code/blocks.py +++ b/codegen/lib/code/blocks.py @@ -42,7 +42,7 @@ def generate_blocks(blocks_burger: dict, blocks_report: dict, ordered_blocks: li return 'ComparatorType' if property is None: - return '_'.join(map(to_camel_case, property_variants)).replace('__', '_') + return ''.join(map(to_camel_case, property_variants)) property_name = None for class_name in [block_data_burger['class']] + block_data_burger['super']: |