From 1065c80f48d4d4bc9542bfefbcbf5aefeaeaa7a9 Mon Sep 17 00:00:00 2001 From: Archangel Date: Sat, 9 Aug 2025 14:45:19 +0200 Subject: [PATCH] Remove nodisms from WatermarkLocale --- .../SPTarkov.Server.Core/Utils/Watermark.cs | 77 ++++++++----------- 1 file changed, 31 insertions(+), 46 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs index fd3f278d..51479281 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Watermark.cs @@ -9,50 +9,35 @@ using SPTarkov.Server.Core.Services; namespace SPTarkov.Server.Core.Utils; [Injectable] -public class WatermarkLocale(ServerLocalisationService localisationService) +public class WatermarkLocale(ServerLocalisationService serverLocalisationService) { - protected readonly List Description = - [ - localisationService.GetText("watermark-discord_url"), - "", - localisationService.GetText("watermark-free_of_charge"), - localisationService.GetText("watermark-paid_scammed"), - localisationService.GetText("watermark-commercial_use_prohibited"), - ]; - protected readonly List Modding = - [ - "", - localisationService.GetText("watermark-modding_disabled"), - "", - localisationService.GetText("watermark-not_an_issue"), - localisationService.GetText("watermark-do_not_report"), - ]; - protected readonly List Warning = - [ - "", - localisationService.GetText("watermark-testing_build"), - localisationService.GetText("watermark-no_support"), - "", - $"{localisationService.GetText("watermark-report_issues_to")}:", - localisationService.GetText("watermark-issue_tracker_url"), - "", - localisationService.GetText("watermark-use_at_own_risk"), - ]; - - public List GetDescription() - { - return Description; - } - - public List GetWarning() - { - return Warning; - } - - public List GetModding() - { - return Modding; - } + public List Description { get; } = + [ + serverLocalisationService.GetText("watermark-discord_url"), + "", + serverLocalisationService.GetText("watermark-free_of_charge"), + serverLocalisationService.GetText("watermark-paid_scammed"), + serverLocalisationService.GetText("watermark-commercial_use_prohibited"), + ]; + public List Modding { get; } = + [ + "", + serverLocalisationService.GetText("watermark-modding_disabled"), + "", + serverLocalisationService.GetText("watermark-not_an_issue"), + serverLocalisationService.GetText("watermark-do_not_report"), + ]; + public List Warning { get; } = + [ + "", + serverLocalisationService.GetText("watermark-testing_build"), + serverLocalisationService.GetText("watermark-no_support"), + "", + $"{serverLocalisationService.GetText("watermark-report_issues_to")}:", + serverLocalisationService.GetText("watermark-issue_tracker_url"), + "", + serverLocalisationService.GetText("watermark-use_at_own_risk"), + ]; } [Injectable(TypePriority = OnLoadOrder.Watermark)] @@ -69,9 +54,9 @@ public class Watermark( public virtual Task OnLoad() { - var description = watermarkLocale.GetDescription(); - var warning = watermarkLocale.GetWarning(); - var modding = watermarkLocale.GetModding(); + var description = watermarkLocale.Description; + var warning = watermarkLocale.Warning; + var modding = watermarkLocale.Modding; var versionTag = GetVersionTag(); versionLabel = $"{sptConfig.ProjectName} {versionTag} | EFT {sptConfig.CompatibleTarkovVersion}";