Move data code to own crate + general data refactor

1 files changed, 10 insertions, 13 deletions

diff --git a/server/tools/src/main.rs b/server/tools/src/main.rs
index b550dabb..f70c5755 100644
--- a/server/tools/src/main.rs
+++ b/server/tools/src/main.rs
@@ -16,31 +16,28 @@
 
 */
 
-pub mod book;
 pub mod book_html;
 pub mod diagram_dot;
-pub mod diagram_layout;
 pub mod diagram_svg;
 pub mod graph;
 pub mod graph_summary;
 pub mod map_linter;
-pub mod recipe_diagram;
 
 use crate::{
-    book::{book, print_book},
     book_html::render_html_book,
     diagram_dot::{diagram_dot, diagram_dot_svg},
-    diagram_layout::diagram_layout,
     diagram_svg::diagram_svg,
     graph::graph,
     graph_summary::graph_summary,
     map_linter::check_map,
-    recipe_diagram::recipe_diagram,
 };
 use anyhow::Result;
 use clap::Parser;
+use hurrycurry_data::{
+    book::{book, diagram_layout::diagram_layout, print_book, recipe_diagram::recipe_diagram},
+    index::DataIndex,
+};
 use hurrycurry_locale::FALLBACK_LOCALE;
-use hurrycurry_server::data::DataIndex;
 
 #[derive(Parser)]
 enum Action {
@@ -83,7 +80,7 @@ fn main() -> Result<()> {
         } => {
             let mut index = DataIndex::default();
             index.reload()?;
-            let (data, serverdata, _) = index.generate("5star")?;
+            let (data, serverdata) = index.generate("5star")?;
             let mut diagram = recipe_diagram(&data, &serverdata, &[&out])?;
             let out = if dot_out {
                 diagram_dot(&data, &diagram, false)?
@@ -99,20 +96,20 @@ fn main() -> Result<()> {
         Action::Book => {
             let mut index = DataIndex::default();
             index.reload()?;
-            let (data, serverdata, _) = index.generate("5star")?;
+            let (data, serverdata) = index.generate("5star")?;
             print_book(&data, &serverdata)?
         }
         Action::BookHtml => {
             let mut index = DataIndex::default();
             index.reload()?;
-            let (data, serverdata, _) = index.generate("5star")?;
+            let (data, serverdata) = index.generate("5star")?;
             let book = book(&data, &serverdata)?;
             println!("{}", render_html_book(&data, &book, &FALLBACK_LOCALE));
         }
         Action::MapDemands { map } => {
             let mut index = DataIndex::default();
             index.reload()?;
-            let (data, _, _) = index.generate(&map)?;
+            let (data, _) = index.generate(&map)?;
             for demand in &data.demands {
                 println!("{}", data.item_name(demand.input))
             }
@@ -120,7 +117,7 @@ fn main() -> Result<()> {
         Action::MapItems { map } => {
             let mut index = DataIndex::default();
             index.reload()?;
-            let (data, _, _) = index.generate(&map)?;
+            let (data, _) = index.generate(&map)?;
             for name in &data.item_names {
                 println!("{name}")
             }
@@ -128,7 +125,7 @@ fn main() -> Result<()> {
         Action::MapTiles { map } => {
             let mut index = DataIndex::default();
             index.reload()?;
-            let (data, _, _) = index.generate(&map)?;
+            let (data, _) = index.generate(&map)?;
             for name in &data.tile_names {
                 println!("{name}")
             }