Loads of cleanup

src/ffi/dynamic_data/models/pokemon.rs

@@ -84,7 +84,7 @@ ffi_arc_getter!(Pokemon, coloring, u8);
 
 /// Gets the held item of a Pokemon
 #[no_mangle]
-extern "C" fn pokemon_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Item>> {
+extern "C" fn pokemon_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<dyn Item>> {
     if let Some(v) = ptr.as_ref().held_item().read().as_ref() {
         v.clone().into()
     } else {
@@ -103,8 +103,8 @@ extern "C" fn pokemon_has_held_item(ptr: ExternPointer<Arc<Pokemon>>, name: *con
 #[no_mangle]
 extern "C" fn pokemon_set_held_item(
     ptr: ExternPointer<Arc<Pokemon>>,
-    item: ExternPointer<Arc<Item>>,
-) -> IdentifiablePointer<Arc<Item>> {
+    item: ExternPointer<Arc<dyn Item>>,
+) -> IdentifiablePointer<Arc<dyn Item>> {
     if let Some(v) = ptr.as_ref().set_held_item(item.as_ref()) {
         v.into()
     } else {
@@ -114,7 +114,7 @@ extern "C" fn pokemon_set_held_item(
 
 /// Removes the held item from the Pokemon. Returns the previously held item.
 #[no_mangle]
-extern "C" fn pokemon_remove_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<Item>> {
+extern "C" fn pokemon_remove_held_item(ptr: ExternPointer<Arc<Pokemon>>) -> IdentifiablePointer<Arc<dyn Item>> {
     if let Some(v) = ptr.as_ref().remove_held_item() {
         v.into()
     } else {

src/ffi/mod.rs

@@ -129,9 +129,9 @@ impl<T> From<*mut T> for ExternPointer<T> {
     }
 }
 
-impl<T: ValueIdentifiable> From<Arc<T>> for IdentifiablePointer<Arc<T>> {
+impl<T: ValueIdentifiable + ?Sized> From<Arc<T>> for IdentifiablePointer<Arc<T>> {
     fn from(v: Arc<T>) -> Self {
-        let id = unsafe { transmute(v.value_identifier()) };
+        let id = v.value_identifier().value();
         Self {
             ptr: Box::into_raw(Box::new(v)),
             id,

src/ffi/static_data/item.rs

@@ -1,5 +1,5 @@
 use crate::ffi::{ffi_arc_getter, ExternPointer, IdentifiablePointer, OwnedPtr};
-use crate::static_data::{BattleItemCategory, Item, ItemCategory};
+use crate::static_data::{BattleItemCategory, Item, ItemCategory, ItemImpl};
 use crate::StringKey;
 use hashbrown::HashSet;
 use std::ffi::{c_char, CStr, CString};
@@ -15,36 +15,38 @@ unsafe extern "C" fn item_new(
     price: i32,
     flags: *const *const c_char,
     flags_length: usize,
-) -> IdentifiablePointer<Arc<Item>> {
+) -> IdentifiablePointer<Arc<dyn Item>> {
     let flags = std::slice::from_raw_parts(flags, flags_length);
     let name: StringKey = CStr::from_ptr(name).to_str().unwrap().into();
     let mut flags_set: HashSet<StringKey> = HashSet::with_capacity(flags_length);
     for flag in flags {
         flags_set.insert(CStr::from_ptr(*flag).to_str().unwrap().into());
     }
-    Arc::new(Item::new(&name, category, battle_category, price, flags_set)).into()
+
+    let item: Arc<dyn Item> = Arc::new(ItemImpl::new(&name, category, battle_category, price, flags_set));
+    item.into()
 }
 
 /// Drops a reference counted item.
 #[no_mangle]
-unsafe extern "C" fn item_drop(ptr: OwnedPtr<Arc<Item>>) {
+unsafe extern "C" fn item_drop(ptr: OwnedPtr<Arc<dyn Item>>) {
     drop_in_place(ptr)
 }
 
 /// The name of the item.
 #[no_mangle]
-unsafe extern "C" fn item_name(ptr: ExternPointer<Arc<Item>>) -> OwnedPtr<c_char> {
+unsafe extern "C" fn item_name(ptr: ExternPointer<Arc<dyn Item>>) -> OwnedPtr<c_char> {
     let name = ptr.as_ref().name();
     CString::new(name.str()).unwrap().into_raw()
 }
 
-ffi_arc_getter!(Item, category, ItemCategory);
-ffi_arc_getter!(Item, battle_category, BattleItemCategory);
-ffi_arc_getter!(Item, price, i32);
+ffi_arc_getter!(dyn Item, category, ItemCategory);
+ffi_arc_getter!(dyn Item, battle_category, BattleItemCategory);
+ffi_arc_getter!(dyn Item, price, i32);
 
 /// Checks whether the item has a specific flag.
 #[no_mangle]
-unsafe extern "C" fn item_has_flag(ptr: ExternPointer<Arc<Item>>, flag: *const c_char) -> u8 {
+unsafe extern "C" fn item_has_flag(ptr: ExternPointer<Arc<dyn Item>>, flag: *const c_char) -> u8 {
     let flag = CStr::from_ptr(flag).into();
     u8::from(ptr.as_ref().has_flag(&flag))
 }

src/ffi/static_data/libraries/mod.rs

@@ -75,4 +75,4 @@ macro_rules! library_interface {
 library_interface!(SpeciesLibrary, Species);
 library_interface!(MoveLibrary, MoveData);
 library_interface!(AbilityLibrary, Ability);
-library_interface!(ItemLibrary, Item);
+library_interface!(ItemLibrary, dyn Item);