Chaoscaot/schemsearch
1
0
Fork 0
mirror of https://github.com/Chaoscaot/schemsearch.git synced 2025-11-05 05:54:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactor NBT handling for version 3 schematics

Browse Source 
Update logic to process "Schematic" key in NBT for version 3, ensuring compatibility with nested tags. Adjust function signatures to pass CompoundTag references, optimizing data handling and reducing unnecessary clones.
This commit is contained in:
Chaoscaot
2025-05-04 20:26:26 +02:00
parent b04c01e737
commit 881989a7bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
schemsearch-files/src/lib.rs
View File

@ -65,7 +65,7 @@ impl SpongeSchematic {
pub fn load_data<R>(data: &mut R) -> Result<SpongeSchematic, String> where R: Read { pub fn load_data<R>(data: &mut R) -> Result<SpongeSchematic, String> where R: Read {
let nbt: CompoundTag = nbt::decode::read_gzip_compound_tag(data).map_err(|e| e.to_string())?; let nbt: CompoundTag = nbt::decode::read_gzip_compound_tag(data).map_err(|e| e.to_string())?;
let version = nbt.get_i32("Version").unwrap_or_else(|_| { let version = nbt.get_i32("Version").unwrap_or_else(|_| {
return if nbt.contains_key("Blocks") { return if nbt.contains_key("Schematic") {
3 3
} else if nbt.contains_key("BlockEntities") { } else if nbt.contains_key("BlockEntities") {
2 2
@ -79,7 +79,7 @@ impl SpongeSchematic {
match version { match version {
1 => SpongeSchematic::from_nbt_1(nbt), 1 => SpongeSchematic::from_nbt_1(nbt),
2 => SpongeSchematic::from_nbt_2(nbt), 2 => SpongeSchematic::from_nbt_2(nbt),
3 => SpongeSchematic::from_nbt_3(nbt), 3 => SpongeSchematic::from_nbt_3(nbt.get_compound_tag("Schematic").map_err(|e| e.to_string())?),
_ => Err("Invalid schematic: Unknown Version".to_string()), _ => Err("Invalid schematic: Unknown Version".to_string()),
} }
} }
@ -121,7 +121,7 @@ impl SpongeSchematic {
}) })
} }
pub fn from_nbt_3(nbt: CompoundTag) -> Result<Self, String> { pub fn from_nbt_3(nbt: &CompoundTag) -> Result<Self, String> {
let blocks = nbt.get_compound_tag("Blocks").map_err(|e| e.to_string())?; let blocks = nbt.get_compound_tag("Blocks").map_err(|e| e.to_string())?;
Ok(Self{ Ok(Self{
data_version: nbt.get_i32("DataVersion").map_err(|e| e.to_string())?, data_version: nbt.get_i32("DataVersion").map_err(|e| e.to_string())?,