Rework asset system (TemplateCollections)

gameserver/src/config/mod.rs

@@ -1,18 +1,51 @@
 mod templates;
 
-use lazy_static::lazy_static;
+use std::path::Path;
+
+use anyhow::{bail, Result};
+use paste::paste;
 pub use templates::*;
+use tokio::sync::OnceCell;
 
-const MAIN_CITY_OBJECT_COLLECTION_JSON: &str =
+macro_rules! template_collections {
-    include_str!("../../TemplateCollections/MainCityObjectTemplateCollection.json");
+    ($($template_type:ident;)*) => {
+        $(paste! {
+            static [<$template_type:snake:upper _COLLECTION>]: OnceCell<Vec<[<$template_type Template>]>> = OnceCell::const_new();
+        })*
 
-lazy_static! {
+        fn init_template_collections() -> Result<()> {
-    static ref MAIN_CITY_OBJECT_COLLECTION: Vec<MainCityObjectTemplate> =
+            $(paste! {
-        serde_json::from_str(MAIN_CITY_OBJECT_COLLECTION_JSON).unwrap();
+                let path = concat!("assets/TemplateCollections/", stringify!($template_type), "TemplateCollection.json");
+                let data = std::fs::read_to_string(path)?;
+                [<$template_type:snake:upper _COLLECTION>].set(serde_json::from_str(&data)?).unwrap();
+            })*
+
+            Ok(())
+        }
+
+        $(paste! {
+            pub fn [<iter_ $template_type:snake _collection>]() -> ::std::slice::Iter<'static, [<$template_type Template>]> {
+                [<$template_type:snake:upper _COLLECTION>].get().unwrap().iter()
+            }
+        })*
+    };
+}
+
+template_collections! {
+    MainCityObject;
+}
+
+pub fn init_assets() -> Result<()> {
+    if !Path::new("assets/").exists() {
+        bail!(
+            "Assets directory not found! Make sure you have it in the same directory with executable."
+        )
+    }
+
+    init_template_collections()?;
+    Ok(())
 }
 
 pub fn get_main_city_object(tag_id: i32, npc_id: i32) -> Option<&'static MainCityObjectTemplate> {
-    MAIN_CITY_OBJECT_COLLECTION
+    iter_main_city_object_collection().find(|o| o.tag_id == tag_id && o.npc_id == npc_id)
-        .iter()
-        .find(|object| object.tag_id == tag_id && object.npc_id == npc_id)
 }

gameserver/src/config/templates.rs

@@ -1,6 +1,7 @@
-use serde::{Deserialize, Serialize};
+#![allow(dead_code)]
+use serde::Deserialize;
 
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 #[serde(rename_all = "PascalCase")]
 pub struct MainCityObjectTemplate {
     #[serde(rename = "TagID")]

gameserver/src/game/context.rs

@@ -12,7 +12,7 @@ use super::manager::{
 };
 
 pub struct GameContext {
-    pub player: Arc<AtomicRefCell<PlayerInfo>>,
+    #[allow(unused)]
     pub uid_manager: Arc<AtomicRefCell<UniqueIDManager>>,
     pub item_manager: Arc<AtomicRefCell<ItemManager>>,
     pub dungeon_manager: Arc<AtomicRefCell<DungeonManager>>,
@@ -28,7 +28,6 @@ impl GameContext {
         let uid_manager = Arc::new(AtomicRefCell::new(UniqueIDManager::new()));
 
         Self {
-            player: player.clone(),
             uid_manager: uid_manager.clone(),
             item_manager: Arc::new(AtomicRefCell::new(ItemManager::new(
                 uid_manager.clone(),

gameserver/src/game/manager/dungeon.rs

@@ -494,6 +494,7 @@ impl DungeonManager {
         )
     }
 
+    #[allow(dead_code)]
     pub fn is_in_tutorial(&self) -> bool {
         let cur_scene_uid = self.get_cur_scene_uid();
 

gameserver/src/main.rs

@@ -1,6 +1,7 @@
 use std::path::Path;
 
 use anyhow::Result;
+use config::init_assets;
 use tracing::Level;
 
 mod config;
@@ -19,6 +20,7 @@ async fn main() -> Result<()> {
     ansi_term::enable_ansi_support().unwrap();
 
     init_config()?;
+    init_assets()?;
     init_tracing();
 
     let span = tracing::span!(Level::DEBUG, "main");

gameserver/src/net/handlers/hollow.rs

@@ -49,7 +49,7 @@ pub async fn on_rpc_end_battle_arg(session: &NetworkSession, arg: &RpcEndBattleA
         session.send_rpc_arg(210, &sync_event).await?;
     } else {
         let dungeon_manager = session.context.dungeon_manager.borrow();
-        let cur_scene = *dungeon_manager
+        let _ = *dungeon_manager
             .hollow_finished()
             .send_changes(session)
             .await?;
@@ -154,7 +154,7 @@ pub async fn on_rpc_run_hollow_event_graph_arg(
 
         if hollow_finished {
             let dungeon_manager = session.context.dungeon_manager.borrow();
-            let cur_scene = *dungeon_manager
+            let _ = *dungeon_manager
                 .hollow_finished()
                 .send_changes(session)
                 .await?;

gameserver/src/net/packet.rs

@@ -11,6 +11,7 @@ use super::handlers::*;
 use super::NetworkSession;
 
 pub struct Packet {
+    #[allow(unused)]
     pub to_channel: u16,
     pub header: ProtocolHeader,
     pub body: Vec<u8>,