From 4794b4f1a0a500fed258863d3d4e7216f67c8639 Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 15 Dec 2021 19:23:27 -0600 Subject: writing packets is now friendlier --- .../src/packets/handshake/client_intention_packet.rs | 10 +++++----- .../src/packets/login/serverbound_hello_packet.rs | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'minecraft-protocol/src/packets') diff --git a/minecraft-protocol/src/packets/handshake/client_intention_packet.rs b/minecraft-protocol/src/packets/handshake/client_intention_packet.rs index 3f7e3b37..868626b3 100644 --- a/minecraft-protocol/src/packets/handshake/client_intention_packet.rs +++ b/minecraft-protocol/src/packets/handshake/client_intention_packet.rs @@ -2,7 +2,7 @@ use std::hash::Hash; use tokio::io::BufReader; -use crate::{mc_buf, packets::ConnectionProtocol}; +use crate::{mc_buf::Writable, packets::ConnectionProtocol}; use super::HandshakePacket; @@ -21,10 +21,10 @@ impl ClientIntentionPacket { } pub fn write(&self, buf: &mut Vec) { - mc_buf::write_varint(buf, self.protocol_version as i32); - mc_buf::write_utf(buf, &self.hostname); - mc_buf::write_short(buf, self.port); - mc_buf::write_varint(buf, self.intention.clone() as i32); + buf.write_varint(self.protocol_version as i32).unwrap(); + buf.write_utf(&self.hostname).unwrap(); + buf.write_short(self.port).unwrap(); + buf.write_varint(self.intention.clone() as i32).unwrap(); } pub async fn read( diff --git a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs b/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs index 69448074..32a6dadc 100644 --- a/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs +++ b/minecraft-protocol/src/packets/login/serverbound_hello_packet.rs @@ -1,7 +1,7 @@ use std::hash::Hash; use tokio::io::BufReader; -use crate::mc_buf; +use crate::mc_buf::Writable; use super::LoginPacket; @@ -16,7 +16,7 @@ impl ServerboundHelloPacket { } pub fn write(&self, buf: &mut Vec) { - mc_buf::write_utf(buf, &self.username); + buf.write_utf(&self.username).unwrap(); } pub async fn read( -- cgit v1.2.3