Prep for v3.1.6

ferram4 · Apr 29, 2016 · c753398 · c753398
1 parent b079369
commit c753398
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 22 deletions.
diff --git a/GameData/KerbalJointReinforcement/KerbalJointReinforcement.version b/GameData/KerbalJointReinforcement/KerbalJointReinforcement.version
@@ -9,7 +9,7 @@
   "VERSION" : {
     "MAJOR" : 3,
     "MINOR" : 1,
-    "PATCH" : 5
+    "PATCH" : 6
   },
   "KSP_VERSION_MIN" : {
     "MAJOR" : 1,
@@ -19,7 +19,7 @@
   "KSP_VERSION_MAX" : {
     "MAJOR" : 1,
     "MINOR" : 1,
-    "PATCH" : 0
+    "PATCH" : 1
   }
 }
 
diff --git a/GameData/KerbalJointReinforcement/Plugin/KerbalJointReinforcement.dll b/GameData/KerbalJointReinforcement/Plugin/KerbalJointReinforcement.dll
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement.v12.suo b/KerbalJointReinforcement/KerbalJointReinforcement.v12.suo
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRDecouplerReinforcementModule.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRDecouplerReinforcementModule.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.5
+Kerbal Joint Reinforcement, v3.1.6
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.
@@ -189,7 +189,7 @@ private void BreakAllInvalidJointsAndRebuild()
 
                 foreach (Part p in n.vessel.Parts)
                 {
-                    if (p is StrutConnector || p.Modules.Contains("LaunchClamp"))
+                    if (p is StrutConnector || p.Modules.Contains<LaunchClamp>())
                         continue;
 
                     ConfigurableJoint[] possibleConnections = p.GetComponents<ConfigurableJoint>();

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRJointUtils.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRJointUtils.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.5
+Kerbal Joint Reinforcement, v3.1.6
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.
@@ -341,9 +341,9 @@ public static void LoadConstants()
         public static Vector3 GuessUpVector(Part part)
         {
             // For intakes, use the intake vector
-            if (part.Modules.Contains("ModuleResourceIntake"))
+            if (part.Modules.Contains<ModuleResourceIntake>())
             {
-                ModuleResourceIntake i = part.Modules["ModuleResourceIntake"] as ModuleResourceIntake;
+                ModuleResourceIntake i = part.Modules.GetModule<ModuleResourceIntake>();
                 Transform intakeTrans = part.FindModelTransform(i.intakeTransformName);
                 return part.transform.InverseTransformDirection(intakeTrans.forward);
             }

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRLaunchClampReinforcementModule.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRLaunchClampReinforcementModule.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.5
+Kerbal Joint Reinforcement, v3.1.6
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.
@@ -118,7 +118,7 @@ private void BreakAllInvalidJoints()
 
                 foreach (Part p in n.vessel.Parts)
                 {
-                    if (p is StrutConnector || p.Modules.Contains("LaunchClamp"))
+                    if (p is StrutConnector || p.Modules.Contains<LaunchClamp>())
                         continue;
 
 

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRManager.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRManager.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.5
+Kerbal Joint Reinforcement, v3.1.6
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.
@@ -169,15 +169,15 @@ private void RunVesselJointUpdateFunction(Vessel v)
                     }
 
                 if (KJRJointUtils.reinforceLaunchClampsFurther)
-                    if (p.Modules.Contains("LaunchClamp") && p.parent != null)
+                    if (p.Modules.Contains<LaunchClamp>() && p.parent != null)
                     {
                         p.breakingForce = Mathf.Infinity;
                         p.breakingTorque = Mathf.Infinity;
                         p.mass = Mathf.Max(p.mass, (p.parent.mass + p.parent.GetResourceMass()) * 0.01f);          //We do this to make sure that there is a mass ratio of 100:1 between the clamp and what it's connected to.  This helps counteract some of the wobbliness simply, but also allows some give and springiness to absorb the initial physics kick
                         if (KJRJointUtils.debug)
                             Debug.Log("KJR: Launch Clamp Break Force / Torque increased");
 
-                        if (!p.Modules.Contains("KJRLaunchClampReinforcementModule"))
+                        if (!p.Modules.Contains<KJRLaunchClampReinforcementModule>())
                             KJRJointUtils.AddLaunchClampReinforcementModule(p);
                     }
             }
@@ -188,7 +188,7 @@ private void RunVesselJointUpdateFunction(Vessel v)
 
         private bool ValidDecoupler(Part p)
         {
-            return (p.Modules.Contains("ModuleDecouple") || p.Modules.Contains("ModuleAnchoredDecoupler")) && !p.Modules.Contains("KJRDecouplerReinforcementModule");
+            return (p.Modules.Contains<ModuleDecouple>() || p.Modules.Contains<ModuleAnchoredDecoupler>()) && !p.Modules.Contains<KJRDecouplerReinforcementModule>();
         }
 
 /*        public void LateUpdate()
@@ -259,7 +259,7 @@ public void FixedUpdate()
                                     jointList.Add(j);
                                     Debug.Log("Part: " + p.partInfo.title + " BreakForce = " + j.breakForce + " BreakTorque = " + j.breakTorque);
                                 }*/
-                                if (p.Modules.Contains("LaunchClamp"))
+                                if (p.Modules.Contains<LaunchClamp>())
                                 {
                                     foreach (Joint j in partJoints)
                                         if (j.connectedBody == null)
@@ -279,7 +279,7 @@ public void FixedUpdate()
                         else
                         {
                             foreach (Part p in v.Parts)
-                                if (p.Modules.Contains("LaunchClamp"))
+                                if (p.Modules.Contains<LaunchClamp>())
                                 {
                                     easing = true;
                                     break;
@@ -394,9 +394,9 @@ private void UpdatePartJoint(Part p)
                     p.attachMethod = AttachNodeMethod.LOCKED_JOINT;
                 }
             }
-            if (p.Modules.Contains("CModuleStrut"))
+            if (p.Modules.Contains<CModuleStrut>())
             {
-                CModuleStrut s = (CModuleStrut)p.Modules["CModuleStrut"];
+                CModuleStrut s = p.Modules.GetModule<CModuleStrut>();
 
                 if (!(s.jointTarget == null || s.jointRoot == null))
                 {
@@ -439,7 +439,7 @@ private void UpdatePartJoint(Part p)
 
             bool addAdditionalJointToParent = KJRJointUtils.multiPartAttachNodeReinforcement;
             //addAdditionalJointToParent &= !(p.Modules.Contains("LaunchClamp") || (p.parent.Modules.Contains("ModuleDecouple") || p.parent.Modules.Contains("ModuleAnchoredDecoupler")));
-            addAdditionalJointToParent &= !(p is StrutConnector || p.Modules.Contains("CModuleStrut"));
+            addAdditionalJointToParent &= !(p is StrutConnector || p.Modules.Contains<CModuleStrut>());
 
             float partMass = p.mass + p.GetResourceMass();
             for (int i = 0; i < jointList.Count; i++)
@@ -472,8 +472,8 @@ private void UpdatePartJoint(Part p)
                 if (node == null)
                 {
                     // Check if it's a pair of coupled docking ports
-                    var dock1 = p.Modules["ModuleDockingNode"] as ModuleDockingNode;
-                    var dock2 = p.parent.Modules["ModuleDockingNode"] as ModuleDockingNode;
+                    var dock1 = p.Modules.GetModule<ModuleDockingNode>();
+                    var dock2 = p.parent.Modules.GetModule<ModuleDockingNode>();
 
                     //Debug.Log(dock1 + " " + (dock1 ? ""+dock1.dockedPartUId : "?") + " " + dock2 + " " + (dock2 ? ""+dock2.dockedPartUId : "?"));
 

diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/KJRMultiJointManager.cs b/KerbalJointReinforcement/KerbalJointReinforcement/KJRMultiJointManager.cs
@@ -1,5 +1,5 @@
 /*
-Kerbal Joint Reinforcement, v3.1.5
+Kerbal Joint Reinforcement, v3.1.6
 Copyright 2015, Michael Ferrara, aka Ferram4
 
     This file is part of Kerbal Joint Reinforcement.

diff --git a/...ntReinforcement/obj/Release/KerbalJointReinforcement.csprojResolveAssemblyReference.cache b/...ntReinforcement/obj/Release/KerbalJointReinforcement.csprojResolveAssemblyReference.cache
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.dll b/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.dll
diff --git a/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.pdb b/KerbalJointReinforcement/KerbalJointReinforcement/obj/Release/KerbalJointReinforcement.pdb
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Kerbal Joint Reinforcement, v3.1.5
+Kerbal Joint Reinforcement, v3.1.6
 ==========================
 
 Physics stabilizer plugin for Kerbal Space Program
@@ -119,6 +119,12 @@ These types are currently not used, but removing the a in front of them will cau
 ***********************
 ****** CHANGELOG ******
 ***********************
+v3.1.6  
+	Features  
+	--Update to ensure KSP 1.1.1 compatibility  
+	--Minor optimization in joint setups  
+	--Remove B9 pWings from stiffening exemption, as it is unnecessary  
+
 v3.1.5  
 	Features  
 	--Updated to be compatible with KSP 1.1