fix for latest nightly by changing the FixedBitSet generic to take bytes instead of bits

11 files changed, 26 insertions, 26 deletions

diff --git a/azalea-protocol/src/packets/game/c_boss_event.rs b/azalea-protocol/src/packets/game/c_boss_event.rs
index e54ab59f..58d9f4bb 100755
--- a/azalea-protocol/src/packets/game/c_boss_event.rs
+++ b/azalea-protocol/src/packets/game/c_boss_event.rs
@@ -116,7 +116,7 @@ pub struct Properties {
 
 impl AzaleaRead for Properties {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<3>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 3_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(Self {
             darken_screen: set.index(0),
             play_music: set.index(1),
@@ -127,7 +127,7 @@ impl AzaleaRead for Properties {
 
 impl AzaleaWrite for Properties {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<3>::new();
+        let mut set = FixedBitSet::<{ 3_usize.div_ceil(8) }>::new();
         if self.darken_screen {
             set.set(0);
         }
diff --git a/azalea-protocol/src/packets/game/c_commands.rs b/azalea-protocol/src/packets/game/c_commands.rs
index 1a231559..c0ac27b2 100755
--- a/azalea-protocol/src/packets/game/c_commands.rs
+++ b/azalea-protocol/src/packets/game/c_commands.rs
@@ -46,7 +46,7 @@ impl<T: PartialEq> PartialEq for BrigadierNumber<T> {
 
 impl<T: AzaleaRead> AzaleaRead for BrigadierNumber<T> {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let flags = FixedBitSet::<2>::azalea_read(buf)?;
+        let flags = FixedBitSet::<{ 2_usize.div_ceil(8) }>::azalea_read(buf)?;
         let min = if flags.index(0) {
             Some(T::azalea_read(buf)?)
         } else {
@@ -62,7 +62,7 @@ impl<T: AzaleaRead> AzaleaRead for BrigadierNumber<T> {
 }
 impl<T: AzaleaWrite> AzaleaWrite for BrigadierNumber<T> {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut flags = FixedBitSet::<2>::new();
+        let mut flags = FixedBitSet::<{ 2_usize.div_ceil(8) }>::new();
         if self.min.is_some() {
             flags.set(0);
         }
@@ -156,7 +156,7 @@ pub struct EntityParser {
 }
 impl AzaleaRead for EntityParser {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let flags = FixedBitSet::<2>::azalea_read(buf)?;
+        let flags = FixedBitSet::<{ 2_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(EntityParser {
             single: flags.index(0),
             players_only: flags.index(1),
@@ -165,7 +165,7 @@ impl AzaleaRead for EntityParser {
 }
 impl AzaleaWrite for EntityParser {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut flags = FixedBitSet::<2>::new();
+        let mut flags = FixedBitSet::<{ 2_usize.div_ceil(8) }>::new();
         if self.single {
             flags.set(0);
         }
@@ -180,7 +180,7 @@ impl AzaleaWrite for EntityParser {
 // TODO: BrigadierNodeStub should have more stuff
 impl AzaleaRead for BrigadierNodeStub {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let flags = FixedBitSet::<8>::azalea_read(buf)?;
+        let flags = FixedBitSet::<{ 8_usize.div_ceil(8) }>::azalea_read(buf)?;
         if flags.index(5) || flags.index(6) || flags.index(7) {
             warn!("Warning: The flags from a Brigadier node are over 31. This is probably a bug.",);
         }
@@ -239,7 +239,7 @@ impl AzaleaRead for BrigadierNodeStub {
 
 impl AzaleaWrite for BrigadierNodeStub {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut flags = FixedBitSet::<4>::new();
+        let mut flags = FixedBitSet::<{ 4_usize.div_ceil(8) }>::new();
         if self.is_executable {
             flags.set(2);
         }
diff --git a/azalea-protocol/src/packets/game/c_player_abilities.rs b/azalea-protocol/src/packets/game/c_player_abilities.rs
index c32a99fe..fffd320c 100755
--- a/azalea-protocol/src/packets/game/c_player_abilities.rs
+++ b/azalea-protocol/src/packets/game/c_player_abilities.rs
@@ -23,7 +23,7 @@ pub struct PlayerAbilitiesFlags {
 
 impl AzaleaRead for PlayerAbilitiesFlags {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<4>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 4_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(PlayerAbilitiesFlags {
             invulnerable: set.index(0),
             flying: set.index(1),
@@ -35,7 +35,7 @@ impl AzaleaRead for PlayerAbilitiesFlags {
 
 impl AzaleaWrite for PlayerAbilitiesFlags {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<4>::new();
+        let mut set = FixedBitSet::<{ 4_usize.div_ceil(8) }>::new();
         if self.invulnerable {
             set.set(0);
         }
diff --git a/azalea-protocol/src/packets/game/c_player_info_update.rs b/azalea-protocol/src/packets/game/c_player_info_update.rs
index 73c463d5..eb019167 100644
--- a/azalea-protocol/src/packets/game/c_player_info_update.rs
+++ b/azalea-protocol/src/packets/game/c_player_info_update.rs
@@ -183,7 +183,7 @@ pub struct ActionEnumSet {
 
 impl AzaleaRead for ActionEnumSet {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<7>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 7_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(ActionEnumSet {
             add_player: set.index(0),
             initialize_chat: set.index(1),
@@ -199,7 +199,7 @@ impl AzaleaRead for ActionEnumSet {
 
 impl AzaleaWrite for ActionEnumSet {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<7>::new();
+        let mut set = FixedBitSet::<{ 7_usize.div_ceil(8) }>::new();
         if self.add_player {
             set.set(0);
         }
diff --git a/azalea-protocol/src/packets/game/c_player_position.rs b/azalea-protocol/src/packets/game/c_player_position.rs
index e742df22..c6a2e3f9 100755
--- a/azalea-protocol/src/packets/game/c_player_position.rs
+++ b/azalea-protocol/src/packets/game/c_player_position.rs
@@ -39,7 +39,7 @@ pub struct RelativeMovements {
 impl AzaleaRead for RelativeMovements {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
         // yes minecraft seriously wastes that many bits, smh
-        let set = FixedBitSet::<32>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 32_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(RelativeMovements {
             x: set.index(0),
             y: set.index(1),
@@ -56,7 +56,7 @@ impl AzaleaRead for RelativeMovements {
 
 impl AzaleaWrite for RelativeMovements {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<32>::new();
+        let mut set = FixedBitSet::<{ 32_usize.div_ceil(8) }>::new();
         let mut set_bit = |index: usize, value: bool| {
             if value {
                 set.set(index);
diff --git a/azalea-protocol/src/packets/game/c_stop_sound.rs b/azalea-protocol/src/packets/game/c_stop_sound.rs
index 0a01fa71..aa92c23e 100755
--- a/azalea-protocol/src/packets/game/c_stop_sound.rs
+++ b/azalea-protocol/src/packets/game/c_stop_sound.rs
@@ -1,6 +1,6 @@
 use std::io::{Cursor, Write};
 
-use azalea_buf::{BufReadError, AzaleaRead, AzaleaWrite};
+use azalea_buf::{AzaleaRead, AzaleaWrite, BufReadError};
 use azalea_core::{bitset::FixedBitSet, resource_location::ResourceLocation};
 use azalea_protocol_macros::ClientboundGamePacket;
 
@@ -14,7 +14,7 @@ pub struct ClientboundStopSound {
 
 impl AzaleaRead for ClientboundStopSound {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<2>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 2_usize.div_ceil(8) }>::azalea_read(buf)?;
         let source = if set.index(0) {
             Some(SoundSource::azalea_read(buf)?)
         } else {
@@ -32,7 +32,7 @@ impl AzaleaRead for ClientboundStopSound {
 
 impl AzaleaWrite for ClientboundStopSound {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<2>::new();
+        let mut set = FixedBitSet::<{ 2_usize.div_ceil(8) }>::new();
         if self.source.is_some() {
             set.set(0);
         }
diff --git a/azalea-protocol/src/packets/game/s_chat.rs b/azalea-protocol/src/packets/game/s_chat.rs
index 03bafd11..40c7e123 100755
--- a/azalea-protocol/src/packets/game/s_chat.rs
+++ b/azalea-protocol/src/packets/game/s_chat.rs
@@ -16,5 +16,5 @@ pub struct ServerboundChat {
 pub struct LastSeenMessagesUpdate {
     #[var]
     pub messages: u32,
-    pub acknowledged: FixedBitSet<20>,
+    pub acknowledged: FixedBitSet<{ 20_usize.div_ceil(8) }>,
 }
diff --git a/azalea-protocol/src/packets/game/s_player_abilities.rs b/azalea-protocol/src/packets/game/s_player_abilities.rs
index fdf2d8a4..5e63ef2e 100755
--- a/azalea-protocol/src/packets/game/s_player_abilities.rs
+++ b/azalea-protocol/src/packets/game/s_player_abilities.rs
@@ -13,7 +13,7 @@ pub struct ServerboundPlayerAbilities {
 
 impl AzaleaRead for ServerboundPlayerAbilities {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<2>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 2_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(Self {
             is_flying: set.index(1),
         })
@@ -22,7 +22,7 @@ impl AzaleaRead for ServerboundPlayerAbilities {
 
 impl AzaleaWrite for ServerboundPlayerAbilities {
     fn azalea_write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<2>::new();
+        let mut set = FixedBitSet::<{ 2_usize.div_ceil(8) }>::new();
         if self.is_flying {
             set.set(1);
         }
diff --git a/azalea-protocol/src/packets/game/s_player_input.rs b/azalea-protocol/src/packets/game/s_player_input.rs
index bd4ba970..6dbd47cd 100755
--- a/azalea-protocol/src/packets/game/s_player_input.rs
+++ b/azalea-protocol/src/packets/game/s_player_input.rs
@@ -18,7 +18,7 @@ pub struct ServerboundPlayerInput {
 
 impl AzaleaRead for ServerboundPlayerInput {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<7>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 7_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(Self {
             forward: set.index(0),
             backward: set.index(1),
@@ -33,7 +33,7 @@ impl AzaleaRead for ServerboundPlayerInput {
 
 impl AzaleaWrite for ServerboundPlayerInput {
     fn azalea_write(&self, buf: &mut impl std::io::Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<7>::new();
+        let mut set = FixedBitSet::<{ 7_usize.div_ceil(8) }>::new();
         if self.forward {
             set.set(0);
         }
diff --git a/azalea-protocol/src/packets/game/s_set_command_block.rs b/azalea-protocol/src/packets/game/s_set_command_block.rs
index dacb79de..ea1af6bb 100755
--- a/azalea-protocol/src/packets/game/s_set_command_block.rs
+++ b/azalea-protocol/src/packets/game/s_set_command_block.rs
@@ -30,7 +30,7 @@ impl AzaleaRead for ServerboundSetCommandBlock {
         let command = String::azalea_read(buf)?;
         let mode = Mode::azalea_read(buf)?;
 
-        let set = FixedBitSet::<3>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 3_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(Self {
             pos,
             command,
@@ -48,7 +48,7 @@ impl AzaleaWrite for ServerboundSetCommandBlock {
         self.command.azalea_write(buf)?;
         self.mode.azalea_write(buf)?;
 
-        let mut set = FixedBitSet::<3>::new();
+        let mut set = FixedBitSet::<{ 3_usize.div_ceil(8) }>::new();
         if self.track_output {
             set.set(0);
         }
diff --git a/azalea-protocol/src/packets/game/s_set_structure_block.rs b/azalea-protocol/src/packets/game/s_set_structure_block.rs
index 7f05a3a7..14b403ab 100755
--- a/azalea-protocol/src/packets/game/s_set_structure_block.rs
+++ b/azalea-protocol/src/packets/game/s_set_structure_block.rs
@@ -71,7 +71,7 @@ pub struct Flags {
 
 impl AzaleaRead for Flags {
     fn azalea_read(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
-        let set = FixedBitSet::<3>::azalea_read(buf)?;
+        let set = FixedBitSet::<{ 3_usize.div_ceil(8) }>::azalea_read(buf)?;
         Ok(Self {
             ignore_entities: set.index(0),
             show_air: set.index(1),
@@ -82,7 +82,7 @@ impl AzaleaRead for Flags {
 
 impl AzaleaWrite for Flags {
     fn azalea_write(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
-        let mut set = FixedBitSet::<3>::new();
+        let mut set = FixedBitSet::<{ 3_usize.div_ceil(8) }>::new();
         if self.ignore_entities {
             set.set(0);
         }