more specific types!

1 files changed, 4 insertions, 3 deletions

diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs
index a7bb5b6..7b40373 100644
--- a/src/encyclopedia.rs
+++ b/src/encyclopedia.rs
@@ -4,12 +4,13 @@ use serde_json::Value;
 use crate::{
 	assemblage::Assemblage,
 	componentwrapper::PreEntity,
-	Template
+	Template,
+	template::EntityType
 };
 
 #[derive(Default, Clone)]
 pub struct Encyclopedia {
-	items: HashMap<String, Assemblage>
+	items: HashMap<EntityType, Assemblage>
 }
 
 impl Encyclopedia {
@@ -17,7 +18,7 @@ impl Encyclopedia {
 	pub fn from_json(val: Value) -> Result<Encyclopedia, &'static str> {
 		let mut items = HashMap::new();
 		for (k, v) in val.as_object().ok_or("encyclopedia not a json object")?.into_iter() {
-			items.insert(k.clone(), Assemblage::from_json(v)?);
+			items.insert(EntityType(k.clone()), Assemblage::from_json(v)?);
 		}
 		Ok(Encyclopedia{items})
 	}