fix parsing Dust particle and treat waterlogged blocks as liquid in pathfinder

2 files changed, 5 insertions, 8 deletions

diff --git a/azalea-block/azalea-block-macros/src/lib.rs b/azalea-block/azalea-block-macros/src/lib.rs
index 742d1fc9..de13ff6e 100755
--- a/azalea-block/azalea-block-macros/src/lib.rs
+++ b/azalea-block/azalea-block-macros/src/lib.rs
@@ -694,11 +694,8 @@ pub fn make_block_states(input: TokenStream) -> TokenStream {
     let last_state_id = state_id - 1;
     let mut generated = quote! {
         impl BlockState {
-            /// Returns the highest possible state ID.
-            #[inline]
-            pub fn max_state() -> u32 {
-                #last_state_id
-            }
+            /// The highest possible block state ID.
+            pub const MAX_STATE: u32 = #last_state_id;
 
             /// Get a property from this block state. Will be `None` if the block can't have the property.
             ///
diff --git a/azalea-block/src/lib.rs b/azalea-block/src/lib.rs
index c1655919..3de0aa5a 100755
--- a/azalea-block/src/lib.rs
+++ b/azalea-block/src/lib.rs
@@ -56,7 +56,7 @@ impl BlockState {
 
     #[inline]
     pub fn is_valid_state(state_id: u32) -> bool {
-        state_id <= Self::max_state()
+        state_id <= Self::MAX_STATE
     }
 
     /// Returns true if the block is air. This only checks for normal air, not
@@ -184,8 +184,8 @@ mod tests {
     fn test_from_u32() {
         assert_eq!(BlockState::try_from(0).unwrap(), BlockState::AIR);
 
-        assert!(BlockState::try_from(BlockState::max_state()).is_ok());
-        assert!(BlockState::try_from(BlockState::max_state() + 1).is_err());
+        assert!(BlockState::try_from(BlockState::MAX_STATE).is_ok());
+        assert!(BlockState::try_from(BlockState::MAX_STATE + 1).is_err());
     }
 
     #[test]