diff --git a/README.md b/README.md index d7d5a2fab..c2d8dd2e9 100755 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.

-*Currently supported Minecraft version: `1.20.2`.* +*Currently supported Minecraft version: `23w40a`.* > **Warning** > Azalea is still very unfinished, though most crates are in a somewhat useable state diff --git a/azalea-block/src/generated.rs b/azalea-block/src/generated.rs index e3f8fb9e3..4add88e99 100755 --- a/azalea-block/src/generated.rs +++ b/azalea-block/src/generated.rs @@ -282,11 +282,6 @@ make_block_states! { }, "short" => bool, "unstable" => bool, - "slot_0_occupied" => bool, - "slot_1_occupied" => bool, - "slot_2_occupied" => bool, - "slot_3_occupied" => bool, - "slot_4_occupied" => bool, "slot_5_occupied" => bool, "age" => FireAge { _0, @@ -837,26 +832,6 @@ make_block_states! { }, "locked" => bool, "down" => bool, - "age" => PumpkinStemAge { - _0, - _1, - _2, - _3, - _4, - _5, - _6, - _7, - }, - "age" => MelonStemAge { - _0, - _1, - _2, - _3, - _4, - _5, - _6, - _7, - }, "down" => bool, "north" => bool, "south" => bool, @@ -1863,7 +1838,8 @@ make_block_states! { _14, _15, }, - "south" => bool, + "east" => bool, + "up" => bool, "west" => bool, "bloom" => bool, "can_summon" => bool, @@ -1920,7 +1896,7 @@ make_block_states! { Partial, Full, }, - "axis" => CacheSize { + "axis" => Falling { X, Y, Z, @@ -2666,7 +2642,6 @@ make_block_states! { waterlogged: false, west: false, }, - pumpkin => BlockBehavior::new().strength(1.0, 1.0), {}, netherrack => BlockBehavior::new().requires_correct_tool_for_drops().strength(0.4, 0.4), {}, soul_sand => BlockBehavior::new().strength(0.5, 0.5), {}, soul_soil => BlockBehavior::new().strength(0.5, 0.5), {}, @@ -2832,19 +2807,6 @@ make_block_states! { waterlogged: false, west: false, }, - melon => BlockBehavior::new().strength(1.0, 1.0), {}, - attached_pumpkin_stem => BlockBehavior::new(), { - facing: FacingCardinal::North, - }, - attached_melon_stem => BlockBehavior::new(), { - facing: FacingCardinal::North, - }, - pumpkin_stem => BlockBehavior::new(), { - age: PumpkinStemAge::_0, - }, - melon_stem => BlockBehavior::new(), { - age: MelonStemAge::_0, - }, vine => BlockBehavior::new().strength(0.2, 0.2), { east: false, north: false, @@ -5113,7 +5075,7 @@ make_block_states! { cracked_deepslate_bricks => BlockBehavior::new().requires_correct_tool_for_drops().strength(3.5, 6.0), {}, cracked_deepslate_tiles => BlockBehavior::new().requires_correct_tool_for_drops().strength(3.5, 6.0), {}, infested_deepslate => BlockBehavior::new().strength(1.5, 0.75), { - axis: CacheSize::Y, + axis: Falling::Y, }, smooth_basalt => BlockBehavior::new().requires_correct_tool_for_drops().strength(1.25, 4.2), {}, raw_iron_block => BlockBehavior::new().requires_correct_tool_for_drops().strength(5.0, 6.0), {}, diff --git a/azalea-language/src/en_us.json b/azalea-language/src/en_us.json index ee0df16b6..0faef9044 100755 --- a/azalea-language/src/en_us.json +++ b/azalea-language/src/en_us.json @@ -2413,6 +2413,7 @@ "commands.jfr.start.failed": "Failed to start JFR profiling", "commands.jfr.started": "JFR profiling started", "commands.jfr.stopped": "JFR profiling stopped and dumped to %s", + "commands.kick.owner.failed": "Cannot kick server owner in LAN game", "commands.kick.success": "Kicked %s: %s", "commands.kill.success.multiple": "Killed %s entities", "commands.kill.success.single": "Killed %s", @@ -3516,6 +3517,7 @@ "gui.down": "Down", "gui.entity_tooltip.type": "Type: %s", "gui.hours": "%s hour(s)", + "gui.loadingMinecraft": "Loading Minecraft", "gui.minutes": "%s minute(s)", "gui.multiLineEditBox.character_limit": "%s/%s", "gui.narrate.button": "%s button", @@ -4615,6 +4617,9 @@ "mco.selectServer.purchase": "Add Realm", "mco.selectServer.trial": "Get a trial!", "mco.selectServer.uninitialized": "Click to start your new realm!", + "mco.snapshotRealmsPopup.message": "Realms are now available in Snapshots starting with Snapshot 23w41a. Every Realms subscription comes with a free Snapshot Realm that is separate from your normal Java Realm!", + "mco.snapshotRealmsPopup.title": "Realms now available in Snapshots", + "mco.snapshotRealmsPopup.urlText": "Learn More", "mco.template.button.publisher": "Publisher", "mco.template.button.select": "Select", "mco.template.button.trailer": "Trailer", diff --git a/azalea-physics/src/collision/blocks.rs b/azalea-physics/src/collision/blocks.rs index f6baea9f0..a59711d2a 100644 --- a/azalea-physics/src/collision/blocks.rs +++ b/azalea-physics/src/collision/blocks.rs @@ -1752,8 +1752,8 @@ impl BlockWithShape for BlockState { | 5716..=5733 | 5738..=5772 | 5799..=5814 - | 5859..=5863 - | 5865..=5866 + | 5858..=5862 + | 5864..=5865 | 6813..=6998 | 7001..=7002 | 7005..=7006 @@ -4201,24 +4201,24 @@ impl BlockWithShape for BlockState { | 5706..=5707 | 5710..=5711 | 5714..=5715 - | 6010..=6013 - | 6018..=6021 - | 6074..=6077 - | 6082..=6085 - | 6138..=6141 - | 6146..=6149 - | 6202..=6205 - | 6210..=6213 - | 6266..=6269 - | 6274..=6277 - | 6330..=6333 - | 6338..=6341 - | 6394..=6397 - | 6402..=6405 - | 6458..=6461 - | 6466..=6469 - | 6522..=6525 - | 6530..=6533 + | 6009..=6012 + | 6017..=6020 + | 6073..=6076 + | 6081..=6084 + | 6137..=6140 + | 6145..=6148 + | 6201..=6204 + | 6209..=6212 + | 6265..=6268 + | 6273..=6276 + | 6329..=6332 + | 6337..=6340 + | 6393..=6396 + | 6401..=6404 + | 6457..=6460 + | 6465..=6468 + | 6521..=6524 + | 6529..=6532 | 10447..=10450 | 10455..=10458 | 11822..=11823 @@ -4314,24 +4314,24 @@ impl BlockWithShape for BlockState { | 5692..=5693 | 5704..=5705 | 5712..=5713 - | 5962..=5965 - | 5970..=5973 - | 6026..=6029 - | 6034..=6037 - | 6090..=6093 - | 6098..=6101 - | 6154..=6157 - | 6162..=6165 - | 6218..=6221 - | 6226..=6229 - | 6282..=6285 - | 6290..=6293 - | 6346..=6349 - | 6354..=6357 - | 6410..=6413 - | 6418..=6421 - | 6474..=6477 - | 6482..=6485 + | 5961..=5964 + | 5969..=5972 + | 6025..=6028 + | 6033..=6036 + | 6089..=6092 + | 6097..=6100 + | 6153..=6156 + | 6161..=6164 + | 6217..=6220 + | 6225..=6228 + | 6281..=6284 + | 6289..=6292 + | 6345..=6348 + | 6353..=6356 + | 6409..=6412 + | 6417..=6420 + | 6473..=6476 + | 6481..=6484 | 10399..=10402 | 10407..=10410 | 11824..=11825 @@ -4435,24 +4435,24 @@ impl BlockWithShape for BlockState { | 5690..=5691 | 5694..=5695 | 5698..=5699 - | 5994..=5997 - | 6002..=6005 - | 6058..=6061 - | 6066..=6069 - | 6122..=6125 - | 6130..=6133 - | 6186..=6189 - | 6194..=6197 - | 6250..=6253 - | 6258..=6261 - | 6314..=6317 - | 6322..=6325 - | 6378..=6381 - | 6386..=6389 - | 6442..=6445 - | 6450..=6453 - | 6506..=6509 - | 6514..=6517 + | 5993..=5996 + | 6001..=6004 + | 6057..=6060 + | 6065..=6068 + | 6121..=6124 + | 6129..=6132 + | 6185..=6188 + | 6193..=6196 + | 6249..=6252 + | 6257..=6260 + | 6313..=6316 + | 6321..=6324 + | 6377..=6380 + | 6385..=6388 + | 6441..=6444 + | 6449..=6452 + | 6505..=6508 + | 6513..=6516 | 10431..=10434 | 10439..=10442 | 11826..=11827 @@ -4556,24 +4556,24 @@ impl BlockWithShape for BlockState { | 5696..=5697 | 5700..=5701 | 5708..=5709 - | 5978..=5981 - | 5986..=5989 - | 6042..=6045 - | 6050..=6053 - | 6106..=6109 - | 6114..=6117 - | 6170..=6173 - | 6178..=6181 - | 6234..=6237 - | 6242..=6245 - | 6298..=6301 - | 6306..=6309 - | 6362..=6365 - | 6370..=6373 - | 6426..=6429 - | 6434..=6437 - | 6490..=6493 - | 6498..=6501 + | 5977..=5980 + | 5985..=5988 + | 6041..=6044 + | 6049..=6052 + | 6105..=6108 + | 6113..=6116 + | 6169..=6172 + | 6177..=6180 + | 6233..=6236 + | 6241..=6244 + | 6297..=6300 + | 6305..=6308 + | 6361..=6364 + | 6369..=6372 + | 6425..=6428 + | 6433..=6436 + | 6489..=6492 + | 6497..=6500 | 10415..=10418 | 10423..=10426 | 11840..=11841 @@ -4682,7 +4682,7 @@ impl BlockWithShape for BlockState { | 5606..=5609 | 5614..=5617 | 5622..=5625 => &SHAPE70, - 5773 | 5882..=5945 | 9175..=9190 => &SHAPE7, + 5773 | 5881..=5944 | 9175..=9190 => &SHAPE7, 5774 => &SHAPE58, 5775 | 9191..=9222 => &SHAPE59, 5776 @@ -4746,7 +4746,7 @@ impl BlockWithShape for BlockState { | 23498..=23499 | 23909..=23910 => &SHAPE8, 5777 => &SHAPE60, - 5779 | 5851 | 22589 => &SHAPE61, + 5779 | 5850 | 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 @@ -4926,49 +4926,49 @@ impl BlockWithShape for BlockState { 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, - 5878 => &SHAPE94, - 5879 => &SHAPE95, - 5880 => &SHAPE96, - 5881 => &SHAPE97, - 5966..=5969 - | 5982..=5985 - | 5998..=6001 - | 6014..=6017 - | 6030..=6033 - | 6046..=6049 - | 6062..=6065 - | 6078..=6081 - | 6094..=6097 - | 6110..=6113 - | 6126..=6129 - | 6142..=6145 - | 6158..=6161 - | 6174..=6177 - | 6190..=6193 - | 6206..=6209 - | 6222..=6225 - | 6238..=6241 - | 6254..=6257 - | 6270..=6273 - | 6286..=6289 - | 6302..=6305 - | 6318..=6321 - | 6334..=6337 - | 6350..=6353 - | 6366..=6369 - | 6382..=6385 - | 6398..=6401 - | 6414..=6417 - | 6430..=6433 - | 6446..=6449 - | 6462..=6465 - | 6478..=6481 - | 6494..=6497 - | 6510..=6513 - | 6526..=6529 + 5874 => &SHAPE91, + 5875 => &SHAPE92, + 5876 => &SHAPE93, + 5877 => &SHAPE94, + 5878 => &SHAPE95, + 5879 => &SHAPE96, + 5880 => &SHAPE97, + 5965..=5968 + | 5981..=5984 + | 5997..=6000 + | 6013..=6016 + | 6029..=6032 + | 6045..=6048 + | 6061..=6064 + | 6077..=6080 + | 6093..=6096 + | 6109..=6112 + | 6125..=6128 + | 6141..=6144 + | 6157..=6160 + | 6173..=6176 + | 6189..=6192 + | 6205..=6208 + | 6221..=6224 + | 6237..=6240 + | 6253..=6256 + | 6269..=6272 + | 6285..=6288 + | 6301..=6304 + | 6317..=6320 + | 6333..=6336 + | 6349..=6352 + | 6365..=6368 + | 6381..=6384 + | 6397..=6400 + | 6413..=6416 + | 6429..=6432 + | 6445..=6448 + | 6461..=6464 + | 6477..=6480 + | 6493..=6496 + | 6509..=6512 + | 6525..=6528 | 10403..=10406 | 10419..=10422 | 10435..=10438 @@ -4981,42 +4981,42 @@ impl BlockWithShape for BlockState { | 18832..=18835 | 18848..=18851 | 18864..=18867 => &SHAPE98, - 5974..=5977 - | 5990..=5993 - | 6006..=6009 - | 6022..=6025 - | 6038..=6041 - | 6054..=6057 - | 6070..=6073 - | 6086..=6089 - | 6102..=6105 - | 6118..=6121 - | 6134..=6137 - | 6150..=6153 - | 6166..=6169 - | 6182..=6185 - | 6198..=6201 - | 6214..=6217 - | 6230..=6233 - | 6246..=6249 - | 6262..=6265 - | 6278..=6281 - | 6294..=6297 - | 6310..=6313 - | 6326..=6329 - | 6342..=6345 - | 6358..=6361 - | 6374..=6377 - | 6390..=6393 - | 6406..=6409 - | 6422..=6425 - | 6438..=6441 - | 6454..=6457 - | 6470..=6473 - | 6486..=6489 - | 6502..=6505 - | 6518..=6521 - | 6534..=6537 + 5973..=5976 + | 5989..=5992 + | 6005..=6008 + | 6021..=6024 + | 6037..=6040 + | 6053..=6056 + | 6069..=6072 + | 6085..=6088 + | 6101..=6104 + | 6117..=6120 + | 6133..=6136 + | 6149..=6152 + | 6165..=6168 + | 6181..=6184 + | 6197..=6200 + | 6213..=6216 + | 6229..=6232 + | 6245..=6248 + | 6261..=6264 + | 6277..=6280 + | 6293..=6296 + | 6309..=6312 + | 6325..=6328 + | 6341..=6344 + | 6357..=6360 + | 6373..=6376 + | 6389..=6392 + | 6405..=6408 + | 6421..=6424 + | 6437..=6440 + | 6453..=6456 + | 6469..=6472 + | 6485..=6488 + | 6501..=6504 + | 6517..=6520 + | 6533..=6536 | 10411..=10414 | 10427..=10430 | 10443..=10446 @@ -5029,89 +5029,89 @@ impl BlockWithShape for BlockState { | 18840..=18843 | 18856..=18859 | 18872..=18875 => &SHAPE99, - 6742 | 6744 | 6780 | 6782 | 9372 | 9374 | 9404 | 9406 | 9436 | 9438 | 9468 | 9470 + 6741 | 6743 | 6779 | 6781 | 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 | 9373 | 9375 | 9405 | 9407 | 9437 | 9439 | 9469 | 9471 + 6742 | 6744 | 6780 | 6782 | 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 | 9376 | 9378 | 9408 | 9410 | 9440 | 9442 | 9472 | 9474 + 6745 | 6747 | 6783 | 6785 | 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 | 9377 | 9379 | 9409 | 9411 | 9441 | 9443 | 9473 | 9475 + 6746 | 6748 | 6784 | 6786 | 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 | 9380 | 9382 | 9412 | 9414 | 9444 | 9446 | 9476 | 9478 + 6749 | 6751 | 6787 | 6789 | 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 | 9381 | 9383 | 9413 | 9415 | 9445 | 9447 | 9477 | 9479 + 6750 | 6752 | 6788 | 6790 | 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 | 9384 | 9386 | 9416 | 9418 | 9448 | 9450 | 9480 | 9482 + 6753 | 6755 | 6791 | 6793 | 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 | 9385 | 9387 | 9417 | 9419 | 9449 | 9451 | 9481 | 9483 + 6754 | 6756 | 6792 | 6794 | 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 | 9388 | 9390 | 9420 | 9422 | 9452 | 9454 | 9484 | 9486 + 6757 | 6759 | 6795 | 6797 | 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 | 9389 | 9391 | 9421 | 9423 | 9453 | 9455 | 9485 | 9487 + 6758 | 6760 | 6796 | 6798 | 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 | 9392 | 9394 | 9424 | 9426 | 9456 | 9458 | 9488 | 9490 + 6761 | 6763 | 6799 | 6801 | 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 | 9393 | 9395 | 9425 | 9427 | 9457 | 9459 | 9489 | 9491 + 6762 | 6764 | 6800 | 6802 | 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 | 9396 | 9398 | 9428 | 9430 | 9460 | 9462 | 9492 | 9494 + 6765 | 6767 | 6803 | 6805 | 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 | 9397 | 9399 | 9429 | 9431 | 9461 | 9463 | 9493 | 9495 + 6766 | 6768 | 6804 | 6806 | 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 | 9400 | 9402 | 9432 | 9434 | 9464 | 9466 | 9496 | 9498 + 6769 | 6771 | 6807 | 6809 | 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 | 9401 | 9403 | 9433 | 9435 | 9465 | 9467 | 9497 | 9499 + 6770 | 6772 | 6808 | 6810 | 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 | 12945..=12956 => &SHAPE116, - 6778..=6779 => &SHAPE117, + 6773..=6774 => &SHAPE115, + 6775..=6776 | 12945..=12956 => &SHAPE116, + 6777..=6778 => &SHAPE117, 7271 => &SHAPE119, 7390..=7397 => &SHAPE120, 7398..=7405 => &SHAPE121, @@ -8036,10 +8036,10 @@ impl BlockWithShape for BlockState { } fn is_shape_empty(&self) -> bool { - matches!(self.id, 0|25..=78|80..=111|1944..=1991|2004..=2010|2063..=2090|2355..=2872|2978..=4273|4278..=4285|4302..=4589|4662..=4681|4762..=5537|5626..=5651|5716..=5733|5738..=5772|5799..=5814|5859..=5863|5865..=5866|6813..=6998|7001..=7002|7005..=7006|7009..=7010|7013..=7014|7017..=7018|7021..=7022|7025..=7026|7385..=7388|7406|7521..=7664|7925|7928|8249|8252|8595..=8826|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) + matches!(self.id, 0|25..=78|80..=111|1944..=1991|2004..=2010|2063..=2090|2355..=2872|2978..=4273|4278..=4285|4302..=4589|4662..=4681|4762..=5537|5626..=5651|5716..=5733|5738..=5772|5799..=5814|5858..=5862|5864..=5865|6813..=6998|7001..=7002|7005..=7006|7009..=7010|7013..=7014|7017..=7018|7021..=7022|7025..=7026|7385..=7388|7406|7521..=7664|7925|7928|8249|8252|8595..=8826|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) } fn is_shape_full(&self) -> bool { - matches!(self.id, 1..=24|79|112..=1687|1998..=2003|2017..=2022|2047..=2062|2091..=2354|2873|4274..=4277|4294..=4301|5734..=5737|5780..=5781|5798|5815..=5816|5849..=5850|5852..=5858|5864|5867..=5874|5946..=5961|6538..=6741|6812|7269..=7270|7272|7415|7417..=7418|7511..=7512|7665|7906..=7918|9223..=9224|9235..=9239|9344..=9371|10364..=10366|10463..=10465|10710..=10711|10716..=10717|10722..=10727|10744..=10746|11079..=11081|11166..=11167|11172..=11173|11178..=11179|11184..=11185|11190..=11191|11196..=11197|11202..=11203|11208..=11209|11214..=11215|11220..=11221|11226..=11227|11232..=11233|11238..=11239|11244..=11245|11250..=11251|11256..=11257|11262..=11263|11268..=11269|11274..=11275|11280..=11281|11286..=11287|11292..=11293|11298..=11299|11304..=11309|12404..=12413|12494|12515..=12548|12550..=12759|12787|12803..=12812|12941|14086..=14087|14092..=14093|14098..=14099|14104..=14105|14110..=14111|14116..=14117|14122..=14123|14128..=14129|14134..=14135|14140..=14141|14146..=14147|14152..=14153|14158..=14159|18404..=18437|18466|18579..=18591|18593|18596..=18608|18610|18666..=18667|18672..=18673|18678..=18679|19356..=19371|19381..=19444|19446..=19454|19459..=19460|19869..=19874|19879..=19880|20285|20370..=20371|20722..=20724|21031..=21032|21081..=21083|21565|21694..=21695|21704..=21713|22038..=22039|22044..=22045|22050..=22051|22056..=22065|22390..=22391|22396..=22397|22402..=22403|22408..=22409|22454|22529|22588|22590..=22593|22678..=22679|23004|23089..=23090|23415|23500..=23501|23826|23911..=23912|24237..=24246|24249..=24257|24259) + matches!(self.id, 1..=24|79|112..=1687|1998..=2003|2017..=2022|2047..=2062|2091..=2354|2873|4274..=4277|4294..=4301|5734..=5737|5780..=5781|5798|5815..=5816|5849|5851..=5857|5863|5866..=5873|5945..=5960|6537..=6740|6811..=6812|7269..=7270|7272|7415|7417..=7418|7511..=7512|7665|7906..=7918|9223..=9224|9235..=9239|9344..=9371|10364..=10366|10463..=10465|10710..=10711|10716..=10717|10722..=10727|10744..=10746|11079..=11081|11166..=11167|11172..=11173|11178..=11179|11184..=11185|11190..=11191|11196..=11197|11202..=11203|11208..=11209|11214..=11215|11220..=11221|11226..=11227|11232..=11233|11238..=11239|11244..=11245|11250..=11251|11256..=11257|11262..=11263|11268..=11269|11274..=11275|11280..=11281|11286..=11287|11292..=11293|11298..=11299|11304..=11309|12404..=12413|12494|12515..=12548|12550..=12759|12787|12803..=12812|12941|14086..=14087|14092..=14093|14098..=14099|14104..=14105|14110..=14111|14116..=14117|14122..=14123|14128..=14129|14134..=14135|14140..=14141|14146..=14147|14152..=14153|14158..=14159|18404..=18437|18466|18579..=18591|18593|18596..=18608|18610|18666..=18667|18672..=18673|18678..=18679|19356..=19371|19381..=19444|19446..=19454|19459..=19460|19869..=19874|19879..=19880|20285|20370..=20371|20722..=20724|21031..=21032|21081..=21083|21565|21694..=21695|21704..=21713|22038..=22039|22044..=22045|22050..=22051|22056..=22065|22390..=22391|22396..=22397|22402..=22403|22408..=22409|22454|22529|22588|22590..=22593|22678..=22679|23004|23089..=23090|23415|23500..=23501|23826|23911..=23912|24237..=24246|24249..=24257|24259) } } diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index eb902da2f..71626fca3 100755 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -12,7 +12,7 @@ use std::io::{Cursor, Write}; // TODO: rename the packet files to just like clientbound_add_entity instead of // clientbound_add_entity_packet -pub const PROTOCOL_VERSION: u32 = 764; +pub const PROTOCOL_VERSION: u32 = 1073741978; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum ConnectionProtocol { diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index c6c67367a..86655808d 100755 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -111,20 +111,20 @@ enum Activity { registry! { enum Attribute { - GenericMaxHealth => "minecraft:generic.max_health", - GenericFollowRange => "minecraft:generic.follow_range", - GenericKnockbackResistance => "minecraft:generic.knockback_resistance", - GenericMovementSpeed => "minecraft:generic.movement_speed", - GenericFlyingSpeed => "minecraft:generic.flying_speed", + GenericArmor => "minecraft:generic.armor", + GenericArmorToughness => "minecraft:generic.armor_toughness", GenericAttackDamage => "minecraft:generic.attack_damage", GenericAttackKnockback => "minecraft:generic.attack_knockback", GenericAttackSpeed => "minecraft:generic.attack_speed", - GenericArmor => "minecraft:generic.armor", - GenericArmorToughness => "minecraft:generic.armor_toughness", + GenericFlyingSpeed => "minecraft:generic.flying_speed", + GenericFollowRange => "minecraft:generic.follow_range", + HorseJumpStrength => "minecraft:horse.jump_strength", + GenericKnockbackResistance => "minecraft:generic.knockback_resistance", GenericLuck => "minecraft:generic.luck", GenericMaxAbsorption => "minecraft:generic.max_absorption", + GenericMaxHealth => "minecraft:generic.max_health", + GenericMovementSpeed => "minecraft:generic.movement_speed", ZombieSpawnReinforcements => "minecraft:zombie.spawn_reinforcements", - HorseJumpStrength => "minecraft:horse.jump_strength", } } @@ -436,7 +436,6 @@ enum Block { SugarCane => "minecraft:sugar_cane", Jukebox => "minecraft:jukebox", OakFence => "minecraft:oak_fence", - Pumpkin => "minecraft:pumpkin", Netherrack => "minecraft:netherrack", SoulSand => "minecraft:soul_sand", SoulSoil => "minecraft:soul_soil", @@ -493,6 +492,7 @@ enum Block { IronBars => "minecraft:iron_bars", Chain => "minecraft:chain", GlassPane => "minecraft:glass_pane", + Pumpkin => "minecraft:pumpkin", Melon => "minecraft:melon", AttachedPumpkinStem => "minecraft:attached_pumpkin_stem", AttachedMelonStem => "minecraft:attached_melon_stem", @@ -5525,3 +5525,239 @@ enum MenuKind { Stonecutter => "minecraft:stonecutter", } } + +registry! { +enum BlockKind { + Block => "minecraft:block", + Air => "minecraft:air", + Amethyst => "minecraft:amethyst", + AmethystCluster => "minecraft:amethyst_cluster", + Anvil => "minecraft:anvil", + AttachedStem => "minecraft:attached_stem", + Azalea => "minecraft:azalea", + BambooSapling => "minecraft:bamboo_sapling", + BambooStalk => "minecraft:bamboo_stalk", + Banner => "minecraft:banner", + Barrel => "minecraft:barrel", + Barrier => "minecraft:barrier", + BaseCoralFan => "minecraft:base_coral_fan", + BaseCoralPlant => "minecraft:base_coral_plant", + BaseCoralWallFan => "minecraft:base_coral_wall_fan", + Beacon => "minecraft:beacon", + Bed => "minecraft:bed", + Beehive => "minecraft:beehive", + Beetroot => "minecraft:beetroot", + Bell => "minecraft:bell", + BigDripleaf => "minecraft:big_dripleaf", + BigDripleafStem => "minecraft:big_dripleaf_stem", + BlastFurnace => "minecraft:blast_furnace", + BrewingStand => "minecraft:brewing_stand", + Brushable => "minecraft:brushable", + BubbleColumn => "minecraft:bubble_column", + BuddingAmethyst => "minecraft:budding_amethyst", + Button => "minecraft:button", + Cactus => "minecraft:cactus", + Cake => "minecraft:cake", + CalibratedSculkSensor => "minecraft:calibrated_sculk_sensor", + Campfire => "minecraft:campfire", + CandleCake => "minecraft:candle_cake", + Candle => "minecraft:candle", + Carpet => "minecraft:carpet", + Carrot => "minecraft:carrot", + CartographyTable => "minecraft:cartography_table", + CarvedPumpkin => "minecraft:carved_pumpkin", + Cauldron => "minecraft:cauldron", + CaveVines => "minecraft:cave_vines", + CaveVinesPlant => "minecraft:cave_vines_plant", + CeilingHangingSign => "minecraft:ceiling_hanging_sign", + Chain => "minecraft:chain", + CherryLeaves => "minecraft:cherry_leaves", + Chest => "minecraft:chest", + ChiseledBookShelf => "minecraft:chiseled_book_shelf", + ChorusFlower => "minecraft:chorus_flower", + ChorusPlant => "minecraft:chorus_plant", + Cocoa => "minecraft:cocoa", + ColoredFalling => "minecraft:colored_falling", + Command => "minecraft:command", + Comparator => "minecraft:comparator", + Composter => "minecraft:composter", + ConcretePowder => "minecraft:concrete_powder", + Conduit => "minecraft:conduit", + Coral => "minecraft:coral", + CoralFan => "minecraft:coral_fan", + CoralPlant => "minecraft:coral_plant", + CoralWallFan => "minecraft:coral_wall_fan", + CraftingTable => "minecraft:crafting_table", + Crop => "minecraft:crop", + CryingObsidian => "minecraft:crying_obsidian", + DaylightDetector => "minecraft:daylight_detector", + DeadBush => "minecraft:dead_bush", + DecoratedPot => "minecraft:decorated_pot", + DetectorRail => "minecraft:detector_rail", + DirtPath => "minecraft:dirt_path", + Dispenser => "minecraft:dispenser", + Door => "minecraft:door", + DoublePlant => "minecraft:double_plant", + DragonEgg => "minecraft:dragon_egg", + DropExperience => "minecraft:drop_experience", + Dropper => "minecraft:dropper", + EnchantmentTable => "minecraft:enchantment_table", + EnderChest => "minecraft:ender_chest", + EndGateway => "minecraft:end_gateway", + EndPortal => "minecraft:end_portal", + EndPortalFrame => "minecraft:end_portal_frame", + EndRod => "minecraft:end_rod", + Farm => "minecraft:farm", + Fence => "minecraft:fence", + FenceGate => "minecraft:fence_gate", + Fire => "minecraft:fire", + FletchingTable => "minecraft:fletching_table", + Flower => "minecraft:flower", + FlowerPot => "minecraft:flower_pot", + Frogspawn => "minecraft:frogspawn", + FrostedIce => "minecraft:frosted_ice", + Fungus => "minecraft:fungus", + Furnace => "minecraft:furnace", + Glass => "minecraft:glass", + GlazedTerracotta => "minecraft:glazed_terracotta", + GlowLichen => "minecraft:glow_lichen", + Grass => "minecraft:grass", + Grindstone => "minecraft:grindstone", + HalfTransparent => "minecraft:half_transparent", + HangingRoots => "minecraft:hanging_roots", + Hay => "minecraft:hay", + Honey => "minecraft:honey", + Hopper => "minecraft:hopper", + HugeMushroom => "minecraft:huge_mushroom", + Ice => "minecraft:ice", + Infested => "minecraft:infested", + InfestedRotatedPillar => "minecraft:infested_rotated_pillar", + IronBars => "minecraft:iron_bars", + JackOLantern => "minecraft:jack_o_lantern", + Jigsaw => "minecraft:jigsaw", + Jukebox => "minecraft:jukebox", + Kelp => "minecraft:kelp", + KelpPlant => "minecraft:kelp_plant", + Ladder => "minecraft:ladder", + Lantern => "minecraft:lantern", + LavaCauldron => "minecraft:lava_cauldron", + LayeredCauldron => "minecraft:layered_cauldron", + Leaves => "minecraft:leaves", + Lectern => "minecraft:lectern", + Lever => "minecraft:lever", + Light => "minecraft:light", + LightningRod => "minecraft:lightning_rod", + Liquid => "minecraft:liquid", + Loom => "minecraft:loom", + Magma => "minecraft:magma", + MangroveLeaves => "minecraft:mangrove_leaves", + MangrovePropagule => "minecraft:mangrove_propagule", + MangroveRoots => "minecraft:mangrove_roots", + Moss => "minecraft:moss", + MovingPiston => "minecraft:moving_piston", + Mud => "minecraft:mud", + Mushroom => "minecraft:mushroom", + Mycelium => "minecraft:mycelium", + NetherPortal => "minecraft:nether_portal", + Netherrack => "minecraft:netherrack", + NetherSprouts => "minecraft:nether_sprouts", + NetherWart => "minecraft:nether_wart", + Note => "minecraft:note", + Nylium => "minecraft:nylium", + Observer => "minecraft:observer", + Piglinwallskull => "minecraft:piglinwallskull", + PinkPetals => "minecraft:pink_petals", + PistonBase => "minecraft:piston_base", + PistonHead => "minecraft:piston_head", + PitcherCrop => "minecraft:pitcher_crop", + PlayerHead => "minecraft:player_head", + PlayerWallHead => "minecraft:player_wall_head", + PointedDripstone => "minecraft:pointed_dripstone", + Potato => "minecraft:potato", + PowderSnow => "minecraft:powder_snow", + Powered => "minecraft:powered", + PoweredRail => "minecraft:powered_rail", + PressurePlate => "minecraft:pressure_plate", + Pumpkin => "minecraft:pumpkin", + Rail => "minecraft:rail", + RedstoneLamp => "minecraft:redstone_lamp", + RedstoneOre => "minecraft:redstone_ore", + RedstoneTorch => "minecraft:redstone_torch", + RedstoneWallTorch => "minecraft:redstone_wall_torch", + RedstoneWire => "minecraft:redstone_wire", + Repeater => "minecraft:repeater", + RespawnAnchor => "minecraft:respawn_anchor", + RootedDirt => "minecraft:rooted_dirt", + Roots => "minecraft:roots", + RotatedPillar => "minecraft:rotated_pillar", + Sapling => "minecraft:sapling", + Scaffolding => "minecraft:scaffolding", + SculkCatalyst => "minecraft:sculk_catalyst", + Sculk => "minecraft:sculk", + SculkSensor => "minecraft:sculk_sensor", + SculkShrieker => "minecraft:sculk_shrieker", + SculkVein => "minecraft:sculk_vein", + Seagrass => "minecraft:seagrass", + SeaPickle => "minecraft:sea_pickle", + ShulkerBox => "minecraft:shulker_box", + Skull => "minecraft:skull", + Slab => "minecraft:slab", + Slime => "minecraft:slime", + SmallDripleaf => "minecraft:small_dripleaf", + SmithingTable => "minecraft:smithing_table", + Smoker => "minecraft:smoker", + SnifferEgg => "minecraft:sniffer_egg", + SnowLayer => "minecraft:snow_layer", + SnowyDirt => "minecraft:snowy_dirt", + SoulFire => "minecraft:soul_fire", + SoulSand => "minecraft:soul_sand", + Spawner => "minecraft:spawner", + Sponge => "minecraft:sponge", + SporeBlossom => "minecraft:spore_blossom", + StainedGlassPane => "minecraft:stained_glass_pane", + StainedGlass => "minecraft:stained_glass", + Stair => "minecraft:stair", + StandingSign => "minecraft:standing_sign", + Stem => "minecraft:stem", + Stonecutter => "minecraft:stonecutter", + Structure => "minecraft:structure", + StructureVoid => "minecraft:structure_void", + SugarCane => "minecraft:sugar_cane", + SweetBerryBush => "minecraft:sweet_berry_bush", + TallFlower => "minecraft:tall_flower", + TallGrass => "minecraft:tall_grass", + TallSeagrass => "minecraft:tall_seagrass", + Target => "minecraft:target", + TintedGlass => "minecraft:tinted_glass", + Tnt => "minecraft:tnt", + TorchflowerCrop => "minecraft:torchflower_crop", + Torch => "minecraft:torch", + Trapdoor => "minecraft:trapdoor", + TrappedChest => "minecraft:trapped_chest", + TripWireHook => "minecraft:trip_wire_hook", + Tripwire => "minecraft:tripwire", + TurtleEgg => "minecraft:turtle_egg", + TwistingVinesPlant => "minecraft:twisting_vines_plant", + TwistingVines => "minecraft:twisting_vines", + Vine => "minecraft:vine", + WallBanner => "minecraft:wall_banner", + WallHangingSign => "minecraft:wall_hanging_sign", + WallSign => "minecraft:wall_sign", + WallSkull => "minecraft:wall_skull", + WallTorch => "minecraft:wall_torch", + Wall => "minecraft:wall", + Waterlily => "minecraft:waterlily", + WeatheringCopperFull => "minecraft:weathering_copper_full", + WeatheringCopperSlab => "minecraft:weathering_copper_slab", + WeatheringCopperStair => "minecraft:weathering_copper_stair", + Web => "minecraft:web", + WeepingVinesPlant => "minecraft:weeping_vines_plant", + WeepingVines => "minecraft:weeping_vines", + WeightedPressurePlate => "minecraft:weighted_pressure_plate", + WetSponge => "minecraft:wet_sponge", + WitherRose => "minecraft:wither_rose", + WitherSkull => "minecraft:wither_skull", + WitherWallSkull => "minecraft:wither_wall_skull", + WoolCarpet => "minecraft:wool_carpet", +} +} diff --git a/codegen/migrate.py b/codegen/migrate.py index 6e51c2df2..860d860ee 100755 --- a/codegen/migrate.py +++ b/codegen/migrate.py @@ -124,7 +124,7 @@ new_version_id, 'blocks') lib.code.blocks.generate_blocks( - block_states_burger, block_states_report, new_ordered_blocks, new_mappings) + block_states_burger, block_states_report, pixlyzer_block_datas, new_ordered_blocks, new_mappings) lib.code.shapes.generate_block_shapes( pixlyzer_block_datas, shape_datas['shapes'], shape_datas['aabbs'], block_states_report, block_states_burger, new_mappings)