Revert "Very destructive commit"

This reverts commit 471b014.

crates/components/src/database_view.rs

@@ -48,11 +48,11 @@ impl DatabaseView {
     pub fn show<T, R>(
         &mut self,
         ui: &mut egui::Ui,
-        update_state: &mut luminol_core::UpdateState<'_>,
+        update_state: &luminol_core::UpdateState<'_>,
         label: impl Into<egui::WidgetText>,
         vec: &mut Vec<T>,
         formatter: impl Fn(&T) -> String,
-        inner: impl FnOnce(&mut egui::Ui, &mut Vec<T>, usize, &mut luminol_core::UpdateState<'_>) -> R,
+        inner: impl FnOnce(&mut egui::Ui, &mut Vec<T>, usize) -> R,
     ) -> egui::InnerResponse<DatabaseViewResponse<R>>
     where
         T: luminol_data::rpg::DatabaseEntry,
@@ -262,7 +262,7 @@ impl DatabaseView {
 
                         DatabaseViewResponse {
                             inner: (self.selected_id < vec.len())
-                                .then(|| inner(ui, vec, self.selected_id, update_state)),
+                                .then(|| inner(ui, vec, self.selected_id)),
                             modified,
                         }
                     })

crates/data/src/rmxp/actor.rs

@@ -19,7 +19,7 @@ use crate::{
     optional_path_serde, Path, Table2,
 };
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Actor")]
 pub struct Actor {

crates/data/src/rmxp/armor.rs

@@ -19,7 +19,7 @@ use crate::{
     optional_path_alox, optional_path_serde, Path,
 };
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Armor")]
 pub struct Armor {

crates/data/src/rmxp/class.rs

@@ -16,7 +16,7 @@
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 pub use crate::{id_alox, id_serde, id_vec_alox, id_vec_serde, Table1};
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Class")]
 pub struct Class {
@@ -36,7 +36,7 @@ pub struct Class {
     pub learnings: Vec<Learning>,
 }
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Class::Learning")]
 pub struct Learning {

crates/data/src/rmxp/enemy.rs

@@ -19,7 +19,7 @@ pub use crate::{
     optional_path_serde, Path, Table1,
 };
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Enemy")]
 pub struct Enemy {
@@ -65,7 +65,7 @@ pub struct Enemy {
     pub treasure_prob: i32,
 }
 
-#[derive(Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Enemy::Action")]
 pub struct Action {

crates/data/src/rmxp/skill.rs

@@ -19,7 +19,7 @@ pub use crate::{
     optional_path_alox, optional_path_serde, rpg::AudioFile, Path,
 };
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Skill")]
 pub struct Skill {

crates/data/src/rmxp/state.rs

@@ -16,7 +16,7 @@
 // along with Luminol.  If not, see <http://www.gnu.org/licenses/>.
 use crate::{id_alox, id_serde, id_vec_alox, id_vec_serde, optional_id_alox, optional_id_serde};
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::State")]
 pub struct State {

crates/data/src/rmxp/weapon.rs

@@ -19,7 +19,7 @@ pub use crate::{
     optional_path_alox, optional_path_serde, rpg::AudioFile, Path,
 };
 
-#[derive(Default, Debug, serde::Deserialize, serde::Serialize, Clone)]
+#[derive(Default, Debug, serde::Deserialize, serde::Serialize)]
 #[derive(alox_48::Deserialize, alox_48::Serialize)]
 #[marshal(class = "RPG::Weapon")]
 pub struct Weapon {

crates/modals/src/sound_picker.rs

@@ -24,23 +24,18 @@
 use luminol_core::prelude::*;
 
 pub struct Modal {
-    state: State,
-    id_source: egui::Id,
-    source: Source,
-}
-
-enum State {
-    Closed,
-    Open { tab: luminol_components::SoundTab },
+    tab: luminol_components::SoundTab,
+    open: bool,
 }
 
 impl Modal {
-    pub fn new(source: Source, id_source: impl Into<egui::Id>) -> Self {
-        Self {
-            state: State::Closed,
-            id_source: id_source.into(),
-            source,
-        }
+    pub fn new(
+        filesystem: &impl FileSystem,
+        source: Source,
+        selected_track: luminol_data::rpg::AudioFile,
+    ) -> Self {
+        let tab = luminol_components::SoundTab::new(filesystem, source, selected_track);
+        Self { tab, open: false }
     }
 }
 
@@ -53,21 +48,16 @@ impl luminol_core::Modal for Modal {
         update_state: &'m mut luminol_core::UpdateState<'_>,
     ) -> impl egui::Widget + 'm {
         |ui: &mut egui::Ui| {
-            let button_text = if let Some(track) = &data.name {
-                format!("Audio/{}/{}", self.source, track)
+            let button_text = if let Some(track) = &self.tab.audio_file.name {
+                format!("Audio/{}/{}", self.tab.source, track)
             } else {
                 "(None)".to_string()
             };
 
             let mut button_response = ui.button(button_text);
 
             if button_response.clicked() {
-                let tab = luminol_components::SoundTab::new(
-                    update_state.filesystem,
-                    self.source,
-                    data.clone(),
-                );
-                self.state = State::Open { tab };
+                self.open = true;
             }
             if self.show_window(update_state, ui.ctx(), data) {
                 button_response.mark_changed()
@@ -78,7 +68,7 @@ impl luminol_core::Modal for Modal {
     }
 
     fn reset(&mut self) {
-        self.state = State::Closed;
+        self.open = false;
     }
 }
 
@@ -89,30 +79,24 @@ impl Modal {
         ctx: &egui::Context,
         data: &mut luminol_data::rpg::AudioFile,
     ) -> bool {
-        let mut win_open = true;
+        let mut win_open = self.open;
         let mut keep_open = true;
         let mut needs_save = false;
 
-        let State::Open { tab } = &mut self.state else {
-            return false;
-        };
-
         egui::Window::new("Graphic Picker")
             .open(&mut win_open)
             .show(ctx, |ui| {
-                tab.ui(ui, update_state);
+                self.tab.ui(ui, update_state);
                 ui.separator();
 
                 luminol_components::close_options_ui(ui, &mut keep_open, &mut needs_save);
             });
 
         if needs_save {
-            *data = tab.audio_file.clone();
+            *data = self.tab.audio_file.clone();
         }
 
-        if !(win_open && keep_open) {
-            self.state = State::Closed;
-        }
+        self.open = win_open && keep_open;
         needs_save
     }
 }