Fix #121: IJSIModule should now be accessible from external mods

Author: JonnyOThan

RasterPropMonitor/Core/IJSIModule.cs

@@ -19,6 +19,8 @@
  * along with RasterPropMonitor.  If not, see <http://www.gnu.org/licenses/>.
  ****************************************************************************/
 using System;
+using System.Collections.Generic;
+using Log = KSPBuildTools.Log;
 
 namespace JSI
 {
@@ -28,6 +30,56 @@ namespace JSI
     /// </summary>
     public class IJSIModule
     {
+        public IJSIModule(Vessel v)
+        {
+            this.vessel = v;
+        }
+
         public Vessel vessel;
+
+        #region Module Registration
+
+        static List<Type> x_registeredTypes = new List<Type>();
+
+        internal static void CreateJSIModules(List<IJSIModule> modules, Vessel v)
+        {
+            foreach (Type t in x_registeredTypes)
+            {
+                try
+                {
+                    modules.Add((IJSIModule)Activator.CreateInstance(t, v));
+                }
+                catch (Exception e)
+                {
+                    Log.Error("Error creating JSI module of type " + t.Name + ": ");
+                    Log.Exception(e);
+                }
+            }
+        }
+
+        public static void RegisterModule(Type jsiModuleType)
+        {
+            if (x_registeredTypes.IndexOf(jsiModuleType) != -1) return;
+            if (!typeof(IJSIModule).IsAssignableFrom(jsiModuleType))
+            {
+                Log.Error($"Tried to register an ISJIModuleType {jsiModuleType.Name} that does not inherit from IJSIModule");
+                return;
+            }
+            x_registeredTypes.Add(jsiModuleType);
+        }
+
+        // A place to register known modules that might not otherwise have their static constructors called
+        static IJSIModule()
+        {
+            RegisterModule(typeof(JSIParachute));
+            RegisterModule(typeof(JSIInternalRPMButtons));
+            if (JSIChatterer.chattererFound) RegisterModule(typeof(JSIChatterer));
+            if (JSIFAR.farFound) RegisterModule(typeof(JSIFAR));
+            if (JSIKAC.kacFound) RegisterModule(typeof(JSIKAC));
+            if (JSIMechJeb.IsInstalled) RegisterModule(typeof(JSIMechJeb));
+            if (JSIPilotAssistant.paFound) RegisterModule(typeof(JSIPilotAssistant));
+        }
+
+        #endregion
     }
 }

RasterPropMonitor/Core/RasterPropMonitorComputer.cs

@@ -347,16 +347,11 @@ public void Start()
                 GameEvents.onVesselChange.Add(onVesselChange);
                 GameEvents.onVesselCrewWasModified.Add(onVesselCrewWasModified);
 
-                installedModules.Add(new JSIParachute(vessel)); // note this handles both stock chutes and realchute
-                if (JSIMechJeb.IsInstalled) installedModules.Add(new JSIMechJeb(vessel));
-                installedModules.Add(new JSIInternalRPMButtons(vessel));
-                if (JSIFAR.farFound) installedModules.Add(new JSIFAR(vessel));
-                if (JSIKAC.kacFound) installedModules.Add(new JSIKAC(vessel));
+                IJSIModule.CreateJSIModules(installedModules, vessel);
+
 #if ENABLE_ENGINE_MONITOR
                 installedModules.Add(new JSIEngine(vessel));
 #endif
-                if (JSIPilotAssistant.paFound) installedModules.Add(new JSIPilotAssistant(vessel));
-                if (JSIChatterer.chattererFound) installedModules.Add(new JSIChatterer(vessel));
 
                 if (string.IsNullOrEmpty(RPMCid))
                 {
@@ -643,10 +638,7 @@ public void OnDestroy()
             localCrew.Clear();
             localCrewMedical.Clear();
 
-            for (int i = 0; i < installedModules.Count; ++i)
-            {
-                installedModules[i].vessel = null;
-            }
+            installedModules.Clear();
 
             variableCollection.Clear();
             ClearVariables();

RasterPropMonitor/Handlers/JSIChatterer.cs

@@ -90,16 +90,16 @@ static JSIChatterer()
             if (chatterer_t != null && chattererStartTalking != null)
             {
                 chattererFound = true;
+                IJSIModule.RegisterModule(typeof(JSIChatterer));
             }
             else
             {
                 chattererFound = false;
             }
         }
 
-        public JSIChatterer(Vessel myVessel)
+        public JSIChatterer(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
             JUtil.LogMessage(this, "A supported version of Chatterer is {0}", (chattererFound) ? "present" : "not available");
             lastVessel = Guid.Empty;
         }

RasterPropMonitor/Handlers/JSIFAR.cs

@@ -172,6 +172,7 @@ static JSIFAR()
                 }
 
                 farFound = true;
+                IJSIModule.RegisterModule(typeof(JSIFAR));
             }
             catch (Exception e)
             {
@@ -181,9 +182,8 @@ static JSIFAR()
 
         }
 
-        public JSIFAR(Vessel myVessel)
+        public JSIFAR(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
             JUtil.LogMessage(this, "A supported version of FAR is {0}", (farFound) ? "present" : "not available");
         }
 

RasterPropMonitor/Handlers/JSIInternalRPMButtons.cs

@@ -36,9 +36,8 @@ namespace JSI
     /// </summary>
     public class JSIInternalRPMButtons : IJSIModule
     {
-        public JSIInternalRPMButtons(Vessel myVessel)
+        public JSIInternalRPMButtons(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
         }
 
         /// <summary>

RasterPropMonitor/Handlers/JSIKAC.cs

@@ -30,11 +30,14 @@ class JSIKAC : IJSIModule
         static JSIKAC()
         {
             kacFound = KACWrapper.InitKACWrapper();
+            if (kacFound)
+            {
+                IJSIModule.RegisterModule(typeof(JSIKAC));
+            }
         }
 
-        public JSIKAC(Vessel myVessel)
+        public JSIKAC(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
             JUtil.LogMessage(this, "A supported version of Kerbal Alarm Clock is {0}", (kacFound) ? "present" : "not available");
         }
 

RasterPropMonitor/Handlers/JSIMechJeb.cs

@@ -834,6 +834,8 @@ static JSIMechJeb()
                 {
                     throw new NotImplementedException("mjModuleUsers");
                 }
+
+                IJSIModule.RegisterModule(typeof(JSIMechJeb));
             }
             catch (Exception e)
             {
@@ -853,9 +855,8 @@ static JSIMechJeb()
 
         static public bool IsInstalled => mjFound;
 
-        public JSIMechJeb(Vessel myVessel)
+        public JSIMechJeb(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
             JUtil.LogInfo(this, "A supported version of MechJeb is {0}", (mjFound) ? "present" : "not available");
         }
 

RasterPropMonitor/Handlers/JSIParachute.cs

@@ -55,6 +55,8 @@ public enum SafeState
 
         static JSIParachute()
         {
+            IJSIModule.RegisterModule(typeof(JSIParachute));
+
             try
             {
                 Type rcMRC = null;
@@ -156,9 +158,8 @@ static JSIParachute()
             }
         }
 
-        public JSIParachute(Vessel myVessel)
+        public JSIParachute(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
             JUtil.LogMessage(this, "A supported version of RealChute is {0}", (rcFound) ? "present" : "not available");
         }
 

RasterPropMonitor/Handlers/JSIPilotAssistant.cs

@@ -223,11 +223,11 @@ static JSIPilotAssistant()
             }
 
             paFound = true;
+            IJSIModule.RegisterModule(typeof(JSIPilotAssistant));
         }
 
-        public JSIPilotAssistant(Vessel myVessel)
+        public JSIPilotAssistant(Vessel myVessel) : base(myVessel)
         {
-            vessel = myVessel;
             JUtil.LogMessage(this, "A supported version of Pilot Assistant is {0}", (paFound) ? "present" : "not available");
         }