merge all makefiles into one

4 files changed, 8 insertions, 16 deletions

diff --git a/server/tools/src/graph.rs b/server/tools/src/graph.rs
index a65ffc97..343047da 100644
--- a/server/tools/src/graph.rs
+++ b/server/tools/src/graph.rs
@@ -20,8 +20,7 @@ use hurrycurry_data::index::DataIndex;
 use hurrycurry_protocol::{Demand, ItemIndex, Recipe, RecipeIndex};
 
 pub(crate) fn graph() -> Result<()> {
-    let mut index = DataIndex::default();
-    index.reload()?;
+    let index = DataIndex::new("data".into())?;
 
     println!("digraph {{");
 
diff --git a/server/tools/src/graph_summary.rs b/server/tools/src/graph_summary.rs
index bfdcc955..c6db2678 100644
--- a/server/tools/src/graph_summary.rs
+++ b/server/tools/src/graph_summary.rs
@@ -22,8 +22,7 @@ use hurrycurry_protocol::{ItemIndex, Recipe, TileIndex};
 use std::collections::HashSet;
 
 pub(crate) fn graph_summary() -> Result<()> {
-    let mut index = DataIndex::default();
-    index.reload()?;
+    let index = DataIndex::new("data".into())?;
 
     println!("digraph {{");
 
diff --git a/server/tools/src/main.rs b/server/tools/src/main.rs
index 07c5d45b..4af6b87f 100644
--- a/server/tools/src/main.rs
+++ b/server/tools/src/main.rs
@@ -65,8 +65,7 @@ fn main() -> Result<()> {
         Action::Graph => graph()?,
         Action::GraphSummary => graph_summary()?,
         Action::GraphSingle { out, dot_out } => {
-            let mut index = DataIndex::default();
-            index.reload()?;
+            let index = DataIndex::new("data".into())?;
             let (data, serverdata) = index.generate("5star")?;
             let out = data.get_item_by_name(&out).unwrap();
             let mut diagram = recipe_diagram(&data, &serverdata, &[out])?;
@@ -79,24 +78,21 @@ fn main() -> Result<()> {
             println!("{out}");
         }
         Action::MapDemands { map } => {
-            let mut index = DataIndex::default();
-            index.reload()?;
+            let index = DataIndex::new("data".into())?;
             let (data, _) = index.generate(&map)?;
             for demand in &data.demands {
                 println!("{}", data.item_name(demand.input))
             }
         }
         Action::MapItems { map } => {
-            let mut index = DataIndex::default();
-            index.reload()?;
+            let index = DataIndex::new("data".into())?;
             let (data, _) = index.generate(&map)?;
             for name in &data.item_names {
                 println!("{name}")
             }
         }
         Action::MapTiles { map } => {
-            let mut index = DataIndex::default();
-            index.reload()?;
+            let index = DataIndex::new("data".into())?;
             let (data, _) = index.generate(&map)?;
             for name in &data.tile_names {
                 println!("{name}")
@@ -104,8 +100,7 @@ fn main() -> Result<()> {
         }
         Action::CheckMap { map } => {
             if map == "all" {
-                let mut index = DataIndex::default();
-                index.reload()?;
+                let index = DataIndex::new("data".into())?;
                 for map in index.maps.keys() {
                     check_map(map)?;
                 }
diff --git a/server/tools/src/map_linter.rs b/server/tools/src/map_linter.rs
index 678f2930..94b57726 100644
--- a/server/tools/src/map_linter.rs
+++ b/server/tools/src/map_linter.rs
@@ -146,8 +146,7 @@ static TILE_MODE: LazyLock<HashMap<String, TileMode>> = LazyLock::new(|| {
 pub fn check_map(map: &str) -> Result<()> {
     let style = &COLORED;
     let locale = &*FALLBACK_LOCALE;
-    let mut index = DataIndex::default();
-    index.reload()?;
+    let index = DataIndex::new("data".into())?;
     let (data, serverdata) = index.generate(map)?;
 
     let mut warnings = Vec::new();