1 files changed, 3 insertions, 8 deletions
diff --git a/server/src/main.rs b/server/src/main.rs
index 3af71e17..0f0bac5e 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use futures_util::{SinkExt, StreamExt};
 use log::{debug, info, warn};
-use std::{fs::File, sync::Arc, time::Duration};
+use std::{sync::Arc, time::Duration};
 use tokio::{
     io::{AsyncBufReadExt, AsyncWriteExt, BufReader},
     net::TcpListener,
@@ -12,8 +12,8 @@ use tokio::{
 use tokio_tungstenite::tungstenite::Message;
 use undercooked::{
     customer::customer,
-    data::build_gamedata,
     game::Game,
+    load_gamedata,
     protocol::{PacketC, PacketS, PlayerID},
 };
 
@@ -28,12 +28,7 @@ async fn main() -> Result<()> {
     );
     info!("listening for websockets on {}", ws_listener.local_addr()?);
 
-    let data = build_gamedata(
-        serde_yaml::from_reader(File::open("data/recipes.yaml").unwrap()).unwrap(),
-        serde_yaml::from_reader(File::open("data/map.yaml").unwrap()).unwrap(),
-        serde_yaml::from_reader(File::open("data/demands.yaml").unwrap()).unwrap(),
-    );
-
+    let data = load_gamedata();
     let game = Arc::new(RwLock::new(Game::new(data.into())));
     let (tx, rx) = broadcast::channel::<PacketC>(1024);