Added support for bare manifests

BSIPA-ModList/BSIPA-ModList.csproj

@@ -97,6 +97,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Icons\self.png" />
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Icons\library.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
     <Message Text="Packing..." Importance="normal" />

BSIPA-ModList/UI/ViewControllers/ModListController.cs

@@ -118,6 +118,56 @@ namespace BSIPA_ModList.UI
                 list.flow.SetSelected(infoView, immediate: list.flow.HasSelected);
             }
         }
+        private class LibraryModCell : CustomCellInfo, IClickableCell
+        {
+            private static Sprite _defaultIcon;
+            public static Sprite DefaultIcon
+            {
+                get
+                {
+                    if (_defaultIcon == null)
+                        _defaultIcon = UIUtilities.LoadSpriteFromResources("BSIPA_ModList.Icons.library.png");
+                    return _defaultIcon;
+                }
+            }
+
+            internal PluginLoader.PluginInfo Plugin;
+            private ModListController list;
+
+            public LibraryModCell(ModListController list, PluginLoader.PluginInfo plugin)
+                : base($"{plugin.Metadata.Name} <size=60%>v{plugin.Metadata.Version}", plugin.Metadata.Manifest.Author, null)
+            {
+                Plugin = plugin;
+                this.list = list;
+
+                if (string.IsNullOrWhiteSpace(subtext))
+                    subtext = "<color=#BFBFBF><i>Unspecified Author</i>";
+
+                icon = DefaultIcon;
+
+                Logger.log.Debug($"LibraryModCell {plugin.Metadata.Name} {plugin.Metadata.Version}");
+            }
+
+            private ModInfoViewController infoView;
+
+            public void OnSelect(ModListController cntrl)
+            {
+                Logger.log.Debug($"Selected LibraryModCell {Plugin.Metadata.Name} {Plugin.Metadata.Version}");
+
+                if (infoView == null)
+                {
+                    var desc = Plugin.Metadata.Manifest.Description;
+                    if (string.IsNullOrWhiteSpace(desc))
+                        desc = "<color=#BFBFBF><i>No description</i>";
+
+                    infoView = BeatSaberUI.CreateViewController<ModInfoViewController>();
+                    infoView.Init(icon, Plugin.Metadata.Name, "v" + Plugin.Metadata.Version.ToString(), subtext,
+                        desc, Plugin.Metadata.Features.FirstOrDefault(f => f is NoUpdateFeature) == null);
+                }
+
+                list.flow.SetSelected(infoView, immediate: list.flow.HasSelected);
+            }
+        }
 
 #pragma warning disable CS0618
         private class IPAModCell : CustomCellInfo, IClickableCell
@@ -190,10 +240,12 @@ namespace BSIPA_ModList.UI
 
             reuseIdentifier = "BSIPAModListTableCell";
 
-            foreach (var plugin in bsipaPlugins)
+            foreach (var plugin in bsipaPlugins.Where(p => !p.Metadata.IsBare))
                 Data.Add(new BSIPAModCell(this, plugin));
             foreach (var plugin in ignoredPlugins)
                 Data.Add(new BSIPAIgnoredModCell(this, plugin));
+            foreach (var plugin in bsipaPlugins.Where(p => p.Metadata.IsBare))
+                Data.Add(new LibraryModCell(this, plugin));
             foreach (var plugin in ipaPlugins)
                 Data.Add(new IPAModCell(this, plugin));
         }

IPA.Loader/Loader/PluginLoader.cs

@@ -71,6 +71,8 @@ namespace IPA.Loader
 
             internal bool IsSelf;
 
+            internal bool IsBare;
+
             private PluginManifest manifest;
 
             internal HashSet<PluginMetadata> Dependencies { get; } = new HashSet<PluginMetadata>();
@@ -212,6 +214,31 @@ namespace IPA.Loader
                     Logger.loader.Error(e);
                 }
             }
+
+            IEnumerable<string> bareManifests = Directory.GetFiles(BeatSaber.PluginsPath, "*.json");
+            bareManifests = bareManifests.Concat(Directory.GetFiles(BeatSaber.PluginsPath, "*.manifest"));
+            foreach (var manifest in bareManifests)
+            {
+                try
+                {
+                    var metadata = new PluginMetadata
+                    {
+                        File = new FileInfo(Path.Combine(BeatSaber.PluginsPath, manifest)),
+                        IsSelf = false,
+                        IsBare = true,
+                    };
+
+                    metadata.Manifest = JsonConvert.DeserializeObject<PluginManifest>(File.ReadAllText(manifest));
+
+                    Logger.loader.Debug($"Adding info for bare manifest {Path.GetFileName(manifest)}");
+                    PluginsMetadata.Add(metadata);
+                }
+                catch (Exception e)
+                {
+                    Logger.loader.Error($"Could not load data for bare manifest {Path.GetFileName(manifest)}");
+                    Logger.loader.Error(e);
+                }
+            }
         }
 
         // keep track of these for the updater; it should still be able to update mods not loaded
@@ -219,7 +246,7 @@ namespace IPA.Loader
 
         internal static void Resolve()
         { // resolves duplicates and conflicts, etc
-            PluginsMetadata.Sort((a, b) => a.Version.CompareTo(b.Version));
+            PluginsMetadata.Sort((a, b) => b.Version.CompareTo(a.Version));
             
             var ids = new HashSet<string>();
             var ignore = new HashSet<PluginMetadata>();
@@ -431,7 +458,7 @@ namespace IPA.Loader
 
         internal static void Load(PluginMetadata meta)
         {
-            if (meta.Assembly == null)
+            if (meta.Assembly == null && meta.PluginType != null)
                 meta.Assembly = Assembly.LoadFrom(meta.File.FullName);
         }
 

IPA.Loader/Loader/manifest.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/nike4613/ModSaber-MetadataFileSchema/master/Schema.json",
+  "$schema": "https://raw.githubusercontent.com/beat-saber-modding-group/BSIPA-MetadataFileSchema/master/Schema.json",
   "author": "DaNike",
   "description": "A mod loader specifically for Beat Saber.",
   "gameVersion": "0.13.2",