Update CI, auto-adjust namespaces

2023-08-13 00:22:13 -07:00 · 2023-08-13 00:22:13 -07:00 · 94fc8a025e
parent e9745348a3
commit 94fc8a025e
40 changed files with 77 additions and 58 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        framework-version: [ 'net6.0', 'net7.0' ]
+        framework-version: [ 'netstandard2.1', 'net6.0', 'net7.0' ]
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@ -20,9 +20,9 @@ jobs:
        with:
          dotnet-version: '7.0.x'
          dotnet-quality: 'ga'
-          
+
      - name: Install dependencies
        run: dotnet restore
-        
+
      - name: Build for ${{ matrix.framework-version }}
        run: dotnet build BattleBitAPI --framework ${{ matrix.framework-version }} --configuration Release --no-restore
--- a/BattleBitAPI.Playground/Program.cs
+++ b/BattleBitAPI.Playground/Program.cs
@ -1,8 +1,9 @@
-using BattleBitAPI;
-using BattleBitAPI.Common;
+using BattleBitAPI.Common.Arguments;
+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
 using BattleBitAPI.Server;
-using System.Threading.Channels;
-using System.Xml;
+
+namespace BattleBitAPI.Playground;

 class Program
 {
--- a/BattleBitAPI/BattleBitAPI.csproj
+++ b/BattleBitAPI/BattleBitAPI.csproj
@ -2,11 +2,11 @@

  <PropertyGroup>
    <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.1;net7.0;net6.0</TargetFrameworks>
    <ImplicitUsings>enable</ImplicitUsings>
    <Nullable>disable</Nullable>
    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <RootNamespace>CommunityServerAPI</RootNamespace>
+    <RootNamespace>BattleBitAPI</RootNamespace>
    <LangVersion>latest</LangVersion>
  </PropertyGroup>
  
--- a/BattleBitAPI/Common/Arguments/OnPlayerKillArguments.cs
+++ b/BattleBitAPI/Common/Arguments/OnPlayerKillArguments.cs
@ -1,6 +1,8 @@
 using System.Numerics;

-namespace BattleBitAPI.Common
+using BattleBitAPI.Common.Enums;
+
+namespace BattleBitAPI.Common.Arguments
 {
    public struct OnPlayerKillArguments<TPlayer> where TPlayer : Player<TPlayer>
    {
--- a/BattleBitAPI/Common/Arguments/OnPlayerSpawnArguments.cs
+++ b/BattleBitAPI/Common/Arguments/OnPlayerSpawnArguments.cs
@ -1,6 +1,9 @@
 using System.Numerics;

-namespace BattleBitAPI.Common
+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
+
+namespace BattleBitAPI.Common.Arguments
 {
    public struct OnPlayerSpawnArguments
    {
--- a/BattleBitAPI/Common/Conts.cs
+++ b/BattleBitAPI/Common/Conts.cs
@ -1,4 +1,4 @@
-namespace CommunityServerAPI.BattleBitAPI
+namespace BattleBitAPI.Common
 {
    public static class Const
    {
--- a/BattleBitAPI/Common/Data/Attachment.cs
+++ b/BattleBitAPI/Common/Data/Attachment.cs
@ -1,7 +1,6 @@
-using BattleBitAPI.Common;
-using System;
+using BattleBitAPI.Common.Enums;

-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Data
 {
    public class Attachment : IEquatable<string>, IEquatable<Attachment>
    {
--- a/BattleBitAPI/Common/Data/Gadget.cs
+++ b/BattleBitAPI/Common/Data/Gadget.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Data
 {
    public class Gadget : IEquatable<string>, IEquatable<Gadget>
    {
--- a/BattleBitAPI/Common/Data/Gadgets.cs
+++ b/BattleBitAPI/Common/Data/Gadgets.cs
@ -1,6 +1,6 @@
 using System.Reflection;

-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Data
 {
    public static class Gadgets
    {
--- a/BattleBitAPI/Common/Data/Map.cs
+++ b/BattleBitAPI/Common/Data/Map.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Data
 {
    public class Map : IEquatable<string>, IEquatable<Map>
    {
--- a/BattleBitAPI/Common/Data/PlayerLoadout.cs
+++ b/BattleBitAPI/Common/Data/PlayerLoadout.cs
@ -1,4 +1,7 @@
-namespace BattleBitAPI.Common
+using BattleBitAPI.Common.Datasets;
+using BattleBitAPI.Common.Enums;
+
+namespace BattleBitAPI.Common.Data
 {
    public struct PlayerLoadout
    {
--- a/BattleBitAPI/Common/Data/PlayerStats.cs
+++ b/BattleBitAPI/Common/Data/PlayerStats.cs
@ -1,4 +1,6 @@
-namespace BattleBitAPI.Common
+using BattleBitAPI.Common.Enums;
+
+namespace BattleBitAPI.Common.Data
 {
    public class PlayerStats
    {
--- a/BattleBitAPI/Common/Data/PlayerWearings.cs
+++ b/BattleBitAPI/Common/Data/PlayerWearings.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Data
 {
    public struct PlayerWearings
    {
--- a/BattleBitAPI/Common/Data/Weapon.cs
+++ b/BattleBitAPI/Common/Data/Weapon.cs
@ -1,6 +1,6 @@
-using System;
+using BattleBitAPI.Common.Enums;

-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Data
 {
    public class Weapon : IEquatable<string>, IEquatable<Weapon>
    {
--- a/BattleBitAPI/Common/Datasets/Attachments.cs
+++ b/BattleBitAPI/Common/Datasets/Attachments.cs
@ -1,6 +1,9 @@
 using System.Reflection;

-namespace BattleBitAPI.Common
+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
+
+namespace BattleBitAPI.Common.Datasets
 {
    public static class Attachments
    {
--- a/BattleBitAPI/Common/Datasets/Weapons.cs
+++ b/BattleBitAPI/Common/Datasets/Weapons.cs
@ -1,7 +1,9 @@
-using Microsoft.VisualBasic;
-using System.Reflection;
+using System.Reflection;

-namespace BattleBitAPI.Common
+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
+
+namespace BattleBitAPI.Common.Datasets
 {
    public static class Weapons
    {
--- a/BattleBitAPI/Common/Enums/AttachmentType.cs
+++ b/BattleBitAPI/Common/Enums/AttachmentType.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum AttachmentType
    {
--- a/BattleBitAPI/Common/Enums/ChatChannel.cs
+++ b/BattleBitAPI/Common/Enums/ChatChannel.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum ChatChannel
    {
--- a/BattleBitAPI/Common/Enums/DamageReason.cs
+++ b/BattleBitAPI/Common/Enums/DamageReason.cs
@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum ReasonOfDamage : byte
    {
--- a/BattleBitAPI/Common/Enums/GameRole.cs
+++ b/BattleBitAPI/Common/Enums/GameRole.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum GameRole
    {
--- a/BattleBitAPI/Common/Enums/GameState.cs
+++ b/BattleBitAPI/Common/Enums/GameState.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum GameState : byte
    {
--- a/BattleBitAPI/Common/Enums/MapDayNight.cs
+++ b/BattleBitAPI/Common/Enums/MapDayNight.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum MapDayNight : byte
    {
--- a/BattleBitAPI/Common/Enums/MapSize.cs
+++ b/BattleBitAPI/Common/Enums/MapSize.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum MapSize : byte
    {
--- a/BattleBitAPI/Common/Enums/PlayerBody.cs
+++ b/BattleBitAPI/Common/Enums/PlayerBody.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum PlayerBody : byte
    {
--- a/BattleBitAPI/Common/Enums/PlayerSpawningPoint.cs
+++ b/BattleBitAPI/Common/Enums/PlayerSpawningPoint.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum PlayerSpawningPosition : byte
    {
--- a/BattleBitAPI/Common/Enums/PlayerStand.cs
+++ b/BattleBitAPI/Common/Enums/PlayerStand.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum PlayerStand : byte
    {
--- a/BattleBitAPI/Common/Enums/ReportReason.cs
+++ b/BattleBitAPI/Common/Enums/ReportReason.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum ReportReason
    {
--- a/BattleBitAPI/Common/Enums/Roles.cs
+++ b/BattleBitAPI/Common/Enums/Roles.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum Roles : ulong
    {
--- a/BattleBitAPI/Common/Enums/Squads.cs
+++ b/BattleBitAPI/Common/Enums/Squads.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum Squads
    {
--- a/BattleBitAPI/Common/Enums/Team.cs
+++ b/BattleBitAPI/Common/Enums/Team.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum Team : byte
    {
--- a/BattleBitAPI/Common/Enums/WeaponType.cs
+++ b/BattleBitAPI/Common/Enums/WeaponType.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Common
+namespace BattleBitAPI.Common.Enums
 {
    public enum WeaponType : int
    {
--- a/BattleBitAPI/Player.cs
+++ b/BattleBitAPI/Player.cs
@ -4,6 +4,9 @@ using BattleBitAPI.Server;
 using System.Net;
 using System.Numerics;

+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
+
 namespace BattleBitAPI
 {
    public class Player<TPlayer> where TPlayer : Player<TPlayer>
--- a/BattleBitAPI/Server/GameServer.cs
+++ b/BattleBitAPI/Server/GameServer.cs
@ -4,9 +4,12 @@ using System.Net.Sockets;
 using System.Numerics;
 using System.Text;
 using BattleBitAPI.Common;
+using BattleBitAPI.Common.Arguments;
+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
 using BattleBitAPI.Common.Extentions;
 using BattleBitAPI.Networking;
-using CommunityServerAPI.BattleBitAPI;
+using BattleBitAPI.Server.Internal;

 namespace BattleBitAPI.Server
 {
--- a/BattleBitAPI/Server/Internal/GamemodeRotation.cs
+++ b/BattleBitAPI/Server/Internal/GamemodeRotation.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Server
+namespace BattleBitAPI.Server.Internal
 {
    public class GamemodeRotation<TPlayer> where TPlayer : Player<TPlayer>
    {
--- a/BattleBitAPI/Server/Internal/MapRotation.cs
+++ b/BattleBitAPI/Server/Internal/MapRotation.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Server
+namespace BattleBitAPI.Server.Internal
 {
    public class MapRotation<TPlayer> where TPlayer : Player<TPlayer>
    {
--- a/BattleBitAPI/Server/Internal/RoundSettings.cs
+++ b/BattleBitAPI/Server/Internal/RoundSettings.cs
@ -1,6 +1,6 @@
-using BattleBitAPI.Common;
+using BattleBitAPI.Common.Enums;

-namespace BattleBitAPI.Server
+namespace BattleBitAPI.Server.Internal
 {
    public class RoundSettings<TPlayer> where TPlayer : Player<TPlayer>
    {
@ -32,12 +32,12 @@ namespace BattleBitAPI.Server
                this.mResources.IsDirtyRoundSettings = true;
            }
        }
-        public double MaxTickets
+        public int MaxTickets
        {
-            get => this.mResources._RoundSettings.MaxTickets;
+            get => this.mResources._RoundSettings.PlayersToStart;
            set
            {
-                this.mResources._RoundSettings.MaxTickets = value;
+                this.mResources._RoundSettings.PlayersToStart = value;
                this.mResources.IsDirtyRoundSettings = true;
            }
        }
--- a/BattleBitAPI/Server/Internal/ServerSettings.cs
+++ b/BattleBitAPI/Server/Internal/ServerSettings.cs
@ -1,4 +1,4 @@
-namespace BattleBitAPI.Server
+namespace BattleBitAPI.Server.Internal
 {
    public class ServerSettings<TPlayer> where TPlayer : Player<TPlayer>
    {
--- a/BattleBitAPI/Server/ServerListener.cs
+++ b/BattleBitAPI/Server/ServerListener.cs
@ -3,10 +3,12 @@ using System.Net.Security;
 using System.Net.Sockets;
 using System.Numerics;
 using BattleBitAPI.Common;
+using BattleBitAPI.Common.Arguments;
+using BattleBitAPI.Common.Data;
+using BattleBitAPI.Common.Enums;
 using BattleBitAPI.Common.Extentions;
 using BattleBitAPI.Common.Serialization;
 using BattleBitAPI.Networking;
-using CommunityServerAPI.BattleBitAPI;

 namespace BattleBitAPI.Server
 {
--- a/BattleBitAPI/Storage/DiskStorage.cs
+++ b/BattleBitAPI/Storage/DiskStorage.cs
@ -1,4 +1,5 @@
 using BattleBitAPI.Common;
+using BattleBitAPI.Common.Data;

 namespace BattleBitAPI.Storage
 {
--- a/BattleBitAPI/Storage/IPlayerStatsDatabase.cs
+++ b/BattleBitAPI/Storage/IPlayerStatsDatabase.cs
@ -1,4 +1,5 @@
 using BattleBitAPI.Common;
+using BattleBitAPI.Common.Data;

 namespace BattleBitAPI.Storage
 {