chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ProgramStatics non nullable, add auto generated header & add getters

Browse Source
This commit is contained in:
Archangel
2025-08-05 20:33:23 +02:00
parent 58ca43de49
commit 23389b48c4
5 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -423,3 +423,6 @@ fabric.properties
# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser
# Automatically generated file containing metadata on build
Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.Generated.cs
Libraries/SPTarkov.Server.Core/SPTarkov.Server.Core.csproj
+1 -1
View File
@@ -51,7 +51,7 @@
<Target Name="GenerateProgramStatics" BeforeTargets="BeforeBuild">
<WriteLinesToFile
File="Utils/ProgramStatics.Generated.cs"
Lines="&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA; private static string? _sptVersion = &quot;$(SptVersion)&quot;%3B&#xD;&#xA; private static string? _commit = &quot;$(SptCommit)&quot;%3B&#xD;&#xA; private static double? _buildTime = $(SptBuildTime)%3B&#xD;&#xA; private static EntryType? BuildType = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;"
Lines="// &lt;auto-generated /&gt;&#xD;&#xA;// This file is automatically generated. Do not modify manually.&#xD;&#xA;// Any changes made to this file will be overwritten during the build process.&#xD;&#xA;&#xD;&#xA;using SPTarkov.Server.Core.Models.Enums%3B&#xD;&#xA;&#xD;&#xA;namespace SPTarkov.Server.Core.Utils%3B&#xD;&#xA;&#xD;&#xA;public static partial class ProgramStatics&#xD;&#xA;{&#xD;&#xA; private static string SptVersion { get%3B } = &quot;$(SptVersion)&quot;%3B&#xD;&#xA; private static string Commit { get%3B } = &quot;$(SptCommit)&quot;%3B&#xD;&#xA; private static double BuildTime { get%3B } = $(SptBuildTime)%3B&#xD;&#xA; private static EntryType BuildType { get%3B } = EntryType.$(SptBuildType)%3B&#xD;&#xA;}&#xD;&#xA;"
Overwrite="true"
/>
</Target>
Libraries/SPTarkov.Server.Core/Utils/App.cs
+2 -5
View File
@@ -43,15 +43,12 @@ public class App(
// _logger.Debug($"RAM: {(os.totalmem() / 1024 / 1024 / 1024).toFixed(2)}GB");
if (ProgramStatics.BUILD_TIME() is not null)
if (ProgramStatics.BUILD_TIME() != 0)
{
_logger.Debug($"Date: {ProgramStatics.BUILD_TIME()}");
}
if (ProgramStatics.COMMIT() is not null)
{
_logger.Debug($"Commit: {ProgramStatics.COMMIT()}");
}
_logger.Debug($"Commit: {ProgramStatics.COMMIT()}");
}
// execute onLoad callbacks
Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.Generated.cs
-11
View File
@@ -1,11 +0,0 @@
using SPTarkov.Server.Core.Models.Enums;
namespace SPTarkov.Server.Core.Utils;
public static partial class ProgramStatics
{
private static string? _sptVersion = "4.0.0";
private static string? _commit = "a12b34";
private static double? _buildTime = 0000000000;
private static EntryType? BuildType = EntryType.LOCAL;
}
Libraries/SPTarkov.Server.Core/Utils/ProgramStatics.cs
+9 -11
View File
@@ -10,9 +10,7 @@ public static partial class ProgramStatics
public static void Initialize()
{
var _entryType = BuildType ?? EntryType.LOCAL;
switch (_entryType)
switch (BuildType)
{
case EntryType.RELEASE:
_debug = false;
@@ -41,7 +39,7 @@ public static partial class ProgramStatics
}
#if DEBUG
Console.WriteLine($"SPTarkov.Server.Core: entrytype: {_entryType}");
Console.WriteLine($"SPTarkov.Server.Core: entrytype: {BuildType}");
Console.WriteLine($"SPTarkov.Server.Core: debug: {_debug}");
Console.WriteLine($"SPTarkov.Server.Core: compiled: {_compiled}");
Console.WriteLine($"SPTarkov.Server.Core: mods: {_mods}");
@@ -49,7 +47,7 @@ public static partial class ProgramStatics
}
// Public Static Getters
public static EntryType? ENTRY_TYPE()
public static EntryType ENTRY_TYPE()
{
return BuildType;
}
@@ -69,18 +67,18 @@ public static partial class ProgramStatics
return _mods;
}
public static string? SPT_VERSION()
public static string SPT_VERSION()
{
return _sptVersion;
return SptVersion;
}
public static string? COMMIT()
public static string COMMIT()
{
return _commit;
return Commit;
}
public static double? BUILD_TIME()
public static double BUILD_TIME()
{
return _buildTime;
return BuildTime;
}
}