Fixed a little mishap in primitives.rs that didn't allow for encoding of usize variables.

Changed type of `eid` to be an entity and be consistent with the typing of the rest of the project.

Author: teoscura

src/bin/src/packet_handlers/animations.rs

@@ -11,11 +11,10 @@ async fn entity_animation(
 ) -> Result<EntityAnimationEvent, NetError> {
     //TODO change this global broadcast to a broadcast that affects only players in the view distance
     //      of the player doing it, but as long as we still cant see other players, this will be fine.
-
     broadcast(
         &event.packet,
         &state,
-        BroadcastOptions::default().except([event.eid.val as usize]),
+        BroadcastOptions::default().except([event.entity]),
     )
         .await?;
     Ok(event)

src/lib/net/crates/codec/src/decode/primitives.rs

@@ -35,6 +35,7 @@ impl_for_primitives!(
     u32 | i32,
     u64 | i64,
     u128 | i128,
+    usize | isize,
     f32,
     f64
 );

src/lib/net/crates/codec/src/encode/primitives.rs

@@ -40,6 +40,7 @@ impl_for_primitives!(
     u32 | i32,
     u64 | i64,
     u128 | i128,
+    usize | isize,
     f32,
     f64
 );

src/lib/net/src/packets/incoming/swing_arm.rs

@@ -6,6 +6,7 @@ use ferrumc_macros::{packet, NetDecode};
 use ferrumc_net_codec::net_types::var_int::VarInt;
 use ferrumc_state::ServerState;
 use std::sync::Arc;
+use ferrumc_ecs::entities::Entity;
 
 #[derive(NetDecode)]
 #[packet(packet_id = 0x36, state = "play")]
@@ -14,15 +15,15 @@ pub struct SwingArmPacket {
 }
 
 impl IncomingPacket for SwingArmPacket {
-    async fn handle(self, conn_id: usize, state: Arc<ServerState>) -> NetResult<()> {
+    async fn handle(self, conn_id: Entity, state: Arc<ServerState>) -> NetResult<()> {
         let animation = {
             if self.hand == 0 {
                 0
             } else {
                 3
             }
         };
-        let event = EntityAnimationEvent::new(VarInt::new(conn_id as i32), animation);
+        let event = EntityAnimationEvent::new(conn_id, animation);
         EntityAnimationEvent::trigger(event, state).await?;
         Ok(())
     }

src/lib/net/src/packets/outgoing/entity_animation.rs

@@ -1,34 +1,31 @@
-use crate::errors::NetError;
-use crate::utils::broadcast::{broadcast, BroadcastOptions};
-use ferrumc_macros::{event_handler, packet, Event, NetEncode};
-use ferrumc_net_codec::net_types::var_int::VarInt;
-use ferrumc_state::GlobalState;
+use ferrumc_macros::{packet, Event, NetEncode};
 use std::io::Write;
+use ferrumc_ecs::entities::Entity;
 
 #[derive(NetEncode)]
 #[packet(packet_id = 0x03)]
 pub struct EntityAnimationPacket {
-    pub eid: VarInt,
+    pub eid: Entity,
     pub animation: u8,
 }
 
 #[derive(Event)]
 pub struct EntityAnimationEvent {
-    pub eid: VarInt,
+    pub entity: Entity,
     pub animation: u8,
     pub packet: EntityAnimationPacket,
 }
 
 impl EntityAnimationPacket {
-    pub fn new(eid: VarInt, animation: u8) -> Self {
+    pub fn new(eid: Entity, animation: u8) -> Self {
         Self { eid, animation }
     }
 }
 
 impl EntityAnimationEvent {
-    pub fn new(eid: VarInt, animation: u8) -> Self {
+    pub fn new(eid: Entity, animation: u8) -> Self {
         Self {
-            eid: eid.clone(),
+            entity: eid.clone(),
             animation: animation,
             packet: EntityAnimationPacket::new(eid, animation.clone()),
         }