Implement /gamemode

Author: caelunshun

Cargo.lock

@@ -7,7 +7,7 @@ edition = "2018"
 [dependencies]
 feather-items = { path = "../items" }
 
-fecs = { git = "https://github.com/feather-rs/fecs", rev = "fed8bcb516941b12cb980e354e77b699be075a89" }
+fecs = { git = "https://github.com/feather-rs/fecs", rev = "0c4838d65b41ca059012b6e9147eabf0c275a731" }
 legion = { git = "https://github.com/TomGillen/legion", rev = "bd441f4811e7a9e877a0f479a674bbdbf4e4cda3" }
 thiserror = "1.0"
 parking_lot = "0.10"

core/inventory/Cargo.toml

@@ -30,7 +30,7 @@ feather-server-util = { path = "util" }
 feather-server-weather = { path = "weather" }
 feather-server-worldgen = { path = "worldgen" }
 
-fecs = { git = "https://github.com/feather-rs/fecs", rev = "fed8bcb516941b12cb980e354e77b699be075a89" }
+fecs = { git = "https://github.com/feather-rs/fecs", rev = "0c4838d65b41ca059012b6e9147eabf0c275a731" }
 tokio = { version = "0.2", features = ["full"] }
 simple_logger = "1.6"
 log = "0.4"

server/Cargo.toml

@@ -10,7 +10,7 @@ feather-server-types = { path = "../types" }
 feather-server-util = { path = "../util" }
 feather-server-worldgen = { path = "../worldgen" }
 
-fecs = { git = "https://github.com/feather-rs/fecs", rev = "fed8bcb516941b12cb980e354e77b699be075a89" }
+fecs = { git = "https://github.com/feather-rs/fecs", rev = "0c4838d65b41ca059012b6e9147eabf0c275a731" }
 parking_lot = "0.10"
 ahash = "0.3"
 rayon = "1.3"

server/chunk/Cargo.toml

@@ -9,7 +9,7 @@ feather-core = { path = "../../core" }
 feather-server-types = { path = "../types" }
 feather-server-util = { path = "../util" }
 
-fecs = { git = "https://github.com/feather-rs/fecs", rev = "fed8bcb516941b12cb980e354e77b699be075a89" }
+fecs = { git = "https://github.com/feather-rs/fecs", rev = "0c4838d65b41ca059012b6e9147eabf0c275a731" }
 lieutenant = { git = "https://github.com/feather-rs/lieutenant", branch = "cleanup" }
 smallvec = "1.4"
 anyhow = "1.0"

server/commands/Cargo.toml

@@ -1,6 +1,6 @@
 use crate::CommandCtx;
 use feather_core::position;
-use feather_core::util::Position;
+use feather_core::util::{Gamemode, Position};
 use feather_server_types::{Game, Name, NetworkId, Player};
 use fecs::{component, Entity, IntoQuery, Read, World};
 use lieutenant::{ArgumentKind, Input};
@@ -240,3 +240,35 @@ impl ArgumentKind<CommandCtx> for Coordinates {
         Ok(Coordinates { x, y, z })
     }
 }
+
+#[derive(Debug, Error)]
+pub enum GamemodeParseError {
+    #[error("invalid gamemode string {0}")]
+    InvalidGamemode(String),
+}
+
+/// A parsed gamemode string ("survival", "creative", ...)
+#[derive(Copy, Clone, Debug)]
+pub struct ParsedGamemode(pub Gamemode);
+
+impl ArgumentKind<CommandCtx> for ParsedGamemode {
+    type ParseError = GamemodeParseError;
+
+    fn satisfies<'a>(_ctx: &CommandCtx, input: &mut Input<'a>) -> bool {
+        !input.advance_until(" ").is_empty()
+    }
+
+    fn parse<'a>(_ctx: &CommandCtx, input: &mut Input<'a>) -> Result<Self, Self::ParseError> {
+        let s = input.advance_until(" ");
+
+        let gamemode = match s {
+            "survival" => Gamemode::Survival,
+            "creative" => Gamemode::Creative,
+            "spectator" => Gamemode::Spectator,
+            "adventure" => Gamemode::Adventure,
+            s => return Err(GamemodeParseError::InvalidGamemode(s.to_owned())),
+        };
+
+        Ok(ParsedGamemode(gamemode))
+    }
+}

server/commands/src/arguments.rs

@@ -1,9 +1,12 @@
 //! The implementations of various commands.
 
 use crate::arguments::Coordinates;
-use crate::{arguments::EntitySelector, CommandCtx};
-use feather_core::util::Position;
-use feather_server_types::Teleported;
+use crate::{
+    arguments::{EntitySelector, ParsedGamemode},
+    CommandCtx,
+};
+use feather_core::util::{Gamemode, Position};
+use feather_server_types::{GamemodeUpdateEvent, Teleported};
 use fecs::{Entity, World};
 use lieutenant::command;
 use thiserror::Error;
@@ -84,3 +87,42 @@ fn teleport_entity_to_pos(world: &mut World, entity: Entity, pos: Position) {
     }
     let _ = world.add(entity, Teleported);
 }
+
+#[command(usage = "gamemode <gamemode>")]
+pub fn gamemode_1(ctx: &mut CommandCtx, gamemode: ParsedGamemode) -> anyhow::Result<()> {
+    update_gamemode(ctx, gamemode.0, ctx.sender);
+    Ok(())
+}
+
+#[command(usage = "gamemode <gamemode> <target>")]
+pub fn gamemode_2(
+    ctx: &mut CommandCtx,
+    gamemode: ParsedGamemode,
+    target: EntitySelector,
+) -> anyhow::Result<()> {
+    for entity in target.entities {
+        update_gamemode(ctx, gamemode.0, entity)
+    }
+
+    Ok(())
+}
+
+fn update_gamemode(ctx: &mut CommandCtx, gamemode: Gamemode, entity: Entity) {
+    let event = if let Some(mut old) = ctx.world.try_get_mut::<Gamemode>(ctx.sender) {
+        let old_val = *old;
+        *old = gamemode;
+
+        let event = GamemodeUpdateEvent {
+            player: entity,
+            old: old_val,
+            new: gamemode,
+        };
+        Some(event)
+    } else {
+        None
+    };
+
+    if let Some(event) = event {
+        ctx.game.handle(&mut *ctx.world, event);
+    }
+}

server/commands/src/impls.rs

@@ -101,6 +101,9 @@ impl CommandState {
                 tp_2,
                 tp_3,
                 tp_4,
+
+                gamemode_1,
+                gamemode_2,
         }
 
         Self {

server/commands/src/lib.rs

@@ -9,7 +9,7 @@ feather-core = { path = "../../core" }
 feather-server-types = { path = "../types" }
 feather-server-util = { path = "../util" }
 
-fecs = { git = "https://github.com/feather-rs/fecs", rev = "fed8bcb516941b12cb980e354e77b699be075a89" }
+fecs = { git = "https://github.com/feather-rs/fecs", rev = "0c4838d65b41ca059012b6e9147eabf0c275a731" }
 nalgebra-glm = "0.6"
 inventory = "0.1"
 parking_lot = "0.10"

server/entity/Cargo.toml

@@ -10,7 +10,7 @@ feather-server-physics = { path = "../physics" }
 feather-server-types = { path = "../types" }
 feather-server-util = { path = "../util" }
 
-fecs = { git = "https://github.com/feather-rs/fecs", rev = "fed8bcb516941b12cb980e354e77b699be075a89" }
+fecs = { git = "https://github.com/feather-rs/fecs", rev = "0c4838d65b41ca059012b6e9147eabf0c275a731" }
 arrayvec = "0.5"
 smallvec = "1.4"
 ahash = "0.3"