From d9795a593aa51b7cd5e2d98484c05d9345eed71d Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 8 May 2022 18:55:56 -0500 Subject: Update palette.rs --- azalea-world/src/palette.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/azalea-world/src/palette.rs b/azalea-world/src/palette.rs index 47354c94..db722a5b 100644 --- a/azalea-world/src/palette.rs +++ b/azalea-world/src/palette.rs @@ -1,6 +1,4 @@ -use azalea_protocol::mc_buf::{ - McBufReadable, McBufVarintReadable, McBufWritable, Readable, Writable, -}; +use azalea_protocol::mc_buf::{McBufReadable, McBufVarReadable, McBufWritable, Readable, Writable}; use std::io::{Read, Write}; #[derive(Clone, Debug, Copy)] @@ -69,9 +67,9 @@ impl Palette { bits_per_entry: u8, ) -> Result { Ok(match bits_per_entry { - 0 => Palette::SingleValue(u32::varint_read_into(buf)?), - 1..=4 => Palette::Linear(Vec::::varint_read_into(buf)?), - 5..=8 => Palette::Hashmap(Vec::::varint_read_into(buf)?), + 0 => Palette::SingleValue(u32::var_read_into(buf)?), + 1..=4 => Palette::Linear(Vec::::var_read_into(buf)?), + 5..=8 => Palette::Hashmap(Vec::::var_read_into(buf)?), _ => Palette::Global, }) } @@ -81,8 +79,8 @@ impl Palette { bits_per_entry: u8, ) -> Result { Ok(match bits_per_entry { - 0 => Palette::SingleValue(u32::varint_read_into(buf)?), - 1..=3 => Palette::Linear(Vec::::varint_read_into(buf)?), + 0 => Palette::SingleValue(u32::var_read_into(buf)?), + 1..=3 => Palette::Linear(Vec::::var_read_into(buf)?), _ => Palette::Global, }) } -- cgit v1.2.3