From 2d60da9a6fe0a7418d07475b7c0a677f7f2922d4 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 30 Sep 2025 16:03:23 +0200 Subject: Extract server locale code to own crate --- server/src/entity/book.rs | 2 +- server/src/entity/campaign.rs | 3 ++- server/src/entity/mod.rs | 2 +- server/src/entity/tutorial.rs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'server/src/entity') 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, }; -- cgit v1.2.3-70-g09d2