Fix for issue KSP-KOS#1849

GER-Space · Oct 21, 2016 · c5c49ab · c5c49ab
1 parent 4696559
commit c5c49ab
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 37 deletions.
diff --git a/src/kOS/AddOns/InfernalRobotics/IRWrapper.cs b/src/kOS/AddOns/InfernalRobotics/IRWrapper.cs
@@ -23,17 +23,25 @@ public class IRWrapper
         internal static bool InstanceExists { get { return (IRController != null); } }
         internal static bool APIReady { get { return isWrapped && IRController.Ready; } }
 
+        internal static Type GetType(string name)
+        {
+            Type type = null;
+            AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+            {
+                if (t.FullName == name)
+                    type = t;
+            });
+            return type;
+        }
+
         internal static bool InitWrapper()
         {
             isWrapped = false;
             ActualServoController = null;
             IRController = null;
             LogFormatted("Attempting to Grab IR Types...");
 
-            IRServoControllerType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "InfernalRobotics.Command.ServoController");
+            IRServoControllerType = GetType("InfernalRobotics.Command.ServoController");
 
             if (IRServoControllerType == null)
             {
@@ -42,54 +50,39 @@ internal static bool InitWrapper()
 
             LogFormatted("IR Version:{0}", IRServoControllerType.Assembly.GetName().Version.ToString());
 
-            IRServoMechanismType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "InfernalRobotics.Control.IMechanism");
+            IRServoMechanismType = GetType("InfernalRobotics.Control.IMechanism");
 
             if (IRServoMechanismType == null)
             {
                 LogFormatted("[IR Wrapper] Failed to grab Mechanism Type");
                 return false;
             }
 
-            IRServoMotorType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "InfernalRobotics.Control.IServoMotor");
+            IRServoMotorType = GetType("InfernalRobotics.Control.IServoMotor");
 
             if (IRServoMotorType == null)
             {
                 LogFormatted("[IR Wrapper] Failed to grab ServoMotor Type");
                 return false;
             }
 
-            IRServoType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "InfernalRobotics.Control.IServo");
+            IRServoType = GetType("InfernalRobotics.Control.IServo");
 
             if (IRServoType == null)
             {
                 LogFormatted("[IR Wrapper] Failed to grab Servo Type");
                 return false;
             }
 
-            IRServoPartType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "InfernalRobotics.Control.IPart");
+            IRServoPartType = GetType("InfernalRobotics.Control.IPart");
 
             if (IRServoType == null)
             {
                 LogFormatted("[IR Wrapper] Failed to grab ServoPart Type");
                 return false;
             }
 
-            IRControlGroupType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "InfernalRobotics.Command.ServoController+ControlGroup");
+            IRControlGroupType = GetType("InfernalRobotics.Command.ServoController+ControlGroup");
 
             if (IRControlGroupType == null)
             {

diff --git a/src/kOS/AddOns/KerbalAlarmClock/KACWrapper.cs b/src/kOS/AddOns/KerbalAlarmClock/KACWrapper.cs
@@ -55,6 +55,17 @@ public class KACWrapper
 
         public static Boolean NeedUpgrade { get; private set; }
 
+        public static Type GetType(string name)
+        {
+            Type type = null;
+            AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+            {
+                if (t.FullName == name)
+                    type = t;
+            });
+            return type;
+        }
+
         /// <summary>
         /// This method will set up the KAC object and wrap all the methods/functions
         /// </summary>
@@ -71,10 +82,7 @@ public static Boolean InitKACWrapper()
             LogFormatted("Attempting to Grab KAC Types...");
 
             //find the base type
-            KACType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "KerbalAlarmClock.KerbalAlarmClock");
+            KACType = GetType("KerbalAlarmClock.KerbalAlarmClock");
 
             if (KACType == null)
             {
@@ -89,10 +97,7 @@ public static Boolean InitKACWrapper()
             }
 
             //now the Alarm Type
-            KACAlarmType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "KerbalAlarmClock.KACAlarm");
+            KACAlarmType = GetType("KerbalAlarmClock.KACAlarm");
 
             if (KACAlarmType == null)
             {

diff --git a/src/kOS/Screen/ToolbarWrapper.cs b/src/kOS/Screen/ToolbarWrapper.cs
@@ -726,12 +726,17 @@ internal ToolbarTypes() {
 		}
 
 		internal static Type getType(string name) {
-			return AssemblyLoader.loadedAssemblies
-				.SelectMany(a => a.assembly.GetExportedTypes())
-				.SingleOrDefault(t => t.FullName == name);
-		}
+            Type type = null;
+            AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+            {
+                    if (t.FullName == name)
+                    type = t;
+            });
+            return type;
+        }
+
 
-		internal static PropertyInfo getProperty(Type type, string name) {
+        internal static PropertyInfo getProperty(Type type, string name) {
 			return type.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
 		}