aboutsummaryrefslogtreecommitdiff
path: root/azalea-world/src
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2022-09-02 12:11:14 -0500
committerGitHub <noreply@github.com>2022-09-02 12:11:14 -0500
commitcfb190d00c70f1b09789e23f89a3c67840e0fd87 (patch)
tree9bdc021943753d60bf437526c4c294275eae13ac /azalea-world/src
parent32458d743f757da3193717fe5554f490703640c0 (diff)
downloadazalea-drasl-cfb190d00c70f1b09789e23f89a3c67840e0fd87.tar.xz
get rid of Readable & Writable (#21)
Diffstat (limited to 'azalea-world/src')
-rw-r--r--azalea-world/src/palette.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/azalea-world/src/palette.rs b/azalea-world/src/palette.rs
index 1b057e4f..ddb0c587 100644
--- a/azalea-world/src/palette.rs
+++ b/azalea-world/src/palette.rs
@@ -1,6 +1,4 @@
-use azalea_buf::{
- BufReadError, McBufReadable, McBufVarReadable, McBufWritable, Readable, Writable,
-};
+use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufWritable};
use std::io::{Read, Write};
use crate::BitStorage;
@@ -38,7 +36,7 @@ impl PalettedContainer {
buf: &mut impl Read,
container_type: &'static PalettedContainerType,
) -> Result<Self, BufReadError> {
- let bits_per_entry = buf.read_byte()?;
+ let bits_per_entry = u8::read_from(buf)?;
let palette_type = PaletteType::from_bits_and_type(bits_per_entry, container_type);
let palette = palette_type.read(buf)?;
let size = container_type.size();
@@ -181,7 +179,7 @@ impl PalettedContainer {
impl McBufWritable for PalettedContainer {
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
- buf.write_byte(self.bits_per_entry)?;
+ self.bits_per_entry.write_into(buf)?;
self.palette.write_into(buf)?;
self.storage.data.write_into(buf)?;
Ok(())