From c9b4dccd7eaeed68ce96cf5167916417d0baa6a7 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:29:47 -0500
Subject: All block shapes & collisions (#22)

* start adding shapes

* add more collision stuff

* DiscreteCubeMerger

* more mergers

* start adding BitSetDiscreteVoxelShape::join

* i love rust :smiley: :smiley: :smiley:

* r

* IT COMPILES????

* fix warning

* fix error

* fix more clippy issues

* add box_shape

* more shape stuff

* make DiscreteVoxelShape an enum

* Update shape.rs

* also make VoxelShape an enum

* implement BitSet::clear

* add more missing things

* it compiles

W

* start block shape codegen

* optimize shape codegen

* make az-block/blocks.rs look better (broken)

* almost new block macro

* make the codegen not generate 'type'

* try to fix

* work more on the blocks macro

* wait it compiles

* fix clippy issues

* shapes codegen works

* well it's almost working

* simplify some shape codegen

* enum type names are correct

* W it compiles

* cargo check no longer warns

* fix some clippy issues

* start making it so the shape impl is on BlockStates

* insane code

* new impl compiles

* fix wrong find_bits + TESTS PASS!

* add a test for slab collision

* fix clippy issues

* ok rust

* fix error that happens when on stairs

* add test for top slabs

* start adding join_is_not_empty

* add more to join_is_not_empty

* top slabs still don't work!!

* x..=0 doesn't work in rust :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley:

* remove comment since i added more useful names

* remove some printlns

* fix walls in some configurations erroring

* fix some warnings

* change comment to \`\`\`ignore instead of \`\`\`no_run

* players are .6 wide not .8

* fix clippy's complaints

* i missed one clippy warning
---
 azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs | 6 ++++--
 azalea-protocol/src/packets/game/clientbound_recipe_packet.rs      | 6 +++---
 azalea-protocol/src/packets/login/serverbound_hello_packet.rs      | 4 ++--
 azalea-protocol/src/read.rs                                        | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'azalea-protocol/src')

diff --git a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
index 1db3cba6..c9476a45 100644
--- a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs
@@ -54,9 +54,11 @@ impl PlayerChatMessage {
                 .content
                 .decorated
                 .clone()
-                .unwrap_or(Component::from(self.signed_body.content.plain.clone()));
+                .unwrap_or_else(|| Component::from(self.signed_body.content.plain.clone()));
         }
-        self.unsigned_content.clone().unwrap_or(self.message(true))
+        self.unsigned_content
+            .clone()
+            .unwrap_or_else(|| self.message(true))
     }
 }
 
diff --git a/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs b/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs
index 546eb6e4..4e19a114 100644
--- a/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs
@@ -46,9 +46,9 @@ impl McBufReadable for ClientboundRecipePacket {
         };
 
         Ok(ClientboundRecipePacket {
-            action: action,
-            settings: settings,
-            recipes: recipes,
+            action,
+            settings,
+            recipes,
         })
     }
 }
diff --git a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
index 06cf1fa7..4d94092e 100755
--- a/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
+++ b/azalea-protocol/src/packets/login/serverbound_hello_packet.rs
@@ -2,14 +2,14 @@ use azalea_buf::McBuf;
 use azalea_protocol_macros::ServerboundLoginPacket;
 use uuid::Uuid;
 
-#[derive(Clone, Debug, ServerboundLoginPacket, McBuf, PartialEq)]
+#[derive(Clone, Debug, ServerboundLoginPacket, McBuf, PartialEq, Eq)]
 pub struct ServerboundHelloPacket {
     pub username: String,
     pub public_key: Option<ProfilePublicKeyData>,
     pub profile_id: Option<Uuid>,
 }
 
-#[derive(Clone, Debug, McBuf, PartialEq)]
+#[derive(Clone, Debug, McBuf, PartialEq, Eq)]
 pub struct ProfilePublicKeyData {
     pub expires_at: u64,
     pub key: Vec<u8>,
diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs
index 3ff24f72..8a2aaf7d 100755
--- a/azalea-protocol/src/read.rs
+++ b/azalea-protocol/src/read.rs
@@ -83,7 +83,7 @@ fn packet_decoder<P: ProtocolPacket>(stream: &mut impl Read) -> Result<P, ReadPa
     // Packet ID
     let packet_id =
         u32::var_read_from(stream).map_err(|e| ReadPacketError::ReadPacketId { source: e })?;
-    P::read(packet_id.try_into().unwrap(), stream)
+    P::read(packet_id, stream)
 }
 
 // this is always true in multiplayer, false in singleplayer
-- 
cgit v1.2.3