From fd63adcb41091b7d6c3a27787eb97705c92a15d8 Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Fri, 29 Sep 2023 16:34:23 -0500
Subject: [PATCH] update block shapes

---
 azalea-block/src/generated.rs             |    18 +-
 azalea-client/src/packet_handling/game.rs |    10 +-
 azalea-physics/src/collision/blocks.rs    | 10152 ++++++++++----------
 azalea-physics/src/collision/mod.rs       |    39 +-
 4 files changed, 5124 insertions(+), 5095 deletions(-)

diff --git a/azalea-block/src/generated.rs b/azalea-block/src/generated.rs
index f5c8eee54..e3f8fb9e3 100755
--- a/azalea-block/src/generated.rs
+++ b/azalea-block/src/generated.rs
@@ -3080,46 +3080,60 @@ make_block_states! {
             powered: false,
         },
         skeleton_skull => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: SkeletonSkullRotation::_0,
         },
         skeleton_wall_skull => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         wither_skeleton_skull => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: WitherSkeletonSkullRotation::_0,
         },
         wither_skeleton_wall_skull => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         zombie_head => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: ZombieHeadRotation::_0,
         },
         zombie_wall_head => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         player_head => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: PlayerHeadRotation::_0,
         },
         player_wall_head => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         creeper_head => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: CreeperHeadRotation::_0,
         },
         creeper_wall_head => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         dragon_head => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: DragonHeadRotation::_0,
         },
         dragon_wall_head => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         piglin_head => BlockBehavior::new().strength(1.0, 1.0), {
+            powered: false,
             rotation: PiglinHeadRotation::_0,
         },
         piglin_wall_head => BlockBehavior::new().strength(1.0, 1.0), {
             facing: FacingCardinal::North,
+            powered: false,
         },
         anvil => BlockBehavior::new().requires_correct_tool_for_drops().strength(5.0, 1200.0), {
             facing: FacingCardinal::North,
@@ -3341,7 +3355,9 @@ make_block_states! {
             waterlogged: false,
         },
         slime_block => BlockBehavior::new().friction(0.8), {},
-        barrier => BlockBehavior::new().strength(-1.0, 3600000.8), {},
+        barrier => BlockBehavior::new().strength(-1.0, 3600000.8), {
+            waterlogged: false,
+        },
         light => BlockBehavior::new().strength(-1.0, 3600000.8), {
             level: LightLevel::_15,
             waterlogged: false,
diff --git a/azalea-client/src/packet_handling/game.rs b/azalea-client/src/packet_handling/game.rs
index 670d37576..c97c1a499 100644
--- a/azalea-client/src/packet_handling/game.rs
+++ b/azalea-client/src/packet_handling/game.rs
@@ -690,6 +690,8 @@ pub fn process_packet_events(ecs: &mut World) {
 
                     // per-client id index
                     entity_id_index.insert(entity_id, ecs_entity);
+
+                    debug!("added to LoadedBy of entity {ecs_entity:?} with id {entity_id:?}");
                     continue;
                 };
 
@@ -698,7 +700,8 @@ pub fn process_packet_events(ecs: &mut World) {
                 let bundle = p.as_entity_bundle((**instance_name).clone());
                 let mut spawned =
                     commands.spawn((entity_id, LoadedBy(HashSet::from([player_entity])), bundle));
-                let ecs_entity = spawned.id();
+                let ecs_entity: Entity = spawned.id();
+                debug!("spawned entity {ecs_entity:?} with id {entity_id:?}");
 
                 azalea_entity::indexing::add_entity_to_indexes(
                     entity_id,
@@ -946,8 +949,13 @@ pub fn process_packet_events(ecs: &mut World) {
                         );
                         continue;
                     };
+
                     // the [`remove_despawned_entities_from_indexes`] system will despawn the entity
                     // if it's not loaded by anything anymore
+
+                    // also we can't just ecs.despawn because if we're in a swarm then the entity
+                    // might still be loaded by another client
+
                     loaded_by.remove(&player_entity);
                 }
             }
diff --git a/azalea-physics/src/collision/blocks.rs b/azalea-physics/src/collision/blocks.rs
index 502aff854..a361c2084 100644
--- a/azalea-physics/src/collision/blocks.rs
+++ b/azalea-physics/src/collision/blocks.rs
@@ -1764,160 +1764,160 @@ impl BlockWithShape for BlockState {
             | 8249
             | 8252
             | 8595..=8826
-            | 9003..=9034
-            | 9180..=9203
-            | 10226..=10257
-            | 10606..=10937
-            | 11169..=11170
-            | 11173..=11174
-            | 11177..=11178
-            | 11181..=11182
-            | 11185..=11186
-            | 11189..=11190
-            | 11193..=11194
-            | 11197..=11198
-            | 11201..=11202
-            | 11205..=11206
-            | 11209..=11210
-            | 11213..=11214
-            | 11217..=11218
-            | 11221..=11222
-            | 11225..=11226
-            | 11229..=11230
-            | 11233..=11234
-            | 11237..=11238
-            | 11241..=11242
-            | 11245..=11246
-            | 11249..=11250
-            | 11253..=11254
-            | 11257..=11258
-            | 11261..=11262
-            | 11265..=11266
-            | 11269..=11270
-            | 11273..=11274
-            | 11277..=11278
-            | 11281..=11282
-            | 11285..=11286
-            | 11289..=11290
-            | 11293..=11294
-            | 11297..=11298
-            | 11301..=11302
-            | 11305..=11306
-            | 11309..=11310
-            | 11313..=11314
-            | 11317..=11318
-            | 11321..=11322
-            | 11325..=11326
-            | 11329..=11330
-            | 11333..=11334
-            | 11337..=11338
-            | 11341..=11342
-            | 11345..=11346
-            | 11349..=11350
-            | 11353..=11354
-            | 11357..=11358
-            | 11361..=11362
-            | 11365..=11366
-            | 11369..=11370
-            | 11373..=11374
-            | 11377..=11378
-            | 11381..=11382
-            | 11385..=11386
-            | 11389..=11390
-            | 11393..=11394
-            | 11397..=11398
-            | 11401..=11402
-            | 11405..=11406
-            | 11409..=11410
-            | 11413..=11414
-            | 11417..=11418
-            | 11421..=11422
-            | 12354..=12355
-            | 12358
-            | 12360
-            | 12362
-            | 12364
-            | 12366..=12371
-            | 12373
-            | 12408
-            | 12619..=12645
-            | 12672..=12791
-            | 12803
-            | 12817..=12820
-            | 14025
-            | 14028
-            | 14349
-            | 14352
-            | 14673
-            | 14676
-            | 14997
-            | 15000
-            | 15321
-            | 15324
-            | 15645
-            | 15648
-            | 15969
-            | 15972
-            | 16293
-            | 16296
-            | 16617
-            | 16620
-            | 16941
-            | 16944
-            | 17265
-            | 17268
-            | 17589
-            | 17592
-            | 17913
-            | 17916
-            | 18434..=18437
-            | 18451
-            | 18453..=18454
-            | 18468
-            | 18470..=18524
-            | 18539..=18542
-            | 18735..=18736
-            | 18739..=18740
-            | 18743..=18744
-            | 18747..=18748
-            | 18751..=18752
-            | 18755..=18756
-            | 18759..=18760
-            | 18763..=18764
-            | 18767..=18768
-            | 18771..=18772
-            | 18775..=18776
-            | 18779..=18780
-            | 18783..=18784
-            | 18787..=18788
-            | 18791..=18792
-            | 18795..=18796
-            | 18959..=19006
-            | 19135..=19214
-            | 19406
-            | 19409
-            | 19826
-            | 19829
-            | 20231..=20256
-            | 20263
-            | 20266
-            | 20943
-            | 21425..=21552
-            | 22314..=22368
-            | 22372..=22387
-            | 22395..=22396
-            | 22403..=22404
-            | 22411..=22412
-            | 22419..=22446
-            | 22545
-            | 22548
-            | 22956
-            | 22959
-            | 23367
-            | 23370
-            | 23778
-            | 23781
-            | 24117 => &SHAPE0,
+            | 9143..=9174
+            | 9320..=9343
+            | 10367..=10398
+            | 10747..=11078
+            | 11310..=11311
+            | 11314..=11315
+            | 11318..=11319
+            | 11322..=11323
+            | 11326..=11327
+            | 11330..=11331
+            | 11334..=11335
+            | 11338..=11339
+            | 11342..=11343
+            | 11346..=11347
+            | 11350..=11351
+            | 11354..=11355
+            | 11358..=11359
+            | 11362..=11363
+            | 11366..=11367
+            | 11370..=11371
+            | 11374..=11375
+            | 11378..=11379
+            | 11382..=11383
+            | 11386..=11387
+            | 11390..=11391
+            | 11394..=11395
+            | 11398..=11399
+            | 11402..=11403
+            | 11406..=11407
+            | 11410..=11411
+            | 11414..=11415
+            | 11418..=11419
+            | 11422..=11423
+            | 11426..=11427
+            | 11430..=11431
+            | 11434..=11435
+            | 11438..=11439
+            | 11442..=11443
+            | 11446..=11447
+            | 11450..=11451
+            | 11454..=11455
+            | 11458..=11459
+            | 11462..=11463
+            | 11466..=11467
+            | 11470..=11471
+            | 11474..=11475
+            | 11478..=11479
+            | 11482..=11483
+            | 11486..=11487
+            | 11490..=11491
+            | 11494..=11495
+            | 11498..=11499
+            | 11502..=11503
+            | 11506..=11507
+            | 11510..=11511
+            | 11514..=11515
+            | 11518..=11519
+            | 11522..=11523
+            | 11526..=11527
+            | 11530..=11531
+            | 11534..=11535
+            | 11538..=11539
+            | 11542..=11543
+            | 11546..=11547
+            | 11550..=11551
+            | 11554..=11555
+            | 11558..=11559
+            | 11562..=11563
+            | 12495..=12496
+            | 12499
+            | 12501
+            | 12503
+            | 12505
+            | 12507..=12512
+            | 12514
+            | 12549
+            | 12760..=12786
+            | 12813..=12932
+            | 12944
+            | 12958..=12961
+            | 14166
+            | 14169
+            | 14490
+            | 14493
+            | 14814
+            | 14817
+            | 15138
+            | 15141
+            | 15462
+            | 15465
+            | 15786
+            | 15789
+            | 16110
+            | 16113
+            | 16434
+            | 16437
+            | 16758
+            | 16761
+            | 17082
+            | 17085
+            | 17406
+            | 17409
+            | 17730
+            | 17733
+            | 18054
+            | 18057
+            | 18575..=18578
+            | 18592
+            | 18594..=18595
+            | 18609
+            | 18611..=18665
+            | 18680..=18683
+            | 18876..=18877
+            | 18880..=18881
+            | 18884..=18885
+            | 18888..=18889
+            | 18892..=18893
+            | 18896..=18897
+            | 18900..=18901
+            | 18904..=18905
+            | 18908..=18909
+            | 18912..=18913
+            | 18916..=18917
+            | 18920..=18921
+            | 18924..=18925
+            | 18928..=18929
+            | 18932..=18933
+            | 18936..=18937
+            | 19100..=19147
+            | 19276..=19355
+            | 19547
+            | 19550
+            | 19967
+            | 19970
+            | 20372..=20397
+            | 20404
+            | 20407
+            | 21084
+            | 21566..=21693
+            | 22455..=22509
+            | 22513..=22528
+            | 22536..=22537
+            | 22544..=22545
+            | 22552..=22553
+            | 22560..=22587
+            | 22686
+            | 22689
+            | 23097
+            | 23100
+            | 23508
+            | 23511
+            | 23919
+            | 23922
+            | 24258 => &SHAPE0,
             1688 | 1690 | 1693 | 1695 | 1704 | 1706 | 1709 | 1711 | 1720 | 1722 | 1725 | 1727
             | 1736 | 1738 | 1741 | 1743 | 1752 | 1754 | 1757 | 1759 | 1768 | 1770 | 1773 | 1775
             | 1784 | 1786 | 1789 | 1791 | 1800 | 1802 | 1805 | 1807 | 1816 | 1818 | 1821 | 1823
@@ -2054,49 +2054,49 @@ impl BlockWithShape for BlockState {
             | 7666..=7667
             | 7746..=7747
             | 7826..=7827
-            | 9100..=9101
-            | 9744..=9745
-            | 9824..=9825
-            | 9904..=9905
-            | 9984..=9985
-            | 10064..=10065
-            | 10144..=10145
-            | 10325..=10326
-            | 10405..=10406
-            | 10485..=10486
-            | 10941..=10942
-            | 12273..=12274
-            | 12821..=12822
-            | 12901..=12902
-            | 12981..=12982
-            | 13061..=13062
-            | 13141..=13142
-            | 13221..=13222
-            | 13301..=13302
-            | 13381..=13382
-            | 13461..=13462
-            | 13541..=13542
-            | 13621..=13622
-            | 13701..=13702
-            | 13781..=13782
-            | 13861..=13862
-            | 18799..=18800
-            | 18879..=18880
-            | 19320..=19321
-            | 19740..=19741
-            | 20145..=20146
-            | 21573..=21574
-            | 21653..=21654
-            | 21733..=21734
-            | 21813..=21814
-            | 21925..=21926
-            | 22005..=22006
-            | 22085..=22086
-            | 22165..=22166
-            | 22453..=22454
-            | 22864..=22865
-            | 23275..=23276
-            | 23686..=23687 => &SHAPE29,
+            | 9240..=9241
+            | 9884..=9885
+            | 9964..=9965
+            | 10044..=10045
+            | 10124..=10125
+            | 10204..=10205
+            | 10284..=10285
+            | 10466..=10467
+            | 10546..=10547
+            | 10626..=10627
+            | 11082..=11083
+            | 12414..=12415
+            | 12962..=12963
+            | 13042..=13043
+            | 13122..=13123
+            | 13202..=13203
+            | 13282..=13283
+            | 13362..=13363
+            | 13442..=13443
+            | 13522..=13523
+            | 13602..=13603
+            | 13682..=13683
+            | 13762..=13763
+            | 13842..=13843
+            | 13922..=13923
+            | 14002..=14003
+            | 18940..=18941
+            | 19020..=19021
+            | 19461..=19462
+            | 19881..=19882
+            | 20286..=20287
+            | 21714..=21715
+            | 21794..=21795
+            | 21874..=21875
+            | 21954..=21955
+            | 22066..=22067
+            | 22146..=22147
+            | 22226..=22227
+            | 22306..=22307
+            | 22594..=22595
+            | 23005..=23006
+            | 23416..=23417
+            | 23827..=23828 => &SHAPE29,
             2876..=2877
             | 2918..=2919
             | 4684..=4685
@@ -2117,92 +2117,92 @@ impl BlockWithShape for BlockState {
             | 7790..=7791
             | 7828..=7829
             | 7870..=7871
-            | 9102..=9103
-            | 9144..=9145
-            | 9746..=9747
-            | 9788..=9789
-            | 9826..=9827
-            | 9868..=9869
-            | 9906..=9907
-            | 9948..=9949
-            | 9986..=9987
-            | 10028..=10029
-            | 10066..=10067
-            | 10108..=10109
-            | 10146..=10147
-            | 10188..=10189
-            | 10327..=10328
-            | 10369..=10370
-            | 10407..=10408
-            | 10449..=10450
-            | 10487..=10488
-            | 10529..=10530
-            | 10943..=10944
-            | 10985..=10986
-            | 12275..=12276
-            | 12317..=12318
-            | 12823..=12824
-            | 12865..=12866
-            | 12903..=12904
-            | 12945..=12946
-            | 12983..=12984
-            | 13025..=13026
-            | 13063..=13064
-            | 13105..=13106
-            | 13143..=13144
-            | 13185..=13186
-            | 13223..=13224
-            | 13265..=13266
-            | 13303..=13304
-            | 13345..=13346
-            | 13383..=13384
-            | 13425..=13426
-            | 13463..=13464
-            | 13505..=13506
-            | 13543..=13544
-            | 13585..=13586
-            | 13623..=13624
-            | 13665..=13666
-            | 13703..=13704
-            | 13745..=13746
-            | 13783..=13784
-            | 13825..=13826
-            | 13863..=13864
-            | 13905..=13906
-            | 18801..=18802
-            | 18843..=18844
-            | 18881..=18882
-            | 18923..=18924
-            | 19322..=19323
-            | 19364..=19365
-            | 19742..=19743
-            | 19784..=19785
-            | 20147..=20148
-            | 20189..=20190
-            | 21575..=21576
-            | 21617..=21618
-            | 21655..=21656
-            | 21697..=21698
-            | 21735..=21736
-            | 21777..=21778
-            | 21815..=21816
-            | 21857..=21858
-            | 21927..=21928
-            | 21969..=21970
-            | 22007..=22008
-            | 22049..=22050
-            | 22087..=22088
-            | 22129..=22130
-            | 22167..=22168
-            | 22209..=22210
-            | 22455..=22456
-            | 22497..=22498
-            | 22866..=22867
-            | 22908..=22909
-            | 23277..=23278
-            | 23319..=23320
-            | 23688..=23689
-            | 23730..=23731 => &SHAPE30,
+            | 9242..=9243
+            | 9284..=9285
+            | 9886..=9887
+            | 9928..=9929
+            | 9966..=9967
+            | 10008..=10009
+            | 10046..=10047
+            | 10088..=10089
+            | 10126..=10127
+            | 10168..=10169
+            | 10206..=10207
+            | 10248..=10249
+            | 10286..=10287
+            | 10328..=10329
+            | 10468..=10469
+            | 10510..=10511
+            | 10548..=10549
+            | 10590..=10591
+            | 10628..=10629
+            | 10670..=10671
+            | 11084..=11085
+            | 11126..=11127
+            | 12416..=12417
+            | 12458..=12459
+            | 12964..=12965
+            | 13006..=13007
+            | 13044..=13045
+            | 13086..=13087
+            | 13124..=13125
+            | 13166..=13167
+            | 13204..=13205
+            | 13246..=13247
+            | 13284..=13285
+            | 13326..=13327
+            | 13364..=13365
+            | 13406..=13407
+            | 13444..=13445
+            | 13486..=13487
+            | 13524..=13525
+            | 13566..=13567
+            | 13604..=13605
+            | 13646..=13647
+            | 13684..=13685
+            | 13726..=13727
+            | 13764..=13765
+            | 13806..=13807
+            | 13844..=13845
+            | 13886..=13887
+            | 13924..=13925
+            | 13966..=13967
+            | 14004..=14005
+            | 14046..=14047
+            | 18942..=18943
+            | 18984..=18985
+            | 19022..=19023
+            | 19064..=19065
+            | 19463..=19464
+            | 19505..=19506
+            | 19883..=19884
+            | 19925..=19926
+            | 20288..=20289
+            | 20330..=20331
+            | 21716..=21717
+            | 21758..=21759
+            | 21796..=21797
+            | 21838..=21839
+            | 21876..=21877
+            | 21918..=21919
+            | 21956..=21957
+            | 21998..=21999
+            | 22068..=22069
+            | 22110..=22111
+            | 22148..=22149
+            | 22190..=22191
+            | 22228..=22229
+            | 22270..=22271
+            | 22308..=22309
+            | 22350..=22351
+            | 22596..=22597
+            | 22638..=22639
+            | 23007..=23008
+            | 23049..=23050
+            | 23418..=23419
+            | 23460..=23461
+            | 23829..=23830
+            | 23871..=23872 => &SHAPE30,
             2878..=2879
             | 2936..=2937
             | 4686..=4687
@@ -2223,92 +2223,92 @@ impl BlockWithShape for BlockState {
             | 7808..=7809
             | 7830..=7831
             | 7888..=7889
-            | 9104..=9105
-            | 9162..=9163
-            | 9748..=9749
-            | 9806..=9807
-            | 9828..=9829
-            | 9886..=9887
-            | 9908..=9909
-            | 9966..=9967
-            | 9988..=9989
-            | 10046..=10047
-            | 10068..=10069
-            | 10126..=10127
-            | 10148..=10149
-            | 10206..=10207
-            | 10329..=10330
-            | 10387..=10388
-            | 10409..=10410
-            | 10467..=10468
-            | 10489..=10490
-            | 10547..=10548
-            | 10945..=10946
-            | 11003..=11004
-            | 12277..=12278
-            | 12335..=12336
-            | 12825..=12826
-            | 12883..=12884
-            | 12905..=12906
-            | 12963..=12964
-            | 12985..=12986
-            | 13043..=13044
-            | 13065..=13066
-            | 13123..=13124
-            | 13145..=13146
-            | 13203..=13204
-            | 13225..=13226
-            | 13283..=13284
-            | 13305..=13306
-            | 13363..=13364
-            | 13385..=13386
-            | 13443..=13444
-            | 13465..=13466
-            | 13523..=13524
-            | 13545..=13546
-            | 13603..=13604
-            | 13625..=13626
-            | 13683..=13684
-            | 13705..=13706
-            | 13763..=13764
-            | 13785..=13786
-            | 13843..=13844
-            | 13865..=13866
-            | 13923..=13924
-            | 18803..=18804
-            | 18861..=18862
-            | 18883..=18884
-            | 18941..=18942
-            | 19324..=19325
-            | 19382..=19383
-            | 19744..=19745
-            | 19802..=19803
-            | 20149..=20150
-            | 20207..=20208
-            | 21577..=21578
-            | 21635..=21636
-            | 21657..=21658
-            | 21715..=21716
-            | 21737..=21738
-            | 21795..=21796
-            | 21817..=21818
-            | 21875..=21876
-            | 21929..=21930
-            | 21987..=21988
-            | 22009..=22010
-            | 22067..=22068
-            | 22089..=22090
-            | 22147..=22148
-            | 22169..=22170
-            | 22227..=22228
-            | 22457..=22458
-            | 22515..=22516
-            | 22868..=22869
-            | 22926..=22927
-            | 23279..=23280
-            | 23337..=23338
-            | 23690..=23691
-            | 23748..=23749 => &SHAPE31,
+            | 9244..=9245
+            | 9302..=9303
+            | 9888..=9889
+            | 9946..=9947
+            | 9968..=9969
+            | 10026..=10027
+            | 10048..=10049
+            | 10106..=10107
+            | 10128..=10129
+            | 10186..=10187
+            | 10208..=10209
+            | 10266..=10267
+            | 10288..=10289
+            | 10346..=10347
+            | 10470..=10471
+            | 10528..=10529
+            | 10550..=10551
+            | 10608..=10609
+            | 10630..=10631
+            | 10688..=10689
+            | 11086..=11087
+            | 11144..=11145
+            | 12418..=12419
+            | 12476..=12477
+            | 12966..=12967
+            | 13024..=13025
+            | 13046..=13047
+            | 13104..=13105
+            | 13126..=13127
+            | 13184..=13185
+            | 13206..=13207
+            | 13264..=13265
+            | 13286..=13287
+            | 13344..=13345
+            | 13366..=13367
+            | 13424..=13425
+            | 13446..=13447
+            | 13504..=13505
+            | 13526..=13527
+            | 13584..=13585
+            | 13606..=13607
+            | 13664..=13665
+            | 13686..=13687
+            | 13744..=13745
+            | 13766..=13767
+            | 13824..=13825
+            | 13846..=13847
+            | 13904..=13905
+            | 13926..=13927
+            | 13984..=13985
+            | 14006..=14007
+            | 14064..=14065
+            | 18944..=18945
+            | 19002..=19003
+            | 19024..=19025
+            | 19082..=19083
+            | 19465..=19466
+            | 19523..=19524
+            | 19885..=19886
+            | 19943..=19944
+            | 20290..=20291
+            | 20348..=20349
+            | 21718..=21719
+            | 21776..=21777
+            | 21798..=21799
+            | 21856..=21857
+            | 21878..=21879
+            | 21936..=21937
+            | 21958..=21959
+            | 22016..=22017
+            | 22070..=22071
+            | 22128..=22129
+            | 22150..=22151
+            | 22208..=22209
+            | 22230..=22231
+            | 22288..=22289
+            | 22310..=22311
+            | 22368..=22369
+            | 22598..=22599
+            | 22656..=22657
+            | 23009..=23010
+            | 23067..=23068
+            | 23420..=23421
+            | 23478..=23479
+            | 23831..=23832
+            | 23889..=23890 => &SHAPE31,
             2880..=2881
             | 2922..=2923
             | 4688..=4689
@@ -2329,92 +2329,92 @@ impl BlockWithShape for BlockState {
             | 7794..=7795
             | 7832..=7833
             | 7874..=7875
-            | 9106..=9107
-            | 9148..=9149
-            | 9750..=9751
-            | 9792..=9793
-            | 9830..=9831
-            | 9872..=9873
-            | 9910..=9911
-            | 9952..=9953
-            | 9990..=9991
-            | 10032..=10033
-            | 10070..=10071
-            | 10112..=10113
-            | 10150..=10151
-            | 10192..=10193
-            | 10331..=10332
-            | 10373..=10374
-            | 10411..=10412
-            | 10453..=10454
-            | 10491..=10492
-            | 10533..=10534
-            | 10947..=10948
-            | 10989..=10990
-            | 12279..=12280
-            | 12321..=12322
-            | 12827..=12828
-            | 12869..=12870
-            | 12907..=12908
-            | 12949..=12950
-            | 12987..=12988
-            | 13029..=13030
-            | 13067..=13068
-            | 13109..=13110
-            | 13147..=13148
-            | 13189..=13190
-            | 13227..=13228
-            | 13269..=13270
-            | 13307..=13308
-            | 13349..=13350
-            | 13387..=13388
-            | 13429..=13430
-            | 13467..=13468
-            | 13509..=13510
-            | 13547..=13548
-            | 13589..=13590
-            | 13627..=13628
-            | 13669..=13670
-            | 13707..=13708
-            | 13749..=13750
-            | 13787..=13788
-            | 13829..=13830
-            | 13867..=13868
-            | 13909..=13910
-            | 18805..=18806
-            | 18847..=18848
-            | 18885..=18886
-            | 18927..=18928
-            | 19326..=19327
-            | 19368..=19369
-            | 19746..=19747
-            | 19788..=19789
-            | 20151..=20152
-            | 20193..=20194
-            | 21579..=21580
-            | 21621..=21622
-            | 21659..=21660
-            | 21701..=21702
-            | 21739..=21740
-            | 21781..=21782
-            | 21819..=21820
-            | 21861..=21862
-            | 21931..=21932
-            | 21973..=21974
-            | 22011..=22012
-            | 22053..=22054
-            | 22091..=22092
-            | 22133..=22134
-            | 22171..=22172
-            | 22213..=22214
-            | 22459..=22460
-            | 22501..=22502
-            | 22870..=22871
-            | 22912..=22913
-            | 23281..=23282
-            | 23323..=23324
-            | 23692..=23693
-            | 23734..=23735 => &SHAPE32,
+            | 9246..=9247
+            | 9288..=9289
+            | 9890..=9891
+            | 9932..=9933
+            | 9970..=9971
+            | 10012..=10013
+            | 10050..=10051
+            | 10092..=10093
+            | 10130..=10131
+            | 10172..=10173
+            | 10210..=10211
+            | 10252..=10253
+            | 10290..=10291
+            | 10332..=10333
+            | 10472..=10473
+            | 10514..=10515
+            | 10552..=10553
+            | 10594..=10595
+            | 10632..=10633
+            | 10674..=10675
+            | 11088..=11089
+            | 11130..=11131
+            | 12420..=12421
+            | 12462..=12463
+            | 12968..=12969
+            | 13010..=13011
+            | 13048..=13049
+            | 13090..=13091
+            | 13128..=13129
+            | 13170..=13171
+            | 13208..=13209
+            | 13250..=13251
+            | 13288..=13289
+            | 13330..=13331
+            | 13368..=13369
+            | 13410..=13411
+            | 13448..=13449
+            | 13490..=13491
+            | 13528..=13529
+            | 13570..=13571
+            | 13608..=13609
+            | 13650..=13651
+            | 13688..=13689
+            | 13730..=13731
+            | 13768..=13769
+            | 13810..=13811
+            | 13848..=13849
+            | 13890..=13891
+            | 13928..=13929
+            | 13970..=13971
+            | 14008..=14009
+            | 14050..=14051
+            | 18946..=18947
+            | 18988..=18989
+            | 19026..=19027
+            | 19068..=19069
+            | 19467..=19468
+            | 19509..=19510
+            | 19887..=19888
+            | 19929..=19930
+            | 20292..=20293
+            | 20334..=20335
+            | 21720..=21721
+            | 21762..=21763
+            | 21800..=21801
+            | 21842..=21843
+            | 21880..=21881
+            | 21922..=21923
+            | 21960..=21961
+            | 22002..=22003
+            | 22072..=22073
+            | 22114..=22115
+            | 22152..=22153
+            | 22194..=22195
+            | 22232..=22233
+            | 22274..=22275
+            | 22312..=22313
+            | 22354..=22355
+            | 22600..=22601
+            | 22642..=22643
+            | 23011..=23012
+            | 23053..=23054
+            | 23422..=23423
+            | 23464..=23465
+            | 23833..=23834
+            | 23875..=23876 => &SHAPE32,
             2882..=2883
             | 2940..=2941
             | 4690..=4691
@@ -2435,92 +2435,92 @@ impl BlockWithShape for BlockState {
             | 7812..=7813
             | 7834..=7835
             | 7892..=7893
-            | 9108..=9109
-            | 9166..=9167
-            | 9752..=9753
-            | 9810..=9811
-            | 9832..=9833
-            | 9890..=9891
-            | 9912..=9913
-            | 9970..=9971
-            | 9992..=9993
-            | 10050..=10051
-            | 10072..=10073
-            | 10130..=10131
-            | 10152..=10153
-            | 10210..=10211
-            | 10333..=10334
-            | 10391..=10392
-            | 10413..=10414
-            | 10471..=10472
-            | 10493..=10494
-            | 10551..=10552
-            | 10949..=10950
-            | 11007..=11008
-            | 12281..=12282
-            | 12339..=12340
-            | 12829..=12830
-            | 12887..=12888
-            | 12909..=12910
-            | 12967..=12968
-            | 12989..=12990
-            | 13047..=13048
-            | 13069..=13070
-            | 13127..=13128
-            | 13149..=13150
-            | 13207..=13208
-            | 13229..=13230
-            | 13287..=13288
-            | 13309..=13310
-            | 13367..=13368
-            | 13389..=13390
-            | 13447..=13448
-            | 13469..=13470
-            | 13527..=13528
-            | 13549..=13550
-            | 13607..=13608
-            | 13629..=13630
-            | 13687..=13688
-            | 13709..=13710
-            | 13767..=13768
-            | 13789..=13790
-            | 13847..=13848
-            | 13869..=13870
-            | 13927..=13928
-            | 18807..=18808
-            | 18865..=18866
-            | 18887..=18888
-            | 18945..=18946
-            | 19328..=19329
-            | 19386..=19387
-            | 19748..=19749
-            | 19806..=19807
-            | 20153..=20154
-            | 20211..=20212
-            | 21581..=21582
-            | 21639..=21640
-            | 21661..=21662
-            | 21719..=21720
-            | 21741..=21742
-            | 21799..=21800
-            | 21821..=21822
-            | 21879..=21880
-            | 21933..=21934
-            | 21991..=21992
-            | 22013..=22014
-            | 22071..=22072
-            | 22093..=22094
-            | 22151..=22152
-            | 22173..=22174
-            | 22231..=22232
-            | 22461..=22462
-            | 22519..=22520
-            | 22872..=22873
-            | 22930..=22931
-            | 23283..=23284
-            | 23341..=23342
-            | 23694..=23695
-            | 23752..=23753 => &SHAPE33,
+            | 9248..=9249
+            | 9306..=9307
+            | 9892..=9893
+            | 9950..=9951
+            | 9972..=9973
+            | 10030..=10031
+            | 10052..=10053
+            | 10110..=10111
+            | 10132..=10133
+            | 10190..=10191
+            | 10212..=10213
+            | 10270..=10271
+            | 10292..=10293
+            | 10350..=10351
+            | 10474..=10475
+            | 10532..=10533
+            | 10554..=10555
+            | 10612..=10613
+            | 10634..=10635
+            | 10692..=10693
+            | 11090..=11091
+            | 11148..=11149
+            | 12422..=12423
+            | 12480..=12481
+            | 12970..=12971
+            | 13028..=13029
+            | 13050..=13051
+            | 13108..=13109
+            | 13130..=13131
+            | 13188..=13189
+            | 13210..=13211
+            | 13268..=13269
+            | 13290..=13291
+            | 13348..=13349
+            | 13370..=13371
+            | 13428..=13429
+            | 13450..=13451
+            | 13508..=13509
+            | 13530..=13531
+            | 13588..=13589
+            | 13610..=13611
+            | 13668..=13669
+            | 13690..=13691
+            | 13748..=13749
+            | 13770..=13771
+            | 13828..=13829
+            | 13850..=13851
+            | 13908..=13909
+            | 13930..=13931
+            | 13988..=13989
+            | 14010..=14011
+            | 14068..=14069
+            | 18948..=18949
+            | 19006..=19007
+            | 19028..=19029
+            | 19086..=19087
+            | 19469..=19470
+            | 19527..=19528
+            | 19889..=19890
+            | 19947..=19948
+            | 20294..=20295
+            | 20352..=20353
+            | 21722..=21723
+            | 21780..=21781
+            | 21802..=21803
+            | 21860..=21861
+            | 21882..=21883
+            | 21940..=21941
+            | 21962..=21963
+            | 22020..=22021
+            | 22074..=22075
+            | 22132..=22133
+            | 22154..=22155
+            | 22212..=22213
+            | 22234..=22235
+            | 22292..=22293
+            | 22314..=22315
+            | 22372..=22373
+            | 22602..=22603
+            | 22660..=22661
+            | 23013..=23014
+            | 23071..=23072
+            | 23424..=23425
+            | 23482..=23483
+            | 23835..=23836
+            | 23893..=23894 => &SHAPE33,
             2884..=2885
             | 4692..=4693
             | 7039..=7040
@@ -2531,49 +2531,49 @@ impl BlockWithShape for BlockState {
             | 7676..=7677
             | 7756..=7757
             | 7836..=7837
-            | 9110..=9111
-            | 9754..=9755
-            | 9834..=9835
-            | 9914..=9915
-            | 9994..=9995
-            | 10074..=10075
-            | 10154..=10155
-            | 10335..=10336
-            | 10415..=10416
-            | 10495..=10496
-            | 10951..=10952
-            | 12283..=12284
-            | 12831..=12832
-            | 12911..=12912
-            | 12991..=12992
-            | 13071..=13072
-            | 13151..=13152
-            | 13231..=13232
-            | 13311..=13312
-            | 13391..=13392
-            | 13471..=13472
-            | 13551..=13552
-            | 13631..=13632
-            | 13711..=13712
-            | 13791..=13792
-            | 13871..=13872
-            | 18809..=18810
-            | 18889..=18890
-            | 19330..=19331
-            | 19750..=19751
-            | 20155..=20156
-            | 21583..=21584
-            | 21663..=21664
-            | 21743..=21744
-            | 21823..=21824
-            | 21935..=21936
-            | 22015..=22016
-            | 22095..=22096
-            | 22175..=22176
-            | 22463..=22464
-            | 22874..=22875
-            | 23285..=23286
-            | 23696..=23697 => &SHAPE34,
+            | 9250..=9251
+            | 9894..=9895
+            | 9974..=9975
+            | 10054..=10055
+            | 10134..=10135
+            | 10214..=10215
+            | 10294..=10295
+            | 10476..=10477
+            | 10556..=10557
+            | 10636..=10637
+            | 11092..=11093
+            | 12424..=12425
+            | 12972..=12973
+            | 13052..=13053
+            | 13132..=13133
+            | 13212..=13213
+            | 13292..=13293
+            | 13372..=13373
+            | 13452..=13453
+            | 13532..=13533
+            | 13612..=13613
+            | 13692..=13693
+            | 13772..=13773
+            | 13852..=13853
+            | 13932..=13933
+            | 14012..=14013
+            | 18950..=18951
+            | 19030..=19031
+            | 19471..=19472
+            | 19891..=19892
+            | 20296..=20297
+            | 21724..=21725
+            | 21804..=21805
+            | 21884..=21885
+            | 21964..=21965
+            | 22076..=22077
+            | 22156..=22157
+            | 22236..=22237
+            | 22316..=22317
+            | 22604..=22605
+            | 23015..=23016
+            | 23426..=23427
+            | 23837..=23838 => &SHAPE34,
             2886..=2887
             | 2928..=2929
             | 4694..=4695
@@ -2594,92 +2594,92 @@ impl BlockWithShape for BlockState {
             | 7800..=7801
             | 7838..=7839
             | 7880..=7881
-            | 9112..=9113
-            | 9154..=9155
-            | 9756..=9757
-            | 9798..=9799
-            | 9836..=9837
-            | 9878..=9879
-            | 9916..=9917
-            | 9958..=9959
-            | 9996..=9997
-            | 10038..=10039
-            | 10076..=10077
-            | 10118..=10119
-            | 10156..=10157
-            | 10198..=10199
-            | 10337..=10338
-            | 10379..=10380
-            | 10417..=10418
-            | 10459..=10460
-            | 10497..=10498
-            | 10539..=10540
-            | 10953..=10954
-            | 10995..=10996
-            | 12285..=12286
-            | 12327..=12328
-            | 12833..=12834
-            | 12875..=12876
-            | 12913..=12914
-            | 12955..=12956
-            | 12993..=12994
-            | 13035..=13036
-            | 13073..=13074
-            | 13115..=13116
-            | 13153..=13154
-            | 13195..=13196
-            | 13233..=13234
-            | 13275..=13276
-            | 13313..=13314
-            | 13355..=13356
-            | 13393..=13394
-            | 13435..=13436
-            | 13473..=13474
-            | 13515..=13516
-            | 13553..=13554
-            | 13595..=13596
-            | 13633..=13634
-            | 13675..=13676
-            | 13713..=13714
-            | 13755..=13756
-            | 13793..=13794
-            | 13835..=13836
-            | 13873..=13874
-            | 13915..=13916
-            | 18811..=18812
-            | 18853..=18854
-            | 18891..=18892
-            | 18933..=18934
-            | 19332..=19333
-            | 19374..=19375
-            | 19752..=19753
-            | 19794..=19795
-            | 20157..=20158
-            | 20199..=20200
-            | 21585..=21586
-            | 21627..=21628
-            | 21665..=21666
-            | 21707..=21708
-            | 21745..=21746
-            | 21787..=21788
-            | 21825..=21826
-            | 21867..=21868
-            | 21937..=21938
-            | 21979..=21980
-            | 22017..=22018
-            | 22059..=22060
-            | 22097..=22098
-            | 22139..=22140
-            | 22177..=22178
-            | 22219..=22220
-            | 22465..=22466
-            | 22507..=22508
-            | 22876..=22877
-            | 22918..=22919
-            | 23287..=23288
-            | 23329..=23330
-            | 23698..=23699
-            | 23740..=23741 => &SHAPE35,
+            | 9252..=9253
+            | 9294..=9295
+            | 9896..=9897
+            | 9938..=9939
+            | 9976..=9977
+            | 10018..=10019
+            | 10056..=10057
+            | 10098..=10099
+            | 10136..=10137
+            | 10178..=10179
+            | 10216..=10217
+            | 10258..=10259
+            | 10296..=10297
+            | 10338..=10339
+            | 10478..=10479
+            | 10520..=10521
+            | 10558..=10559
+            | 10600..=10601
+            | 10638..=10639
+            | 10680..=10681
+            | 11094..=11095
+            | 11136..=11137
+            | 12426..=12427
+            | 12468..=12469
+            | 12974..=12975
+            | 13016..=13017
+            | 13054..=13055
+            | 13096..=13097
+            | 13134..=13135
+            | 13176..=13177
+            | 13214..=13215
+            | 13256..=13257
+            | 13294..=13295
+            | 13336..=13337
+            | 13374..=13375
+            | 13416..=13417
+            | 13454..=13455
+            | 13496..=13497
+            | 13534..=13535
+            | 13576..=13577
+            | 13614..=13615
+            | 13656..=13657
+            | 13694..=13695
+            | 13736..=13737
+            | 13774..=13775
+            | 13816..=13817
+            | 13854..=13855
+            | 13896..=13897
+            | 13934..=13935
+            | 13976..=13977
+            | 14014..=14015
+            | 14056..=14057
+            | 18952..=18953
+            | 18994..=18995
+            | 19032..=19033
+            | 19074..=19075
+            | 19473..=19474
+            | 19515..=19516
+            | 19893..=19894
+            | 19935..=19936
+            | 20298..=20299
+            | 20340..=20341
+            | 21726..=21727
+            | 21768..=21769
+            | 21806..=21807
+            | 21848..=21849
+            | 21886..=21887
+            | 21928..=21929
+            | 21966..=21967
+            | 22008..=22009
+            | 22078..=22079
+            | 22120..=22121
+            | 22158..=22159
+            | 22200..=22201
+            | 22238..=22239
+            | 22280..=22281
+            | 22318..=22319
+            | 22360..=22361
+            | 22606..=22607
+            | 22648..=22649
+            | 23017..=23018
+            | 23059..=23060
+            | 23428..=23429
+            | 23470..=23471
+            | 23839..=23840
+            | 23881..=23882 => &SHAPE35,
             2888..=2889
             | 2946..=2947
             | 4696..=4697
@@ -2700,92 +2700,92 @@ impl BlockWithShape for BlockState {
             | 7818..=7819
             | 7840..=7841
             | 7898..=7899
-            | 9114..=9115
-            | 9172..=9173
-            | 9758..=9759
-            | 9816..=9817
-            | 9838..=9839
-            | 9896..=9897
-            | 9918..=9919
-            | 9976..=9977
-            | 9998..=9999
-            | 10056..=10057
-            | 10078..=10079
-            | 10136..=10137
-            | 10158..=10159
-            | 10216..=10217
-            | 10339..=10340
-            | 10397..=10398
-            | 10419..=10420
-            | 10477..=10478
-            | 10499..=10500
-            | 10557..=10558
-            | 10955..=10956
-            | 11013..=11014
-            | 12287..=12288
-            | 12345..=12346
-            | 12835..=12836
-            | 12893..=12894
-            | 12915..=12916
-            | 12973..=12974
-            | 12995..=12996
-            | 13053..=13054
-            | 13075..=13076
-            | 13133..=13134
-            | 13155..=13156
-            | 13213..=13214
-            | 13235..=13236
-            | 13293..=13294
-            | 13315..=13316
-            | 13373..=13374
-            | 13395..=13396
-            | 13453..=13454
-            | 13475..=13476
-            | 13533..=13534
-            | 13555..=13556
-            | 13613..=13614
-            | 13635..=13636
-            | 13693..=13694
-            | 13715..=13716
-            | 13773..=13774
-            | 13795..=13796
-            | 13853..=13854
-            | 13875..=13876
-            | 13933..=13934
-            | 18813..=18814
-            | 18871..=18872
-            | 18893..=18894
-            | 18951..=18952
-            | 19334..=19335
-            | 19392..=19393
-            | 19754..=19755
-            | 19812..=19813
-            | 20159..=20160
-            | 20217..=20218
-            | 21587..=21588
-            | 21645..=21646
-            | 21667..=21668
-            | 21725..=21726
-            | 21747..=21748
-            | 21805..=21806
-            | 21827..=21828
-            | 21885..=21886
-            | 21939..=21940
-            | 21997..=21998
-            | 22019..=22020
-            | 22077..=22078
-            | 22099..=22100
-            | 22157..=22158
-            | 22179..=22180
-            | 22237..=22238
-            | 22467..=22468
-            | 22525..=22526
-            | 22878..=22879
-            | 22936..=22937
-            | 23289..=23290
-            | 23347..=23348
-            | 23700..=23701
-            | 23758..=23759 => &SHAPE36,
+            | 9254..=9255
+            | 9312..=9313
+            | 9898..=9899
+            | 9956..=9957
+            | 9978..=9979
+            | 10036..=10037
+            | 10058..=10059
+            | 10116..=10117
+            | 10138..=10139
+            | 10196..=10197
+            | 10218..=10219
+            | 10276..=10277
+            | 10298..=10299
+            | 10356..=10357
+            | 10480..=10481
+            | 10538..=10539
+            | 10560..=10561
+            | 10618..=10619
+            | 10640..=10641
+            | 10698..=10699
+            | 11096..=11097
+            | 11154..=11155
+            | 12428..=12429
+            | 12486..=12487
+            | 12976..=12977
+            | 13034..=13035
+            | 13056..=13057
+            | 13114..=13115
+            | 13136..=13137
+            | 13194..=13195
+            | 13216..=13217
+            | 13274..=13275
+            | 13296..=13297
+            | 13354..=13355
+            | 13376..=13377
+            | 13434..=13435
+            | 13456..=13457
+            | 13514..=13515
+            | 13536..=13537
+            | 13594..=13595
+            | 13616..=13617
+            | 13674..=13675
+            | 13696..=13697
+            | 13754..=13755
+            | 13776..=13777
+            | 13834..=13835
+            | 13856..=13857
+            | 13914..=13915
+            | 13936..=13937
+            | 13994..=13995
+            | 14016..=14017
+            | 14074..=14075
+            | 18954..=18955
+            | 19012..=19013
+            | 19034..=19035
+            | 19092..=19093
+            | 19475..=19476
+            | 19533..=19534
+            | 19895..=19896
+            | 19953..=19954
+            | 20300..=20301
+            | 20358..=20359
+            | 21728..=21729
+            | 21786..=21787
+            | 21808..=21809
+            | 21866..=21867
+            | 21888..=21889
+            | 21946..=21947
+            | 21968..=21969
+            | 22026..=22027
+            | 22080..=22081
+            | 22138..=22139
+            | 22160..=22161
+            | 22218..=22219
+            | 22240..=22241
+            | 22298..=22299
+            | 22320..=22321
+            | 22378..=22379
+            | 22608..=22609
+            | 22666..=22667
+            | 23019..=23020
+            | 23077..=23078
+            | 23430..=23431
+            | 23488..=23489
+            | 23841..=23842
+            | 23899..=23900 => &SHAPE36,
             2890..=2891
             | 2932..=2933
             | 4698..=4699
@@ -2806,92 +2806,92 @@ impl BlockWithShape for BlockState {
             | 7804..=7805
             | 7842..=7843
             | 7884..=7885
-            | 9116..=9117
-            | 9158..=9159
-            | 9760..=9761
-            | 9802..=9803
-            | 9840..=9841
-            | 9882..=9883
-            | 9920..=9921
-            | 9962..=9963
-            | 10000..=10001
-            | 10042..=10043
-            | 10080..=10081
-            | 10122..=10123
-            | 10160..=10161
-            | 10202..=10203
-            | 10341..=10342
-            | 10383..=10384
-            | 10421..=10422
-            | 10463..=10464
-            | 10501..=10502
-            | 10543..=10544
-            | 10957..=10958
-            | 10999..=11000
-            | 12289..=12290
-            | 12331..=12332
-            | 12837..=12838
-            | 12879..=12880
-            | 12917..=12918
-            | 12959..=12960
-            | 12997..=12998
-            | 13039..=13040
-            | 13077..=13078
-            | 13119..=13120
-            | 13157..=13158
-            | 13199..=13200
-            | 13237..=13238
-            | 13279..=13280
-            | 13317..=13318
-            | 13359..=13360
-            | 13397..=13398
-            | 13439..=13440
-            | 13477..=13478
-            | 13519..=13520
-            | 13557..=13558
-            | 13599..=13600
-            | 13637..=13638
-            | 13679..=13680
-            | 13717..=13718
-            | 13759..=13760
-            | 13797..=13798
-            | 13839..=13840
-            | 13877..=13878
-            | 13919..=13920
-            | 18815..=18816
-            | 18857..=18858
-            | 18895..=18896
-            | 18937..=18938
-            | 19336..=19337
-            | 19378..=19379
-            | 19756..=19757
-            | 19798..=19799
-            | 20161..=20162
-            | 20203..=20204
-            | 21589..=21590
-            | 21631..=21632
-            | 21669..=21670
-            | 21711..=21712
-            | 21749..=21750
-            | 21791..=21792
-            | 21829..=21830
-            | 21871..=21872
-            | 21941..=21942
-            | 21983..=21984
-            | 22021..=22022
-            | 22063..=22064
-            | 22101..=22102
-            | 22143..=22144
-            | 22181..=22182
-            | 22223..=22224
-            | 22469..=22470
-            | 22511..=22512
-            | 22880..=22881
-            | 22922..=22923
-            | 23291..=23292
-            | 23333..=23334
-            | 23702..=23703
-            | 23744..=23745 => &SHAPE37,
+            | 9256..=9257
+            | 9298..=9299
+            | 9900..=9901
+            | 9942..=9943
+            | 9980..=9981
+            | 10022..=10023
+            | 10060..=10061
+            | 10102..=10103
+            | 10140..=10141
+            | 10182..=10183
+            | 10220..=10221
+            | 10262..=10263
+            | 10300..=10301
+            | 10342..=10343
+            | 10482..=10483
+            | 10524..=10525
+            | 10562..=10563
+            | 10604..=10605
+            | 10642..=10643
+            | 10684..=10685
+            | 11098..=11099
+            | 11140..=11141
+            | 12430..=12431
+            | 12472..=12473
+            | 12978..=12979
+            | 13020..=13021
+            | 13058..=13059
+            | 13100..=13101
+            | 13138..=13139
+            | 13180..=13181
+            | 13218..=13219
+            | 13260..=13261
+            | 13298..=13299
+            | 13340..=13341
+            | 13378..=13379
+            | 13420..=13421
+            | 13458..=13459
+            | 13500..=13501
+            | 13538..=13539
+            | 13580..=13581
+            | 13618..=13619
+            | 13660..=13661
+            | 13698..=13699
+            | 13740..=13741
+            | 13778..=13779
+            | 13820..=13821
+            | 13858..=13859
+            | 13900..=13901
+            | 13938..=13939
+            | 13980..=13981
+            | 14018..=14019
+            | 14060..=14061
+            | 18956..=18957
+            | 18998..=18999
+            | 19036..=19037
+            | 19078..=19079
+            | 19477..=19478
+            | 19519..=19520
+            | 19897..=19898
+            | 19939..=19940
+            | 20302..=20303
+            | 20344..=20345
+            | 21730..=21731
+            | 21772..=21773
+            | 21810..=21811
+            | 21852..=21853
+            | 21890..=21891
+            | 21932..=21933
+            | 21970..=21971
+            | 22012..=22013
+            | 22082..=22083
+            | 22124..=22125
+            | 22162..=22163
+            | 22204..=22205
+            | 22242..=22243
+            | 22284..=22285
+            | 22322..=22323
+            | 22364..=22365
+            | 22610..=22611
+            | 22652..=22653
+            | 23021..=23022
+            | 23063..=23064
+            | 23432..=23433
+            | 23474..=23475
+            | 23843..=23844
+            | 23885..=23886 => &SHAPE37,
             2892..=2893
             | 2950..=2951
             | 4700..=4701
@@ -2912,92 +2912,92 @@ impl BlockWithShape for BlockState {
             | 7822..=7823
             | 7844..=7845
             | 7902..=7903
-            | 9118..=9119
-            | 9176..=9177
-            | 9762..=9763
-            | 9820..=9821
-            | 9842..=9843
-            | 9900..=9901
-            | 9922..=9923
-            | 9980..=9981
-            | 10002..=10003
-            | 10060..=10061
-            | 10082..=10083
-            | 10140..=10141
-            | 10162..=10163
-            | 10220..=10221
-            | 10343..=10344
-            | 10401..=10402
-            | 10423..=10424
-            | 10481..=10482
-            | 10503..=10504
-            | 10561..=10562
-            | 10959..=10960
-            | 11017..=11018
-            | 12291..=12292
-            | 12349..=12350
-            | 12839..=12840
-            | 12897..=12898
-            | 12919..=12920
-            | 12977..=12978
-            | 12999..=13000
-            | 13057..=13058
-            | 13079..=13080
-            | 13137..=13138
-            | 13159..=13160
-            | 13217..=13218
-            | 13239..=13240
-            | 13297..=13298
-            | 13319..=13320
-            | 13377..=13378
-            | 13399..=13400
-            | 13457..=13458
-            | 13479..=13480
-            | 13537..=13538
-            | 13559..=13560
-            | 13617..=13618
-            | 13639..=13640
-            | 13697..=13698
-            | 13719..=13720
-            | 13777..=13778
-            | 13799..=13800
-            | 13857..=13858
-            | 13879..=13880
-            | 13937..=13938
-            | 18817..=18818
-            | 18875..=18876
-            | 18897..=18898
-            | 18955..=18956
-            | 19338..=19339
-            | 19396..=19397
-            | 19758..=19759
-            | 19816..=19817
-            | 20163..=20164
-            | 20221..=20222
-            | 21591..=21592
-            | 21649..=21650
-            | 21671..=21672
-            | 21729..=21730
-            | 21751..=21752
-            | 21809..=21810
-            | 21831..=21832
-            | 21889..=21890
-            | 21943..=21944
-            | 22001..=22002
-            | 22023..=22024
-            | 22081..=22082
-            | 22103..=22104
-            | 22161..=22162
-            | 22183..=22184
-            | 22241..=22242
-            | 22471..=22472
-            | 22529..=22530
-            | 22882..=22883
-            | 22940..=22941
-            | 23293..=23294
-            | 23351..=23352
-            | 23704..=23705
-            | 23762..=23763 => &SHAPE38,
+            | 9258..=9259
+            | 9316..=9317
+            | 9902..=9903
+            | 9960..=9961
+            | 9982..=9983
+            | 10040..=10041
+            | 10062..=10063
+            | 10120..=10121
+            | 10142..=10143
+            | 10200..=10201
+            | 10222..=10223
+            | 10280..=10281
+            | 10302..=10303
+            | 10360..=10361
+            | 10484..=10485
+            | 10542..=10543
+            | 10564..=10565
+            | 10622..=10623
+            | 10644..=10645
+            | 10702..=10703
+            | 11100..=11101
+            | 11158..=11159
+            | 12432..=12433
+            | 12490..=12491
+            | 12980..=12981
+            | 13038..=13039
+            | 13060..=13061
+            | 13118..=13119
+            | 13140..=13141
+            | 13198..=13199
+            | 13220..=13221
+            | 13278..=13279
+            | 13300..=13301
+            | 13358..=13359
+            | 13380..=13381
+            | 13438..=13439
+            | 13460..=13461
+            | 13518..=13519
+            | 13540..=13541
+            | 13598..=13599
+            | 13620..=13621
+            | 13678..=13679
+            | 13700..=13701
+            | 13758..=13759
+            | 13780..=13781
+            | 13838..=13839
+            | 13860..=13861
+            | 13918..=13919
+            | 13940..=13941
+            | 13998..=13999
+            | 14020..=14021
+            | 14078..=14079
+            | 18958..=18959
+            | 19016..=19017
+            | 19038..=19039
+            | 19096..=19097
+            | 19479..=19480
+            | 19537..=19538
+            | 19899..=19900
+            | 19957..=19958
+            | 20304..=20305
+            | 20362..=20363
+            | 21732..=21733
+            | 21790..=21791
+            | 21812..=21813
+            | 21870..=21871
+            | 21892..=21893
+            | 21950..=21951
+            | 21972..=21973
+            | 22030..=22031
+            | 22084..=22085
+            | 22142..=22143
+            | 22164..=22165
+            | 22222..=22223
+            | 22244..=22245
+            | 22302..=22303
+            | 22324..=22325
+            | 22382..=22383
+            | 22612..=22613
+            | 22670..=22671
+            | 23023..=23024
+            | 23081..=23082
+            | 23434..=23435
+            | 23492..=23493
+            | 23845..=23846
+            | 23903..=23904 => &SHAPE38,
             2894..=2895
             | 4702..=4703
             | 7049..=7050
@@ -3008,53 +3008,53 @@ impl BlockWithShape for BlockState {
             | 7686..=7687
             | 7766..=7767
             | 7846..=7847
-            | 9120..=9121
-            | 9764..=9765
-            | 9844..=9845
-            | 9924..=9925
-            | 10004..=10005
-            | 10084..=10085
-            | 10164..=10165
-            | 10345..=10346
-            | 10425..=10426
-            | 10505..=10506
-            | 10961..=10962
-            | 12293..=12294
-            | 12841..=12842
-            | 12921..=12922
-            | 13001..=13002
-            | 13081..=13082
-            | 13161..=13162
-            | 13241..=13242
-            | 13321..=13322
-            | 13401..=13402
-            | 13481..=13482
-            | 13561..=13562
-            | 13641..=13642
-            | 13721..=13722
-            | 13801..=13802
-            | 13881..=13882
-            | 18819..=18820
-            | 18899..=18900
-            | 19340..=19341
-            | 19760..=19761
-            | 20165..=20166
-            | 21593..=21594
-            | 21673..=21674
-            | 21753..=21754
-            | 21833..=21834
-            | 21945..=21946
-            | 22025..=22026
-            | 22105..=22106
-            | 22185..=22186
-            | 22473..=22474
-            | 22884..=22885
-            | 23295..=23296
-            | 23706..=23707 => &SHAPE39,
-            2896..=2897
-            | 2938..=2939
-            | 4704..=4705
-            | 4746..=4747
+            | 9260..=9261
+            | 9904..=9905
+            | 9984..=9985
+            | 10064..=10065
+            | 10144..=10145
+            | 10224..=10225
+            | 10304..=10305
+            | 10486..=10487
+            | 10566..=10567
+            | 10646..=10647
+            | 11102..=11103
+            | 12434..=12435
+            | 12982..=12983
+            | 13062..=13063
+            | 13142..=13143
+            | 13222..=13223
+            | 13302..=13303
+            | 13382..=13383
+            | 13462..=13463
+            | 13542..=13543
+            | 13622..=13623
+            | 13702..=13703
+            | 13782..=13783
+            | 13862..=13863
+            | 13942..=13943
+            | 14022..=14023
+            | 18960..=18961
+            | 19040..=19041
+            | 19481..=19482
+            | 19901..=19902
+            | 20306..=20307
+            | 21734..=21735
+            | 21814..=21815
+            | 21894..=21895
+            | 21974..=21975
+            | 22086..=22087
+            | 22166..=22167
+            | 22246..=22247
+            | 22326..=22327
+            | 22614..=22615
+            | 23025..=23026
+            | 23436..=23437
+            | 23847..=23848 => &SHAPE39,
+            2896..=2897
+            | 2938..=2939
+            | 4704..=4705
+            | 4746..=4747
             | 7051..=7052
             | 7093..=7094
             | 7131..=7132
@@ -3071,92 +3071,92 @@ impl BlockWithShape for BlockState {
             | 7810..=7811
             | 7848..=7849
             | 7890..=7891
-            | 9122..=9123
-            | 9164..=9165
-            | 9766..=9767
-            | 9808..=9809
-            | 9846..=9847
-            | 9888..=9889
-            | 9926..=9927
-            | 9968..=9969
-            | 10006..=10007
-            | 10048..=10049
-            | 10086..=10087
-            | 10128..=10129
-            | 10166..=10167
-            | 10208..=10209
-            | 10347..=10348
-            | 10389..=10390
-            | 10427..=10428
-            | 10469..=10470
-            | 10507..=10508
-            | 10549..=10550
-            | 10963..=10964
-            | 11005..=11006
-            | 12295..=12296
-            | 12337..=12338
-            | 12843..=12844
-            | 12885..=12886
-            | 12923..=12924
-            | 12965..=12966
-            | 13003..=13004
-            | 13045..=13046
-            | 13083..=13084
-            | 13125..=13126
-            | 13163..=13164
-            | 13205..=13206
-            | 13243..=13244
-            | 13285..=13286
-            | 13323..=13324
-            | 13365..=13366
-            | 13403..=13404
-            | 13445..=13446
-            | 13483..=13484
-            | 13525..=13526
-            | 13563..=13564
-            | 13605..=13606
-            | 13643..=13644
-            | 13685..=13686
-            | 13723..=13724
-            | 13765..=13766
-            | 13803..=13804
-            | 13845..=13846
-            | 13883..=13884
-            | 13925..=13926
-            | 18821..=18822
-            | 18863..=18864
-            | 18901..=18902
-            | 18943..=18944
-            | 19342..=19343
-            | 19384..=19385
-            | 19762..=19763
-            | 19804..=19805
-            | 20167..=20168
-            | 20209..=20210
-            | 21595..=21596
-            | 21637..=21638
-            | 21675..=21676
-            | 21717..=21718
-            | 21755..=21756
-            | 21797..=21798
-            | 21835..=21836
-            | 21877..=21878
-            | 21947..=21948
-            | 21989..=21990
-            | 22027..=22028
-            | 22069..=22070
-            | 22107..=22108
-            | 22149..=22150
-            | 22187..=22188
-            | 22229..=22230
-            | 22475..=22476
-            | 22517..=22518
-            | 22886..=22887
-            | 22928..=22929
-            | 23297..=23298
-            | 23339..=23340
-            | 23708..=23709
-            | 23750..=23751 => &SHAPE40,
+            | 9262..=9263
+            | 9304..=9305
+            | 9906..=9907
+            | 9948..=9949
+            | 9986..=9987
+            | 10028..=10029
+            | 10066..=10067
+            | 10108..=10109
+            | 10146..=10147
+            | 10188..=10189
+            | 10226..=10227
+            | 10268..=10269
+            | 10306..=10307
+            | 10348..=10349
+            | 10488..=10489
+            | 10530..=10531
+            | 10568..=10569
+            | 10610..=10611
+            | 10648..=10649
+            | 10690..=10691
+            | 11104..=11105
+            | 11146..=11147
+            | 12436..=12437
+            | 12478..=12479
+            | 12984..=12985
+            | 13026..=13027
+            | 13064..=13065
+            | 13106..=13107
+            | 13144..=13145
+            | 13186..=13187
+            | 13224..=13225
+            | 13266..=13267
+            | 13304..=13305
+            | 13346..=13347
+            | 13384..=13385
+            | 13426..=13427
+            | 13464..=13465
+            | 13506..=13507
+            | 13544..=13545
+            | 13586..=13587
+            | 13624..=13625
+            | 13666..=13667
+            | 13704..=13705
+            | 13746..=13747
+            | 13784..=13785
+            | 13826..=13827
+            | 13864..=13865
+            | 13906..=13907
+            | 13944..=13945
+            | 13986..=13987
+            | 14024..=14025
+            | 14066..=14067
+            | 18962..=18963
+            | 19004..=19005
+            | 19042..=19043
+            | 19084..=19085
+            | 19483..=19484
+            | 19525..=19526
+            | 19903..=19904
+            | 19945..=19946
+            | 20308..=20309
+            | 20350..=20351
+            | 21736..=21737
+            | 21778..=21779
+            | 21816..=21817
+            | 21858..=21859
+            | 21896..=21897
+            | 21938..=21939
+            | 21976..=21977
+            | 22018..=22019
+            | 22088..=22089
+            | 22130..=22131
+            | 22168..=22169
+            | 22210..=22211
+            | 22248..=22249
+            | 22290..=22291
+            | 22328..=22329
+            | 22370..=22371
+            | 22616..=22617
+            | 22658..=22659
+            | 23027..=23028
+            | 23069..=23070
+            | 23438..=23439
+            | 23480..=23481
+            | 23849..=23850
+            | 23891..=23892 => &SHAPE40,
             2898..=2899
             | 2916..=2917
             | 4706..=4707
@@ -3177,92 +3177,92 @@ impl BlockWithShape for BlockState {
             | 7788..=7789
             | 7850..=7851
             | 7868..=7869
-            | 9124..=9125
-            | 9142..=9143
-            | 9768..=9769
-            | 9786..=9787
-            | 9848..=9849
-            | 9866..=9867
-            | 9928..=9929
-            | 9946..=9947
-            | 10008..=10009
-            | 10026..=10027
-            | 10088..=10089
-            | 10106..=10107
-            | 10168..=10169
-            | 10186..=10187
-            | 10349..=10350
-            | 10367..=10368
-            | 10429..=10430
-            | 10447..=10448
-            | 10509..=10510
-            | 10527..=10528
-            | 10965..=10966
-            | 10983..=10984
-            | 12297..=12298
-            | 12315..=12316
-            | 12845..=12846
-            | 12863..=12864
-            | 12925..=12926
-            | 12943..=12944
-            | 13005..=13006
-            | 13023..=13024
-            | 13085..=13086
-            | 13103..=13104
-            | 13165..=13166
-            | 13183..=13184
-            | 13245..=13246
-            | 13263..=13264
-            | 13325..=13326
-            | 13343..=13344
-            | 13405..=13406
-            | 13423..=13424
-            | 13485..=13486
-            | 13503..=13504
-            | 13565..=13566
-            | 13583..=13584
-            | 13645..=13646
-            | 13663..=13664
-            | 13725..=13726
-            | 13743..=13744
-            | 13805..=13806
-            | 13823..=13824
-            | 13885..=13886
-            | 13903..=13904
-            | 18823..=18824
-            | 18841..=18842
-            | 18903..=18904
-            | 18921..=18922
-            | 19344..=19345
-            | 19362..=19363
-            | 19764..=19765
-            | 19782..=19783
-            | 20169..=20170
-            | 20187..=20188
-            | 21597..=21598
-            | 21615..=21616
-            | 21677..=21678
-            | 21695..=21696
-            | 21757..=21758
-            | 21775..=21776
-            | 21837..=21838
-            | 21855..=21856
-            | 21949..=21950
-            | 21967..=21968
-            | 22029..=22030
-            | 22047..=22048
-            | 22109..=22110
-            | 22127..=22128
-            | 22189..=22190
-            | 22207..=22208
-            | 22477..=22478
-            | 22495..=22496
-            | 22888..=22889
-            | 22906..=22907
-            | 23299..=23300
-            | 23317..=23318
-            | 23710..=23711
-            | 23728..=23729 => &SHAPE41,
+            | 9264..=9265
+            | 9282..=9283
+            | 9908..=9909
+            | 9926..=9927
+            | 9988..=9989
+            | 10006..=10007
+            | 10068..=10069
+            | 10086..=10087
+            | 10148..=10149
+            | 10166..=10167
+            | 10228..=10229
+            | 10246..=10247
+            | 10308..=10309
+            | 10326..=10327
+            | 10490..=10491
+            | 10508..=10509
+            | 10570..=10571
+            | 10588..=10589
+            | 10650..=10651
+            | 10668..=10669
+            | 11106..=11107
+            | 11124..=11125
+            | 12438..=12439
+            | 12456..=12457
+            | 12986..=12987
+            | 13004..=13005
+            | 13066..=13067
+            | 13084..=13085
+            | 13146..=13147
+            | 13164..=13165
+            | 13226..=13227
+            | 13244..=13245
+            | 13306..=13307
+            | 13324..=13325
+            | 13386..=13387
+            | 13404..=13405
+            | 13466..=13467
+            | 13484..=13485
+            | 13546..=13547
+            | 13564..=13565
+            | 13626..=13627
+            | 13644..=13645
+            | 13706..=13707
+            | 13724..=13725
+            | 13786..=13787
+            | 13804..=13805
+            | 13866..=13867
+            | 13884..=13885
+            | 13946..=13947
+            | 13964..=13965
+            | 14026..=14027
+            | 14044..=14045
+            | 18964..=18965
+            | 18982..=18983
+            | 19044..=19045
+            | 19062..=19063
+            | 19485..=19486
+            | 19503..=19504
+            | 19905..=19906
+            | 19923..=19924
+            | 20310..=20311
+            | 20328..=20329
+            | 21738..=21739
+            | 21756..=21757
+            | 21818..=21819
+            | 21836..=21837
+            | 21898..=21899
+            | 21916..=21917
+            | 21978..=21979
+            | 21996..=21997
+            | 22090..=22091
+            | 22108..=22109
+            | 22170..=22171
+            | 22188..=22189
+            | 22250..=22251
+            | 22268..=22269
+            | 22330..=22331
+            | 22348..=22349
+            | 22618..=22619
+            | 22636..=22637
+            | 23029..=23030
+            | 23047..=23048
+            | 23440..=23441
+            | 23458..=23459
+            | 23851..=23852
+            | 23869..=23870 => &SHAPE41,
             2900..=2901
             | 2942..=2943
             | 4708..=4709
@@ -3283,92 +3283,92 @@ impl BlockWithShape for BlockState {
             | 7814..=7815
             | 7852..=7853
             | 7894..=7895
-            | 9126..=9127
-            | 9168..=9169
-            | 9770..=9771
-            | 9812..=9813
-            | 9850..=9851
-            | 9892..=9893
-            | 9930..=9931
-            | 9972..=9973
-            | 10010..=10011
-            | 10052..=10053
-            | 10090..=10091
-            | 10132..=10133
-            | 10170..=10171
-            | 10212..=10213
-            | 10351..=10352
-            | 10393..=10394
-            | 10431..=10432
-            | 10473..=10474
-            | 10511..=10512
-            | 10553..=10554
-            | 10967..=10968
-            | 11009..=11010
-            | 12299..=12300
-            | 12341..=12342
-            | 12847..=12848
-            | 12889..=12890
-            | 12927..=12928
-            | 12969..=12970
-            | 13007..=13008
-            | 13049..=13050
-            | 13087..=13088
-            | 13129..=13130
-            | 13167..=13168
-            | 13209..=13210
-            | 13247..=13248
-            | 13289..=13290
-            | 13327..=13328
-            | 13369..=13370
-            | 13407..=13408
-            | 13449..=13450
-            | 13487..=13488
-            | 13529..=13530
-            | 13567..=13568
-            | 13609..=13610
-            | 13647..=13648
-            | 13689..=13690
-            | 13727..=13728
-            | 13769..=13770
-            | 13807..=13808
-            | 13849..=13850
-            | 13887..=13888
-            | 13929..=13930
-            | 18825..=18826
-            | 18867..=18868
-            | 18905..=18906
-            | 18947..=18948
-            | 19346..=19347
-            | 19388..=19389
-            | 19766..=19767
-            | 19808..=19809
-            | 20171..=20172
-            | 20213..=20214
-            | 21599..=21600
-            | 21641..=21642
-            | 21679..=21680
-            | 21721..=21722
-            | 21759..=21760
-            | 21801..=21802
-            | 21839..=21840
-            | 21881..=21882
-            | 21951..=21952
-            | 21993..=21994
-            | 22031..=22032
-            | 22073..=22074
-            | 22111..=22112
-            | 22153..=22154
-            | 22191..=22192
-            | 22233..=22234
-            | 22479..=22480
-            | 22521..=22522
-            | 22890..=22891
-            | 22932..=22933
-            | 23301..=23302
-            | 23343..=23344
-            | 23712..=23713
-            | 23754..=23755 => &SHAPE42,
+            | 9266..=9267
+            | 9308..=9309
+            | 9910..=9911
+            | 9952..=9953
+            | 9990..=9991
+            | 10032..=10033
+            | 10070..=10071
+            | 10112..=10113
+            | 10150..=10151
+            | 10192..=10193
+            | 10230..=10231
+            | 10272..=10273
+            | 10310..=10311
+            | 10352..=10353
+            | 10492..=10493
+            | 10534..=10535
+            | 10572..=10573
+            | 10614..=10615
+            | 10652..=10653
+            | 10694..=10695
+            | 11108..=11109
+            | 11150..=11151
+            | 12440..=12441
+            | 12482..=12483
+            | 12988..=12989
+            | 13030..=13031
+            | 13068..=13069
+            | 13110..=13111
+            | 13148..=13149
+            | 13190..=13191
+            | 13228..=13229
+            | 13270..=13271
+            | 13308..=13309
+            | 13350..=13351
+            | 13388..=13389
+            | 13430..=13431
+            | 13468..=13469
+            | 13510..=13511
+            | 13548..=13549
+            | 13590..=13591
+            | 13628..=13629
+            | 13670..=13671
+            | 13708..=13709
+            | 13750..=13751
+            | 13788..=13789
+            | 13830..=13831
+            | 13868..=13869
+            | 13910..=13911
+            | 13948..=13949
+            | 13990..=13991
+            | 14028..=14029
+            | 14070..=14071
+            | 18966..=18967
+            | 19008..=19009
+            | 19046..=19047
+            | 19088..=19089
+            | 19487..=19488
+            | 19529..=19530
+            | 19907..=19908
+            | 19949..=19950
+            | 20312..=20313
+            | 20354..=20355
+            | 21740..=21741
+            | 21782..=21783
+            | 21820..=21821
+            | 21862..=21863
+            | 21900..=21901
+            | 21942..=21943
+            | 21980..=21981
+            | 22022..=22023
+            | 22092..=22093
+            | 22134..=22135
+            | 22172..=22173
+            | 22214..=22215
+            | 22252..=22253
+            | 22294..=22295
+            | 22332..=22333
+            | 22374..=22375
+            | 22620..=22621
+            | 22662..=22663
+            | 23031..=23032
+            | 23073..=23074
+            | 23442..=23443
+            | 23484..=23485
+            | 23853..=23854
+            | 23895..=23896 => &SHAPE42,
             2902..=2903
             | 2920..=2921
             | 4710..=4711
@@ -3389,92 +3389,92 @@ impl BlockWithShape for BlockState {
             | 7792..=7793
             | 7854..=7855
             | 7872..=7873
-            | 9128..=9129
-            | 9146..=9147
-            | 9772..=9773
-            | 9790..=9791
-            | 9852..=9853
-            | 9870..=9871
-            | 9932..=9933
-            | 9950..=9951
-            | 10012..=10013
-            | 10030..=10031
-            | 10092..=10093
-            | 10110..=10111
-            | 10172..=10173
-            | 10190..=10191
-            | 10353..=10354
-            | 10371..=10372
-            | 10433..=10434
-            | 10451..=10452
-            | 10513..=10514
-            | 10531..=10532
-            | 10969..=10970
-            | 10987..=10988
-            | 12301..=12302
-            | 12319..=12320
-            | 12849..=12850
-            | 12867..=12868
-            | 12929..=12930
-            | 12947..=12948
-            | 13009..=13010
-            | 13027..=13028
-            | 13089..=13090
-            | 13107..=13108
-            | 13169..=13170
-            | 13187..=13188
-            | 13249..=13250
-            | 13267..=13268
-            | 13329..=13330
-            | 13347..=13348
-            | 13409..=13410
-            | 13427..=13428
-            | 13489..=13490
-            | 13507..=13508
-            | 13569..=13570
-            | 13587..=13588
-            | 13649..=13650
-            | 13667..=13668
-            | 13729..=13730
-            | 13747..=13748
-            | 13809..=13810
-            | 13827..=13828
-            | 13889..=13890
-            | 13907..=13908
-            | 18827..=18828
-            | 18845..=18846
-            | 18907..=18908
-            | 18925..=18926
-            | 19348..=19349
-            | 19366..=19367
-            | 19768..=19769
-            | 19786..=19787
-            | 20173..=20174
-            | 20191..=20192
-            | 21601..=21602
-            | 21619..=21620
-            | 21681..=21682
-            | 21699..=21700
-            | 21761..=21762
-            | 21779..=21780
-            | 21841..=21842
-            | 21859..=21860
-            | 21953..=21954
-            | 21971..=21972
-            | 22033..=22034
-            | 22051..=22052
-            | 22113..=22114
-            | 22131..=22132
-            | 22193..=22194
-            | 22211..=22212
-            | 22481..=22482
-            | 22499..=22500
-            | 22892..=22893
-            | 22910..=22911
-            | 23303..=23304
-            | 23321..=23322
-            | 23714..=23715
-            | 23732..=23733 => &SHAPE43,
+            | 9268..=9269
+            | 9286..=9287
+            | 9912..=9913
+            | 9930..=9931
+            | 9992..=9993
+            | 10010..=10011
+            | 10072..=10073
+            | 10090..=10091
+            | 10152..=10153
+            | 10170..=10171
+            | 10232..=10233
+            | 10250..=10251
+            | 10312..=10313
+            | 10330..=10331
+            | 10494..=10495
+            | 10512..=10513
+            | 10574..=10575
+            | 10592..=10593
+            | 10654..=10655
+            | 10672..=10673
+            | 11110..=11111
+            | 11128..=11129
+            | 12442..=12443
+            | 12460..=12461
+            | 12990..=12991
+            | 13008..=13009
+            | 13070..=13071
+            | 13088..=13089
+            | 13150..=13151
+            | 13168..=13169
+            | 13230..=13231
+            | 13248..=13249
+            | 13310..=13311
+            | 13328..=13329
+            | 13390..=13391
+            | 13408..=13409
+            | 13470..=13471
+            | 13488..=13489
+            | 13550..=13551
+            | 13568..=13569
+            | 13630..=13631
+            | 13648..=13649
+            | 13710..=13711
+            | 13728..=13729
+            | 13790..=13791
+            | 13808..=13809
+            | 13870..=13871
+            | 13888..=13889
+            | 13950..=13951
+            | 13968..=13969
+            | 14030..=14031
+            | 14048..=14049
+            | 18968..=18969
+            | 18986..=18987
+            | 19048..=19049
+            | 19066..=19067
+            | 19489..=19490
+            | 19507..=19508
+            | 19909..=19910
+            | 19927..=19928
+            | 20314..=20315
+            | 20332..=20333
+            | 21742..=21743
+            | 21760..=21761
+            | 21822..=21823
+            | 21840..=21841
+            | 21902..=21903
+            | 21920..=21921
+            | 21982..=21983
+            | 22000..=22001
+            | 22094..=22095
+            | 22112..=22113
+            | 22174..=22175
+            | 22192..=22193
+            | 22254..=22255
+            | 22272..=22273
+            | 22334..=22335
+            | 22352..=22353
+            | 22622..=22623
+            | 22640..=22641
+            | 23033..=23034
+            | 23051..=23052
+            | 23444..=23445
+            | 23462..=23463
+            | 23855..=23856
+            | 23873..=23874 => &SHAPE43,
             2904..=2905
             | 4712..=4713
             | 7059..=7060
@@ -3485,49 +3485,49 @@ impl BlockWithShape for BlockState {
             | 7696..=7697
             | 7776..=7777
             | 7856..=7857
-            | 9130..=9131
-            | 9774..=9775
-            | 9854..=9855
-            | 9934..=9935
-            | 10014..=10015
-            | 10094..=10095
-            | 10174..=10175
-            | 10355..=10356
-            | 10435..=10436
-            | 10515..=10516
-            | 10971..=10972
-            | 12303..=12304
-            | 12851..=12852
-            | 12931..=12932
-            | 13011..=13012
-            | 13091..=13092
-            | 13171..=13172
-            | 13251..=13252
-            | 13331..=13332
-            | 13411..=13412
-            | 13491..=13492
-            | 13571..=13572
-            | 13651..=13652
-            | 13731..=13732
-            | 13811..=13812
-            | 13891..=13892
-            | 18829..=18830
-            | 18909..=18910
-            | 19350..=19351
-            | 19770..=19771
-            | 20175..=20176
-            | 21603..=21604
-            | 21683..=21684
-            | 21763..=21764
-            | 21843..=21844
-            | 21955..=21956
-            | 22035..=22036
-            | 22115..=22116
-            | 22195..=22196
-            | 22483..=22484
-            | 22894..=22895
-            | 23305..=23306
-            | 23716..=23717 => &SHAPE44,
+            | 9270..=9271
+            | 9914..=9915
+            | 9994..=9995
+            | 10074..=10075
+            | 10154..=10155
+            | 10234..=10235
+            | 10314..=10315
+            | 10496..=10497
+            | 10576..=10577
+            | 10656..=10657
+            | 11112..=11113
+            | 12444..=12445
+            | 12992..=12993
+            | 13072..=13073
+            | 13152..=13153
+            | 13232..=13233
+            | 13312..=13313
+            | 13392..=13393
+            | 13472..=13473
+            | 13552..=13553
+            | 13632..=13633
+            | 13712..=13713
+            | 13792..=13793
+            | 13872..=13873
+            | 13952..=13953
+            | 14032..=14033
+            | 18970..=18971
+            | 19050..=19051
+            | 19491..=19492
+            | 19911..=19912
+            | 20316..=20317
+            | 21744..=21745
+            | 21824..=21825
+            | 21904..=21905
+            | 21984..=21985
+            | 22096..=22097
+            | 22176..=22177
+            | 22256..=22257
+            | 22336..=22337
+            | 22624..=22625
+            | 23035..=23036
+            | 23446..=23447
+            | 23857..=23858 => &SHAPE44,
             2906..=2907
             | 2948..=2949
             | 4714..=4715
@@ -3548,92 +3548,92 @@ impl BlockWithShape for BlockState {
             | 7820..=7821
             | 7858..=7859
             | 7900..=7901
-            | 9132..=9133
-            | 9174..=9175
-            | 9776..=9777
-            | 9818..=9819
-            | 9856..=9857
-            | 9898..=9899
-            | 9936..=9937
-            | 9978..=9979
-            | 10016..=10017
-            | 10058..=10059
-            | 10096..=10097
-            | 10138..=10139
-            | 10176..=10177
-            | 10218..=10219
-            | 10357..=10358
-            | 10399..=10400
-            | 10437..=10438
-            | 10479..=10480
-            | 10517..=10518
-            | 10559..=10560
-            | 10973..=10974
-            | 11015..=11016
-            | 12305..=12306
-            | 12347..=12348
-            | 12853..=12854
-            | 12895..=12896
-            | 12933..=12934
-            | 12975..=12976
-            | 13013..=13014
-            | 13055..=13056
-            | 13093..=13094
-            | 13135..=13136
-            | 13173..=13174
-            | 13215..=13216
-            | 13253..=13254
-            | 13295..=13296
-            | 13333..=13334
-            | 13375..=13376
-            | 13413..=13414
-            | 13455..=13456
-            | 13493..=13494
-            | 13535..=13536
-            | 13573..=13574
-            | 13615..=13616
-            | 13653..=13654
-            | 13695..=13696
-            | 13733..=13734
-            | 13775..=13776
-            | 13813..=13814
-            | 13855..=13856
-            | 13893..=13894
-            | 13935..=13936
-            | 18831..=18832
-            | 18873..=18874
-            | 18911..=18912
-            | 18953..=18954
-            | 19352..=19353
-            | 19394..=19395
-            | 19772..=19773
-            | 19814..=19815
-            | 20177..=20178
-            | 20219..=20220
-            | 21605..=21606
-            | 21647..=21648
-            | 21685..=21686
-            | 21727..=21728
-            | 21765..=21766
-            | 21807..=21808
-            | 21845..=21846
-            | 21887..=21888
-            | 21957..=21958
-            | 21999..=22000
-            | 22037..=22038
-            | 22079..=22080
-            | 22117..=22118
-            | 22159..=22160
-            | 22197..=22198
-            | 22239..=22240
-            | 22485..=22486
-            | 22527..=22528
-            | 22896..=22897
-            | 22938..=22939
-            | 23307..=23308
-            | 23349..=23350
-            | 23718..=23719
-            | 23760..=23761 => &SHAPE45,
+            | 9272..=9273
+            | 9314..=9315
+            | 9916..=9917
+            | 9958..=9959
+            | 9996..=9997
+            | 10038..=10039
+            | 10076..=10077
+            | 10118..=10119
+            | 10156..=10157
+            | 10198..=10199
+            | 10236..=10237
+            | 10278..=10279
+            | 10316..=10317
+            | 10358..=10359
+            | 10498..=10499
+            | 10540..=10541
+            | 10578..=10579
+            | 10620..=10621
+            | 10658..=10659
+            | 10700..=10701
+            | 11114..=11115
+            | 11156..=11157
+            | 12446..=12447
+            | 12488..=12489
+            | 12994..=12995
+            | 13036..=13037
+            | 13074..=13075
+            | 13116..=13117
+            | 13154..=13155
+            | 13196..=13197
+            | 13234..=13235
+            | 13276..=13277
+            | 13314..=13315
+            | 13356..=13357
+            | 13394..=13395
+            | 13436..=13437
+            | 13474..=13475
+            | 13516..=13517
+            | 13554..=13555
+            | 13596..=13597
+            | 13634..=13635
+            | 13676..=13677
+            | 13714..=13715
+            | 13756..=13757
+            | 13794..=13795
+            | 13836..=13837
+            | 13874..=13875
+            | 13916..=13917
+            | 13954..=13955
+            | 13996..=13997
+            | 14034..=14035
+            | 14076..=14077
+            | 18972..=18973
+            | 19014..=19015
+            | 19052..=19053
+            | 19094..=19095
+            | 19493..=19494
+            | 19535..=19536
+            | 19913..=19914
+            | 19955..=19956
+            | 20318..=20319
+            | 20360..=20361
+            | 21746..=21747
+            | 21788..=21789
+            | 21826..=21827
+            | 21868..=21869
+            | 21906..=21907
+            | 21948..=21949
+            | 21986..=21987
+            | 22028..=22029
+            | 22098..=22099
+            | 22140..=22141
+            | 22178..=22179
+            | 22220..=22221
+            | 22258..=22259
+            | 22300..=22301
+            | 22338..=22339
+            | 22380..=22381
+            | 22626..=22627
+            | 22668..=22669
+            | 23037..=23038
+            | 23079..=23080
+            | 23448..=23449
+            | 23490..=23491
+            | 23859..=23860
+            | 23901..=23902 => &SHAPE45,
             2908..=2909
             | 2926..=2927
             | 4716..=4717
@@ -3654,92 +3654,92 @@ impl BlockWithShape for BlockState {
             | 7798..=7799
             | 7860..=7861
             | 7878..=7879
-            | 9134..=9135
-            | 9152..=9153
-            | 9778..=9779
-            | 9796..=9797
-            | 9858..=9859
-            | 9876..=9877
-            | 9938..=9939
-            | 9956..=9957
-            | 10018..=10019
-            | 10036..=10037
-            | 10098..=10099
-            | 10116..=10117
-            | 10178..=10179
-            | 10196..=10197
-            | 10359..=10360
-            | 10377..=10378
-            | 10439..=10440
-            | 10457..=10458
-            | 10519..=10520
-            | 10537..=10538
-            | 10975..=10976
-            | 10993..=10994
-            | 12307..=12308
-            | 12325..=12326
-            | 12855..=12856
-            | 12873..=12874
-            | 12935..=12936
-            | 12953..=12954
-            | 13015..=13016
-            | 13033..=13034
-            | 13095..=13096
-            | 13113..=13114
-            | 13175..=13176
-            | 13193..=13194
-            | 13255..=13256
-            | 13273..=13274
-            | 13335..=13336
-            | 13353..=13354
-            | 13415..=13416
-            | 13433..=13434
-            | 13495..=13496
-            | 13513..=13514
-            | 13575..=13576
-            | 13593..=13594
-            | 13655..=13656
-            | 13673..=13674
-            | 13735..=13736
-            | 13753..=13754
-            | 13815..=13816
-            | 13833..=13834
-            | 13895..=13896
-            | 13913..=13914
-            | 18833..=18834
-            | 18851..=18852
-            | 18913..=18914
-            | 18931..=18932
-            | 19354..=19355
-            | 19372..=19373
-            | 19774..=19775
-            | 19792..=19793
-            | 20179..=20180
-            | 20197..=20198
-            | 21607..=21608
-            | 21625..=21626
-            | 21687..=21688
-            | 21705..=21706
-            | 21767..=21768
-            | 21785..=21786
-            | 21847..=21848
-            | 21865..=21866
-            | 21959..=21960
-            | 21977..=21978
-            | 22039..=22040
-            | 22057..=22058
-            | 22119..=22120
-            | 22137..=22138
-            | 22199..=22200
-            | 22217..=22218
-            | 22487..=22488
-            | 22505..=22506
-            | 22898..=22899
-            | 22916..=22917
-            | 23309..=23310
-            | 23327..=23328
-            | 23720..=23721
-            | 23738..=23739 => &SHAPE46,
+            | 9274..=9275
+            | 9292..=9293
+            | 9918..=9919
+            | 9936..=9937
+            | 9998..=9999
+            | 10016..=10017
+            | 10078..=10079
+            | 10096..=10097
+            | 10158..=10159
+            | 10176..=10177
+            | 10238..=10239
+            | 10256..=10257
+            | 10318..=10319
+            | 10336..=10337
+            | 10500..=10501
+            | 10518..=10519
+            | 10580..=10581
+            | 10598..=10599
+            | 10660..=10661
+            | 10678..=10679
+            | 11116..=11117
+            | 11134..=11135
+            | 12448..=12449
+            | 12466..=12467
+            | 12996..=12997
+            | 13014..=13015
+            | 13076..=13077
+            | 13094..=13095
+            | 13156..=13157
+            | 13174..=13175
+            | 13236..=13237
+            | 13254..=13255
+            | 13316..=13317
+            | 13334..=13335
+            | 13396..=13397
+            | 13414..=13415
+            | 13476..=13477
+            | 13494..=13495
+            | 13556..=13557
+            | 13574..=13575
+            | 13636..=13637
+            | 13654..=13655
+            | 13716..=13717
+            | 13734..=13735
+            | 13796..=13797
+            | 13814..=13815
+            | 13876..=13877
+            | 13894..=13895
+            | 13956..=13957
+            | 13974..=13975
+            | 14036..=14037
+            | 14054..=14055
+            | 18974..=18975
+            | 18992..=18993
+            | 19054..=19055
+            | 19072..=19073
+            | 19495..=19496
+            | 19513..=19514
+            | 19915..=19916
+            | 19933..=19934
+            | 20320..=20321
+            | 20338..=20339
+            | 21748..=21749
+            | 21766..=21767
+            | 21828..=21829
+            | 21846..=21847
+            | 21908..=21909
+            | 21926..=21927
+            | 21988..=21989
+            | 22006..=22007
+            | 22100..=22101
+            | 22118..=22119
+            | 22180..=22181
+            | 22198..=22199
+            | 22260..=22261
+            | 22278..=22279
+            | 22340..=22341
+            | 22358..=22359
+            | 22628..=22629
+            | 22646..=22647
+            | 23039..=23040
+            | 23057..=23058
+            | 23450..=23451
+            | 23468..=23469
+            | 23861..=23862
+            | 23879..=23880 => &SHAPE46,
             2910..=2911
             | 2952..=2953
             | 4718..=4719
@@ -3760,92 +3760,92 @@ impl BlockWithShape for BlockState {
             | 7824..=7825
             | 7862..=7863
             | 7904..=7905
-            | 9136..=9137
-            | 9178..=9179
-            | 9780..=9781
-            | 9822..=9823
-            | 9860..=9861
-            | 9902..=9903
-            | 9940..=9941
-            | 9982..=9983
-            | 10020..=10021
-            | 10062..=10063
-            | 10100..=10101
-            | 10142..=10143
-            | 10180..=10181
-            | 10222..=10223
-            | 10361..=10362
-            | 10403..=10404
-            | 10441..=10442
-            | 10483..=10484
-            | 10521..=10522
-            | 10563..=10564
-            | 10977..=10978
-            | 11019..=11020
-            | 12309..=12310
-            | 12351..=12352
-            | 12857..=12858
-            | 12899..=12900
-            | 12937..=12938
-            | 12979..=12980
-            | 13017..=13018
-            | 13059..=13060
-            | 13097..=13098
-            | 13139..=13140
-            | 13177..=13178
-            | 13219..=13220
-            | 13257..=13258
-            | 13299..=13300
-            | 13337..=13338
-            | 13379..=13380
-            | 13417..=13418
-            | 13459..=13460
-            | 13497..=13498
-            | 13539..=13540
-            | 13577..=13578
-            | 13619..=13620
-            | 13657..=13658
-            | 13699..=13700
-            | 13737..=13738
-            | 13779..=13780
-            | 13817..=13818
-            | 13859..=13860
-            | 13897..=13898
-            | 13939..=13940
-            | 18835..=18836
-            | 18877..=18878
-            | 18915..=18916
-            | 18957..=18958
-            | 19356..=19357
-            | 19398..=19399
-            | 19776..=19777
-            | 19818..=19819
-            | 20181..=20182
-            | 20223..=20224
-            | 21609..=21610
-            | 21651..=21652
-            | 21689..=21690
-            | 21731..=21732
-            | 21769..=21770
-            | 21811..=21812
-            | 21849..=21850
-            | 21891..=21892
-            | 21961..=21962
-            | 22003..=22004
-            | 22041..=22042
-            | 22083..=22084
-            | 22121..=22122
-            | 22163..=22164
-            | 22201..=22202
-            | 22243..=22244
-            | 22489..=22490
-            | 22531..=22532
-            | 22900..=22901
-            | 22942..=22943
-            | 23311..=23312
-            | 23353..=23354
-            | 23722..=23723
-            | 23764..=23765 => &SHAPE47,
+            | 9276..=9277
+            | 9318..=9319
+            | 9920..=9921
+            | 9962..=9963
+            | 10000..=10001
+            | 10042..=10043
+            | 10080..=10081
+            | 10122..=10123
+            | 10160..=10161
+            | 10202..=10203
+            | 10240..=10241
+            | 10282..=10283
+            | 10320..=10321
+            | 10362..=10363
+            | 10502..=10503
+            | 10544..=10545
+            | 10582..=10583
+            | 10624..=10625
+            | 10662..=10663
+            | 10704..=10705
+            | 11118..=11119
+            | 11160..=11161
+            | 12450..=12451
+            | 12492..=12493
+            | 12998..=12999
+            | 13040..=13041
+            | 13078..=13079
+            | 13120..=13121
+            | 13158..=13159
+            | 13200..=13201
+            | 13238..=13239
+            | 13280..=13281
+            | 13318..=13319
+            | 13360..=13361
+            | 13398..=13399
+            | 13440..=13441
+            | 13478..=13479
+            | 13520..=13521
+            | 13558..=13559
+            | 13600..=13601
+            | 13638..=13639
+            | 13680..=13681
+            | 13718..=13719
+            | 13760..=13761
+            | 13798..=13799
+            | 13840..=13841
+            | 13878..=13879
+            | 13920..=13921
+            | 13958..=13959
+            | 14000..=14001
+            | 14038..=14039
+            | 14080..=14081
+            | 18976..=18977
+            | 19018..=19019
+            | 19056..=19057
+            | 19098..=19099
+            | 19497..=19498
+            | 19539..=19540
+            | 19917..=19918
+            | 19959..=19960
+            | 20322..=20323
+            | 20364..=20365
+            | 21750..=21751
+            | 21792..=21793
+            | 21830..=21831
+            | 21872..=21873
+            | 21910..=21911
+            | 21952..=21953
+            | 21990..=21991
+            | 22032..=22033
+            | 22102..=22103
+            | 22144..=22145
+            | 22182..=22183
+            | 22224..=22225
+            | 22262..=22263
+            | 22304..=22305
+            | 22342..=22343
+            | 22384..=22385
+            | 22630..=22631
+            | 22672..=22673
+            | 23041..=23042
+            | 23083..=23084
+            | 23452..=23453
+            | 23494..=23495
+            | 23863..=23864
+            | 23905..=23906 => &SHAPE47,
             2912..=2913
             | 2930..=2931
             | 4720..=4721
@@ -3866,92 +3866,92 @@ impl BlockWithShape for BlockState {
             | 7802..=7803
             | 7864..=7865
             | 7882..=7883
-            | 9138..=9139
-            | 9156..=9157
-            | 9782..=9783
-            | 9800..=9801
-            | 9862..=9863
-            | 9880..=9881
-            | 9942..=9943
-            | 9960..=9961
-            | 10022..=10023
-            | 10040..=10041
-            | 10102..=10103
-            | 10120..=10121
-            | 10182..=10183
-            | 10200..=10201
-            | 10363..=10364
-            | 10381..=10382
-            | 10443..=10444
-            | 10461..=10462
-            | 10523..=10524
-            | 10541..=10542
-            | 10979..=10980
-            | 10997..=10998
-            | 12311..=12312
-            | 12329..=12330
-            | 12859..=12860
-            | 12877..=12878
-            | 12939..=12940
-            | 12957..=12958
-            | 13019..=13020
-            | 13037..=13038
-            | 13099..=13100
-            | 13117..=13118
-            | 13179..=13180
-            | 13197..=13198
-            | 13259..=13260
-            | 13277..=13278
-            | 13339..=13340
-            | 13357..=13358
-            | 13419..=13420
-            | 13437..=13438
-            | 13499..=13500
-            | 13517..=13518
-            | 13579..=13580
-            | 13597..=13598
-            | 13659..=13660
-            | 13677..=13678
-            | 13739..=13740
-            | 13757..=13758
-            | 13819..=13820
-            | 13837..=13838
-            | 13899..=13900
-            | 13917..=13918
-            | 18837..=18838
-            | 18855..=18856
-            | 18917..=18918
-            | 18935..=18936
-            | 19358..=19359
-            | 19376..=19377
-            | 19778..=19779
-            | 19796..=19797
-            | 20183..=20184
-            | 20201..=20202
-            | 21611..=21612
-            | 21629..=21630
-            | 21691..=21692
-            | 21709..=21710
-            | 21771..=21772
-            | 21789..=21790
-            | 21851..=21852
-            | 21869..=21870
-            | 21963..=21964
-            | 21981..=21982
-            | 22043..=22044
-            | 22061..=22062
-            | 22123..=22124
-            | 22141..=22142
-            | 22203..=22204
-            | 22221..=22222
-            | 22491..=22492
-            | 22509..=22510
-            | 22902..=22903
-            | 22920..=22921
-            | 23313..=23314
-            | 23331..=23332
-            | 23724..=23725
-            | 23742..=23743 => &SHAPE48,
+            | 9278..=9279
+            | 9296..=9297
+            | 9922..=9923
+            | 9940..=9941
+            | 10002..=10003
+            | 10020..=10021
+            | 10082..=10083
+            | 10100..=10101
+            | 10162..=10163
+            | 10180..=10181
+            | 10242..=10243
+            | 10260..=10261
+            | 10322..=10323
+            | 10340..=10341
+            | 10504..=10505
+            | 10522..=10523
+            | 10584..=10585
+            | 10602..=10603
+            | 10664..=10665
+            | 10682..=10683
+            | 11120..=11121
+            | 11138..=11139
+            | 12452..=12453
+            | 12470..=12471
+            | 13000..=13001
+            | 13018..=13019
+            | 13080..=13081
+            | 13098..=13099
+            | 13160..=13161
+            | 13178..=13179
+            | 13240..=13241
+            | 13258..=13259
+            | 13320..=13321
+            | 13338..=13339
+            | 13400..=13401
+            | 13418..=13419
+            | 13480..=13481
+            | 13498..=13499
+            | 13560..=13561
+            | 13578..=13579
+            | 13640..=13641
+            | 13658..=13659
+            | 13720..=13721
+            | 13738..=13739
+            | 13800..=13801
+            | 13818..=13819
+            | 13880..=13881
+            | 13898..=13899
+            | 13960..=13961
+            | 13978..=13979
+            | 14040..=14041
+            | 14058..=14059
+            | 18978..=18979
+            | 18996..=18997
+            | 19058..=19059
+            | 19076..=19077
+            | 19499..=19500
+            | 19517..=19518
+            | 19919..=19920
+            | 19937..=19938
+            | 20324..=20325
+            | 20342..=20343
+            | 21752..=21753
+            | 21770..=21771
+            | 21832..=21833
+            | 21850..=21851
+            | 21912..=21913
+            | 21930..=21931
+            | 21992..=21993
+            | 22010..=22011
+            | 22104..=22105
+            | 22122..=22123
+            | 22184..=22185
+            | 22202..=22203
+            | 22264..=22265
+            | 22282..=22283
+            | 22344..=22345
+            | 22362..=22363
+            | 22632..=22633
+            | 22650..=22651
+            | 23043..=23044
+            | 23061..=23062
+            | 23454..=23455
+            | 23472..=23473
+            | 23865..=23866
+            | 23883..=23884 => &SHAPE48,
             2914..=2915
             | 4722..=4723
             | 7069..=7070
@@ -3962,49 +3962,49 @@ impl BlockWithShape for BlockState {
             | 7706..=7707
             | 7786..=7787
             | 7866..=7867
-            | 9140..=9141
-            | 9784..=9785
-            | 9864..=9865
-            | 9944..=9945
-            | 10024..=10025
-            | 10104..=10105
-            | 10184..=10185
-            | 10365..=10366
-            | 10445..=10446
-            | 10525..=10526
-            | 10981..=10982
-            | 12313..=12314
-            | 12861..=12862
-            | 12941..=12942
-            | 13021..=13022
-            | 13101..=13102
-            | 13181..=13182
-            | 13261..=13262
-            | 13341..=13342
-            | 13421..=13422
-            | 13501..=13502
-            | 13581..=13582
-            | 13661..=13662
-            | 13741..=13742
-            | 13821..=13822
-            | 13901..=13902
-            | 18839..=18840
-            | 18919..=18920
-            | 19360..=19361
-            | 19780..=19781
-            | 20185..=20186
-            | 21613..=21614
-            | 21693..=21694
-            | 21773..=21774
-            | 21853..=21854
-            | 21965..=21966
-            | 22045..=22046
-            | 22125..=22126
-            | 22205..=22206
-            | 22493..=22494
-            | 22904..=22905
-            | 23315..=23316
-            | 23726..=23727 => &SHAPE49,
+            | 9280..=9281
+            | 9924..=9925
+            | 10004..=10005
+            | 10084..=10085
+            | 10164..=10165
+            | 10244..=10245
+            | 10324..=10325
+            | 10506..=10507
+            | 10586..=10587
+            | 10666..=10667
+            | 11122..=11123
+            | 12454..=12455
+            | 13002..=13003
+            | 13082..=13083
+            | 13162..=13163
+            | 13242..=13243
+            | 13322..=13323
+            | 13402..=13403
+            | 13482..=13483
+            | 13562..=13563
+            | 13642..=13643
+            | 13722..=13723
+            | 13802..=13803
+            | 13882..=13883
+            | 13962..=13963
+            | 14042..=14043
+            | 18980..=18981
+            | 19060..=19061
+            | 19501..=19502
+            | 19921..=19922
+            | 20326..=20327
+            | 21754..=21755
+            | 21834..=21835
+            | 21914..=21915
+            | 21994..=21995
+            | 22106..=22107
+            | 22186..=22187
+            | 22266..=22267
+            | 22346..=22347
+            | 22634..=22635
+            | 23045..=23046
+            | 23456..=23457
+            | 23867..=23868 => &SHAPE49,
             2924..=2925
             | 4732..=4733
             | 7079..=7080
@@ -4015,49 +4015,49 @@ impl BlockWithShape for BlockState {
             | 7716..=7717
             | 7796..=7797
             | 7876..=7877
-            | 9150..=9151
-            | 9794..=9795
-            | 9874..=9875
-            | 9954..=9955
-            | 10034..=10035
-            | 10114..=10115
-            | 10194..=10195
-            | 10375..=10376
-            | 10455..=10456
-            | 10535..=10536
-            | 10991..=10992
-            | 12323..=12324
-            | 12871..=12872
-            | 12951..=12952
-            | 13031..=13032
-            | 13111..=13112
-            | 13191..=13192
-            | 13271..=13272
-            | 13351..=13352
-            | 13431..=13432
-            | 13511..=13512
-            | 13591..=13592
-            | 13671..=13672
-            | 13751..=13752
-            | 13831..=13832
-            | 13911..=13912
-            | 18849..=18850
-            | 18929..=18930
-            | 19370..=19371
-            | 19790..=19791
-            | 20195..=20196
-            | 21623..=21624
-            | 21703..=21704
-            | 21783..=21784
-            | 21863..=21864
-            | 21975..=21976
-            | 22055..=22056
-            | 22135..=22136
-            | 22215..=22216
-            | 22503..=22504
-            | 22914..=22915
-            | 23325..=23326
-            | 23736..=23737 => &SHAPE50,
+            | 9290..=9291
+            | 9934..=9935
+            | 10014..=10015
+            | 10094..=10095
+            | 10174..=10175
+            | 10254..=10255
+            | 10334..=10335
+            | 10516..=10517
+            | 10596..=10597
+            | 10676..=10677
+            | 11132..=11133
+            | 12464..=12465
+            | 13012..=13013
+            | 13092..=13093
+            | 13172..=13173
+            | 13252..=13253
+            | 13332..=13333
+            | 13412..=13413
+            | 13492..=13493
+            | 13572..=13573
+            | 13652..=13653
+            | 13732..=13733
+            | 13812..=13813
+            | 13892..=13893
+            | 13972..=13973
+            | 14052..=14053
+            | 18990..=18991
+            | 19070..=19071
+            | 19511..=19512
+            | 19931..=19932
+            | 20336..=20337
+            | 21764..=21765
+            | 21844..=21845
+            | 21924..=21925
+            | 22004..=22005
+            | 22116..=22117
+            | 22196..=22197
+            | 22276..=22277
+            | 22356..=22357
+            | 22644..=22645
+            | 23055..=23056
+            | 23466..=23467
+            | 23877..=23878 => &SHAPE50,
             2934..=2935
             | 4742..=4743
             | 7089..=7090
@@ -4068,49 +4068,49 @@ impl BlockWithShape for BlockState {
             | 7726..=7727
             | 7806..=7807
             | 7886..=7887
-            | 9160..=9161
-            | 9804..=9805
-            | 9884..=9885
-            | 9964..=9965
-            | 10044..=10045
-            | 10124..=10125
-            | 10204..=10205
-            | 10385..=10386
-            | 10465..=10466
-            | 10545..=10546
-            | 11001..=11002
-            | 12333..=12334
-            | 12881..=12882
-            | 12961..=12962
-            | 13041..=13042
-            | 13121..=13122
-            | 13201..=13202
-            | 13281..=13282
-            | 13361..=13362
-            | 13441..=13442
-            | 13521..=13522
-            | 13601..=13602
-            | 13681..=13682
-            | 13761..=13762
-            | 13841..=13842
-            | 13921..=13922
-            | 18859..=18860
-            | 18939..=18940
-            | 19380..=19381
-            | 19800..=19801
-            | 20205..=20206
-            | 21633..=21634
-            | 21713..=21714
-            | 21793..=21794
-            | 21873..=21874
-            | 21985..=21986
-            | 22065..=22066
-            | 22145..=22146
-            | 22225..=22226
-            | 22513..=22514
-            | 22924..=22925
-            | 23335..=23336
-            | 23746..=23747 => &SHAPE51,
+            | 9300..=9301
+            | 9944..=9945
+            | 10024..=10025
+            | 10104..=10105
+            | 10184..=10185
+            | 10264..=10265
+            | 10344..=10345
+            | 10526..=10527
+            | 10606..=10607
+            | 10686..=10687
+            | 11142..=11143
+            | 12474..=12475
+            | 13022..=13023
+            | 13102..=13103
+            | 13182..=13183
+            | 13262..=13263
+            | 13342..=13343
+            | 13422..=13423
+            | 13502..=13503
+            | 13582..=13583
+            | 13662..=13663
+            | 13742..=13743
+            | 13822..=13823
+            | 13902..=13903
+            | 13982..=13983
+            | 14062..=14063
+            | 19000..=19001
+            | 19080..=19081
+            | 19521..=19522
+            | 19941..=19942
+            | 20346..=20347
+            | 21774..=21775
+            | 21854..=21855
+            | 21934..=21935
+            | 22014..=22015
+            | 22126..=22127
+            | 22206..=22207
+            | 22286..=22287
+            | 22366..=22367
+            | 22654..=22655
+            | 23065..=23066
+            | 23476..=23477
+            | 23887..=23888 => &SHAPE51,
             2944..=2945
             | 4752..=4753
             | 7099..=7100
@@ -4121,63 +4121,63 @@ impl BlockWithShape for BlockState {
             | 7736..=7737
             | 7816..=7817
             | 7896..=7897
-            | 9170..=9171
-            | 9814..=9815
-            | 9894..=9895
-            | 9974..=9975
-            | 10054..=10055
-            | 10134..=10135
-            | 10214..=10215
-            | 10395..=10396
-            | 10475..=10476
-            | 10555..=10556
-            | 11011..=11012
-            | 12343..=12344
-            | 12891..=12892
-            | 12971..=12972
-            | 13051..=13052
-            | 13131..=13132
-            | 13211..=13212
-            | 13291..=13292
-            | 13371..=13372
-            | 13451..=13452
-            | 13531..=13532
-            | 13611..=13612
-            | 13691..=13692
-            | 13771..=13772
-            | 13851..=13852
-            | 13931..=13932
-            | 18869..=18870
-            | 18949..=18950
-            | 19390..=19391
-            | 19810..=19811
-            | 20215..=20216
-            | 21643..=21644
-            | 21723..=21724
-            | 21803..=21804
-            | 21883..=21884
-            | 21995..=21996
-            | 22075..=22076
-            | 22155..=22156
-            | 22235..=22236
-            | 22523..=22524
-            | 22934..=22935
-            | 23345..=23346
-            | 23756..=23757 => &SHAPE52,
+            | 9310..=9311
+            | 9954..=9955
+            | 10034..=10035
+            | 10114..=10115
+            | 10194..=10195
+            | 10274..=10275
+            | 10354..=10355
+            | 10536..=10537
+            | 10616..=10617
+            | 10696..=10697
+            | 11152..=11153
+            | 12484..=12485
+            | 13032..=13033
+            | 13112..=13113
+            | 13192..=13193
+            | 13272..=13273
+            | 13352..=13353
+            | 13432..=13433
+            | 13512..=13513
+            | 13592..=13593
+            | 13672..=13673
+            | 13752..=13753
+            | 13832..=13833
+            | 13912..=13913
+            | 13992..=13993
+            | 14072..=14073
+            | 19010..=19011
+            | 19090..=19091
+            | 19531..=19532
+            | 19951..=19952
+            | 20356..=20357
+            | 21784..=21785
+            | 21864..=21865
+            | 21944..=21945
+            | 22024..=22025
+            | 22136..=22137
+            | 22216..=22217
+            | 22296..=22297
+            | 22376..=22377
+            | 22664..=22665
+            | 23075..=23076
+            | 23486..=23487
+            | 23897..=23898 => &SHAPE52,
             2954..=2955
             | 2960..=2961
             | 2966..=2967
             | 2972..=2973
             | 7513..=7520
-            | 8979..=8980
-            | 8985..=8986
-            | 8991..=8992
-            | 8997..=8998 => &SHAPE53,
-            2956..=2957 | 2964..=2965 | 8981..=8982 | 8989..=8990 => &SHAPE54,
-            2958..=2959 | 2962..=2963 | 8983..=8984 | 8987..=8988 => &SHAPE55,
-            2968..=2969 | 2976..=2977 | 8993..=8994 | 9001..=9002 => &SHAPE56,
-            2970..=2971 | 2974..=2975 | 8995..=8996 | 8999..=9000 => &SHAPE57,
-            4286..=4293 | 12372 => &SHAPE62,
+            | 9119..=9120
+            | 9125..=9126
+            | 9131..=9132
+            | 9137..=9138 => &SHAPE53,
+            2956..=2957 | 2964..=2965 | 9121..=9122 | 9129..=9130 => &SHAPE54,
+            2958..=2959 | 2962..=2963 | 9123..=9124 | 9127..=9128 => &SHAPE55,
+            2968..=2969 | 2976..=2977 | 9133..=9134 | 9141..=9142 => &SHAPE56,
+            2970..=2971 | 2974..=2975 | 9135..=9136 | 9139..=9140 => &SHAPE57,
+            4286..=4293 | 12513 => &SHAPE62,
             4590..=4591
             | 4598..=4599
             | 4610..=4611
@@ -4213,84 +4213,84 @@ impl BlockWithShape for BlockState {
             | 6466..=6469
             | 6522..=6525
             | 6530..=6533
-            | 10306..=10309
-            | 10314..=10317
-            | 11681..=11682
-            | 11689..=11690
-            | 11701..=11702
-            | 11709..=11710
-            | 11731..=11732
-            | 11735..=11736
-            | 11739..=11740
-            | 11743..=11746
-            | 11753..=11754
-            | 11765..=11766
-            | 11773..=11774
-            | 11795..=11796
-            | 11799..=11800
-            | 11803..=11804
-            | 11807..=11810
-            | 11817..=11818
-            | 11829..=11830
-            | 11837..=11838
-            | 11859..=11860
-            | 11863..=11864
-            | 11867..=11868
-            | 11871..=11874
-            | 11881..=11882
-            | 11893..=11894
-            | 11901..=11902
-            | 11923..=11924
-            | 11927..=11928
-            | 11931..=11932
-            | 11935..=11938
-            | 11945..=11946
-            | 11957..=11958
-            | 11965..=11966
-            | 11987..=11988
-            | 11991..=11992
-            | 11995..=11996
-            | 11999..=12002
-            | 12009..=12010
-            | 12021..=12022
-            | 12029..=12030
-            | 12051..=12052
-            | 12055..=12056
-            | 12059..=12060
-            | 12063..=12066
-            | 12073..=12074
-            | 12085..=12086
-            | 12093..=12094
-            | 12115..=12116
-            | 12119..=12120
-            | 12123..=12124
-            | 12127..=12130
-            | 12137..=12138
-            | 12149..=12150
-            | 12157..=12158
-            | 12179..=12180
-            | 12183..=12184
-            | 12187..=12188
-            | 12191..=12192
-            | 18655..=18658
-            | 18663..=18666
-            | 18719..=18722
-            | 18727..=18730
-            | 19007..=19008
-            | 19015..=19016
-            | 19027..=19028
-            | 19035..=19036
-            | 19057..=19058
-            | 19061..=19062
-            | 19065..=19066
-            | 19069..=19072
-            | 19079..=19080
-            | 19091..=19092
-            | 19099..=19100
-            | 19121..=19122
-            | 19125..=19126
-            | 19129..=19130
-            | 19133..=19134 => &SHAPE64,
+            | 10447..=10450
+            | 10455..=10458
+            | 11822..=11823
+            | 11830..=11831
+            | 11842..=11843
+            | 11850..=11851
+            | 11872..=11873
+            | 11876..=11877
+            | 11880..=11881
+            | 11884..=11887
+            | 11894..=11895
+            | 11906..=11907
+            | 11914..=11915
+            | 11936..=11937
+            | 11940..=11941
+            | 11944..=11945
+            | 11948..=11951
+            | 11958..=11959
+            | 11970..=11971
+            | 11978..=11979
+            | 12000..=12001
+            | 12004..=12005
+            | 12008..=12009
+            | 12012..=12015
+            | 12022..=12023
+            | 12034..=12035
+            | 12042..=12043
+            | 12064..=12065
+            | 12068..=12069
+            | 12072..=12073
+            | 12076..=12079
+            | 12086..=12087
+            | 12098..=12099
+            | 12106..=12107
+            | 12128..=12129
+            | 12132..=12133
+            | 12136..=12137
+            | 12140..=12143
+            | 12150..=12151
+            | 12162..=12163
+            | 12170..=12171
+            | 12192..=12193
+            | 12196..=12197
+            | 12200..=12201
+            | 12204..=12207
+            | 12214..=12215
+            | 12226..=12227
+            | 12234..=12235
+            | 12256..=12257
+            | 12260..=12261
+            | 12264..=12265
+            | 12268..=12271
+            | 12278..=12279
+            | 12290..=12291
+            | 12298..=12299
+            | 12320..=12321
+            | 12324..=12325
+            | 12328..=12329
+            | 12332..=12333
+            | 18796..=18799
+            | 18804..=18807
+            | 18860..=18863
+            | 18868..=18871
+            | 19148..=19149
+            | 19156..=19157
+            | 19168..=19169
+            | 19176..=19177
+            | 19198..=19199
+            | 19202..=19203
+            | 19206..=19207
+            | 19210..=19213
+            | 19220..=19221
+            | 19232..=19233
+            | 19240..=19241
+            | 19262..=19263
+            | 19266..=19267
+            | 19270..=19271
+            | 19274..=19275 => &SHAPE64,
             4592..=4593
             | 4596..=4597
             | 4600..=4601
@@ -4326,92 +4326,92 @@ impl BlockWithShape for BlockState {
             | 6418..=6421
             | 6474..=6477
             | 6482..=6485
-            | 10258..=10261
-            | 10266..=10269
-            | 11683..=11684
-            | 11687..=11688
-            | 11691..=11692
-            | 11695..=11696
-            | 11713..=11714
-            | 11721..=11722
-            | 11733..=11734
-            | 11741..=11742
-            | 11747..=11748
-            | 11751..=11752
-            | 11755..=11756
-            | 11759..=11760
-            | 11777..=11778
-            | 11785..=11786
-            | 11797..=11798
-            | 11805..=11806
-            | 11811..=11812
-            | 11815..=11816
-            | 11819..=11820
-            | 11823..=11824
-            | 11841..=11842
-            | 11849..=11850
-            | 11861..=11862
-            | 11869..=11870
-            | 11875..=11876
-            | 11879..=11880
-            | 11883..=11884
-            | 11887..=11888
-            | 11905..=11906
-            | 11913..=11914
-            | 11925..=11926
-            | 11933..=11934
-            | 11939..=11940
-            | 11943..=11944
-            | 11947..=11948
-            | 11951..=11952
-            | 11969..=11970
-            | 11977..=11978
-            | 11989..=11990
-            | 11997..=11998
-            | 12003..=12004
-            | 12007..=12008
-            | 12011..=12012
-            | 12015..=12016
-            | 12033..=12034
-            | 12041..=12042
-            | 12053..=12054
-            | 12061..=12062
-            | 12067..=12068
-            | 12071..=12072
-            | 12075..=12076
-            | 12079..=12080
-            | 12097..=12098
-            | 12105..=12106
-            | 12117..=12118
-            | 12125..=12126
-            | 12131..=12132
-            | 12135..=12136
-            | 12139..=12140
-            | 12143..=12144
-            | 12161..=12162
-            | 12169..=12170
-            | 12181..=12182
-            | 12189..=12190
-            | 18607..=18610
-            | 18615..=18618
-            | 18671..=18674
-            | 18679..=18682
-            | 19009..=19010
-            | 19013..=19014
-            | 19017..=19018
-            | 19021..=19022
-            | 19039..=19040
-            | 19047..=19048
-            | 19059..=19060
-            | 19067..=19068
-            | 19073..=19074
-            | 19077..=19078
-            | 19081..=19082
-            | 19085..=19086
-            | 19103..=19104
-            | 19111..=19112
-            | 19123..=19124
-            | 19131..=19132 => &SHAPE65,
+            | 10399..=10402
+            | 10407..=10410
+            | 11824..=11825
+            | 11828..=11829
+            | 11832..=11833
+            | 11836..=11837
+            | 11854..=11855
+            | 11862..=11863
+            | 11874..=11875
+            | 11882..=11883
+            | 11888..=11889
+            | 11892..=11893
+            | 11896..=11897
+            | 11900..=11901
+            | 11918..=11919
+            | 11926..=11927
+            | 11938..=11939
+            | 11946..=11947
+            | 11952..=11953
+            | 11956..=11957
+            | 11960..=11961
+            | 11964..=11965
+            | 11982..=11983
+            | 11990..=11991
+            | 12002..=12003
+            | 12010..=12011
+            | 12016..=12017
+            | 12020..=12021
+            | 12024..=12025
+            | 12028..=12029
+            | 12046..=12047
+            | 12054..=12055
+            | 12066..=12067
+            | 12074..=12075
+            | 12080..=12081
+            | 12084..=12085
+            | 12088..=12089
+            | 12092..=12093
+            | 12110..=12111
+            | 12118..=12119
+            | 12130..=12131
+            | 12138..=12139
+            | 12144..=12145
+            | 12148..=12149
+            | 12152..=12153
+            | 12156..=12157
+            | 12174..=12175
+            | 12182..=12183
+            | 12194..=12195
+            | 12202..=12203
+            | 12208..=12209
+            | 12212..=12213
+            | 12216..=12217
+            | 12220..=12221
+            | 12238..=12239
+            | 12246..=12247
+            | 12258..=12259
+            | 12266..=12267
+            | 12272..=12273
+            | 12276..=12277
+            | 12280..=12281
+            | 12284..=12285
+            | 12302..=12303
+            | 12310..=12311
+            | 12322..=12323
+            | 12330..=12331
+            | 18748..=18751
+            | 18756..=18759
+            | 18812..=18815
+            | 18820..=18823
+            | 19150..=19151
+            | 19154..=19155
+            | 19158..=19159
+            | 19162..=19163
+            | 19180..=19181
+            | 19188..=19189
+            | 19200..=19201
+            | 19208..=19209
+            | 19214..=19215
+            | 19218..=19219
+            | 19222..=19223
+            | 19226..=19227
+            | 19244..=19245
+            | 19252..=19253
+            | 19264..=19265
+            | 19272..=19273 => &SHAPE65,
             4594..=4595
             | 4602..=4603
             | 4606..=4607
@@ -4447,92 +4447,92 @@ impl BlockWithShape for BlockState {
             | 6450..=6453
             | 6506..=6509
             | 6514..=6517
-            | 10290..=10293
-            | 10298..=10301
-            | 11685..=11686
-            | 11693..=11694
-            | 11697..=11698
-            | 11705..=11706
-            | 11715..=11716
-            | 11719..=11720
-            | 11723..=11724
-            | 11727..=11728
-            | 11749..=11750
-            | 11757..=11758
-            | 11761..=11762
-            | 11769..=11770
-            | 11779..=11780
-            | 11783..=11784
-            | 11787..=11788
-            | 11791..=11792
-            | 11813..=11814
-            | 11821..=11822
-            | 11825..=11826
-            | 11833..=11834
-            | 11843..=11844
-            | 11847..=11848
-            | 11851..=11852
-            | 11855..=11856
-            | 11877..=11878
-            | 11885..=11886
-            | 11889..=11890
-            | 11897..=11898
-            | 11907..=11908
-            | 11911..=11912
-            | 11915..=11916
-            | 11919..=11920
-            | 11941..=11942
-            | 11949..=11950
-            | 11953..=11954
-            | 11961..=11962
-            | 11971..=11972
-            | 11975..=11976
-            | 11979..=11980
-            | 11983..=11984
-            | 12005..=12006
-            | 12013..=12014
-            | 12017..=12018
-            | 12025..=12026
-            | 12035..=12036
-            | 12039..=12040
-            | 12043..=12044
-            | 12047..=12048
-            | 12069..=12070
-            | 12077..=12078
-            | 12081..=12082
-            | 12089..=12090
-            | 12099..=12100
-            | 12103..=12104
-            | 12107..=12108
-            | 12111..=12112
-            | 12133..=12134
-            | 12141..=12142
-            | 12145..=12146
-            | 12153..=12154
-            | 12163..=12164
-            | 12167..=12168
-            | 12171..=12172
-            | 12175..=12176
-            | 18639..=18642
-            | 18647..=18650
-            | 18703..=18706
-            | 18711..=18714
-            | 19011..=19012
-            | 19019..=19020
-            | 19023..=19024
-            | 19031..=19032
-            | 19041..=19042
-            | 19045..=19046
-            | 19049..=19050
-            | 19053..=19054
-            | 19075..=19076
-            | 19083..=19084
-            | 19087..=19088
-            | 19095..=19096
-            | 19105..=19106
-            | 19109..=19110
-            | 19113..=19114
-            | 19117..=19118 => &SHAPE66,
+            | 10431..=10434
+            | 10439..=10442
+            | 11826..=11827
+            | 11834..=11835
+            | 11838..=11839
+            | 11846..=11847
+            | 11856..=11857
+            | 11860..=11861
+            | 11864..=11865
+            | 11868..=11869
+            | 11890..=11891
+            | 11898..=11899
+            | 11902..=11903
+            | 11910..=11911
+            | 11920..=11921
+            | 11924..=11925
+            | 11928..=11929
+            | 11932..=11933
+            | 11954..=11955
+            | 11962..=11963
+            | 11966..=11967
+            | 11974..=11975
+            | 11984..=11985
+            | 11988..=11989
+            | 11992..=11993
+            | 11996..=11997
+            | 12018..=12019
+            | 12026..=12027
+            | 12030..=12031
+            | 12038..=12039
+            | 12048..=12049
+            | 12052..=12053
+            | 12056..=12057
+            | 12060..=12061
+            | 12082..=12083
+            | 12090..=12091
+            | 12094..=12095
+            | 12102..=12103
+            | 12112..=12113
+            | 12116..=12117
+            | 12120..=12121
+            | 12124..=12125
+            | 12146..=12147
+            | 12154..=12155
+            | 12158..=12159
+            | 12166..=12167
+            | 12176..=12177
+            | 12180..=12181
+            | 12184..=12185
+            | 12188..=12189
+            | 12210..=12211
+            | 12218..=12219
+            | 12222..=12223
+            | 12230..=12231
+            | 12240..=12241
+            | 12244..=12245
+            | 12248..=12249
+            | 12252..=12253
+            | 12274..=12275
+            | 12282..=12283
+            | 12286..=12287
+            | 12294..=12295
+            | 12304..=12305
+            | 12308..=12309
+            | 12312..=12313
+            | 12316..=12317
+            | 18780..=18783
+            | 18788..=18791
+            | 18844..=18847
+            | 18852..=18855
+            | 19152..=19153
+            | 19160..=19161
+            | 19164..=19165
+            | 19172..=19173
+            | 19182..=19183
+            | 19186..=19187
+            | 19190..=19191
+            | 19194..=19195
+            | 19216..=19217
+            | 19224..=19225
+            | 19228..=19229
+            | 19236..=19237
+            | 19246..=19247
+            | 19250..=19251
+            | 19254..=19255
+            | 19258..=19259 => &SHAPE66,
             4608..=4609
             | 4612..=4613
             | 4616..=4617
@@ -4568,92 +4568,92 @@ impl BlockWithShape for BlockState {
             | 6434..=6437
             | 6490..=6493
             | 6498..=6501
-            | 10274..=10277
-            | 10282..=10285
-            | 11699..=11700
-            | 11703..=11704
-            | 11707..=11708
-            | 11711..=11712
-            | 11717..=11718
-            | 11725..=11726
-            | 11729..=11730
-            | 11737..=11738
-            | 11763..=11764
-            | 11767..=11768
-            | 11771..=11772
-            | 11775..=11776
-            | 11781..=11782
-            | 11789..=11790
-            | 11793..=11794
-            | 11801..=11802
-            | 11827..=11828
-            | 11831..=11832
-            | 11835..=11836
-            | 11839..=11840
-            | 11845..=11846
-            | 11853..=11854
-            | 11857..=11858
-            | 11865..=11866
-            | 11891..=11892
-            | 11895..=11896
-            | 11899..=11900
-            | 11903..=11904
-            | 11909..=11910
-            | 11917..=11918
-            | 11921..=11922
-            | 11929..=11930
-            | 11955..=11956
-            | 11959..=11960
-            | 11963..=11964
-            | 11967..=11968
-            | 11973..=11974
-            | 11981..=11982
-            | 11985..=11986
-            | 11993..=11994
-            | 12019..=12020
-            | 12023..=12024
-            | 12027..=12028
-            | 12031..=12032
-            | 12037..=12038
-            | 12045..=12046
-            | 12049..=12050
-            | 12057..=12058
-            | 12083..=12084
-            | 12087..=12088
-            | 12091..=12092
-            | 12095..=12096
-            | 12101..=12102
-            | 12109..=12110
-            | 12113..=12114
-            | 12121..=12122
-            | 12147..=12148
-            | 12151..=12152
-            | 12155..=12156
-            | 12159..=12160
-            | 12165..=12166
-            | 12173..=12174
-            | 12177..=12178
-            | 12185..=12186
-            | 18623..=18626
-            | 18631..=18634
-            | 18687..=18690
-            | 18695..=18698
-            | 19025..=19026
-            | 19029..=19030
-            | 19033..=19034
-            | 19037..=19038
-            | 19043..=19044
-            | 19051..=19052
-            | 19055..=19056
-            | 19063..=19064
-            | 19089..=19090
-            | 19093..=19094
-            | 19097..=19098
-            | 19101..=19102
-            | 19107..=19108
-            | 19115..=19116
-            | 19119..=19120
-            | 19127..=19128 => &SHAPE67,
+            | 10415..=10418
+            | 10423..=10426
+            | 11840..=11841
+            | 11844..=11845
+            | 11848..=11849
+            | 11852..=11853
+            | 11858..=11859
+            | 11866..=11867
+            | 11870..=11871
+            | 11878..=11879
+            | 11904..=11905
+            | 11908..=11909
+            | 11912..=11913
+            | 11916..=11917
+            | 11922..=11923
+            | 11930..=11931
+            | 11934..=11935
+            | 11942..=11943
+            | 11968..=11969
+            | 11972..=11973
+            | 11976..=11977
+            | 11980..=11981
+            | 11986..=11987
+            | 11994..=11995
+            | 11998..=11999
+            | 12006..=12007
+            | 12032..=12033
+            | 12036..=12037
+            | 12040..=12041
+            | 12044..=12045
+            | 12050..=12051
+            | 12058..=12059
+            | 12062..=12063
+            | 12070..=12071
+            | 12096..=12097
+            | 12100..=12101
+            | 12104..=12105
+            | 12108..=12109
+            | 12114..=12115
+            | 12122..=12123
+            | 12126..=12127
+            | 12134..=12135
+            | 12160..=12161
+            | 12164..=12165
+            | 12168..=12169
+            | 12172..=12173
+            | 12178..=12179
+            | 12186..=12187
+            | 12190..=12191
+            | 12198..=12199
+            | 12224..=12225
+            | 12228..=12229
+            | 12232..=12233
+            | 12236..=12237
+            | 12242..=12243
+            | 12250..=12251
+            | 12254..=12255
+            | 12262..=12263
+            | 12288..=12289
+            | 12292..=12293
+            | 12296..=12297
+            | 12300..=12301
+            | 12306..=12307
+            | 12314..=12315
+            | 12318..=12319
+            | 12326..=12327
+            | 18764..=18767
+            | 18772..=18775
+            | 18828..=18831
+            | 18836..=18839
+            | 19166..=19167
+            | 19170..=19171
+            | 19174..=19175
+            | 19178..=19179
+            | 19184..=19185
+            | 19192..=19193
+            | 19196..=19197
+            | 19204..=19205
+            | 19230..=19231
+            | 19234..=19235
+            | 19238..=19239
+            | 19242..=19243
+            | 19248..=19249
+            | 19256..=19257
+            | 19260..=19261
+            | 19268..=19269 => &SHAPE67,
             5538..=5541
             | 5546..=5549
             | 5554..=5557
@@ -4676,90 +4676,90 @@ impl BlockWithShape for BlockState {
             | 5606..=5609
             | 5614..=5617
             | 5622..=5625 => &SHAPE70,
-            5773 | 5882..=5945 | 9035..=9050 => &SHAPE7,
+            5773 | 5882..=5945 | 9175..=9190 => &SHAPE7,
             5774 => &SHAPE58,
-            5775 | 9051..=9082 => &SHAPE59,
+            5775 | 9191..=9222 => &SHAPE59,
             5776
-            | 10567..=10568
-            | 10573..=10574
-            | 10579..=10580
-            | 11023..=11024
-            | 11029..=11030
-            | 11035..=11036
-            | 11041..=11042
-            | 11047..=11048
-            | 11053..=11054
-            | 11059..=11060
-            | 11065..=11066
-            | 11071..=11072
-            | 11077..=11078
-            | 11083..=11084
-            | 11089..=11090
-            | 11095..=11096
-            | 11101..=11102
-            | 11107..=11108
-            | 11113..=11114
-            | 11119..=11120
-            | 11125..=11126
-            | 11131..=11132
-            | 11137..=11138
-            | 11143..=11144
-            | 11149..=11150
-            | 11155..=11156
-            | 11161..=11162
-            | 13943..=13944
-            | 13949..=13950
-            | 13955..=13956
-            | 13961..=13962
-            | 13967..=13968
-            | 13973..=13974
-            | 13979..=13980
-            | 13985..=13986
-            | 13991..=13992
-            | 13997..=13998
-            | 14003..=14004
-            | 14009..=14010
-            | 14015..=14016
-            | 18529..=18530
-            | 18535..=18536
-            | 19726..=19727
-            | 19736..=19737
-            | 20227..=20228
-            | 20944..=21423
-            | 21555..=21562
-            | 21895..=21896
-            | 21901..=21902
-            | 21907..=21908
-            | 21913..=21914
-            | 22247..=22248
-            | 22253..=22254
-            | 22259..=22260
-            | 22265..=22266
-            | 22535..=22536
-            | 22946..=22947
-            | 23357..=23358
-            | 23768..=23769 => &SHAPE8,
+            | 10708..=10709
+            | 10714..=10715
+            | 10720..=10721
+            | 11164..=11165
+            | 11170..=11171
+            | 11176..=11177
+            | 11182..=11183
+            | 11188..=11189
+            | 11194..=11195
+            | 11200..=11201
+            | 11206..=11207
+            | 11212..=11213
+            | 11218..=11219
+            | 11224..=11225
+            | 11230..=11231
+            | 11236..=11237
+            | 11242..=11243
+            | 11248..=11249
+            | 11254..=11255
+            | 11260..=11261
+            | 11266..=11267
+            | 11272..=11273
+            | 11278..=11279
+            | 11284..=11285
+            | 11290..=11291
+            | 11296..=11297
+            | 11302..=11303
+            | 14084..=14085
+            | 14090..=14091
+            | 14096..=14097
+            | 14102..=14103
+            | 14108..=14109
+            | 14114..=14115
+            | 14120..=14121
+            | 14126..=14127
+            | 14132..=14133
+            | 14138..=14139
+            | 14144..=14145
+            | 14150..=14151
+            | 14156..=14157
+            | 18670..=18671
+            | 18676..=18677
+            | 19867..=19868
+            | 19877..=19878
+            | 20368..=20369
+            | 21085..=21564
+            | 21696..=21703
+            | 22036..=22037
+            | 22042..=22043
+            | 22048..=22049
+            | 22054..=22055
+            | 22388..=22389
+            | 22394..=22395
+            | 22400..=22401
+            | 22406..=22407
+            | 22676..=22677
+            | 23087..=23088
+            | 23498..=23499
+            | 23909..=23910 => &SHAPE8,
             5777 => &SHAPE60,
-            5779 | 5851 | 22448 => &SHAPE61,
-            5782..=5797 | 19304 => &SHAPE71,
-            5817 | 5819 | 7273 | 7275 | 11425 | 11427 | 11457 | 11459 | 11489 | 11491 | 11521
-            | 11523 | 11553 | 11555 | 11585 | 11587 | 11617 | 11619 | 11649 | 11651 | 18543
-            | 18545 | 18575 | 18577 => &SHAPE74,
-            5818 | 5820 | 7274 | 7276 | 11426 | 11428 | 11458 | 11460 | 11490 | 11492 | 11522
-            | 11524 | 11554 | 11556 | 11586 | 11588 | 11618 | 11620 | 11650 | 11652 | 18544
-            | 18546 | 18576 | 18578 => &SHAPE75,
-            5821 | 5823 | 7277 | 7279 | 11429 | 11431 | 11461 | 11463 | 11493 | 11495 | 11525
-            | 11527 | 11557 | 11559 | 11589 | 11591 | 11621 | 11623 | 11653 | 11655 | 18547
-            | 18549 | 18579 | 18581 => &SHAPE76,
-            5822 | 5824 | 7278 | 7280 | 11430 | 11432 | 11462 | 11464 | 11494 | 11496 | 11526
-            | 11528 | 11558 | 11560 | 11590 | 11592 | 11622 | 11624 | 11654 | 11656 | 18548
-            | 18550 | 18580 | 18582 => &SHAPE77,
-            5825 | 5827 | 7281 | 7283 | 11433 | 11435 | 11465 | 11467 | 11497 | 11499 | 11529
-            | 11531 | 11561 | 11563 | 11593 | 11595 | 11625 | 11627 | 11657 | 11659 | 18551
-            | 18553 | 18583 | 18585 => &SHAPE78,
-            5826 | 5828 | 7282 | 7284 | 11434 | 11436 | 11466 | 11468 | 11498 | 11500 | 11530
-            | 11532 | 11562 | 11564 | 11594 | 11596 | 11626 | 11628 | 11658 | 11660 | 18552
-            | 18554 | 18584 | 18586 => &SHAPE79,
+            5779 | 5851 | 22589 => &SHAPE61,
+            5782..=5797 | 19445 => &SHAPE71,
+            5817 | 5819 | 7273 | 7275 | 11566 | 11568 | 11598 | 11600 | 11630 | 11632 | 11662
+            | 11664 | 11694 | 11696 | 11726 | 11728 | 11758 | 11760 | 11790 | 11792 | 18684
+            | 18686 | 18716 | 18718 => &SHAPE74,
+            5818 | 5820 | 7274 | 7276 | 11567 | 11569 | 11599 | 11601 | 11631 | 11633 | 11663
+            | 11665 | 11695 | 11697 | 11727 | 11729 | 11759 | 11761 | 11791 | 11793 | 18685
+            | 18687 | 18717 | 18719 => &SHAPE75,
+            5821 | 5823 | 7277 | 7279 | 11570 | 11572 | 11602 | 11604 | 11634 | 11636 | 11666
+            | 11668 | 11698 | 11700 | 11730 | 11732 | 11762 | 11764 | 11794 | 11796 | 18688
+            | 18690 | 18720 | 18722 => &SHAPE76,
+            5822 | 5824 | 7278 | 7280 | 11571 | 11573 | 11603 | 11605 | 11635 | 11637 | 11667
+            | 11669 | 11699 | 11701 | 11731 | 11733 | 11763 | 11765 | 11795 | 11797 | 18689
+            | 18691 | 18721 | 18723 => &SHAPE77,
+            5825 | 5827 | 7281 | 7283 | 11574 | 11576 | 11606 | 11608 | 11638 | 11640 | 11670
+            | 11672 | 11702 | 11704 | 11734 | 11736 | 11766 | 11768 | 11798 | 11800 | 18692
+            | 18694 | 18724 | 18726 => &SHAPE78,
+            5826 | 5828 | 7282 | 7284 | 11575 | 11577 | 11607 | 11609 | 11639 | 11641 | 11671
+            | 11673 | 11703 | 11705 | 11735 | 11737 | 11767 | 11769 | 11799 | 11801 | 18693
+            | 18695 | 18725 | 18727 => &SHAPE79,
             5829
             | 5831
             | 6999..=7000
@@ -4768,72 +4768,72 @@ impl BlockWithShape for BlockState {
             | 7011..=7012
             | 7285
             | 7287
-            | 11171..=11172
-            | 11175..=11176
-            | 11179..=11180
-            | 11183..=11184
-            | 11203..=11204
-            | 11207..=11208
-            | 11211..=11212
-            | 11215..=11216
-            | 11235..=11236
-            | 11239..=11240
-            | 11243..=11244
-            | 11247..=11248
-            | 11267..=11268
-            | 11271..=11272
-            | 11275..=11276
-            | 11279..=11280
-            | 11299..=11300
-            | 11303..=11304
-            | 11307..=11308
-            | 11311..=11312
-            | 11331..=11332
-            | 11335..=11336
-            | 11339..=11340
-            | 11343..=11344
-            | 11363..=11364
-            | 11367..=11368
-            | 11371..=11372
-            | 11375..=11376
-            | 11395..=11396
-            | 11399..=11400
-            | 11403..=11404
-            | 11407..=11408
-            | 11437
-            | 11439
-            | 11469
-            | 11471
-            | 11501
-            | 11503
-            | 11533
-            | 11535
-            | 11565
-            | 11567
-            | 11597
-            | 11599
-            | 11629
-            | 11631
-            | 11661
-            | 11663
-            | 18555
-            | 18557
-            | 18587
-            | 18589
-            | 18737..=18738
-            | 18741..=18742
-            | 18745..=18746
-            | 18749..=18750
-            | 18769..=18770
-            | 18773..=18774
-            | 18777..=18778
-            | 18781..=18782 => &SHAPE80,
-            5830 | 5832 | 7286 | 7288 | 11438 | 11440 | 11470 | 11472 | 11502 | 11504 | 11534
-            | 11536 | 11566 | 11568 | 11598 | 11600 | 11630 | 11632 | 11662 | 11664 | 18556
-            | 18558 | 18588 | 18590 => &SHAPE81,
-            5833 | 5835 | 7289 | 7291 | 11441 | 11443 | 11473 | 11475 | 11505 | 11507 | 11537
-            | 11539 | 11569 | 11571 | 11601 | 11603 | 11633 | 11635 | 11665 | 11667 | 18559
-            | 18561 | 18591 | 18593 => &SHAPE82,
+            | 11312..=11313
+            | 11316..=11317
+            | 11320..=11321
+            | 11324..=11325
+            | 11344..=11345
+            | 11348..=11349
+            | 11352..=11353
+            | 11356..=11357
+            | 11376..=11377
+            | 11380..=11381
+            | 11384..=11385
+            | 11388..=11389
+            | 11408..=11409
+            | 11412..=11413
+            | 11416..=11417
+            | 11420..=11421
+            | 11440..=11441
+            | 11444..=11445
+            | 11448..=11449
+            | 11452..=11453
+            | 11472..=11473
+            | 11476..=11477
+            | 11480..=11481
+            | 11484..=11485
+            | 11504..=11505
+            | 11508..=11509
+            | 11512..=11513
+            | 11516..=11517
+            | 11536..=11537
+            | 11540..=11541
+            | 11544..=11545
+            | 11548..=11549
+            | 11578
+            | 11580
+            | 11610
+            | 11612
+            | 11642
+            | 11644
+            | 11674
+            | 11676
+            | 11706
+            | 11708
+            | 11738
+            | 11740
+            | 11770
+            | 11772
+            | 11802
+            | 11804
+            | 18696
+            | 18698
+            | 18728
+            | 18730
+            | 18878..=18879
+            | 18882..=18883
+            | 18886..=18887
+            | 18890..=18891
+            | 18910..=18911
+            | 18914..=18915
+            | 18918..=18919
+            | 18922..=18923 => &SHAPE80,
+            5830 | 5832 | 7286 | 7288 | 11579 | 11581 | 11611 | 11613 | 11643 | 11645 | 11675
+            | 11677 | 11707 | 11709 | 11739 | 11741 | 11771 | 11773 | 11803 | 11805 | 18697
+            | 18699 | 18729 | 18731 => &SHAPE81,
+            5833 | 5835 | 7289 | 7291 | 11582 | 11584 | 11614 | 11616 | 11646 | 11648 | 11678
+            | 11680 | 11710 | 11712 | 11742 | 11744 | 11774 | 11776 | 11806 | 11808 | 18700
+            | 18702 | 18732 | 18734 => &SHAPE82,
             5834
             | 5836
             | 7015..=7016
@@ -4842,84 +4842,84 @@ impl BlockWithShape for BlockState {
             | 7027..=7028
             | 7290
             | 7292
-            | 11187..=11188
-            | 11191..=11192
-            | 11195..=11196
-            | 11199..=11200
-            | 11219..=11220
-            | 11223..=11224
-            | 11227..=11228
-            | 11231..=11232
-            | 11251..=11252
-            | 11255..=11256
-            | 11259..=11260
-            | 11263..=11264
-            | 11283..=11284
-            | 11287..=11288
-            | 11291..=11292
-            | 11295..=11296
-            | 11315..=11316
-            | 11319..=11320
-            | 11323..=11324
-            | 11327..=11328
-            | 11347..=11348
-            | 11351..=11352
-            | 11355..=11356
-            | 11359..=11360
-            | 11379..=11380
-            | 11383..=11384
-            | 11387..=11388
-            | 11391..=11392
-            | 11411..=11412
-            | 11415..=11416
-            | 11419..=11420
-            | 11423..=11424
-            | 11442
-            | 11444
-            | 11474
-            | 11476
-            | 11506
-            | 11508
-            | 11538
-            | 11540
-            | 11570
-            | 11572
-            | 11602
-            | 11604
-            | 11634
-            | 11636
-            | 11666
-            | 11668
-            | 18560
-            | 18562
-            | 18592
-            | 18594
-            | 18753..=18754
-            | 18757..=18758
-            | 18761..=18762
-            | 18765..=18766
-            | 18785..=18786
-            | 18789..=18790
-            | 18793..=18794
-            | 18797..=18798 => &SHAPE83,
-            5837 | 5839 | 7293 | 7295 | 11445 | 11447 | 11477 | 11479 | 11509 | 11511 | 11541
-            | 11543 | 11573 | 11575 | 11605 | 11607 | 11637 | 11639 | 11669 | 11671 | 18563
-            | 18565 | 18595 | 18597 => &SHAPE84,
-            5838 | 5840 | 7294 | 7296 | 11446 | 11448 | 11478 | 11480 | 11510 | 11512 | 11542
-            | 11544 | 11574 | 11576 | 11606 | 11608 | 11638 | 11640 | 11670 | 11672 | 18564
-            | 18566 | 18596 | 18598 => &SHAPE85,
-            5841 | 5843 | 7297 | 7299 | 11449 | 11451 | 11481 | 11483 | 11513 | 11515 | 11545
-            | 11547 | 11577 | 11579 | 11609 | 11611 | 11641 | 11643 | 11673 | 11675 | 18567
-            | 18569 | 18599 | 18601 => &SHAPE86,
-            5842 | 5844 | 7298 | 7300 | 11450 | 11452 | 11482 | 11484 | 11514 | 11516 | 11546
-            | 11548 | 11578 | 11580 | 11610 | 11612 | 11642 | 11644 | 11674 | 11676 | 18568
-            | 18570 | 18600 | 18602 => &SHAPE87,
-            5845 | 5847 | 7301 | 7303 | 11453 | 11455 | 11485 | 11487 | 11517 | 11519 | 11549
-            | 11551 | 11581 | 11583 | 11613 | 11615 | 11645 | 11647 | 11677 | 11679 | 18571
-            | 18573 | 18603 | 18605 => &SHAPE88,
-            5846 | 5848 | 7302 | 7304 | 11454 | 11456 | 11486 | 11488 | 11518 | 11520 | 11550
-            | 11552 | 11582 | 11584 | 11614 | 11616 | 11646 | 11648 | 11678 | 11680 | 18572
-            | 18574 | 18604 | 18606 => &SHAPE89,
+            | 11328..=11329
+            | 11332..=11333
+            | 11336..=11337
+            | 11340..=11341
+            | 11360..=11361
+            | 11364..=11365
+            | 11368..=11369
+            | 11372..=11373
+            | 11392..=11393
+            | 11396..=11397
+            | 11400..=11401
+            | 11404..=11405
+            | 11424..=11425
+            | 11428..=11429
+            | 11432..=11433
+            | 11436..=11437
+            | 11456..=11457
+            | 11460..=11461
+            | 11464..=11465
+            | 11468..=11469
+            | 11488..=11489
+            | 11492..=11493
+            | 11496..=11497
+            | 11500..=11501
+            | 11520..=11521
+            | 11524..=11525
+            | 11528..=11529
+            | 11532..=11533
+            | 11552..=11553
+            | 11556..=11557
+            | 11560..=11561
+            | 11564..=11565
+            | 11583
+            | 11585
+            | 11615
+            | 11617
+            | 11647
+            | 11649
+            | 11679
+            | 11681
+            | 11711
+            | 11713
+            | 11743
+            | 11745
+            | 11775
+            | 11777
+            | 11807
+            | 11809
+            | 18701
+            | 18703
+            | 18733
+            | 18735
+            | 18894..=18895
+            | 18898..=18899
+            | 18902..=18903
+            | 18906..=18907
+            | 18926..=18927
+            | 18930..=18931
+            | 18934..=18935
+            | 18938..=18939 => &SHAPE83,
+            5837 | 5839 | 7293 | 7295 | 11586 | 11588 | 11618 | 11620 | 11650 | 11652 | 11682
+            | 11684 | 11714 | 11716 | 11746 | 11748 | 11778 | 11780 | 11810 | 11812 | 18704
+            | 18706 | 18736 | 18738 => &SHAPE84,
+            5838 | 5840 | 7294 | 7296 | 11587 | 11589 | 11619 | 11621 | 11651 | 11653 | 11683
+            | 11685 | 11715 | 11717 | 11747 | 11749 | 11779 | 11781 | 11811 | 11813 | 18705
+            | 18707 | 18737 | 18739 => &SHAPE85,
+            5841 | 5843 | 7297 | 7299 | 11590 | 11592 | 11622 | 11624 | 11654 | 11656 | 11686
+            | 11688 | 11718 | 11720 | 11750 | 11752 | 11782 | 11784 | 11814 | 11816 | 18708
+            | 18710 | 18740 | 18742 => &SHAPE86,
+            5842 | 5844 | 7298 | 7300 | 11591 | 11593 | 11623 | 11625 | 11655 | 11657 | 11687
+            | 11689 | 11719 | 11721 | 11751 | 11753 | 11783 | 11785 | 11815 | 11817 | 18709
+            | 18711 | 18741 | 18743 => &SHAPE87,
+            5845 | 5847 | 7301 | 7303 | 11594 | 11596 | 11626 | 11628 | 11658 | 11660 | 11690
+            | 11692 | 11722 | 11724 | 11754 | 11756 | 11786 | 11788 | 11818 | 11820 | 18712
+            | 18714 | 18744 | 18746 => &SHAPE88,
+            5846 | 5848 | 7302 | 7304 | 11595 | 11597 | 11627 | 11629 | 11659 | 11661 | 11691
+            | 11693 | 11723 | 11725 | 11755 | 11757 | 11787 | 11789 | 11819 | 11821 | 18713
+            | 18715 | 18745 | 18747 => &SHAPE89,
             5875 => &SHAPE91,
             5876 => &SHAPE92,
             5877 => &SHAPE93,
@@ -4963,18 +4963,18 @@ impl BlockWithShape for BlockState {
             | 6494..=6497
             | 6510..=6513
             | 6526..=6529
-            | 10262..=10265
-            | 10278..=10281
-            | 10294..=10297
-            | 10310..=10313
-            | 18611..=18614
-            | 18627..=18630
-            | 18643..=18646
-            | 18659..=18662
-            | 18675..=18678
-            | 18691..=18694
-            | 18707..=18710
-            | 18723..=18726 => &SHAPE98,
+            | 10403..=10406
+            | 10419..=10422
+            | 10435..=10438
+            | 10451..=10454
+            | 18752..=18755
+            | 18768..=18771
+            | 18784..=18787
+            | 18800..=18803
+            | 18816..=18819
+            | 18832..=18835
+            | 18848..=18851
+            | 18864..=18867 => &SHAPE98,
             5974..=5977
             | 5990..=5993
             | 6006..=6009
@@ -5011,107 +5011,107 @@ impl BlockWithShape for BlockState {
             | 6502..=6505
             | 6518..=6521
             | 6534..=6537
-            | 10270..=10273
-            | 10286..=10289
-            | 10302..=10305
-            | 10318..=10321
-            | 18619..=18622
-            | 18635..=18638
-            | 18651..=18654
-            | 18667..=18670
-            | 18683..=18686
-            | 18699..=18702
-            | 18715..=18718
-            | 18731..=18734 => &SHAPE99,
-            6742 | 6744 | 6780 | 6782 | 9232 | 9234 | 9264 | 9266 | 9296 | 9298 | 9328 | 9330
-            | 9360 | 9362 | 9392 | 9394 | 9424 | 9426 | 9456 | 9458 | 9488 | 9490 | 9520 | 9522
-            | 9552 | 9554 | 9584 | 9586 | 9616 | 9618 | 9648 | 9650 | 9680 | 9682 | 9712 | 9714 => {
+            | 10411..=10414
+            | 10427..=10430
+            | 10443..=10446
+            | 10459..=10462
+            | 18760..=18763
+            | 18776..=18779
+            | 18792..=18795
+            | 18808..=18811
+            | 18824..=18827
+            | 18840..=18843
+            | 18856..=18859
+            | 18872..=18875 => &SHAPE99,
+            6742 | 6744 | 6780 | 6782 | 9372 | 9374 | 9404 | 9406 | 9436 | 9438 | 9468 | 9470
+            | 9500 | 9502 | 9532 | 9534 | 9564 | 9566 | 9596 | 9598 | 9628 | 9630 | 9660 | 9662
+            | 9692 | 9694 | 9724 | 9726 | 9756 | 9758 | 9788 | 9790 | 9820 | 9822 | 9852 | 9854 => {
                 &SHAPE100
             }
-            6743 | 6745 | 6781 | 6783 | 9233 | 9235 | 9265 | 9267 | 9297 | 9299 | 9329 | 9331
-            | 9361 | 9363 | 9393 | 9395 | 9425 | 9427 | 9457 | 9459 | 9489 | 9491 | 9521 | 9523
-            | 9553 | 9555 | 9585 | 9587 | 9617 | 9619 | 9649 | 9651 | 9681 | 9683 | 9713 | 9715 => {
+            6743 | 6745 | 6781 | 6783 | 9373 | 9375 | 9405 | 9407 | 9437 | 9439 | 9469 | 9471
+            | 9501 | 9503 | 9533 | 9535 | 9565 | 9567 | 9597 | 9599 | 9629 | 9631 | 9661 | 9663
+            | 9693 | 9695 | 9725 | 9727 | 9757 | 9759 | 9789 | 9791 | 9821 | 9823 | 9853 | 9855 => {
                 &SHAPE101
             }
-            6746 | 6748 | 6784 | 6786 | 9236 | 9238 | 9268 | 9270 | 9300 | 9302 | 9332 | 9334
-            | 9364 | 9366 | 9396 | 9398 | 9428 | 9430 | 9460 | 9462 | 9492 | 9494 | 9524 | 9526
-            | 9556 | 9558 | 9588 | 9590 | 9620 | 9622 | 9652 | 9654 | 9684 | 9686 | 9716 | 9718 => {
+            6746 | 6748 | 6784 | 6786 | 9376 | 9378 | 9408 | 9410 | 9440 | 9442 | 9472 | 9474
+            | 9504 | 9506 | 9536 | 9538 | 9568 | 9570 | 9600 | 9602 | 9632 | 9634 | 9664 | 9666
+            | 9696 | 9698 | 9728 | 9730 | 9760 | 9762 | 9792 | 9794 | 9824 | 9826 | 9856 | 9858 => {
                 &SHAPE102
             }
-            6747 | 6749 | 6785 | 6787 | 9237 | 9239 | 9269 | 9271 | 9301 | 9303 | 9333 | 9335
-            | 9365 | 9367 | 9397 | 9399 | 9429 | 9431 | 9461 | 9463 | 9493 | 9495 | 9525 | 9527
-            | 9557 | 9559 | 9589 | 9591 | 9621 | 9623 | 9653 | 9655 | 9685 | 9687 | 9717 | 9719 => {
+            6747 | 6749 | 6785 | 6787 | 9377 | 9379 | 9409 | 9411 | 9441 | 9443 | 9473 | 9475
+            | 9505 | 9507 | 9537 | 9539 | 9569 | 9571 | 9601 | 9603 | 9633 | 9635 | 9665 | 9667
+            | 9697 | 9699 | 9729 | 9731 | 9761 | 9763 | 9793 | 9795 | 9825 | 9827 | 9857 | 9859 => {
                 &SHAPE103
             }
-            6750 | 6752 | 6788 | 6790 | 9240 | 9242 | 9272 | 9274 | 9304 | 9306 | 9336 | 9338
-            | 9368 | 9370 | 9400 | 9402 | 9432 | 9434 | 9464 | 9466 | 9496 | 9498 | 9528 | 9530
-            | 9560 | 9562 | 9592 | 9594 | 9624 | 9626 | 9656 | 9658 | 9688 | 9690 | 9720 | 9722 => {
+            6750 | 6752 | 6788 | 6790 | 9380 | 9382 | 9412 | 9414 | 9444 | 9446 | 9476 | 9478
+            | 9508 | 9510 | 9540 | 9542 | 9572 | 9574 | 9604 | 9606 | 9636 | 9638 | 9668 | 9670
+            | 9700 | 9702 | 9732 | 9734 | 9764 | 9766 | 9796 | 9798 | 9828 | 9830 | 9860 | 9862 => {
                 &SHAPE104
             }
-            6751 | 6753 | 6789 | 6791 | 9241 | 9243 | 9273 | 9275 | 9305 | 9307 | 9337 | 9339
-            | 9369 | 9371 | 9401 | 9403 | 9433 | 9435 | 9465 | 9467 | 9497 | 9499 | 9529 | 9531
-            | 9561 | 9563 | 9593 | 9595 | 9625 | 9627 | 9657 | 9659 | 9689 | 9691 | 9721 | 9723 => {
+            6751 | 6753 | 6789 | 6791 | 9381 | 9383 | 9413 | 9415 | 9445 | 9447 | 9477 | 9479
+            | 9509 | 9511 | 9541 | 9543 | 9573 | 9575 | 9605 | 9607 | 9637 | 9639 | 9669 | 9671
+            | 9701 | 9703 | 9733 | 9735 | 9765 | 9767 | 9797 | 9799 | 9829 | 9831 | 9861 | 9863 => {
                 &SHAPE105
             }
-            6754 | 6756 | 6792 | 6794 | 9244 | 9246 | 9276 | 9278 | 9308 | 9310 | 9340 | 9342
-            | 9372 | 9374 | 9404 | 9406 | 9436 | 9438 | 9468 | 9470 | 9500 | 9502 | 9532 | 9534
-            | 9564 | 9566 | 9596 | 9598 | 9628 | 9630 | 9660 | 9662 | 9692 | 9694 | 9724 | 9726 => {
+            6754 | 6756 | 6792 | 6794 | 9384 | 9386 | 9416 | 9418 | 9448 | 9450 | 9480 | 9482
+            | 9512 | 9514 | 9544 | 9546 | 9576 | 9578 | 9608 | 9610 | 9640 | 9642 | 9672 | 9674
+            | 9704 | 9706 | 9736 | 9738 | 9768 | 9770 | 9800 | 9802 | 9832 | 9834 | 9864 | 9866 => {
                 &SHAPE106
             }
-            6755 | 6757 | 6793 | 6795 | 9245 | 9247 | 9277 | 9279 | 9309 | 9311 | 9341 | 9343
-            | 9373 | 9375 | 9405 | 9407 | 9437 | 9439 | 9469 | 9471 | 9501 | 9503 | 9533 | 9535
-            | 9565 | 9567 | 9597 | 9599 | 9629 | 9631 | 9661 | 9663 | 9693 | 9695 | 9725 | 9727 => {
+            6755 | 6757 | 6793 | 6795 | 9385 | 9387 | 9417 | 9419 | 9449 | 9451 | 9481 | 9483
+            | 9513 | 9515 | 9545 | 9547 | 9577 | 9579 | 9609 | 9611 | 9641 | 9643 | 9673 | 9675
+            | 9705 | 9707 | 9737 | 9739 | 9769 | 9771 | 9801 | 9803 | 9833 | 9835 | 9865 | 9867 => {
                 &SHAPE107
             }
-            6758 | 6760 | 6796 | 6798 | 9248 | 9250 | 9280 | 9282 | 9312 | 9314 | 9344 | 9346
-            | 9376 | 9378 | 9408 | 9410 | 9440 | 9442 | 9472 | 9474 | 9504 | 9506 | 9536 | 9538
-            | 9568 | 9570 | 9600 | 9602 | 9632 | 9634 | 9664 | 9666 | 9696 | 9698 | 9728 | 9730 => {
+            6758 | 6760 | 6796 | 6798 | 9388 | 9390 | 9420 | 9422 | 9452 | 9454 | 9484 | 9486
+            | 9516 | 9518 | 9548 | 9550 | 9580 | 9582 | 9612 | 9614 | 9644 | 9646 | 9676 | 9678
+            | 9708 | 9710 | 9740 | 9742 | 9772 | 9774 | 9804 | 9806 | 9836 | 9838 | 9868 | 9870 => {
                 &SHAPE108
             }
-            6759 | 6761 | 6797 | 6799 | 9249 | 9251 | 9281 | 9283 | 9313 | 9315 | 9345 | 9347
-            | 9377 | 9379 | 9409 | 9411 | 9441 | 9443 | 9473 | 9475 | 9505 | 9507 | 9537 | 9539
-            | 9569 | 9571 | 9601 | 9603 | 9633 | 9635 | 9665 | 9667 | 9697 | 9699 | 9729 | 9731 => {
+            6759 | 6761 | 6797 | 6799 | 9389 | 9391 | 9421 | 9423 | 9453 | 9455 | 9485 | 9487
+            | 9517 | 9519 | 9549 | 9551 | 9581 | 9583 | 9613 | 9615 | 9645 | 9647 | 9677 | 9679
+            | 9709 | 9711 | 9741 | 9743 | 9773 | 9775 | 9805 | 9807 | 9837 | 9839 | 9869 | 9871 => {
                 &SHAPE109
             }
-            6762 | 6764 | 6800 | 6802 | 9252 | 9254 | 9284 | 9286 | 9316 | 9318 | 9348 | 9350
-            | 9380 | 9382 | 9412 | 9414 | 9444 | 9446 | 9476 | 9478 | 9508 | 9510 | 9540 | 9542
-            | 9572 | 9574 | 9604 | 9606 | 9636 | 9638 | 9668 | 9670 | 9700 | 9702 | 9732 | 9734 => {
+            6762 | 6764 | 6800 | 6802 | 9392 | 9394 | 9424 | 9426 | 9456 | 9458 | 9488 | 9490
+            | 9520 | 9522 | 9552 | 9554 | 9584 | 9586 | 9616 | 9618 | 9648 | 9650 | 9680 | 9682
+            | 9712 | 9714 | 9744 | 9746 | 9776 | 9778 | 9808 | 9810 | 9840 | 9842 | 9872 | 9874 => {
                 &SHAPE110
             }
-            6763 | 6765 | 6801 | 6803 | 9253 | 9255 | 9285 | 9287 | 9317 | 9319 | 9349 | 9351
-            | 9381 | 9383 | 9413 | 9415 | 9445 | 9447 | 9477 | 9479 | 9509 | 9511 | 9541 | 9543
-            | 9573 | 9575 | 9605 | 9607 | 9637 | 9639 | 9669 | 9671 | 9701 | 9703 | 9733 | 9735 => {
+            6763 | 6765 | 6801 | 6803 | 9393 | 9395 | 9425 | 9427 | 9457 | 9459 | 9489 | 9491
+            | 9521 | 9523 | 9553 | 9555 | 9585 | 9587 | 9617 | 9619 | 9649 | 9651 | 9681 | 9683
+            | 9713 | 9715 | 9745 | 9747 | 9777 | 9779 | 9809 | 9811 | 9841 | 9843 | 9873 | 9875 => {
                 &SHAPE111
             }
-            6766 | 6768 | 6804 | 6806 | 9256 | 9258 | 9288 | 9290 | 9320 | 9322 | 9352 | 9354
-            | 9384 | 9386 | 9416 | 9418 | 9448 | 9450 | 9480 | 9482 | 9512 | 9514 | 9544 | 9546
-            | 9576 | 9578 | 9608 | 9610 | 9640 | 9642 | 9672 | 9674 | 9704 | 9706 | 9736 | 9738 => {
+            6766 | 6768 | 6804 | 6806 | 9396 | 9398 | 9428 | 9430 | 9460 | 9462 | 9492 | 9494
+            | 9524 | 9526 | 9556 | 9558 | 9588 | 9590 | 9620 | 9622 | 9652 | 9654 | 9684 | 9686
+            | 9716 | 9718 | 9748 | 9750 | 9780 | 9782 | 9812 | 9814 | 9844 | 9846 | 9876 | 9878 => {
                 &SHAPE112
             }
-            6767 | 6769 | 6805 | 6807 | 9257 | 9259 | 9289 | 9291 | 9321 | 9323 | 9353 | 9355
-            | 9385 | 9387 | 9417 | 9419 | 9449 | 9451 | 9481 | 9483 | 9513 | 9515 | 9545 | 9547
-            | 9577 | 9579 | 9609 | 9611 | 9641 | 9643 | 9673 | 9675 | 9705 | 9707 | 9737 | 9739 => {
+            6767 | 6769 | 6805 | 6807 | 9397 | 9399 | 9429 | 9431 | 9461 | 9463 | 9493 | 9495
+            | 9525 | 9527 | 9557 | 9559 | 9589 | 9591 | 9621 | 9623 | 9653 | 9655 | 9685 | 9687
+            | 9717 | 9719 | 9749 | 9751 | 9781 | 9783 | 9813 | 9815 | 9845 | 9847 | 9877 | 9879 => {
                 &SHAPE113
             }
-            6770 | 6772 | 6808 | 6810 | 9260 | 9262 | 9292 | 9294 | 9324 | 9326 | 9356 | 9358
-            | 9388 | 9390 | 9420 | 9422 | 9452 | 9454 | 9484 | 9486 | 9516 | 9518 | 9548 | 9550
-            | 9580 | 9582 | 9612 | 9614 | 9644 | 9646 | 9676 | 9678 | 9708 | 9710 | 9740 | 9742 => {
+            6770 | 6772 | 6808 | 6810 | 9400 | 9402 | 9432 | 9434 | 9464 | 9466 | 9496 | 9498
+            | 9528 | 9530 | 9560 | 9562 | 9592 | 9594 | 9624 | 9626 | 9656 | 9658 | 9688 | 9690
+            | 9720 | 9722 | 9752 | 9754 | 9784 | 9786 | 9816 | 9818 | 9848 | 9850 | 9880 | 9882 => {
                 &SHAPE114
             }
-            6771 | 6773 | 6809 | 6811 | 9261 | 9263 | 9293 | 9295 | 9325 | 9327 | 9357 | 9359
-            | 9389 | 9391 | 9421 | 9423 | 9453 | 9455 | 9485 | 9487 | 9517 | 9519 | 9549 | 9551
-            | 9581 | 9583 | 9613 | 9615 | 9645 | 9647 | 9677 | 9679 | 9709 | 9711 | 9741 | 9743 => {
+            6771 | 6773 | 6809 | 6811 | 9401 | 9403 | 9433 | 9435 | 9465 | 9467 | 9497 | 9499
+            | 9529 | 9531 | 9561 | 9563 | 9593 | 9595 | 9625 | 9627 | 9657 | 9659 | 9689 | 9691
+            | 9721 | 9723 | 9753 | 9755 | 9785 | 9787 | 9817 | 9819 | 9849 | 9851 | 9881 | 9883 => {
                 &SHAPE2
             }
             6774..=6775 => &SHAPE115,
-            6776..=6777 | 12804..=12815 => &SHAPE116,
+            6776..=6777 | 12945..=12956 => &SHAPE116,
             6778..=6779 => &SHAPE117,
             7271 => &SHAPE119,
             7390..=7397 => &SHAPE120,
             7398..=7405 => &SHAPE121,
             7407..=7410 => &SHAPE122,
             7411..=7414 => &SHAPE123,
-            7416 | 24119..=24134 => &SHAPE72,
+            7416 | 24260..=24275 => &SHAPE72,
             7419 => &SHAPE124,
             7420 => &SHAPE125,
             7421 => &SHAPE126,
@@ -5124,108 +5124,108 @@ impl BlockWithShape for BlockState {
             7428 => &SHAPE133,
             7429 => &SHAPE134,
             7430 => &SHAPE135,
-            7919 | 7922 | 8243 | 8246 | 14019 | 14022 | 14343 | 14346 | 14667 | 14670 | 14991
-            | 14994 | 15315 | 15318 | 15639 | 15642 | 15963 | 15966 | 16287 | 16290 | 16611
-            | 16614 | 16935 | 16938 | 17259 | 17262 | 17583 | 17586 | 17907 | 17910 | 19400
-            | 19403 | 19820 | 19823 | 20257 | 20260 | 22539 | 22542 | 22950 | 22953 | 23361
-            | 23364 | 23772 | 23775 => &SHAPE136,
+            7919 | 7922 | 8243 | 8246 | 14160 | 14163 | 14484 | 14487 | 14808 | 14811 | 15132
+            | 15135 | 15456 | 15459 | 15780 | 15783 | 16104 | 16107 | 16428 | 16431 | 16752
+            | 16755 | 17076 | 17079 | 17400 | 17403 | 17724 | 17727 | 18048 | 18051 | 19541
+            | 19544 | 19961 | 19964 | 20398 | 20401 | 22680 | 22683 | 23091 | 23094 | 23502
+            | 23505 | 23913 | 23916 => &SHAPE136,
             7920..=7921
             | 7923..=7924
             | 8244..=8245
             | 8247..=8248
-            | 14020..=14021
-            | 14023..=14024
-            | 14344..=14345
-            | 14347..=14348
-            | 14668..=14669
-            | 14671..=14672
-            | 14992..=14993
-            | 14995..=14996
-            | 15316..=15317
-            | 15319..=15320
-            | 15640..=15641
-            | 15643..=15644
-            | 15964..=15965
-            | 15967..=15968
-            | 16288..=16289
-            | 16291..=16292
-            | 16612..=16613
-            | 16615..=16616
-            | 16936..=16937
-            | 16939..=16940
-            | 17260..=17261
-            | 17263..=17264
-            | 17584..=17585
-            | 17587..=17588
-            | 17908..=17909
-            | 17911..=17912
-            | 19401..=19402
-            | 19404..=19405
-            | 19821..=19822
-            | 19824..=19825
-            | 20258..=20259
-            | 20261..=20262
-            | 22540..=22541
-            | 22543..=22544
-            | 22951..=22952
-            | 22954..=22955
-            | 23362..=23363
-            | 23365..=23366
-            | 23773..=23774
-            | 23776..=23777 => &SHAPE137,
+            | 14161..=14162
+            | 14164..=14165
+            | 14485..=14486
+            | 14488..=14489
+            | 14809..=14810
+            | 14812..=14813
+            | 15133..=15134
+            | 15136..=15137
+            | 15457..=15458
+            | 15460..=15461
+            | 15781..=15782
+            | 15784..=15785
+            | 16105..=16106
+            | 16108..=16109
+            | 16429..=16430
+            | 16432..=16433
+            | 16753..=16754
+            | 16756..=16757
+            | 17077..=17078
+            | 17080..=17081
+            | 17401..=17402
+            | 17404..=17405
+            | 17725..=17726
+            | 17728..=17729
+            | 18049..=18050
+            | 18052..=18053
+            | 19542..=19543
+            | 19545..=19546
+            | 19962..=19963
+            | 19965..=19966
+            | 20399..=20400
+            | 20402..=20403
+            | 22681..=22682
+            | 22684..=22685
+            | 23092..=23093
+            | 23095..=23096
+            | 23503..=23504
+            | 23506..=23507
+            | 23914..=23915
+            | 23917..=23918 => &SHAPE137,
             7926..=7927
             | 7929..=7930
             | 8250..=8251
             | 8253..=8254
-            | 14026..=14027
-            | 14029..=14030
-            | 14350..=14351
-            | 14353..=14354
-            | 14674..=14675
-            | 14677..=14678
-            | 14998..=14999
-            | 15001..=15002
-            | 15322..=15323
-            | 15325..=15326
-            | 15646..=15647
-            | 15649..=15650
-            | 15970..=15971
-            | 15973..=15974
-            | 16294..=16295
-            | 16297..=16298
-            | 16618..=16619
-            | 16621..=16622
-            | 16942..=16943
-            | 16945..=16946
-            | 17266..=17267
-            | 17269..=17270
-            | 17590..=17591
-            | 17593..=17594
-            | 17914..=17915
-            | 17917..=17918
-            | 19407..=19408
-            | 19410..=19411
-            | 19827..=19828
-            | 19830..=19831
-            | 20264..=20265
-            | 20267..=20268
-            | 22546..=22547
-            | 22549..=22550
-            | 22957..=22958
-            | 22960..=22961
-            | 23368..=23369
-            | 23371..=23372
-            | 23779..=23780
-            | 23782..=23783 => &SHAPE138,
-            7931 | 7934 | 7943 | 7946 | 8255 | 8258 | 8267 | 8270 | 14031 | 14034 | 14043
-            | 14046 | 14355 | 14358 | 14367 | 14370 | 14679 | 14682 | 14691 | 14694 | 15003
-            | 15006 | 15015 | 15018 | 15327 | 15330 | 15339 | 15342 | 15651 | 15654 | 15663
-            | 15666 | 15975 | 15978 | 15987 | 15990 | 16299 | 16302 | 16311 | 16314 | 16623
-            | 16626 | 16635 | 16638 | 16947 | 16950 | 16959 | 16962 | 17271 | 17274 | 17283
-            | 17286 | 17595 | 17598 | 17607 | 17610 | 17919 | 17922 | 17931 | 17934 | 19412
-            | 19415 | 19424 | 19427 | 19832 | 19835 | 19844 | 19847 | 20269 | 20272 | 20281
-            | 20284 | 22551 | 22554 | 22563 | 22566 | 22962 | 22965 | 22974 | 22977 | 23373
-            | 23376 | 23385 | 23388 | 23784 | 23787 | 23796 | 23799 => &SHAPE139,
+            | 14167..=14168
+            | 14170..=14171
+            | 14491..=14492
+            | 14494..=14495
+            | 14815..=14816
+            | 14818..=14819
+            | 15139..=15140
+            | 15142..=15143
+            | 15463..=15464
+            | 15466..=15467
+            | 15787..=15788
+            | 15790..=15791
+            | 16111..=16112
+            | 16114..=16115
+            | 16435..=16436
+            | 16438..=16439
+            | 16759..=16760
+            | 16762..=16763
+            | 17083..=17084
+            | 17086..=17087
+            | 17407..=17408
+            | 17410..=17411
+            | 17731..=17732
+            | 17734..=17735
+            | 18055..=18056
+            | 18058..=18059
+            | 19548..=19549
+            | 19551..=19552
+            | 19968..=19969
+            | 19971..=19972
+            | 20405..=20406
+            | 20408..=20409
+            | 22687..=22688
+            | 22690..=22691
+            | 23098..=23099
+            | 23101..=23102
+            | 23509..=23510
+            | 23512..=23513
+            | 23920..=23921
+            | 23923..=23924 => &SHAPE138,
+            7931 | 7934 | 7943 | 7946 | 8255 | 8258 | 8267 | 8270 | 14172 | 14175 | 14184
+            | 14187 | 14496 | 14499 | 14508 | 14511 | 14820 | 14823 | 14832 | 14835 | 15144
+            | 15147 | 15156 | 15159 | 15468 | 15471 | 15480 | 15483 | 15792 | 15795 | 15804
+            | 15807 | 16116 | 16119 | 16128 | 16131 | 16440 | 16443 | 16452 | 16455 | 16764
+            | 16767 | 16776 | 16779 | 17088 | 17091 | 17100 | 17103 | 17412 | 17415 | 17424
+            | 17427 | 17736 | 17739 | 17748 | 17751 | 18060 | 18063 | 18072 | 18075 | 19553
+            | 19556 | 19565 | 19568 | 19973 | 19976 | 19985 | 19988 | 20410 | 20413 | 20422
+            | 20425 | 22692 | 22695 | 22704 | 22707 | 23103 | 23106 | 23115 | 23118 | 23514
+            | 23517 | 23526 | 23529 | 23925 | 23928 | 23937 | 23940 => &SHAPE139,
             7932..=7933
             | 7935..=7936
             | 7944..=7945
@@ -5234,192 +5234,192 @@ impl BlockWithShape for BlockState {
             | 8259..=8260
             | 8268..=8269
             | 8271..=8272
-            | 14032..=14033
-            | 14035..=14036
-            | 14044..=14045
-            | 14047..=14048
-            | 14356..=14357
-            | 14359..=14360
-            | 14368..=14369
-            | 14371..=14372
-            | 14680..=14681
-            | 14683..=14684
-            | 14692..=14693
-            | 14695..=14696
-            | 15004..=15005
-            | 15007..=15008
-            | 15016..=15017
-            | 15019..=15020
-            | 15328..=15329
-            | 15331..=15332
-            | 15340..=15341
-            | 15343..=15344
-            | 15652..=15653
-            | 15655..=15656
-            | 15664..=15665
-            | 15667..=15668
-            | 15976..=15977
-            | 15979..=15980
-            | 15988..=15989
-            | 15991..=15992
-            | 16300..=16301
-            | 16303..=16304
-            | 16312..=16313
-            | 16315..=16316
-            | 16624..=16625
-            | 16627..=16628
-            | 16636..=16637
-            | 16639..=16640
-            | 16948..=16949
-            | 16951..=16952
-            | 16960..=16961
-            | 16963..=16964
-            | 17272..=17273
-            | 17275..=17276
-            | 17284..=17285
-            | 17287..=17288
-            | 17596..=17597
-            | 17599..=17600
-            | 17608..=17609
-            | 17611..=17612
-            | 17920..=17921
-            | 17923..=17924
-            | 17932..=17933
-            | 17935..=17936
-            | 19413..=19414
-            | 19416..=19417
-            | 19425..=19426
-            | 19428..=19429
-            | 19833..=19834
-            | 19836..=19837
-            | 19845..=19846
-            | 19848..=19849
-            | 20270..=20271
-            | 20273..=20274
-            | 20282..=20283
-            | 20285..=20286
-            | 22552..=22553
-            | 22555..=22556
-            | 22564..=22565
-            | 22567..=22568
-            | 22963..=22964
-            | 22966..=22967
-            | 22975..=22976
-            | 22978..=22979
-            | 23374..=23375
-            | 23377..=23378
-            | 23386..=23387
-            | 23389..=23390
-            | 23785..=23786
-            | 23788..=23789
-            | 23797..=23798
-            | 23800..=23801 => &SHAPE140,
-            7937 | 7940 | 7949 | 7952 | 8261 | 8264 | 8273 | 8276 | 14037 | 14040 | 14049
-            | 14052 | 14361 | 14364 | 14373 | 14376 | 14685 | 14688 | 14697 | 14700 | 15009
-            | 15012 | 15021 | 15024 | 15333 | 15336 | 15345 | 15348 | 15657 | 15660 | 15669
-            | 15672 | 15981 | 15984 | 15993 | 15996 | 16305 | 16308 | 16317 | 16320 | 16629
-            | 16632 | 16641 | 16644 | 16953 | 16956 | 16965 | 16968 | 17277 | 17280 | 17289
-            | 17292 | 17601 | 17604 | 17613 | 17616 | 17925 | 17928 | 17937 | 17940 | 19418
-            | 19421 | 19430 | 19433 | 19838 | 19841 | 19850 | 19853 | 20275 | 20278 | 20287
-            | 20290 | 22557 | 22560 | 22569 | 22572 | 22968 | 22971 | 22980 | 22983 | 23379
-            | 23382 | 23391 | 23394 | 23790 | 23793 | 23802 | 23805 => &SHAPE141,
-            7938..=7939
-            | 7941..=7942
-            | 7950..=7951
-            | 7953..=7954
-            | 8262..=8263
-            | 8265..=8266
-            | 8274..=8275
-            | 8277..=8278
-            | 14038..=14039
-            | 14041..=14042
-            | 14050..=14051
-            | 14053..=14054
-            | 14362..=14363
-            | 14365..=14366
-            | 14374..=14375
-            | 14377..=14378
-            | 14686..=14687
-            | 14689..=14690
-            | 14698..=14699
-            | 14701..=14702
-            | 15010..=15011
-            | 15013..=15014
-            | 15022..=15023
-            | 15025..=15026
-            | 15334..=15335
-            | 15337..=15338
-            | 15346..=15347
-            | 15349..=15350
-            | 15658..=15659
-            | 15661..=15662
-            | 15670..=15671
-            | 15673..=15674
-            | 15982..=15983
-            | 15985..=15986
-            | 15994..=15995
-            | 15997..=15998
-            | 16306..=16307
-            | 16309..=16310
-            | 16318..=16319
-            | 16321..=16322
-            | 16630..=16631
-            | 16633..=16634
-            | 16642..=16643
-            | 16645..=16646
-            | 16954..=16955
-            | 16957..=16958
-            | 16966..=16967
-            | 16969..=16970
-            | 17278..=17279
-            | 17281..=17282
-            | 17290..=17291
-            | 17293..=17294
-            | 17602..=17603
-            | 17605..=17606
-            | 17614..=17615
-            | 17617..=17618
-            | 17926..=17927
-            | 17929..=17930
-            | 17938..=17939
-            | 17941..=17942
-            | 19419..=19420
-            | 19422..=19423
-            | 19431..=19432
-            | 19434..=19435
-            | 19839..=19840
-            | 19842..=19843
-            | 19851..=19852
-            | 19854..=19855
-            | 20276..=20277
-            | 20279..=20280
-            | 20288..=20289
-            | 20291..=20292
-            | 22558..=22559
-            | 22561..=22562
-            | 22570..=22571
-            | 22573..=22574
-            | 22969..=22970
-            | 22972..=22973
-            | 22981..=22982
-            | 22984..=22985
-            | 23380..=23381
-            | 23383..=23384
-            | 23392..=23393
-            | 23395..=23396
-            | 23791..=23792
-            | 23794..=23795
-            | 23803..=23804
-            | 23806..=23807 => &SHAPE142,
-            7955 | 7958 | 7991 | 7994 | 8279 | 8282 | 8315 | 8318 | 14055 | 14058 | 14091
-            | 14094 | 14379 | 14382 | 14415 | 14418 | 14703 | 14706 | 14739 | 14742 | 15027
-            | 15030 | 15063 | 15066 | 15351 | 15354 | 15387 | 15390 | 15675 | 15678 | 15711
-            | 15714 | 15999 | 16002 | 16035 | 16038 | 16323 | 16326 | 16359 | 16362 | 16647
-            | 16650 | 16683 | 16686 | 16971 | 16974 | 17007 | 17010 | 17295 | 17298 | 17331
-            | 17334 | 17619 | 17622 | 17655 | 17658 | 17943 | 17946 | 17979 | 17982 | 19436
-            | 19439 | 19472 | 19475 | 19856 | 19859 | 19892 | 19895 | 20293 | 20296 | 20329
-            | 20332 | 22575 | 22578 | 22611 | 22614 | 22986 | 22989 | 23022 | 23025 | 23397
-            | 23400 | 23433 | 23436 | 23808 | 23811 | 23844 | 23847 => &SHAPE143,
+            | 14173..=14174
+            | 14176..=14177
+            | 14185..=14186
+            | 14188..=14189
+            | 14497..=14498
+            | 14500..=14501
+            | 14509..=14510
+            | 14512..=14513
+            | 14821..=14822
+            | 14824..=14825
+            | 14833..=14834
+            | 14836..=14837
+            | 15145..=15146
+            | 15148..=15149
+            | 15157..=15158
+            | 15160..=15161
+            | 15469..=15470
+            | 15472..=15473
+            | 15481..=15482
+            | 15484..=15485
+            | 15793..=15794
+            | 15796..=15797
+            | 15805..=15806
+            | 15808..=15809
+            | 16117..=16118
+            | 16120..=16121
+            | 16129..=16130
+            | 16132..=16133
+            | 16441..=16442
+            | 16444..=16445
+            | 16453..=16454
+            | 16456..=16457
+            | 16765..=16766
+            | 16768..=16769
+            | 16777..=16778
+            | 16780..=16781
+            | 17089..=17090
+            | 17092..=17093
+            | 17101..=17102
+            | 17104..=17105
+            | 17413..=17414
+            | 17416..=17417
+            | 17425..=17426
+            | 17428..=17429
+            | 17737..=17738
+            | 17740..=17741
+            | 17749..=17750
+            | 17752..=17753
+            | 18061..=18062
+            | 18064..=18065
+            | 18073..=18074
+            | 18076..=18077
+            | 19554..=19555
+            | 19557..=19558
+            | 19566..=19567
+            | 19569..=19570
+            | 19974..=19975
+            | 19977..=19978
+            | 19986..=19987
+            | 19989..=19990
+            | 20411..=20412
+            | 20414..=20415
+            | 20423..=20424
+            | 20426..=20427
+            | 22693..=22694
+            | 22696..=22697
+            | 22705..=22706
+            | 22708..=22709
+            | 23104..=23105
+            | 23107..=23108
+            | 23116..=23117
+            | 23119..=23120
+            | 23515..=23516
+            | 23518..=23519
+            | 23527..=23528
+            | 23530..=23531
+            | 23926..=23927
+            | 23929..=23930
+            | 23938..=23939
+            | 23941..=23942 => &SHAPE140,
+            7937 | 7940 | 7949 | 7952 | 8261 | 8264 | 8273 | 8276 | 14178 | 14181 | 14190
+            | 14193 | 14502 | 14505 | 14514 | 14517 | 14826 | 14829 | 14838 | 14841 | 15150
+            | 15153 | 15162 | 15165 | 15474 | 15477 | 15486 | 15489 | 15798 | 15801 | 15810
+            | 15813 | 16122 | 16125 | 16134 | 16137 | 16446 | 16449 | 16458 | 16461 | 16770
+            | 16773 | 16782 | 16785 | 17094 | 17097 | 17106 | 17109 | 17418 | 17421 | 17430
+            | 17433 | 17742 | 17745 | 17754 | 17757 | 18066 | 18069 | 18078 | 18081 | 19559
+            | 19562 | 19571 | 19574 | 19979 | 19982 | 19991 | 19994 | 20416 | 20419 | 20428
+            | 20431 | 22698 | 22701 | 22710 | 22713 | 23109 | 23112 | 23121 | 23124 | 23520
+            | 23523 | 23532 | 23535 | 23931 | 23934 | 23943 | 23946 => &SHAPE141,
+            7938..=7939
+            | 7941..=7942
+            | 7950..=7951
+            | 7953..=7954
+            | 8262..=8263
+            | 8265..=8266
+            | 8274..=8275
+            | 8277..=8278
+            | 14179..=14180
+            | 14182..=14183
+            | 14191..=14192
+            | 14194..=14195
+            | 14503..=14504
+            | 14506..=14507
+            | 14515..=14516
+            | 14518..=14519
+            | 14827..=14828
+            | 14830..=14831
+            | 14839..=14840
+            | 14842..=14843
+            | 15151..=15152
+            | 15154..=15155
+            | 15163..=15164
+            | 15166..=15167
+            | 15475..=15476
+            | 15478..=15479
+            | 15487..=15488
+            | 15490..=15491
+            | 15799..=15800
+            | 15802..=15803
+            | 15811..=15812
+            | 15814..=15815
+            | 16123..=16124
+            | 16126..=16127
+            | 16135..=16136
+            | 16138..=16139
+            | 16447..=16448
+            | 16450..=16451
+            | 16459..=16460
+            | 16462..=16463
+            | 16771..=16772
+            | 16774..=16775
+            | 16783..=16784
+            | 16786..=16787
+            | 17095..=17096
+            | 17098..=17099
+            | 17107..=17108
+            | 17110..=17111
+            | 17419..=17420
+            | 17422..=17423
+            | 17431..=17432
+            | 17434..=17435
+            | 17743..=17744
+            | 17746..=17747
+            | 17755..=17756
+            | 17758..=17759
+            | 18067..=18068
+            | 18070..=18071
+            | 18079..=18080
+            | 18082..=18083
+            | 19560..=19561
+            | 19563..=19564
+            | 19572..=19573
+            | 19575..=19576
+            | 19980..=19981
+            | 19983..=19984
+            | 19992..=19993
+            | 19995..=19996
+            | 20417..=20418
+            | 20420..=20421
+            | 20429..=20430
+            | 20432..=20433
+            | 22699..=22700
+            | 22702..=22703
+            | 22711..=22712
+            | 22714..=22715
+            | 23110..=23111
+            | 23113..=23114
+            | 23122..=23123
+            | 23125..=23126
+            | 23521..=23522
+            | 23524..=23525
+            | 23533..=23534
+            | 23536..=23537
+            | 23932..=23933
+            | 23935..=23936
+            | 23944..=23945
+            | 23947..=23948 => &SHAPE142,
+            7955 | 7958 | 7991 | 7994 | 8279 | 8282 | 8315 | 8318 | 14196 | 14199 | 14232
+            | 14235 | 14520 | 14523 | 14556 | 14559 | 14844 | 14847 | 14880 | 14883 | 15168
+            | 15171 | 15204 | 15207 | 15492 | 15495 | 15528 | 15531 | 15816 | 15819 | 15852
+            | 15855 | 16140 | 16143 | 16176 | 16179 | 16464 | 16467 | 16500 | 16503 | 16788
+            | 16791 | 16824 | 16827 | 17112 | 17115 | 17148 | 17151 | 17436 | 17439 | 17472
+            | 17475 | 17760 | 17763 | 17796 | 17799 | 18084 | 18087 | 18120 | 18123 | 19577
+            | 19580 | 19613 | 19616 | 19997 | 20000 | 20033 | 20036 | 20434 | 20437 | 20470
+            | 20473 | 22716 | 22719 | 22752 | 22755 | 23127 | 23130 | 23163 | 23166 | 23538
+            | 23541 | 23574 | 23577 | 23949 | 23952 | 23985 | 23988 => &SHAPE143,
             7956..=7957
             | 7959..=7960
             | 7992..=7993
@@ -5428,95 +5428,95 @@ impl BlockWithShape for BlockState {
             | 8283..=8284
             | 8316..=8317
             | 8319..=8320
-            | 14056..=14057
-            | 14059..=14060
-            | 14092..=14093
-            | 14095..=14096
-            | 14380..=14381
-            | 14383..=14384
-            | 14416..=14417
-            | 14419..=14420
-            | 14704..=14705
-            | 14707..=14708
-            | 14740..=14741
-            | 14743..=14744
-            | 15028..=15029
-            | 15031..=15032
-            | 15064..=15065
-            | 15067..=15068
-            | 15352..=15353
-            | 15355..=15356
-            | 15388..=15389
-            | 15391..=15392
-            | 15676..=15677
-            | 15679..=15680
-            | 15712..=15713
-            | 15715..=15716
-            | 16000..=16001
-            | 16003..=16004
-            | 16036..=16037
-            | 16039..=16040
-            | 16324..=16325
-            | 16327..=16328
-            | 16360..=16361
-            | 16363..=16364
-            | 16648..=16649
-            | 16651..=16652
-            | 16684..=16685
-            | 16687..=16688
-            | 16972..=16973
-            | 16975..=16976
-            | 17008..=17009
-            | 17011..=17012
-            | 17296..=17297
-            | 17299..=17300
-            | 17332..=17333
-            | 17335..=17336
-            | 17620..=17621
-            | 17623..=17624
-            | 17656..=17657
-            | 17659..=17660
-            | 17944..=17945
-            | 17947..=17948
-            | 17980..=17981
-            | 17983..=17984
-            | 19437..=19438
-            | 19440..=19441
-            | 19473..=19474
-            | 19476..=19477
-            | 19857..=19858
-            | 19860..=19861
-            | 19893..=19894
-            | 19896..=19897
-            | 20294..=20295
-            | 20297..=20298
-            | 20330..=20331
-            | 20333..=20334
-            | 22576..=22577
-            | 22579..=22580
-            | 22612..=22613
-            | 22615..=22616
-            | 22987..=22988
-            | 22990..=22991
-            | 23023..=23024
-            | 23026..=23027
-            | 23398..=23399
-            | 23401..=23402
-            | 23434..=23435
-            | 23437..=23438
-            | 23809..=23810
-            | 23812..=23813
-            | 23845..=23846
-            | 23848..=23849 => &SHAPE144,
-            7961 | 7964 | 7997 | 8000 | 8285 | 8288 | 8321 | 8324 | 14061 | 14064 | 14097
-            | 14100 | 14385 | 14388 | 14421 | 14424 | 14709 | 14712 | 14745 | 14748 | 15033
-            | 15036 | 15069 | 15072 | 15357 | 15360 | 15393 | 15396 | 15681 | 15684 | 15717
-            | 15720 | 16005 | 16008 | 16041 | 16044 | 16329 | 16332 | 16365 | 16368 | 16653
-            | 16656 | 16689 | 16692 | 16977 | 16980 | 17013 | 17016 | 17301 | 17304 | 17337
-            | 17340 | 17625 | 17628 | 17661 | 17664 | 17949 | 17952 | 17985 | 17988 | 19442
-            | 19445 | 19478 | 19481 | 19862 | 19865 | 19898 | 19901 | 20299 | 20302 | 20335
-            | 20338 | 22581 | 22584 | 22617 | 22620 | 22992 | 22995 | 23028 | 23031 | 23403
-            | 23406 | 23439 | 23442 | 23814 | 23817 | 23850 | 23853 => &SHAPE145,
+            | 14197..=14198
+            | 14200..=14201
+            | 14233..=14234
+            | 14236..=14237
+            | 14521..=14522
+            | 14524..=14525
+            | 14557..=14558
+            | 14560..=14561
+            | 14845..=14846
+            | 14848..=14849
+            | 14881..=14882
+            | 14884..=14885
+            | 15169..=15170
+            | 15172..=15173
+            | 15205..=15206
+            | 15208..=15209
+            | 15493..=15494
+            | 15496..=15497
+            | 15529..=15530
+            | 15532..=15533
+            | 15817..=15818
+            | 15820..=15821
+            | 15853..=15854
+            | 15856..=15857
+            | 16141..=16142
+            | 16144..=16145
+            | 16177..=16178
+            | 16180..=16181
+            | 16465..=16466
+            | 16468..=16469
+            | 16501..=16502
+            | 16504..=16505
+            | 16789..=16790
+            | 16792..=16793
+            | 16825..=16826
+            | 16828..=16829
+            | 17113..=17114
+            | 17116..=17117
+            | 17149..=17150
+            | 17152..=17153
+            | 17437..=17438
+            | 17440..=17441
+            | 17473..=17474
+            | 17476..=17477
+            | 17761..=17762
+            | 17764..=17765
+            | 17797..=17798
+            | 17800..=17801
+            | 18085..=18086
+            | 18088..=18089
+            | 18121..=18122
+            | 18124..=18125
+            | 19578..=19579
+            | 19581..=19582
+            | 19614..=19615
+            | 19617..=19618
+            | 19998..=19999
+            | 20001..=20002
+            | 20034..=20035
+            | 20037..=20038
+            | 20435..=20436
+            | 20438..=20439
+            | 20471..=20472
+            | 20474..=20475
+            | 22717..=22718
+            | 22720..=22721
+            | 22753..=22754
+            | 22756..=22757
+            | 23128..=23129
+            | 23131..=23132
+            | 23164..=23165
+            | 23167..=23168
+            | 23539..=23540
+            | 23542..=23543
+            | 23575..=23576
+            | 23578..=23579
+            | 23950..=23951
+            | 23953..=23954
+            | 23986..=23987
+            | 23989..=23990 => &SHAPE144,
+            7961 | 7964 | 7997 | 8000 | 8285 | 8288 | 8321 | 8324 | 14202 | 14205 | 14238
+            | 14241 | 14526 | 14529 | 14562 | 14565 | 14850 | 14853 | 14886 | 14889 | 15174
+            | 15177 | 15210 | 15213 | 15498 | 15501 | 15534 | 15537 | 15822 | 15825 | 15858
+            | 15861 | 16146 | 16149 | 16182 | 16185 | 16470 | 16473 | 16506 | 16509 | 16794
+            | 16797 | 16830 | 16833 | 17118 | 17121 | 17154 | 17157 | 17442 | 17445 | 17478
+            | 17481 | 17766 | 17769 | 17802 | 17805 | 18090 | 18093 | 18126 | 18129 | 19583
+            | 19586 | 19619 | 19622 | 20003 | 20006 | 20039 | 20042 | 20440 | 20443 | 20476
+            | 20479 | 22722 | 22725 | 22758 | 22761 | 23133 | 23136 | 23169 | 23172 | 23544
+            | 23547 | 23580 | 23583 | 23955 | 23958 | 23991 | 23994 => &SHAPE145,
             7962..=7963
             | 7965..=7966
             | 7998..=7999
@@ -5525,104 +5525,104 @@ impl BlockWithShape for BlockState {
             | 8289..=8290
             | 8322..=8323
             | 8325..=8326
-            | 14062..=14063
-            | 14065..=14066
-            | 14098..=14099
-            | 14101..=14102
-            | 14386..=14387
-            | 14389..=14390
-            | 14422..=14423
-            | 14425..=14426
-            | 14710..=14711
-            | 14713..=14714
-            | 14746..=14747
-            | 14749..=14750
-            | 15034..=15035
-            | 15037..=15038
-            | 15070..=15071
-            | 15073..=15074
-            | 15358..=15359
-            | 15361..=15362
-            | 15394..=15395
-            | 15397..=15398
-            | 15682..=15683
-            | 15685..=15686
-            | 15718..=15719
-            | 15721..=15722
-            | 16006..=16007
-            | 16009..=16010
-            | 16042..=16043
-            | 16045..=16046
-            | 16330..=16331
-            | 16333..=16334
-            | 16366..=16367
-            | 16369..=16370
-            | 16654..=16655
-            | 16657..=16658
-            | 16690..=16691
-            | 16693..=16694
-            | 16978..=16979
-            | 16981..=16982
-            | 17014..=17015
-            | 17017..=17018
-            | 17302..=17303
-            | 17305..=17306
-            | 17338..=17339
-            | 17341..=17342
-            | 17626..=17627
-            | 17629..=17630
-            | 17662..=17663
-            | 17665..=17666
-            | 17950..=17951
-            | 17953..=17954
-            | 17986..=17987
-            | 17989..=17990
-            | 19443..=19444
-            | 19446..=19447
-            | 19479..=19480
-            | 19482..=19483
-            | 19863..=19864
-            | 19866..=19867
-            | 19899..=19900
-            | 19902..=19903
-            | 20300..=20301
-            | 20303..=20304
-            | 20336..=20337
-            | 20339..=20340
-            | 22582..=22583
-            | 22585..=22586
-            | 22618..=22619
-            | 22621..=22622
-            | 22993..=22994
-            | 22996..=22997
-            | 23029..=23030
-            | 23032..=23033
-            | 23404..=23405
-            | 23407..=23408
-            | 23440..=23441
-            | 23443..=23444
-            | 23815..=23816
-            | 23818..=23819
-            | 23851..=23852
-            | 23854..=23855 => &SHAPE146,
+            | 14203..=14204
+            | 14206..=14207
+            | 14239..=14240
+            | 14242..=14243
+            | 14527..=14528
+            | 14530..=14531
+            | 14563..=14564
+            | 14566..=14567
+            | 14851..=14852
+            | 14854..=14855
+            | 14887..=14888
+            | 14890..=14891
+            | 15175..=15176
+            | 15178..=15179
+            | 15211..=15212
+            | 15214..=15215
+            | 15499..=15500
+            | 15502..=15503
+            | 15535..=15536
+            | 15538..=15539
+            | 15823..=15824
+            | 15826..=15827
+            | 15859..=15860
+            | 15862..=15863
+            | 16147..=16148
+            | 16150..=16151
+            | 16183..=16184
+            | 16186..=16187
+            | 16471..=16472
+            | 16474..=16475
+            | 16507..=16508
+            | 16510..=16511
+            | 16795..=16796
+            | 16798..=16799
+            | 16831..=16832
+            | 16834..=16835
+            | 17119..=17120
+            | 17122..=17123
+            | 17155..=17156
+            | 17158..=17159
+            | 17443..=17444
+            | 17446..=17447
+            | 17479..=17480
+            | 17482..=17483
+            | 17767..=17768
+            | 17770..=17771
+            | 17803..=17804
+            | 17806..=17807
+            | 18091..=18092
+            | 18094..=18095
+            | 18127..=18128
+            | 18130..=18131
+            | 19584..=19585
+            | 19587..=19588
+            | 19620..=19621
+            | 19623..=19624
+            | 20004..=20005
+            | 20007..=20008
+            | 20040..=20041
+            | 20043..=20044
+            | 20441..=20442
+            | 20444..=20445
+            | 20477..=20478
+            | 20480..=20481
+            | 22723..=22724
+            | 22726..=22727
+            | 22759..=22760
+            | 22762..=22763
+            | 23134..=23135
+            | 23137..=23138
+            | 23170..=23171
+            | 23173..=23174
+            | 23545..=23546
+            | 23548..=23549
+            | 23581..=23582
+            | 23584..=23585
+            | 23956..=23957
+            | 23959..=23960
+            | 23992..=23993
+            | 23995..=23996 => &SHAPE146,
             7967 | 7970 | 7979 | 7982 | 8003 | 8006 | 8015 | 8018 | 8291 | 8294 | 8303 | 8306
-            | 8327 | 8330 | 8339 | 8342 | 14067 | 14070 | 14079 | 14082 | 14103 | 14106 | 14115
-            | 14118 | 14391 | 14394 | 14403 | 14406 | 14427 | 14430 | 14439 | 14442 | 14715
-            | 14718 | 14727 | 14730 | 14751 | 14754 | 14763 | 14766 | 15039 | 15042 | 15051
-            | 15054 | 15075 | 15078 | 15087 | 15090 | 15363 | 15366 | 15375 | 15378 | 15399
-            | 15402 | 15411 | 15414 | 15687 | 15690 | 15699 | 15702 | 15723 | 15726 | 15735
-            | 15738 | 16011 | 16014 | 16023 | 16026 | 16047 | 16050 | 16059 | 16062 | 16335
-            | 16338 | 16347 | 16350 | 16371 | 16374 | 16383 | 16386 | 16659 | 16662 | 16671
-            | 16674 | 16695 | 16698 | 16707 | 16710 | 16983 | 16986 | 16995 | 16998 | 17019
-            | 17022 | 17031 | 17034 | 17307 | 17310 | 17319 | 17322 | 17343 | 17346 | 17355
-            | 17358 | 17631 | 17634 | 17643 | 17646 | 17667 | 17670 | 17679 | 17682 | 17955
-            | 17958 | 17967 | 17970 | 17991 | 17994 | 18003 | 18006 | 19448 | 19451 | 19460
-            | 19463 | 19484 | 19487 | 19496 | 19499 | 19868 | 19871 | 19880 | 19883 | 19904
-            | 19907 | 19916 | 19919 | 20305 | 20308 | 20317 | 20320 | 20341 | 20344 | 20353
-            | 20356 | 22587 | 22590 | 22599 | 22602 | 22623 | 22626 | 22635 | 22638 | 22998
-            | 23001 | 23010 | 23013 | 23034 | 23037 | 23046 | 23049 | 23409 | 23412 | 23421
-            | 23424 | 23445 | 23448 | 23457 | 23460 | 23820 | 23823 | 23832 | 23835 | 23856
-            | 23859 | 23868 | 23871 => &SHAPE147,
+            | 8327 | 8330 | 8339 | 8342 | 14208 | 14211 | 14220 | 14223 | 14244 | 14247 | 14256
+            | 14259 | 14532 | 14535 | 14544 | 14547 | 14568 | 14571 | 14580 | 14583 | 14856
+            | 14859 | 14868 | 14871 | 14892 | 14895 | 14904 | 14907 | 15180 | 15183 | 15192
+            | 15195 | 15216 | 15219 | 15228 | 15231 | 15504 | 15507 | 15516 | 15519 | 15540
+            | 15543 | 15552 | 15555 | 15828 | 15831 | 15840 | 15843 | 15864 | 15867 | 15876
+            | 15879 | 16152 | 16155 | 16164 | 16167 | 16188 | 16191 | 16200 | 16203 | 16476
+            | 16479 | 16488 | 16491 | 16512 | 16515 | 16524 | 16527 | 16800 | 16803 | 16812
+            | 16815 | 16836 | 16839 | 16848 | 16851 | 17124 | 17127 | 17136 | 17139 | 17160
+            | 17163 | 17172 | 17175 | 17448 | 17451 | 17460 | 17463 | 17484 | 17487 | 17496
+            | 17499 | 17772 | 17775 | 17784 | 17787 | 17808 | 17811 | 17820 | 17823 | 18096
+            | 18099 | 18108 | 18111 | 18132 | 18135 | 18144 | 18147 | 19589 | 19592 | 19601
+            | 19604 | 19625 | 19628 | 19637 | 19640 | 20009 | 20012 | 20021 | 20024 | 20045
+            | 20048 | 20057 | 20060 | 20446 | 20449 | 20458 | 20461 | 20482 | 20485 | 20494
+            | 20497 | 22728 | 22731 | 22740 | 22743 | 22764 | 22767 | 22776 | 22779 | 23139
+            | 23142 | 23151 | 23154 | 23175 | 23178 | 23187 | 23190 | 23550 | 23553 | 23562
+            | 23565 | 23586 | 23589 | 23598 | 23601 | 23961 | 23964 | 23973 | 23976 | 23997
+            | 24000 | 24009 | 24012 => &SHAPE147,
             7968..=7969
             | 7971..=7972
             | 7980..=7981
@@ -5639,184 +5639,184 @@ impl BlockWithShape for BlockState {
             | 8331..=8332
             | 8340..=8341
             | 8343..=8344
-            | 14068..=14069
-            | 14071..=14072
-            | 14080..=14081
-            | 14083..=14084
-            | 14104..=14105
-            | 14107..=14108
-            | 14116..=14117
-            | 14119..=14120
-            | 14392..=14393
-            | 14395..=14396
-            | 14404..=14405
-            | 14407..=14408
-            | 14428..=14429
-            | 14431..=14432
-            | 14440..=14441
-            | 14443..=14444
-            | 14716..=14717
-            | 14719..=14720
-            | 14728..=14729
-            | 14731..=14732
-            | 14752..=14753
-            | 14755..=14756
-            | 14764..=14765
-            | 14767..=14768
-            | 15040..=15041
-            | 15043..=15044
-            | 15052..=15053
-            | 15055..=15056
-            | 15076..=15077
-            | 15079..=15080
-            | 15088..=15089
-            | 15091..=15092
-            | 15364..=15365
-            | 15367..=15368
-            | 15376..=15377
-            | 15379..=15380
-            | 15400..=15401
-            | 15403..=15404
-            | 15412..=15413
-            | 15415..=15416
-            | 15688..=15689
-            | 15691..=15692
-            | 15700..=15701
-            | 15703..=15704
-            | 15724..=15725
-            | 15727..=15728
-            | 15736..=15737
-            | 15739..=15740
-            | 16012..=16013
-            | 16015..=16016
-            | 16024..=16025
-            | 16027..=16028
-            | 16048..=16049
-            | 16051..=16052
-            | 16060..=16061
-            | 16063..=16064
-            | 16336..=16337
-            | 16339..=16340
-            | 16348..=16349
-            | 16351..=16352
-            | 16372..=16373
-            | 16375..=16376
-            | 16384..=16385
-            | 16387..=16388
-            | 16660..=16661
-            | 16663..=16664
-            | 16672..=16673
-            | 16675..=16676
-            | 16696..=16697
-            | 16699..=16700
-            | 16708..=16709
-            | 16711..=16712
-            | 16984..=16985
-            | 16987..=16988
-            | 16996..=16997
-            | 16999..=17000
-            | 17020..=17021
-            | 17023..=17024
-            | 17032..=17033
-            | 17035..=17036
-            | 17308..=17309
-            | 17311..=17312
-            | 17320..=17321
-            | 17323..=17324
-            | 17344..=17345
-            | 17347..=17348
-            | 17356..=17357
-            | 17359..=17360
-            | 17632..=17633
-            | 17635..=17636
-            | 17644..=17645
-            | 17647..=17648
-            | 17668..=17669
-            | 17671..=17672
-            | 17680..=17681
-            | 17683..=17684
-            | 17956..=17957
-            | 17959..=17960
-            | 17968..=17969
-            | 17971..=17972
-            | 17992..=17993
-            | 17995..=17996
-            | 18004..=18005
-            | 18007..=18008
-            | 19449..=19450
-            | 19452..=19453
-            | 19461..=19462
-            | 19464..=19465
-            | 19485..=19486
-            | 19488..=19489
-            | 19497..=19498
-            | 19500..=19501
-            | 19869..=19870
-            | 19872..=19873
-            | 19881..=19882
-            | 19884..=19885
-            | 19905..=19906
-            | 19908..=19909
-            | 19917..=19918
-            | 19920..=19921
-            | 20306..=20307
-            | 20309..=20310
-            | 20318..=20319
-            | 20321..=20322
-            | 20342..=20343
-            | 20345..=20346
-            | 20354..=20355
-            | 20357..=20358
-            | 22588..=22589
-            | 22591..=22592
-            | 22600..=22601
-            | 22603..=22604
-            | 22624..=22625
-            | 22627..=22628
-            | 22636..=22637
-            | 22639..=22640
-            | 22999..=23000
-            | 23002..=23003
-            | 23011..=23012
-            | 23014..=23015
-            | 23035..=23036
-            | 23038..=23039
-            | 23047..=23048
-            | 23050..=23051
-            | 23410..=23411
-            | 23413..=23414
-            | 23422..=23423
-            | 23425..=23426
-            | 23446..=23447
-            | 23449..=23450
-            | 23458..=23459
-            | 23461..=23462
-            | 23821..=23822
-            | 23824..=23825
-            | 23833..=23834
-            | 23836..=23837
-            | 23857..=23858
-            | 23860..=23861
-            | 23869..=23870
-            | 23872..=23873 => &SHAPE148,
+            | 14209..=14210
+            | 14212..=14213
+            | 14221..=14222
+            | 14224..=14225
+            | 14245..=14246
+            | 14248..=14249
+            | 14257..=14258
+            | 14260..=14261
+            | 14533..=14534
+            | 14536..=14537
+            | 14545..=14546
+            | 14548..=14549
+            | 14569..=14570
+            | 14572..=14573
+            | 14581..=14582
+            | 14584..=14585
+            | 14857..=14858
+            | 14860..=14861
+            | 14869..=14870
+            | 14872..=14873
+            | 14893..=14894
+            | 14896..=14897
+            | 14905..=14906
+            | 14908..=14909
+            | 15181..=15182
+            | 15184..=15185
+            | 15193..=15194
+            | 15196..=15197
+            | 15217..=15218
+            | 15220..=15221
+            | 15229..=15230
+            | 15232..=15233
+            | 15505..=15506
+            | 15508..=15509
+            | 15517..=15518
+            | 15520..=15521
+            | 15541..=15542
+            | 15544..=15545
+            | 15553..=15554
+            | 15556..=15557
+            | 15829..=15830
+            | 15832..=15833
+            | 15841..=15842
+            | 15844..=15845
+            | 15865..=15866
+            | 15868..=15869
+            | 15877..=15878
+            | 15880..=15881
+            | 16153..=16154
+            | 16156..=16157
+            | 16165..=16166
+            | 16168..=16169
+            | 16189..=16190
+            | 16192..=16193
+            | 16201..=16202
+            | 16204..=16205
+            | 16477..=16478
+            | 16480..=16481
+            | 16489..=16490
+            | 16492..=16493
+            | 16513..=16514
+            | 16516..=16517
+            | 16525..=16526
+            | 16528..=16529
+            | 16801..=16802
+            | 16804..=16805
+            | 16813..=16814
+            | 16816..=16817
+            | 16837..=16838
+            | 16840..=16841
+            | 16849..=16850
+            | 16852..=16853
+            | 17125..=17126
+            | 17128..=17129
+            | 17137..=17138
+            | 17140..=17141
+            | 17161..=17162
+            | 17164..=17165
+            | 17173..=17174
+            | 17176..=17177
+            | 17449..=17450
+            | 17452..=17453
+            | 17461..=17462
+            | 17464..=17465
+            | 17485..=17486
+            | 17488..=17489
+            | 17497..=17498
+            | 17500..=17501
+            | 17773..=17774
+            | 17776..=17777
+            | 17785..=17786
+            | 17788..=17789
+            | 17809..=17810
+            | 17812..=17813
+            | 17821..=17822
+            | 17824..=17825
+            | 18097..=18098
+            | 18100..=18101
+            | 18109..=18110
+            | 18112..=18113
+            | 18133..=18134
+            | 18136..=18137
+            | 18145..=18146
+            | 18148..=18149
+            | 19590..=19591
+            | 19593..=19594
+            | 19602..=19603
+            | 19605..=19606
+            | 19626..=19627
+            | 19629..=19630
+            | 19638..=19639
+            | 19641..=19642
+            | 20010..=20011
+            | 20013..=20014
+            | 20022..=20023
+            | 20025..=20026
+            | 20046..=20047
+            | 20049..=20050
+            | 20058..=20059
+            | 20061..=20062
+            | 20447..=20448
+            | 20450..=20451
+            | 20459..=20460
+            | 20462..=20463
+            | 20483..=20484
+            | 20486..=20487
+            | 20495..=20496
+            | 20498..=20499
+            | 22729..=22730
+            | 22732..=22733
+            | 22741..=22742
+            | 22744..=22745
+            | 22765..=22766
+            | 22768..=22769
+            | 22777..=22778
+            | 22780..=22781
+            | 23140..=23141
+            | 23143..=23144
+            | 23152..=23153
+            | 23155..=23156
+            | 23176..=23177
+            | 23179..=23180
+            | 23188..=23189
+            | 23191..=23192
+            | 23551..=23552
+            | 23554..=23555
+            | 23563..=23564
+            | 23566..=23567
+            | 23587..=23588
+            | 23590..=23591
+            | 23599..=23600
+            | 23602..=23603
+            | 23962..=23963
+            | 23965..=23966
+            | 23974..=23975
+            | 23977..=23978
+            | 23998..=23999
+            | 24001..=24002
+            | 24010..=24011
+            | 24013..=24014 => &SHAPE148,
             7973 | 7976 | 7985 | 7988 | 8009 | 8012 | 8021 | 8024 | 8297 | 8300 | 8309 | 8312
-            | 8333 | 8336 | 8345 | 8348 | 14073 | 14076 | 14085 | 14088 | 14109 | 14112 | 14121
-            | 14124 | 14397 | 14400 | 14409 | 14412 | 14433 | 14436 | 14445 | 14448 | 14721
-            | 14724 | 14733 | 14736 | 14757 | 14760 | 14769 | 14772 | 15045 | 15048 | 15057
-            | 15060 | 15081 | 15084 | 15093 | 15096 | 15369 | 15372 | 15381 | 15384 | 15405
-            | 15408 | 15417 | 15420 | 15693 | 15696 | 15705 | 15708 | 15729 | 15732 | 15741
-            | 15744 | 16017 | 16020 | 16029 | 16032 | 16053 | 16056 | 16065 | 16068 | 16341
-            | 16344 | 16353 | 16356 | 16377 | 16380 | 16389 | 16392 | 16665 | 16668 | 16677
-            | 16680 | 16701 | 16704 | 16713 | 16716 | 16989 | 16992 | 17001 | 17004 | 17025
-            | 17028 | 17037 | 17040 | 17313 | 17316 | 17325 | 17328 | 17349 | 17352 | 17361
-            | 17364 | 17637 | 17640 | 17649 | 17652 | 17673 | 17676 | 17685 | 17688 | 17961
-            | 17964 | 17973 | 17976 | 17997 | 18000 | 18009 | 18012 | 19454 | 19457 | 19466
-            | 19469 | 19490 | 19493 | 19502 | 19505 | 19874 | 19877 | 19886 | 19889 | 19910
-            | 19913 | 19922 | 19925 | 20311 | 20314 | 20323 | 20326 | 20347 | 20350 | 20359
-            | 20362 | 22593 | 22596 | 22605 | 22608 | 22629 | 22632 | 22641 | 22644 | 23004
-            | 23007 | 23016 | 23019 | 23040 | 23043 | 23052 | 23055 | 23415 | 23418 | 23427
-            | 23430 | 23451 | 23454 | 23463 | 23466 | 23826 | 23829 | 23838 | 23841 | 23862
-            | 23865 | 23874 | 23877 => &SHAPE149,
+            | 8333 | 8336 | 8345 | 8348 | 14214 | 14217 | 14226 | 14229 | 14250 | 14253 | 14262
+            | 14265 | 14538 | 14541 | 14550 | 14553 | 14574 | 14577 | 14586 | 14589 | 14862
+            | 14865 | 14874 | 14877 | 14898 | 14901 | 14910 | 14913 | 15186 | 15189 | 15198
+            | 15201 | 15222 | 15225 | 15234 | 15237 | 15510 | 15513 | 15522 | 15525 | 15546
+            | 15549 | 15558 | 15561 | 15834 | 15837 | 15846 | 15849 | 15870 | 15873 | 15882
+            | 15885 | 16158 | 16161 | 16170 | 16173 | 16194 | 16197 | 16206 | 16209 | 16482
+            | 16485 | 16494 | 16497 | 16518 | 16521 | 16530 | 16533 | 16806 | 16809 | 16818
+            | 16821 | 16842 | 16845 | 16854 | 16857 | 17130 | 17133 | 17142 | 17145 | 17166
+            | 17169 | 17178 | 17181 | 17454 | 17457 | 17466 | 17469 | 17490 | 17493 | 17502
+            | 17505 | 17778 | 17781 | 17790 | 17793 | 17814 | 17817 | 17826 | 17829 | 18102
+            | 18105 | 18114 | 18117 | 18138 | 18141 | 18150 | 18153 | 19595 | 19598 | 19607
+            | 19610 | 19631 | 19634 | 19643 | 19646 | 20015 | 20018 | 20027 | 20030 | 20051
+            | 20054 | 20063 | 20066 | 20452 | 20455 | 20464 | 20467 | 20488 | 20491 | 20500
+            | 20503 | 22734 | 22737 | 22746 | 22749 | 22770 | 22773 | 22782 | 22785 | 23145
+            | 23148 | 23157 | 23160 | 23181 | 23184 | 23193 | 23196 | 23556 | 23559 | 23568
+            | 23571 | 23592 | 23595 | 23604 | 23607 | 23967 | 23970 | 23979 | 23982 | 24003
+            | 24006 | 24015 | 24018 => &SHAPE149,
             7974..=7975
             | 7977..=7978
             | 7986..=7987
@@ -5833,572 +5833,572 @@ impl BlockWithShape for BlockState {
             | 8337..=8338
             | 8346..=8347
             | 8349..=8350
-            | 14074..=14075
-            | 14077..=14078
-            | 14086..=14087
-            | 14089..=14090
-            | 14110..=14111
-            | 14113..=14114
-            | 14122..=14123
-            | 14125..=14126
-            | 14398..=14399
-            | 14401..=14402
-            | 14410..=14411
-            | 14413..=14414
-            | 14434..=14435
-            | 14437..=14438
-            | 14446..=14447
-            | 14449..=14450
-            | 14722..=14723
-            | 14725..=14726
-            | 14734..=14735
-            | 14737..=14738
-            | 14758..=14759
-            | 14761..=14762
-            | 14770..=14771
-            | 14773..=14774
-            | 15046..=15047
-            | 15049..=15050
-            | 15058..=15059
-            | 15061..=15062
-            | 15082..=15083
-            | 15085..=15086
-            | 15094..=15095
-            | 15097..=15098
-            | 15370..=15371
-            | 15373..=15374
-            | 15382..=15383
-            | 15385..=15386
-            | 15406..=15407
-            | 15409..=15410
-            | 15418..=15419
-            | 15421..=15422
-            | 15694..=15695
-            | 15697..=15698
-            | 15706..=15707
-            | 15709..=15710
-            | 15730..=15731
-            | 15733..=15734
-            | 15742..=15743
-            | 15745..=15746
-            | 16018..=16019
-            | 16021..=16022
-            | 16030..=16031
-            | 16033..=16034
-            | 16054..=16055
-            | 16057..=16058
-            | 16066..=16067
-            | 16069..=16070
-            | 16342..=16343
-            | 16345..=16346
-            | 16354..=16355
-            | 16357..=16358
-            | 16378..=16379
-            | 16381..=16382
-            | 16390..=16391
-            | 16393..=16394
-            | 16666..=16667
-            | 16669..=16670
-            | 16678..=16679
-            | 16681..=16682
-            | 16702..=16703
-            | 16705..=16706
-            | 16714..=16715
-            | 16717..=16718
-            | 16990..=16991
-            | 16993..=16994
-            | 17002..=17003
-            | 17005..=17006
-            | 17026..=17027
-            | 17029..=17030
-            | 17038..=17039
-            | 17041..=17042
-            | 17314..=17315
-            | 17317..=17318
-            | 17326..=17327
-            | 17329..=17330
-            | 17350..=17351
-            | 17353..=17354
-            | 17362..=17363
-            | 17365..=17366
-            | 17638..=17639
-            | 17641..=17642
-            | 17650..=17651
-            | 17653..=17654
-            | 17674..=17675
-            | 17677..=17678
-            | 17686..=17687
-            | 17689..=17690
-            | 17962..=17963
-            | 17965..=17966
-            | 17974..=17975
-            | 17977..=17978
-            | 17998..=17999
-            | 18001..=18002
-            | 18010..=18011
-            | 18013..=18014
-            | 19455..=19456
-            | 19458..=19459
-            | 19467..=19468
-            | 19470..=19471
-            | 19491..=19492
-            | 19494..=19495
-            | 19503..=19504
-            | 19506..=19507
-            | 19875..=19876
-            | 19878..=19879
-            | 19887..=19888
-            | 19890..=19891
-            | 19911..=19912
-            | 19914..=19915
-            | 19923..=19924
-            | 19926..=19927
-            | 20312..=20313
-            | 20315..=20316
-            | 20324..=20325
-            | 20327..=20328
-            | 20348..=20349
-            | 20351..=20352
-            | 20360..=20361
-            | 20363..=20364
-            | 22594..=22595
-            | 22597..=22598
-            | 22606..=22607
-            | 22609..=22610
-            | 22630..=22631
-            | 22633..=22634
-            | 22642..=22643
-            | 22645..=22646
-            | 23005..=23006
-            | 23008..=23009
-            | 23017..=23018
-            | 23020..=23021
-            | 23041..=23042
-            | 23044..=23045
-            | 23053..=23054
-            | 23056..=23057
-            | 23416..=23417
-            | 23419..=23420
-            | 23428..=23429
-            | 23431..=23432
-            | 23452..=23453
-            | 23455..=23456
-            | 23464..=23465
-            | 23467..=23468
-            | 23827..=23828
-            | 23830..=23831
-            | 23839..=23840
-            | 23842..=23843
-            | 23863..=23864
-            | 23866..=23867
-            | 23875..=23876
-            | 23878..=23879 => &SHAPE150,
-            8027 | 8030 | 8135 | 8138 | 8351 | 8354 | 8459 | 8462 | 14127 | 14130 | 14235
-            | 14238 | 14451 | 14454 | 14559 | 14562 | 14775 | 14778 | 14883 | 14886 | 15099
-            | 15102 | 15207 | 15210 | 15423 | 15426 | 15531 | 15534 | 15747 | 15750 | 15855
-            | 15858 | 16071 | 16074 | 16179 | 16182 | 16395 | 16398 | 16503 | 16506 | 16719
-            | 16722 | 16827 | 16830 | 17043 | 17046 | 17151 | 17154 | 17367 | 17370 | 17475
-            | 17478 | 17691 | 17694 | 17799 | 17802 | 18015 | 18018 | 18123 | 18126 | 19508
-            | 19511 | 19616 | 19619 | 19928 | 19931 | 20036 | 20039 | 20365 | 20368 | 20473
-            | 20476 | 22647 | 22650 | 22755 | 22758 | 23058 | 23061 | 23166 | 23169 | 23469
-            | 23472 | 23577 | 23580 | 23880 | 23883 | 23988 | 23991 => &SHAPE151,
-            8028..=8029
-            | 8031..=8032
-            | 8136..=8137
-            | 8139..=8140
-            | 8352..=8353
-            | 8355..=8356
-            | 8460..=8461
-            | 8463..=8464
-            | 14128..=14129
-            | 14131..=14132
-            | 14236..=14237
-            | 14239..=14240
-            | 14452..=14453
-            | 14455..=14456
-            | 14560..=14561
-            | 14563..=14564
-            | 14776..=14777
-            | 14779..=14780
-            | 14884..=14885
-            | 14887..=14888
-            | 15100..=15101
-            | 15103..=15104
-            | 15208..=15209
-            | 15211..=15212
-            | 15424..=15425
-            | 15427..=15428
-            | 15532..=15533
-            | 15535..=15536
-            | 15748..=15749
-            | 15751..=15752
-            | 15856..=15857
-            | 15859..=15860
-            | 16072..=16073
-            | 16075..=16076
-            | 16180..=16181
-            | 16183..=16184
-            | 16396..=16397
-            | 16399..=16400
-            | 16504..=16505
-            | 16507..=16508
-            | 16720..=16721
-            | 16723..=16724
-            | 16828..=16829
-            | 16831..=16832
-            | 17044..=17045
-            | 17047..=17048
-            | 17152..=17153
-            | 17155..=17156
-            | 17368..=17369
-            | 17371..=17372
-            | 17476..=17477
-            | 17479..=17480
-            | 17692..=17693
-            | 17695..=17696
-            | 17800..=17801
-            | 17803..=17804
-            | 18016..=18017
-            | 18019..=18020
-            | 18124..=18125
-            | 18127..=18128
-            | 19509..=19510
-            | 19512..=19513
-            | 19617..=19618
-            | 19620..=19621
-            | 19929..=19930
-            | 19932..=19933
-            | 20037..=20038
-            | 20040..=20041
-            | 20366..=20367
-            | 20369..=20370
-            | 20474..=20475
-            | 20477..=20478
-            | 22648..=22649
-            | 22651..=22652
-            | 22756..=22757
-            | 22759..=22760
-            | 23059..=23060
-            | 23062..=23063
-            | 23167..=23168
-            | 23170..=23171
-            | 23470..=23471
-            | 23473..=23474
-            | 23578..=23579
-            | 23581..=23582
-            | 23881..=23882
-            | 23884..=23885
-            | 23989..=23990
-            | 23992..=23993 => &SHAPE152,
-            8033 | 8036 | 8141 | 8144 | 8357 | 8360 | 8465 | 8468 | 14133 | 14136 | 14241
-            | 14244 | 14457 | 14460 | 14565 | 14568 | 14781 | 14784 | 14889 | 14892 | 15105
-            | 15108 | 15213 | 15216 | 15429 | 15432 | 15537 | 15540 | 15753 | 15756 | 15861
-            | 15864 | 16077 | 16080 | 16185 | 16188 | 16401 | 16404 | 16509 | 16512 | 16725
-            | 16728 | 16833 | 16836 | 17049 | 17052 | 17157 | 17160 | 17373 | 17376 | 17481
-            | 17484 | 17697 | 17700 | 17805 | 17808 | 18021 | 18024 | 18129 | 18132 | 19514
-            | 19517 | 19622 | 19625 | 19934 | 19937 | 20042 | 20045 | 20371 | 20374 | 20479
-            | 20482 | 22653 | 22656 | 22761 | 22764 | 23064 | 23067 | 23172 | 23175 | 23475
-            | 23478 | 23583 | 23586 | 23886 | 23889 | 23994 | 23997 => &SHAPE153,
-            8034..=8035
-            | 8037..=8038
-            | 8142..=8143
-            | 8145..=8146
-            | 8358..=8359
-            | 8361..=8362
-            | 8466..=8467
-            | 8469..=8470
-            | 14134..=14135
-            | 14137..=14138
-            | 14242..=14243
-            | 14245..=14246
-            | 14458..=14459
-            | 14461..=14462
-            | 14566..=14567
-            | 14569..=14570
-            | 14782..=14783
-            | 14785..=14786
-            | 14890..=14891
-            | 14893..=14894
-            | 15106..=15107
-            | 15109..=15110
-            | 15214..=15215
-            | 15217..=15218
-            | 15430..=15431
-            | 15433..=15434
-            | 15538..=15539
-            | 15541..=15542
-            | 15754..=15755
-            | 15757..=15758
-            | 15862..=15863
-            | 15865..=15866
-            | 16078..=16079
-            | 16081..=16082
-            | 16186..=16187
-            | 16189..=16190
-            | 16402..=16403
-            | 16405..=16406
-            | 16510..=16511
-            | 16513..=16514
-            | 16726..=16727
-            | 16729..=16730
-            | 16834..=16835
-            | 16837..=16838
-            | 17050..=17051
-            | 17053..=17054
-            | 17158..=17159
-            | 17161..=17162
-            | 17374..=17375
-            | 17377..=17378
-            | 17482..=17483
-            | 17485..=17486
-            | 17698..=17699
-            | 17701..=17702
-            | 17806..=17807
-            | 17809..=17810
-            | 18022..=18023
-            | 18025..=18026
-            | 18130..=18131
-            | 18133..=18134
-            | 19515..=19516
-            | 19518..=19519
-            | 19623..=19624
-            | 19626..=19627
-            | 19935..=19936
-            | 19938..=19939
-            | 20043..=20044
-            | 20046..=20047
-            | 20372..=20373
-            | 20375..=20376
-            | 20480..=20481
-            | 20483..=20484
-            | 22654..=22655
-            | 22657..=22658
-            | 22762..=22763
-            | 22765..=22766
-            | 23065..=23066
-            | 23068..=23069
-            | 23173..=23174
-            | 23176..=23177
-            | 23476..=23477
-            | 23479..=23480
-            | 23584..=23585
-            | 23587..=23588
-            | 23887..=23888
-            | 23890..=23891
-            | 23995..=23996
-            | 23998..=23999 => &SHAPE154,
-            8039 | 8042 | 8051 | 8054 | 8147 | 8150 | 8159 | 8162 | 8363 | 8366 | 8375 | 8378
-            | 8471 | 8474 | 8483 | 8486 | 14139 | 14142 | 14151 | 14154 | 14247 | 14250 | 14259
-            | 14262 | 14463 | 14466 | 14475 | 14478 | 14571 | 14574 | 14583 | 14586 | 14787
-            | 14790 | 14799 | 14802 | 14895 | 14898 | 14907 | 14910 | 15111 | 15114 | 15123
-            | 15126 | 15219 | 15222 | 15231 | 15234 | 15435 | 15438 | 15447 | 15450 | 15543
-            | 15546 | 15555 | 15558 | 15759 | 15762 | 15771 | 15774 | 15867 | 15870 | 15879
-            | 15882 | 16083 | 16086 | 16095 | 16098 | 16191 | 16194 | 16203 | 16206 | 16407
-            | 16410 | 16419 | 16422 | 16515 | 16518 | 16527 | 16530 | 16731 | 16734 | 16743
-            | 16746 | 16839 | 16842 | 16851 | 16854 | 17055 | 17058 | 17067 | 17070 | 17163
-            | 17166 | 17175 | 17178 | 17379 | 17382 | 17391 | 17394 | 17487 | 17490 | 17499
-            | 17502 | 17703 | 17706 | 17715 | 17718 | 17811 | 17814 | 17823 | 17826 | 18027
-            | 18030 | 18039 | 18042 | 18135 | 18138 | 18147 | 18150 | 19520 | 19523 | 19532
-            | 19535 | 19628 | 19631 | 19640 | 19643 | 19940 | 19943 | 19952 | 19955 | 20048
-            | 20051 | 20060 | 20063 | 20377 | 20380 | 20389 | 20392 | 20485 | 20488 | 20497
-            | 20500 | 22659 | 22662 | 22671 | 22674 | 22767 | 22770 | 22779 | 22782 | 23070
-            | 23073 | 23082 | 23085 | 23178 | 23181 | 23190 | 23193 | 23481 | 23484 | 23493
-            | 23496 | 23589 | 23592 | 23601 | 23604 | 23892 | 23895 | 23904 | 23907 | 24000
-            | 24003 | 24012 | 24015 => &SHAPE155,
-            8040..=8041
-            | 8043..=8044
-            | 8052..=8053
-            | 8055..=8056
-            | 8148..=8149
-            | 8151..=8152
-            | 8160..=8161
-            | 8163..=8164
-            | 8364..=8365
-            | 8367..=8368
-            | 8376..=8377
-            | 8379..=8380
-            | 8472..=8473
-            | 8475..=8476
-            | 8484..=8485
-            | 8487..=8488
-            | 14140..=14141
-            | 14143..=14144
-            | 14152..=14153
-            | 14155..=14156
-            | 14248..=14249
+            | 14215..=14216
+            | 14218..=14219
+            | 14227..=14228
+            | 14230..=14231
             | 14251..=14252
-            | 14260..=14261
+            | 14254..=14255
             | 14263..=14264
-            | 14464..=14465
-            | 14467..=14468
-            | 14476..=14477
-            | 14479..=14480
-            | 14572..=14573
+            | 14266..=14267
+            | 14539..=14540
+            | 14542..=14543
+            | 14551..=14552
+            | 14554..=14555
             | 14575..=14576
-            | 14584..=14585
+            | 14578..=14579
             | 14587..=14588
-            | 14788..=14789
-            | 14791..=14792
-            | 14800..=14801
-            | 14803..=14804
-            | 14896..=14897
+            | 14590..=14591
+            | 14863..=14864
+            | 14866..=14867
+            | 14875..=14876
+            | 14878..=14879
             | 14899..=14900
-            | 14908..=14909
+            | 14902..=14903
             | 14911..=14912
-            | 15112..=15113
-            | 15115..=15116
-            | 15124..=15125
-            | 15127..=15128
-            | 15220..=15221
+            | 14914..=14915
+            | 15187..=15188
+            | 15190..=15191
+            | 15199..=15200
+            | 15202..=15203
             | 15223..=15224
-            | 15232..=15233
+            | 15226..=15227
             | 15235..=15236
-            | 15436..=15437
-            | 15439..=15440
-            | 15448..=15449
-            | 15451..=15452
-            | 15544..=15545
+            | 15238..=15239
+            | 15511..=15512
+            | 15514..=15515
+            | 15523..=15524
+            | 15526..=15527
             | 15547..=15548
-            | 15556..=15557
+            | 15550..=15551
             | 15559..=15560
-            | 15760..=15761
-            | 15763..=15764
-            | 15772..=15773
-            | 15775..=15776
-            | 15868..=15869
+            | 15562..=15563
+            | 15835..=15836
+            | 15838..=15839
+            | 15847..=15848
+            | 15850..=15851
             | 15871..=15872
-            | 15880..=15881
+            | 15874..=15875
             | 15883..=15884
-            | 16084..=16085
-            | 16087..=16088
-            | 16096..=16097
-            | 16099..=16100
-            | 16192..=16193
+            | 15886..=15887
+            | 16159..=16160
+            | 16162..=16163
+            | 16171..=16172
+            | 16174..=16175
             | 16195..=16196
-            | 16204..=16205
+            | 16198..=16199
             | 16207..=16208
-            | 16408..=16409
-            | 16411..=16412
-            | 16420..=16421
-            | 16423..=16424
-            | 16516..=16517
+            | 16210..=16211
+            | 16483..=16484
+            | 16486..=16487
+            | 16495..=16496
+            | 16498..=16499
             | 16519..=16520
-            | 16528..=16529
+            | 16522..=16523
             | 16531..=16532
-            | 16732..=16733
-            | 16735..=16736
-            | 16744..=16745
-            | 16747..=16748
-            | 16840..=16841
+            | 16534..=16535
+            | 16807..=16808
+            | 16810..=16811
+            | 16819..=16820
+            | 16822..=16823
             | 16843..=16844
-            | 16852..=16853
+            | 16846..=16847
             | 16855..=16856
-            | 17056..=17057
-            | 17059..=17060
-            | 17068..=17069
-            | 17071..=17072
-            | 17164..=17165
+            | 16858..=16859
+            | 17131..=17132
+            | 17134..=17135
+            | 17143..=17144
+            | 17146..=17147
             | 17167..=17168
-            | 17176..=17177
+            | 17170..=17171
             | 17179..=17180
-            | 17380..=17381
-            | 17383..=17384
-            | 17392..=17393
-            | 17395..=17396
-            | 17488..=17489
+            | 17182..=17183
+            | 17455..=17456
+            | 17458..=17459
+            | 17467..=17468
+            | 17470..=17471
             | 17491..=17492
-            | 17500..=17501
+            | 17494..=17495
             | 17503..=17504
-            | 17704..=17705
-            | 17707..=17708
-            | 17716..=17717
-            | 17719..=17720
-            | 17812..=17813
+            | 17506..=17507
+            | 17779..=17780
+            | 17782..=17783
+            | 17791..=17792
+            | 17794..=17795
             | 17815..=17816
-            | 17824..=17825
+            | 17818..=17819
             | 17827..=17828
-            | 18028..=18029
-            | 18031..=18032
-            | 18040..=18041
-            | 18043..=18044
-            | 18136..=18137
+            | 17830..=17831
+            | 18103..=18104
+            | 18106..=18107
+            | 18115..=18116
+            | 18118..=18119
             | 18139..=18140
-            | 18148..=18149
+            | 18142..=18143
             | 18151..=18152
-            | 19521..=19522
-            | 19524..=19525
-            | 19533..=19534
-            | 19536..=19537
-            | 19629..=19630
+            | 18154..=18155
+            | 19596..=19597
+            | 19599..=19600
+            | 19608..=19609
+            | 19611..=19612
             | 19632..=19633
-            | 19641..=19642
+            | 19635..=19636
             | 19644..=19645
-            | 19941..=19942
-            | 19944..=19945
-            | 19953..=19954
-            | 19956..=19957
-            | 20049..=20050
+            | 19647..=19648
+            | 20016..=20017
+            | 20019..=20020
+            | 20028..=20029
+            | 20031..=20032
             | 20052..=20053
-            | 20061..=20062
+            | 20055..=20056
             | 20064..=20065
-            | 20378..=20379
-            | 20381..=20382
-            | 20390..=20391
-            | 20393..=20394
-            | 20486..=20487
+            | 20067..=20068
+            | 20453..=20454
+            | 20456..=20457
+            | 20465..=20466
+            | 20468..=20469
             | 20489..=20490
-            | 20498..=20499
+            | 20492..=20493
             | 20501..=20502
-            | 22660..=22661
-            | 22663..=22664
-            | 22672..=22673
-            | 22675..=22676
-            | 22768..=22769
+            | 20504..=20505
+            | 22735..=22736
+            | 22738..=22739
+            | 22747..=22748
+            | 22750..=22751
             | 22771..=22772
-            | 22780..=22781
+            | 22774..=22775
             | 22783..=22784
-            | 23071..=23072
-            | 23074..=23075
-            | 23083..=23084
-            | 23086..=23087
-            | 23179..=23180
+            | 22786..=22787
+            | 23146..=23147
+            | 23149..=23150
+            | 23158..=23159
+            | 23161..=23162
             | 23182..=23183
-            | 23191..=23192
+            | 23185..=23186
             | 23194..=23195
-            | 23482..=23483
-            | 23485..=23486
-            | 23494..=23495
-            | 23497..=23498
-            | 23590..=23591
+            | 23197..=23198
+            | 23557..=23558
+            | 23560..=23561
+            | 23569..=23570
+            | 23572..=23573
             | 23593..=23594
-            | 23602..=23603
+            | 23596..=23597
             | 23605..=23606
-            | 23893..=23894
-            | 23896..=23897
-            | 23905..=23906
-            | 23908..=23909
-            | 24001..=24002
+            | 23608..=23609
+            | 23968..=23969
+            | 23971..=23972
+            | 23980..=23981
+            | 23983..=23984
             | 24004..=24005
-            | 24013..=24014
-            | 24016..=24017 => &SHAPE156,
+            | 24007..=24008
+            | 24016..=24017
+            | 24019..=24020 => &SHAPE150,
+            8027 | 8030 | 8135 | 8138 | 8351 | 8354 | 8459 | 8462 | 14268 | 14271 | 14376
+            | 14379 | 14592 | 14595 | 14700 | 14703 | 14916 | 14919 | 15024 | 15027 | 15240
+            | 15243 | 15348 | 15351 | 15564 | 15567 | 15672 | 15675 | 15888 | 15891 | 15996
+            | 15999 | 16212 | 16215 | 16320 | 16323 | 16536 | 16539 | 16644 | 16647 | 16860
+            | 16863 | 16968 | 16971 | 17184 | 17187 | 17292 | 17295 | 17508 | 17511 | 17616
+            | 17619 | 17832 | 17835 | 17940 | 17943 | 18156 | 18159 | 18264 | 18267 | 19649
+            | 19652 | 19757 | 19760 | 20069 | 20072 | 20177 | 20180 | 20506 | 20509 | 20614
+            | 20617 | 22788 | 22791 | 22896 | 22899 | 23199 | 23202 | 23307 | 23310 | 23610
+            | 23613 | 23718 | 23721 | 24021 | 24024 | 24129 | 24132 => &SHAPE151,
+            8028..=8029
+            | 8031..=8032
+            | 8136..=8137
+            | 8139..=8140
+            | 8352..=8353
+            | 8355..=8356
+            | 8460..=8461
+            | 8463..=8464
+            | 14269..=14270
+            | 14272..=14273
+            | 14377..=14378
+            | 14380..=14381
+            | 14593..=14594
+            | 14596..=14597
+            | 14701..=14702
+            | 14704..=14705
+            | 14917..=14918
+            | 14920..=14921
+            | 15025..=15026
+            | 15028..=15029
+            | 15241..=15242
+            | 15244..=15245
+            | 15349..=15350
+            | 15352..=15353
+            | 15565..=15566
+            | 15568..=15569
+            | 15673..=15674
+            | 15676..=15677
+            | 15889..=15890
+            | 15892..=15893
+            | 15997..=15998
+            | 16000..=16001
+            | 16213..=16214
+            | 16216..=16217
+            | 16321..=16322
+            | 16324..=16325
+            | 16537..=16538
+            | 16540..=16541
+            | 16645..=16646
+            | 16648..=16649
+            | 16861..=16862
+            | 16864..=16865
+            | 16969..=16970
+            | 16972..=16973
+            | 17185..=17186
+            | 17188..=17189
+            | 17293..=17294
+            | 17296..=17297
+            | 17509..=17510
+            | 17512..=17513
+            | 17617..=17618
+            | 17620..=17621
+            | 17833..=17834
+            | 17836..=17837
+            | 17941..=17942
+            | 17944..=17945
+            | 18157..=18158
+            | 18160..=18161
+            | 18265..=18266
+            | 18268..=18269
+            | 19650..=19651
+            | 19653..=19654
+            | 19758..=19759
+            | 19761..=19762
+            | 20070..=20071
+            | 20073..=20074
+            | 20178..=20179
+            | 20181..=20182
+            | 20507..=20508
+            | 20510..=20511
+            | 20615..=20616
+            | 20618..=20619
+            | 22789..=22790
+            | 22792..=22793
+            | 22897..=22898
+            | 22900..=22901
+            | 23200..=23201
+            | 23203..=23204
+            | 23308..=23309
+            | 23311..=23312
+            | 23611..=23612
+            | 23614..=23615
+            | 23719..=23720
+            | 23722..=23723
+            | 24022..=24023
+            | 24025..=24026
+            | 24130..=24131
+            | 24133..=24134 => &SHAPE152,
+            8033 | 8036 | 8141 | 8144 | 8357 | 8360 | 8465 | 8468 | 14274 | 14277 | 14382
+            | 14385 | 14598 | 14601 | 14706 | 14709 | 14922 | 14925 | 15030 | 15033 | 15246
+            | 15249 | 15354 | 15357 | 15570 | 15573 | 15678 | 15681 | 15894 | 15897 | 16002
+            | 16005 | 16218 | 16221 | 16326 | 16329 | 16542 | 16545 | 16650 | 16653 | 16866
+            | 16869 | 16974 | 16977 | 17190 | 17193 | 17298 | 17301 | 17514 | 17517 | 17622
+            | 17625 | 17838 | 17841 | 17946 | 17949 | 18162 | 18165 | 18270 | 18273 | 19655
+            | 19658 | 19763 | 19766 | 20075 | 20078 | 20183 | 20186 | 20512 | 20515 | 20620
+            | 20623 | 22794 | 22797 | 22902 | 22905 | 23205 | 23208 | 23313 | 23316 | 23616
+            | 23619 | 23724 | 23727 | 24027 | 24030 | 24135 | 24138 => &SHAPE153,
+            8034..=8035
+            | 8037..=8038
+            | 8142..=8143
+            | 8145..=8146
+            | 8358..=8359
+            | 8361..=8362
+            | 8466..=8467
+            | 8469..=8470
+            | 14275..=14276
+            | 14278..=14279
+            | 14383..=14384
+            | 14386..=14387
+            | 14599..=14600
+            | 14602..=14603
+            | 14707..=14708
+            | 14710..=14711
+            | 14923..=14924
+            | 14926..=14927
+            | 15031..=15032
+            | 15034..=15035
+            | 15247..=15248
+            | 15250..=15251
+            | 15355..=15356
+            | 15358..=15359
+            | 15571..=15572
+            | 15574..=15575
+            | 15679..=15680
+            | 15682..=15683
+            | 15895..=15896
+            | 15898..=15899
+            | 16003..=16004
+            | 16006..=16007
+            | 16219..=16220
+            | 16222..=16223
+            | 16327..=16328
+            | 16330..=16331
+            | 16543..=16544
+            | 16546..=16547
+            | 16651..=16652
+            | 16654..=16655
+            | 16867..=16868
+            | 16870..=16871
+            | 16975..=16976
+            | 16978..=16979
+            | 17191..=17192
+            | 17194..=17195
+            | 17299..=17300
+            | 17302..=17303
+            | 17515..=17516
+            | 17518..=17519
+            | 17623..=17624
+            | 17626..=17627
+            | 17839..=17840
+            | 17842..=17843
+            | 17947..=17948
+            | 17950..=17951
+            | 18163..=18164
+            | 18166..=18167
+            | 18271..=18272
+            | 18274..=18275
+            | 19656..=19657
+            | 19659..=19660
+            | 19764..=19765
+            | 19767..=19768
+            | 20076..=20077
+            | 20079..=20080
+            | 20184..=20185
+            | 20187..=20188
+            | 20513..=20514
+            | 20516..=20517
+            | 20621..=20622
+            | 20624..=20625
+            | 22795..=22796
+            | 22798..=22799
+            | 22903..=22904
+            | 22906..=22907
+            | 23206..=23207
+            | 23209..=23210
+            | 23314..=23315
+            | 23317..=23318
+            | 23617..=23618
+            | 23620..=23621
+            | 23725..=23726
+            | 23728..=23729
+            | 24028..=24029
+            | 24031..=24032
+            | 24136..=24137
+            | 24139..=24140 => &SHAPE154,
+            8039 | 8042 | 8051 | 8054 | 8147 | 8150 | 8159 | 8162 | 8363 | 8366 | 8375 | 8378
+            | 8471 | 8474 | 8483 | 8486 | 14280 | 14283 | 14292 | 14295 | 14388 | 14391 | 14400
+            | 14403 | 14604 | 14607 | 14616 | 14619 | 14712 | 14715 | 14724 | 14727 | 14928
+            | 14931 | 14940 | 14943 | 15036 | 15039 | 15048 | 15051 | 15252 | 15255 | 15264
+            | 15267 | 15360 | 15363 | 15372 | 15375 | 15576 | 15579 | 15588 | 15591 | 15684
+            | 15687 | 15696 | 15699 | 15900 | 15903 | 15912 | 15915 | 16008 | 16011 | 16020
+            | 16023 | 16224 | 16227 | 16236 | 16239 | 16332 | 16335 | 16344 | 16347 | 16548
+            | 16551 | 16560 | 16563 | 16656 | 16659 | 16668 | 16671 | 16872 | 16875 | 16884
+            | 16887 | 16980 | 16983 | 16992 | 16995 | 17196 | 17199 | 17208 | 17211 | 17304
+            | 17307 | 17316 | 17319 | 17520 | 17523 | 17532 | 17535 | 17628 | 17631 | 17640
+            | 17643 | 17844 | 17847 | 17856 | 17859 | 17952 | 17955 | 17964 | 17967 | 18168
+            | 18171 | 18180 | 18183 | 18276 | 18279 | 18288 | 18291 | 19661 | 19664 | 19673
+            | 19676 | 19769 | 19772 | 19781 | 19784 | 20081 | 20084 | 20093 | 20096 | 20189
+            | 20192 | 20201 | 20204 | 20518 | 20521 | 20530 | 20533 | 20626 | 20629 | 20638
+            | 20641 | 22800 | 22803 | 22812 | 22815 | 22908 | 22911 | 22920 | 22923 | 23211
+            | 23214 | 23223 | 23226 | 23319 | 23322 | 23331 | 23334 | 23622 | 23625 | 23634
+            | 23637 | 23730 | 23733 | 23742 | 23745 | 24033 | 24036 | 24045 | 24048 | 24141
+            | 24144 | 24153 | 24156 => &SHAPE155,
+            8040..=8041
+            | 8043..=8044
+            | 8052..=8053
+            | 8055..=8056
+            | 8148..=8149
+            | 8151..=8152
+            | 8160..=8161
+            | 8163..=8164
+            | 8364..=8365
+            | 8367..=8368
+            | 8376..=8377
+            | 8379..=8380
+            | 8472..=8473
+            | 8475..=8476
+            | 8484..=8485
+            | 8487..=8488
+            | 14281..=14282
+            | 14284..=14285
+            | 14293..=14294
+            | 14296..=14297
+            | 14389..=14390
+            | 14392..=14393
+            | 14401..=14402
+            | 14404..=14405
+            | 14605..=14606
+            | 14608..=14609
+            | 14617..=14618
+            | 14620..=14621
+            | 14713..=14714
+            | 14716..=14717
+            | 14725..=14726
+            | 14728..=14729
+            | 14929..=14930
+            | 14932..=14933
+            | 14941..=14942
+            | 14944..=14945
+            | 15037..=15038
+            | 15040..=15041
+            | 15049..=15050
+            | 15052..=15053
+            | 15253..=15254
+            | 15256..=15257
+            | 15265..=15266
+            | 15268..=15269
+            | 15361..=15362
+            | 15364..=15365
+            | 15373..=15374
+            | 15376..=15377
+            | 15577..=15578
+            | 15580..=15581
+            | 15589..=15590
+            | 15592..=15593
+            | 15685..=15686
+            | 15688..=15689
+            | 15697..=15698
+            | 15700..=15701
+            | 15901..=15902
+            | 15904..=15905
+            | 15913..=15914
+            | 15916..=15917
+            | 16009..=16010
+            | 16012..=16013
+            | 16021..=16022
+            | 16024..=16025
+            | 16225..=16226
+            | 16228..=16229
+            | 16237..=16238
+            | 16240..=16241
+            | 16333..=16334
+            | 16336..=16337
+            | 16345..=16346
+            | 16348..=16349
+            | 16549..=16550
+            | 16552..=16553
+            | 16561..=16562
+            | 16564..=16565
+            | 16657..=16658
+            | 16660..=16661
+            | 16669..=16670
+            | 16672..=16673
+            | 16873..=16874
+            | 16876..=16877
+            | 16885..=16886
+            | 16888..=16889
+            | 16981..=16982
+            | 16984..=16985
+            | 16993..=16994
+            | 16996..=16997
+            | 17197..=17198
+            | 17200..=17201
+            | 17209..=17210
+            | 17212..=17213
+            | 17305..=17306
+            | 17308..=17309
+            | 17317..=17318
+            | 17320..=17321
+            | 17521..=17522
+            | 17524..=17525
+            | 17533..=17534
+            | 17536..=17537
+            | 17629..=17630
+            | 17632..=17633
+            | 17641..=17642
+            | 17644..=17645
+            | 17845..=17846
+            | 17848..=17849
+            | 17857..=17858
+            | 17860..=17861
+            | 17953..=17954
+            | 17956..=17957
+            | 17965..=17966
+            | 17968..=17969
+            | 18169..=18170
+            | 18172..=18173
+            | 18181..=18182
+            | 18184..=18185
+            | 18277..=18278
+            | 18280..=18281
+            | 18289..=18290
+            | 18292..=18293
+            | 19662..=19663
+            | 19665..=19666
+            | 19674..=19675
+            | 19677..=19678
+            | 19770..=19771
+            | 19773..=19774
+            | 19782..=19783
+            | 19785..=19786
+            | 20082..=20083
+            | 20085..=20086
+            | 20094..=20095
+            | 20097..=20098
+            | 20190..=20191
+            | 20193..=20194
+            | 20202..=20203
+            | 20205..=20206
+            | 20519..=20520
+            | 20522..=20523
+            | 20531..=20532
+            | 20534..=20535
+            | 20627..=20628
+            | 20630..=20631
+            | 20639..=20640
+            | 20642..=20643
+            | 22801..=22802
+            | 22804..=22805
+            | 22813..=22814
+            | 22816..=22817
+            | 22909..=22910
+            | 22912..=22913
+            | 22921..=22922
+            | 22924..=22925
+            | 23212..=23213
+            | 23215..=23216
+            | 23224..=23225
+            | 23227..=23228
+            | 23320..=23321
+            | 23323..=23324
+            | 23332..=23333
+            | 23335..=23336
+            | 23623..=23624
+            | 23626..=23627
+            | 23635..=23636
+            | 23638..=23639
+            | 23731..=23732
+            | 23734..=23735
+            | 23743..=23744
+            | 23746..=23747
+            | 24034..=24035
+            | 24037..=24038
+            | 24046..=24047
+            | 24049..=24050
+            | 24142..=24143
+            | 24145..=24146
+            | 24154..=24155
+            | 24157..=24158 => &SHAPE156,
             8045 | 8048 | 8057 | 8060 | 8153 | 8156 | 8165 | 8168 | 8369 | 8372 | 8381 | 8384
-            | 8477 | 8480 | 8489 | 8492 | 14145 | 14148 | 14157 | 14160 | 14253 | 14256 | 14265
-            | 14268 | 14469 | 14472 | 14481 | 14484 | 14577 | 14580 | 14589 | 14592 | 14793
-            | 14796 | 14805 | 14808 | 14901 | 14904 | 14913 | 14916 | 15117 | 15120 | 15129
-            | 15132 | 15225 | 15228 | 15237 | 15240 | 15441 | 15444 | 15453 | 15456 | 15549
-            | 15552 | 15561 | 15564 | 15765 | 15768 | 15777 | 15780 | 15873 | 15876 | 15885
-            | 15888 | 16089 | 16092 | 16101 | 16104 | 16197 | 16200 | 16209 | 16212 | 16413
-            | 16416 | 16425 | 16428 | 16521 | 16524 | 16533 | 16536 | 16737 | 16740 | 16749
-            | 16752 | 16845 | 16848 | 16857 | 16860 | 17061 | 17064 | 17073 | 17076 | 17169
-            | 17172 | 17181 | 17184 | 17385 | 17388 | 17397 | 17400 | 17493 | 17496 | 17505
-            | 17508 | 17709 | 17712 | 17721 | 17724 | 17817 | 17820 | 17829 | 17832 | 18033
-            | 18036 | 18045 | 18048 | 18141 | 18144 | 18153 | 18156 | 19526 | 19529 | 19538
-            | 19541 | 19634 | 19637 | 19646 | 19649 | 19946 | 19949 | 19958 | 19961 | 20054
-            | 20057 | 20066 | 20069 | 20383 | 20386 | 20395 | 20398 | 20491 | 20494 | 20503
-            | 20506 | 22665 | 22668 | 22677 | 22680 | 22773 | 22776 | 22785 | 22788 | 23076
-            | 23079 | 23088 | 23091 | 23184 | 23187 | 23196 | 23199 | 23487 | 23490 | 23499
-            | 23502 | 23595 | 23598 | 23607 | 23610 | 23898 | 23901 | 23910 | 23913 | 24006
-            | 24009 | 24018 | 24021 => &SHAPE157,
+            | 8477 | 8480 | 8489 | 8492 | 14286 | 14289 | 14298 | 14301 | 14394 | 14397 | 14406
+            | 14409 | 14610 | 14613 | 14622 | 14625 | 14718 | 14721 | 14730 | 14733 | 14934
+            | 14937 | 14946 | 14949 | 15042 | 15045 | 15054 | 15057 | 15258 | 15261 | 15270
+            | 15273 | 15366 | 15369 | 15378 | 15381 | 15582 | 15585 | 15594 | 15597 | 15690
+            | 15693 | 15702 | 15705 | 15906 | 15909 | 15918 | 15921 | 16014 | 16017 | 16026
+            | 16029 | 16230 | 16233 | 16242 | 16245 | 16338 | 16341 | 16350 | 16353 | 16554
+            | 16557 | 16566 | 16569 | 16662 | 16665 | 16674 | 16677 | 16878 | 16881 | 16890
+            | 16893 | 16986 | 16989 | 16998 | 17001 | 17202 | 17205 | 17214 | 17217 | 17310
+            | 17313 | 17322 | 17325 | 17526 | 17529 | 17538 | 17541 | 17634 | 17637 | 17646
+            | 17649 | 17850 | 17853 | 17862 | 17865 | 17958 | 17961 | 17970 | 17973 | 18174
+            | 18177 | 18186 | 18189 | 18282 | 18285 | 18294 | 18297 | 19667 | 19670 | 19679
+            | 19682 | 19775 | 19778 | 19787 | 19790 | 20087 | 20090 | 20099 | 20102 | 20195
+            | 20198 | 20207 | 20210 | 20524 | 20527 | 20536 | 20539 | 20632 | 20635 | 20644
+            | 20647 | 22806 | 22809 | 22818 | 22821 | 22914 | 22917 | 22926 | 22929 | 23217
+            | 23220 | 23229 | 23232 | 23325 | 23328 | 23337 | 23340 | 23628 | 23631 | 23640
+            | 23643 | 23736 | 23739 | 23748 | 23751 | 24039 | 24042 | 24051 | 24054 | 24147
+            | 24150 | 24159 | 24162 => &SHAPE157,
             8046..=8047
             | 8049..=8050
             | 8058..=8059
@@ -6415,184 +6415,184 @@ impl BlockWithShape for BlockState {
             | 8481..=8482
             | 8490..=8491
             | 8493..=8494
-            | 14146..=14147
-            | 14149..=14150
-            | 14158..=14159
-            | 14161..=14162
-            | 14254..=14255
-            | 14257..=14258
-            | 14266..=14267
-            | 14269..=14270
-            | 14470..=14471
-            | 14473..=14474
-            | 14482..=14483
-            | 14485..=14486
-            | 14578..=14579
-            | 14581..=14582
-            | 14590..=14591
-            | 14593..=14594
-            | 14794..=14795
-            | 14797..=14798
-            | 14806..=14807
-            | 14809..=14810
-            | 14902..=14903
-            | 14905..=14906
-            | 14914..=14915
-            | 14917..=14918
-            | 15118..=15119
-            | 15121..=15122
-            | 15130..=15131
-            | 15133..=15134
-            | 15226..=15227
-            | 15229..=15230
-            | 15238..=15239
-            | 15241..=15242
-            | 15442..=15443
-            | 15445..=15446
-            | 15454..=15455
-            | 15457..=15458
-            | 15550..=15551
-            | 15553..=15554
-            | 15562..=15563
-            | 15565..=15566
-            | 15766..=15767
-            | 15769..=15770
-            | 15778..=15779
-            | 15781..=15782
-            | 15874..=15875
-            | 15877..=15878
-            | 15886..=15887
-            | 15889..=15890
-            | 16090..=16091
-            | 16093..=16094
-            | 16102..=16103
-            | 16105..=16106
-            | 16198..=16199
-            | 16201..=16202
-            | 16210..=16211
-            | 16213..=16214
-            | 16414..=16415
-            | 16417..=16418
-            | 16426..=16427
-            | 16429..=16430
-            | 16522..=16523
-            | 16525..=16526
-            | 16534..=16535
-            | 16537..=16538
-            | 16738..=16739
-            | 16741..=16742
-            | 16750..=16751
-            | 16753..=16754
-            | 16846..=16847
-            | 16849..=16850
-            | 16858..=16859
-            | 16861..=16862
-            | 17062..=17063
-            | 17065..=17066
-            | 17074..=17075
-            | 17077..=17078
-            | 17170..=17171
-            | 17173..=17174
-            | 17182..=17183
-            | 17185..=17186
-            | 17386..=17387
-            | 17389..=17390
-            | 17398..=17399
-            | 17401..=17402
-            | 17494..=17495
-            | 17497..=17498
-            | 17506..=17507
-            | 17509..=17510
-            | 17710..=17711
-            | 17713..=17714
-            | 17722..=17723
-            | 17725..=17726
-            | 17818..=17819
-            | 17821..=17822
-            | 17830..=17831
-            | 17833..=17834
-            | 18034..=18035
-            | 18037..=18038
-            | 18046..=18047
-            | 18049..=18050
-            | 18142..=18143
-            | 18145..=18146
-            | 18154..=18155
-            | 18157..=18158
-            | 19527..=19528
-            | 19530..=19531
-            | 19539..=19540
-            | 19542..=19543
-            | 19635..=19636
-            | 19638..=19639
-            | 19647..=19648
-            | 19650..=19651
-            | 19947..=19948
-            | 19950..=19951
-            | 19959..=19960
-            | 19962..=19963
-            | 20055..=20056
-            | 20058..=20059
-            | 20067..=20068
-            | 20070..=20071
-            | 20384..=20385
-            | 20387..=20388
-            | 20396..=20397
-            | 20399..=20400
-            | 20492..=20493
-            | 20495..=20496
-            | 20504..=20505
-            | 20507..=20508
-            | 22666..=22667
-            | 22669..=22670
-            | 22678..=22679
-            | 22681..=22682
-            | 22774..=22775
-            | 22777..=22778
-            | 22786..=22787
-            | 22789..=22790
-            | 23077..=23078
-            | 23080..=23081
-            | 23089..=23090
-            | 23092..=23093
-            | 23185..=23186
-            | 23188..=23189
-            | 23197..=23198
-            | 23200..=23201
-            | 23488..=23489
-            | 23491..=23492
-            | 23500..=23501
-            | 23503..=23504
-            | 23596..=23597
-            | 23599..=23600
-            | 23608..=23609
-            | 23611..=23612
-            | 23899..=23900
-            | 23902..=23903
-            | 23911..=23912
-            | 23914..=23915
-            | 24007..=24008
-            | 24010..=24011
-            | 24019..=24020
-            | 24022..=24023 => &SHAPE158,
+            | 14287..=14288
+            | 14290..=14291
+            | 14299..=14300
+            | 14302..=14303
+            | 14395..=14396
+            | 14398..=14399
+            | 14407..=14408
+            | 14410..=14411
+            | 14611..=14612
+            | 14614..=14615
+            | 14623..=14624
+            | 14626..=14627
+            | 14719..=14720
+            | 14722..=14723
+            | 14731..=14732
+            | 14734..=14735
+            | 14935..=14936
+            | 14938..=14939
+            | 14947..=14948
+            | 14950..=14951
+            | 15043..=15044
+            | 15046..=15047
+            | 15055..=15056
+            | 15058..=15059
+            | 15259..=15260
+            | 15262..=15263
+            | 15271..=15272
+            | 15274..=15275
+            | 15367..=15368
+            | 15370..=15371
+            | 15379..=15380
+            | 15382..=15383
+            | 15583..=15584
+            | 15586..=15587
+            | 15595..=15596
+            | 15598..=15599
+            | 15691..=15692
+            | 15694..=15695
+            | 15703..=15704
+            | 15706..=15707
+            | 15907..=15908
+            | 15910..=15911
+            | 15919..=15920
+            | 15922..=15923
+            | 16015..=16016
+            | 16018..=16019
+            | 16027..=16028
+            | 16030..=16031
+            | 16231..=16232
+            | 16234..=16235
+            | 16243..=16244
+            | 16246..=16247
+            | 16339..=16340
+            | 16342..=16343
+            | 16351..=16352
+            | 16354..=16355
+            | 16555..=16556
+            | 16558..=16559
+            | 16567..=16568
+            | 16570..=16571
+            | 16663..=16664
+            | 16666..=16667
+            | 16675..=16676
+            | 16678..=16679
+            | 16879..=16880
+            | 16882..=16883
+            | 16891..=16892
+            | 16894..=16895
+            | 16987..=16988
+            | 16990..=16991
+            | 16999..=17000
+            | 17002..=17003
+            | 17203..=17204
+            | 17206..=17207
+            | 17215..=17216
+            | 17218..=17219
+            | 17311..=17312
+            | 17314..=17315
+            | 17323..=17324
+            | 17326..=17327
+            | 17527..=17528
+            | 17530..=17531
+            | 17539..=17540
+            | 17542..=17543
+            | 17635..=17636
+            | 17638..=17639
+            | 17647..=17648
+            | 17650..=17651
+            | 17851..=17852
+            | 17854..=17855
+            | 17863..=17864
+            | 17866..=17867
+            | 17959..=17960
+            | 17962..=17963
+            | 17971..=17972
+            | 17974..=17975
+            | 18175..=18176
+            | 18178..=18179
+            | 18187..=18188
+            | 18190..=18191
+            | 18283..=18284
+            | 18286..=18287
+            | 18295..=18296
+            | 18298..=18299
+            | 19668..=19669
+            | 19671..=19672
+            | 19680..=19681
+            | 19683..=19684
+            | 19776..=19777
+            | 19779..=19780
+            | 19788..=19789
+            | 19791..=19792
+            | 20088..=20089
+            | 20091..=20092
+            | 20100..=20101
+            | 20103..=20104
+            | 20196..=20197
+            | 20199..=20200
+            | 20208..=20209
+            | 20211..=20212
+            | 20525..=20526
+            | 20528..=20529
+            | 20537..=20538
+            | 20540..=20541
+            | 20633..=20634
+            | 20636..=20637
+            | 20645..=20646
+            | 20648..=20649
+            | 22807..=22808
+            | 22810..=22811
+            | 22819..=22820
+            | 22822..=22823
+            | 22915..=22916
+            | 22918..=22919
+            | 22927..=22928
+            | 22930..=22931
+            | 23218..=23219
+            | 23221..=23222
+            | 23230..=23231
+            | 23233..=23234
+            | 23326..=23327
+            | 23329..=23330
+            | 23338..=23339
+            | 23341..=23342
+            | 23629..=23630
+            | 23632..=23633
+            | 23641..=23642
+            | 23644..=23645
+            | 23737..=23738
+            | 23740..=23741
+            | 23749..=23750
+            | 23752..=23753
+            | 24040..=24041
+            | 24043..=24044
+            | 24052..=24053
+            | 24055..=24056
+            | 24148..=24149
+            | 24151..=24152
+            | 24160..=24161
+            | 24163..=24164 => &SHAPE158,
             8063 | 8066 | 8099 | 8102 | 8171 | 8174 | 8207 | 8210 | 8387 | 8390 | 8423 | 8426
-            | 8495 | 8498 | 8531 | 8534 | 14163 | 14166 | 14199 | 14202 | 14271 | 14274 | 14307
-            | 14310 | 14487 | 14490 | 14523 | 14526 | 14595 | 14598 | 14631 | 14634 | 14811
-            | 14814 | 14847 | 14850 | 14919 | 14922 | 14955 | 14958 | 15135 | 15138 | 15171
-            | 15174 | 15243 | 15246 | 15279 | 15282 | 15459 | 15462 | 15495 | 15498 | 15567
-            | 15570 | 15603 | 15606 | 15783 | 15786 | 15819 | 15822 | 15891 | 15894 | 15927
-            | 15930 | 16107 | 16110 | 16143 | 16146 | 16215 | 16218 | 16251 | 16254 | 16431
-            | 16434 | 16467 | 16470 | 16539 | 16542 | 16575 | 16578 | 16755 | 16758 | 16791
-            | 16794 | 16863 | 16866 | 16899 | 16902 | 17079 | 17082 | 17115 | 17118 | 17187
-            | 17190 | 17223 | 17226 | 17403 | 17406 | 17439 | 17442 | 17511 | 17514 | 17547
-            | 17550 | 17727 | 17730 | 17763 | 17766 | 17835 | 17838 | 17871 | 17874 | 18051
-            | 18054 | 18087 | 18090 | 18159 | 18162 | 18195 | 18198 | 19544 | 19547 | 19580
-            | 19583 | 19652 | 19655 | 19688 | 19691 | 19964 | 19967 | 20000 | 20003 | 20072
-            | 20075 | 20108 | 20111 | 20401 | 20404 | 20437 | 20440 | 20509 | 20512 | 20545
-            | 20548 | 22683 | 22686 | 22719 | 22722 | 22791 | 22794 | 22827 | 22830 | 23094
-            | 23097 | 23130 | 23133 | 23202 | 23205 | 23238 | 23241 | 23505 | 23508 | 23541
-            | 23544 | 23613 | 23616 | 23649 | 23652 | 23916 | 23919 | 23952 | 23955 | 24024
-            | 24027 | 24060 | 24063 => &SHAPE159,
+            | 8495 | 8498 | 8531 | 8534 | 14304 | 14307 | 14340 | 14343 | 14412 | 14415 | 14448
+            | 14451 | 14628 | 14631 | 14664 | 14667 | 14736 | 14739 | 14772 | 14775 | 14952
+            | 14955 | 14988 | 14991 | 15060 | 15063 | 15096 | 15099 | 15276 | 15279 | 15312
+            | 15315 | 15384 | 15387 | 15420 | 15423 | 15600 | 15603 | 15636 | 15639 | 15708
+            | 15711 | 15744 | 15747 | 15924 | 15927 | 15960 | 15963 | 16032 | 16035 | 16068
+            | 16071 | 16248 | 16251 | 16284 | 16287 | 16356 | 16359 | 16392 | 16395 | 16572
+            | 16575 | 16608 | 16611 | 16680 | 16683 | 16716 | 16719 | 16896 | 16899 | 16932
+            | 16935 | 17004 | 17007 | 17040 | 17043 | 17220 | 17223 | 17256 | 17259 | 17328
+            | 17331 | 17364 | 17367 | 17544 | 17547 | 17580 | 17583 | 17652 | 17655 | 17688
+            | 17691 | 17868 | 17871 | 17904 | 17907 | 17976 | 17979 | 18012 | 18015 | 18192
+            | 18195 | 18228 | 18231 | 18300 | 18303 | 18336 | 18339 | 19685 | 19688 | 19721
+            | 19724 | 19793 | 19796 | 19829 | 19832 | 20105 | 20108 | 20141 | 20144 | 20213
+            | 20216 | 20249 | 20252 | 20542 | 20545 | 20578 | 20581 | 20650 | 20653 | 20686
+            | 20689 | 22824 | 22827 | 22860 | 22863 | 22932 | 22935 | 22968 | 22971 | 23235
+            | 23238 | 23271 | 23274 | 23343 | 23346 | 23379 | 23382 | 23646 | 23649 | 23682
+            | 23685 | 23754 | 23757 | 23790 | 23793 | 24057 | 24060 | 24093 | 24096 | 24165
+            | 24168 | 24201 | 24204 => &SHAPE159,
             8064..=8065
             | 8067..=8068
             | 8100..=8101
@@ -6609,184 +6609,184 @@ impl BlockWithShape for BlockState {
             | 8499..=8500
             | 8532..=8533
             | 8535..=8536
-            | 14164..=14165
-            | 14167..=14168
-            | 14200..=14201
-            | 14203..=14204
-            | 14272..=14273
-            | 14275..=14276
+            | 14305..=14306
             | 14308..=14309
-            | 14311..=14312
-            | 14488..=14489
-            | 14491..=14492
-            | 14524..=14525
-            | 14527..=14528
-            | 14596..=14597
-            | 14599..=14600
+            | 14341..=14342
+            | 14344..=14345
+            | 14413..=14414
+            | 14416..=14417
+            | 14449..=14450
+            | 14452..=14453
+            | 14629..=14630
             | 14632..=14633
-            | 14635..=14636
-            | 14812..=14813
-            | 14815..=14816
-            | 14848..=14849
-            | 14851..=14852
-            | 14920..=14921
-            | 14923..=14924
+            | 14665..=14666
+            | 14668..=14669
+            | 14737..=14738
+            | 14740..=14741
+            | 14773..=14774
+            | 14776..=14777
+            | 14953..=14954
             | 14956..=14957
-            | 14959..=14960
-            | 15136..=15137
-            | 15139..=15140
-            | 15172..=15173
-            | 15175..=15176
-            | 15244..=15245
-            | 15247..=15248
+            | 14989..=14990
+            | 14992..=14993
+            | 15061..=15062
+            | 15064..=15065
+            | 15097..=15098
+            | 15100..=15101
+            | 15277..=15278
             | 15280..=15281
-            | 15283..=15284
-            | 15460..=15461
-            | 15463..=15464
-            | 15496..=15497
-            | 15499..=15500
-            | 15568..=15569
-            | 15571..=15572
+            | 15313..=15314
+            | 15316..=15317
+            | 15385..=15386
+            | 15388..=15389
+            | 15421..=15422
+            | 15424..=15425
+            | 15601..=15602
             | 15604..=15605
-            | 15607..=15608
-            | 15784..=15785
-            | 15787..=15788
-            | 15820..=15821
-            | 15823..=15824
-            | 15892..=15893
-            | 15895..=15896
+            | 15637..=15638
+            | 15640..=15641
+            | 15709..=15710
+            | 15712..=15713
+            | 15745..=15746
+            | 15748..=15749
+            | 15925..=15926
             | 15928..=15929
-            | 15931..=15932
-            | 16108..=16109
-            | 16111..=16112
-            | 16144..=16145
-            | 16147..=16148
-            | 16216..=16217
-            | 16219..=16220
+            | 15961..=15962
+            | 15964..=15965
+            | 16033..=16034
+            | 16036..=16037
+            | 16069..=16070
+            | 16072..=16073
+            | 16249..=16250
             | 16252..=16253
-            | 16255..=16256
-            | 16432..=16433
-            | 16435..=16436
-            | 16468..=16469
-            | 16471..=16472
-            | 16540..=16541
-            | 16543..=16544
+            | 16285..=16286
+            | 16288..=16289
+            | 16357..=16358
+            | 16360..=16361
+            | 16393..=16394
+            | 16396..=16397
+            | 16573..=16574
             | 16576..=16577
-            | 16579..=16580
-            | 16756..=16757
-            | 16759..=16760
-            | 16792..=16793
-            | 16795..=16796
-            | 16864..=16865
-            | 16867..=16868
+            | 16609..=16610
+            | 16612..=16613
+            | 16681..=16682
+            | 16684..=16685
+            | 16717..=16718
+            | 16720..=16721
+            | 16897..=16898
             | 16900..=16901
-            | 16903..=16904
-            | 17080..=17081
-            | 17083..=17084
-            | 17116..=17117
-            | 17119..=17120
-            | 17188..=17189
-            | 17191..=17192
+            | 16933..=16934
+            | 16936..=16937
+            | 17005..=17006
+            | 17008..=17009
+            | 17041..=17042
+            | 17044..=17045
+            | 17221..=17222
             | 17224..=17225
-            | 17227..=17228
-            | 17404..=17405
-            | 17407..=17408
-            | 17440..=17441
-            | 17443..=17444
-            | 17512..=17513
-            | 17515..=17516
+            | 17257..=17258
+            | 17260..=17261
+            | 17329..=17330
+            | 17332..=17333
+            | 17365..=17366
+            | 17368..=17369
+            | 17545..=17546
             | 17548..=17549
-            | 17551..=17552
-            | 17728..=17729
-            | 17731..=17732
-            | 17764..=17765
-            | 17767..=17768
-            | 17836..=17837
-            | 17839..=17840
+            | 17581..=17582
+            | 17584..=17585
+            | 17653..=17654
+            | 17656..=17657
+            | 17689..=17690
+            | 17692..=17693
+            | 17869..=17870
             | 17872..=17873
-            | 17875..=17876
-            | 18052..=18053
-            | 18055..=18056
-            | 18088..=18089
-            | 18091..=18092
-            | 18160..=18161
-            | 18163..=18164
+            | 17905..=17906
+            | 17908..=17909
+            | 17977..=17978
+            | 17980..=17981
+            | 18013..=18014
+            | 18016..=18017
+            | 18193..=18194
             | 18196..=18197
-            | 18199..=18200
-            | 19545..=19546
-            | 19548..=19549
-            | 19581..=19582
-            | 19584..=19585
-            | 19653..=19654
-            | 19656..=19657
+            | 18229..=18230
+            | 18232..=18233
+            | 18301..=18302
+            | 18304..=18305
+            | 18337..=18338
+            | 18340..=18341
+            | 19686..=19687
             | 19689..=19690
-            | 19692..=19693
-            | 19965..=19966
-            | 19968..=19969
-            | 20001..=20002
-            | 20004..=20005
-            | 20073..=20074
-            | 20076..=20077
+            | 19722..=19723
+            | 19725..=19726
+            | 19794..=19795
+            | 19797..=19798
+            | 19830..=19831
+            | 19833..=19834
+            | 20106..=20107
             | 20109..=20110
-            | 20112..=20113
-            | 20402..=20403
-            | 20405..=20406
-            | 20438..=20439
-            | 20441..=20442
-            | 20510..=20511
-            | 20513..=20514
-            | 20546..=20547
-            | 20549..=20550
-            | 22684..=22685
-            | 22687..=22688
-            | 22720..=22721
-            | 22723..=22724
-            | 22792..=22793
-            | 22795..=22796
-            | 22828..=22829
-            | 22831..=22832
-            | 23095..=23096
-            | 23098..=23099
-            | 23131..=23132
-            | 23134..=23135
-            | 23203..=23204
-            | 23206..=23207
+            | 20142..=20143
+            | 20145..=20146
+            | 20214..=20215
+            | 20217..=20218
+            | 20250..=20251
+            | 20253..=20254
+            | 20543..=20544
+            | 20546..=20547
+            | 20579..=20580
+            | 20582..=20583
+            | 20651..=20652
+            | 20654..=20655
+            | 20687..=20688
+            | 20690..=20691
+            | 22825..=22826
+            | 22828..=22829
+            | 22861..=22862
+            | 22864..=22865
+            | 22933..=22934
+            | 22936..=22937
+            | 22969..=22970
+            | 22972..=22973
+            | 23236..=23237
             | 23239..=23240
-            | 23242..=23243
-            | 23506..=23507
-            | 23509..=23510
-            | 23542..=23543
-            | 23545..=23546
-            | 23614..=23615
-            | 23617..=23618
+            | 23272..=23273
+            | 23275..=23276
+            | 23344..=23345
+            | 23347..=23348
+            | 23380..=23381
+            | 23383..=23384
+            | 23647..=23648
             | 23650..=23651
-            | 23653..=23654
-            | 23917..=23918
-            | 23920..=23921
-            | 23953..=23954
-            | 23956..=23957
-            | 24025..=24026
-            | 24028..=24029
+            | 23683..=23684
+            | 23686..=23687
+            | 23755..=23756
+            | 23758..=23759
+            | 23791..=23792
+            | 23794..=23795
+            | 24058..=24059
             | 24061..=24062
-            | 24064..=24065 => &SHAPE160,
+            | 24094..=24095
+            | 24097..=24098
+            | 24166..=24167
+            | 24169..=24170
+            | 24202..=24203
+            | 24205..=24206 => &SHAPE160,
             8069 | 8072 | 8105 | 8108 | 8177 | 8180 | 8213 | 8216 | 8393 | 8396 | 8429 | 8432
-            | 8501 | 8504 | 8537 | 8540 | 14169 | 14172 | 14205 | 14208 | 14277 | 14280 | 14313
-            | 14316 | 14493 | 14496 | 14529 | 14532 | 14601 | 14604 | 14637 | 14640 | 14817
-            | 14820 | 14853 | 14856 | 14925 | 14928 | 14961 | 14964 | 15141 | 15144 | 15177
-            | 15180 | 15249 | 15252 | 15285 | 15288 | 15465 | 15468 | 15501 | 15504 | 15573
-            | 15576 | 15609 | 15612 | 15789 | 15792 | 15825 | 15828 | 15897 | 15900 | 15933
-            | 15936 | 16113 | 16116 | 16149 | 16152 | 16221 | 16224 | 16257 | 16260 | 16437
-            | 16440 | 16473 | 16476 | 16545 | 16548 | 16581 | 16584 | 16761 | 16764 | 16797
-            | 16800 | 16869 | 16872 | 16905 | 16908 | 17085 | 17088 | 17121 | 17124 | 17193
-            | 17196 | 17229 | 17232 | 17409 | 17412 | 17445 | 17448 | 17517 | 17520 | 17553
-            | 17556 | 17733 | 17736 | 17769 | 17772 | 17841 | 17844 | 17877 | 17880 | 18057
-            | 18060 | 18093 | 18096 | 18165 | 18168 | 18201 | 18204 | 19550 | 19553 | 19586
-            | 19589 | 19658 | 19661 | 19694 | 19697 | 19970 | 19973 | 20006 | 20009 | 20078
-            | 20081 | 20114 | 20117 | 20407 | 20410 | 20443 | 20446 | 20515 | 20518 | 20551
-            | 20554 | 22689 | 22692 | 22725 | 22728 | 22797 | 22800 | 22833 | 22836 | 23100
-            | 23103 | 23136 | 23139 | 23208 | 23211 | 23244 | 23247 | 23511 | 23514 | 23547
-            | 23550 | 23619 | 23622 | 23655 | 23658 | 23922 | 23925 | 23958 | 23961 | 24030
-            | 24033 | 24066 | 24069 => &SHAPE161,
+            | 8501 | 8504 | 8537 | 8540 | 14310 | 14313 | 14346 | 14349 | 14418 | 14421 | 14454
+            | 14457 | 14634 | 14637 | 14670 | 14673 | 14742 | 14745 | 14778 | 14781 | 14958
+            | 14961 | 14994 | 14997 | 15066 | 15069 | 15102 | 15105 | 15282 | 15285 | 15318
+            | 15321 | 15390 | 15393 | 15426 | 15429 | 15606 | 15609 | 15642 | 15645 | 15714
+            | 15717 | 15750 | 15753 | 15930 | 15933 | 15966 | 15969 | 16038 | 16041 | 16074
+            | 16077 | 16254 | 16257 | 16290 | 16293 | 16362 | 16365 | 16398 | 16401 | 16578
+            | 16581 | 16614 | 16617 | 16686 | 16689 | 16722 | 16725 | 16902 | 16905 | 16938
+            | 16941 | 17010 | 17013 | 17046 | 17049 | 17226 | 17229 | 17262 | 17265 | 17334
+            | 17337 | 17370 | 17373 | 17550 | 17553 | 17586 | 17589 | 17658 | 17661 | 17694
+            | 17697 | 17874 | 17877 | 17910 | 17913 | 17982 | 17985 | 18018 | 18021 | 18198
+            | 18201 | 18234 | 18237 | 18306 | 18309 | 18342 | 18345 | 19691 | 19694 | 19727
+            | 19730 | 19799 | 19802 | 19835 | 19838 | 20111 | 20114 | 20147 | 20150 | 20219
+            | 20222 | 20255 | 20258 | 20548 | 20551 | 20584 | 20587 | 20656 | 20659 | 20692
+            | 20695 | 22830 | 22833 | 22866 | 22869 | 22938 | 22941 | 22974 | 22977 | 23241
+            | 23244 | 23277 | 23280 | 23349 | 23352 | 23385 | 23388 | 23652 | 23655 | 23688
+            | 23691 | 23760 | 23763 | 23796 | 23799 | 24063 | 24066 | 24099 | 24102 | 24171
+            | 24174 | 24207 | 24210 => &SHAPE161,
             8070..=8071
             | 8073..=8074
             | 8106..=8107
@@ -6803,201 +6803,201 @@ impl BlockWithShape for BlockState {
             | 8505..=8506
             | 8538..=8539
             | 8541..=8542
-            | 14170..=14171
-            | 14173..=14174
-            | 14206..=14207
-            | 14209..=14210
-            | 14278..=14279
-            | 14281..=14282
+            | 14311..=14312
             | 14314..=14315
-            | 14317..=14318
-            | 14494..=14495
-            | 14497..=14498
-            | 14530..=14531
-            | 14533..=14534
-            | 14602..=14603
-            | 14605..=14606
+            | 14347..=14348
+            | 14350..=14351
+            | 14419..=14420
+            | 14422..=14423
+            | 14455..=14456
+            | 14458..=14459
+            | 14635..=14636
             | 14638..=14639
-            | 14641..=14642
-            | 14818..=14819
-            | 14821..=14822
-            | 14854..=14855
-            | 14857..=14858
-            | 14926..=14927
-            | 14929..=14930
+            | 14671..=14672
+            | 14674..=14675
+            | 14743..=14744
+            | 14746..=14747
+            | 14779..=14780
+            | 14782..=14783
+            | 14959..=14960
             | 14962..=14963
-            | 14965..=14966
-            | 15142..=15143
-            | 15145..=15146
-            | 15178..=15179
-            | 15181..=15182
-            | 15250..=15251
-            | 15253..=15254
+            | 14995..=14996
+            | 14998..=14999
+            | 15067..=15068
+            | 15070..=15071
+            | 15103..=15104
+            | 15106..=15107
+            | 15283..=15284
             | 15286..=15287
-            | 15289..=15290
-            | 15466..=15467
-            | 15469..=15470
-            | 15502..=15503
-            | 15505..=15506
-            | 15574..=15575
-            | 15577..=15578
+            | 15319..=15320
+            | 15322..=15323
+            | 15391..=15392
+            | 15394..=15395
+            | 15427..=15428
+            | 15430..=15431
+            | 15607..=15608
             | 15610..=15611
-            | 15613..=15614
-            | 15790..=15791
-            | 15793..=15794
-            | 15826..=15827
-            | 15829..=15830
-            | 15898..=15899
-            | 15901..=15902
+            | 15643..=15644
+            | 15646..=15647
+            | 15715..=15716
+            | 15718..=15719
+            | 15751..=15752
+            | 15754..=15755
+            | 15931..=15932
             | 15934..=15935
-            | 15937..=15938
-            | 16114..=16115
-            | 16117..=16118
-            | 16150..=16151
-            | 16153..=16154
-            | 16222..=16223
-            | 16225..=16226
+            | 15967..=15968
+            | 15970..=15971
+            | 16039..=16040
+            | 16042..=16043
+            | 16075..=16076
+            | 16078..=16079
+            | 16255..=16256
             | 16258..=16259
-            | 16261..=16262
-            | 16438..=16439
-            | 16441..=16442
-            | 16474..=16475
-            | 16477..=16478
-            | 16546..=16547
-            | 16549..=16550
+            | 16291..=16292
+            | 16294..=16295
+            | 16363..=16364
+            | 16366..=16367
+            | 16399..=16400
+            | 16402..=16403
+            | 16579..=16580
             | 16582..=16583
-            | 16585..=16586
-            | 16762..=16763
-            | 16765..=16766
-            | 16798..=16799
-            | 16801..=16802
-            | 16870..=16871
-            | 16873..=16874
+            | 16615..=16616
+            | 16618..=16619
+            | 16687..=16688
+            | 16690..=16691
+            | 16723..=16724
+            | 16726..=16727
+            | 16903..=16904
             | 16906..=16907
-            | 16909..=16910
-            | 17086..=17087
-            | 17089..=17090
-            | 17122..=17123
-            | 17125..=17126
-            | 17194..=17195
-            | 17197..=17198
+            | 16939..=16940
+            | 16942..=16943
+            | 17011..=17012
+            | 17014..=17015
+            | 17047..=17048
+            | 17050..=17051
+            | 17227..=17228
             | 17230..=17231
-            | 17233..=17234
-            | 17410..=17411
-            | 17413..=17414
-            | 17446..=17447
-            | 17449..=17450
-            | 17518..=17519
-            | 17521..=17522
+            | 17263..=17264
+            | 17266..=17267
+            | 17335..=17336
+            | 17338..=17339
+            | 17371..=17372
+            | 17374..=17375
+            | 17551..=17552
             | 17554..=17555
-            | 17557..=17558
-            | 17734..=17735
-            | 17737..=17738
-            | 17770..=17771
-            | 17773..=17774
-            | 17842..=17843
-            | 17845..=17846
+            | 17587..=17588
+            | 17590..=17591
+            | 17659..=17660
+            | 17662..=17663
+            | 17695..=17696
+            | 17698..=17699
+            | 17875..=17876
             | 17878..=17879
-            | 17881..=17882
-            | 18058..=18059
-            | 18061..=18062
-            | 18094..=18095
-            | 18097..=18098
-            | 18166..=18167
-            | 18169..=18170
+            | 17911..=17912
+            | 17914..=17915
+            | 17983..=17984
+            | 17986..=17987
+            | 18019..=18020
+            | 18022..=18023
+            | 18199..=18200
             | 18202..=18203
-            | 18205..=18206
-            | 19551..=19552
-            | 19554..=19555
-            | 19587..=19588
-            | 19590..=19591
-            | 19659..=19660
-            | 19662..=19663
+            | 18235..=18236
+            | 18238..=18239
+            | 18307..=18308
+            | 18310..=18311
+            | 18343..=18344
+            | 18346..=18347
+            | 19692..=19693
             | 19695..=19696
-            | 19698..=19699
-            | 19971..=19972
-            | 19974..=19975
-            | 20007..=20008
-            | 20010..=20011
-            | 20079..=20080
-            | 20082..=20083
+            | 19728..=19729
+            | 19731..=19732
+            | 19800..=19801
+            | 19803..=19804
+            | 19836..=19837
+            | 19839..=19840
+            | 20112..=20113
             | 20115..=20116
-            | 20118..=20119
-            | 20408..=20409
-            | 20411..=20412
-            | 20444..=20445
-            | 20447..=20448
-            | 20516..=20517
-            | 20519..=20520
+            | 20148..=20149
+            | 20151..=20152
+            | 20220..=20221
+            | 20223..=20224
+            | 20256..=20257
+            | 20259..=20260
+            | 20549..=20550
             | 20552..=20553
-            | 20555..=20556
-            | 22690..=22691
-            | 22693..=22694
-            | 22726..=22727
-            | 22729..=22730
-            | 22798..=22799
-            | 22801..=22802
+            | 20585..=20586
+            | 20588..=20589
+            | 20657..=20658
+            | 20660..=20661
+            | 20693..=20694
+            | 20696..=20697
+            | 22831..=22832
             | 22834..=22835
-            | 22837..=22838
-            | 23101..=23102
-            | 23104..=23105
-            | 23137..=23138
-            | 23140..=23141
-            | 23209..=23210
-            | 23212..=23213
+            | 22867..=22868
+            | 22870..=22871
+            | 22939..=22940
+            | 22942..=22943
+            | 22975..=22976
+            | 22978..=22979
+            | 23242..=23243
             | 23245..=23246
-            | 23248..=23249
-            | 23512..=23513
-            | 23515..=23516
-            | 23548..=23549
-            | 23551..=23552
-            | 23620..=23621
-            | 23623..=23624
+            | 23278..=23279
+            | 23281..=23282
+            | 23350..=23351
+            | 23353..=23354
+            | 23386..=23387
+            | 23389..=23390
+            | 23653..=23654
             | 23656..=23657
-            | 23659..=23660
-            | 23923..=23924
-            | 23926..=23927
-            | 23959..=23960
-            | 23962..=23963
-            | 24031..=24032
-            | 24034..=24035
+            | 23689..=23690
+            | 23692..=23693
+            | 23761..=23762
+            | 23764..=23765
+            | 23797..=23798
+            | 23800..=23801
+            | 24064..=24065
             | 24067..=24068
-            | 24070..=24071 => &SHAPE162,
+            | 24100..=24101
+            | 24103..=24104
+            | 24172..=24173
+            | 24175..=24176
+            | 24208..=24209
+            | 24211..=24212 => &SHAPE162,
             8075 | 8078 | 8087 | 8090 | 8111 | 8114 | 8123 | 8126 | 8183 | 8186 | 8195 | 8198
             | 8219 | 8222 | 8231 | 8234 | 8399 | 8402 | 8411 | 8414 | 8435 | 8438 | 8447 | 8450
-            | 8507 | 8510 | 8519 | 8522 | 8543 | 8546 | 8555 | 8558 | 14175 | 14178 | 14187
-            | 14190 | 14211 | 14214 | 14223 | 14226 | 14283 | 14286 | 14295 | 14298 | 14319
-            | 14322 | 14331 | 14334 | 14499 | 14502 | 14511 | 14514 | 14535 | 14538 | 14547
-            | 14550 | 14607 | 14610 | 14619 | 14622 | 14643 | 14646 | 14655 | 14658 | 14823
-            | 14826 | 14835 | 14838 | 14859 | 14862 | 14871 | 14874 | 14931 | 14934 | 14943
-            | 14946 | 14967 | 14970 | 14979 | 14982 | 15147 | 15150 | 15159 | 15162 | 15183
-            | 15186 | 15195 | 15198 | 15255 | 15258 | 15267 | 15270 | 15291 | 15294 | 15303
-            | 15306 | 15471 | 15474 | 15483 | 15486 | 15507 | 15510 | 15519 | 15522 | 15579
-            | 15582 | 15591 | 15594 | 15615 | 15618 | 15627 | 15630 | 15795 | 15798 | 15807
-            | 15810 | 15831 | 15834 | 15843 | 15846 | 15903 | 15906 | 15915 | 15918 | 15939
-            | 15942 | 15951 | 15954 | 16119 | 16122 | 16131 | 16134 | 16155 | 16158 | 16167
-            | 16170 | 16227 | 16230 | 16239 | 16242 | 16263 | 16266 | 16275 | 16278 | 16443
-            | 16446 | 16455 | 16458 | 16479 | 16482 | 16491 | 16494 | 16551 | 16554 | 16563
-            | 16566 | 16587 | 16590 | 16599 | 16602 | 16767 | 16770 | 16779 | 16782 | 16803
-            | 16806 | 16815 | 16818 | 16875 | 16878 | 16887 | 16890 | 16911 | 16914 | 16923
-            | 16926 | 17091 | 17094 | 17103 | 17106 | 17127 | 17130 | 17139 | 17142 | 17199
-            | 17202 | 17211 | 17214 | 17235 | 17238 | 17247 | 17250 | 17415 | 17418 | 17427
-            | 17430 | 17451 | 17454 | 17463 | 17466 | 17523 | 17526 | 17535 | 17538 | 17559
-            | 17562 | 17571 | 17574 | 17739 | 17742 | 17751 | 17754 | 17775 | 17778 | 17787
-            | 17790 | 17847 | 17850 | 17859 | 17862 | 17883 | 17886 | 17895 | 17898 | 18063
-            | 18066 | 18075 | 18078 | 18099 | 18102 | 18111 | 18114 | 18171 | 18174 | 18183
-            | 18186 | 18207 | 18210 | 18219 | 18222 | 19556 | 19559 | 19568 | 19571 | 19592
-            | 19595 | 19604 | 19607 | 19664 | 19667 | 19676 | 19679 | 19700 | 19703 | 19712
-            | 19715 | 19976 | 19979 | 19988 | 19991 | 20012 | 20015 | 20024 | 20027 | 20084
-            | 20087 | 20096 | 20099 | 20120 | 20123 | 20132 | 20135 | 20413 | 20416 | 20425
-            | 20428 | 20449 | 20452 | 20461 | 20464 | 20521 | 20524 | 20533 | 20536 | 20557
-            | 20560 | 20569 | 20572 | 22695 | 22698 | 22707 | 22710 | 22731 | 22734 | 22743
-            | 22746 | 22803 | 22806 | 22815 | 22818 | 22839 | 22842 | 22851 | 22854 | 23106
-            | 23109 | 23118 | 23121 | 23142 | 23145 | 23154 | 23157 | 23214 | 23217 | 23226
-            | 23229 | 23250 | 23253 | 23262 | 23265 | 23517 | 23520 | 23529 | 23532 | 23553
-            | 23556 | 23565 | 23568 | 23625 | 23628 | 23637 | 23640 | 23661 | 23664 | 23673
-            | 23676 | 23928 | 23931 | 23940 | 23943 | 23964 | 23967 | 23976 | 23979 | 24036
-            | 24039 | 24048 | 24051 | 24072 | 24075 | 24084 | 24087 => &SHAPE163,
+            | 8507 | 8510 | 8519 | 8522 | 8543 | 8546 | 8555 | 8558 | 14316 | 14319 | 14328
+            | 14331 | 14352 | 14355 | 14364 | 14367 | 14424 | 14427 | 14436 | 14439 | 14460
+            | 14463 | 14472 | 14475 | 14640 | 14643 | 14652 | 14655 | 14676 | 14679 | 14688
+            | 14691 | 14748 | 14751 | 14760 | 14763 | 14784 | 14787 | 14796 | 14799 | 14964
+            | 14967 | 14976 | 14979 | 15000 | 15003 | 15012 | 15015 | 15072 | 15075 | 15084
+            | 15087 | 15108 | 15111 | 15120 | 15123 | 15288 | 15291 | 15300 | 15303 | 15324
+            | 15327 | 15336 | 15339 | 15396 | 15399 | 15408 | 15411 | 15432 | 15435 | 15444
+            | 15447 | 15612 | 15615 | 15624 | 15627 | 15648 | 15651 | 15660 | 15663 | 15720
+            | 15723 | 15732 | 15735 | 15756 | 15759 | 15768 | 15771 | 15936 | 15939 | 15948
+            | 15951 | 15972 | 15975 | 15984 | 15987 | 16044 | 16047 | 16056 | 16059 | 16080
+            | 16083 | 16092 | 16095 | 16260 | 16263 | 16272 | 16275 | 16296 | 16299 | 16308
+            | 16311 | 16368 | 16371 | 16380 | 16383 | 16404 | 16407 | 16416 | 16419 | 16584
+            | 16587 | 16596 | 16599 | 16620 | 16623 | 16632 | 16635 | 16692 | 16695 | 16704
+            | 16707 | 16728 | 16731 | 16740 | 16743 | 16908 | 16911 | 16920 | 16923 | 16944
+            | 16947 | 16956 | 16959 | 17016 | 17019 | 17028 | 17031 | 17052 | 17055 | 17064
+            | 17067 | 17232 | 17235 | 17244 | 17247 | 17268 | 17271 | 17280 | 17283 | 17340
+            | 17343 | 17352 | 17355 | 17376 | 17379 | 17388 | 17391 | 17556 | 17559 | 17568
+            | 17571 | 17592 | 17595 | 17604 | 17607 | 17664 | 17667 | 17676 | 17679 | 17700
+            | 17703 | 17712 | 17715 | 17880 | 17883 | 17892 | 17895 | 17916 | 17919 | 17928
+            | 17931 | 17988 | 17991 | 18000 | 18003 | 18024 | 18027 | 18036 | 18039 | 18204
+            | 18207 | 18216 | 18219 | 18240 | 18243 | 18252 | 18255 | 18312 | 18315 | 18324
+            | 18327 | 18348 | 18351 | 18360 | 18363 | 19697 | 19700 | 19709 | 19712 | 19733
+            | 19736 | 19745 | 19748 | 19805 | 19808 | 19817 | 19820 | 19841 | 19844 | 19853
+            | 19856 | 20117 | 20120 | 20129 | 20132 | 20153 | 20156 | 20165 | 20168 | 20225
+            | 20228 | 20237 | 20240 | 20261 | 20264 | 20273 | 20276 | 20554 | 20557 | 20566
+            | 20569 | 20590 | 20593 | 20602 | 20605 | 20662 | 20665 | 20674 | 20677 | 20698
+            | 20701 | 20710 | 20713 | 22836 | 22839 | 22848 | 22851 | 22872 | 22875 | 22884
+            | 22887 | 22944 | 22947 | 22956 | 22959 | 22980 | 22983 | 22992 | 22995 | 23247
+            | 23250 | 23259 | 23262 | 23283 | 23286 | 23295 | 23298 | 23355 | 23358 | 23367
+            | 23370 | 23391 | 23394 | 23403 | 23406 | 23658 | 23661 | 23670 | 23673 | 23694
+            | 23697 | 23706 | 23709 | 23766 | 23769 | 23778 | 23781 | 23802 | 23805 | 23814
+            | 23817 | 24069 | 24072 | 24081 | 24084 | 24105 | 24108 | 24117 | 24120 | 24177
+            | 24180 | 24189 | 24192 | 24213 | 24216 | 24225 | 24228 => &SHAPE163,
             8076..=8077
             | 8079..=8080
             | 8088..=8089
@@ -7030,361 +7030,361 @@ impl BlockWithShape for BlockState {
             | 8547..=8548
             | 8556..=8557
             | 8559..=8560
-            | 14176..=14177
-            | 14179..=14180
-            | 14188..=14189
-            | 14191..=14192
-            | 14212..=14213
-            | 14215..=14216
-            | 14224..=14225
-            | 14227..=14228
-            | 14284..=14285
-            | 14287..=14288
-            | 14296..=14297
-            | 14299..=14300
+            | 14317..=14318
             | 14320..=14321
-            | 14323..=14324
+            | 14329..=14330
             | 14332..=14333
-            | 14335..=14336
-            | 14500..=14501
-            | 14503..=14504
-            | 14512..=14513
-            | 14515..=14516
-            | 14536..=14537
-            | 14539..=14540
-            | 14548..=14549
-            | 14551..=14552
-            | 14608..=14609
-            | 14611..=14612
-            | 14620..=14621
-            | 14623..=14624
+            | 14353..=14354
+            | 14356..=14357
+            | 14365..=14366
+            | 14368..=14369
+            | 14425..=14426
+            | 14428..=14429
+            | 14437..=14438
+            | 14440..=14441
+            | 14461..=14462
+            | 14464..=14465
+            | 14473..=14474
+            | 14476..=14477
+            | 14641..=14642
             | 14644..=14645
-            | 14647..=14648
+            | 14653..=14654
             | 14656..=14657
-            | 14659..=14660
-            | 14824..=14825
-            | 14827..=14828
-            | 14836..=14837
-            | 14839..=14840
-            | 14860..=14861
-            | 14863..=14864
-            | 14872..=14873
-            | 14875..=14876
-            | 14932..=14933
-            | 14935..=14936
-            | 14944..=14945
-            | 14947..=14948
+            | 14677..=14678
+            | 14680..=14681
+            | 14689..=14690
+            | 14692..=14693
+            | 14749..=14750
+            | 14752..=14753
+            | 14761..=14762
+            | 14764..=14765
+            | 14785..=14786
+            | 14788..=14789
+            | 14797..=14798
+            | 14800..=14801
+            | 14965..=14966
             | 14968..=14969
-            | 14971..=14972
+            | 14977..=14978
             | 14980..=14981
-            | 14983..=14984
-            | 15148..=15149
-            | 15151..=15152
-            | 15160..=15161
-            | 15163..=15164
-            | 15184..=15185
-            | 15187..=15188
-            | 15196..=15197
-            | 15199..=15200
-            | 15256..=15257
-            | 15259..=15260
-            | 15268..=15269
-            | 15271..=15272
+            | 15001..=15002
+            | 15004..=15005
+            | 15013..=15014
+            | 15016..=15017
+            | 15073..=15074
+            | 15076..=15077
+            | 15085..=15086
+            | 15088..=15089
+            | 15109..=15110
+            | 15112..=15113
+            | 15121..=15122
+            | 15124..=15125
+            | 15289..=15290
             | 15292..=15293
-            | 15295..=15296
+            | 15301..=15302
             | 15304..=15305
-            | 15307..=15308
-            | 15472..=15473
-            | 15475..=15476
-            | 15484..=15485
-            | 15487..=15488
-            | 15508..=15509
-            | 15511..=15512
-            | 15520..=15521
-            | 15523..=15524
-            | 15580..=15581
-            | 15583..=15584
-            | 15592..=15593
-            | 15595..=15596
+            | 15325..=15326
+            | 15328..=15329
+            | 15337..=15338
+            | 15340..=15341
+            | 15397..=15398
+            | 15400..=15401
+            | 15409..=15410
+            | 15412..=15413
+            | 15433..=15434
+            | 15436..=15437
+            | 15445..=15446
+            | 15448..=15449
+            | 15613..=15614
             | 15616..=15617
-            | 15619..=15620
+            | 15625..=15626
             | 15628..=15629
-            | 15631..=15632
-            | 15796..=15797
-            | 15799..=15800
-            | 15808..=15809
-            | 15811..=15812
-            | 15832..=15833
-            | 15835..=15836
-            | 15844..=15845
-            | 15847..=15848
-            | 15904..=15905
-            | 15907..=15908
-            | 15916..=15917
-            | 15919..=15920
+            | 15649..=15650
+            | 15652..=15653
+            | 15661..=15662
+            | 15664..=15665
+            | 15721..=15722
+            | 15724..=15725
+            | 15733..=15734
+            | 15736..=15737
+            | 15757..=15758
+            | 15760..=15761
+            | 15769..=15770
+            | 15772..=15773
+            | 15937..=15938
             | 15940..=15941
-            | 15943..=15944
+            | 15949..=15950
             | 15952..=15953
-            | 15955..=15956
-            | 16120..=16121
-            | 16123..=16124
-            | 16132..=16133
-            | 16135..=16136
-            | 16156..=16157
-            | 16159..=16160
-            | 16168..=16169
-            | 16171..=16172
-            | 16228..=16229
-            | 16231..=16232
-            | 16240..=16241
-            | 16243..=16244
+            | 15973..=15974
+            | 15976..=15977
+            | 15985..=15986
+            | 15988..=15989
+            | 16045..=16046
+            | 16048..=16049
+            | 16057..=16058
+            | 16060..=16061
+            | 16081..=16082
+            | 16084..=16085
+            | 16093..=16094
+            | 16096..=16097
+            | 16261..=16262
             | 16264..=16265
-            | 16267..=16268
+            | 16273..=16274
             | 16276..=16277
-            | 16279..=16280
-            | 16444..=16445
-            | 16447..=16448
-            | 16456..=16457
-            | 16459..=16460
-            | 16480..=16481
-            | 16483..=16484
-            | 16492..=16493
-            | 16495..=16496
-            | 16552..=16553
-            | 16555..=16556
-            | 16564..=16565
-            | 16567..=16568
+            | 16297..=16298
+            | 16300..=16301
+            | 16309..=16310
+            | 16312..=16313
+            | 16369..=16370
+            | 16372..=16373
+            | 16381..=16382
+            | 16384..=16385
+            | 16405..=16406
+            | 16408..=16409
+            | 16417..=16418
+            | 16420..=16421
+            | 16585..=16586
             | 16588..=16589
-            | 16591..=16592
+            | 16597..=16598
             | 16600..=16601
-            | 16603..=16604
-            | 16768..=16769
-            | 16771..=16772
-            | 16780..=16781
-            | 16783..=16784
-            | 16804..=16805
-            | 16807..=16808
-            | 16816..=16817
-            | 16819..=16820
-            | 16876..=16877
-            | 16879..=16880
-            | 16888..=16889
-            | 16891..=16892
+            | 16621..=16622
+            | 16624..=16625
+            | 16633..=16634
+            | 16636..=16637
+            | 16693..=16694
+            | 16696..=16697
+            | 16705..=16706
+            | 16708..=16709
+            | 16729..=16730
+            | 16732..=16733
+            | 16741..=16742
+            | 16744..=16745
+            | 16909..=16910
             | 16912..=16913
-            | 16915..=16916
+            | 16921..=16922
             | 16924..=16925
-            | 16927..=16928
-            | 17092..=17093
-            | 17095..=17096
-            | 17104..=17105
-            | 17107..=17108
-            | 17128..=17129
-            | 17131..=17132
-            | 17140..=17141
-            | 17143..=17144
-            | 17200..=17201
-            | 17203..=17204
-            | 17212..=17213
-            | 17215..=17216
+            | 16945..=16946
+            | 16948..=16949
+            | 16957..=16958
+            | 16960..=16961
+            | 17017..=17018
+            | 17020..=17021
+            | 17029..=17030
+            | 17032..=17033
+            | 17053..=17054
+            | 17056..=17057
+            | 17065..=17066
+            | 17068..=17069
+            | 17233..=17234
             | 17236..=17237
-            | 17239..=17240
+            | 17245..=17246
             | 17248..=17249
-            | 17251..=17252
-            | 17416..=17417
-            | 17419..=17420
-            | 17428..=17429
-            | 17431..=17432
-            | 17452..=17453
-            | 17455..=17456
-            | 17464..=17465
-            | 17467..=17468
-            | 17524..=17525
-            | 17527..=17528
-            | 17536..=17537
-            | 17539..=17540
+            | 17269..=17270
+            | 17272..=17273
+            | 17281..=17282
+            | 17284..=17285
+            | 17341..=17342
+            | 17344..=17345
+            | 17353..=17354
+            | 17356..=17357
+            | 17377..=17378
+            | 17380..=17381
+            | 17389..=17390
+            | 17392..=17393
+            | 17557..=17558
             | 17560..=17561
-            | 17563..=17564
+            | 17569..=17570
             | 17572..=17573
-            | 17575..=17576
-            | 17740..=17741
-            | 17743..=17744
-            | 17752..=17753
-            | 17755..=17756
-            | 17776..=17777
-            | 17779..=17780
-            | 17788..=17789
-            | 17791..=17792
-            | 17848..=17849
-            | 17851..=17852
-            | 17860..=17861
-            | 17863..=17864
+            | 17593..=17594
+            | 17596..=17597
+            | 17605..=17606
+            | 17608..=17609
+            | 17665..=17666
+            | 17668..=17669
+            | 17677..=17678
+            | 17680..=17681
+            | 17701..=17702
+            | 17704..=17705
+            | 17713..=17714
+            | 17716..=17717
+            | 17881..=17882
             | 17884..=17885
-            | 17887..=17888
+            | 17893..=17894
             | 17896..=17897
-            | 17899..=17900
-            | 18064..=18065
-            | 18067..=18068
-            | 18076..=18077
-            | 18079..=18080
-            | 18100..=18101
-            | 18103..=18104
-            | 18112..=18113
-            | 18115..=18116
-            | 18172..=18173
-            | 18175..=18176
-            | 18184..=18185
-            | 18187..=18188
+            | 17917..=17918
+            | 17920..=17921
+            | 17929..=17930
+            | 17932..=17933
+            | 17989..=17990
+            | 17992..=17993
+            | 18001..=18002
+            | 18004..=18005
+            | 18025..=18026
+            | 18028..=18029
+            | 18037..=18038
+            | 18040..=18041
+            | 18205..=18206
             | 18208..=18209
-            | 18211..=18212
+            | 18217..=18218
             | 18220..=18221
-            | 18223..=18224
-            | 19557..=19558
-            | 19560..=19561
-            | 19569..=19570
-            | 19572..=19573
-            | 19593..=19594
-            | 19596..=19597
-            | 19605..=19606
-            | 19608..=19609
-            | 19665..=19666
-            | 19668..=19669
-            | 19677..=19678
-            | 19680..=19681
+            | 18241..=18242
+            | 18244..=18245
+            | 18253..=18254
+            | 18256..=18257
+            | 18313..=18314
+            | 18316..=18317
+            | 18325..=18326
+            | 18328..=18329
+            | 18349..=18350
+            | 18352..=18353
+            | 18361..=18362
+            | 18364..=18365
+            | 19698..=19699
             | 19701..=19702
-            | 19704..=19705
+            | 19710..=19711
             | 19713..=19714
-            | 19716..=19717
-            | 19977..=19978
-            | 19980..=19981
-            | 19989..=19990
-            | 19992..=19993
-            | 20013..=20014
-            | 20016..=20017
-            | 20025..=20026
-            | 20028..=20029
-            | 20085..=20086
-            | 20088..=20089
-            | 20097..=20098
-            | 20100..=20101
+            | 19734..=19735
+            | 19737..=19738
+            | 19746..=19747
+            | 19749..=19750
+            | 19806..=19807
+            | 19809..=19810
+            | 19818..=19819
+            | 19821..=19822
+            | 19842..=19843
+            | 19845..=19846
+            | 19854..=19855
+            | 19857..=19858
+            | 20118..=20119
             | 20121..=20122
-            | 20124..=20125
+            | 20130..=20131
             | 20133..=20134
-            | 20136..=20137
-            | 20414..=20415
-            | 20417..=20418
-            | 20426..=20427
-            | 20429..=20430
-            | 20450..=20451
-            | 20453..=20454
-            | 20462..=20463
-            | 20465..=20466
-            | 20522..=20523
-            | 20525..=20526
-            | 20534..=20535
-            | 20537..=20538
+            | 20154..=20155
+            | 20157..=20158
+            | 20166..=20167
+            | 20169..=20170
+            | 20226..=20227
+            | 20229..=20230
+            | 20238..=20239
+            | 20241..=20242
+            | 20262..=20263
+            | 20265..=20266
+            | 20274..=20275
+            | 20277..=20278
+            | 20555..=20556
             | 20558..=20559
-            | 20561..=20562
+            | 20567..=20568
             | 20570..=20571
-            | 20573..=20574
-            | 22696..=22697
-            | 22699..=22700
-            | 22708..=22709
-            | 22711..=22712
-            | 22732..=22733
-            | 22735..=22736
-            | 22744..=22745
-            | 22747..=22748
-            | 22804..=22805
-            | 22807..=22808
-            | 22816..=22817
-            | 22819..=22820
+            | 20591..=20592
+            | 20594..=20595
+            | 20603..=20604
+            | 20606..=20607
+            | 20663..=20664
+            | 20666..=20667
+            | 20675..=20676
+            | 20678..=20679
+            | 20699..=20700
+            | 20702..=20703
+            | 20711..=20712
+            | 20714..=20715
+            | 22837..=22838
             | 22840..=22841
-            | 22843..=22844
+            | 22849..=22850
             | 22852..=22853
-            | 22855..=22856
-            | 23107..=23108
-            | 23110..=23111
-            | 23119..=23120
-            | 23122..=23123
-            | 23143..=23144
-            | 23146..=23147
-            | 23155..=23156
-            | 23158..=23159
-            | 23215..=23216
-            | 23218..=23219
-            | 23227..=23228
-            | 23230..=23231
+            | 22873..=22874
+            | 22876..=22877
+            | 22885..=22886
+            | 22888..=22889
+            | 22945..=22946
+            | 22948..=22949
+            | 22957..=22958
+            | 22960..=22961
+            | 22981..=22982
+            | 22984..=22985
+            | 22993..=22994
+            | 22996..=22997
+            | 23248..=23249
             | 23251..=23252
-            | 23254..=23255
+            | 23260..=23261
             | 23263..=23264
-            | 23266..=23267
-            | 23518..=23519
-            | 23521..=23522
-            | 23530..=23531
-            | 23533..=23534
-            | 23554..=23555
-            | 23557..=23558
-            | 23566..=23567
-            | 23569..=23570
-            | 23626..=23627
-            | 23629..=23630
-            | 23638..=23639
-            | 23641..=23642
+            | 23284..=23285
+            | 23287..=23288
+            | 23296..=23297
+            | 23299..=23300
+            | 23356..=23357
+            | 23359..=23360
+            | 23368..=23369
+            | 23371..=23372
+            | 23392..=23393
+            | 23395..=23396
+            | 23404..=23405
+            | 23407..=23408
+            | 23659..=23660
             | 23662..=23663
-            | 23665..=23666
+            | 23671..=23672
             | 23674..=23675
-            | 23677..=23678
-            | 23929..=23930
-            | 23932..=23933
-            | 23941..=23942
-            | 23944..=23945
-            | 23965..=23966
-            | 23968..=23969
-            | 23977..=23978
-            | 23980..=23981
-            | 24037..=24038
-            | 24040..=24041
-            | 24049..=24050
-            | 24052..=24053
+            | 23695..=23696
+            | 23698..=23699
+            | 23707..=23708
+            | 23710..=23711
+            | 23767..=23768
+            | 23770..=23771
+            | 23779..=23780
+            | 23782..=23783
+            | 23803..=23804
+            | 23806..=23807
+            | 23815..=23816
+            | 23818..=23819
+            | 24070..=24071
             | 24073..=24074
-            | 24076..=24077
+            | 24082..=24083
             | 24085..=24086
-            | 24088..=24089 => &SHAPE164,
+            | 24106..=24107
+            | 24109..=24110
+            | 24118..=24119
+            | 24121..=24122
+            | 24178..=24179
+            | 24181..=24182
+            | 24190..=24191
+            | 24193..=24194
+            | 24214..=24215
+            | 24217..=24218
+            | 24226..=24227
+            | 24229..=24230 => &SHAPE164,
             8081 | 8084 | 8093 | 8096 | 8117 | 8120 | 8129 | 8132 | 8189 | 8192 | 8201 | 8204
             | 8225 | 8228 | 8237 | 8240 | 8405 | 8408 | 8417 | 8420 | 8441 | 8444 | 8453 | 8456
-            | 8513 | 8516 | 8525 | 8528 | 8549 | 8552 | 8561 | 8564 | 14181 | 14184 | 14193
-            | 14196 | 14217 | 14220 | 14229 | 14232 | 14289 | 14292 | 14301 | 14304 | 14325
-            | 14328 | 14337 | 14340 | 14505 | 14508 | 14517 | 14520 | 14541 | 14544 | 14553
-            | 14556 | 14613 | 14616 | 14625 | 14628 | 14649 | 14652 | 14661 | 14664 | 14829
-            | 14832 | 14841 | 14844 | 14865 | 14868 | 14877 | 14880 | 14937 | 14940 | 14949
-            | 14952 | 14973 | 14976 | 14985 | 14988 | 15153 | 15156 | 15165 | 15168 | 15189
-            | 15192 | 15201 | 15204 | 15261 | 15264 | 15273 | 15276 | 15297 | 15300 | 15309
-            | 15312 | 15477 | 15480 | 15489 | 15492 | 15513 | 15516 | 15525 | 15528 | 15585
-            | 15588 | 15597 | 15600 | 15621 | 15624 | 15633 | 15636 | 15801 | 15804 | 15813
-            | 15816 | 15837 | 15840 | 15849 | 15852 | 15909 | 15912 | 15921 | 15924 | 15945
-            | 15948 | 15957 | 15960 | 16125 | 16128 | 16137 | 16140 | 16161 | 16164 | 16173
-            | 16176 | 16233 | 16236 | 16245 | 16248 | 16269 | 16272 | 16281 | 16284 | 16449
-            | 16452 | 16461 | 16464 | 16485 | 16488 | 16497 | 16500 | 16557 | 16560 | 16569
-            | 16572 | 16593 | 16596 | 16605 | 16608 | 16773 | 16776 | 16785 | 16788 | 16809
-            | 16812 | 16821 | 16824 | 16881 | 16884 | 16893 | 16896 | 16917 | 16920 | 16929
-            | 16932 | 17097 | 17100 | 17109 | 17112 | 17133 | 17136 | 17145 | 17148 | 17205
-            | 17208 | 17217 | 17220 | 17241 | 17244 | 17253 | 17256 | 17421 | 17424 | 17433
-            | 17436 | 17457 | 17460 | 17469 | 17472 | 17529 | 17532 | 17541 | 17544 | 17565
-            | 17568 | 17577 | 17580 | 17745 | 17748 | 17757 | 17760 | 17781 | 17784 | 17793
-            | 17796 | 17853 | 17856 | 17865 | 17868 | 17889 | 17892 | 17901 | 17904 | 18069
-            | 18072 | 18081 | 18084 | 18105 | 18108 | 18117 | 18120 | 18177 | 18180 | 18189
-            | 18192 | 18213 | 18216 | 18225 | 18228 | 19562 | 19565 | 19574 | 19577 | 19598
-            | 19601 | 19610 | 19613 | 19670 | 19673 | 19682 | 19685 | 19706 | 19709 | 19718
-            | 19721 | 19982 | 19985 | 19994 | 19997 | 20018 | 20021 | 20030 | 20033 | 20090
-            | 20093 | 20102 | 20105 | 20126 | 20129 | 20138 | 20141 | 20419 | 20422 | 20431
-            | 20434 | 20455 | 20458 | 20467 | 20470 | 20527 | 20530 | 20539 | 20542 | 20563
-            | 20566 | 20575 | 20578 | 22701 | 22704 | 22713 | 22716 | 22737 | 22740 | 22749
-            | 22752 | 22809 | 22812 | 22821 | 22824 | 22845 | 22848 | 22857 | 22860 | 23112
-            | 23115 | 23124 | 23127 | 23148 | 23151 | 23160 | 23163 | 23220 | 23223 | 23232
-            | 23235 | 23256 | 23259 | 23268 | 23271 | 23523 | 23526 | 23535 | 23538 | 23559
-            | 23562 | 23571 | 23574 | 23631 | 23634 | 23643 | 23646 | 23667 | 23670 | 23679
-            | 23682 | 23934 | 23937 | 23946 | 23949 | 23970 | 23973 | 23982 | 23985 | 24042
-            | 24045 | 24054 | 24057 | 24078 | 24081 | 24090 | 24093 => &SHAPE165,
+            | 8513 | 8516 | 8525 | 8528 | 8549 | 8552 | 8561 | 8564 | 14322 | 14325 | 14334
+            | 14337 | 14358 | 14361 | 14370 | 14373 | 14430 | 14433 | 14442 | 14445 | 14466
+            | 14469 | 14478 | 14481 | 14646 | 14649 | 14658 | 14661 | 14682 | 14685 | 14694
+            | 14697 | 14754 | 14757 | 14766 | 14769 | 14790 | 14793 | 14802 | 14805 | 14970
+            | 14973 | 14982 | 14985 | 15006 | 15009 | 15018 | 15021 | 15078 | 15081 | 15090
+            | 15093 | 15114 | 15117 | 15126 | 15129 | 15294 | 15297 | 15306 | 15309 | 15330
+            | 15333 | 15342 | 15345 | 15402 | 15405 | 15414 | 15417 | 15438 | 15441 | 15450
+            | 15453 | 15618 | 15621 | 15630 | 15633 | 15654 | 15657 | 15666 | 15669 | 15726
+            | 15729 | 15738 | 15741 | 15762 | 15765 | 15774 | 15777 | 15942 | 15945 | 15954
+            | 15957 | 15978 | 15981 | 15990 | 15993 | 16050 | 16053 | 16062 | 16065 | 16086
+            | 16089 | 16098 | 16101 | 16266 | 16269 | 16278 | 16281 | 16302 | 16305 | 16314
+            | 16317 | 16374 | 16377 | 16386 | 16389 | 16410 | 16413 | 16422 | 16425 | 16590
+            | 16593 | 16602 | 16605 | 16626 | 16629 | 16638 | 16641 | 16698 | 16701 | 16710
+            | 16713 | 16734 | 16737 | 16746 | 16749 | 16914 | 16917 | 16926 | 16929 | 16950
+            | 16953 | 16962 | 16965 | 17022 | 17025 | 17034 | 17037 | 17058 | 17061 | 17070
+            | 17073 | 17238 | 17241 | 17250 | 17253 | 17274 | 17277 | 17286 | 17289 | 17346
+            | 17349 | 17358 | 17361 | 17382 | 17385 | 17394 | 17397 | 17562 | 17565 | 17574
+            | 17577 | 17598 | 17601 | 17610 | 17613 | 17670 | 17673 | 17682 | 17685 | 17706
+            | 17709 | 17718 | 17721 | 17886 | 17889 | 17898 | 17901 | 17922 | 17925 | 17934
+            | 17937 | 17994 | 17997 | 18006 | 18009 | 18030 | 18033 | 18042 | 18045 | 18210
+            | 18213 | 18222 | 18225 | 18246 | 18249 | 18258 | 18261 | 18318 | 18321 | 18330
+            | 18333 | 18354 | 18357 | 18366 | 18369 | 19703 | 19706 | 19715 | 19718 | 19739
+            | 19742 | 19751 | 19754 | 19811 | 19814 | 19823 | 19826 | 19847 | 19850 | 19859
+            | 19862 | 20123 | 20126 | 20135 | 20138 | 20159 | 20162 | 20171 | 20174 | 20231
+            | 20234 | 20243 | 20246 | 20267 | 20270 | 20279 | 20282 | 20560 | 20563 | 20572
+            | 20575 | 20596 | 20599 | 20608 | 20611 | 20668 | 20671 | 20680 | 20683 | 20704
+            | 20707 | 20716 | 20719 | 22842 | 22845 | 22854 | 22857 | 22878 | 22881 | 22890
+            | 22893 | 22950 | 22953 | 22962 | 22965 | 22986 | 22989 | 22998 | 23001 | 23253
+            | 23256 | 23265 | 23268 | 23289 | 23292 | 23301 | 23304 | 23361 | 23364 | 23373
+            | 23376 | 23397 | 23400 | 23409 | 23412 | 23664 | 23667 | 23676 | 23679 | 23700
+            | 23703 | 23712 | 23715 | 23772 | 23775 | 23784 | 23787 | 23808 | 23811 | 23820
+            | 23823 | 24075 | 24078 | 24087 | 24090 | 24111 | 24114 | 24123 | 24126 | 24183
+            | 24186 | 24195 | 24198 | 24219 | 24222 | 24231 | 24234 => &SHAPE165,
             8082..=8083
             | 8085..=8086
             | 8094..=8095
@@ -7417,606 +7417,614 @@ impl BlockWithShape for BlockState {
             | 8553..=8554
             | 8562..=8563
             | 8565..=8566
-            | 14182..=14183
-            | 14185..=14186
-            | 14194..=14195
-            | 14197..=14198
-            | 14218..=14219
-            | 14221..=14222
-            | 14230..=14231
-            | 14233..=14234
-            | 14290..=14291
-            | 14293..=14294
-            | 14302..=14303
-            | 14305..=14306
+            | 14323..=14324
             | 14326..=14327
-            | 14329..=14330
+            | 14335..=14336
             | 14338..=14339
-            | 14341..=14342
-            | 14506..=14507
-            | 14509..=14510
-            | 14518..=14519
-            | 14521..=14522
-            | 14542..=14543
-            | 14545..=14546
-            | 14554..=14555
-            | 14557..=14558
-            | 14614..=14615
-            | 14617..=14618
-            | 14626..=14627
-            | 14629..=14630
+            | 14359..=14360
+            | 14362..=14363
+            | 14371..=14372
+            | 14374..=14375
+            | 14431..=14432
+            | 14434..=14435
+            | 14443..=14444
+            | 14446..=14447
+            | 14467..=14468
+            | 14470..=14471
+            | 14479..=14480
+            | 14482..=14483
+            | 14647..=14648
             | 14650..=14651
-            | 14653..=14654
+            | 14659..=14660
             | 14662..=14663
-            | 14665..=14666
-            | 14830..=14831
-            | 14833..=14834
-            | 14842..=14843
-            | 14845..=14846
-            | 14866..=14867
-            | 14869..=14870
-            | 14878..=14879
-            | 14881..=14882
-            | 14938..=14939
-            | 14941..=14942
-            | 14950..=14951
-            | 14953..=14954
+            | 14683..=14684
+            | 14686..=14687
+            | 14695..=14696
+            | 14698..=14699
+            | 14755..=14756
+            | 14758..=14759
+            | 14767..=14768
+            | 14770..=14771
+            | 14791..=14792
+            | 14794..=14795
+            | 14803..=14804
+            | 14806..=14807
+            | 14971..=14972
             | 14974..=14975
-            | 14977..=14978
+            | 14983..=14984
             | 14986..=14987
-            | 14989..=14990
-            | 15154..=15155
-            | 15157..=15158
-            | 15166..=15167
-            | 15169..=15170
-            | 15190..=15191
-            | 15193..=15194
-            | 15202..=15203
-            | 15205..=15206
-            | 15262..=15263
-            | 15265..=15266
-            | 15274..=15275
-            | 15277..=15278
+            | 15007..=15008
+            | 15010..=15011
+            | 15019..=15020
+            | 15022..=15023
+            | 15079..=15080
+            | 15082..=15083
+            | 15091..=15092
+            | 15094..=15095
+            | 15115..=15116
+            | 15118..=15119
+            | 15127..=15128
+            | 15130..=15131
+            | 15295..=15296
             | 15298..=15299
-            | 15301..=15302
+            | 15307..=15308
             | 15310..=15311
-            | 15313..=15314
-            | 15478..=15479
-            | 15481..=15482
-            | 15490..=15491
-            | 15493..=15494
-            | 15514..=15515
-            | 15517..=15518
-            | 15526..=15527
-            | 15529..=15530
-            | 15586..=15587
-            | 15589..=15590
-            | 15598..=15599
-            | 15601..=15602
+            | 15331..=15332
+            | 15334..=15335
+            | 15343..=15344
+            | 15346..=15347
+            | 15403..=15404
+            | 15406..=15407
+            | 15415..=15416
+            | 15418..=15419
+            | 15439..=15440
+            | 15442..=15443
+            | 15451..=15452
+            | 15454..=15455
+            | 15619..=15620
             | 15622..=15623
-            | 15625..=15626
+            | 15631..=15632
             | 15634..=15635
-            | 15637..=15638
-            | 15802..=15803
-            | 15805..=15806
-            | 15814..=15815
-            | 15817..=15818
-            | 15838..=15839
-            | 15841..=15842
-            | 15850..=15851
-            | 15853..=15854
-            | 15910..=15911
-            | 15913..=15914
-            | 15922..=15923
-            | 15925..=15926
+            | 15655..=15656
+            | 15658..=15659
+            | 15667..=15668
+            | 15670..=15671
+            | 15727..=15728
+            | 15730..=15731
+            | 15739..=15740
+            | 15742..=15743
+            | 15763..=15764
+            | 15766..=15767
+            | 15775..=15776
+            | 15778..=15779
+            | 15943..=15944
             | 15946..=15947
-            | 15949..=15950
+            | 15955..=15956
             | 15958..=15959
-            | 15961..=15962
-            | 16126..=16127
-            | 16129..=16130
-            | 16138..=16139
-            | 16141..=16142
-            | 16162..=16163
-            | 16165..=16166
-            | 16174..=16175
-            | 16177..=16178
-            | 16234..=16235
-            | 16237..=16238
-            | 16246..=16247
-            | 16249..=16250
+            | 15979..=15980
+            | 15982..=15983
+            | 15991..=15992
+            | 15994..=15995
+            | 16051..=16052
+            | 16054..=16055
+            | 16063..=16064
+            | 16066..=16067
+            | 16087..=16088
+            | 16090..=16091
+            | 16099..=16100
+            | 16102..=16103
+            | 16267..=16268
             | 16270..=16271
-            | 16273..=16274
+            | 16279..=16280
             | 16282..=16283
-            | 16285..=16286
-            | 16450..=16451
-            | 16453..=16454
-            | 16462..=16463
-            | 16465..=16466
-            | 16486..=16487
-            | 16489..=16490
-            | 16498..=16499
-            | 16501..=16502
-            | 16558..=16559
-            | 16561..=16562
-            | 16570..=16571
-            | 16573..=16574
+            | 16303..=16304
+            | 16306..=16307
+            | 16315..=16316
+            | 16318..=16319
+            | 16375..=16376
+            | 16378..=16379
+            | 16387..=16388
+            | 16390..=16391
+            | 16411..=16412
+            | 16414..=16415
+            | 16423..=16424
+            | 16426..=16427
+            | 16591..=16592
             | 16594..=16595
-            | 16597..=16598
+            | 16603..=16604
             | 16606..=16607
-            | 16609..=16610
-            | 16774..=16775
-            | 16777..=16778
-            | 16786..=16787
-            | 16789..=16790
-            | 16810..=16811
-            | 16813..=16814
-            | 16822..=16823
-            | 16825..=16826
-            | 16882..=16883
-            | 16885..=16886
-            | 16894..=16895
-            | 16897..=16898
+            | 16627..=16628
+            | 16630..=16631
+            | 16639..=16640
+            | 16642..=16643
+            | 16699..=16700
+            | 16702..=16703
+            | 16711..=16712
+            | 16714..=16715
+            | 16735..=16736
+            | 16738..=16739
+            | 16747..=16748
+            | 16750..=16751
+            | 16915..=16916
             | 16918..=16919
-            | 16921..=16922
-            | 16930..=16931
-            | 16933..=16934
-            | 17098..=17099
-            | 17101..=17102
-            | 17110..=17111
-            | 17113..=17114
-            | 17134..=17135
-            | 17137..=17138
-            | 17146..=17147
-            | 17149..=17150
-            | 17206..=17207
-            | 17209..=17210
-            | 17218..=17219
-            | 17221..=17222
+            | 16927..=16928
+            | 16930..=16931
+            | 16951..=16952
+            | 16954..=16955
+            | 16963..=16964
+            | 16966..=16967
+            | 17023..=17024
+            | 17026..=17027
+            | 17035..=17036
+            | 17038..=17039
+            | 17059..=17060
+            | 17062..=17063
+            | 17071..=17072
+            | 17074..=17075
+            | 17239..=17240
             | 17242..=17243
-            | 17245..=17246
+            | 17251..=17252
             | 17254..=17255
-            | 17257..=17258
-            | 17422..=17423
-            | 17425..=17426
-            | 17434..=17435
-            | 17437..=17438
-            | 17458..=17459
-            | 17461..=17462
-            | 17470..=17471
-            | 17473..=17474
-            | 17530..=17531
-            | 17533..=17534
-            | 17542..=17543
-            | 17545..=17546
+            | 17275..=17276
+            | 17278..=17279
+            | 17287..=17288
+            | 17290..=17291
+            | 17347..=17348
+            | 17350..=17351
+            | 17359..=17360
+            | 17362..=17363
+            | 17383..=17384
+            | 17386..=17387
+            | 17395..=17396
+            | 17398..=17399
+            | 17563..=17564
             | 17566..=17567
-            | 17569..=17570
+            | 17575..=17576
             | 17578..=17579
-            | 17581..=17582
-            | 17746..=17747
-            | 17749..=17750
-            | 17758..=17759
-            | 17761..=17762
-            | 17782..=17783
-            | 17785..=17786
-            | 17794..=17795
-            | 17797..=17798
-            | 17854..=17855
-            | 17857..=17858
-            | 17866..=17867
-            | 17869..=17870
+            | 17599..=17600
+            | 17602..=17603
+            | 17611..=17612
+            | 17614..=17615
+            | 17671..=17672
+            | 17674..=17675
+            | 17683..=17684
+            | 17686..=17687
+            | 17707..=17708
+            | 17710..=17711
+            | 17719..=17720
+            | 17722..=17723
+            | 17887..=17888
             | 17890..=17891
-            | 17893..=17894
+            | 17899..=17900
             | 17902..=17903
-            | 17905..=17906
-            | 18070..=18071
-            | 18073..=18074
-            | 18082..=18083
-            | 18085..=18086
-            | 18106..=18107
-            | 18109..=18110
-            | 18118..=18119
-            | 18121..=18122
-            | 18178..=18179
-            | 18181..=18182
-            | 18190..=18191
-            | 18193..=18194
+            | 17923..=17924
+            | 17926..=17927
+            | 17935..=17936
+            | 17938..=17939
+            | 17995..=17996
+            | 17998..=17999
+            | 18007..=18008
+            | 18010..=18011
+            | 18031..=18032
+            | 18034..=18035
+            | 18043..=18044
+            | 18046..=18047
+            | 18211..=18212
             | 18214..=18215
-            | 18217..=18218
+            | 18223..=18224
             | 18226..=18227
-            | 18229..=18230
-            | 19563..=19564
-            | 19566..=19567
-            | 19575..=19576
-            | 19578..=19579
-            | 19599..=19600
-            | 19602..=19603
-            | 19611..=19612
-            | 19614..=19615
-            | 19671..=19672
-            | 19674..=19675
-            | 19683..=19684
-            | 19686..=19687
+            | 18247..=18248
+            | 18250..=18251
+            | 18259..=18260
+            | 18262..=18263
+            | 18319..=18320
+            | 18322..=18323
+            | 18331..=18332
+            | 18334..=18335
+            | 18355..=18356
+            | 18358..=18359
+            | 18367..=18368
+            | 18370..=18371
+            | 19704..=19705
             | 19707..=19708
-            | 19710..=19711
+            | 19716..=19717
             | 19719..=19720
-            | 19722..=19723
-            | 19983..=19984
-            | 19986..=19987
-            | 19995..=19996
-            | 19998..=19999
-            | 20019..=20020
-            | 20022..=20023
-            | 20031..=20032
-            | 20034..=20035
-            | 20091..=20092
-            | 20094..=20095
-            | 20103..=20104
-            | 20106..=20107
+            | 19740..=19741
+            | 19743..=19744
+            | 19752..=19753
+            | 19755..=19756
+            | 19812..=19813
+            | 19815..=19816
+            | 19824..=19825
+            | 19827..=19828
+            | 19848..=19849
+            | 19851..=19852
+            | 19860..=19861
+            | 19863..=19864
+            | 20124..=20125
             | 20127..=20128
-            | 20130..=20131
+            | 20136..=20137
             | 20139..=20140
-            | 20142..=20143
-            | 20420..=20421
-            | 20423..=20424
-            | 20432..=20433
-            | 20435..=20436
-            | 20456..=20457
-            | 20459..=20460
-            | 20468..=20469
-            | 20471..=20472
-            | 20528..=20529
-            | 20531..=20532
-            | 20540..=20541
-            | 20543..=20544
+            | 20160..=20161
+            | 20163..=20164
+            | 20172..=20173
+            | 20175..=20176
+            | 20232..=20233
+            | 20235..=20236
+            | 20244..=20245
+            | 20247..=20248
+            | 20268..=20269
+            | 20271..=20272
+            | 20280..=20281
+            | 20283..=20284
+            | 20561..=20562
             | 20564..=20565
-            | 20567..=20568
+            | 20573..=20574
             | 20576..=20577
-            | 20579..=20580
-            | 22702..=22703
-            | 22705..=22706
-            | 22714..=22715
-            | 22717..=22718
-            | 22738..=22739
-            | 22741..=22742
-            | 22750..=22751
-            | 22753..=22754
-            | 22810..=22811
-            | 22813..=22814
-            | 22822..=22823
-            | 22825..=22826
+            | 20597..=20598
+            | 20600..=20601
+            | 20609..=20610
+            | 20612..=20613
+            | 20669..=20670
+            | 20672..=20673
+            | 20681..=20682
+            | 20684..=20685
+            | 20705..=20706
+            | 20708..=20709
+            | 20717..=20718
+            | 20720..=20721
+            | 22843..=22844
             | 22846..=22847
-            | 22849..=22850
+            | 22855..=22856
             | 22858..=22859
-            | 22861..=22862
-            | 23113..=23114
-            | 23116..=23117
-            | 23125..=23126
-            | 23128..=23129
-            | 23149..=23150
-            | 23152..=23153
-            | 23161..=23162
-            | 23164..=23165
-            | 23221..=23222
-            | 23224..=23225
-            | 23233..=23234
-            | 23236..=23237
+            | 22879..=22880
+            | 22882..=22883
+            | 22891..=22892
+            | 22894..=22895
+            | 22951..=22952
+            | 22954..=22955
+            | 22963..=22964
+            | 22966..=22967
+            | 22987..=22988
+            | 22990..=22991
+            | 22999..=23000
+            | 23002..=23003
+            | 23254..=23255
             | 23257..=23258
-            | 23260..=23261
+            | 23266..=23267
             | 23269..=23270
-            | 23272..=23273
-            | 23524..=23525
-            | 23527..=23528
-            | 23536..=23537
-            | 23539..=23540
-            | 23560..=23561
-            | 23563..=23564
-            | 23572..=23573
-            | 23575..=23576
-            | 23632..=23633
-            | 23635..=23636
-            | 23644..=23645
-            | 23647..=23648
+            | 23290..=23291
+            | 23293..=23294
+            | 23302..=23303
+            | 23305..=23306
+            | 23362..=23363
+            | 23365..=23366
+            | 23374..=23375
+            | 23377..=23378
+            | 23398..=23399
+            | 23401..=23402
+            | 23410..=23411
+            | 23413..=23414
+            | 23665..=23666
             | 23668..=23669
-            | 23671..=23672
+            | 23677..=23678
             | 23680..=23681
-            | 23683..=23684
-            | 23935..=23936
-            | 23938..=23939
-            | 23947..=23948
-            | 23950..=23951
-            | 23971..=23972
-            | 23974..=23975
-            | 23983..=23984
-            | 23986..=23987
-            | 24043..=24044
-            | 24046..=24047
-            | 24055..=24056
-            | 24058..=24059
+            | 23701..=23702
+            | 23704..=23705
+            | 23713..=23714
+            | 23716..=23717
+            | 23773..=23774
+            | 23776..=23777
+            | 23785..=23786
+            | 23788..=23789
+            | 23809..=23810
+            | 23812..=23813
+            | 23821..=23822
+            | 23824..=23825
+            | 24076..=24077
             | 24079..=24080
-            | 24082..=24083
+            | 24088..=24089
             | 24091..=24092
-            | 24094..=24095 => &SHAPE166,
-            8567..=8594 | 12816 | 19314..=19317 | 24106..=24107 => &SHAPE27,
-            8827..=8842 | 8847..=8862 | 8867..=8882 | 8887..=8902 | 8907..=8922 | 8927..=8942 => {
+            | 24112..=24113
+            | 24115..=24116
+            | 24124..=24125
+            | 24127..=24128
+            | 24184..=24185
+            | 24187..=24188
+            | 24196..=24197
+            | 24199..=24200
+            | 24220..=24221
+            | 24223..=24224
+            | 24232..=24233
+            | 24235..=24236 => &SHAPE166,
+            8567..=8594 | 12957 | 19455..=19458 | 24247..=24248 => &SHAPE27,
+            8827..=8858 | 8867..=8898 | 8907..=8938 | 8947..=8978 | 8987..=9018 | 9027..=9058 => {
                 &SHAPE169
             }
-            8843 | 8863 | 8883 | 8903 | 8923 | 8943 => &SHAPE170,
-            8844 | 8864 | 8884 | 8904 | 8924 | 8944 => &SHAPE171,
-            8845 | 8865 | 8885 | 8905 | 8925 | 8945 => &SHAPE172,
-            8846 | 8866 | 8886 | 8906 | 8926 | 8946 => &SHAPE173,
-            8947..=8962 => &SHAPE174,
-            8963 => &SHAPE175,
-            8964 => &SHAPE176,
-            8965 => &SHAPE177,
-            8966 => &SHAPE178,
-            8967..=8968 | 8971..=8972 | 8975..=8976 => &SHAPE179,
-            8969..=8970 | 8973..=8974 | 8977..=8978 => &SHAPE180,
-            9085 | 9090 => &SHAPE181,
-            9086 | 9091 => &SHAPE182,
-            9087 | 9092 => &SHAPE183,
-            9088 | 9093 => &SHAPE184,
-            9089 | 9094 => &SHAPE185,
-            10565..=10566
-            | 10571..=10572
-            | 10577..=10578
-            | 11021..=11022
-            | 11027..=11028
-            | 11033..=11034
-            | 11039..=11040
-            | 11045..=11046
-            | 11051..=11052
-            | 11057..=11058
-            | 11063..=11064
-            | 11069..=11070
-            | 11075..=11076
-            | 11081..=11082
-            | 11087..=11088
-            | 11093..=11094
-            | 11099..=11100
-            | 11105..=11106
-            | 11111..=11112
-            | 11117..=11118
-            | 11123..=11124
-            | 11129..=11130
-            | 11135..=11136
-            | 11141..=11142
-            | 11147..=11148
-            | 11153..=11154
-            | 11159..=11160
-            | 13941..=13942
-            | 13947..=13948
-            | 13953..=13954
-            | 13959..=13960
-            | 13965..=13966
-            | 13971..=13972
-            | 13977..=13978
-            | 13983..=13984
-            | 13989..=13990
-            | 13995..=13996
-            | 14001..=14002
-            | 14007..=14008
-            | 14013..=14014
-            | 18527..=18528
-            | 18533..=18534
-            | 19724..=19725
-            | 19734..=19735
-            | 20225..=20226
-            | 21893..=21894
-            | 21899..=21900
-            | 21905..=21906
-            | 21911..=21912
-            | 22245..=22246
-            | 22251..=22252
-            | 22257..=22258
-            | 22263..=22264
-            | 22533..=22534
-            | 22944..=22945
-            | 23355..=23356
-            | 23766..=23767 => &SHAPE186,
-            10587..=10602 | 22371 => &SHAPE28,
-            12193 | 12195 | 22269..=22272 | 22277..=22280 => &SHAPE187,
-            12194 | 12196 | 22273..=22276 | 22281..=22284 => &SHAPE188,
-            12197..=12198 | 22285..=22292 => &SHAPE90,
-            12199 => &SHAPE189,
-            12200 => &SHAPE190,
-            12201 => &SHAPE191,
-            12202 => &SHAPE192,
-            12203 => &SHAPE193,
-            12204 => &SHAPE194,
-            12205 => &SHAPE195,
-            12206 => &SHAPE196,
-            12207 => &SHAPE197,
-            12208 => &SHAPE198,
-            12209 => &SHAPE199,
-            12210 => &SHAPE200,
-            12211 => &SHAPE201,
-            12212 => &SHAPE202,
-            12213 => &SHAPE203,
-            12214 => &SHAPE204,
-            12215 => &SHAPE205,
-            12216 => &SHAPE206,
-            12217 => &SHAPE207,
-            12218 => &SHAPE208,
-            12219 => &SHAPE209,
-            12220 => &SHAPE210,
-            12221 => &SHAPE211,
-            12222 => &SHAPE212,
-            12223 => &SHAPE213,
-            12224 => &SHAPE214,
-            12225 => &SHAPE215,
-            12226 => &SHAPE216,
-            12227 => &SHAPE217,
-            12228 | 22305..=22308 => &SHAPE68,
-            12229 => &SHAPE218,
-            12230 => &SHAPE219,
-            12231 => &SHAPE220,
-            12232 => &SHAPE221,
-            12233 => &SHAPE222,
-            12234 => &SHAPE223,
-            12235 => &SHAPE224,
-            12236 => &SHAPE225,
-            12237 => &SHAPE226,
-            12238 => &SHAPE227,
-            12239 => &SHAPE228,
-            12240 => &SHAPE229,
-            12241 => &SHAPE230,
-            12242 => &SHAPE231,
-            12243 => &SHAPE232,
-            12244 => &SHAPE233,
-            12245 => &SHAPE234,
-            12246 => &SHAPE235,
-            12247 => &SHAPE236,
-            12248 => &SHAPE237,
-            12249 => &SHAPE238,
-            12250 => &SHAPE239,
-            12251 => &SHAPE240,
-            12252 => &SHAPE241,
-            12253 => &SHAPE242,
-            12254 => &SHAPE243,
-            12255 => &SHAPE244,
-            12256 => &SHAPE245,
-            12257 => &SHAPE246,
-            12258 => &SHAPE247,
-            12259 => &SHAPE248,
-            12260 => &SHAPE249,
-            12261 => &SHAPE250,
-            12262 => &SHAPE251,
-            12356..=12357 => &SHAPE252,
-            12359 | 12361 | 12363 | 12365 => &SHAPE253,
-            12647..=12649 => &SHAPE255,
-            12650..=12658 => &SHAPE256,
-            12659..=12661 => &SHAPE257,
-            12792..=12793 => &SHAPE258,
-            12794..=12795 => &SHAPE259,
-            12796..=12797 => &SHAPE260,
-            12798..=12799 => &SHAPE261,
-            12801..=12802 => &SHAPE254,
-            18231..=18262 => &SHAPE263,
-            18297..=18298 => &SHAPE264,
-            18299..=18300 => &SHAPE265,
-            18301 => &SHAPE266,
-            18302 => &SHAPE267,
-            18303 => &SHAPE268,
-            18304 => &SHAPE269,
-            18305..=18306 => &SHAPE270,
-            18307..=18308 => &SHAPE271,
-            18309..=18324 => &SHAPE272,
-            18326..=18329 => &SHAPE168,
-            18330..=18333 => &SHAPE273,
-            18334..=18337 => &SHAPE274,
-            18338..=18345 => &SHAPE275,
-            18346..=18347 => &SHAPE276,
-            18348..=18349 => &SHAPE277,
-            18350..=18351 => &SHAPE278,
-            18352..=18353 => &SHAPE279,
-            18354..=18357 => &SHAPE280,
-            18358..=18361 => &SHAPE281,
-            18362..=18363 | 18366..=18367 => &SHAPE282,
-            18364..=18365 | 18368..=18369 => &SHAPE283,
-            18370..=18433 => &SHAPE167,
-            19231..=19239 => &SHAPE284,
-            20584..=20587
-            | 20600..=20603
-            | 20616..=20619
-            | 20632..=20635
-            | 20648..=20651
-            | 20664..=20667
-            | 20680..=20683
-            | 20696..=20699
-            | 20712..=20715
-            | 20728..=20731
-            | 20744..=20747
-            | 20760..=20763
-            | 20776..=20779
-            | 20792..=20795
-            | 20808..=20811
-            | 20824..=20827
-            | 20840..=20843 => &SHAPE118,
-            20588..=20591
-            | 20604..=20607
-            | 20620..=20623
-            | 20636..=20639
-            | 20652..=20655
-            | 20668..=20671
-            | 20684..=20687
-            | 20700..=20703
-            | 20716..=20719
-            | 20732..=20735
-            | 20748..=20751
-            | 20764..=20767
-            | 20780..=20783
-            | 20796..=20799
-            | 20812..=20815
-            | 20828..=20831
-            | 20844..=20847 => &SHAPE285,
-            20592..=20595
-            | 20608..=20611
-            | 20624..=20627
-            | 20640..=20643
-            | 20656..=20659
-            | 20672..=20675
-            | 20688..=20691
-            | 20704..=20707
-            | 20720..=20723
-            | 20736..=20739
-            | 20752..=20755
-            | 20768..=20771
-            | 20784..=20787
-            | 20800..=20803
-            | 20816..=20819
-            | 20832..=20835
-            | 20848..=20851 => &SHAPE286,
-            20596..=20599
-            | 20612..=20615
-            | 20628..=20631
-            | 20644..=20647
-            | 20660..=20663
-            | 20676..=20679
-            | 20692..=20695
-            | 20708..=20711
-            | 20724..=20727
-            | 20740..=20743
-            | 20756..=20759
-            | 20772..=20775
-            | 20788..=20791
-            | 20804..=20807
-            | 20820..=20823
-            | 20836..=20839
-            | 20852..=20855 => &SHAPE287,
-            20856..=20889 => &SHAPE288,
-            20892..=20893 => &SHAPE289,
-            20894..=20895 => &SHAPE290,
-            20896..=20897 => &SHAPE291,
-            20898..=20899 => &SHAPE292,
-            20900..=20901 => &SHAPE293,
-            20902..=20903 => &SHAPE294,
-            20904..=20905 => &SHAPE295,
-            20906..=20907 => &SHAPE296,
-            20908..=20909 => &SHAPE297,
-            20910..=20911 => &SHAPE298,
-            20912..=20913 => &SHAPE299,
-            20914..=20915 => &SHAPE300,
-            20916..=20917 => &SHAPE301,
-            20918..=20919 => &SHAPE302,
-            20920..=20921 => &SHAPE303,
-            20922..=20923 => &SHAPE304,
-            20924..=20925 => &SHAPE305,
-            20926..=20927 => &SHAPE306,
-            20928..=20929 => &SHAPE307,
-            20930..=20931 => &SHAPE308,
-            20932..=20933 => &SHAPE309,
-            20934..=20935 => &SHAPE310,
-            20936..=20937 => &SHAPE311,
-            20938..=20939 => &SHAPE312,
-            22293..=22296 => &SHAPE262,
-            22297..=22298 => &SHAPE313,
-            22299..=22300 => &SHAPE314,
-            22301..=22304 => &SHAPE63,
-            22309..=22312 => &SHAPE73,
-            22369..=22370 => &SHAPE315,
-            22389..=22392 | 22397..=22400 | 22405..=22408 | 22413..=22416 => &SHAPE316,
-            22393..=22394 | 22401..=22402 | 22409..=22410 | 22417..=22418 => &SHAPE317,
+            8859..=8860 | 8899..=8900 | 8939..=8940 | 8979..=8980 | 9019..=9020 | 9059..=9060 => {
+                &SHAPE170
+            }
+            8861..=8862 | 8901..=8902 | 8941..=8942 | 8981..=8982 | 9021..=9022 | 9061..=9062 => {
+                &SHAPE171
+            }
+            8863..=8864 | 8903..=8904 | 8943..=8944 | 8983..=8984 | 9023..=9024 | 9063..=9064 => {
+                &SHAPE172
+            }
+            8865..=8866 | 8905..=8906 | 8945..=8946 | 8985..=8986 | 9025..=9026 | 9065..=9066 => {
+                &SHAPE173
+            }
+            9067..=9098 => &SHAPE174,
+            9099..=9100 => &SHAPE175,
+            9101..=9102 => &SHAPE176,
+            9103..=9104 => &SHAPE177,
+            9105..=9106 => &SHAPE178,
+            9107..=9108 | 9111..=9112 | 9115..=9116 => &SHAPE179,
+            9109..=9110 | 9113..=9114 | 9117..=9118 => &SHAPE180,
+            9225 | 9230 => &SHAPE181,
+            9226 | 9231 => &SHAPE182,
+            9227 | 9232 => &SHAPE183,
+            9228 | 9233 => &SHAPE184,
+            9229 | 9234 => &SHAPE185,
+            10706..=10707
+            | 10712..=10713
+            | 10718..=10719
+            | 11162..=11163
+            | 11168..=11169
+            | 11174..=11175
+            | 11180..=11181
+            | 11186..=11187
+            | 11192..=11193
+            | 11198..=11199
+            | 11204..=11205
+            | 11210..=11211
+            | 11216..=11217
+            | 11222..=11223
+            | 11228..=11229
+            | 11234..=11235
+            | 11240..=11241
+            | 11246..=11247
+            | 11252..=11253
+            | 11258..=11259
+            | 11264..=11265
+            | 11270..=11271
+            | 11276..=11277
+            | 11282..=11283
+            | 11288..=11289
+            | 11294..=11295
+            | 11300..=11301
+            | 14082..=14083
+            | 14088..=14089
+            | 14094..=14095
+            | 14100..=14101
+            | 14106..=14107
+            | 14112..=14113
+            | 14118..=14119
+            | 14124..=14125
+            | 14130..=14131
+            | 14136..=14137
+            | 14142..=14143
+            | 14148..=14149
+            | 14154..=14155
+            | 18668..=18669
+            | 18674..=18675
+            | 19865..=19866
+            | 19875..=19876
+            | 20366..=20367
+            | 22034..=22035
+            | 22040..=22041
+            | 22046..=22047
+            | 22052..=22053
+            | 22386..=22387
+            | 22392..=22393
+            | 22398..=22399
+            | 22404..=22405
+            | 22674..=22675
+            | 23085..=23086
+            | 23496..=23497
+            | 23907..=23908 => &SHAPE186,
+            10728..=10743 | 22512 => &SHAPE28,
+            12334 | 12336 | 22410..=22413 | 22418..=22421 => &SHAPE187,
+            12335 | 12337 | 22414..=22417 | 22422..=22425 => &SHAPE188,
+            12338..=12339 | 22426..=22433 => &SHAPE90,
+            12340 => &SHAPE189,
+            12341 => &SHAPE190,
+            12342 => &SHAPE191,
+            12343 => &SHAPE192,
+            12344 => &SHAPE193,
+            12345 => &SHAPE194,
+            12346 => &SHAPE195,
+            12347 => &SHAPE196,
+            12348 => &SHAPE197,
+            12349 => &SHAPE198,
+            12350 => &SHAPE199,
+            12351 => &SHAPE200,
+            12352 => &SHAPE201,
+            12353 => &SHAPE202,
+            12354 => &SHAPE203,
+            12355 => &SHAPE204,
+            12356 => &SHAPE205,
+            12357 => &SHAPE206,
+            12358 => &SHAPE207,
+            12359 => &SHAPE208,
+            12360 => &SHAPE209,
+            12361 => &SHAPE210,
+            12362 => &SHAPE211,
+            12363 => &SHAPE212,
+            12364 => &SHAPE213,
+            12365 => &SHAPE214,
+            12366 => &SHAPE215,
+            12367 => &SHAPE216,
+            12368 => &SHAPE217,
+            12369 | 22446..=22449 => &SHAPE68,
+            12370 => &SHAPE218,
+            12371 => &SHAPE219,
+            12372 => &SHAPE220,
+            12373 => &SHAPE221,
+            12374 => &SHAPE222,
+            12375 => &SHAPE223,
+            12376 => &SHAPE224,
+            12377 => &SHAPE225,
+            12378 => &SHAPE226,
+            12379 => &SHAPE227,
+            12380 => &SHAPE228,
+            12381 => &SHAPE229,
+            12382 => &SHAPE230,
+            12383 => &SHAPE231,
+            12384 => &SHAPE232,
+            12385 => &SHAPE233,
+            12386 => &SHAPE234,
+            12387 => &SHAPE235,
+            12388 => &SHAPE236,
+            12389 => &SHAPE237,
+            12390 => &SHAPE238,
+            12391 => &SHAPE239,
+            12392 => &SHAPE240,
+            12393 => &SHAPE241,
+            12394 => &SHAPE242,
+            12395 => &SHAPE243,
+            12396 => &SHAPE244,
+            12397 => &SHAPE245,
+            12398 => &SHAPE246,
+            12399 => &SHAPE247,
+            12400 => &SHAPE248,
+            12401 => &SHAPE249,
+            12402 => &SHAPE250,
+            12403 => &SHAPE251,
+            12497..=12498 => &SHAPE252,
+            12500 | 12502 | 12504 | 12506 => &SHAPE253,
+            12788..=12790 => &SHAPE255,
+            12791..=12799 => &SHAPE256,
+            12800..=12802 => &SHAPE257,
+            12933..=12934 => &SHAPE258,
+            12935..=12936 => &SHAPE259,
+            12937..=12938 => &SHAPE260,
+            12939..=12940 => &SHAPE261,
+            12942..=12943 => &SHAPE254,
+            18372..=18403 => &SHAPE263,
+            18438..=18439 => &SHAPE264,
+            18440..=18441 => &SHAPE265,
+            18442 => &SHAPE266,
+            18443 => &SHAPE267,
+            18444 => &SHAPE268,
+            18445 => &SHAPE269,
+            18446..=18447 => &SHAPE270,
+            18448..=18449 => &SHAPE271,
+            18450..=18465 => &SHAPE272,
+            18467..=18470 => &SHAPE168,
+            18471..=18474 => &SHAPE273,
+            18475..=18478 => &SHAPE274,
+            18479..=18486 => &SHAPE275,
+            18487..=18488 => &SHAPE276,
+            18489..=18490 => &SHAPE277,
+            18491..=18492 => &SHAPE278,
+            18493..=18494 => &SHAPE279,
+            18495..=18498 => &SHAPE280,
+            18499..=18502 => &SHAPE281,
+            18503..=18504 | 18507..=18508 => &SHAPE282,
+            18505..=18506 | 18509..=18510 => &SHAPE283,
+            18511..=18574 => &SHAPE167,
+            19372..=19380 => &SHAPE284,
+            20725..=20728
+            | 20741..=20744
+            | 20757..=20760
+            | 20773..=20776
+            | 20789..=20792
+            | 20805..=20808
+            | 20821..=20824
+            | 20837..=20840
+            | 20853..=20856
+            | 20869..=20872
+            | 20885..=20888
+            | 20901..=20904
+            | 20917..=20920
+            | 20933..=20936
+            | 20949..=20952
+            | 20965..=20968
+            | 20981..=20984 => &SHAPE118,
+            20729..=20732
+            | 20745..=20748
+            | 20761..=20764
+            | 20777..=20780
+            | 20793..=20796
+            | 20809..=20812
+            | 20825..=20828
+            | 20841..=20844
+            | 20857..=20860
+            | 20873..=20876
+            | 20889..=20892
+            | 20905..=20908
+            | 20921..=20924
+            | 20937..=20940
+            | 20953..=20956
+            | 20969..=20972
+            | 20985..=20988 => &SHAPE285,
+            20733..=20736
+            | 20749..=20752
+            | 20765..=20768
+            | 20781..=20784
+            | 20797..=20800
+            | 20813..=20816
+            | 20829..=20832
+            | 20845..=20848
+            | 20861..=20864
+            | 20877..=20880
+            | 20893..=20896
+            | 20909..=20912
+            | 20925..=20928
+            | 20941..=20944
+            | 20957..=20960
+            | 20973..=20976
+            | 20989..=20992 => &SHAPE286,
+            20737..=20740
+            | 20753..=20756
+            | 20769..=20772
+            | 20785..=20788
+            | 20801..=20804
+            | 20817..=20820
+            | 20833..=20836
+            | 20849..=20852
+            | 20865..=20868
+            | 20881..=20884
+            | 20897..=20900
+            | 20913..=20916
+            | 20929..=20932
+            | 20945..=20948
+            | 20961..=20964
+            | 20977..=20980
+            | 20993..=20996 => &SHAPE287,
+            20997..=21030 => &SHAPE288,
+            21033..=21034 => &SHAPE289,
+            21035..=21036 => &SHAPE290,
+            21037..=21038 => &SHAPE291,
+            21039..=21040 => &SHAPE292,
+            21041..=21042 => &SHAPE293,
+            21043..=21044 => &SHAPE294,
+            21045..=21046 => &SHAPE295,
+            21047..=21048 => &SHAPE296,
+            21049..=21050 => &SHAPE297,
+            21051..=21052 => &SHAPE298,
+            21053..=21054 => &SHAPE299,
+            21055..=21056 => &SHAPE300,
+            21057..=21058 => &SHAPE301,
+            21059..=21060 => &SHAPE302,
+            21061..=21062 => &SHAPE303,
+            21063..=21064 => &SHAPE304,
+            21065..=21066 => &SHAPE305,
+            21067..=21068 => &SHAPE306,
+            21069..=21070 => &SHAPE307,
+            21071..=21072 => &SHAPE308,
+            21073..=21074 => &SHAPE309,
+            21075..=21076 => &SHAPE310,
+            21077..=21078 => &SHAPE311,
+            21079..=21080 => &SHAPE312,
+            22434..=22437 => &SHAPE262,
+            22438..=22439 => &SHAPE313,
+            22440..=22441 => &SHAPE314,
+            22442..=22445 => &SHAPE63,
+            22450..=22453 => &SHAPE73,
+            22510..=22511 => &SHAPE315,
+            22530..=22533 | 22538..=22541 | 22546..=22549 | 22554..=22557 => &SHAPE316,
+            22534..=22535 | 22542..=22543 | 22550..=22551 | 22558..=22559 => &SHAPE317,
             _ => &SHAPE1,
         }
     }
diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs
index 1013b4fce..53ade2b26 100644
--- a/azalea-physics/src/collision/mod.rs
+++ b/azalea-physics/src/collision/mod.rs
@@ -58,7 +58,7 @@ fn collide(movement: &Vec3, world: &Instance, physics: &azalea_entity::Physics)
     // let entity_collisions = world.get_entity_collisions(self,
     // entity_bounding_box.expand_towards(movement));
     let entity_collisions = Vec::new();
-    let collided_movement = if movement.length_sqr() == 0.0 {
+    let collided_delta = if movement.length_sqr() == 0.0 {
         *movement
     } else {
         collide_bounding_box(
@@ -69,15 +69,15 @@ fn collide(movement: &Vec3, world: &Instance, physics: &azalea_entity::Physics)
         )
     };
 
-    let x_collision = movement.x != collided_movement.x;
-    let y_collision = movement.y != collided_movement.y;
-    let z_collision = movement.z != collided_movement.z;
+    let x_collision = movement.x != collided_delta.x;
+    let y_collision = movement.y != collided_delta.y;
+    let z_collision = movement.z != collided_delta.z;
 
     let on_ground = physics.on_ground || y_collision && movement.y < 0.;
 
     let max_up_step = 0.6;
-    if on_ground && (x_collision || z_collision) {
-        let mut hypothetical_new_position = collide_bounding_box(
+    if max_up_step > 0. && on_ground && (x_collision || z_collision) {
+        let mut step_to_delta = collide_bounding_box(
             &Vec3 {
                 x: movement.x,
                 y: max_up_step,
@@ -87,7 +87,7 @@ fn collide(movement: &Vec3, world: &Instance, physics: &azalea_entity::Physics)
             world,
             entity_collisions.clone(),
         );
-        let step_up_position = collide_bounding_box(
+        let directly_up_delta = collide_bounding_box(
             &Vec3 {
                 x: 0.,
                 y: max_up_step,
@@ -97,41 +97,38 @@ fn collide(movement: &Vec3, world: &Instance, physics: &azalea_entity::Physics)
             world,
             entity_collisions.clone(),
         );
-        if step_up_position.y < max_up_step {
-            let var11 = collide_bounding_box(
+        if directly_up_delta.y < max_up_step {
+            let target_movement = collide_bounding_box(
                 &Vec3 {
                     x: movement.x,
                     y: 0.,
                     z: movement.z,
                 },
-                &entity_bounding_box.move_relative(&step_up_position),
+                &entity_bounding_box.move_relative(&directly_up_delta),
                 world,
                 entity_collisions.clone(),
             )
-            .add(step_up_position);
-            if var11.horizontal_distance_sqr() > hypothetical_new_position.horizontal_distance_sqr()
-            {
-                hypothetical_new_position = var11;
+            .add(directly_up_delta);
+            if target_movement.horizontal_distance_sqr() > step_to_delta.horizontal_distance_sqr() {
+                step_to_delta = target_movement;
             }
         }
 
-        if hypothetical_new_position.horizontal_distance_sqr()
-            > collided_movement.horizontal_distance_sqr()
-        {
-            return hypothetical_new_position.add(collide_bounding_box(
+        if step_to_delta.horizontal_distance_sqr() > collided_delta.horizontal_distance_sqr() {
+            return step_to_delta.add(collide_bounding_box(
                 &Vec3 {
                     x: 0.,
-                    y: -hypothetical_new_position.y + movement.y,
+                    y: -step_to_delta.y + movement.y,
                     z: 0.,
                 },
-                &entity_bounding_box.move_relative(&hypothetical_new_position),
+                &entity_bounding_box.move_relative(&step_to_delta),
                 world,
                 entity_collisions.clone(),
             ));
         }
     }
 
-    collided_movement
+    collided_delta
 }
 
 /// Move an entity by a given delta, checking for collisions.