diff options
Diffstat (limited to 'server/tools/src/recipe_diagram.rs')
-rw-r--r-- | server/tools/src/recipe_diagram.rs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/server/tools/src/recipe_diagram.rs b/server/tools/src/recipe_diagram.rs index 25f8040c..7dc42c1e 100644 --- a/server/tools/src/recipe_diagram.rs +++ b/server/tools/src/recipe_diagram.rs @@ -17,18 +17,19 @@ */ use anyhow::Result; -use hurrycurry_protocol::book::{Diagram, DiagramEdge, DiagramNode}; -use hurrycurry_protocol::glam::Vec2; -use hurrycurry_protocol::{ItemIndex, Message, RecipeIndex}; -use hurrycurry_server::data::DataIndex; +use hurrycurry_protocol::{ + Gamedata, ItemIndex, Message, RecipeIndex, + book::{Diagram, DiagramEdge, DiagramNode}, + glam::Vec2, +}; +use hurrycurry_server::data::Serverdata; use std::collections::{BTreeMap, BTreeSet, HashSet}; -pub(crate) fn recipe_diagram(target_items: &[String]) -> Result<Diagram> { - let mut index = DataIndex::default(); - index.reload()?; - - let (data, serverdata, _) = index.generate("5star")?; - +pub(crate) fn recipe_diagram( + data: &Gamedata, + serverdata: &Serverdata, + target_items: &[String], +) -> Result<Diagram> { let ambient_items = serverdata .initial_map .iter() |