reminder to add bsipa to your dependencies

nike4613 · Sep 2, 2020 · 158cc75 · 158cc75
1 parent 83e0664
commit 158cc75
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 4 deletions.
diff --git a/IPA.Loader/Config/SelfConfig.cs b/IPA.Loader/Config/SelfConfig.cs
@@ -68,7 +68,7 @@ public static void ReadCommandLine(string[] args)
         }
 
         internal const string IPAName = "Beat Saber IPA";
-        internal const string IPAVersion = "4.1.0.0";
+        internal const string IPAVersion = "4.1.1.0";
 
         // uses Updates.AutoUpdate, Updates.AutoCheckUpdates, YeetMods, Debug.ShowCallSource, Debug.ShowDebug, 
         //      Debug.CondenseModLogs

diff --git a/IPA.Loader/Loader/PluginLoader.cs b/IPA.Loader/Loader/PluginLoader.cs
@@ -32,6 +32,8 @@ namespace IPA.Loader
 
     internal partial class PluginLoader
     {
+        internal static PluginMetadata SelfMeta;
+
         internal static Task LoadTask() =>
             TaskEx.Run(() =>
         {
@@ -95,6 +97,7 @@ internal static void LoadMetadata()
                 selfMeta.Manifest = JsonConvert.DeserializeObject<PluginManifest>(manifest);
 
                 PluginsMetadata.Add(selfMeta);
+                SelfMeta = selfMeta;
             }
             catch (Exception e)
             {
@@ -225,7 +228,7 @@ void TryGetNamespacedPluginType(string ns, PluginMetadata meta)
             IEnumerable<string> bareManifests = Directory.GetFiles(UnityGame.PluginsPath, "*.json");
             bareManifests = bareManifests.Concat(Directory.GetFiles(UnityGame.PluginsPath, "*.manifest"));
             foreach (var manifest in bareManifests)
-            { // TODO: maybe find a way to allow a bare manifest to specify an associated file
+            {
                 try
                 {
                     var metadata = new PluginMetadata
@@ -641,12 +644,16 @@ internal static void ResolveDependencies()
             var disabledLookup = DisabledPlugins.NonNull(m => m.Id).ToDictionary(m => m.Id, m => m.Version);
             foreach (var meta in PluginsMetadata)
             {
+                bool ignoreBcNoLoader = true;
                 var missingDeps = new List<(string id, Range version, bool disabled)>();
                 foreach (var dep in meta.Manifest.Dependencies)
                 {
 #if DEBUG
                     Logger.loader.Debug($"Looking for dependency {dep.Key} with version range {dep.Value.Intersect(new SemVer.Range("*.*.*"))}");
 #endif
+                    if (dep.Key == SelfMeta.Id)
+                        ignoreBcNoLoader = false;
+
                     if (pluginsToLoad.ContainsKey(dep.Key) && dep.Value.IsSatisfied(pluginsToLoad[dep.Key]))
                         continue;
 
@@ -662,6 +669,19 @@ internal static void ResolveDependencies()
                     }
                 }
 
+                if (meta.PluginType != null && !meta.IsSelf && !meta.IsBare && ignoreBcNoLoader)
+                {
+                    ignoredPlugins.Add(meta, new IgnoreReason(Reason.Dependency)
+                    {
+                        ReasonText = "BSIPA Plugin does not reference BSIPA!"
+                    });
+                    for (int i = 0; i < 20; i++)
+                    {
+                        Logger.loader.Warn($"HEY {meta.Id} YOU DEPEND ON BSIPA SO DEPEND ON BSIPA");
+                    }
+                    continue;
+                }
+
                 if (missingDeps.Count == 0)
                 {
                     metadata.Add(meta);

diff --git a/IPA.Loader/Loader/manifest.json b/IPA.Loader/Loader/manifest.json
@@ -5,7 +5,7 @@
     "#![IPA.Loader.description.md]",
     "A mod loader specifically for Beat Saber."
   ],
-  "gameVersion": "1.11.0",
+  "gameVersion": "1.11.1",
   "id": "BSIPA",
   "name": "Beat Saber IPA",
   "version": "4.1.0",

diff --git a/IPA/Program.cs b/IPA/Program.cs
@@ -23,7 +23,7 @@ public enum Architecture
             Unknown
         }
 
-        public const string FileVersion = "4.1.0.0";
+        public const string FileVersion = "4.1.1.0";
 
         public static Version Version => Assembly.GetEntryAssembly().GetName().Version;
 

diff --git a/Refs/UnityEngine.CoreModule.Net4.dll b/Refs/UnityEngine.CoreModule.Net4.dll
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ public enum Architecture @@
                 Unknown
             }
-            public const string FileVersion = "4.1.0.0";
+            public const string FileVersion = "4.1.1.0";
             public static Version Version => Assembly.GetEntryAssembly().GetName().Version;
@@ Expand Down @@