v4.3.7 (#98)

* PerSave Settings were not initialized on new game * Use Trace for default logging * Workflow fix, NuGet is being weird on WIndows workers * Build fix
Aragas · Apr 11, 2021 · 1903aab · 1903aab
1 parent 8633b3e
commit 1903aab
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 18 deletions.
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
@@ -46,6 +46,12 @@ jobs:
       with:
         nuget-version: 'latest'
 
+    - name: Ensure NuGet Source
+      uses: fabriciomurta/ensure-nuget-source@v1
+      with:
+        name: 'nuget.org'
+        url: 'https://api.nuget.org/v3/index.json'
+
     - name: Generating Newtonsoft.Json xref maps
       run: >-
         dotnet run -p build/SandcastleXrefGenerator -- `

diff --git a/.github/workflows/test-and-publish.yml b/.github/workflows/test-and-publish.yml
@@ -57,6 +57,12 @@ jobs:
       env:
         NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
+    - name: Ensure NuGet Source
+      uses: fabriciomurta/ensure-nuget-source@v1
+      with:
+        name: 'nuget.org'
+        url: 'https://api.nuget.org/v3/index.json'
+
     - name: Download DepotDownloader_2.3.6
       uses: i3h/download-release-asset@v1
       with:

diff --git a/build/common.props b/build/common.props
@@ -2,14 +2,14 @@
 <Project>
 
   <PropertyGroup>
-    <Version>4.3.6</Version>
+    <Version>4.3.7</Version>
     <GameVersion>1.4.3</GameVersion>
     <HarmonyVersion>2.0.2</HarmonyVersion>
     <ButterLibVersion>1.0.21</ButterLibVersion>
     <UIExtenderExVersion>2.1.1</UIExtenderExVersion>
     <BuildResourcesVersion>1.0.0.33</BuildResourcesVersion>
-    <BUTRSharedVersion>1.6.1.30</BUTRSharedVersion>
-    <HarmonyExtensionsVersion>2.0.0.8</HarmonyExtensionsVersion>
+    <BUTRSharedVersion>1.6.1.31</BUTRSharedVersion>
+    <HarmonyExtensionsVersion>2.0.0.10</HarmonyExtensionsVersion>
     <TargetFramework>net472</TargetFramework>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 4.3.7
+Game Versions: e1.4.3,e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9
+* PerSave Settings were not initialized on new game
+---------------------------------------------------------------------------------------------------
 Version: 4.3.6
 Game Versions: e1.4.3,e1.5.0,e1.5.1,e1.5.2,e1.5.3,e1.5.4,e1.5.5,e1.5.6,e1.5.7,e1.5.8,e1.5.9
 * Fixed PerSave Settings loading issue

diff --git a/src/MCM/DependencyInjection/LightInjectServiceContainer.cs b/src/MCM/DependencyInjection/LightInjectServiceContainer.cs
@@ -88,11 +88,11 @@ public IGenericServiceProvider Build()
         {
             if (_serviceContainer.AvailableServices.All(s => s.ServiceType != typeof(IMCMLogger)))
             {
-                _serviceContainer.RegisterTransient<IMCMLogger, NullMCMLogger>();
+                _serviceContainer.RegisterTransient<IMCMLogger, DefaultMCMLogger>();
             }
             if (_serviceContainer.AvailableServices.All(s => s.ServiceType != typeof(IMCMLogger<>)))
             {
-                _serviceContainer.RegisterTransient(typeof(IMCMLogger<>), typeof(NullMCMLogger<>));
+                _serviceContainer.RegisterTransient(typeof(IMCMLogger<>), typeof(DefaultMCMLogger<>));
             }
 
             _serviceContainer.Compile();

diff --git a/src/MCM/Implementation/Settings/Containers/PerSave/PerSaveCampaignBehavior.cs b/src/MCM/Implementation/Settings/Containers/PerSave/PerSaveCampaignBehavior.cs
@@ -31,7 +31,17 @@ public override void SyncData(IDataStore dataStore)
             }
         }
 
-        public override void RegisterEvents() { }
+        public override void RegisterEvents()
+        {
+            CampaignEvents.OnNewGameCreatedEvent.AddNonSerializedListener(this, OnNewGameCreatedEvent);
+        }
+
+        private void OnNewGameCreatedEvent(CampaignGameStarter campaignGameStarter)
+        {
+            _settings = new Dictionary<string, string>();
+            var perSaveSettingsContainer = GenericServiceProvider.GetService<MCMPerSaveSettingsContainer>();
+            perSaveSettingsContainer?.LoadSettings();
+        }
 
         public bool SaveSettings(PerSaveSettings perSaveSettings)
         {

diff --git a/src/MCM/Logger/NullMCMLogger.cs → src/MCM/Logger/DefaultMCMLogger.cs b/src/MCM/Logger/NullMCMLogger.cs → src/MCM/Logger/DefaultMCMLogger.cs
@@ -1,20 +1,21 @@
 using System;
+using System.Diagnostics;
 
 namespace MCM.Logger
 {
-    internal class NullMCMLogger<T> : IMCMLogger<T>
+    internal class DefaultMCMLogger<T> : IMCMLogger<T>
     {
-        public void LogTrace(string message, params object[] args) { }
-        public void LogInformation(string message, params object[] args) { }
-        public void LogWarning(string message, params object[] args) { }
-        public void LogError(Exception exception, string message, params object[] args) { }
+        public void LogTrace(string message, params object[] args) => Trace.WriteLine(string.Format(message, args));
+        public void LogInformation(string message, params object[] args) => Trace.TraceInformation(message, args);
+        public void LogWarning(string message, params object[] args) => Trace.TraceWarning(message, args);
+        public void LogError(Exception exception, string message, params object[] args) => Trace.TraceError(message, args);
     }
 
-    internal class NullMCMLogger : IMCMLogger
+    internal class DefaultMCMLogger : IMCMLogger
     {
-        public void LogTrace(string message, params object[] args) { }
-        public void LogInformation(string message, params object[] args) { }
-        public void LogWarning(string message, params object[] args) { }
-        public void LogError(Exception exception, string message, params object[] args) { }
+        public void LogTrace(string message, params object[] args) => Trace.WriteLine(string.Format(message, args));
+        public void LogInformation(string message, params object[] args) => Trace.TraceInformation(message, args);
+        public void LogWarning(string message, params object[] args) => Trace.TraceWarning(message, args);
+        public void LogError(Exception exception, string message, params object[] args) => Trace.TraceError(message, args);
     }
 }
diff --git a/tests/MCM.Tests/SettingsFormat/JsonSettingsFormatTests.cs b/tests/MCM.Tests/SettingsFormat/JsonSettingsFormatTests.cs
@@ -22,7 +22,7 @@ public class JsonSettingsFormatTests : BaseSettingsFormatTests
         [OneTimeSetUp]
         public void OneTimeSetUp1()
         {
-            Format = new JsonSettingsFormat(new NullMCMLogger<JsonSettingsFormat>());
+            Format = new JsonSettingsFormat(new DefaultMCMLogger<JsonSettingsFormat>());
 
             Settings = BaseSettingsBuilder.Create("Testing_Global_v1", "Testing Fluent Settings")!
                 .SetFormat("json")

diff --git a/tests/MCM.Tests/SettingsFormat/XmlSettingsFormatTests.cs b/tests/MCM.Tests/SettingsFormat/XmlSettingsFormatTests.cs
@@ -23,7 +23,7 @@ public class XmlSettingsFormatTests : BaseSettingsFormatTests
         [OneTimeSetUp]
         public void OneTimeSetUp1()
         {
-            Format = new XmlSettingsFormat(new NullMCMLogger<XmlSettingsFormat>());
+            Format = new XmlSettingsFormat(new DefaultMCMLogger<XmlSettingsFormat>());
 
             Settings = BaseSettingsBuilder.Create("Testing_Global_v1", "Testing Fluent Settings")!
                 .SetFormat("xml")