Extract server locale code to own crate

13 files changed, 35 insertions, 17 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 42727fcd..afc0d4a6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1034,6 +1034,14 @@ dependencies = [
 ]
 
 [[package]]
+name = "hurrycurry-locale"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "hurrycurry-protocol",
+]
+
+[[package]]
 name = "hurrycurry-protocol"
 version = "11.0.0"
 dependencies = [
@@ -1090,6 +1098,7 @@ dependencies = [
  "get_if_addrs",
  "hurrycurry-bot",
  "hurrycurry-client-lib",
+ "hurrycurry-locale",
  "hurrycurry-protocol",
  "igd",
  "log",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index 0698e6ab..e14bb84d 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -30,6 +30,7 @@ igd = { version = "0.12.1", optional = true, features = ["aio"] }
 get_if_addrs = { version = "0.5.3", optional = true }
 mdns-sd = { version = "0.15.1", optional = true }
 
+hurrycurry-locale = { path = "locale" }
 hurrycurry-protocol = { path = "protocol" }
 hurrycurry-client-lib = { path = "client-lib" }
 hurrycurry-bot = { path = "bot" }
diff --git a/server/locale/Cargo.toml b/server/locale/Cargo.toml
new file mode 100644
index 00000000..4e0b60cf
--- /dev/null
+++ b/server/locale/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "hurrycurry-locale"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+hurrycurry-protocol = { path = "../protocol" }
+anyhow = "1.0.100"
diff --git a/server/src/message.rs b/server/locale/src/lib.rs
index 31084ada..1d01e4e1 100644
--- a/server/src/message.rs
+++ b/server/locale/src/lib.rs
@@ -16,7 +16,7 @@
 
 */
 
-use anyhow::{anyhow, Result};
+use anyhow::anyhow;
 use hurrycurry_protocol::Message;
 use std::{
     collections::HashMap,
@@ -99,7 +99,7 @@ impl Display for TrError {
 #[macro_export]
 macro_rules! tre {
     ($id:literal $(, $typ:ident = $param:expr)*) => {
-        $crate::message::TrError::Tr {
+        $crate::TrError::Tr {
             id: $id,
             params: vec![$($crate::tre_param!($typ, $param)),*]
         }
@@ -131,9 +131,9 @@ impl Index<&'static str> for Strings {
 }
 
 impl Strings {
-    pub fn load() -> Result<Self> {
+    pub fn load() -> anyhow::Result<Self> {
         Ok(Self(
-            include_str!("../../locale/en.ini")
+            include_str!("../../../locale/en.ini")
                 .lines()
                 .skip(1)
                 .map(|l| {
@@ -143,7 +143,7 @@ impl Strings {
                         v.trim_start().replace("%n", "\n"),
                     ))
                 })
-                .try_collect()?,
+                .collect::<anyhow::Result<HashMap<_, _>>>()?,
         ))
     }
 }
diff --git a/server/src/commands.rs b/server/src/commands.rs
index 2a922e3f..2f0902ba 100644
--- a/server/src/commands.rs
+++ b/server/src/commands.rs
@@ -17,13 +17,12 @@
 */
 use crate::{
     entity::{bot::BotDriver, tutorial::Tutorial},
-    message::TrError,
     server::{AnnounceState, Server},
-    tre, trm,
 };
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
 use hurrycurry_bot::algos::ALGO_CONSTRUCTORS;
+use hurrycurry_locale::{tre, trm, TrError};
 use hurrycurry_protocol::{Character, Menu, Message, PacketC, PlayerClass, PlayerID};
 use std::{fmt::Write, time::Duration};
 
diff --git a/server/src/entity/book.rs b/server/src/entity/book.rs
index 566eb0a9..4b87aa44 100644
--- a/server/src/entity/book.rs
+++ b/server/src/entity/book.rs
@@ -16,8 +16,8 @@
 
 */
 use super::{Entity, EntityContext};
-use crate::message::TrError;
 use anyhow::Result;
+use hurrycurry_locale::TrError;
 use hurrycurry_protocol::{glam::IVec2, Menu, PacketC, PlayerID};
 
 #[derive(Debug, Clone)]
diff --git a/server/src/entity/campaign.rs b/server/src/entity/campaign.rs
index 03136869..53ea6582 100644
--- a/server/src/entity/campaign.rs
+++ b/server/src/entity/campaign.rs
@@ -16,8 +16,9 @@
 
 */
 use super::{Entity, EntityContext};
-use crate::{message::TrError, scoreboard::ScoreboardStore, server::GameServerExt, trm};
+use crate::{scoreboard::ScoreboardStore, server::GameServerExt};
 use anyhow::Result;
+use hurrycurry_locale::{trm, TrError};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     Message, PacketC, PlayerID, TileIndex,
diff --git a/server/src/entity/mod.rs b/server/src/entity/mod.rs
index c42ebd65..928910bc 100644
--- a/server/src/entity/mod.rs
+++ b/server/src/entity/mod.rs
@@ -30,7 +30,6 @@ pub mod tutorial;
 use crate::{
     data::{ItemTileRegistry, Serverdata},
     entity::pedestrians::Pedestrians,
-    message::TrError,
     scoreboard::ScoreboardStore,
 };
 use anyhow::{anyhow, Result};
@@ -40,6 +39,7 @@ use conveyor::Conveyor;
 use customers::Customers;
 use environment_effect::{EnvironmentController, EnvironmentEffect, EnvironmentEffectController};
 use hurrycurry_client_lib::Game;
+use hurrycurry_locale::TrError;
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     Character, PacketC, PacketS, PlayerID,
diff --git a/server/src/entity/tutorial.rs b/server/src/entity/tutorial.rs
index 7da50417..bc4e3e7d 100644
--- a/server/src/entity/tutorial.rs
+++ b/server/src/entity/tutorial.rs
@@ -16,8 +16,8 @@
 
 */
 use super::{Entity, EntityContext};
-use crate::{message::TrError, trm};
 use anyhow::Result;
+use hurrycurry_locale::{TrError, trm};
 use hurrycurry_protocol::{
     glam::IVec2, ItemIndex, Message, PacketC, PlayerID, Recipe, RecipeIndex, TileIndex,
 };
diff --git a/server/src/lib.rs b/server/src/lib.rs
index 085ae64a..3e01ba36 100644
--- a/server/src/lib.rs
+++ b/server/src/lib.rs
@@ -20,7 +20,6 @@ pub mod commands;
 pub mod data;
 pub mod entity;
 pub mod interaction;
-pub mod message;
 pub mod network;
 pub mod scoreboard;
 pub mod server;
diff --git a/server/src/main.rs b/server/src/main.rs
index 2c47db7d..5514e7d0 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -18,8 +18,9 @@
 use anyhow::{bail, Result};
 use clap::Parser;
 use futures_util::{SinkExt, StreamExt};
+use hurrycurry_locale::trm;
 use hurrycurry_protocol::{PacketC, PacketS};
-use hurrycurry_server::{data::DATA_DIR, server::Server, trm, ConnectionID};
+use hurrycurry_server::{data::DATA_DIR, server::Server, ConnectionID};
 use log::{debug, info, trace, warn, LevelFilter};
 use std::{
     env::var, net::SocketAddr, path::PathBuf, process::exit, str::FromStr, sync::Arc,
diff --git a/server/src/server.rs b/server/src/server.rs
index d074bedd..363afc7b 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -19,12 +19,12 @@ use crate::{
     data::{DataIndex, Serverdata},
     entity::{Entities, EntityContext},
     interaction::{interact, tick_slot},
-    message::TrError,
     scoreboard::ScoreboardStore,
-    tre, ConnectionID,
+    ConnectionID,
 };
 use anyhow::{Context, Result};
 use hurrycurry_client_lib::{gamedata_index::GamedataIndex, Game, Involvement, Item, Player, Tile};
+use hurrycurry_locale::{tre, TrError};
 use hurrycurry_protocol::{
     glam::{IVec2, Vec2},
     movement::MovementBase,
diff --git a/server/src/state.rs b/server/src/state.rs
index 45e928aa..6cdaa8f1 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -16,11 +16,11 @@
 
 */
 use crate::{
-    message::TrError,
     server::{AnnounceState, ConnectionData, GameServerExt, Server},
-    tre, trm, ConnectionID,
+    ConnectionID,
 };
 use anyhow::Result;
+use hurrycurry_locale::{tre, trm, TrError};
 use hurrycurry_protocol::{Menu, Message, PacketC, PacketS, PlayerID, VERSION};
 use log::{debug, info, trace};