Merge pull request #39 from sepluginloader/dev

v1.10.3

Author: austinvaness

PluginLoader/Data/GitHubPlugin.cs

@@ -85,7 +85,7 @@ public override Assembly GetAssembly()
 
             string dllFile = Path.Combine(cacheDir, pluginFile);
             string commitFile = Path.Combine(cacheDir, commitHashFile);
-            if (!File.Exists(dllFile) || !File.Exists(commitFile) || File.ReadAllText(commitFile) != Commit)
+            if (!File.Exists(dllFile) || !File.Exists(commitFile) || File.ReadAllText(commitFile) != Commit || Main.Instance.Config.GameVersionChanged)
             {
                 var lbl = Main.Instance.Splash;
                 lbl.SetText($"Downloading '{FriendlyName}'");

PluginLoader/Data/ObsoletePlugin.cs

@@ -0,0 +1,19 @@
+using System.Reflection;
+
+namespace avaness.PluginLoader.Data
+{
+    internal class ObsoletePlugin : PluginData
+    {
+        public override string Source => "Obsolete";
+
+        public override Assembly GetAssembly()
+        {
+            return null;
+        }
+
+        public override void Show()
+        {
+
+        }
+    }
+}

PluginLoader/Data/PluginData.cs

@@ -14,12 +14,10 @@
 
 namespace avaness.PluginLoader.Data
 {
-    [XmlInclude(typeof(WorkshopPlugin))]
-    [XmlInclude(typeof(SEPMPlugin))]
     [XmlInclude(typeof(GitHubPlugin))]
     [XmlInclude(typeof(ModPlugin))]
     [ProtoContract]
-    [ProtoInclude(100, typeof(SteamPlugin))]
+    [ProtoInclude(100, typeof(ObsoletePlugin))]
     [ProtoInclude(103, typeof(GitHubPlugin))]
     [ProtoInclude(104, typeof(ModPlugin))]
     public abstract class PluginData : IEquatable<PluginData>

PluginLoader/Data/SEPMPlugin.cs

@@ -11,6 +11,7 @@ public class SplashScreen : Form
 	{
 		private const float barWidth = 0.98f; // 98% of width
 		private const float barHeight = 0.06f; // 6% of height
+		private static readonly Color backgroundColor = Color.FromArgb(4, 4, 4);
 
 		private readonly bool invalid;
 		private readonly Label lbl;
@@ -49,7 +50,7 @@ public SplashScreen()
 			{
 				Name = "PluginLoaderInfo",
 				Font = lblFont,
-				BackColor = Color.Black,
+				BackColor = backgroundColor,
 				ForeColor = Color.White,
 				MaximumSize = Size,
 				Size = new Size(Size.Width, lblFont.Height),

PluginLoader/Data/SteamPlugin.cs

@@ -2,7 +2,6 @@
 using Sandbox;
 using Sandbox.Game.World;
 using Sandbox.Graphics.GUI;
-using SEPluginManager;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -50,12 +49,6 @@ public static void Restart()
             Process.GetCurrentProcess().Kill();
         }
 
-        public static void ExecuteMain(SEPMPlugin plugin)
-        {
-            string name = plugin.GetType().ToString();
-            plugin.Main(new Harmony(name), new Logger());
-        }
-
         public static string GetHash1(string file)
         {
             using (SHA1Managed sha = new SHA1Managed())

PluginLoader/Data/WorkshopPlugin.cs

@@ -19,7 +19,7 @@ namespace avaness.PluginLoader
 {
     public class Main : IHandleInputPlugin
     {
-        const string HarmonyVersion = "2.2.1.0";
+        const string HarmonyVersion = "2.2.2.0";
 
         public static Main Instance;
 
@@ -68,11 +68,17 @@ public Main()
 
             AppDomain.CurrentDomain.AssemblyResolve += ResolveDependencies;
 
+            Splash.SetText("Starting...");
             Config = PluginConfig.Load(pluginsDir);
+            Config.CheckGameVersion();
             List = new PluginList(pluginsDir, Config);
-
+            
+            Splash.SetText("Starting...");
             Config.Init(List);
 
+            if (Config.GameVersionChanged)
+                ClearGitHubCache(pluginsDir);
+
             StatsClient.OverrideBaseUrl(Config.StatsServerBaseUrl);
 
             Splash.SetText("Patching...");
@@ -114,6 +120,36 @@ public Main()
             Splash = null;
         }
 
+        private void ClearGitHubCache(string pluginsDir)
+        {
+            string pluginCache = Path.Combine(pluginsDir, "GitHub");
+            if (!Directory.Exists(pluginCache))
+                return;
+
+            bool hasGitHub = false;
+            foreach(string id in Config.EnabledPlugins)
+            {
+                if(List.TryGetPlugin(id, out PluginData pluginData) && pluginData is GitHubPlugin)
+                {
+                    hasGitHub = true;
+                    break;
+                }
+            }
+
+            if(hasGitHub)
+            {
+                DialogResult result = MessageBox.Show(LoaderTools.GetMainForm(), "Space Engineers has been updated so all GitHub plugins that are currently enabled must be downloaded and compiled. Press OK to continue.", "PluginLoader", MessageBoxButtons.OKCancel);
+                if (result == DialogResult.Cancel)
+                    return;
+            }
+
+            try
+            {
+                Directory.Delete(pluginCache);
+            }
+            catch { }
+        }
+
         public bool TryGetPluginInstance(string id, out PluginInstance instance)
         {
             instance = null;
@@ -237,14 +273,6 @@ private Assembly ResolveDependencies(object sender, ResolveEventArgs args)
                     LogFile.WriteLine("Resolving 0Harmony");
                 return typeof(Harmony).Assembly;
             }
-            else if (args.Name.Contains("SEPluginManager"))
-            {
-                if (assembly != null)
-                    LogFile.WriteLine("Resolving SEPluginManager for " + assembly);
-                else
-                    LogFile.WriteLine("Resolving SEPluginManager");
-                return typeof(SEPluginManager.SEPMPlugin).Assembly;
-            }
 
             return null;
         }