From 6337da3fe35f9adcbc9f4d8ae15e6352944d9c3e Mon Sep 17 00:00:00 2001 From: Aymeric Wibo Date: Tue, 13 Aug 2024 15:07:25 +0200 Subject: [PATCH] community: Revert to manually formatted model file (and clean them up a bit) --- community/models/__init__.py | 3 +-- community/models/button.py | 6 ++++-- community/models/cactus.py | 4 +++- community/models/crop.py | 4 +++- community/models/cube.py | 5 +++-- community/models/door.py | 4 +++- community/models/fire.py | 4 +++- community/models/flat.py | 4 +++- community/models/glass.py | 4 +++- community/models/ladder.py | 4 +++- community/models/leaves.py | 2 ++ community/models/lever.py | 6 ++++-- community/models/liquid.py | 5 +++-- community/models/plant.py | 4 +++- community/models/pressure_plate.py | 4 +++- community/models/sign.py | 4 +++- community/models/sign_post.py | 4 +++- community/models/slab.py | 4 +++- community/models/snow.py | 4 +++- community/models/soil.py | 4 +++- community/models/stairs.py | 4 +++- community/models/tinted_glass.py | 4 +++- community/models/torch.py | 2 ++ 23 files changed, 67 insertions(+), 26 deletions(-) diff --git a/community/models/__init__.py b/community/models/__init__.py index 10395346..e940b528 100644 --- a/community/models/__init__.py +++ b/community/models/__init__.py @@ -22,8 +22,7 @@ "button", "snow", "cactus", - "tinted_glass" + "tinted_glass", ] from . import * - diff --git a/community/models/button.py b/community/models/button.py index 3f7f6584..f6bf0b1b 100644 --- a/community/models/button.py +++ b/community/models/button.py @@ -1,7 +1,9 @@ -translucent = False transparent = 2 is_cube = False glass = False +translucent = False + +# fmt: off colliders = [] @@ -30,4 +32,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/cactus.py b/community/models/cactus.py index 8f04ef2d..bf5b2dd8 100644 --- a/community/models/cactus.py +++ b/community/models/cactus.py @@ -3,6 +3,8 @@ is_cube = False glass = False +# fmt: off + colliders = [ [ (-0.4375, -0.5, -0.4375), @@ -35,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/crop.py b/community/models/crop.py index d0326697..8f387b3c 100644 --- a/community/models/crop.py +++ b/community/models/crop.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -36,4 +38,4 @@ [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/cube.py b/community/models/cube.py index 2de79983..475b8545 100644 --- a/community/models/cube.py +++ b/community/models/cube.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5, -0.5), @@ -19,7 +21,6 @@ [ 0.5, 0.5, -0.5, 0.5, -0.5, -0.5, -0.5, -0.5, -0.5, -0.5, 0.5, -0.5], # back ] -# Deprecating tex_coords = [ [0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 0.0], [0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 0.0], @@ -36,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/door.py b/community/models/door.py index 80646339..b34a2f9d 100644 --- a/community/models/door.py +++ b/community/models/door.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -30,4 +32,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/fire.py b/community/models/fire.py index 226d0f58..0ff98b1d 100644 --- a/community/models/fire.py +++ b/community/models/fire.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -24,4 +26,4 @@ [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], -] \ No newline at end of file +] diff --git a/community/models/flat.py b/community/models/flat.py index 4e6f824b..8d5e40f3 100644 --- a/community/models/flat.py +++ b/community/models/flat.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -18,4 +20,4 @@ shading_values = [ [1.0, 1.0, 1.0, 1.0], [0.4, 0.4, 0.4, 0.4], -] \ No newline at end of file +] diff --git a/community/models/glass.py b/community/models/glass.py index 847a51da..d259bf90 100644 --- a/community/models/glass.py +++ b/community/models/glass.py @@ -3,6 +3,8 @@ glass = True translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5, -0.5), @@ -35,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/ladder.py b/community/models/ladder.py index 226d0f58..0ff98b1d 100644 --- a/community/models/ladder.py +++ b/community/models/ladder.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -24,4 +26,4 @@ [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], -] \ No newline at end of file +] diff --git a/community/models/leaves.py b/community/models/leaves.py index 15b2f576..ea004e08 100644 --- a/community/models/leaves.py +++ b/community/models/leaves.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5, -0.5), diff --git a/community/models/lever.py b/community/models/lever.py index 4f7eb5ab..46359dd6 100644 --- a/community/models/lever.py +++ b/community/models/lever.py @@ -1,8 +1,10 @@ -transparent = True +transparent = 1 is_cube = False glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -30,4 +32,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/liquid.py b/community/models/liquid.py index d8f58426..6df86bcf 100644 --- a/community/models/liquid.py +++ b/community/models/liquid.py @@ -1,10 +1,12 @@ # in the end, it'd be nice to have it so that liquids fill up the whole block when they have a block above them # this would avoid the problems this solution has -translucent = True transparent = 1 is_cube = True glass = True +translucent = True + +# fmt: off colliders = [] @@ -26,7 +28,6 @@ [0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 0.0], ] - shading_values = [ [0.6, 0.6, 0.6, 0.6], [0.6, 0.6, 0.6, 0.6], diff --git a/community/models/plant.py b/community/models/plant.py index 226d0f58..0ff98b1d 100644 --- a/community/models/plant.py +++ b/community/models/plant.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -24,4 +26,4 @@ [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], -] \ No newline at end of file +] diff --git a/community/models/pressure_plate.py b/community/models/pressure_plate.py index 4e6f824b..8d5e40f3 100644 --- a/community/models/pressure_plate.py +++ b/community/models/pressure_plate.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -18,4 +20,4 @@ shading_values = [ [1.0, 1.0, 1.0, 1.0], [0.4, 0.4, 0.4, 0.4], -] \ No newline at end of file +] diff --git a/community/models/sign.py b/community/models/sign.py index 226d0f58..0ff98b1d 100644 --- a/community/models/sign.py +++ b/community/models/sign.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -24,4 +26,4 @@ [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], -] \ No newline at end of file +] diff --git a/community/models/sign_post.py b/community/models/sign_post.py index 226d0f58..0ff98b1d 100644 --- a/community/models/sign_post.py +++ b/community/models/sign_post.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [ @@ -24,4 +26,4 @@ [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], [1.0, 1.0, 1.0, 1.0], -] \ No newline at end of file +] diff --git a/community/models/slab.py b/community/models/slab.py index 14eacc5d..e2932597 100644 --- a/community/models/slab.py +++ b/community/models/slab.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5, -0.5), @@ -35,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/snow.py b/community/models/snow.py index 12cff385..0c02b11d 100644 --- a/community/models/snow.py +++ b/community/models/snow.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5000, -0.5), @@ -23,4 +25,4 @@ shading_values = [ [1.0, 1.0, 1.0, 1.0], [0.4, 0.4, 0.4, 0.4], -] \ No newline at end of file +] diff --git a/community/models/soil.py b/community/models/soil.py index 90643cac..2a77a097 100644 --- a/community/models/soil.py +++ b/community/models/soil.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5000, -0.5), @@ -35,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/stairs.py b/community/models/stairs.py index 14eacc5d..e2932597 100644 --- a/community/models/stairs.py +++ b/community/models/stairs.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [ [ (-0.5, -0.5, -0.5), @@ -35,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/tinted_glass.py b/community/models/tinted_glass.py index 1a7e14c3..a2b247e6 100644 --- a/community/models/tinted_glass.py +++ b/community/models/tinted_glass.py @@ -3,6 +3,8 @@ glass = True translucent = True +# fmt: off + colliders = [ [ (-0.5, -0.5, -0.5), @@ -35,4 +37,4 @@ [0.4, 0.4, 0.4, 0.4], [0.8, 0.8, 0.8, 0.8], [0.8, 0.8, 0.8, 0.8], -] \ No newline at end of file +] diff --git a/community/models/torch.py b/community/models/torch.py index 6b0482ff..32e37d65 100644 --- a/community/models/torch.py +++ b/community/models/torch.py @@ -3,6 +3,8 @@ glass = False translucent = False +# fmt: off + colliders = [] vertex_positions = [