Merge origin/main

Author: koskja

.gitignore

@@ -8,6 +8,7 @@
 
 world/
 /config.toml
+plugins/
 
 # Python cache files (libcraft)
 **/__pycache__/

Cargo.lock

@@ -15,6 +15,7 @@ members = [
     "quill/sys",
     "quill/common",
     "quill/api",
+    "quill/api/plugin-macro",
     "quill/plugin-format",
     "quill/cargo-quill",
 

Cargo.toml

@@ -27,8 +27,8 @@ In the long term, Feather could be used on larger, more survival-like servers, w
 ### Ecosystem
 
 The Feather ecosystem consists of several repositories:
-* [`libcraft`](https://github.com/feather-rs/libcraft), a set of Rust crates providing Minecraft functionality.
-* [`quill`](https://github.com/feather-rs/quill), our work-in-progress plugin API. Quill plugins are written in Rust and compiled to WebAssembly. Feather runs them in a sandboxed WebAssembly VM.
+* [`libcraft`](https://github.com/feather-rs/feather/tree/main/libcraft), a set of Rust crates providing Minecraft functionality.
+* [`quill`](https://github.com/feather-rs/feather/tree/main/quill), our work-in-progress plugin API. Quill plugins are written in Rust and compiled to WebAssembly. Feather runs them in a sandboxed WebAssembly VM.
 * `feather`, the server software built on top of `libcraft` and `quill`.
 
 ### Performance

README.md

@@ -1,12 +1,10 @@
 use ahash::AHashMap;
 use base::{ChunkPosition, Position};
 use ecs::{Entity, SysResult, SystemExecutor};
+use quill_common::events::{EntityCreateEvent, EntityRemoveEvent};
 use utils::vec_remove_item;
 
-use crate::{
-    events::{ChunkCrossEvent, EntityCreateEvent, EntityRemoveEvent},
-    Game,
-};
+use crate::{events::ChunkCrossEvent, Game};
 
 pub fn register(systems: &mut SystemExecutor<Game>) {
     systems.add_system(update_chunk_entities);

feather/common/src/chunk/entities.rs

@@ -9,13 +9,10 @@ use std::{
 use ahash::AHashMap;
 use base::ChunkPosition;
 use ecs::{Entity, SysResult, SystemExecutor};
+use quill_common::events::EntityRemoveEvent;
 use utils::vec_remove_item;
 
-use crate::{
-    chunk::worker::LoadRequest,
-    events::{EntityRemoveEvent, ViewUpdateEvent},
-    Game,
-};
+use crate::{chunk::worker::LoadRequest, events::ViewUpdateEvent, Game};
 
 pub fn register(game: &mut Game, systems: &mut SystemExecutor<Game>) {
     game.insert_resource(ChunkLoadState::default());

feather/common/src/chunk/loading.rs

@@ -8,10 +8,6 @@ mod plugin_message;
 pub use block_change::BlockChangeEvent;
 pub use plugin_message::PluginMessageEvent;
 
-/// Triggered when a player joins the `Game`.
-#[derive(Debug)]
-pub struct PlayerJoinEvent;
-
 /// Event triggered when a player changes their `View`,
 /// meaning they crossed into a new chunk.
 #[derive(Debug)]
@@ -62,14 +58,3 @@ pub struct ChunkLoadEvent {
 pub struct ChunkLoadFailEvent {
     pub position: ChunkPosition,
 }
-
-/// Triggered when an entity is removed from the world.
-///
-/// The entity will remain alive for one tick after it is
-/// destroyed to allow systems to observe this event.
-#[derive(Debug)]
-pub struct EntityRemoveEvent;
-
-/// Triggered when an entity is added into the world.
-#[derive(Debug)]
-pub struct EntityCreateEvent;

feather/common/src/events.rs

@@ -5,12 +5,13 @@ use ecs::{
     Ecs, Entity, EntityBuilder, HasEcs, HasResources, NoSuchEntity, Resources, SysResult,
     SystemExecutor,
 };
+use quill_common::events::{EntityCreateEvent, EntityRemoveEvent, PlayerJoinEvent};
 use quill_common::{entities::Player, entity_init::EntityInit};
 
 use crate::{
     chat::{ChatKind, ChatMessage},
     chunk::entities::ChunkEntities,
-    events::{BlockChangeEvent, EntityCreateEvent, EntityRemoveEvent, PlayerJoinEvent},
+    events::BlockChangeEvent,
     ChatBox, World,
 };
 

feather/common/src/game.rs

@@ -3,11 +3,9 @@ use base::{ChunkPosition, Position};
 use ecs::{SysResult, SystemExecutor};
 use itertools::Either;
 use quill_common::components::Name;
+use quill_common::events::PlayerJoinEvent;
 
-use crate::{
-    events::{PlayerJoinEvent, ViewUpdateEvent},
-    Game,
-};
+use crate::{events::ViewUpdateEvent, Game};
 
 /// Registers systems to update the `View` of a player.
 pub fn register(_game: &mut Game, systems: &mut SystemExecutor<Game>) {

feather/common/src/view.rs

@@ -25,6 +25,7 @@ tempfile = "3"
 vec-arena = "1"
 wasmer = { version = "2", default-features = false, features = [ "jit" ] }
 wasmer-wasi = { version = "2", default-features = false, features = [ "host-fs", "sys" ] }
+serde_json = "1"
 
 [features]
 llvm = [ "wasmer/llvm" ]