aboutsummaryrefslogtreecommitdiff
path: root/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-06-25 02:33:28 -0500
committermat <github@matdoes.dev>2022-06-25 02:33:28 -0500
commitcd9a05e5a62190b3d4a2a733bf637d6324aec5fd (patch)
tree15fb360678dfb5e8d81330144b810735b73f6ef4 /azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
parentc9faf25fab4f89319731fec87ad4d2cf45864632 (diff)
downloadazalea-drasl-cd9a05e5a62190b3d4a2a733bf637d6324aec5fd.tar.xz
read_into -> read_from
yeah
Diffstat (limited to 'azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs')
-rwxr-xr-xazalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs32
1 files changed, 16 insertions, 16 deletions
diff --git a/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs b/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
index bf29a050..ee3f21a2 100755
--- a/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
+++ b/azalea-protocol/src/packets/game/clientbound_declare_commands_packet.rs
@@ -25,15 +25,15 @@ pub struct BrigadierNumber<T> {
max: Option<T>,
}
impl<T: McBufReadable> McBufReadable for BrigadierNumber<T> {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
let flags = buf.read_byte()?;
let min = if flags & 0x01 != 0 {
- Some(T::read_into(buf)?)
+ Some(T::read_from(buf)?)
} else {
None
};
let max = if flags & 0x02 != 0 {
- Some(T::read_into(buf)?)
+ Some(T::read_from(buf)?)
} else {
None
};
@@ -124,16 +124,16 @@ pub enum BrigadierParser {
}
impl McBufReadable for BrigadierParser {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
- let parser_type = u32::var_read_into(buf)?;
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
+ let parser_type = u32::var_read_from(buf)?;
match parser_type {
0 => Ok(BrigadierParser::Bool),
- 1 => Ok(BrigadierParser::Float(BrigadierNumber::read_into(buf)?)),
- 2 => Ok(BrigadierParser::Double(BrigadierNumber::read_into(buf)?)),
- 3 => Ok(BrigadierParser::Integer(BrigadierNumber::read_into(buf)?)),
- 4 => Ok(BrigadierParser::Long(BrigadierNumber::read_into(buf)?)),
- 5 => Ok(BrigadierParser::String(BrigadierString::read_into(buf)?)),
+ 1 => Ok(BrigadierParser::Float(BrigadierNumber::read_from(buf)?)),
+ 2 => Ok(BrigadierParser::Double(BrigadierNumber::read_from(buf)?)),
+ 3 => Ok(BrigadierParser::Integer(BrigadierNumber::read_from(buf)?)),
+ 4 => Ok(BrigadierParser::Long(BrigadierNumber::read_from(buf)?)),
+ 5 => Ok(BrigadierParser::String(BrigadierString::read_from(buf)?)),
6 => {
let flags = buf.read_byte()?;
Ok(BrigadierParser::Entity {
@@ -183,10 +183,10 @@ impl McBufReadable for BrigadierParser {
41 => Ok(BrigadierParser::Dimension),
42 => Ok(BrigadierParser::Time),
43 => Ok(BrigadierParser::ResourceOrTag {
- registry_key: ResourceLocation::read_into(buf)?,
+ registry_key: ResourceLocation::read_from(buf)?,
}),
44 => Ok(BrigadierParser::Resource {
- registry_key: ResourceLocation::read_into(buf)?,
+ registry_key: ResourceLocation::read_from(buf)?,
}),
45 => Ok(BrigadierParser::TemplateMirror),
46 => Ok(BrigadierParser::TemplateRotation),
@@ -198,8 +198,8 @@ impl McBufReadable for BrigadierParser {
// TODO: BrigadierNodeStub should have more stuff
impl McBufReadable for BrigadierNodeStub {
- fn read_into(buf: &mut impl Read) -> Result<Self, String> {
- let flags = u8::read_into(buf)?;
+ fn read_from(buf: &mut impl Read) -> Result<Self, String> {
+ let flags = u8::read_from(buf)?;
if flags > 31 {
println!(
"Warning: The flags from a Brigadier node are over 31 ({flags}; {flags:#b}). This is probably a bug.",
@@ -217,9 +217,9 @@ impl McBufReadable for BrigadierNodeStub {
// argument node
if node_type == 2 {
let _name = buf.read_utf()?;
- let _parser = BrigadierParser::read_into(buf)?;
+ let _parser = BrigadierParser::read_from(buf)?;
let _suggestions_type = if has_suggestions_type {
- Some(ResourceLocation::read_into(buf)?)
+ Some(ResourceLocation::read_from(buf)?)
} else {
None
};