Rework of FFI, adding a value identifier, so we can keep knowledge of data even when data moves.

src/static_data/libraries/ability_library.rs

@@ -4,11 +4,13 @@ use indexmap::IndexMap;
 
 use crate::static_data::Ability;
 use crate::static_data::DataLibrary;
-use crate::StringKey;
+use crate::{StringKey, ValueIdentifiable, ValueIdentifier};
 
 /// A storage for all abilities that can be used in this data library.
 #[derive(Debug)]
 pub struct AbilityLibrary {
+    /// A unique identifier so we know what value this is.
+    identifier: ValueIdentifier,
     /// The underlying map for the library.
     map: IndexMap<StringKey, Arc<Ability>>,
 }
@@ -17,6 +19,7 @@ impl AbilityLibrary {
     /// Instantiates a new ability library.
     pub fn new(capacity: usize) -> AbilityLibrary {
         AbilityLibrary {
+            identifier: Default::default(),
             map: IndexMap::with_capacity(capacity),
         }
     }
@@ -31,18 +34,25 @@ impl DataLibrary<'_, Ability> for AbilityLibrary {
     }
 }
 
+impl ValueIdentifiable for AbilityLibrary {
+    fn value_identifier(&self) -> ValueIdentifier {
+        self.identifier
+    }
+}
+
 #[cfg(test)]
 pub mod tests {
     use crate::static_data::Ability;
     use crate::static_data::AbilityLibrary;
     use crate::static_data::DataLibrary;
     use crate::StringKey;
+    use std::sync::Arc;
 
     pub fn build() -> AbilityLibrary {
         let mut lib = AbilityLibrary::new(1);
         lib.add(
             &StringKey::new("test_ability".into()),
-            Ability::new(&"test_ability".into(), &"test_ability".into(), Vec::new()),
+            Arc::new(Ability::new(&"test_ability".into(), &"test_ability".into(), Vec::new())),
         );
         // Drops borrow as mut