aboutsummaryrefslogtreecommitdiff
path: root/azalea-protocol/src/packets/game/c_commands.rs
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2025-11-13 12:34:47 +0930
committermat <git@matdoes.dev>2025-11-13 07:04:52 +0400
commitfbaae39cdf9c5a7a34005a51a37b85f7cdd5ea00 (patch)
tree3126fb34a4e0ac979a1103a8227a2b9a136c1553 /azalea-protocol/src/packets/game/c_commands.rs
parenta4312599f7c04709a92b7be238dcf577bafbb14f (diff)
downloadazalea-drasl-fbaae39cdf9c5a7a34005a51a37b85f7cdd5ea00.tar.xz
rename ResourceLocation to Identifier ahead of mojmap changes
Diffstat (limited to 'azalea-protocol/src/packets/game/c_commands.rs')
-rw-r--r--azalea-protocol/src/packets/game/c_commands.rs20
1 files changed, 10 insertions, 10 deletions
diff --git a/azalea-protocol/src/packets/game/c_commands.rs b/azalea-protocol/src/packets/game/c_commands.rs
index 303f8481..46be5613 100644
--- a/azalea-protocol/src/packets/game/c_commands.rs
+++ b/azalea-protocol/src/packets/game/c_commands.rs
@@ -1,7 +1,7 @@
use std::io::{self, Cursor, Write};
use azalea_buf::{AzBuf, AzaleaRead, AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, BufReadError};
-use azalea_core::{bitset::FixedBitSet, resource_location::ResourceLocation};
+use azalea_core::{bitset::FixedBitSet, identifier::Identifier};
use azalea_protocol_macros::ClientboundGamePacket;
use tracing::warn;
@@ -131,7 +131,7 @@ pub enum BrigadierParser {
Team,
ItemSlot,
ItemSlots,
- ResourceLocation,
+ Identifier,
Function,
EntityAnchor,
IntRange,
@@ -139,11 +139,11 @@ pub enum BrigadierParser {
Dimension,
GameMode,
Time { min: i32 },
- ResourceOrTag { registry_key: ResourceLocation },
- ResourceOrTagKey { registry_key: ResourceLocation },
- Resource { registry_key: ResourceLocation },
- ResourceKey { registry_key: ResourceLocation },
- ResourceSelector { registry_key: ResourceLocation },
+ ResourceOrTag { registry_key: Identifier },
+ ResourceOrTagKey { registry_key: Identifier },
+ Resource { registry_key: Identifier },
+ ResourceKey { registry_key: Identifier },
+ ResourceSelector { registry_key: Identifier },
TemplateMirror,
TemplateRotation,
Heightmap,
@@ -210,7 +210,7 @@ impl AzaleaRead for BrigadierNodeStub {
let name = String::azalea_read(buf)?;
let parser = BrigadierParser::azalea_read(buf)?;
let suggestions_type = if has_suggestions_type {
- Some(ResourceLocation::azalea_read(buf)?)
+ Some(Identifier::azalea_read(buf)?)
} else {
None
};
@@ -318,7 +318,7 @@ pub enum NodeType {
Argument {
name: String,
parser: BrigadierParser,
- suggestions_type: Option<ResourceLocation>,
+ suggestions_type: Option<Identifier>,
},
}
@@ -379,7 +379,7 @@ mod tests {
node_type: NodeType::Argument {
name: "position".to_string(),
parser: BrigadierParser::Vec3,
- suggestions_type: Some(ResourceLocation::new("minecraft:test_suggestion")),
+ suggestions_type: Some(Identifier::new("minecraft:test_suggestion")),
},
is_restricted: false,
};