Some changes for 1.5 :3

SpaceWarpDev · Aug 24, 2023 · cf7bd58 · cf7bd58
1 parent 1604b27
commit cf7bd58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 24 deletions.
diff --git a/SpaceWarp.Core/API/Loading/Loading.cs b/SpaceWarp.Core/API/Loading/Loading.cs
@@ -16,10 +16,6 @@ public static class Loading
     internal static List<Func<SpaceWarpPluginDescriptor, DescriptorLoadingAction>> DescriptorLoadingActionGenerators =
         new();
 
-    internal static List<Func<SpaceWarpPluginDescriptor, DescriptorLoadingAction>>
-        FallbackDescriptorLoadingActionGenerators =
-            new();
-
     internal static List<Func<BaseSpaceWarpPlugin, ModLoadingAction>> LoadingActionGenerators = new();
     internal static List<Func<FlowAction>> GeneralLoadingActions = new();
 
@@ -33,11 +29,7 @@ internal static List<Func<SpaceWarpPluginDescriptor, DescriptorLoadingAction>>
     public static void AddAssetLoadingAction(string subfolder, string name,
         Func<string, string, List<(string name, UnityObject asset)>> importFunction, params string[] extensions)
     {
-        AddModLoadingAction(name,
-            extensions.Length == 0
-                ? CreateAssetLoadingActionWithoutExtension(subfolder, importFunction)
-                : CreateAssetLoadingActionWithExtensions(subfolder, importFunction, extensions));
-        FallbackDescriptorLoadingActionGenerators.Add(d => new DescriptorLoadingAction(name,
+        DescriptorLoadingActionGenerators.Add(d => new DescriptorLoadingAction(name,
             extensions.Length == 0
                 ? CreateAssetLoadingActionWithoutExtensionDescriptor(subfolder, importFunction)
                 : CreateAssetLoadingActionWithExtensionsDescriptor(subfolder, importFunction, extensions), d));

diff --git a/SpaceWarp.Core/Patching/BootstrapPatch.cs b/SpaceWarp.Core/Patching/BootstrapPatch.cs
@@ -89,22 +89,10 @@ private static void DoLoadingActions(IList<SpaceWarpPluginDescriptor> allPlugins
 
     private static void DoOldStyleLoadingActions(SequentialFlow flow, SpaceWarpPluginDescriptor plugin)
     {
-        if (plugin.Plugin != null)
+        if (plugin.Plugin is not BaseSpaceWarpPlugin baseSpaceWarpPlugin) return;
+        foreach (var action in Loading.LoadingActionGenerators)
         {
-            foreach (var action in Loading.LoadingActionGenerators)
-            {
-                if (plugin.Plugin is BaseSpaceWarpPlugin baseSpaceWarpPlugin)
-                {
-                    flow.AddAction(action(baseSpaceWarpPlugin));
-                }
-            }
-        }
-        else
-        {
-            foreach (var action in Loading.FallbackDescriptorLoadingActionGenerators)
-            {
-                flow.AddAction(action(plugin));
-            }
+            flow.AddAction(action(baseSpaceWarpPlugin));
         }
     }