From 1db575055788c6ce9f4b6f04ee14fb9654c1053a Mon Sep 17 00:00:00 2001 From: CWX Date: Fri, 17 Jan 2025 12:35:51 +0000 Subject: [PATCH] now use ProgramStatics --- Core/Callbacks/ClientLogCallbacks.cs | 32 ++++++------------------ Core/Controllers/GameController.cs | 12 ++++----- {Server => Core/Utils}/ProgramStatics.cs | 0 3 files changed, 13 insertions(+), 31 deletions(-) rename {Server => Core/Utils}/ProgramStatics.cs (100%) diff --git a/Core/Callbacks/ClientLogCallbacks.cs b/Core/Callbacks/ClientLogCallbacks.cs index e757b9d0..015e332e 100644 --- a/Core/Callbacks/ClientLogCallbacks.cs +++ b/Core/Callbacks/ClientLogCallbacks.cs @@ -7,6 +7,7 @@ using Core.Models.Spt.Logging; using Core.Servers; using Core.Services; using Core.Utils; +using Server; namespace Core.Callbacks; @@ -55,7 +56,11 @@ public class ClientLogCallbacks public string ReleaseNotes() { var data = _configServer.GetConfig().Release; - data.BetaDisclaimerText = "BetaDisclaimerText"; // TODO + + data.BetaDisclaimerText = ProgramStatics.MODS() + ? _localisationService.GetText("release-beta-disclaimer-mods-enabled") + : _localisationService.GetText("release-beta-disclaimer"); + data.BetaDisclaimerAcceptText = _localisationService.GetText("release-beta-disclaimer-accept"); data.ServerModsLoadedText = _localisationService.GetText("release-server-mods-loaded"); data.ServerModsLoadedDebugText = _localisationService.GetText("release-server-mods-debug-message"); @@ -64,30 +69,9 @@ public class ClientLogCallbacks data.IllegalPluginsLoadedText = _localisationService.GetText("release-illegal-plugins-loaded"); data.IllegalPluginsExceptionText = _localisationService.GetText("release-illegal-plugins-exception"); data.ReleaseSummaryText = _localisationService.GetText("release-summary"); - data.IsBeta = false; // TODO - data.IsModdable = true; // TODO + data.IsBeta = ProgramStatics.ENTRY_TYPE() == EntryType.BLEEDING_EDGE || ProgramStatics.ENTRY_TYPE() == EntryType.BLEEDING_EDGE_MODS; + data.IsModdable = ProgramStatics.MODS(); data.IsModded = false; // TODO - - - - // data.betaDisclaimerText = ProgramStatics.MODS - // ? this.localisationService.getText("release-beta-disclaimer-mods-enabled") - // : this.localisationService.getText("release-beta-disclaimer"); - // - // data.betaDisclaimerAcceptText = this.localisationService.getText("release-beta-disclaimer-accept"); - // data.serverModsLoadedText = this.localisationService.getText("release-server-mods-loaded"); - // data.serverModsLoadedDebugText = this.localisationService.getText("release-server-mods-debug-message"); - // data.clientModsLoadedText = this.localisationService.getText("release-plugins-loaded"); - // data.clientModsLoadedDebugText = this.localisationService.getText("release-plugins-loaded-debug-message"); - // data.illegalPluginsLoadedText = this.localisationService.getText("release-illegal-plugins-loaded"); - // data.illegalPluginsExceptionText = this.localisationService.getText("release-illegal-plugins-exception"); - // data.releaseSummaryText = this.localisationService.getText("release-summary"); - // - // data.isBeta = - // ProgramStatics.ENTRY_TYPE === EntryType.BLEEDING_EDGE || - // ProgramStatics.ENTRY_TYPE === EntryType.BLEEDING_EDGE_MODS; - // data.isModdable = ProgramStatics.MODS; - // data.isModded = this.modLoadOrder.getLoadOrder().length > 0; return _httpResponseUtil.NoBody(data); } diff --git a/Core/Controllers/GameController.cs b/Core/Controllers/GameController.cs index 60cad5e5..07c87772 100644 --- a/Core/Controllers/GameController.cs +++ b/Core/Controllers/GameController.cs @@ -13,8 +13,8 @@ using Core.Servers; using Core.Services; using Core.Utils; using Core.Utils.Cloners; -using static System.Runtime.InteropServices.JavaScript.JSType; using System.Diagnostics; +using Server; namespace Core.Controllers; @@ -606,12 +606,10 @@ public class GameController /// private void LogProfileDetails(SptProfile fullProfile) { - _logger.Error("NOT IMPLEMENTED LogProfileDetails"); - _logger.Debug($"Profile made with: ${ fullProfile.SptData.Version}"); - _logger.Debug($"{fullProfile.SptData.Mods.Count} Mods used"); - //_logger.Debug($"Server version: ${ ProgramStatics.SPT_VERSION || _coreConfig.SptVersion} ${ ProgramStatics.COMMIT}"); - //_logger.Debug($"Debug enabled: ${ ProgramStatics.DEBUG}"); - //_logger.Debug($"Mods enabled: ${ ProgramStatics.MODS}"); + _logger.Debug($"Profile made with: {fullProfile.SptData.Version}"); + _logger.Debug($"Server version: {(ProgramStatics.SPT_VERSION()) ?? _coreConfig.SptVersion} {ProgramStatics.COMMIT}"); + _logger.Debug($"Debug enabled: {ProgramStatics.DEBUG}"); + _logger.Debug($"Mods enabled: {ProgramStatics.MODS}"); } public void Load() diff --git a/Server/ProgramStatics.cs b/Core/Utils/ProgramStatics.cs similarity index 100% rename from Server/ProgramStatics.cs rename to Core/Utils/ProgramStatics.cs