aboutsummaryrefslogtreecommitdiff
path: root/azalea-brigadier/src
diff options
context:
space:
mode:
Diffstat (limited to 'azalea-brigadier/src')
-rwxr-xr-xazalea-brigadier/src/command_dispatcher.rs6
-rwxr-xr-xazalea-brigadier/src/exceptions/builtin_exceptions.rs2
-rwxr-xr-xazalea-brigadier/src/suggestion/mod.rs6
-rwxr-xr-xazalea-brigadier/src/suggestion/suggestions.rs8
-rwxr-xr-xazalea-brigadier/src/tree/mod.rs6
5 files changed, 14 insertions, 14 deletions
diff --git a/azalea-brigadier/src/command_dispatcher.rs b/azalea-brigadier/src/command_dispatcher.rs
index bb9bfb28..273b1681 100755
--- a/azalea-brigadier/src/command_dispatcher.rs
+++ b/azalea-brigadier/src/command_dispatcher.rs
@@ -136,7 +136,7 @@ impl<S> CommandDispatcher<S> {
return Ordering::Greater;
};
Ordering::Equal
- })
+ });
}
let best_potential = potentials.into_iter().next().unwrap();
return Ok(best_potential);
@@ -195,7 +195,7 @@ impl<S> CommandDispatcher<S> {
let mut node = self.root.clone();
for name in path {
if let Some(child) = node.clone().borrow().child(name) {
- node = child
+ node = child;
} else {
return None;
}
@@ -228,7 +228,7 @@ impl<S> CommandDispatcher<S> {
let mut next: Vec<CommandContext<S>> = vec![];
while !contexts.is_empty() {
- for context in contexts.iter() {
+ for context in &contexts {
let child = &context.child;
if let Some(child) = child {
forked |= child.forks;
diff --git a/azalea-brigadier/src/exceptions/builtin_exceptions.rs b/azalea-brigadier/src/exceptions/builtin_exceptions.rs
index b96b37bf..e60c697c 100755
--- a/azalea-brigadier/src/exceptions/builtin_exceptions.rs
+++ b/azalea-brigadier/src/exceptions/builtin_exceptions.rs
@@ -88,7 +88,7 @@ impl fmt::Debug for BuiltInExceptions {
BuiltInExceptions::ReaderInvalidBool { value } => {
write!(
f,
- "Invalid bool, expected true or false but found '{value}'",
+ "Invalid bool, expected true or false but found '{value}'"
)
}
BuiltInExceptions::ReaderInvalidInt { value } => {
diff --git a/azalea-brigadier/src/suggestion/mod.rs b/azalea-brigadier/src/suggestion/mod.rs
index 114a4c47..592c674c 100755
--- a/azalea-brigadier/src/suggestion/mod.rs
+++ b/azalea-brigadier/src/suggestion/mod.rs
@@ -4,7 +4,7 @@ use crate::context::StringRange;
#[cfg(feature = "azalea-buf")]
use azalea_buf::McBufWritable;
#[cfg(feature = "azalea-buf")]
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
#[cfg(feature = "azalea-buf")]
use std::io::Write;
pub use suggestions::*;
@@ -31,7 +31,7 @@ impl<M: Clone> Suggestion<M> {
}
result.push_str(&self.text);
if self.range.end() < input.len() {
- result.push_str(&input[self.range.end()..])
+ result.push_str(&input[self.range.end()..]);
}
result
@@ -58,7 +58,7 @@ impl<M: Clone> Suggestion<M> {
}
#[cfg(feature = "azalea-buf")]
-impl McBufWritable for Suggestion<Component> {
+impl McBufWritable for Suggestion<FormattedText> {
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
self.text.write_into(buf)?;
self.tooltip.write_into(buf)?;
diff --git a/azalea-brigadier/src/suggestion/suggestions.rs b/azalea-brigadier/src/suggestion/suggestions.rs
index 06ef9661..2a8b5e9e 100755
--- a/azalea-brigadier/src/suggestion/suggestions.rs
+++ b/azalea-brigadier/src/suggestion/suggestions.rs
@@ -5,7 +5,7 @@ use azalea_buf::{
BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable,
};
#[cfg(feature = "azalea-buf")]
-use azalea_chat::Component;
+use azalea_chat::FormattedText;
#[cfg(feature = "azalea-buf")]
use std::io::{Cursor, Write};
use std::{collections::HashSet, hash::Hash};
@@ -68,12 +68,12 @@ impl<M> Default for Suggestions<M> {
}
#[cfg(feature = "azalea-buf")]
-impl McBufReadable for Suggestions<Component> {
+impl McBufReadable for Suggestions<FormattedText> {
fn read_from(buf: &mut Cursor<&[u8]>) -> Result<Self, BufReadError> {
#[derive(McBuf)]
struct StandaloneSuggestion {
pub text: String,
- pub tooltip: Option<Component>,
+ pub tooltip: Option<FormattedText>,
}
let start = u32::var_read_from(buf)? as usize;
@@ -97,7 +97,7 @@ impl McBufReadable for Suggestions<Component> {
}
#[cfg(feature = "azalea-buf")]
-impl McBufWritable for Suggestions<Component> {
+impl McBufWritable for Suggestions<FormattedText> {
fn write_into(&self, buf: &mut impl Write) -> Result<(), std::io::Error> {
(self.range.start() as u32).var_write_into(buf)?;
(self.range.length() as u32).var_write_into(buf)?;
diff --git a/azalea-brigadier/src/tree/mod.rs b/azalea-brigadier/src/tree/mod.rs
index 59b79b5d..bb6af68d 100755
--- a/azalea-brigadier/src/tree/mod.rs
+++ b/azalea-brigadier/src/tree/mod.rs
@@ -65,7 +65,9 @@ impl<S> CommandNode<S> {
pub fn get_relevant_nodes(&self, input: &mut StringReader) -> Vec<Rc<RefCell<CommandNode<S>>>> {
let literals = &self.literals;
- if !literals.is_empty() {
+ if literals.is_empty() {
+ self.arguments.values().cloned().collect()
+ } else {
let cursor = input.cursor();
while input.can_read() && input.peek() != ' ' {
input.skip();
@@ -83,8 +85,6 @@ impl<S> CommandNode<S> {
} else {
self.arguments.values().cloned().collect()
}
- } else {
- self.arguments.values().cloned().collect()
}
}