Merge pull request #269 from SpaceWarpDev/dev

Hotfix 1.5.4
SpaceWarpDev · Nov 4, 2023 · d0020c2 · d0020c2
2 parents cae3c14 + 6369c87
commit d0020c2
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 9 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <SpaceWarpVersion>1.5.3</SpaceWarpVersion>
+        <SpaceWarpVersion>1.5.4</SpaceWarpVersion>
         <TargetFramework>netstandard2.1</TargetFramework>
         <RootNamespace>SpaceWarp</RootNamespace>
         <LangVersion>11</LangVersion>

diff --git a/SpaceWarp.Core/API/Configuration/JsonConfigFile.cs b/SpaceWarp.Core/API/Configuration/JsonConfigFile.cs
@@ -4,6 +4,8 @@
 using System.Text;
 using JetBrains.Annotations;
 using KSP.IO;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using UnityEngine;
 
@@ -68,6 +70,22 @@ private static bool DumpSection(bool hadPreviousSection, StringBuilder result, K
         return true;
     }
 
+    private static List<JsonConverter> _defaultConverters;
+
+    public static List<JsonConverter> DefaultConverters
+    {
+        get
+        {
+            if (_defaultConverters == null)
+            {
+                _defaultConverters = IOProvider.CreateDefaultConverters();
+                _defaultConverters.Add(new StringEnumConverter());
+            }
+
+            return _defaultConverters;
+        }
+    }
+
     private static bool DumpEntry(StringBuilder result, bool hadPreviousKey, KeyValuePair<string, JsonConfigEntry> entry)
     {
         if (hadPreviousKey)
@@ -85,7 +103,7 @@ private static bool DumpEntry(StringBuilder result, bool hadPreviousKey, KeyValu
             }
         }
 
-        var serialized = IOProvider.ToJson(entry.Value.Value);
+        var serialized = JsonConvert.SerializeObject(entry.Value.Value,Formatting.Indented,DefaultConverters.ToArray());
         var serializedLines = serialized.Split('\n').Select(x => x.TrimEnd()).ToArray();
         if (serializedLines.Length > 1)
         {

diff --git a/SpaceWarp.Core/Patching/LoadingActions/FunctionalLoadingActions.cs b/SpaceWarp.Core/Patching/LoadingActions/FunctionalLoadingActions.cs
@@ -38,8 +38,16 @@ string filename
 
             var path = internalPath + "/" + assetName;
             path = path.ToLower();
-            var asset = assetBundle.LoadAsset(name);
-            assets.Add((path, asset));
+            try
+            {
+                SpaceWarpPlugin.Instance.SWLogger.LogInfo($"Attempting to load asset {name} from bundle at {filename}");
+                var asset = assetBundle.LoadAsset(name);
+                assets.Add((path, asset));
+            }
+            catch (Exception e)
+            {
+                SpaceWarpPlugin.Instance.SWLogger.LogInfo($"Error loading asset {name} from bundle at {filename}: {e}");
+            }
         }
 
         return assets;

diff --git a/SpaceWarp.Core/SpaceWarp.Core.csproj b/SpaceWarp.Core/SpaceWarp.Core.csproj
@@ -17,7 +17,7 @@
         <PackageReference Include="HarmonyX" Version="2.10.1" />
         <PackageReference Include="KerbalSpaceProgram2.GameLibs" Version="0.1.5" Publicize="true" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="UitkForKsp2" Version="2.0.0" />
         <PackageReference Include="UnityEngine.Modules" Version="2022.3.5" Publicize="true" />
     </ItemGroup>

diff --git a/SpaceWarp.Core/SpaceWarpPlugin.cs b/SpaceWarp.Core/SpaceWarpPlugin.cs
@@ -61,7 +61,7 @@ private static void OnLanguageSourceAssetLoaded(LanguageSourceAsset asset)
     public void Awake()
     {
         BepInEx.Bootstrap.Chainloader.ManagerObject.Persist();
-        IOProvider.Init();
+        // IOProvider.Init();
 
         Harmony.CreateAndPatchAll(typeof(SpaceWarpPlugin).Assembly, ModGuid);
         ModuleManager.LoadAllModules();

diff --git a/SpaceWarp.nuspec b/SpaceWarp.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
     <metadata>
         <id>SpaceWarp</id>
-        <version>1.5.3</version>
+        <version>1.5.4</version>
         <authors>SpaceWarp contributors</authors>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <licenseUrl>https://raw.githubusercontent.com/SpaceWarp/SpaceWarp/main/LICENSE</licenseUrl>

diff --git a/SpaceWarpBuildTemplate/swinfo.json b/SpaceWarpBuildTemplate/swinfo.json
@@ -6,7 +6,7 @@
   "description": "Space-Warp is an API for KSP2 mod developers.",
   "source": "https://github.com/SpaceWarpDev/SpaceWarp",
   "version_check": "https://raw.githubusercontent.com/SpaceWarpDev/SpaceWarp/main/SpaceWarpBuildTemplate/swinfo.json",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "dependencies": [
     {
       "id":  "UitkForKsp2",

diff --git a/SpaceWarpPatcher/SpaceWarpPatcher.csproj b/SpaceWarpPatcher/SpaceWarpPatcher.csproj
@@ -11,6 +11,6 @@
         <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="all" />
         <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 </Project>