Loads of cleanup

src/script_implementations/wasm/export_registry/dynamic_data/battle_side.rs

@@ -77,7 +77,7 @@ register! {
         side: ExternRef<BattleSide>,
         script_ptr: u32
     ) -> u32 {
-        let side = side.value_func(&env).unwrap();
+        let side : &BattleSide = side.value_func(&env).unwrap();
         unsafe{
             let env = env.data().data();
             let name_ptr = env.script_function_cache().script_get_name(&env).unwrap().call(&mut env.store_mut(), script_ptr).unwrap();

src/script_implementations/wasm/export_registry/dynamic_data/mod.rs

@@ -44,9 +44,9 @@ register! {
             let script = env.data().data().get_loaded_script(script);
             if let Some(script) = script {
                 match script.get_owner() {
-                    ScriptOwnerData::Pokemon(p) => env.data().data().get_extern_ref_index(p.load(Ordering::Relaxed).as_ref().unwrap()),
-                    ScriptOwnerData::BattleSide(p) => env.data().data().get_extern_ref_index(p.load(Ordering::Relaxed).as_ref().unwrap()),
-                    ScriptOwnerData::Battle(p) => env.data().data().get_extern_ref_index(p.load(Ordering::Relaxed).as_ref().unwrap()),
+                    ScriptOwnerData::Pokemon(p) => env.data().data().get_extern_ref_index::<crate::dynamic_data::Pokemon>(p.load(Ordering::Relaxed).as_ref().unwrap()) as u32,
+                    ScriptOwnerData::BattleSide(p) => env.data().data().get_extern_ref_index::<crate::dynamic_data::BattleSide>(p.load(Ordering::Relaxed).as_ref().unwrap()) as u32,
+                    ScriptOwnerData::Battle(p) => env.data().data().get_extern_ref_index::<crate::dynamic_data::Battle>(p.load(Ordering::Relaxed).as_ref().unwrap()) as u32,
                     ScriptOwnerData::None => 0,
                 }
             } else {

src/script_implementations/wasm/export_registry/dynamic_data/pokemon.rs

@@ -16,7 +16,7 @@ register! {
         env: FunctionEnvMut<WebAssemblyEnv>,
         pokemon: ExternRef<Pokemon>,
     ) -> ExternRef<DynamicLibrary> {
-        let lib = pokemon.value_func(&env).unwrap().library();
+        let lib = pokemon.value_func(&env).unwrap().library().as_ref();
         ExternRef::func_new(&env, lib)
     }
 
@@ -174,7 +174,7 @@ register! {
     fn pokemon_get_held_item(
         env: FunctionEnvMut<WebAssemblyEnv>,
         pokemon: ExternRef<Pokemon>,
-    ) -> ExternRef<Item> {
+    ) -> ExternRef<dyn Item> {
         let read_lock = pokemon.value_func(&env).unwrap().held_item().read();
         if let Some(item) = read_lock.as_ref() {
             ExternRef::func_new(&env, item.as_ref())
@@ -231,7 +231,7 @@ register! {
         pokemon: ExternRef<Pokemon>,
         script_ptr: u32
     ) -> u32 {
-        let pokemon = pokemon.value_func(&env).unwrap();
+        let pokemon : &Pokemon = pokemon.value_func(&env).unwrap();
         unsafe{
             let env = env.data().data();
             let name_ptr = env.script_function_cache().script_get_name(&env).unwrap().call(&mut env.store_mut(), script_ptr).unwrap();

src/script_implementations/wasm/export_registry/mod.rs

@@ -109,7 +109,9 @@ fn _error(env: FunctionEnvMut<WebAssemblyEnv>, message: u32, file: u32, line: u3
 
 /// Get a single item from an earlier passed VecExternRef
 fn _vec_extern_ref_get_value(env: FunctionEnvMut<WebAssemblyEnv>, reference: u32, index: u32) -> u32 {
-    env.data().data().get_extern_vec_ref_extern_ref(reference, index)
+    env.data()
+        .data()
+        .get_extern_vec_ref_extern_ref(reference as usize, index as usize) as u32
 }
 
 /// Gets the hash value of a StringKey.

src/script_implementations/wasm/export_registry/static_data/item.rs

@@ -1,38 +1,62 @@
 use crate::script_implementations::wasm::export_registry::register;
 use crate::script_implementations::wasm::extern_ref::ExternRef;
 use crate::script_implementations::wasm::script_resolver::WebAssemblyEnv;
-use crate::static_data::Item;
+use crate::static_data::{DataLibrary, Item, ItemLibrary};
 use crate::StringKey;
 use std::mem::transmute;
 use wasmer::FunctionEnvMut;
 
 register! {
+    fn item_library_get_item(
+        env: FunctionEnvMut<WebAssemblyEnv>,
+        lib: ExternRef<ItemLibrary>,
+        string_key: ExternRef<StringKey>,
+    ) -> ExternRef<dyn Item> {
+        let lib = lib.value_func(&env).unwrap();
+        let m = lib.get(string_key.value_func(&env).unwrap());
+        if let Some(v) = m {
+            ExternRef::func_new(&env, v)
+        } else {
+            ExternRef::null()
+        }
+    }
+
+    fn item_library_get_item_by_hash(env: FunctionEnvMut<WebAssemblyEnv>, lib: ExternRef<ItemLibrary>, hash: u32) -> ExternRef<dyn Item> {
+        let lib = lib.value_func(&env).unwrap();
+        let m = lib.get_by_hash(hash);
+        if let Some(v) = m {
+            ExternRef::func_new(&env, v)
+        } else {
+            ExternRef::null()
+        }
+    }
+
+
     fn item_get_price(
         env: FunctionEnvMut<WebAssemblyEnv>,
-        item: ExternRef<Item>,
+        item: ExternRef<dyn Item>,
     ) -> i32 {
-        item.value_func(&env).unwrap().price()
+        item.value_func_arc(&env).unwrap().price()
     }
 
     fn item_get_name(
         env: FunctionEnvMut<WebAssemblyEnv>,
-        item: ExternRef<Item>,
+        item: ExternRef<dyn Item>,
     ) -> ExternRef<StringKey> {
-        ExternRef::func_new(&env, item.value_func(&env).unwrap().name())
+        ExternRef::func_new(&env, item.value_func_arc(&env).unwrap().name())
     }
 
     fn item_get_category(
         env: FunctionEnvMut<WebAssemblyEnv>,
-        item: ExternRef<Item>,
+        item: ExternRef<dyn Item>,
     ) -> u8 {
-        unsafe { transmute(item.value_func(&env).unwrap().category()) }
-
+        unsafe { transmute(item.value_func_arc(&env).unwrap().category()) }
     }
 
     fn item_get_battle_category(
         env: FunctionEnvMut<WebAssemblyEnv>,
-        item: ExternRef<Item>,
+        item: ExternRef<dyn Item>,
     ) -> u8 {
-        unsafe { transmute(item.value_func(&env).unwrap().battle_category()) }
+        unsafe { transmute(item.value_func_arc(&env).unwrap().battle_category()) }
     }
 }