diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2022-10-02 12:29:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-02 12:29:47 -0500 |
| commit | c9b4dccd7eaeed68ce96cf5167916417d0baa6a7 (patch) | |
| tree | 0b381ee72a1486ccb22fe22158b5d7d3edaf3f99 /azalea-buf | |
| parent | aa78491ee09ec0c6879e6edde349ca67cf809daf (diff) | |
| download | azalea-drasl-c9b4dccd7eaeed68ce96cf5167916417d0baa6a7.tar.xz | |
All block shapes & collisions (#22)
* start adding shapes
* add more collision stuff
* DiscreteCubeMerger
* more mergers
* start adding BitSetDiscreteVoxelShape::join
* i love rust :smiley: :smiley: :smiley:
* r
* IT COMPILES????
* fix warning
* fix error
* fix more clippy issues
* add box_shape
* more shape stuff
* make DiscreteVoxelShape an enum
* Update shape.rs
* also make VoxelShape an enum
* implement BitSet::clear
* add more missing things
* it compiles
W
* start block shape codegen
* optimize shape codegen
* make az-block/blocks.rs look better (broken)
* almost new block macro
* make the codegen not generate 'type'
* try to fix
* work more on the blocks macro
* wait it compiles
* fix clippy issues
* shapes codegen works
* well it's almost working
* simplify some shape codegen
* enum type names are correct
* W it compiles
* cargo check no longer warns
* fix some clippy issues
* start making it so the shape impl is on BlockStates
* insane code
* new impl compiles
* fix wrong find_bits + TESTS PASS!
* add a test for slab collision
* fix clippy issues
* ok rust
* fix error that happens when on stairs
* add test for top slabs
* start adding join_is_not_empty
* add more to join_is_not_empty
* top slabs still don't work!!
* x..=0 doesn't work in rust :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley:
* remove comment since i added more useful names
* remove some printlns
* fix walls in some configurations erroring
* fix some warnings
* change comment to \`\`\`ignore instead of \`\`\`no_run
* players are .6 wide not .8
* fix clippy's complaints
* i missed one clippy warning
Diffstat (limited to 'azalea-buf')
| -rw-r--r-- | azalea-buf/src/definitions.rs | 33 | ||||
| -rw-r--r-- | azalea-buf/src/write.rs | 2 |
2 files changed, 2 insertions, 33 deletions
diff --git a/azalea-buf/src/definitions.rs b/azalea-buf/src/definitions.rs index ab75267b..ae7a7407 100644 --- a/azalea-buf/src/definitions.rs +++ b/azalea-buf/src/definitions.rs @@ -1,8 +1,4 @@ -use crate::{read::BufReadError, McBufReadable, McBufWritable}; -use std::{ - io::{Read, Write}, - ops::Deref, -}; +use std::ops::Deref; /// A Vec<u8> that isn't prefixed by a VarInt with the size. #[derive(Debug, Clone, PartialEq, Eq, Hash)] @@ -27,30 +23,3 @@ impl From<&str> for UnsizedByteArray { Self(s.as_bytes().to_vec()) } } - -/// Represents Java's BitSet, a list of bits. -#[derive(Debug, Clone, PartialEq, Eq, Hash)] -pub struct BitSet { - data: Vec<u64>, -} - -// the Index trait requires us to return a reference, but we can't do that -impl BitSet { - pub fn index(&self, index: usize) -> bool { - (self.data[index / 64] & (1u64 << (index % 64))) != 0 - } -} - -impl McBufReadable for BitSet { - fn read_from(buf: &mut impl Read) -> Result<Self, BufReadError> { - Ok(Self { - data: Vec::<u64>::read_from(buf)?, - }) - } -} - -impl McBufWritable for BitSet { - fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { - self.data.write_into(buf) - } -}
\ No newline at end of file diff --git a/azalea-buf/src/write.rs b/azalea-buf/src/write.rs index 0bbed25b..9b50a1c4 100644 --- a/azalea-buf/src/write.rs +++ b/azalea-buf/src/write.rs @@ -194,7 +194,7 @@ impl McBufWritable for u64 { impl McBufWritable for bool { fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> { - let byte: u8 = if *self { 1 } else { 0 }; + let byte = u8::from(*self); byte.write_into(buf) } } |