feather-rs · MrGunflame · Sep 11, 2021 · Sep 11, 2021 · Sep 11, 2021 · Sep 11, 2021
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -78,7 +78,7 @@ The component can then be accessed both from Feather and from plugins.
 In Feather, events are components. An entity with the `PlayerJoinEvent` component just joined
 the game, for example.
 
-The event sytsem serves as a mechanism to communicate between different crates and modules.
+The event system serves as a mechanism to communicate between different crates and modules.
 For example, triggering a `BlockChangeEvent` _anywhere_ causes `feather-server` to send block
 update packets to players.
 

diff --git a/feather/common/src/entities/bat.rs b/feather/common/src/entities/bat.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Bat;
+use quill_common::{components::Health, entities::Bat};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Bat).add(EntityKind::Bat);
+    builder.add(Bat).add(Health::new(6)).add(EntityKind::Bat);
 }
diff --git a/feather/common/src/entities/bee.rs b/feather/common/src/entities/bee.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Bee;
+use quill_common::{components::Health, entities::Bee};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Bee).add(EntityKind::Bee);
+    builder.add(Bee).add(Health::new(10)).add(EntityKind::Bee);
 }
diff --git a/feather/common/src/entities/blaze.rs b/feather/common/src/entities/blaze.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Blaze;
+use quill_common::{components::Health, entities::Blaze};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Blaze).add(EntityKind::Blaze);
+    builder
+        .add(Blaze)
+        .add(Health::new(20))
+        .add(EntityKind::Blaze);
 }
diff --git a/feather/common/src/entities/boat.rs b/feather/common/src/entities/boat.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Boat;
+use quill_common::{components::Health, entities::Boat};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Boat).add(EntityKind::Boat);
+    builder.add(Boat).add(Health::new(6)).add(EntityKind::Boat);
 }
diff --git a/feather/common/src/entities/cat.rs b/feather/common/src/entities/cat.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Cat;
+use quill_common::{components::Health, entities::Cat};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Cat).add(EntityKind::Cat);
+    builder.add(Cat).add(Health::new(10)).add(EntityKind::Cat);
 }
diff --git a/feather/common/src/entities/cave_spider.rs b/feather/common/src/entities/cave_spider.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::CaveSpider;
+use quill_common::{components::Health, entities::CaveSpider};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(CaveSpider).add(EntityKind::CaveSpider);
+    builder
+        .add(CaveSpider)
+        .add(Health::new(12))
+        .add(EntityKind::CaveSpider);
 }
diff --git a/feather/common/src/entities/chest_minecart.rs b/feather/common/src/entities/chest_minecart.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::ChestMinecart;
+use quill_common::{components::Health, entities::ChestMinecart};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(ChestMinecart).add(EntityKind::ChestMinecart);
+    builder
+        .add(ChestMinecart)
+        .add(Health::new(6))
+        .add(EntityKind::ChestMinecart);
 }
diff --git a/feather/common/src/entities/chicken.rs b/feather/common/src/entities/chicken.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Chicken;
+use quill_common::{components::Health, entities::Chicken};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Chicken).add(EntityKind::Chicken);
+    builder
+        .add(Chicken)
+        .add(Health::new(4))
+        .add(EntityKind::Chicken);
 }
diff --git a/feather/common/src/entities/cod.rs b/feather/common/src/entities/cod.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Cod;
+use quill_common::{components::Health, entities::Cod};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Cod).add(EntityKind::Cod);
+    builder.add(Cod).add(Health::new(3)).add(EntityKind::Cod);
 }
diff --git a/feather/common/src/entities/command_block_minecart.rs b/feather/common/src/entities/command_block_minecart.rs
@@ -1,10 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::CommandBlockMinecart;
+use quill_common::{components::Health, entities::CommandBlockMinecart};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
     builder
         .add(CommandBlockMinecart)
+        .add(Health::new(6))
         .add(EntityKind::CommandBlockMinecart);
 }
diff --git a/feather/common/src/entities/cow.rs b/feather/common/src/entities/cow.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Cow;
+use quill_common::{components::Health, entities::Cow};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Cow).add(EntityKind::Cow);
+    builder.add(Cow).add(Health::new(10)).add(EntityKind::Cow);
 }
diff --git a/feather/common/src/entities/creeper.rs b/feather/common/src/entities/creeper.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Creeper;
+use quill_common::{components::Health, entities::Creeper};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Creeper).add(EntityKind::Creeper);
+    builder
+        .add(Creeper)
+        .add(Health::new(20))
+        .add(EntityKind::Creeper);
 }
diff --git a/feather/common/src/entities/dolphin.rs b/feather/common/src/entities/dolphin.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Dolphin;
+use quill_common::{components::Health, entities::Dolphin};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Dolphin).add(EntityKind::Dolphin);
+    builder
+        .add(Dolphin)
+        .add(Health::new(10))
+        .add(EntityKind::Dolphin);
 }
diff --git a/feather/common/src/entities/drowned.rs b/feather/common/src/entities/drowned.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Drowned;
+use quill_common::{components::Health, entities::Drowned};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Drowned).add(EntityKind::Drowned);
+    builder
+        .add(Drowned)
+        .add(Health::new(20))
+        .add(EntityKind::Drowned);
 }
diff --git a/feather/common/src/entities/elder_guardian.rs b/feather/common/src/entities/elder_guardian.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::ElderGuardian;
+use quill_common::{components::Health, entities::ElderGuardian};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(ElderGuardian).add(EntityKind::ElderGuardian);
+    builder
+        .add(ElderGuardian)
+        .add(Health::new(80))
+        .add(EntityKind::ElderGuardian);
 }
diff --git a/feather/common/src/entities/end_crystal.rs b/feather/common/src/entities/end_crystal.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::EndCrystal;
+use quill_common::{components::Health, entities::EndCrystal};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(EndCrystal).add(EntityKind::EndCrystal);
+    builder
+        .add(EndCrystal)
+        .add(Health::new(5))
+        .add(EntityKind::EndCrystal);
 }
diff --git a/feather/common/src/entities/ender_dragon.rs b/feather/common/src/entities/ender_dragon.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::EnderDragon;
+use quill_common::{components::Health, entities::EnderDragon};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(EnderDragon).add(EntityKind::EnderDragon);
+    builder
+        .add(EnderDragon)
+        .add(Health::new(200))
+        .add(EntityKind::EnderDragon);
 }
diff --git a/feather/common/src/entities/enderman.rs b/feather/common/src/entities/enderman.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Enderman;
+use quill_common::{components::Health, entities::Enderman};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Enderman).add(EntityKind::Enderman);
+    builder
+        .add(Enderman)
+        .add(Health::new(40))
+        .add(EntityKind::Enderman);
 }
diff --git a/feather/common/src/entities/endermite.rs b/feather/common/src/entities/endermite.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Endermite;
+use quill_common::{components::Health, entities::Endermite};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Endermite).add(EntityKind::Endermite);
+    builder
+        .add(Endermite)
+        .add(Health::new(8))
+        .add(EntityKind::Endermite);
 }
diff --git a/feather/common/src/entities/evoker.rs b/feather/common/src/entities/evoker.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Evoker;
+use quill_common::{components::Health, entities::Evoker};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Evoker).add(EntityKind::Evoker);
+    builder
+        .add(Evoker)
+        .add(Health::new(24))
+        .add(EntityKind::Evoker);
 }
diff --git a/feather/common/src/entities/experience_orb.rs b/feather/common/src/entities/experience_orb.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::ExperienceOrb;
+use quill_common::{components::Health, entities::ExperienceOrb};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(ExperienceOrb).add(EntityKind::ExperienceOrb);
+    builder
+        .add(ExperienceOrb)
+        .add(Health::new(5))
+        .add(EntityKind::ExperienceOrb);
 }
diff --git a/feather/common/src/entities/fox.rs b/feather/common/src/entities/fox.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Fox;
+use quill_common::{components::Health, entities::Fox};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Fox).add(EntityKind::Fox);
+    builder.add(Fox).add(Health::new(10)).add(EntityKind::Fox);
 }
diff --git a/feather/common/src/entities/furnace_minecart.rs b/feather/common/src/entities/furnace_minecart.rs
@@ -1,10 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::FurnaceMinecart;
+use quill_common::{components::Health, entities::FurnaceMinecart};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
     builder
         .add(FurnaceMinecart)
+        .add(Health::new(6))
         .add(EntityKind::FurnaceMinecart);
 }
diff --git a/feather/common/src/entities/ghast.rs b/feather/common/src/entities/ghast.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Ghast;
+use quill_common::{components::Health, entities::Ghast};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Ghast).add(EntityKind::Ghast);
+    builder
+        .add(Ghast)
+        .add(Health::new(10))
+        .add(EntityKind::Ghast);
 }
diff --git a/feather/common/src/entities/giant.rs b/feather/common/src/entities/giant.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Giant;
+use quill_common::{components::Health, entities::Giant};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Giant).add(EntityKind::Giant);
+    builder
+        .add(Giant)
+        .add(Health::new(100))
+        .add(EntityKind::Giant);
 }
diff --git a/feather/common/src/entities/guardian.rs b/feather/common/src/entities/guardian.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Guardian;
+use quill_common::{components::Health, entities::Guardian};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Guardian).add(EntityKind::Guardian);
+    builder
+        .add(Guardian)
+        .add(Health::new(30))
+        .add(EntityKind::Guardian);
 }
diff --git a/feather/common/src/entities/hoglin.rs b/feather/common/src/entities/hoglin.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Hoglin;
+use quill_common::{components::Health, entities::Hoglin};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Hoglin).add(EntityKind::Hoglin);
+    builder
+        .add(Hoglin)
+        .add(Health::new(40))
+        .add(EntityKind::Hoglin);
 }
diff --git a/feather/common/src/entities/hopper_minecart.rs b/feather/common/src/entities/hopper_minecart.rs
@@ -1,8 +1,11 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::HopperMinecart;
+use quill_common::{components::Health, entities::HopperMinecart};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(HopperMinecart).add(EntityKind::HopperMinecart);
+    builder
+        .add(HopperMinecart)
+        .add(Health::new(6))
+        .add(EntityKind::HopperMinecart);
 }
diff --git a/feather/common/src/entities/husk.rs b/feather/common/src/entities/husk.rs
@@ -1,8 +1,8 @@
 use base::EntityKind;
 use ecs::EntityBuilder;
-use quill_common::entities::Husk;
+use quill_common::{components::Health, entities::Husk};
 
 pub fn build_default(builder: &mut EntityBuilder) {
     super::build_default(builder);
-    builder.add(Husk).add(EntityKind::Husk);
+    builder.add(Husk).add(Health::new(20)).add(EntityKind::Husk);
 }