refactor: use handle for selected recipe over string (#84)

Author: ssouthcity

src/gameplay/hud/tome/tab_inspect.rs

@@ -78,21 +78,15 @@ fn on_recipe_select(
     click: On<Pointer<Click>>,
     mut commands: Commands,
     inspected: Res<Inspected>,
-    recipes: Res<Assets<RecipeDef>>,
-    query: Query<&Recipe>,
+    recipe_badges: Query<&Recipe>,
 ) {
-    let Some(recipe_id) = query
-        .get(click.entity)
-        .ok()
-        .and_then(|r| recipes.get(r.0))
-        .map(|r| r.id.clone())
-    else {
+    let Ok(recipe) = recipe_badges.get(click.entity) else {
         return;
     };
 
     commands.trigger(SelectRecipe {
         entity: inspected.0,
-        recipe_id,
+        recipe: recipe.0,
     });
 }
 

src/gameplay/recipe/process.rs

@@ -1,13 +1,10 @@
 use bevy::prelude::*;
 
-use crate::{
-    assets::indexing::IndexMap,
-    gameplay::{
-        FactorySystems,
-        item::stack::Stack,
-        recipe::{Input, Output, assets::RecipeDef, select::SelectedRecipe},
-        storage::Storage,
-    },
+use crate::gameplay::{
+    FactorySystems,
+    item::stack::Stack,
+    recipe::{Input, Output, assets::RecipeDef, select::SelectedRecipe},
+    storage::Storage,
 };
 
 use super::progress::on_progress_state_add;
@@ -45,7 +42,6 @@ fn consume_input(
     query: Query<(&mut ProcessState, &Storage, &SelectedRecipe)>,
     mut input_query: Query<(&mut Stack, &Input)>,
     recipes: Res<Assets<RecipeDef>>,
-    recipe_index: Res<IndexMap<RecipeDef>>,
 ) {
     for (mut state, storage, selected_recipe) in query {
         if !matches!(*state, ProcessState::InsufficientInput) {
@@ -66,10 +62,9 @@ fn consume_input(
             }
         }
 
-        let recipe = recipe_index
-            .get(selected_recipe.0.as_str())
-            .and_then(|asset_id| recipes.get(*asset_id))
-            .expect("Selected recipe refers to non-existent recipe");
+        let Some(recipe) = recipes.get(&selected_recipe.0) else {
+            continue;
+        };
 
         let timer = Timer::new(recipe.duration, TimerMode::Once);
 

src/gameplay/recipe/select.rs

@@ -19,30 +19,28 @@ pub fn plugin(app: &mut App) {
 #[derive(Component, Reflect, Default, Deref, DerefMut)]
 #[reflect(Component)]
 #[require(ProcessState)]
-pub struct SelectedRecipe(pub String);
+pub struct SelectedRecipe(pub Handle<RecipeDef>);
 
 #[derive(EntityEvent, Reflect)]
 pub struct SelectRecipe {
     pub entity: Entity,
-    pub recipe_id: String,
+    pub recipe: AssetId<RecipeDef>,
 }
 
 #[derive(Message, Reflect)]
 pub struct RecipeChanged(pub Entity);
 
 fn on_select_recipe(
     select_recipe: On<SelectRecipe>,
-    recipes: Res<Assets<RecipeDef>>,
-    recipe_index: Res<IndexMap<RecipeDef>>,
+    mut recipes: ResMut<Assets<RecipeDef>>,
     mut items: ResMut<Assets<ItemDef>>,
     item_index: Res<IndexMap<ItemDef>>,
     mut commands: Commands,
     mut recipe_changes: MessageWriter<RecipeChanged>,
 ) {
-    let recipe_def = recipe_index
-        .get(&select_recipe.recipe_id)
-        .and_then(|asset_id| recipes.get(*asset_id))
-        .expect("Attempted to select invalid recipe");
+    let Some(recipe_def) = recipes.get(select_recipe.recipe) else {
+        return;
+    };
 
     commands
         .entity(select_recipe.entity)
@@ -82,9 +80,13 @@ fn on_select_recipe(
         ));
     }
 
+    let Some(handle) = recipes.get_strong_handle(select_recipe.recipe) else {
+        return;
+    };
+
     commands
         .entity(select_recipe.entity)
-        .insert(SelectedRecipe(select_recipe.recipe_id.to_owned()));
+        .insert(SelectedRecipe(handle));
 
     recipe_changes.write(RecipeChanged(select_recipe.entity));
 }

src/gameplay/structure/default_recipe.rs

@@ -1,10 +1,13 @@
 use bevy::prelude::*;
 
-use crate::gameplay::{
-    hud::tome::tab_inspect::Inspect,
-    recipe::select::SelectRecipe,
-    structure::{Structure, assets::StructureDef, interactable::Interact},
-    world::construction::StructureConstructed,
+use crate::{
+    assets::indexing::IndexMap,
+    gameplay::{
+        hud::tome::tab_inspect::Inspect,
+        recipe::{assets::RecipeDef, select::SelectRecipe},
+        structure::{Structure, assets::StructureDef, interactable::Interact},
+        world::construction::StructureConstructed,
+    },
 };
 
 pub fn plugin(app: &mut App) {
@@ -19,6 +22,7 @@ fn apply_default_recipe(
     mut commands: Commands,
     structure_query: Query<&Structure>,
     structure_defs: Res<Assets<StructureDef>>,
+    recipe_index: Res<IndexMap<RecipeDef>>,
 ) {
     for StructureConstructed(entity) in structures_constructed.read() {
         let Ok(Structure(handle)) = structure_query.get(*entity) else {
@@ -29,10 +33,14 @@ fn apply_default_recipe(
             continue;
         };
 
-        if let Some(recipe) = &structure_def.default_recipe {
+        if let Some(recipe) = structure_def
+            .default_recipe
+            .as_ref()
+            .and_then(|id| recipe_index.get(id))
+        {
             commands.trigger(SelectRecipe {
                 entity: *entity,
-                recipe_id: recipe.to_owned(),
+                recipe: *recipe,
             });
         }