Updated for 1.4.1

gotmachine · gotmachine · commit d86f4b2d301f · 2018-03-17T12:01:15.000+01:00
Added error-checking to the events, fixes some nullref exceptions
diff --git a/GameData/MandatoryRCS/MandatoryRCS.dll b/GameData/MandatoryRCS/MandatoryRCS.dll
diff --git a/GameData/MandatoryRCS/MandatoryRCS.version b/GameData/MandatoryRCS/MandatoryRCS.version
@@ -11,26 +11,26 @@
   "VERSION":
   {
       "MAJOR":1,
-      "MINOR":4,
+      "MINOR":5,
       "PATCH":0,
       "BUILD":0
   },
   "KSP_VERSION":
   {
       "MAJOR":1,
-      "MINOR":3,
+      "MINOR":4,
       "PATCH":1
   },
   "KSP_VERSION_MIN":
   {
       "MAJOR":1,
-      "MINOR":3,
+      "MINOR":4,
       "PATCH":1
   },
   "KSP_VERSION_MAX":
   {
       "MAJOR":1,
-      "MINOR":3,
+      "MINOR":4,
       "PATCH":1
   }
 }
diff --git a/MandatoryRCS-Source/MandatoryRCS.csproj b/MandatoryRCS-Source/MandatoryRCS.csproj
@@ -40,7 +40,7 @@
   <ItemGroup>
     <Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Kerbal Space Program 1.3.1 DEV\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\SteamLibrary\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\Assembly-CSharp.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <HintPath>..\..\..\..\..\Kerbal Space Program 1.3.1 DEV\KSP_x64_Data\Managed\System.dll</HintPath>
@@ -50,18 +50,18 @@
     </Reference>
     <Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Kerbal Space Program 1.3.1 DEV\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\SteamLibrary\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.dll</HintPath>
     </Reference>
     <Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Kerbal Space Program 1.3.1 DEV\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
+      <HintPath>..\..\..\..\..\..\..\..\..\SteamLibrary\steamapps\common\Kerbal Space Program\KSP_x64_Data\Managed\UnityEngine.UI.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>"C:\Users\Got\Desktop\KSP\Tools\pdb2mdb\pdb2mdb.exe" "C:\Users\Got\Desktop\KSP\SPE source\Mod project\MandatoryRCS\MandatoryRCS\MandatoryRCS-Source\bin\Debug\MandatoryRCS.dll"
-xcopy /Y "C:\Users\Got\Desktop\KSP\SPE source\Mod project\MandatoryRCS\MandatoryRCS\MandatoryRCS-Source\bin\Debug\MandatoryRCS.dll" "C:\Users\Got\Desktop\KSP\Kerbal Space Program 1.3.1 DEV\GameData\MandatoryRCS\"
-xcopy /Y "C:\Users\Got\Desktop\KSP\SPE source\Mod project\MandatoryRCS\MandatoryRCS\MandatoryRCS-Source\bin\Debug\MandatoryRCS.dll.mdb" "C:\Users\Got\Desktop\KSP\Kerbal Space Program 1.3.1 DEV\GameData\MandatoryRCS\"</PostBuildEvent>
+xcopy /Y "C:\Users\Got\Desktop\KSP\SPE source\Mod project\MandatoryRCS\MandatoryRCS\MandatoryRCS-Source\bin\Debug\MandatoryRCS.dll" "C:\Users\Got\Desktop\KSP\Kerbal Space Program 1.4.1 DEV\GameData\MandatoryRCS\"
+xcopy /Y "C:\Users\Got\Desktop\KSP\SPE source\Mod project\MandatoryRCS\MandatoryRCS\MandatoryRCS-Source\bin\Debug\MandatoryRCS.dll.mdb" "C:\Users\Got\Desktop\KSP\Kerbal Space Program 1.4.1 DEV\GameData\MandatoryRCS\"</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MandatoryRCS-Source/MandatoryRCSEvents.cs b/MandatoryRCS-Source/MandatoryRCSEvents.cs
@@ -32,19 +32,28 @@ private void FixedUpdate()
         // Update the total reaction wheels torque capacity for the vessel
         private void onVesselStandardModification(Vessel v)
         {
-            v.vesselModules.OfType<VesselModuleRotation>().First().updateWheelsTotalMaxTorque = true;
+            if (v.vesselModules.OfType<VesselModuleRotation>().Count() > 0)
+            {
+                v.vesselModules.OfType<VesselModuleRotation>().First().updateWheelsTotalMaxTorque = true;
+            }
         }
 
         // Detect active vessel change when switching vessel in the physics bubble
         private void onVesselChange(Vessel v)
         {
-            v.vesselModules.OfType<VesselModuleRotation>().First().vesselSASHasChanged = true;
+            if (v.vesselModules.OfType<VesselModuleRotation>().Count() > 0)
+            {
+                v.vesselModules.OfType<VesselModuleRotation>().First().vesselSASHasChanged = true;
+            }
         }
 
         // Detect navball context (orbit/surface/target) changes
         private void onSetSpeedMode(FlightGlobals.SpeedDisplayModes mode)
         {
-            FlightGlobals.ActiveVessel.vesselModules.OfType<VesselModuleRotation>().First().autopilotContextCurrent = (int)mode;
+            if (FlightGlobals.ActiveVessel.vesselModules.OfType<VesselModuleRotation>().Count() > 0)
+            {
+                FlightGlobals.ActiveVessel.vesselModules.OfType<VesselModuleRotation>().First().autopilotContextCurrent = (int)mode;
+            }
         }
 
         private void OnDestroy()
@@ -68,16 +77,21 @@ private void onVesselSOIChanged(GameEvents.HostedFromToAction<Vessel, CelestialB
         {
             if (data.host.loaded)
             {
-                if (data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold 
-                    && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode >= 1 
-                    && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode <= 6)
+                if (data.host.vesselModules != null && data.host.vesselModules.OfType<VesselModuleRotation>().Count() > 0)
                 {
-                    data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold = false;
-                    data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode = 0;
+                    if (data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold
+                        && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode >= 1
+                        && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode <= 6)
+                    {
+                      data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold = false;
+                      data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode = 0;
+                    }
                 }
             }
             else
             {
+                if (data.host.protoVessel.vesselModules == null || !data.host.protoVessel.vesselModules.HasNode("VesselModuleRotation"))
+                { return; }
                 bool autopilotTargetHoldCurrent = false;
                 int autopilotModeCurrent = 0;
                 if (!data.host.protoVessel.vesselModules.GetNode("VesselModuleRotation").TryGetValue("autopilotTargetHold", ref autopilotTargetHoldCurrent))
diff --git a/README.md b/README.md
@@ -70,6 +70,11 @@ So public domain, feel free to do anything, especially updating this plugin if I
 - Getting out of timewarps with the SAS direction hold activated input a large roll "kick", most visible at high timewarp levels. I tried a lot of things to find out why this happen or fix it, and failed.
 - When switching to an unloaded vessel with its SAS in "target", "antitarget" or "maneuver" mode, the orientation change is applied a few frames after the vessel is unpacked, leading to the rotation event being visible to the player. Won't fix as this is minor, purely cosmetic and fixing would require large modifications.
 
+#### v1.5 for KSP 1.4.1
+- Recompiled for KSP 1.4.1
+- (bugfix) Fixed NRE on asteroids changing SOI
+- (bugfix) Fixed NRE on planting flags
+
 #### v1.4 for KSP 1.3.1
 - Recompiled for KSP 1.3.1
 - Tweaks to the settings menu

Original file line number	Diff line number	Diff line change
`@@ -11,26 +11,26 @@`
`11`	`11`	`"VERSION":`
`12`	`12`	`{`
`13`	`13`	`"MAJOR":1,`
`14`		`- "MINOR":4,`
	`14`	`+ "MINOR":5,`
`15`	`15`	`"PATCH":0,`
`16`	`16`	`"BUILD":0`
`17`	`17`	`},`
`18`	`18`	`"KSP_VERSION":`
`19`	`19`	`{`
`20`	`20`	`"MAJOR":1,`
`21`		`- "MINOR":3,`
	`21`	`+ "MINOR":4,`
`22`	`22`	`"PATCH":1`
`23`	`23`	`},`
`24`	`24`	`"KSP_VERSION_MIN":`
`25`	`25`	`{`
`26`	`26`	`"MAJOR":1,`
`27`		`- "MINOR":3,`
	`27`	`+ "MINOR":4,`
`28`	`28`	`"PATCH":1`
`29`	`29`	`},`
`30`	`30`	`"KSP_VERSION_MAX":`
`31`	`31`	`{`
`32`	`32`	`"MAJOR":1,`
`33`		`- "MINOR":3,`
	`33`	`+ "MINOR":4,`
`34`	`34`	`"PATCH":1`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,28 @@ private void FixedUpdate()`
`32`	`32`	`// Update the total reaction wheels torque capacity for the vessel`
`33`	`33`	`private void onVesselStandardModification(Vessel v)`
`34`	`34`	`{`
`35`		`- v.vesselModules.OfType<VesselModuleRotation>().First().updateWheelsTotalMaxTorque = true;`
	`35`	`+ if (v.vesselModules.OfType<VesselModuleRotation>().Count() > 0)`
	`36`	`+ {`
	`37`	`+ v.vesselModules.OfType<VesselModuleRotation>().First().updateWheelsTotalMaxTorque = true;`
	`38`	`+ }`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`// Detect active vessel change when switching vessel in the physics bubble`
`39`	`42`	`private void onVesselChange(Vessel v)`
`40`	`43`	`{`
`41`		`- v.vesselModules.OfType<VesselModuleRotation>().First().vesselSASHasChanged = true;`
	`44`	`+ if (v.vesselModules.OfType<VesselModuleRotation>().Count() > 0)`
	`45`	`+ {`
	`46`	`+ v.vesselModules.OfType<VesselModuleRotation>().First().vesselSASHasChanged = true;`
	`47`	`+ }`
`42`	`48`	`}`
`43`	`49`
`44`	`50`	`// Detect navball context (orbit/surface/target) changes`
`45`	`51`	`private void onSetSpeedMode(FlightGlobals.SpeedDisplayModes mode)`
`46`	`52`	`{`
`47`		`- FlightGlobals.ActiveVessel.vesselModules.OfType<VesselModuleRotation>().First().autopilotContextCurrent = (int)mode;`
	`53`	`+ if (FlightGlobals.ActiveVessel.vesselModules.OfType<VesselModuleRotation>().Count() > 0)`
	`54`	`+ {`
	`55`	`+ FlightGlobals.ActiveVessel.vesselModules.OfType<VesselModuleRotation>().First().autopilotContextCurrent = (int)mode;`
	`56`	`+ }`
`48`	`57`	`}`
`49`	`58`
`50`	`59`	`private void OnDestroy()`
`@@ -68,16 +77,21 @@ private void onVesselSOIChanged(GameEvents.HostedFromToAction<Vessel, CelestialB`
`68`	`77`	`{`
`69`	`78`	`if (data.host.loaded)`
`70`	`79`	`{`
`71`		`- if (data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold`
`72`		`- && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode >= 1`
`73`		`- && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode <= 6)`
	`80`	`+ if (data.host.vesselModules != null && data.host.vesselModules.OfType<VesselModuleRotation>().Count() > 0)`
`74`	`81`	`{`
`75`		`- data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold = false;`
`76`		`- data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode = 0;`
	`82`	`+ if (data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold`
	`83`	`+ && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode >= 1`
	`84`	`+ && data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode <= 6)`
	`85`	`+ {`
	`86`	`+ data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotTargetHold = false;`
	`87`	`+ data.host.vesselModules.OfType<VesselModuleRotation>().First().autopilotMode = 0;`
	`88`	`+ }`
`77`	`89`	`}`
`78`	`90`	`}`
`79`	`91`	`else`
`80`	`92`	`{`
	`93`	`+ if (data.host.protoVessel.vesselModules == null \|\| !data.host.protoVessel.vesselModules.HasNode("VesselModuleRotation"))`
	`94`	`+ { return; }`
`81`	`95`	`bool autopilotTargetHoldCurrent = false;`
`82`	`96`	`int autopilotModeCurrent = 0;`
`83`	`97`	`if (!data.host.protoVessel.vesselModules.GetNode("VesselModuleRotation").TryGetValue("autopilotTargetHold", ref autopilotTargetHoldCurrent))`