Fix issue with legacy effects not showing in game

JonnyVR1 · May 11, 2022 · 37ca1fa · 37ca1fa
1 parent f042159
commit 37ca1fa
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/PC/BundleLoader.cs b/PC/BundleLoader.cs
@@ -22,15 +22,14 @@ public static void LoadDefaultCover()
             DefaultTex = Utils.LoadSpriteFromResources("Weather.DefaultCover.png");
         }
 
-        public static void LoadFromFileAsync(string path, Action<AsyncOperation, string> callback)
+        private static void LoadFromFileAsync(string path, Action<AsyncOperation, string> callback)
         {
-            if (File.Exists(path))
-            {
-                var bundleAsync = AssetBundle.LoadFromFileAsync(path);
-                bundleAsync.allowSceneActivation = true;
-                Action<AsyncOperation> action = async => { callback(async, path); };
-                bundleAsync.completed += action;
-            }
+            if (!File.Exists(path)) return;
+
+            var bundleAsync = AssetBundle.LoadFromFileAsync(path);
+            bundleAsync.allowSceneActivation = true;
+            Action<AsyncOperation> action = async => { callback(async, path); };
+            bundleAsync.completed += action;
         }
 
         public static void Load()
@@ -52,7 +51,7 @@ public static void Load()
             }
         }
 
-        public static void LoadFromBundle(AsyncOperation bundleRequest, string filePath)
+        private static void LoadFromBundle(AsyncOperation bundleRequest, string filePath)
         {
             var bundle = (bundleRequest as AssetBundleCreateRequest).assetBundle;
             var json = bundle.LoadAsset<TextAsset>("assets/effectJson.asset");
@@ -87,21 +86,21 @@ public static void LoadFromBundle(AsyncOperation bundleRequest, string filePath)
 
            try
             {
-                efdTemp = JsonUtility.FromJson<TempDesc012>(json.text);
-            }
-            catch
-            {
-                try
+                if (json.text.Contains("WorksInGame"))
                 {
-                    var efdOld1 = JsonUtility.FromJson<TempDesc011>(json.text);
-                    efdTemp = new TempDesc012(efdOld1.Author, efdOld1.EffectName, efdOld1.WorksInMenu, true);
+                    efdTemp = JsonUtility.FromJson<TempDesc012>(json.text);
                 }
-                catch
+                else
                 {
-                    var fileName = Path.GetFileNameWithoutExtension(filePath);
-                    Plugin.Log.Error($"{fileName} Failed To Load! Json: {json.text}");
+                    var efdOld1 = JsonUtility.FromJson<TempDesc011>(json.text);
+                    efdTemp = new TempDesc012(efdOld1.Author, efdOld1.EffectName, efdOld1.WorksInMenu, true);
                 }
             }
+            catch
+            {
+                var fileName = Path.GetFileNameWithoutExtension(filePath);
+                Plugin.Log.Error($"{fileName} Failed To Load! Json: {json.text}");
+            }
 
             var efd = eff.AddComponent<EffectDescriptor>();
             efd.author = efdTemp.Author;

diff --git a/PC/Plugin.cs b/PC/Plugin.cs
@@ -90,7 +90,7 @@ private void MenuSceneActive()
             BundleLoader.WeatherPrefab.GetComponent<WeatherSceneInfo>().SetActiveRefs();
         }
 
-        private void GameSceneActive()
+        private static void GameSceneActive()
         {
             WeatherSceneInfo.CurrentScene = SceneManager.GetSceneByName(Game);
             BundleLoader.WeatherPrefab.GetComponent<WeatherSceneInfo>().SetActiveRefs();

diff --git a/PC/manifest.json b/PC/manifest.json
@@ -3,11 +3,12 @@
   "id": "Weather",
   "name": "Weather",
   "author": "FutureMapper",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "",
   "gameVersion": "1.22.0",
   "dependsOn": {
-    "BSIPA": "^4.2.2"
+    "BSIPA": "^4.2.2",
+    "SiraUtil": "^3.0.6"
   },
   "features": []
 }