Add /data, /tag and NBT summoning
/data now supports get, merge, modify and remove on entities, block entities and command storage, with NBT paths (children, indices, [] and [{...}] matches, root matches), scaling for numeric reads, the append, prepend, insert, set and merge modifiers, and from, string and value sources. Command storage is saved per namespace in data/<namespace>/command_storage.dat. /tag adds, removes and lists entity tags, which selectors' tag=, nbt= and advancements= options now check. /summon accepts a full NBT compound (custom name, tags, health, NoAI, Invulnerable, item contents and so on), and armor stands, item frames, paintings, boats and minecarts can now be selected, teleported and killed like other entities.
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -35,6 +35,8 @@ pub struct Registries {
|
||||
pub tracked: Vec<String>,
|
||||
/// Loaded datapack functions (`ns:path`) and function tags (`ns:path`).
|
||||
pub functions: Vec<String>,
|
||||
/// `/data ... storage` ids.
|
||||
pub storages: Vec<String>,
|
||||
pub function_tags: Vec<String>,
|
||||
/// The block the source is looking at (relevant coordinates).
|
||||
pub target_block: Option<[i32; 3]>,
|
||||
@@ -141,6 +143,10 @@ pub enum ArgType {
|
||||
TeamColor,
|
||||
/// RangeArgument.Ints (`1`, `1..`, `..5`, `1..5`).
|
||||
IntRange,
|
||||
/// NbtPathArgument (kept as text).
|
||||
NbtPath,
|
||||
/// NbtTagArgument: any SNBT value (kept as text).
|
||||
NbtTag,
|
||||
}
|
||||
pub fn integer(min: i32) -> ArgType {
|
||||
ArgType::Integer { min, max: i32::MAX }
|
||||
@@ -1551,7 +1557,11 @@ impl ArgType {
|
||||
reader,
|
||||
));
|
||||
}
|
||||
Arg::Str(read_braced(reader, '{', '}')?)
|
||||
let text = read_braced(reader, '{', '}')?;
|
||||
if let Err(e) = horizon_world::nbt::parse_snbt(&text) {
|
||||
return Err(CommandError::at(crate::text::Text::literal(e), reader));
|
||||
}
|
||||
Arg::Str(text)
|
||||
}
|
||||
ArgType::Component => {
|
||||
let (value, used) =
|
||||
@@ -1662,6 +1672,24 @@ impl ArgType {
|
||||
Arg::Str(name.to_owned())
|
||||
}
|
||||
ArgType::IntRange => Arg::IntRange(range_int(reader)?),
|
||||
ArgType::NbtPath => {
|
||||
let (path, used) = crate::nbt_path::NbtPath::parse_prefix(reader.remaining())
|
||||
.map_err(|e| {
|
||||
reader.cursor += e.cursor.min(reader.remaining().len());
|
||||
let args: Vec<&dyn std::fmt::Display> =
|
||||
e.args.iter().map(|a| a as &dyn std::fmt::Display).collect();
|
||||
CommandError::tr_at(e.key, &args, reader)
|
||||
})?;
|
||||
reader.cursor += used;
|
||||
Arg::Str(path.as_str().to_owned())
|
||||
}
|
||||
ArgType::NbtTag => {
|
||||
let (_, used) = horizon_world::nbt::parse_snbt(reader.remaining())
|
||||
.map_err(|e| CommandError::at(crate::text::Text::literal(e), reader))?;
|
||||
let text = reader.remaining()[..used].to_owned();
|
||||
reader.cursor += used;
|
||||
Arg::Str(text)
|
||||
}
|
||||
ArgType::Anchor => {
|
||||
let name = reader.read_unquoted_string();
|
||||
match name {
|
||||
@@ -1718,6 +1746,7 @@ impl ArgType {
|
||||
}
|
||||
ArgType::Id(list) => {
|
||||
let values = match *list {
|
||||
"storages" => reg.storages.clone(),
|
||||
"time_markers" => reg.time_markers.clone(),
|
||||
"advancements" => reg.advancements.clone(),
|
||||
_ => Vec::new(),
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
//! usage text and the vanilla error messages. Argument types live in
|
||||
//! [`args`]; the vanilla command tree in [`vanilla`].
|
||||
pub mod args;
|
||||
pub mod tree_data;
|
||||
pub mod tree_scoreboard;
|
||||
pub mod vanilla;
|
||||
|
||||
|
||||
@@ -215,3 +215,43 @@ fn local_coordinates_follow_view() {
|
||||
]);
|
||||
assert_eq!(w.position([10.0, 64.0, 3.0], [0.0, 0.0]), [11.0, 5.0, 3.0]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn data_and_tag_commands_parse() {
|
||||
let (id, args) = run("data get entity @s Pos 2.5").unwrap();
|
||||
assert_eq!(id, "data.get");
|
||||
assert_eq!(args, ["target", "path", "scale"]);
|
||||
assert_eq!(run("data get block ~ ~ ~ Items[0]").unwrap().0, "data.get");
|
||||
assert_eq!(run("data get storage my:store").unwrap().0, "data.get");
|
||||
assert_eq!(run("data merge storage a:b {x:1}").unwrap().0, "data.merge");
|
||||
assert_eq!(
|
||||
run("data remove entity @s foo.bar[1]").unwrap().0,
|
||||
"data.remove"
|
||||
);
|
||||
let (id, args) = run("data modify storage a:b x.y insert 2 from entity @s Pos[0]").unwrap();
|
||||
assert_eq!(id, "data.modify");
|
||||
assert_eq!(
|
||||
args,
|
||||
["target", "targetPath", "index", "source", "sourcePath"]
|
||||
);
|
||||
assert_eq!(
|
||||
run("data modify block 1 2 3 Text1 set string storage a:b x 1 3")
|
||||
.unwrap()
|
||||
.0,
|
||||
"data.modify"
|
||||
);
|
||||
assert_eq!(
|
||||
run("data modify storage a:b l append value [1,2]")
|
||||
.unwrap()
|
||||
.0,
|
||||
"data.modify"
|
||||
);
|
||||
assert!(run("data modify storage a:b l explode value 1").is_err());
|
||||
assert!(run("data get storage a:b {broken").is_err());
|
||||
assert!(run("data merge storage a:b 5").is_err());
|
||||
assert_eq!(run("tag @e[tag=!x] add foo").unwrap().0, "tag.add");
|
||||
assert_eq!(run("tag @s list").unwrap().0, "tag.list");
|
||||
// Selector options added for scoreboards and NBT.
|
||||
assert!(run("kill @e[scores={a=1..},team=red,nbt={x:1b},tag=t]").is_ok());
|
||||
assert!(run("kill @e[scores={a=1..]").is_err());
|
||||
}
|
||||
|
||||
@@ -0,0 +1,124 @@
|
||||
//! The `/data` and `/tag` command trees (DataCommands, TagCommand).
|
||||
use super::{
|
||||
Dispatcher,
|
||||
args::ArgType,
|
||||
vanilla::{ENTITIES, GAMEMASTERS},
|
||||
};
|
||||
|
||||
const ENTITY: ArgType = ArgType::Entity {
|
||||
single: true,
|
||||
players: false,
|
||||
};
|
||||
|
||||
/// `ArgProvider.wrap` for each of entity, block and storage: calls `then`
|
||||
/// with the node holding the provider's argument.
|
||||
fn providers(
|
||||
d: &mut Dispatcher,
|
||||
parent: usize,
|
||||
role: &str,
|
||||
mut then: impl FnMut(&mut Dispatcher, usize),
|
||||
) {
|
||||
let e = d.literal(parent, "entity");
|
||||
let a = d.argument(e, role, ENTITY);
|
||||
then(d, a);
|
||||
let b = d.literal(parent, "block");
|
||||
let a = d.argument(b, &format!("{role}Pos"), ArgType::BlockPos);
|
||||
then(d, a);
|
||||
let s = d.literal(parent, "storage");
|
||||
let a = d.argument(s, role, ArgType::Id("storages"));
|
||||
then(d, a);
|
||||
}
|
||||
|
||||
pub fn register(d: &mut Dispatcher, root: usize) {
|
||||
let data = d.literal(root, "data");
|
||||
d.requires(data, GAMEMASTERS);
|
||||
|
||||
let merge = d.literal(data, "merge");
|
||||
providers(d, merge, "target", |d, a| {
|
||||
let nbt = d.argument(a, "nbt", ArgType::Nbt);
|
||||
d.executes(nbt, "data.merge");
|
||||
});
|
||||
let get = d.literal(data, "get");
|
||||
providers(d, get, "target", |d, a| {
|
||||
d.executes(a, "data.get");
|
||||
let path = d.argument(a, "path", ArgType::NbtPath);
|
||||
d.executes(path, "data.get");
|
||||
let scale = d.argument(
|
||||
path,
|
||||
"scale",
|
||||
ArgType::Double {
|
||||
min: f64::MIN,
|
||||
max: f64::MAX,
|
||||
},
|
||||
);
|
||||
d.executes(scale, "data.get");
|
||||
});
|
||||
let remove = d.literal(data, "remove");
|
||||
providers(d, remove, "target", |d, a| {
|
||||
let path = d.argument(a, "path", ArgType::NbtPath);
|
||||
d.executes(path, "data.remove");
|
||||
});
|
||||
let modify = d.literal(data, "modify");
|
||||
providers(d, modify, "target", |d, a| {
|
||||
let target_path = d.argument(a, "targetPath", ArgType::NbtPath);
|
||||
// insert <index> | prepend | append | set | merge, then the source.
|
||||
let mut ops = Vec::new();
|
||||
let insert = d.literal(target_path, "insert");
|
||||
let index = d.argument(
|
||||
insert,
|
||||
"index",
|
||||
ArgType::Integer {
|
||||
min: i32::MIN,
|
||||
max: i32::MAX,
|
||||
},
|
||||
);
|
||||
ops.push(index);
|
||||
for op in ["prepend", "append", "set", "merge"] {
|
||||
ops.push(d.literal(target_path, op));
|
||||
}
|
||||
for op in ops {
|
||||
let from = d.literal(op, "from");
|
||||
providers(d, from, "source", |d, s| {
|
||||
d.executes(s, "data.modify");
|
||||
let sp = d.argument(s, "sourcePath", ArgType::NbtPath);
|
||||
d.executes(sp, "data.modify");
|
||||
});
|
||||
let string = d.literal(op, "string");
|
||||
providers(d, string, "source", |d, s| {
|
||||
d.executes(s, "data.modify");
|
||||
let sp = d.argument(s, "sourcePath", ArgType::NbtPath);
|
||||
d.executes(sp, "data.modify");
|
||||
let int = || ArgType::Integer {
|
||||
min: i32::MIN,
|
||||
max: i32::MAX,
|
||||
};
|
||||
let start = d.argument(sp, "start", int());
|
||||
d.executes(start, "data.modify");
|
||||
let end = d.argument(start, "end", int());
|
||||
d.executes(end, "data.modify");
|
||||
});
|
||||
let value = d.literal(op, "value");
|
||||
let v = d.argument(value, "value", ArgType::NbtTag);
|
||||
d.executes(v, "data.modify");
|
||||
}
|
||||
});
|
||||
|
||||
// tag <targets> add|remove <name> | list
|
||||
let tag = d.literal(root, "tag");
|
||||
d.requires(tag, GAMEMASTERS);
|
||||
let targets = d.argument(tag, "targets", ENTITIES);
|
||||
for word in ["add", "remove"] {
|
||||
let w = d.literal(targets, word);
|
||||
let name = d.argument(w, "name", ArgType::Word);
|
||||
d.executes(
|
||||
name,
|
||||
if word == "add" {
|
||||
"tag.add"
|
||||
} else {
|
||||
"tag.remove"
|
||||
},
|
||||
);
|
||||
}
|
||||
let list = d.literal(targets, "list");
|
||||
d.executes(list, "tag.list");
|
||||
}
|
||||
@@ -11,19 +11,19 @@ use crate::gamerules::{RULES, Value};
|
||||
pub const ALL: u8 = 0;
|
||||
pub const GAMEMASTERS: u8 = 2;
|
||||
|
||||
const PLAYERS: ArgType = ArgType::Entity {
|
||||
pub const PLAYERS: ArgType = ArgType::Entity {
|
||||
single: false,
|
||||
players: true,
|
||||
};
|
||||
const PLAYER: ArgType = ArgType::Entity {
|
||||
pub const PLAYER: ArgType = ArgType::Entity {
|
||||
single: true,
|
||||
players: true,
|
||||
};
|
||||
const ENTITIES: ArgType = ArgType::Entity {
|
||||
pub const ENTITIES: ArgType = ArgType::Entity {
|
||||
single: false,
|
||||
players: false,
|
||||
};
|
||||
const ENTITY: ArgType = ArgType::Entity {
|
||||
pub const ENTITY: ArgType = ArgType::Entity {
|
||||
single: true,
|
||||
players: false,
|
||||
};
|
||||
@@ -343,6 +343,7 @@ pub fn build() -> Dispatcher {
|
||||
d.executes(fade_out, "title");
|
||||
|
||||
super::tree_scoreboard::register(&mut d, root);
|
||||
super::tree_data::register(&mut d, root);
|
||||
execute(&mut d, root);
|
||||
d
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user