neocturne/MinedMap
1
0
Fork 0
mirror of https://github.com/neocturne/MinedMap.git synced 2025-03-04 17:23:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

resource: make BlockTypeMap return BlockType without reference

Browse source
This commit is contained in:
Matthias Schiffer 2023-03-01 21:54:40 +01:00
parent 0673c89bd8
commit cbbc6d8f35
Signed by: neocturne
GPG key ID: 16EF3F64CB201D9C
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/resource/mod.rs
View file

@ -53,11 +53,20 @@ impl BlockType {
}
}
pub type BlockTypeMap = HashMap<String, BlockType>;
pub struct BlockTypeMap(HashMap<String, BlockType>);
impl BlockTypeMap {
#[inline]
pub fn get(&self, id: &str) -> Option<BlockType> {
self.0.get(id).copied()
}
}
pub fn block_types() -> BlockTypeMap {
block_types::BLOCK_TYPES
.iter()
.map(|(k, v)| (String::from(*k), *v))
.collect()
BlockTypeMap(
block_types::BLOCK_TYPES
.iter()
.map(|(k, v)| (String::from(*k), *v))
.collect(),
)
}

2
src/world/layer.rs
View file

@ -110,7 +110,7 @@ pub fn top_layer(chunk: &Chunk, block_types: &BlockTypeMap) -> Result<Box<BlockI
let coords = SectionBlockCoords { xz, y };
let block_id = section.block_id_at(coords)?;
let Some(&block_type) = block_types.get(block_id) else {
let Some(block_type) = block_types.get(block_id) else {
eprintln!("Unknown block type: {}", block_id);
continue;
};