feather-rs · Defman · Sep 27, 2021 · Sep 10, 2021 · Sep 10, 2021 · Sep 10, 2021
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
     "libcraft/macros",
     "libcraft/particles",
     "libcraft/text",
+    "libcraft/inventory",
 
     # Quill
     "quill/sys-macros",
@@ -29,7 +30,6 @@ members = [
 
     # Feather (common and server)
     "feather/utils",
-    "feather/generated",
     "feather/blocks",
     "feather/blocks/generator",
     "feather/base",

diff --git a/feather/base/Cargo.toml b/feather/base/Cargo.toml
@@ -12,13 +12,15 @@ bitflags = "1"
 bitvec = "0.21"
 blocks = { path = "../blocks", package = "feather-blocks" }
 byteorder = "1"
-generated = { path = "../generated", package = "feather-generated" }
 hematite-nbt = { git = "https://github.com/PistonDevelopers/hematite_nbt" }
+
 libcraft-blocks = { path = "../../libcraft/blocks" }
 libcraft-core = { path = "../../libcraft/core" }
 libcraft-items = { path = "../../libcraft/items" }
 libcraft-particles = { path = "../../libcraft/particles" }
-libcraft-text = { path = "../../libcraft/text" } 
+libcraft-text = { path = "../../libcraft/text" }
+libcraft-inventory = { path = "../../libcraft/inventory" } 
+
 nom = "5"
 nom_locate = "2"
 num-derive = "0.3"

diff --git a/feather/base/src/anvil/entity.rs b/feather/base/src/anvil/entity.rs
@@ -1,5 +1,5 @@
 use arrayvec::ArrayVec;
-use generated::{Item, ItemStack};
+use libcraft_items::{Item, ItemStack, ItemStackBuilder};
 use serde::ser::Error;
 use serde::{Deserialize, Serialize, Serializer};
 use thiserror::Error;
@@ -219,8 +219,8 @@ where
             Some(nbt)
         };
         Self {
-            count: stack.count as i8,
-            item: stack.item.name().to_owned(),
+            count: stack.count() as i8,
+            item: stack.item().name().to_owned(),
             nbt,
         }
     }
@@ -235,12 +235,22 @@ pub struct ItemNbt {
 }
 
 impl ItemNbt {
-    /// Create an `ItemStack` of the specified item and amount, setting any nbt present.
+    /// Create an `ItemStack` of the specified item and amount, setting any NBT present.
+    ///
+    /// # Panics
+    /// Panics if `count` is zero.
     pub fn item_stack(nbt: &Option<Self>, item: Item, count: u8) -> ItemStack {
-        ItemStack {
-            count: count as u32,
-            item,
-            damage: nbt.as_ref().map(|n| n.damage).flatten().map(|x| x as u32),
+        match nbt {
+            Some(ItemNbt {
+                damage: Some(damage),
+            }) => ItemStackBuilder::with_item(item)
+                .count(count as u32)
+                .damage(*damage)
+                .into(),
+
+            Some(ItemNbt { damage: None }) | None => {
+                ItemStackBuilder::with_item(item).count(count as u32).into()
+            }
         }
     }
 }
@@ -252,7 +262,7 @@ where
     fn from(s: S) -> Self {
         let stack = s.borrow();
         Self {
-            damage: stack.damage.map(|d| d as i32),
+            damage: stack.damage_taken().map(|d| d as i32),
         }
     }
 }

diff --git a/feather/base/src/anvil/level.rs b/feather/base/src/anvil/level.rs
@@ -1,6 +1,7 @@
 //! Implements level.dat file loading.
 
-use generated::{Biome, Item};
+use libcraft_core::Biome;
+use libcraft_items::Item;
 use serde::{Deserialize, Serialize};
 use std::io::{Cursor, Read, Write};
 use std::{collections::HashMap, fs::File};

diff --git a/feather/base/src/anvil/player.rs b/feather/base/src/anvil/player.rs
@@ -1,3 +1,4 @@
+use libcraft_items::{Item, ItemStack};
 use std::{
     collections::HashMap,
     fs,
@@ -9,7 +10,6 @@ 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,
@@ -99,9 +99,9 @@ impl InventorySlot {
             Some(nbt)
         };
         Self {
-            count: stack.count as i8,
+            count: stack.count() as i8,
             slot,
-            item: stack.item.name().to_owned(),
+            item: stack.item().name().to_owned(),
             nbt,
         }
     }
@@ -222,8 +222,8 @@ mod tests {
         };
 
         let item_stack: ItemStack = slot.into();
-        assert_eq!(item_stack.item, Item::Feather);
-        assert_eq!(item_stack.count, 1);
+        assert_eq!(item_stack.item(), Item::Feather);
+        assert_eq!(item_stack.count(), 1);
     }
 
     #[test]
@@ -236,9 +236,9 @@ mod tests {
         };
 
         let item_stack: ItemStack = slot.into();
-        assert_eq!(item_stack.item, Item::DiamondAxe);
-        assert_eq!(item_stack.count, 1);
-        assert_eq!(item_stack.damage, Some(42));
+        assert_eq!(item_stack.item(), Item::DiamondAxe);
+        assert_eq!(item_stack.count(), 1);
+        assert_eq!(item_stack.damage_taken(), Some(42));
     }
 
     #[test]
@@ -251,7 +251,7 @@ mod tests {
         };
 
         let item_stack: ItemStack = slot.into();
-        assert_eq!(item_stack.item, Item::Air);
+        assert_eq!(item_stack.item(), Item::Air);
     }
 
     #[test]
@@ -285,7 +285,10 @@ mod tests {
             };
             assert_eq!(slot.convert_index().unwrap(), expected);
             assert_eq!(
-                InventorySlot::from_network_index(expected, ItemStack::new(Item::Stone, 1)),
+                InventorySlot::from_network_index(
+                    expected,
+                    ItemStack::new(Item::Stone, 1).unwrap()
+                ),
                 Some(slot),
             );
         }

diff --git a/feather/base/src/anvil/region.rs b/feather/base/src/anvil/region.rs
@@ -10,7 +10,7 @@ use super::{block_entity::BlockEntityData, entity::EntityData};
 use bitvec::{bitvec, vec::BitVec};
 use blocks::BlockId;
 use byteorder::{BigEndian, ReadBytesExt, WriteBytesExt};
-use generated::Biome;
+use libcraft_core::Biome;
 use serde::{Deserialize, Serialize};
 use std::borrow::Cow;
 use std::collections::BTreeMap;

diff --git a/feather/base/src/chunk.rs b/feather/base/src/chunk.rs
@@ -1,7 +1,7 @@
 use std::usize;
 
 use ::blocks::BlockId;
-use generated::Biome;
+use libcraft_core::Biome;
 
 use crate::ChunkPosition;
 

diff --git a/feather/base/src/chunk/biome_store.rs b/feather/base/src/chunk/biome_store.rs
@@ -1,4 +1,4 @@
-use generated::Biome;
+use libcraft_core::Biome;
 
 use crate::{CHUNK_HEIGHT, CHUNK_WIDTH};
 

diff --git a/feather/base/src/lib.rs b/feather/base/src/lib.rs
@@ -20,9 +20,13 @@ pub use block::{BlockPositionValidationError, ValidBlockPosition};
 pub use blocks::*;
 pub use chunk::{Chunk, ChunkSection, CHUNK_HEIGHT, CHUNK_WIDTH};
 pub use chunk_lock::*;
-pub use generated::{Area, Biome, EntityKind, Inventory, Item, ItemStack};
+
 pub use libcraft_blocks::{BlockKind, BlockState};
-pub use libcraft_core::{position, vec3, BlockPosition, ChunkPosition, Gamemode, Position, Vec3d};
+pub use libcraft_core::{
+    position, vec3, Biome, BlockPosition, ChunkPosition, EntityKind, Gamemode, Position, Vec3d,
+};
+pub use libcraft_inventory::{Area, Inventory};
+pub use libcraft_items::{Item, ItemStack, ItemStackBuilder, ItemStackError};
 pub use libcraft_particles::{Particle, ParticleKind};
 pub use libcraft_text::{deserialize_text, Text, Title};
 #[doc(inline)]

diff --git a/feather/base/src/metadata.rs b/feather/base/src/metadata.rs
@@ -4,7 +4,7 @@
 
 use crate::{Direction, ValidBlockPosition};
 use bitflags::bitflags;
-use generated::ItemStack;
+use libcraft_items::InventorySlot;
 use std::collections::BTreeMap;
 use uuid::Uuid;
 
@@ -44,7 +44,7 @@ pub enum MetaEntry {
     String(String),
     Chat(String),
     OptChat(OptChat),
-    Slot(Option<ItemStack>),
+    Slot(InventorySlot),
     Boolean(bool),
     Rotation(f32, f32, f32),
     Position(ValidBlockPosition),
@@ -119,7 +119,7 @@ impl ToMetaEntry for OptChat {
     }
 }
 
-impl ToMetaEntry for Option<ItemStack> {
+impl ToMetaEntry for InventorySlot {
     fn to_meta_entry(&self) -> MetaEntry {
         MetaEntry::Slot(self.clone())
     }

diff --git a/feather/blocks/Cargo.toml b/feather/blocks/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2018"
 [dependencies]
 anyhow = "1"
 bincode = "1"
-feather-generated = { path = "../generated" }
 num-traits = "0.2"
 once_cell = { version = "1" }
 serde = { version = "1", features = [ "derive" ] }
 thiserror = "1"
 vek = "0.14"
+libcraft-blocks = { path = "../../libcraft/blocks" }
diff --git a/feather/blocks/generator/src/lib.rs b/feather/blocks/generator/src/lib.rs
@@ -43,7 +43,7 @@ struct Property {
     /// CamelCase name of this property if it were a struct or enum.
     ///
     /// Often prefixed with the name of the block to which this property belongs.
-    name_camel_case: Ident,
+    _name_camel_case: Ident,
     /// The kind of this property.
     kind: PropertyKind,
     /// Possible values of this property.

diff --git a/feather/blocks/generator/src/load.rs b/feather/blocks/generator/src/load.rs
@@ -146,7 +146,7 @@ impl PropertyStore {
         Property {
             name: ident(name),
             real_name: real_name.to_owned(),
-            name_camel_case: ident(name.to_camel_case()),
+            _name_camel_case: ident(name.to_camel_case()),
             kind: guess_property_kind(&possible_values, &name.to_camel_case()),
             possible_values,
         }

diff --git a/feather/blocks/src/categories.rs b/feather/blocks/src/categories.rs
@@ -1,5 +1,5 @@
 use crate::{BlockId, BlockKind};
-use feather_generated::SimplifiedBlockKind;
+use libcraft_blocks::SimplifiedBlockKind;
 
 #[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum PlacementType {

diff --git a/feather/blocks/src/lib.rs b/feather/blocks/src/lib.rs
@@ -1,9 +1,8 @@
+pub use libcraft_blocks::{BlockKind, SimplifiedBlockKind};
 use num_traits::FromPrimitive;
 use std::convert::TryFrom;
 use thiserror::Error;
 
-pub use feather_generated::{BlockKind, SimplifiedBlockKind};
-
 pub mod categories;
 mod directions;
 #[allow(warnings)]

diff --git a/feather/common/Cargo.toml b/feather/common/Cargo.toml
@@ -11,7 +11,6 @@ base = { path = "../base", package = "feather-base" }
 blocks = { path = "../blocks", package = "feather-blocks" }
 ecs = { path = "../ecs", package = "feather-ecs" }
 flume = "0.10"
-generated = { path = "../generated", package = "feather-generated" }
 itertools = "0.10"
 log = "0.4"
 parking_lot = "0.11"
@@ -20,6 +19,8 @@ smartstring = "0.2"
 utils = { path = "../utils", package = "feather-utils" }
 uuid = { version = "0.8", features = [ "v4" ] }
 libcraft-core = { path = "../../libcraft/core" }
+libcraft-inventory = { path = "../../libcraft/inventory" }
+libcraft-items = { path = "../../libcraft/items" }
 rayon = "1.5"
 worldgen = { path = "../worldgen", package = "feather-worldgen" }
 rand = "0.8"
diff --git a/feather/common/src/entities/player.rs b/feather/common/src/entities/player.rs
@@ -38,9 +38,3 @@ impl HotbarSlot {
         Ok(())
     }
 }
-
-impl Default for HotbarSlot {
-    fn default() -> Self {
-        HotbarSlot(0)
-    }
-}