Refactored code + codestyle (draft commit)

Author: Mallifrey

LabExtended/API/ExPlayer.cs

@@ -1,60 +1,43 @@
-using LabExtended.API.Enums;
-using LabExtended.API.Hints;
+using CentralAuth;
+using CommandSystem;
+using Footprinting;
+using Hints;
+using InventorySystem.Disarming;
+using InventorySystem.Items;
+using InventorySystem.Items.Pickups;
+using LabApi.Features.Wrappers;
 using LabExtended.API.Containers;
 using LabExtended.API.CustomVoice;
-using LabExtended.API.RemoteAdmin;
+using LabExtended.API.Enums;
 using LabExtended.API.FileStorage;
-
-using LabExtended.API.Settings.Menus;
-using LabExtended.API.Settings.Entries;
-
+using LabExtended.API.Hints;
 using LabExtended.API.Hints.Elements.Personal;
-
-using LabExtended.Core.Pooling.Pools;
-
+using LabExtended.API.RemoteAdmin;
+using LabExtended.API.Settings.Entries;
+using LabExtended.API.Settings.Menus;
 using LabExtended.Commands.Attributes;
 using LabExtended.Commands.Interfaces;
-
+using LabExtended.Core;
+using LabExtended.Core.Pooling.Pools;
 using LabExtended.Events;
-using LabExtended.Utilities;
 using LabExtended.Extensions;
-
-using LabApi.Features.Wrappers;
-
+using LabExtended.Utilities;
+using LiteNetLib;
 using Mirror;
 using Mirror.LiteNetLib4Mirror;
-
+using NetworkManagerUtils.Dummies;
+using NorthwoodLib.Pools;
 using PlayerRoles;
-using PlayerRoles.Spectating;
 using PlayerRoles.FirstPersonControl;
-
-using InventorySystem.Disarming;
-
-using InventorySystem.Items;
-using InventorySystem.Items.Pickups;
-
+using PlayerRoles.Spectating;
 using RemoteAdmin;
 using RemoteAdmin.Communication;
-
-using LiteNetLib;
-
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
 using UnityEngine;
-
-using VoiceChat;
-
-using Hints;
-
-using CentralAuth;
-
-using CommandSystem;
-
-using Footprinting;
-
-using NetworkManagerUtils.Dummies;
-
-using NorthwoodLib.Pools;
-
 using UserSettings.ServerSpecific;
+using VoiceChat;
 
 #pragma warning disable CS8602 // Dereference of a possibly null reference.
 #pragma warning disable CS8604 // Possible null reference argument.
@@ -135,6 +118,11 @@ public class ExPlayer : Player, IDisposable
         }
     }
 
+    /// <summary>
+    /// Gets a dictionary of Personal DefinedSettings for each Plugin Assembly
+    /// </summary>
+    public Dictionary<Assembly, ServerSpecificSettingBase[]>? SettingsByAssembly => settingsByAssembly;
+
     #region Get
     /// <summary>
     /// Gets an <see cref="ExPlayer"/> instance tied to the specified <see cref="ReferenceHub"/>.
@@ -459,7 +447,10 @@ public static IEnumerable<ExPlayer> Get(RoleTypeId role)
     private string idInfoValue = string.Empty;
 
     internal ICommandRunner? activeRunner;
-    
+
+    internal Dictionary<Assembly, ServerSpecificSettingBase[]>?
+        settingsByAssembly = DictionaryPool<Assembly, ServerSpecificSettingBase[]>.Shared.Rent();
+
     internal Dictionary<string, SettingsMenu>? settingsMenuLookup = DictionaryPool<string, SettingsMenu>.Shared.Rent();
     internal Dictionary<string, SettingsEntry>? settingsIdLookup = DictionaryPool<string, SettingsEntry>.Shared.Rent();
 
@@ -1442,6 +1433,9 @@ public void Dispose()
             PersistentStorage = null!;
         }
 
+        if (settingsByAssembly != null)
+            DictionaryPool<Assembly, ServerSpecificSettingBase[]>.Shared.Return(settingsByAssembly);
+
         if (settingsIdLookup != null)
             DictionaryPool<string, SettingsEntry>.Shared.Return(settingsIdLookup);
 
@@ -1463,6 +1457,7 @@ public void Dispose()
         if (SentPositions != null)
             DictionaryPool<uint, PositionSync.SentPosition>.Shared.Return(SentPositions);
 
+        settingsByAssembly = null;
         settingsIdLookup = null;
         settingsMenuLookup = null;
         settingsAssignedIdLookup = null;
@@ -1478,6 +1473,21 @@ public void Dispose()
         Rotation = null!;
     }
 
+    internal void SyncSettingsByAssembly(Assembly assembly, ServerSpecificSettingBase[] collection) {
+        if (!this)
+            return;
+
+        if (settingsByAssembly == null) {
+            ApiLog.Warn($"Player's {nameof(settingsByAssembly)} is null");
+            return;
+        }
+
+        if (collection == null || collection.Length == 0)
+            settingsByAssembly.Remove(assembly);
+        else
+            settingsByAssembly[assembly] = collection;
+    }
+
     private static ReferenceHub SpawnHiddenDummy(string nick)
     {
         var hubGo = UnityEngine.Object.Instantiate(NetworkManager.singleton.playerPrefab);

LabExtended/API/Settings/SettingsManager.cs

@@ -30,6 +30,11 @@ public static class SettingsManager
     /// </summary>
     public static List<SettingsBuilder> AllBuilders { get; } = new();
 
+    /// <summary>
+    /// Gets a dictionary of DefinedSettings for each Plugin Assembly
+    /// </summary>
+    public static Dictionary<Assembly, ServerSpecificSettingBase[]> GlobalSettingsByAssembly { get; } = new();
+
     /// <summary>
     /// Gets or sets the server-side settings version.
     /// </summary>
@@ -82,11 +87,9 @@ public static void SyncEntries(this ExPlayer player)
 
 
         Dictionary<Assembly, ServerSpecificSettingBase[]> playerSettings = DictionaryPool<Assembly, ServerSpecificSettingBase[]>.Shared.Rent();
-        playerSettings.AddRange(VanillaSettingsAdapter.SssByAssemblyGlobal);
-        if (VanillaSettingsAdapter.SssByAssemblyPersonal.TryGetValue(player, out var loadedPlayerSettings)) {
-            foreach (var kvp in loadedPlayerSettings) {
-                playerSettings[kvp.Key] = kvp.Value;
-            }
+        playerSettings.AddRange(GlobalSettingsByAssembly); // todo Use SendOnJoinFilter
+        foreach (var kvp in player.settingsByAssembly) {
+            playerSettings[kvp.Key] = kvp.Value;
         }
 
         foreach (var sssByAssemblyEntry in playerSettings) {