Added gitattributes

Sealed some classes
Removed unused methods
Better JSON serialization

.gitattributes

@@ -0,0 +1,5 @@
+# Auto detect text files and perform LF normalization
+# https://www.davidlaing.com/2012/09/19/customise-your-gitattributes-to-become-a-git-ninja/
+*    text=auto
+
+*.cs text diff=csharp

src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/CampaignDescriptorStaticImplementation.cs

@@ -6,6 +6,6 @@ namespace Bannerlord.ButterLib.Implementation.CampaignIdentifier
 {
     internal sealed class CampaignDescriptorStaticImplementation : CampaignDescriptorStatic
     {
-        public override CampaignDescriptor? Create(Hero hero) => new CampaignDescriptorImplementation(hero);
+        public override CampaignDescriptor Create(Hero hero) => new CampaignDescriptorImplementation(hero);
     }
 }

src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Helpers/DebugHelper.cs

@@ -7,16 +7,6 @@ namespace Bannerlord.ButterLib.Implementation.CampaignIdentifier.Helpers
 {
     internal static class DebugHelper
     {
-        public static void HandleException(Exception ex, MethodBase methodBase, string sectionName)
-        {
-            SubModule.Logger.LogError(ex, "{sectionName} - Error occurred in {methodBase}.", sectionName, methodBase.Name);
-        }
-
-        public static void HandleException(Exception ex, string logMessage)
-        {
-            SubModule.Logger.LogError(ex, logMessage);
-        }
-
         public static ArgumentOutOfRangeException GetOutOfRangeException<T>(T value, string functionName, string argumentName)
         {
             return new ArgumentOutOfRangeException(argumentName, value, $"{functionName} is supplied with not supported {typeof(T).Name} value.");

src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Patches/CharacterCreationContentApplyCulturePatch.cs

@@ -18,7 +18,7 @@
 
 namespace Bannerlord.ButterLib.Implementation.CampaignIdentifier.Patches
 {
-    internal class CharacterCreationContentApplyCulturePatch
+    internal sealed class CharacterCreationContentApplyCulturePatch
     {
         private static ILogger _logger = default!;
 

src/Bannerlord.ButterLib.Implementation/CampaignIdentifier/Patches/ClanInitializeClanPatch.cs

@@ -15,7 +15,7 @@
 
 namespace Bannerlord.ButterLib.Implementation.CampaignIdentifier.Patches
 {
-    internal class ClanInitializeClanPatch
+    internal sealed class ClanInitializeClanPatch
     {
         private static ILogger _logger = default!;
 

src/Bannerlord.ButterLib.Implementation/SaveSystem/MBObjectVariableStorageBehavior.cs

@@ -1,112 +1,112 @@
-using Bannerlord.ButterLib.SaveSystem;
-using Bannerlord.ButterLib.SaveSystem.Extensions;
-
-using Newtonsoft.Json;
-
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-
-using TaleWorlds.CampaignSystem;
-using TaleWorlds.ObjectSystem;
-
-namespace Bannerlord.ButterLib.Implementation.SaveSystem
-{
-    internal sealed class MBObjectVariableStorageBehavior : CampaignBehaviorBase, IMBObjectVariableStorage
-    {
-        private ConcurrentDictionary<StorageKey, object?> _variables = new ConcurrentDictionary<StorageKey, object?>();
-
-        public override void RegisterEvents() { }
-
-        public override void SyncData(IDataStore dataStore)
-        {
-            if (dataStore.IsSaving)
-            {
-                // Cleanup variables in data store that refer to now-nonexistent/untracked objects.
-                // This is also periodically done due to autosaves to address any leak concerns.
-
-                // Cache known-expired object IDs, as MBObjectManager.GetObject can be slow,
-                // particularly for the types likely to have expired.
-                var expiredIdCache = new Dictionary<uint, bool>();
-
-                foreach (var sk in _variables.Keys)
-                {
-                    if (expiredIdCache.ContainsKey(sk.ObjectId))
-                        _variables.TryRemove(sk, out _);
-                    else if (MBObjectManager.Instance.GetObject(sk) == default)
-                    {
-                        expiredIdCache[sk.ObjectId] = true;
-                        _variables.TryRemove(sk, out _);
-                    }
-                }
-            }
-
-            dataStore.SyncDataAsJson("ButterLib.MBObjectVariableStorage", ref _variables);
-
-            // Loading old saves resets dictionary to null temporarily (only moment it can be null):
-            if (dataStore.IsLoading && _variables == null!)
-                _variables = new ConcurrentDictionary<StorageKey, object?>();
-        }
-
-        public void SetVariable(MBObjectBase @object, string key, object? data) =>
-            _variables[StorageKey.Make(@object, key)] = data;
-
-        public void RemoveVariable(MBObjectBase @object, string key) =>
-            _variables.TryRemove(StorageKey.Make(@object, key), out _);
-
-        public object? GetVariable(MBObjectBase @object, string key) =>
-            _variables.TryGetValue(StorageKey.Make(@object, key), out var value) ? value : null;
-
-#nullable disable
-
-        public T GetVariable<T>(MBObjectBase @object, string key) =>
-            (_variables.TryGetValue(StorageKey.Make(@object, key), out var val) && val is T value) ? value : default;
-
-#nullable restore
-
-        private class MBGUIDConverter : JsonConverter
-        {
-            public override bool CanConvert(Type objectType) => objectType == typeof(StorageKey) || objectType == typeof(StorageKey?);
-
-            public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
-            {
-                if (value is StorageKey storageKey)
-                {
-                    serializer.Serialize(writer, storageKey.ObjectId);
-                    serializer.Serialize(writer, storageKey.Key);
-                    return;
-                }
-
-                serializer.Serialize(writer, null);
-            }
-
-            public override object? ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                if (serializer.Deserialize<uint?>(reader) is { } objectId && reader.Read() && serializer.Deserialize<string>(reader) is { } key)
-                {
-                    return new StorageKey(objectId, key);
-                }
-                return null;
-            }
-        }
-
-        [JsonConverter(typeof(MBGUIDConverter))]
-        private readonly struct StorageKey : IEquatable<StorageKey>
-        {
-            public static implicit operator MBGUID(StorageKey sk) => new MBGUID(sk.ObjectId);
-
-            public readonly uint ObjectId;
-            public readonly string Key;
-
-            internal StorageKey(uint objectId, string key) => (ObjectId, Key) = (objectId, key);
-
-            public static StorageKey Make(MBObjectBase obj, string key) => new StorageKey(obj.Id.InternalValue, key);
-
-            public bool Equals(StorageKey other) => ObjectId == other.ObjectId && Key != null! && other.Key != null! && Key.Equals(other.Key);
-
-            public override bool Equals(object? obj) => obj is StorageKey sk && Equals(sk);
-
-            public override int GetHashCode() => HashCode.Combine(ObjectId, Key);
-        }
-    }
+using Bannerlord.ButterLib.SaveSystem;
+using Bannerlord.ButterLib.SaveSystem.Extensions;
+
+using Newtonsoft.Json;
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.ObjectSystem;
+
+namespace Bannerlord.ButterLib.Implementation.SaveSystem
+{
+    internal sealed class MBObjectVariableStorageBehavior : CampaignBehaviorBase, IMBObjectVariableStorage
+    {
+        private ConcurrentDictionary<StorageKey, object?> _variables = new ConcurrentDictionary<StorageKey, object?>();
+
+        public override void RegisterEvents() { }
+
+        public override void SyncData(IDataStore dataStore)
+        {
+            if (dataStore.IsSaving)
+            {
+                // Cleanup variables in data store that refer to now-nonexistent/untracked objects.
+                // This is also periodically done due to autosaves to address any leak concerns.
+
+                // Cache known-expired object IDs, as MBObjectManager.GetObject can be slow,
+                // particularly for the types likely to have expired.
+                var expiredIdCache = new Dictionary<uint, bool>();
+
+                foreach (var sk in _variables.Keys)
+                {
+                    if (expiredIdCache.ContainsKey(sk.ObjectId))
+                        _variables.TryRemove(sk, out _);
+                    else if (MBObjectManager.Instance.GetObject(sk) == default)
+                    {
+                        expiredIdCache[sk.ObjectId] = true;
+                        _variables.TryRemove(sk, out _);
+                    }
+                }
+            }
+
+            dataStore.SyncDataAsJson("ButterLib.MBObjectVariableStorage", ref _variables);
+
+            // Loading old saves resets dictionary to null temporarily (only moment it can be null):
+            if (dataStore.IsLoading && _variables == null!)
+                _variables = new ConcurrentDictionary<StorageKey, object?>();
+        }
+
+        public void SetVariable(MBObjectBase @object, string key, object? data) =>
+            _variables[StorageKey.Make(@object, key)] = data;
+
+        public void RemoveVariable(MBObjectBase @object, string key) =>
+            _variables.TryRemove(StorageKey.Make(@object, key), out _);
+
+        public object? GetVariable(MBObjectBase @object, string key) =>
+            _variables.TryGetValue(StorageKey.Make(@object, key), out var value) ? value : null;
+
+#nullable disable
+
+        public T GetVariable<T>(MBObjectBase @object, string key) =>
+            (_variables.TryGetValue(StorageKey.Make(@object, key), out var val) && val is T value) ? value : default;
+
+#nullable restore
+
+        private sealed class MBGUIDConverter : JsonConverter
+        {
+            public override bool CanConvert(Type objectType) => objectType == typeof(StorageKey) || objectType == typeof(StorageKey?);
+
+            public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+            {
+                if (value is StorageKey storageKey)
+                {
+                    serializer.Serialize(writer, storageKey.ObjectId);
+                    serializer.Serialize(writer, storageKey.Key);
+                    return;
+                }
+
+                serializer.Serialize(writer, null);
+            }
+
+            public override object? ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                if (serializer.Deserialize<uint?>(reader) is { } objectId && reader.Read() && serializer.Deserialize<string>(reader) is { } key)
+                {
+                    return new StorageKey(objectId, key);
+                }
+                return null;
+            }
+        }
+
+        [JsonConverter(typeof(MBGUIDConverter))]
+        private readonly struct StorageKey : IEquatable<StorageKey>
+        {
+            public static implicit operator MBGUID(StorageKey sk) => new MBGUID(sk.ObjectId);
+
+            public readonly uint ObjectId;
+            public readonly string Key;
+
+            internal StorageKey(uint objectId, string key) => (ObjectId, Key) = (objectId, key);
+
+            public static StorageKey Make(MBObjectBase obj, string key) => new StorageKey(obj.Id.InternalValue, key);
+
+            public bool Equals(StorageKey other) => ObjectId == other.ObjectId && Key != null! && other.Key != null! && Key.Equals(other.Key);
+
+            public override bool Equals(object? obj) => obj is StorageKey sk && Equals(sk);
+
+            public override int GetHashCode() => HashCode.Combine(ObjectId, Key);
+        }
+    }
 }