Merge pull request #22 from B3none/dotnet-8

B3none · web-flow · commit 600b303d73f7 · 2024-03-26T08:24:27.000+01:00
dotnet 8 migration
diff --git a/.github/workflows/plugin-build.yml b/.github/workflows/plugin-build.yml
@@ -24,16 +24,16 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
       - name: Change directory and build
         run: |
           cd RetakesPlugin
           dotnet build
       - name: Create output directory
         run: |
           mkdir -p output/RetakesPlugin
-          mv ./RetakesPlugin/bin/Debug/net7.0/RetakesPlugin.dll output/RetakesPlugin/
-          mv ./RetakesPlugin/bin/Debug/net7.0/RetakesPlugin.pdb output/RetakesPlugin/
+          mv ./RetakesPlugin/bin/Debug/net8.0/RetakesPlugin.dll output/RetakesPlugin/
+          mv ./RetakesPlugin/bin/Debug/net8.0/RetakesPlugin.pdb output/RetakesPlugin/
           mv ./RetakesPlugin/map_config output/RetakesPlugin/
           mv ./RetakesPlugin/lang output/RetakesPlugin/
       - name: Copy output (no map configs)
diff --git a/RetakesPlugin/Modules/Configs/MapConfig.cs b/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
         {
diff --git a/RetakesPlugin/Modules/Configs/RetakesConfig.cs b/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
         {
diff --git a/RetakesPlugin/Modules/Configs/RetakesConfigData.cs b/RetakesPlugin/Modules/Configs/RetakesConfigData.cs
@@ -2,7 +2,7 @@
 
 public class RetakesConfigData
 {
-    public static int CurrentVersion = 7;
+    public static int CurrentVersion = 8;
 
     public int Version { get; set; } = CurrentVersion;
     public int MaxPlayers { get; set; } = 9;
@@ -18,4 +18,5 @@ public class RetakesConfigData
     public string QueuePriorityFlag { get; set; } = "@css/vip";
     public bool IsDebugMode { get; set; } = false;
     public bool ShouldForceEvenTeamsWhenPlayerCountIsMultipleOf10 { get; set; } = true;
+    public bool EnableFallbackBombsiteAnnouncement { get; set; }
 }
diff --git a/RetakesPlugin/Modules/Configs/Spawn.cs b/RetakesPlugin/Modules/Configs/Spawn.cs
@@ -1,7 +1,7 @@
 ﻿using System.Text.Json.Serialization;
 using CounterStrikeSharp.API.Modules.Utils;
 using RetakesPlugin.Modules.Configs.JsonConverters;
-using RetakesPlugin.Modules.Enums;
+using RetakesPluginShared.Enums;
 
 namespace RetakesPlugin.Modules.Configs;
 
diff --git a/RetakesPlugin/Modules/Helpers.cs b/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.Enums;
+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)
     {
diff --git a/RetakesPlugin/Modules/Managers/SpawnManager.cs b/RetakesPlugin/Modules/Managers/SpawnManager.cs
@@ -1,7 +1,7 @@
 using CounterStrikeSharp.API.Core;
 using CounterStrikeSharp.API.Modules.Utils;
 using RetakesPlugin.Modules.Configs;
-using RetakesPlugin.Modules.Enums;
+using RetakesPluginShared.Enums;
 
 namespace RetakesPlugin.Modules.Managers;
 
diff --git a/RetakesPlugin/RetakesPlugin.cs b/RetakesPlugin/RetakesPlugin.cs
@@ -8,7 +8,7 @@
 using CounterStrikeSharp.API.Modules.Entities.Constants;
 using CounterStrikeSharp.API.Modules.Utils;
 using RetakesPlugin.Modules;
-using RetakesPlugin.Modules.Enums;
+using RetakesPluginShared.Enums;
 using RetakesPlugin.Modules.Configs;
 using RetakesPlugin.Modules.Managers;
 using RetakesPluginShared;
@@ -17,10 +17,10 @@
 
 namespace RetakesPlugin;
 
-[MinimumApiVersion(180)]
+[MinimumApiVersion(201)]
 public class RetakesPlugin : BasePlugin
 {
-    private const string Version = "1.4.3";
+    private const string Version = "2.0.0";
 
     #region Plugin info
     public override string ModuleName => "Retakes Plugin";
@@ -629,7 +629,12 @@ public HookResult OnRoundStart(EventRoundStart @event, GameEventInfo info)
 
         _planter = _spawnManager.HandleRoundSpawns(_currentBombsite, _gameManager.QueueManager.ActivePlayers);
 
-        AnnounceBombsite(_currentBombsite);
+        if (_retakesConfig?.RetakesConfigData?.EnableFallbackBombsiteAnnouncement is true or null)
+        {
+            AnnounceBombsite(_currentBombsite);
+        }
+        
+        RetakesPluginEventSenderCapability.Get()?.TriggerEvent(new AnnounceBombsiteEvent(_currentBombsite));
 
         return HookResult.Continue;
     }
diff --git a/RetakesPlugin/RetakesPlugin.csproj b/RetakesPlugin/RetakesPlugin.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.188" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.2" />
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.201" />
+    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.3" />
     <ProjectReference Include="..\RetakesPluginShared\RetakesPluginShared.csproj" />
   </ItemGroup>
 
diff --git a/RetakesPluginShared/Enums/Bombsite.cs b/RetakesPluginShared/Enums/Bombsite.cs
@@ -1,4 +1,4 @@
-﻿namespace RetakesPlugin.Modules.Enums;
+﻿namespace RetakesPluginShared.Enums;
 
 public enum Bombsite
 {
diff --git a/RetakesPluginShared/Events/AnnounceBombsiteEvent.cs b/RetakesPluginShared/Events/AnnounceBombsiteEvent.cs
@@ -0,0 +1,5 @@
+﻿using RetakesPluginShared.Enums;
+
+namespace RetakesPluginShared.Events;
+
+public record AnnounceBombsiteEvent(Bombsite Bombsite) : IRetakesPluginEvent;
diff --git a/RetakesPluginShared/RetakesPluginShared.csproj b/RetakesPluginShared/RetakesPluginShared.csproj
@@ -7,12 +7,20 @@
         </Description>
         <Authors>B3none</Authors>
         
-        <Version>1.0.0</Version>
+        <Version>2.0.0</Version>
         
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>RetakesPluginShared</RootNamespace>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+
+        <PackageReadmeFile>README.md</PackageReadmeFile>
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
     </PropertyGroup>
+
+    <ItemGroup>
+        <None Include="..\README.md" Pack="true" PackagePath="\" />
+        <None Include="..\LICENSE" Pack="true" PackagePath="" />
+    </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public void Load()`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`var jsonData = File.ReadAllText(_mapConfigPath);`
`32`		`- _mapConfigData = JsonSerializer.Deserialize<MapConfigData>(jsonData);`
	`32`	`+ _mapConfigData = JsonSerializer.Deserialize<MapConfigData>(jsonData, Helpers.JsonSerializerOptions);`
`33`	`33`
`34`	`34`	`// TODO: Implement validation to make sure the config is valid / has enough spawns.`
`35`	`35`	`// if (_mapConfigData!.Spawns == null \|\| _mapConfigData.Spawns.Count < 0)`
`@@ -119,10 +119,7 @@ private MapConfigData GetSanitisedMapConfigData()`
`119`	`119`
`120`	`120`	`private void Save()`
`121`	`121`	`{`
`122`		`- var jsonString = JsonSerializer.Serialize(GetSanitisedMapConfigData(), new JsonSerializerOptions`
`123`		`- {`
`124`		`- WriteIndented = true`
`125`		`- });`
	`122`	`+ var jsonString = JsonSerializer.Serialize(GetSanitisedMapConfigData(), Helpers.JsonSerializerOptions);`
`126`	`123`
`127`	`124`	`try`
`128`	`125`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public void Load()`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`var jsonData = File.ReadAllText(_retakesConfigPath);`
`28`		`- RetakesConfigData = JsonSerializer.Deserialize<RetakesConfigData>(jsonData);`
	`28`	`+ RetakesConfigData = JsonSerializer.Deserialize<RetakesConfigData>(jsonData, Helpers.JsonSerializerOptions);`
`29`	`29`
`30`	`30`	`if (RetakesConfigData == null)`
`31`	`31`	`{`
`@@ -54,10 +54,7 @@ public void Load()`
`54`	`54`
`55`	`55`	`private void Save()`
`56`	`56`	`{`
`57`		`- var jsonString = JsonSerializer.Serialize(RetakesConfigData, new JsonSerializerOptions`
`58`		`- {`
`59`		`- WriteIndented = true`
`60`		`- });`
	`57`	`+ var jsonString = JsonSerializer.Serialize(RetakesConfigData, Helpers.JsonSerializerOptions);`
`61`	`58`
`62`	`59`	`try`
`63`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`public class RetakesConfigData`
`4`	`4`	`{`
`5`		`- public static int CurrentVersion = 7;`
	`5`	`+ public static int CurrentVersion = 8;`
`6`	`6`
`7`	`7`	`public int Version { get; set; } = CurrentVersion;`
`8`	`8`	`public int MaxPlayers { get; set; } = 9;`
`@@ -18,4 +18,5 @@ public class RetakesConfigData`
`18`	`18`	`public string QueuePriorityFlag { get; set; } = "@css/vip";`
`19`	`19`	`public bool IsDebugMode { get; set; } = false;`
`20`	`20`	`public bool ShouldForceEvenTeamsWhenPlayerCountIsMultipleOf10 { get; set; } = true;`
	`21`	`+ public bool EnableFallbackBombsiteAnnouncement { get; set; }`
`21`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace RetakesPlugin.Modules.Enums;`
	`1`	`+namespace RetakesPluginShared.Enums;`
`2`	`2`
`3`	`3`	`public enum Bombsite`
`4`	`4`	`{`