Use player.dat (#458)

* Use player.dat

* Simplify PlayerData handling

* Fix fmt after a few manual merges on github

* fixed a typo

* Fix format

* Fix fix

Author: Iaiao

Cargo.lock

@@ -24,6 +24,7 @@ nom_locate = "2"
 num-derive = "0.3"
 num-traits = "0.2"
 parking_lot = "0.11"
+quill-common = { path = "../../quill/common" }
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
 serde_with = "1"

feather/base/Cargo.toml

@@ -1,31 +1,58 @@
-use generated::{Item, ItemStack};
-use nbt::Value;
-use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
     fs,
     fs::File,
     path::{Path, PathBuf},
 };
+
+use nbt::Value;
+use serde::{Deserialize, Serialize};
 use uuid::Uuid;
 
+use generated::{Item, ItemStack};
+use quill_common::components::{
+    CanBuild, CanCreativeFly, CreativeFlying, CreativeFlyingSpeed, Instabreak, Invulnerable,
+    WalkSpeed,
+};
+
 use crate::inventory::*;
 
 use super::entity::{AnimalData, ItemNbt};
 
 /// Represents the contents of a player data file.
-#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct PlayerData {
     // Inherit base entity data
     #[serde(flatten)]
     pub animal: AnimalData,
 
     #[serde(rename = "playerGameType")]
     pub gamemode: i32,
+    #[serde(rename = "previousPlayerGameType")]
+    pub previous_gamemode: i32,
     #[serde(rename = "Inventory")]
     pub inventory: Vec<InventorySlot>,
     #[serde(rename = "SelectedItemSlot")]
     pub held_item: i32,
+    pub abilities: PlayerAbilities,
+}
+
+/// Represents player's abilities (flying, invulnerability, speed, etc.)
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PlayerAbilities {
+    #[serde(rename = "walkSpeed")]
+    pub walk_speed: WalkSpeed,
+    #[serde(rename = "flySpeed")]
+    pub fly_speed: CreativeFlyingSpeed,
+    #[serde(rename = "mayfly")]
+    pub may_fly: CanCreativeFly,
+    #[serde(rename = "flying")]
+    pub is_flying: CreativeFlying,
+    #[serde(rename = "mayBuild")]
+    pub may_build: CanBuild,
+    #[serde(rename = "instabuild")]
+    pub instabreak: Instabreak,
+    pub invulnerable: Invulnerable,
 }
 
 /// Represents a single inventory slot (including position index).
@@ -159,21 +186,28 @@ fn file_path(world_dir: &Path, uuid: Uuid) -> PathBuf {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use std::collections::HashMap;
+    use std::io::Cursor;
+
+    use num_traits::ToPrimitive;
+
     use crate::{
         inventory::{SLOT_ARMOR_CHEST, SLOT_ARMOR_FEET, SLOT_ARMOR_HEAD, SLOT_ARMOR_LEGS},
         Gamemode,
     };
-    use num_traits::ToPrimitive;
-    use std::collections::HashMap;
-    use std::io::Cursor;
+
+    use super::*;
 
     #[test]
     fn test_deserialize_player() {
         let mut cursor = Cursor::new(include_bytes!("player.dat").to_vec());
 
         let player: PlayerData = nbt::from_gzip_reader(&mut cursor).unwrap();
         assert_eq!(player.gamemode, Gamemode::Creative.to_i32().unwrap());
+        assert_eq!(
+            player.previous_gamemode,
+            Gamemode::Spectator.to_i32().unwrap()
+        );
         assert_eq!(player.inventory[0].item, "minecraft:diamond_shovel");
         assert_eq!(player.inventory[0].nbt, Some(ItemNbt { damage: Some(3) }));
     }

feather/base/src/anvil/player.dat

@@ -25,10 +25,6 @@ impl HotbarSlot {
         Self(id)
     }
 
-    pub fn default() -> Self {
-        Self(0)
-    }
-
     pub fn get(&self) -> usize {
         self.0
     }
@@ -42,3 +38,9 @@ impl HotbarSlot {
         Ok(())
     }
 }
+
+impl Default for HotbarSlot {
+    fn default() -> Self {
+        HotbarSlot(0)
+    }
+}

feather/base/src/anvil/player.rs

@@ -1,9 +1,13 @@
+use std::{path::PathBuf, sync::Arc};
+
 use ahash::{AHashMap, AHashSet};
+use parking_lot::{RwLockReadGuard, RwLockWriteGuard};
+use uuid::Uuid;
+
+use base::anvil::player::PlayerData;
 use base::{BlockPosition, Chunk, ChunkHandle, ChunkLock, ChunkPosition, CHUNK_HEIGHT};
 use blocks::BlockId;
 use ecs::{Ecs, SysResult};
-use parking_lot::{RwLockReadGuard, RwLockWriteGuard};
-use std::{path::PathBuf, sync::Arc};
 use worldgen::{ComposableGenerator, WorldGenerator};
 
 use crate::{
@@ -24,6 +28,7 @@ pub struct World {
     chunk_worker: ChunkWorker,
     loading_chunks: AHashSet<ChunkPosition>,
     canceled_chunk_loads: AHashSet<ChunkPosition>,
+    world_dir: PathBuf,
 }
 
 impl Default for World {
@@ -37,6 +42,7 @@ impl Default for World {
             cache: ChunkCache::new(),
             loading_chunks: AHashSet::new(),
             canceled_chunk_loads: AHashSet::new(),
+            world_dir: "world".into(),
         }
     }
 }
@@ -48,9 +54,10 @@ impl World {
 
     pub fn with_gen_and_path(
         generator: Arc<dyn WorldGenerator>,
-        world_dir: impl Into<PathBuf>,
+        world_dir: impl Into<PathBuf> + Clone,
     ) -> Self {
         Self {
+            world_dir: world_dir.clone().into(),
             chunk_worker: ChunkWorker::new(world_dir, generator),
             ..Default::default()
         }
@@ -149,6 +156,17 @@ impl World {
     pub fn chunk_map_mut(&mut self) -> &mut ChunkMap {
         &mut self.chunk_map
     }
+
+    pub fn load_player_data(&self, uuid: Uuid) -> anyhow::Result<PlayerData> {
+        Ok(base::anvil::player::load_player_data(
+            &self.world_dir,
+            uuid,
+        )?)
+    }
+
+    pub fn save_player_data(&self, uuid: Uuid, data: &PlayerData) -> anyhow::Result<()> {
+        base::anvil::player::save_player_data(&self.world_dir, uuid, data)
+    }
 }
 
 pub type ChunkMapInner = AHashMap<ChunkPosition, ChunkHandle>;

feather/common/src/entities/player.rs

@@ -18,6 +18,7 @@ generated = { path = "../generated", package = "feather-generated" }
 hematite-nbt = { git = "https://github.com/PistonDevelopers/hematite_nbt" }
 num-traits = "0.2"
 parking_lot = "0.11" # Arc<RwLock<Chunk>> compat
+quill-common = { path = "../../quill/common" }
 serde = "1"
 thiserror = "1"
 uuid = "0.8"

feather/common/src/world.rs

@@ -8,6 +8,7 @@ use base::{
 };
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
 use num_traits::{FromPrimitive, ToPrimitive};
+use quill_common::components::PreviousGamemode;
 use serde::{de::DeserializeOwned, Serialize};
 use std::{
     borrow::Cow,
@@ -887,3 +888,18 @@ impl Writeable for Gamemode {
         Ok(())
     }
 }
+
+impl Readable for PreviousGamemode {
+    fn read(buffer: &mut Cursor<&[u8]>, version: ProtocolVersion) -> anyhow::Result<Self>
+    where
+        Self: Sized,
+    {
+        Ok(Self::from_id(i8::read(buffer, version)?))
+    }
+}
+
+impl Writeable for PreviousGamemode {
+    fn write(&self, buffer: &mut Vec<u8>, version: ProtocolVersion) -> anyhow::Result<()> {
+        self.id().write(buffer, version)
+    }
+}

feather/protocol/Cargo.toml

@@ -1,15 +1,16 @@
 use anyhow::bail;
+
 use base::{BlockState, EntityMetadata, Gamemode, ParticleKind, ProfileProperty};
+pub use chunk_data::{ChunkData, ChunkDataKind};
+use quill_common::components::PreviousGamemode;
+pub use update_light::UpdateLight;
 
-use super::*;
 use crate::{io::VarLong, Readable, Writeable};
 
-mod chunk_data;
-pub use chunk_data::{ChunkData, ChunkDataKind};
+use super::*;
 
+mod chunk_data;
 mod update_light;
-pub use update_light::UpdateLight;
-
 packets! {
     SpawnEntity {
         entity_id VarInt;
@@ -374,7 +375,7 @@ packets! {
         entity_id i32;
         is_hardcore bool;
         gamemode Gamemode;
-        previous_gamemode u8; // can be 255 if "not set," otherwise corresponds to a gamemode ID
+        previous_gamemode PreviousGamemode; // can be -1 if "not set", otherwise corresponds to a gamemode ID
         world_names VarIntPrefixedVec<String>;
 
         dimension_codec Nbt<Blob>;

feather/protocol/src/io.rs

@@ -30,6 +30,7 @@ hematite-nbt = { git = "https://github.com/PistonDevelopers/hematite_nbt" }
 log = "0.4"
 md-5 = "0.9"
 num-bigint = "0.4"
+num-traits = "0.2"
 once_cell = "1"
 parking_lot = "0.11"
 plugin-host = { path = "../plugin-host", package = "feather-plugin-host" }