Loads of cleanup

tests/common/library_loader.rs

@@ -16,7 +16,7 @@ use pkmn_lib::dynamic_data::Gen7DamageLibrary;
 use pkmn_lib::dynamic_data::Gen7MiscLibrary;
 use pkmn_lib::script_implementations::wasm::script_resolver::WebAssemblyScriptResolver;
 use pkmn_lib::static_data::{
-    Ability, AbilityLibrary, BattleItemCategory, DataLibrary, EffectParameter, Form, GrowthRateLibrary, Item,
+    Ability, AbilityLibrary, BattleItemCategory, DataLibrary, EffectParameter, Form, GrowthRateLibrary, ItemImpl,
     ItemLibrary, LearnableMoves, LibrarySettings, LookupGrowthRate, MoveData, MoveLibrary, Nature, NatureLibrary,
     SecondaryEffect, Species, StaticData, StaticStatisticSet, Statistic, TypeLibrary,
 };
@@ -117,7 +117,7 @@ pub fn load_items(path: &String, lib: &mut ItemLibrary) {
 
         lib.add(
             &name,
-            Arc::new(Item::new(&name, category, battle_category, price as i32, flags)),
+            Arc::new(ItemImpl::new(&name, category, battle_category, price as i32, flags)),
         );
     }
 }