From 2aa046c4b50a0de850eb567cd8bced03e8f99bd6 Mon Sep 17 00:00:00 2001 From: mat Date: Thu, 17 Apr 2025 22:17:18 +0200 Subject: make BlockState::id private --- codegen/lib/code/shapes.py | 8 ++++---- codegen/lib/utils.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'codegen/lib') diff --git a/codegen/lib/code/shapes.py b/codegen/lib/code/shapes.py index 5d5f826d..0896bd82 100644 --- a/codegen/lib/code/shapes.py +++ b/codegen/lib/code/shapes.py @@ -151,18 +151,18 @@ pub trait BlockWithShape {{ impl BlockWithShape for BlockState {{ fn collision_shape(&self) -> &'static VoxelShape {{ - COLLISION_SHAPES_MAP.get(self.id as usize).unwrap_or(&&SHAPE1) + COLLISION_SHAPES_MAP.get(self.id() as usize).unwrap_or(&&SHAPE1) }} fn outline_shape(&self) -> &'static VoxelShape {{ - OUTLINE_SHAPES_MAP.get(self.id as usize).unwrap_or(&&SHAPE1) + OUTLINE_SHAPES_MAP.get(self.id() as usize).unwrap_or(&&SHAPE1) }} fn is_collision_shape_empty(&self) -> bool {{ - matches!(self.id, {empty_shape_match_code}) + matches!(self.id(), {empty_shape_match_code}) }} fn is_collision_shape_full(&self) -> bool {{ - matches!(self.id, {block_shape_match_code}) + matches!(self.id(), {block_shape_match_code}) }} }} diff --git a/codegen/lib/utils.py b/codegen/lib/utils.py index 162dd0fa..fd1e553b 100644 --- a/codegen/lib/utils.py +++ b/codegen/lib/utils.py @@ -10,7 +10,7 @@ def to_snake_case(name: str): def to_camel_case(name: str): - s = re.sub('[_ ](\w)', lambda m: m.group(1).upper(), + s = re.sub(r'[_ ](\w)', lambda m: m.group(1).upper(), name.replace('.', '_').replace('/', '_')) s = upper_first_letter(s) # if the first character is a number, we need to add an underscore -- cgit v1.2.3