mirror of
https://github.com/mat-1/azalea.git
synced 2025-08-02 14:26:04 +00:00
impl Write instead of Vec<u8> for consistency
This commit is contained in:
parent
bec2da64d8
commit
a24d00d998
17 changed files with 100 additions and 130 deletions
|
@ -123,7 +123,7 @@ fn create_impl_mcbufwritable(ident: &Ident, data: &Data) -> proc_macro2::TokenSt
|
|||
|
||||
quote! {
|
||||
impl crate::mc_buf::McBufWritable for #ident {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
|
||||
#(#write_fields)*
|
||||
Ok(())
|
||||
}
|
||||
|
@ -133,7 +133,7 @@ fn create_impl_mcbufwritable(ident: &Ident, data: &Data) -> proc_macro2::TokenSt
|
|||
syn::Data::Enum(syn::DataEnum { .. }) => {
|
||||
quote! {
|
||||
impl crate::mc_buf::McBufWritable for #ident {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
|
||||
crate::mc_buf::Writable::write_varint(buf, *self as i32)
|
||||
}
|
||||
}
|
||||
|
@ -178,7 +178,7 @@ fn as_packet_derive(input: TokenStream, state: proc_macro2::TokenStream) -> Toke
|
|||
#state::#ident(self)
|
||||
}
|
||||
|
||||
pub fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
pub fn write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
|
||||
crate::mc_buf::McBufWritable::write_into(self, buf)
|
||||
}
|
||||
|
||||
|
@ -366,7 +366,7 @@ pub fn declare_state_packets(input: TokenStream) -> TokenStream {
|
|||
}
|
||||
}
|
||||
|
||||
fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
|
||||
match self {
|
||||
#write_match_contents
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@ mod write;
|
|||
|
||||
use packet_macros::{McBufReadable, McBufWritable};
|
||||
pub use read::{read_varint_async, McBufReadable, McBufVarintReadable, Readable};
|
||||
use std::ops::{Deref, Index};
|
||||
use std::ops::Deref;
|
||||
pub use write::{McBufVarintWritable, McBufWritable, Writable};
|
||||
|
||||
// const DEFAULT_NBT_QUOTA: u32 = 2097152;
|
||||
|
|
|
@ -8,49 +8,10 @@ use byteorder::{BigEndian, WriteBytesExt};
|
|||
use std::io::Write;
|
||||
use uuid::Uuid;
|
||||
|
||||
pub trait Writable {
|
||||
pub trait Writable: Write {
|
||||
fn write_list<F, T>(&mut self, list: &[T], writer: F) -> Result<(), std::io::Error>
|
||||
where
|
||||
F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy,
|
||||
T: Sized,
|
||||
Self: Sized;
|
||||
fn write_int_id_list(&mut self, list: &Vec<i32>) -> Result<(), std::io::Error>;
|
||||
fn write_map<KF, VF, KT, VT>(
|
||||
&mut self,
|
||||
map: Vec<(KT, VT)>,
|
||||
key_writer: KF,
|
||||
value_writer: VF,
|
||||
) -> Result<(), std::io::Error>
|
||||
where
|
||||
KF: Fn(&mut Self, KT) -> Result<(), std::io::Error> + Copy,
|
||||
VF: Fn(&mut Self, VT) -> Result<(), std::io::Error> + Copy,
|
||||
Self: Sized;
|
||||
|
||||
fn write_byte(&mut self, n: u8) -> Result<(), std::io::Error>;
|
||||
fn write_bytes(&mut self, bytes: &[u8]) -> Result<(), std::io::Error>;
|
||||
fn write_varint(&mut self, value: i32) -> Result<(), std::io::Error>;
|
||||
fn write_utf_with_len(&mut self, string: &str, len: usize) -> Result<(), std::io::Error>;
|
||||
fn write_utf(&mut self, string: &str) -> Result<(), std::io::Error>;
|
||||
fn write_short(&mut self, n: i16) -> Result<(), std::io::Error>;
|
||||
fn write_byte_array(&mut self, bytes: &[u8]) -> Result<(), std::io::Error>;
|
||||
fn write_int(&mut self, n: i32) -> Result<(), std::io::Error>;
|
||||
fn write_boolean(&mut self, b: bool) -> Result<(), std::io::Error>;
|
||||
fn write_nbt(&mut self, nbt: &azalea_nbt::Tag) -> Result<(), std::io::Error>;
|
||||
fn write_long(&mut self, n: i64) -> Result<(), std::io::Error>;
|
||||
fn write_resource_location(
|
||||
&mut self,
|
||||
location: &ResourceLocation,
|
||||
) -> Result<(), std::io::Error>;
|
||||
fn write_float(&mut self, n: f32) -> Result<(), std::io::Error>;
|
||||
fn write_double(&mut self, n: f64) -> Result<(), std::io::Error>;
|
||||
fn write_uuid(&mut self, uuid: &Uuid) -> Result<(), std::io::Error>;
|
||||
}
|
||||
|
||||
impl Writable for Vec<u8> {
|
||||
fn write_list<F, T>(&mut self, list: &[T], writer: F) -> Result<(), std::io::Error>
|
||||
where
|
||||
F: FnOnce(&mut Self, &T) -> Result<(), std::io::Error> + Copy,
|
||||
Self: Sized,
|
||||
{
|
||||
self.write_varint(list.len() as i32)?;
|
||||
for item in list {
|
||||
|
@ -72,7 +33,6 @@ impl Writable for Vec<u8> {
|
|||
where
|
||||
KF: Fn(&mut Self, KT) -> Result<(), std::io::Error> + Copy,
|
||||
VF: Fn(&mut Self, VT) -> Result<(), std::io::Error> + Copy,
|
||||
Self: Sized,
|
||||
{
|
||||
self.write_varint(map.len() as i32)?;
|
||||
for (key, value) in map {
|
||||
|
@ -87,7 +47,7 @@ impl Writable for Vec<u8> {
|
|||
}
|
||||
|
||||
fn write_bytes(&mut self, bytes: &[u8]) -> Result<(), std::io::Error> {
|
||||
self.extend_from_slice(bytes);
|
||||
self.write_all(bytes);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
@ -140,7 +100,10 @@ impl Writable for Vec<u8> {
|
|||
self.write_byte(if b { 1 } else { 0 })
|
||||
}
|
||||
|
||||
fn write_nbt(&mut self, nbt: &azalea_nbt::Tag) -> Result<(), std::io::Error> {
|
||||
fn write_nbt(&mut self, nbt: &azalea_nbt::Tag) -> Result<(), std::io::Error>
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
nbt.write(self)
|
||||
.map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e.to_string()))
|
||||
}
|
||||
|
@ -164,7 +127,10 @@ impl Writable for Vec<u8> {
|
|||
self.write_utf(&location.to_string())
|
||||
}
|
||||
|
||||
fn write_uuid(&mut self, uuid: &Uuid) -> Result<(), std::io::Error> {
|
||||
fn write_uuid(&mut self, uuid: &Uuid) -> Result<(), std::io::Error>
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
let [a, b, c, d] = uuid.to_int_array();
|
||||
a.write_into(self)?;
|
||||
b.write_into(self)?;
|
||||
|
@ -174,34 +140,30 @@ impl Writable for Vec<u8> {
|
|||
}
|
||||
}
|
||||
|
||||
pub trait McBufWritable
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error>;
|
||||
impl<W: Write + ?Sized> Writable for W {}
|
||||
|
||||
pub trait McBufWritable {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error>;
|
||||
}
|
||||
|
||||
pub trait McBufVarintWritable
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
fn varint_write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error>;
|
||||
pub trait McBufVarintWritable {
|
||||
fn varint_write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error>;
|
||||
}
|
||||
|
||||
impl McBufWritable for i32 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
Writable::write_int(buf, *self)
|
||||
}
|
||||
}
|
||||
|
||||
impl McBufVarintWritable for i32 {
|
||||
fn varint_write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn varint_write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(*self)
|
||||
}
|
||||
}
|
||||
|
||||
impl McBufWritable for UnsizedByteArray {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_bytes(self)
|
||||
}
|
||||
}
|
||||
|
@ -209,132 +171,132 @@ impl McBufWritable for UnsizedByteArray {
|
|||
// TODO: use specialization when that gets stabilized into rust
|
||||
// to optimize for Vec<u8> byte arrays
|
||||
impl<T: McBufWritable> McBufWritable for Vec<T> {
|
||||
default fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
default fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_list(self, |buf, i| T::write_into(i, buf))
|
||||
}
|
||||
}
|
||||
|
||||
impl McBufWritable for Vec<u8> {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte_array(self)
|
||||
}
|
||||
}
|
||||
|
||||
// string
|
||||
impl McBufWritable for String {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_utf(self)
|
||||
}
|
||||
}
|
||||
|
||||
// ResourceLocation
|
||||
impl McBufWritable for ResourceLocation {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_resource_location(self)
|
||||
}
|
||||
}
|
||||
|
||||
// u32
|
||||
impl McBufWritable for u32 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
i16::write_into(&(*self as i16), buf)
|
||||
}
|
||||
}
|
||||
|
||||
// u32 varint
|
||||
impl McBufVarintWritable for u32 {
|
||||
fn varint_write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn varint_write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
i32::varint_write_into(&(*self as i32), buf)
|
||||
}
|
||||
}
|
||||
|
||||
// u16
|
||||
impl McBufWritable for u16 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
i16::write_into(&(*self as i16), buf)
|
||||
}
|
||||
}
|
||||
|
||||
// u16 varint
|
||||
impl McBufVarintWritable for u16 {
|
||||
fn varint_write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn varint_write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
i32::varint_write_into(&(*self as i32), buf)
|
||||
}
|
||||
}
|
||||
|
||||
// u8
|
||||
impl McBufWritable for u8 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte(*self)
|
||||
}
|
||||
}
|
||||
|
||||
// i16
|
||||
impl McBufWritable for i16 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
Writable::write_short(buf, *self)
|
||||
}
|
||||
}
|
||||
|
||||
// i64
|
||||
impl McBufWritable for i64 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
Writable::write_long(buf, *self)
|
||||
}
|
||||
}
|
||||
|
||||
// u64
|
||||
impl McBufWritable for u64 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
i64::write_into(&(*self as i64), buf)
|
||||
}
|
||||
}
|
||||
|
||||
// bool
|
||||
impl McBufWritable for bool {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_boolean(*self)
|
||||
}
|
||||
}
|
||||
|
||||
// i8
|
||||
impl McBufWritable for i8 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte(*self as u8)
|
||||
}
|
||||
}
|
||||
|
||||
// f32
|
||||
impl McBufWritable for f32 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_float(*self)
|
||||
}
|
||||
}
|
||||
|
||||
// f64
|
||||
impl McBufWritable for f64 {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_double(*self)
|
||||
}
|
||||
}
|
||||
|
||||
// GameType
|
||||
impl McBufWritable for GameType {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
u8::write_into(&self.to_id(), buf)
|
||||
}
|
||||
}
|
||||
|
||||
// Option<GameType>
|
||||
impl McBufWritable for Option<GameType> {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte(GameType::to_optional_id(self) as u8)
|
||||
}
|
||||
}
|
||||
|
||||
// Option<String>
|
||||
impl<T: McBufWritable> McBufWritable for Option<T> {
|
||||
default fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
default fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
if let Some(s) = self {
|
||||
buf.write_boolean(true)?;
|
||||
s.write_into(buf)?;
|
||||
|
@ -347,14 +309,14 @@ impl<T: McBufWritable> McBufWritable for Option<T> {
|
|||
|
||||
// azalea_nbt::Tag
|
||||
impl McBufWritable for azalea_nbt::Tag {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_nbt(self)
|
||||
}
|
||||
}
|
||||
|
||||
// Difficulty
|
||||
impl McBufWritable for Difficulty {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
u8::write_into(&self.id(), buf)
|
||||
}
|
||||
}
|
||||
|
@ -371,7 +333,7 @@ impl McBufWritable for Component {
|
|||
// let component = Component::deserialize(json).map_err(|e| e.to_string())?;
|
||||
// Ok(component)
|
||||
// }
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
// component doesn't have serialize implemented yet
|
||||
todo!()
|
||||
}
|
||||
|
@ -379,7 +341,7 @@ impl McBufWritable for Component {
|
|||
|
||||
// Slot
|
||||
impl McBufWritable for Slot {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
match self {
|
||||
Slot::Empty => buf.write_byte(0)?,
|
||||
Slot::Present(i) => {
|
||||
|
@ -395,7 +357,7 @@ impl McBufWritable for Slot {
|
|||
|
||||
// Slot
|
||||
impl McBufWritable for Uuid {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_uuid(self)?;
|
||||
|
||||
Ok(())
|
||||
|
@ -404,7 +366,7 @@ impl McBufWritable for Uuid {
|
|||
|
||||
// BlockPos
|
||||
impl McBufWritable for BlockPos {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_long(
|
||||
(((self.x & 0x3FFFFFF) as i64) << 38)
|
||||
| (((self.z & 0x3FFFFFF) as i64) << 12)
|
||||
|
@ -415,7 +377,7 @@ impl McBufWritable for BlockPos {
|
|||
|
||||
// Direction
|
||||
impl McBufWritable for Direction {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(*self as i32)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
use super::GamePacket;
|
||||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
|
||||
use azalea_core::resource_location::ResourceLocation;
|
||||
use std::{hash::Hash, io::Read};
|
||||
use std::{
|
||||
hash::Hash,
|
||||
io::{Read, Write},
|
||||
};
|
||||
|
||||
#[derive(Hash, Clone, Debug)]
|
||||
pub struct ClientboundDeclareCommandsPacket {
|
||||
|
@ -14,7 +17,7 @@ impl ClientboundDeclareCommandsPacket {
|
|||
GamePacket::ClientboundDeclareCommandsPacket(self)
|
||||
}
|
||||
|
||||
pub fn write(&self, _buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
pub fn write(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
panic!("ClientboundDeclareCommandsPacket::write not implemented")
|
||||
}
|
||||
|
||||
|
@ -60,7 +63,7 @@ impl<T: McBufReadable> McBufReadable for BrigadierNumber<T> {
|
|||
}
|
||||
}
|
||||
impl<T: McBufWritable> McBufWritable for BrigadierNumber<T> {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
let mut flags = 0;
|
||||
if self.min.is_some() {
|
||||
flags |= 0x01;
|
||||
|
@ -101,7 +104,7 @@ impl McBufReadable for BrigadierString {
|
|||
}
|
||||
}
|
||||
impl McBufWritable for BrigadierString {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte(*self as u8)?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
use std::io::Read;
|
||||
|
||||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable};
|
||||
use packet_macros::GamePacket;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
pub struct ClientboundPlayerAbilitiesPacket {
|
||||
|
@ -32,7 +31,7 @@ impl McBufReadable for PlayerAbilitiesFlags {
|
|||
}
|
||||
|
||||
impl McBufWritable for PlayerAbilitiesFlags {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
let mut byte = 0;
|
||||
if self.invulnerable {
|
||||
byte = byte | 1;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
|
||||
use azalea_chat::component::Component;
|
||||
use packet_macros::{GamePacket, McBufReadable, McBufWritable};
|
||||
use std::io::Read;
|
||||
use std::io::{Read, Write};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
|
@ -75,7 +75,7 @@ impl McBufReadable for Action {
|
|||
}
|
||||
}
|
||||
impl McBufWritable for Action {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte(match self {
|
||||
Action::AddPlayer(_) => 0,
|
||||
Action::UpdateGameMode(_) => 1,
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
use std::io::Read;
|
||||
|
||||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable};
|
||||
use packet_macros::GamePacket;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
pub struct ClientboundPlayerPositionPacket {
|
||||
|
@ -41,7 +40,7 @@ impl McBufReadable for RelativeArguments {
|
|||
}
|
||||
|
||||
impl McBufWritable for RelativeArguments {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
let mut byte = 0;
|
||||
if self.x {
|
||||
byte = byte | 0b1;
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
|
||||
use azalea_core::{resource_location::ResourceLocation, Slot};
|
||||
use packet_macros::{GamePacket, McBufReadable, McBufWritable};
|
||||
use std::io::Read;
|
||||
|
||||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
|
||||
use std::io::{Read, Write};
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
pub struct ClientboundRecipePacket {
|
||||
|
@ -35,7 +34,7 @@ pub enum State {
|
|||
}
|
||||
|
||||
impl McBufWritable for State {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(*self as i32)?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
use std::io::Read;
|
||||
|
||||
use crate::{
|
||||
mc_buf::{Readable, Writable},
|
||||
packets::{McBufReadable, McBufWritable},
|
||||
|
@ -7,6 +5,7 @@ use crate::{
|
|||
use azalea_chat::component::Component;
|
||||
use azalea_core::{BlockPos, Direction, Slot};
|
||||
use packet_macros::{GamePacket, McBufReadable, McBufWritable};
|
||||
use std::io::{Read, Write};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
|
@ -40,7 +39,7 @@ impl McBufReadable for Vec<EntityDataItem> {
|
|||
}
|
||||
|
||||
impl McBufWritable for Vec<EntityDataItem> {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
for item in self {
|
||||
buf.write_byte(item.index)?;
|
||||
item.value.write_into(buf)?;
|
||||
|
@ -124,7 +123,7 @@ impl McBufReadable for EntityDataValue {
|
|||
}
|
||||
|
||||
impl McBufWritable for EntityDataValue {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
todo!();
|
||||
}
|
||||
}
|
||||
|
@ -399,7 +398,7 @@ impl McBufReadable for ParticleData {
|
|||
}
|
||||
|
||||
impl McBufWritable for ParticleData {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
|
||||
use azalea_core::resource_location::ResourceLocation;
|
||||
use packet_macros::{GamePacket, McBufReadable, McBufWritable};
|
||||
use std::io::Read;
|
||||
use std::io::{Read, Write};
|
||||
use uuid::Uuid;
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
|
@ -44,7 +44,7 @@ impl McBufReadable for Operation {
|
|||
}
|
||||
|
||||
impl McBufWritable for Operation {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_byte(*self as u8)?;
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use std::io::Read;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
use azalea_core::{resource_location::ResourceLocation, Slot};
|
||||
use packet_macros::{GamePacket, McBufReadable, McBufWritable};
|
||||
|
@ -35,7 +35,7 @@ pub struct ShapedRecipe {
|
|||
}
|
||||
|
||||
impl McBufWritable for ShapedRecipe {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(self.width.try_into().unwrap())?;
|
||||
buf.write_varint(self.height.try_into().unwrap())?;
|
||||
buf.write_utf(&self.group)?;
|
||||
|
@ -122,7 +122,7 @@ pub struct Ingredient {
|
|||
}
|
||||
|
||||
impl McBufWritable for Recipe {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,10 @@
|
|||
use crate::mc_buf::{McBufReadable, McBufWritable, Readable, Writable};
|
||||
use azalea_core::resource_location::ResourceLocation;
|
||||
use packet_macros::GamePacket;
|
||||
use std::{collections::HashMap, io::Read};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
io::{Read, Write},
|
||||
};
|
||||
|
||||
#[derive(Clone, Debug, GamePacket)]
|
||||
pub struct ClientboundUpdateTagsPacket {
|
||||
|
@ -33,7 +36,7 @@ impl McBufReadable for HashMap<ResourceLocation, Vec<Tags>> {
|
|||
}
|
||||
|
||||
impl McBufWritable for HashMap<ResourceLocation, Vec<Tags>> {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(self.len() as i32)?;
|
||||
for (k, v) in self {
|
||||
k.write_into(buf)?;
|
||||
|
@ -51,7 +54,7 @@ impl McBufReadable for Tags {
|
|||
}
|
||||
|
||||
impl McBufWritable for Tags {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
self.name.write_into(buf)?;
|
||||
buf.write_int_id_list(&self.elements)?;
|
||||
Ok(())
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use std::io::Read;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
use super::LoginPacket;
|
||||
use crate::mc_buf::{Readable, Writable};
|
||||
|
@ -17,7 +17,7 @@ impl ClientboundGameProfilePacket {
|
|||
LoginPacket::ClientboundGameProfilePacket(self)
|
||||
}
|
||||
|
||||
pub fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
pub fn write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
for n in self.game_profile.uuid.to_int_array() {
|
||||
buf.write_int(n as i32).unwrap();
|
||||
}
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
use std::{hash::Hash, io::Read};
|
||||
use std::{
|
||||
hash::Hash,
|
||||
io::{Read, Write},
|
||||
};
|
||||
|
||||
use super::LoginPacket;
|
||||
use crate::mc_buf::Readable;
|
||||
|
@ -15,7 +18,7 @@ impl ClientboundHelloPacket {
|
|||
LoginPacket::ClientboundHelloPacket(self)
|
||||
}
|
||||
|
||||
pub fn write(&self, _buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
pub fn write(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
panic!("ClientboundHelloPacket::write not implemented")
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
use std::{hash::Hash, io::Read};
|
||||
use std::{
|
||||
hash::Hash,
|
||||
io::{Read, Write},
|
||||
};
|
||||
|
||||
use crate::mc_buf::{Readable, Writable};
|
||||
|
||||
|
@ -14,7 +17,7 @@ impl ClientboundLoginCompressionPacket {
|
|||
LoginPacket::ClientboundLoginCompressionPacket(self)
|
||||
}
|
||||
|
||||
pub fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
pub fn write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(self.compression_threshold).unwrap();
|
||||
Ok(())
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@ pub mod handshake;
|
|||
pub mod login;
|
||||
pub mod status;
|
||||
|
||||
use std::io::Read;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
use crate::{
|
||||
connect::PacketFlow,
|
||||
|
@ -40,7 +40,7 @@ where
|
|||
/// Read a packet by its id, ConnectionProtocol, and flow
|
||||
fn read(id: u32, flow: &PacketFlow, buf: &mut impl Read) -> Result<Self, String>;
|
||||
|
||||
fn write(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error>;
|
||||
fn write(&self, buf: &mut impl Write) -> Result<(), std::io::Error>;
|
||||
}
|
||||
|
||||
impl McBufReadable for ConnectionProtocol {
|
||||
|
@ -51,7 +51,7 @@ impl McBufReadable for ConnectionProtocol {
|
|||
}
|
||||
|
||||
impl McBufWritable for ConnectionProtocol {
|
||||
fn write_into(&self, buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
buf.write_varint(*self as i32)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use std::io::Read;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
use azalea_chat::component::Component;
|
||||
use serde::Deserialize;
|
||||
|
@ -41,7 +41,7 @@ impl ClientboundStatusResponsePacket {
|
|||
StatusPacket::ClientboundStatusResponsePacket(self)
|
||||
}
|
||||
|
||||
pub fn write(&self, _buf: &mut Vec<u8>) -> Result<(), std::io::Error> {
|
||||
pub fn write(&self, _buf: &mut impl Write) -> Result<(), std::io::Error> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue