Merge pull request #202 from SpaceWarpDev/v1.1.1

Fixed audio and localization issue
SpaceWarpDev · Apr 5, 2023 · 5b9d441 · 5b9d441
2 parents b22e436 + 147271f
commit 5b9d441
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 14 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <SpaceWarpVersion>1.1.0</SpaceWarpVersion>
+        <SpaceWarpVersion>1.1.1</SpaceWarpVersion>
         <TargetFramework>net472</TargetFramework>
         <LangVersion>11</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/SpaceWarp/Patching/BootstrapPatch.cs b/SpaceWarp/Patching/BootstrapPatch.cs
@@ -53,7 +53,7 @@ private static void PatchInitializationsIL(ILContext ilContext, ILLabel endLabel
                 }
             }
 
-            // flow.AddAction(new LoadAddressablesLocalizationsAction());
+            flow.AddAction(new LoadAddressablesLocalizationsAction());
             foreach (var action in Loading.GeneralLoadingActions)
             {
                 flow.AddAction(action);

diff --git a/SpaceWarp/Patching/LoadingActions/LoadingAddressablesLocalizationsAction.cs b/SpaceWarp/Patching/LoadingActions/LoadingAddressablesLocalizationsAction.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using I2.Loc;
+using KSP.Game;
+using KSP.Game.Flow;
+using UnityEngine;
+using UnityEngine.AddressableAssets;
+
+namespace SpaceWarp.Patching.LoadingActions;
+
+internal sealed class LoadAddressablesLocalizationsAction : FlowAction
+{
+    public LoadAddressablesLocalizationsAction() : base("Loading localizations from Addressables")
+    {
+    }
+
+    public override void DoAction(Action resolve, Action<string> reject)
+    {
+        try
+        {
+            GameManager.Instance.Game.Assets.LoadByLabel("language_source",
+                OnLanguageSourceAssetLoaded, delegate(IList<LanguageSourceAsset> languageAssetLocations)
+                {
+                    if (languageAssetLocations != null)
+                    {
+                        Addressables.Release(languageAssetLocations);
+                    }
+
+                    resolve();
+                });
+        }
+        catch (Exception e)
+        {
+            Debug.LogError(e.ToString());
+            reject(null);
+        }
+    }
+
+    private static void OnLanguageSourceAssetLoaded(LanguageSourceAsset asset)
+    {
+        if (!asset || LocalizationManager.Sources.Contains(asset.mSource))
+        {
+            return;
+        }
+
+        asset.mSource.owner = asset;
+        LocalizationManager.AddSource(asset.mSource);
+    }
+}
diff --git a/SpaceWarp/SpaceWarpManager.cs b/SpaceWarp/SpaceWarpManager.cs
@@ -222,20 +222,9 @@ internal static void CheckKspVersions()
         return assets;
     }
 
-    private static void LoadLanguageSourceAsset(LanguageSourceAsset asset)
-    {
-        if (!asset || LocalizationManager.Sources.Contains(asset.mSource))
-        {
-            return;
-        }
-
-        asset.mSource.owner = asset;
-        LocalizationManager.AddSource(asset.mSource);
-    }
     internal static void InitializeSpaceWarpsLoadingActions()
     {
         Loading.AddAssetLoadingAction("bundles","loading asset bundles",AssetBundleLoadingAction,"bundle");
         Loading.AddAssetLoadingAction("images","loading images",ImageLoadingAction);
-        Loading.AddAddressablesLoadingAction<LanguageSourceAsset>("loading addressable localizations","language_source",LoadLanguageSourceAsset);
     }
 }
diff --git a/SpaceWarpBuildTemplate/swinfo.json b/SpaceWarpBuildTemplate/swinfo.json
@@ -5,7 +5,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.1.0",
+  "version": "1.1.1",
   "dependencies": [],
   "ksp2_version": {
     "min": "0",