Command API

Cargo.toml

@@ -20,6 +20,7 @@ default = [
     "network",
     "player_list",
     "world_border",
+    "command"
 ]
 advancement = ["dep:valence_advancement"]
 anvil = ["dep:valence_anvil"]
@@ -29,6 +30,7 @@ log = ["dep:bevy_log"]
 network = ["dep:valence_network"]
 player_list = ["dep:valence_player_list"]
 world_border = ["dep:valence_world_border"]
+command = ["dep:valence_command"]
 
 [dependencies]
 anyhow.workspace = true
@@ -55,6 +57,7 @@ valence_network = { workspace = true, optional = true }
 valence_player_list = { workspace = true, optional = true }
 valence_registry.workspace = true
 valence_world_border = { workspace = true, optional = true }
+valence_command = { workspace = true, optional = true }
 
 [dev-dependencies]
 anyhow.workspace = true
@@ -108,9 +111,11 @@ bevy_utils = { version = "0.11" }
 bitfield-struct = "0.3.1"
 byteorder = "1.4.3"
 bytes = "1.2.1"
+casey = "0.4.0"
 cesu8 = "1.1.0"
 cfb8 = "0.8.1"
 clap = { version = "4.0.30", features = ["derive"] }
+ctor = "0.2.0"
 criterion = "0.4.0"
 directories = "5.0.0"
 eframe = { version = "0.22.0", default-features = false }
@@ -149,6 +154,7 @@ serde = "1.0.160"
 serde_json = "1.0.96"
 sha1 = "0.10.5"
 sha2 = "0.10.6"
+smallvec = "1.11.0"
 syn = "2.0.15"
 syntect = { version = "5.0.0", default-features = false }
 tempfile = "3.3.0"
@@ -166,6 +172,7 @@ valence_biome.path = "crates/valence_biome"
 valence_block.path = "crates/valence_block"
 valence_build_utils.path = "crates/valence_build_utils"
 valence_client.path = "crates/valence_client"
+valence_command.path = "crates/valence_command"
 valence_core_macros.path = "crates/valence_core_macros"
 valence_core.path = "crates/valence_core"
 valence_dimension.path = "crates/valence_dimension"

crates/valence_command/Cargo.toml

@@ -0,0 +1,28 @@
+[package]
+name = "valence_command"
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+async-trait.workspace = true
+bevy_ecs.workspace = true
+bevy_app.workspace = true
+bevy_hierarchy.workspace = true
+byteorder.workspace = true
+valence_core.workspace = true
+anyhow.workspace = true
+glam.workspace = true
+serde_json.workspace = true
+serde.workspace = true
+valence_client.workspace = true
+valence_block.workspace = true
+valence_nbt.workspace = true
+valence_entity.workspace = true
+valence_instance.workspace = true
+ctor.workspace = true
+casey.workspace = true
+paste.workspace = true
+rustc-hash.workspace = true
+smallvec.workspace = true
+parking_lot.workspace = true
+tokio.workspace = true

crates/valence_command/src/boolean.rs

@@ -0,0 +1,106 @@
+use std::any::TypeId;
+use std::borrow::Cow;
+
+use bevy_ecs::system::SystemParamItem;
+use valence_core::text::Text;
+use valence_core::translation_key::{PARSING_BOOL_EXPECTED, PARSING_BOOL_INVALID};
+
+use crate::command::CommandExecutorBase;
+use crate::nodes::NodeSuggestion;
+use crate::parse::{Parse, ParseResult};
+use crate::pkt;
+use crate::reader::{ArcStrReader, StrLocated, StrReader, StrSpan};
+use crate::suggestions::Suggestion;
+
+#[async_trait::async_trait]
+impl Parse for bool {
+    type Item<'a> = bool;
+
+    type Data<'a> = ();
+
+    type Suggestions = StrSpan;
+
+    type SuggestionsParam = ();
+
+    type SuggestionsAsyncData = Cow<'static, [Suggestion<'static>]>;
+
+    const VANILLA: bool = true;
+
+    fn parse_id() -> TypeId {
+        TypeId::of::<Self>()
+    }
+
+    fn item_id() -> TypeId {
+        TypeId::of::<Self>()
+    }
+
+    fn parse<'a>(
+        _data: &Self::Data<'a>,
+        suggestions: &mut Self::Suggestions,
+        reader: &mut StrReader<'a>,
+    ) -> ParseResult<Self> {
+        reader.span_err_located(suggestions, |reader| {
+            let str = reader.read_unquoted_str();
+            if str.is_empty() {
+                Err(Text::translate(PARSING_BOOL_EXPECTED, vec![]))
+            } else if str.eq_ignore_ascii_case("true") {
+                Ok(true)
+            } else if str.eq_ignore_ascii_case("false") {
+                Ok(false)
+            } else {
+                Err(Text::translate(
+                    PARSING_BOOL_INVALID,
+                    vec![str.to_string().into()],
+                ))
+            }
+        })
+    }
+
+    fn brigadier(_data: &Self::Data<'_>) -> Option<pkt::Parser<'static>> {
+        Some(pkt::Parser::Bool)
+    }
+
+    fn brigadier_suggestions(_data: &Self::Data<'_>) -> Option<NodeSuggestion> {
+        None
+    }
+
+    fn create_suggestions_data(
+        _data: &Self::Data<'_>,
+        command: ArcStrReader,
+        _executor: CommandExecutorBase,
+        suggestions: &Self::Suggestions,
+        _param: SystemParamItem<Self::SuggestionsParam>,
+    ) -> Self::SuggestionsAsyncData {
+        const EMPTY: &[Suggestion<'static>] = &[];
+        const ONLY_TRUE: &[Suggestion<'static>] = &[Suggestion::new_str("true")];
+        const ONLY_FALSE: &[Suggestion<'static>] = &[Suggestion::new_str("false")];
+        const BOTH: &[Suggestion<'static>] =
+            &[Suggestion::new_str("true"), Suggestion::new_str("false")];
+
+        let str = suggestions.in_str(command.reader().str()).unwrap();
+
+        Cow::Borrowed(if str.len() > 5 {
+            EMPTY
+        } else {
+            let lc_str = str.to_ascii_lowercase();
+            if str.len() == 0 {
+                BOTH
+            } else if "true".starts_with(&lc_str) {
+                ONLY_TRUE
+            } else if "false".starts_with(&lc_str) {
+                ONLY_FALSE
+            } else {
+                EMPTY
+            }
+        })
+    }
+
+    async fn suggestions(
+        _command: ArcStrReader,
+        _executor: CommandExecutorBase,
+        suggestions: Box<Self::Suggestions>,
+        async_data: Self::SuggestionsAsyncData,
+    ) -> StrLocated<Cow<'static, [Suggestion<'static>]>> {
+        StrLocated::new(*suggestions, async_data)
+    }
+}