Update per blizzy78/ksp_toolbar#39 to prevent NotSupportedException. …

…(Applies to KAC and KS wrappers as well.)
Kerbas-ad-astra · Oct 20, 2016 · 7b1e34e · 7b1e34e
1 parent 012a89f
commit 7b1e34e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 20 deletions.
diff --git a/Source/lib/KACWrapper.cs b/Source/lib/KACWrapper.cs
@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
 using System.Reflection;
 using System.Text;
 
@@ -72,10 +71,14 @@ 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 = null;
+			AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+			{
+				if (t.FullName == "KerbalAlarmClock.KerbalAlarmClock")
+				{
+					KACType = t;
+				}
+			});
 
             if (KACType == null)
             {
@@ -88,12 +91,16 @@ public static Boolean InitKACWrapper()
                 //No TimeEntry or alarmchoice options = need a newer version
                 NeedUpgrade = true;
             }
-
-            //now the Alarm Type
-            KACAlarmType = AssemblyLoader.loadedAssemblies
-                .Select(a => a.assembly.GetExportedTypes())
-                .SelectMany(t => t)
-                .FirstOrDefault(t => t.FullName == "KerbalAlarmClock.KACAlarm");
+
+			//now the Alarm Type
+			KACAlarmType = null;
+            AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+			{
+				if (t.FullName == "KerbalAlarmClock.KACAlarm")
+				{
+					KACAlarmType = t;
+				}
+			});
 
             if (KACAlarmType == null)
             {

diff --git a/Source/lib/KerbalStatsWrapper.cs b/Source/lib/KerbalStatsWrapper.cs
@@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License
 using UnityEngine;
 using System.Collections.Generic;
 using System.Reflection;
-using System.Linq;
+using System;
 
 namespace ExtraplanetaryLaunchpads.KerbalStats {
 	public class KerbalExt
@@ -29,10 +29,14 @@ public static string Get (ProtoCrewMember kerbal, string parms)
 		{
 			if (!initialized) {
 				initialized = true;
-				System.Type KStype = AssemblyLoader.loadedAssemblies
-					.Select(a => a.assembly.GetExportedTypes())
-					.SelectMany(t => t)
-					.FirstOrDefault(t => t.FullName == "KerbalStats.KerbalExt");
+				Type KStype = null;
+				AssemblyLoader.loadedAssemblies.TypeOperation(t =>
+				{
+					if (t.FullName == "KerbalStats.KerbalExt")
+					{
+						KStype = t;
+					}
+				});
 				if (KStype == null) {
 					Debug.LogWarning ("KerbalStats.KerbalExt class not found.");
 				} else {

diff --git a/Source/toolbar/ToolbarWrapper.cs b/Source/toolbar/ToolbarWrapper.cs
@@ -25,7 +25,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 */
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using UnityEngine;
 
@@ -823,9 +822,15 @@ 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)