Merge remote-tracking branch 'origin/dotnet-8' into dotnet-8

Author: B3none

RetakesPlugin/Modules/Configs/MapConfig.cs

@@ -29,7 +29,7 @@ public void Load()
             }
 
             var jsonData = File.ReadAllText(_mapConfigPath);
-            _mapConfigData = JsonSerializer.Deserialize<MapConfigData>(jsonData);
+            _mapConfigData = JsonSerializer.Deserialize<MapConfigData>(jsonData, Helpers.JsonSerializerOptions);
 
             // TODO: Implement validation to make sure the config is valid / has enough spawns.
             // if (_mapConfigData!.Spawns == null || _mapConfigData.Spawns.Count < 0)
@@ -119,10 +119,7 @@ private MapConfigData GetSanitisedMapConfigData()
 
     private void Save()
     {
-        var jsonString = JsonSerializer.Serialize(GetSanitisedMapConfigData(), new JsonSerializerOptions
-        {
-            WriteIndented = true
-        });
+        var jsonString = JsonSerializer.Serialize(GetSanitisedMapConfigData(), Helpers.JsonSerializerOptions);
 
         try
         {

RetakesPlugin/Modules/Configs/RetakesConfig.cs

@@ -25,7 +25,7 @@ public void Load()
             }
 
             var jsonData = File.ReadAllText(_retakesConfigPath);
-            RetakesConfigData = JsonSerializer.Deserialize<RetakesConfigData>(jsonData);
+            RetakesConfigData = JsonSerializer.Deserialize<RetakesConfigData>(jsonData, Helpers.JsonSerializerOptions);
 
             if (RetakesConfigData == null)
             {
@@ -54,10 +54,7 @@ public void Load()
 
     private void Save()
     {
-        var jsonString = JsonSerializer.Serialize(RetakesConfigData, new JsonSerializerOptions
-        {
-            WriteIndented = true
-        });
+        var jsonString = JsonSerializer.Serialize(RetakesConfigData, Helpers.JsonSerializerOptions);
 
         try
         {

RetakesPlugin/Modules/Helpers.cs

@@ -1,17 +1,28 @@
 using System.Drawing;
 using System.Text;
+using System.Text.Json;
 using CounterStrikeSharp.API;
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using RetakesPlugin.Modules.Configs;
+using RetakesPlugin.Modules.Configs.JsonConverters;
 using RetakesPluginShared.Enums;
 
 namespace RetakesPlugin.Modules;
 
 public static class Helpers
 {
     internal static readonly Random Random = new();
+    internal static readonly JsonSerializerOptions JsonSerializerOptions = new()
+    {
+        WriteIndented = true,
+        Converters =
+        {
+            new VectorJsonConverter(),
+            new QAngleJsonConverter()
+        }
+    };
 
     public static bool IsValidPlayer(CCSPlayerController? player)
     {