Refactor and rename RasterPropMonitorComputer.Instantiate so that it can only find the computer module, not add one (because adding modules dynamically is a real bad idea)

JonnyOThan · JonnyOThan · commit 62313ef57ad8 · 2023-05-04T11:35:08.000-04:00
diff --git a/RasterPropMonitor/Auxiliary modules/JSIActionGroupSwitch.cs b/RasterPropMonitor/Auxiliary modules/JSIActionGroupSwitch.cs
@@ -194,7 +194,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
                 if (!groupList.ContainsKey(actionName) && !customGroupList.ContainsKey(actionName))
                 {
@@ -626,8 +626,8 @@ public void Start()
                 {
                     // Set up the color shift.
                     Renderer colorShiftRenderer = internalProp.FindModelComponent<Renderer>(coloredObject);
-                    disabledColorValue = JUtil.ParseColor32(disabledColor, part, ref rpmComp);
-                    enabledColorValue = JUtil.ParseColor32(enabledColor, part, ref rpmComp);
+                    disabledColorValue = JUtil.ParseColor32(disabledColor, rpmComp);
+                    enabledColorValue = JUtil.ParseColor32(enabledColor, rpmComp);
                     colorShiftMaterial = colorShiftRenderer.material;
                     colorNameId = Shader.PropertyToID(colorName);
                     colorShiftMaterial.SetColor(colorNameId, (currentState ^ reverse ? enabledColorValue : disabledColorValue));
diff --git a/RasterPropMonitor/Auxiliary modules/JSICallbackAnimator.cs b/RasterPropMonitor/Auxiliary modules/JSICallbackAnimator.cs
@@ -54,7 +54,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
                 ConfigNode moduleConfig = null;
                 foreach (ConfigNode node in GameDatabase.Instance.GetConfigNodes("PROP"))
@@ -246,7 +246,7 @@ public CallbackAnimationSet(ConfigNode node, string variableName, InternalProp t
                 throw new ArgumentException("Could not parse 'scale' parameter.");
             }
 
-            RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.Instantiate(thisProp, true);
+            RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.FindFromProp(thisProp);
             variable = new VariableOrNumberRange(rpmComp, variableName, tokens[0], tokens[1]);
 
             // That takes care of the scale, now what to do about that scale:
@@ -383,13 +383,13 @@ public CallbackAnimationSet(ConfigNode node, string variableName, InternalProp t
 
                 if (reverse)
                 {
-                    activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);
-                    passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);
+                    activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);
+                    passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);
                 }
                 else
                 {
-                    passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);
-                    activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);
+                    passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);
+                    activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);
                 }
                 Renderer colorShiftRenderer = thisProp.FindModelComponent<Renderer>(node.GetValue("coloredObject"));
                 affectedMaterial = colorShiftRenderer.material;
diff --git a/RasterPropMonitor/Auxiliary modules/JSIInternalBackgroundNoise.cs b/RasterPropMonitor/Auxiliary modules/JSIInternalBackgroundNoise.cs
@@ -26,7 +26,7 @@ public void Start()
                 return;
             }
 
-            rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+            rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
             if (string.IsNullOrEmpty(soundURL))
             {
                 JUtil.LogMessage(this, "JSIInternalBackgroundNoise called with no soundURL");
diff --git a/RasterPropMonitor/Auxiliary modules/JSILabel.cs b/RasterPropMonitor/Auxiliary modules/JSILabel.cs
@@ -118,7 +118,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
                 Transform textObjTransform = JUtil.FindPropTransform(internalProp, transformName);
                 Vector3 localScale = internalProp.transform.localScale;
@@ -273,16 +273,16 @@ public void Start()
 
                 if (!string.IsNullOrEmpty(zeroColor))
                 {
-                    zeroColorValue = JUtil.ParseColor32(zeroColor, part, ref rpmComp);
+                    zeroColorValue = JUtil.ParseColor32(zeroColor, rpmComp);
                     textObj.color = zeroColorValue;
                 }
 
                 bool usesMultiColor = false;
                 if (!(string.IsNullOrEmpty(variableName) || string.IsNullOrEmpty(positiveColor) || string.IsNullOrEmpty(negativeColor) || string.IsNullOrEmpty(zeroColor)))
                 {
                     usesMultiColor = true;
-                    positiveColorValue = JUtil.ParseColor32(positiveColor, part, ref rpmComp);
-                    negativeColorValue = JUtil.ParseColor32(negativeColor, part, ref rpmComp);
+                    positiveColorValue = JUtil.ParseColor32(positiveColor, rpmComp);
+                    negativeColorValue = JUtil.ParseColor32(negativeColor, rpmComp);
                     del = (Action<float>)Delegate.CreateDelegate(typeof(Action<float>), this, "OnCallback");
                     rpmComp.RegisterVariableCallback(variableName, del);
                     registeredVessel = vessel.id;
diff --git a/RasterPropMonitor/Auxiliary modules/JSINavBall.cs b/RasterPropMonitor/Auxiliary modules/JSINavBall.cs
@@ -55,7 +55,7 @@ public void Start()
                 return;
             }
 
-            rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+            rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
             lastOrientation = navBall.rotation;
 
diff --git a/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs b/RasterPropMonitor/Auxiliary modules/JSINumericInput.cs
@@ -66,7 +66,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
                 if (string.IsNullOrEmpty(perPodPersistenceName))
                 {
diff --git a/RasterPropMonitor/Auxiliary modules/JSISwitchableVariableLabel.cs b/RasterPropMonitor/Auxiliary modules/JSISwitchableVariableLabel.cs
@@ -70,7 +70,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
                 textObjTransform = JUtil.FindPropTransform(internalProp, labelTransform);
                 textObj = InternalComponents.Instance.CreateText(fontName, fontSize * 15.5f, textObjTransform, "", Color.green, false, alignment);
@@ -105,7 +105,7 @@ public void Start()
                         {
                             try
                             {
-                                labelsEx.Add(new VariableLabelSet(variableNodes[i], part));
+                                labelsEx.Add(new VariableLabelSet(variableNodes[i], internalProp));
                             }
                             catch (ArgumentException e)
                             {
@@ -121,7 +121,7 @@ public void Start()
                 {
                     try
                     {
-                        labelsEx.Add(new VariableLabelSet(moduleConfig, part));
+                        labelsEx.Add(new VariableLabelSet(moduleConfig, internalProp));
                     }
                     catch (ArgumentException e)
                     {
@@ -265,14 +265,14 @@ public class VariableLabelSet
         public readonly Color color;
         public readonly bool hasColor;
 
-        public VariableLabelSet(ConfigNode node, Part part)
+        public VariableLabelSet(ConfigNode node, InternalProp prop)
         {
             RasterPropMonitorComputer rpmComp = null;
             if (node.HasValue("labelText"))
             {
                 string labelText = node.GetValue("labelText").Trim().UnMangleConfigText();
                 hasText = true;
-                rpmComp = RasterPropMonitorComputer.Instantiate(part, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(prop);
                 label = new StringProcessorFormatter(labelText, rpmComp);
                 oneShot = label.IsConstant;
             }
@@ -284,7 +284,7 @@ public VariableLabelSet(ConfigNode node, Part part)
 
             if (node.HasValue("color"))
             {
-                color = JUtil.ParseColor32(node.GetValue("color").Trim(), part, ref rpmComp);
+                color = JUtil.ParseColor32(node.GetValue("color").Trim(), rpmComp);
                 hasColor = true;
             }
             else
diff --git a/RasterPropMonitor/Auxiliary modules/JSIVariableAnimator.cs b/RasterPropMonitor/Auxiliary modules/JSIVariableAnimator.cs
@@ -57,7 +57,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
                 useNewMode = RPMGlobals.useNewVariableAnimator;
 
                 ConfigNode moduleConfig = null;
@@ -387,13 +387,13 @@ public VariableAnimationSet(ConfigNode node, InternalProp thisProp, RasterPropMo
 
                 if (reverse)
                 {
-                    activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);
-                    passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);
+                    activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);
+                    passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);
                 }
                 else
                 {
-                    passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);
-                    activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);
+                    passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);
+                    activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);
                 }
                 Renderer colorShiftRenderer = thisProp.FindModelComponent<Renderer>(node.GetValue("coloredObject"));
                 affectedMaterial = colorShiftRenderer.material;
@@ -1072,13 +1072,13 @@ public VariableAnimationSet(ConfigNode node, InternalProp thisProp, RasterPropMo
 
                 if (reverse)
                 {
-                    activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);
-                    passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);
+                    activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);
+                    passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);
                 }
                 else
                 {
-                    passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);
-                    activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);
+                    passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);
+                    activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);
                 }
                 Renderer colorShiftRenderer = thisProp.FindModelComponent<Renderer>(node.GetValue("coloredObject"));
                 affectedMaterial = colorShiftRenderer.material;
diff --git a/RasterPropMonitor/Auxiliary modules/JSIVariableLabel.cs b/RasterPropMonitor/Auxiliary modules/JSIVariableLabel.cs
@@ -70,7 +70,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
                 Transform textObjTransform = JUtil.FindPropTransform(internalProp, transformName);
                 textObj = InternalComponents.Instance.CreateText("Arial", fontSize * 15.5f, textObjTransform, "", Color.green, false, "TopLeft");
@@ -95,9 +95,9 @@ public void Start()
 
                 if (!(string.IsNullOrEmpty(variableName) || string.IsNullOrEmpty(positiveColor) || string.IsNullOrEmpty(negativeColor) || string.IsNullOrEmpty(zeroColor)))
                 {
-                    positiveColorValue = JUtil.ParseColor32(positiveColor, part, ref rpmComp);
-                    negativeColorValue = JUtil.ParseColor32(negativeColor, part, ref rpmComp);
-                    zeroColorValue = JUtil.ParseColor32(zeroColor, part, ref rpmComp);
+                    positiveColorValue = JUtil.ParseColor32(positiveColor, rpmComp);
+                    negativeColorValue = JUtil.ParseColor32(negativeColor, rpmComp);
+                    zeroColorValue = JUtil.ParseColor32(zeroColor, rpmComp);
                     del = (Action<float>)Delegate.CreateDelegate(typeof(Action<float>), this, "OnCallback");
                     rpmComp.RegisterVariableCallback(variableName, del);
                     registeredVessel = vessel.id;
diff --git a/RasterPropMonitor/Core/RPMVCEvaluators.cs b/RasterPropMonitor/Core/RPMVCEvaluators.cs
@@ -40,7 +40,7 @@ internal double GetPersistentVariable(string name, double defaultValue)
             {
                 for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)
                 {
-                    RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);
+                    RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();
                     if (rpmc != null)
                     {
                         if (rpmc.HasPersistentVariable(name, false))
@@ -67,7 +67,7 @@ internal bool HasPersistentVariable(string name)
             {
                 for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)
                 {
-                    RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);
+                    RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();
                     if (rpmc != null)
                     {
                         if (rpmc.HasPersistentVariable(name, false))
@@ -93,7 +93,7 @@ internal void SetPersistentVariable(string name, double value)
             {
                 for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)
                 {
-                    RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);
+                    RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();
                     if (rpmc != null)
                     {
                         rpmc.SetPersistentVariable(name, value, false);
diff --git a/RasterPropMonitor/Core/RPMVesselComputer.cs b/RasterPropMonitor/Core/RPMVesselComputer.cs
@@ -557,7 +557,7 @@ public override void OnSave(ConfigNode node)
                     JUtil.LogMessage(this, "OnSave for vessel {0}", vessel.id);
                     for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)
                     {
-                        RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);
+                        RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();
                         if (rpmc != null && rpmc.persistentVars.Count > 0)
                         {
                             JUtil.LogMessage(this, "Storing RPMC {0} persistents", rpmc.RPMCid);
diff --git a/RasterPropMonitor/Core/RasterPropMonitor.cs b/RasterPropMonitor/Core/RasterPropMonitor.cs
@@ -151,7 +151,7 @@ public void Start()
 
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
                 JUtil.LogMessage(this, "Attaching monitor {2}-{1} to {0}", rpmComp.RPMCid, internalProp.propID, internalProp.internalModel.internalName);
 
                 // Install the calculator module.
diff --git a/RasterPropMonitor/Core/RasterPropMonitorComputer.cs b/RasterPropMonitor/Core/RasterPropMonitorComputer.cs
@@ -21,6 +21,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Diagnostics;
 using UnityEngine.Profiling;
 
 namespace JSI
@@ -101,33 +102,16 @@ internal PeriodicRandomValue(int period_)
         private ExternalVariableHandlers plugins = null;
         internal Dictionary<string, Color32> overrideColors = new Dictionary<string, Color32>();
 
-        /// <summary>
-        /// Request the instance, create it if one doesn't exist.
-        /// </summary>
-        /// <param name="referenceLocation">Prop or part where the RPMC should be.</param>
-        /// <param name="createIfMissing">Create the RPMC if it's not already present.</param>
-        /// <returns>The RPMC, or null if it can't be or wasn't created.</returns>
-        public static RasterPropMonitorComputer Instantiate(MonoBehaviour referenceLocation, bool createIfMissing)
+        public static RasterPropMonitorComputer FindFromProp(InternalProp prop)
         {
-            var thatProp = referenceLocation as InternalProp;
-            var thatPart = referenceLocation as Part;
-            if (thatPart == null)
-            {
-                if (thatProp == null)
-                {
-                    //throw new ArgumentException("Cannot instantiate RPMC in this location.");
-                    return null;
-                }
-                thatPart = thatProp.part;
-            }
-            for (int i = 0; i < thatPart.Modules.Count; i++)
+            var rpmc = prop.part.FindModuleImplementing<RasterPropMonitorComputer>();
+
+            if (rpmc == null)
             {
-                if (thatPart.Modules[i].ClassName == typeof(RasterPropMonitorComputer).Name)
-                {
-                    return thatPart.Modules[i] as RasterPropMonitorComputer;
-                }
+                JUtil.LogErrorMessage(null, "No RasterPropMonitorComputer module found on part {0} for prop {1} in internal {2}", prop.part.partInfo.name, prop.propName, prop.internalModel.internalName);
             }
-            return (createIfMissing) ? thatPart.AddModule(typeof(RasterPropMonitorComputer).Name) as RasterPropMonitorComputer : null;
+
+            return rpmc;
         }
 
         // Page handler interface for vessel description page.
diff --git a/RasterPropMonitor/Core/UtilityFunctions.cs b/RasterPropMonitor/Core/UtilityFunctions.cs
@@ -325,13 +325,12 @@ internal static void RenderTextureCamera(Camera camera)
         /// table.
         /// </summary>
         /// <param name="colorString">The color string to parse.</param>
-        /// <param name="part">The part containing the prop that is asking for
-        /// the color parsing.</param>
         /// <param name="rpmComp">The rpmComp for the specified part; if null,
         /// ParseColor32 looks up the RPMC module.</param>
+        /// 
         /// <returns>Color32; white if colorString is empty, obnoxious magenta
         /// if an unknown COLOR_ string is provided.</returns>
-        internal static Color32 ParseColor32(string colorString, Part part, ref RasterPropMonitorComputer rpmComp)
+        internal static Color32 ParseColor32(string colorString, RasterPropMonitorComputer rpmComp)
         {
             if (string.IsNullOrEmpty(colorString))
             {
@@ -341,20 +340,9 @@ internal static Color32 ParseColor32(string colorString, Part part, ref RasterPr
             colorString = colorString.Trim();
             if (colorString.StartsWith("COLOR_"))
             {
-                if (part != null)
+                if (rpmComp != null && rpmComp.overrideColors.ContainsKey(colorString))
                 {
-                    if (rpmComp == null)
-                    {
-                        rpmComp = RasterPropMonitorComputer.Instantiate(part, false);
-                    }
-
-                    if (rpmComp != null)
-                    {
-                        if (rpmComp.overrideColors.ContainsKey(colorString))
-                        {
-                            return rpmComp.overrideColors[colorString];
-                        }
-                    }
+                    return rpmComp.overrideColors[colorString];
                 }
 
                 if (globalColors.ContainsKey(colorString))
diff --git a/RasterPropMonitor/Handlers/JSIGraphingBackground.cs b/RasterPropMonitor/Handlers/JSIGraphingBackground.cs
@@ -98,7 +98,7 @@ public void Start()
             }
             try
             {
-                rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);
+                rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);
 
 				if (lineMaterial == null)
 				{
diff --git a/RasterPropMonitor/Handlers/JSIHeadsUpDisplay.cs b/RasterPropMonitor/Handlers/JSIHeadsUpDisplay.cs
diff --git a/RasterPropMonitor/Handlers/JSIOdometer.cs b/RasterPropMonitor/Handlers/JSIOdometer.cs
diff --git a/RasterPropMonitor/Handlers/JSISteerableCamera.cs b/RasterPropMonitor/Handlers/JSISteerableCamera.cs
diff --git a/RasterPropMonitor/Handlers/JSITargetMenu.cs b/RasterPropMonitor/Handlers/JSITargetMenu.cs
diff --git a/RasterPropMonitor/Handlers/JSIVariableGraph.cs b/RasterPropMonitor/Handlers/JSIVariableGraph.cs
diff --git a/RasterPropMonitor/Handlers/JSIVariablePageTextSwitcher.cs b/RasterPropMonitor/Handlers/JSIVariablePageTextSwitcher.cs
diff --git a/RasterPropMonitor/Handlers/MechJebRPM.cs b/RasterPropMonitor/Handlers/MechJebRPM.cs

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public void Start()`
`194`	`194`
`195`	`195`	`try`
`196`	`196`	`{`
`197`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`197`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`198`	`198`
`199`	`199`	`if (!groupList.ContainsKey(actionName) && !customGroupList.ContainsKey(actionName))`
`200`	`200`	`{`
`@@ -626,8 +626,8 @@ public void Start()`
`626`	`626`	`{`
`627`	`627`	`// Set up the color shift.`
`628`	`628`	`Renderer colorShiftRenderer = internalProp.FindModelComponent<Renderer>(coloredObject);`
`629`		`- disabledColorValue = JUtil.ParseColor32(disabledColor, part, ref rpmComp);`
`630`		`- enabledColorValue = JUtil.ParseColor32(enabledColor, part, ref rpmComp);`
	`629`	`+ disabledColorValue = JUtil.ParseColor32(disabledColor, rpmComp);`
	`630`	`+ enabledColorValue = JUtil.ParseColor32(enabledColor, rpmComp);`
`631`	`631`	`colorShiftMaterial = colorShiftRenderer.material;`
`632`	`632`	`colorNameId = Shader.PropertyToID(colorName);`
`633`	`633`	`colorShiftMaterial.SetColor(colorNameId, (currentState ^ reverse ? enabledColorValue : disabledColorValue));`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void Start()`
`54`	`54`
`55`	`55`	`try`
`56`	`56`	`{`
`57`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`57`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`58`	`58`
`59`	`59`	`ConfigNode moduleConfig = null;`
`60`	`60`	`foreach (ConfigNode node in GameDatabase.Instance.GetConfigNodes("PROP"))`
`@@ -246,7 +246,7 @@ public CallbackAnimationSet(ConfigNode node, string variableName, InternalProp t`
`246`	`246`	`throw new ArgumentException("Could not parse 'scale' parameter.");`
`247`	`247`	`}`
`248`	`248`
`249`		`- RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.Instantiate(thisProp, true);`
	`249`	`+ RasterPropMonitorComputer rpmComp = RasterPropMonitorComputer.FindFromProp(thisProp);`
`250`	`250`	`variable = new VariableOrNumberRange(rpmComp, variableName, tokens[0], tokens[1]);`
`251`	`251`
`252`	`252`	`// That takes care of the scale, now what to do about that scale:`
`@@ -383,13 +383,13 @@ public CallbackAnimationSet(ConfigNode node, string variableName, InternalProp t`
`383`	`383`
`384`	`384`	`if (reverse)`
`385`	`385`	`{`
`386`		`- activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);`
`387`		`- passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);`
	`386`	`+ activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);`
	`387`	`+ passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);`
`388`	`388`	`}`
`389`	`389`	`else`
`390`	`390`	`{`
`391`		`- passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);`
`392`		`- activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);`
	`391`	`+ passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);`
	`392`	`+ activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);`
`393`	`393`	`}`
`394`	`394`	`Renderer colorShiftRenderer = thisProp.FindModelComponent<Renderer>(node.GetValue("coloredObject"));`
`395`	`395`	`affectedMaterial = colorShiftRenderer.material;`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public void Start()`
`26`	`26`	`return;`
`27`	`27`	`}`
`28`	`28`
`29`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`29`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`30`	`30`	`if (string.IsNullOrEmpty(soundURL))`
`31`	`31`	`{`
`32`	`32`	`JUtil.LogMessage(this, "JSIInternalBackgroundNoise called with no soundURL");`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public void Start()`
`118`	`118`
`119`	`119`	`try`
`120`	`120`	`{`
`121`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`121`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`122`	`122`
`123`	`123`	`Transform textObjTransform = JUtil.FindPropTransform(internalProp, transformName);`
`124`	`124`	`Vector3 localScale = internalProp.transform.localScale;`
`@@ -273,16 +273,16 @@ public void Start()`
`273`	`273`
`274`	`274`	`if (!string.IsNullOrEmpty(zeroColor))`
`275`	`275`	`{`
`276`		`- zeroColorValue = JUtil.ParseColor32(zeroColor, part, ref rpmComp);`
	`276`	`+ zeroColorValue = JUtil.ParseColor32(zeroColor, rpmComp);`
`277`	`277`	`textObj.color = zeroColorValue;`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`bool usesMultiColor = false;`
`281`	`281`	`if (!(string.IsNullOrEmpty(variableName) \|\| string.IsNullOrEmpty(positiveColor) \|\| string.IsNullOrEmpty(negativeColor) \|\| string.IsNullOrEmpty(zeroColor)))`
`282`	`282`	`{`
`283`	`283`	`usesMultiColor = true;`
`284`		`- positiveColorValue = JUtil.ParseColor32(positiveColor, part, ref rpmComp);`
`285`		`- negativeColorValue = JUtil.ParseColor32(negativeColor, part, ref rpmComp);`
	`284`	`+ positiveColorValue = JUtil.ParseColor32(positiveColor, rpmComp);`
	`285`	`+ negativeColorValue = JUtil.ParseColor32(negativeColor, rpmComp);`
`286`	`286`	`del = (Action<float>)Delegate.CreateDelegate(typeof(Action<float>), this, "OnCallback");`
`287`	`287`	`rpmComp.RegisterVariableCallback(variableName, del);`
`288`	`288`	`registeredVessel = vessel.id;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public void Start()`
`55`	`55`	`return;`
`56`	`56`	`}`
`57`	`57`
`58`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`58`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`59`	`59`
`60`	`60`	`lastOrientation = navBall.rotation;`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void Start()`
`66`	`66`
`67`	`67`	`try`
`68`	`68`	`{`
`69`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`69`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`70`	`70`
`71`	`71`	`if (string.IsNullOrEmpty(perPodPersistenceName))`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public void Start()`
`70`	`70`
`71`	`71`	`try`
`72`	`72`	`{`
`73`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`73`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`74`	`74`
`75`	`75`	`textObjTransform = JUtil.FindPropTransform(internalProp, labelTransform);`
`76`	`76`	`textObj = InternalComponents.Instance.CreateText(fontName, fontSize * 15.5f, textObjTransform, "", Color.green, false, alignment);`
`@@ -105,7 +105,7 @@ public void Start()`
`105`	`105`	`{`
`106`	`106`	`try`
`107`	`107`	`{`
`108`		`- labelsEx.Add(new VariableLabelSet(variableNodes[i], part));`
	`108`	`+ labelsEx.Add(new VariableLabelSet(variableNodes[i], internalProp));`
`109`	`109`	`}`
`110`	`110`	`catch (ArgumentException e)`
`111`	`111`	`{`
`@@ -121,7 +121,7 @@ public void Start()`
`121`	`121`	`{`
`122`	`122`	`try`
`123`	`123`	`{`
`124`		`- labelsEx.Add(new VariableLabelSet(moduleConfig, part));`
	`124`	`+ labelsEx.Add(new VariableLabelSet(moduleConfig, internalProp));`
`125`	`125`	`}`
`126`	`126`	`catch (ArgumentException e)`
`127`	`127`	`{`
`@@ -265,14 +265,14 @@ public class VariableLabelSet`
`265`	`265`	`public readonly Color color;`
`266`	`266`	`public readonly bool hasColor;`
`267`	`267`
`268`		`- public VariableLabelSet(ConfigNode node, Part part)`
	`268`	`+ public VariableLabelSet(ConfigNode node, InternalProp prop)`
`269`	`269`	`{`
`270`	`270`	`RasterPropMonitorComputer rpmComp = null;`
`271`	`271`	`if (node.HasValue("labelText"))`
`272`	`272`	`{`
`273`	`273`	`string labelText = node.GetValue("labelText").Trim().UnMangleConfigText();`
`274`	`274`	`hasText = true;`
`275`		`- rpmComp = RasterPropMonitorComputer.Instantiate(part, true);`
	`275`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(prop);`
`276`	`276`	`label = new StringProcessorFormatter(labelText, rpmComp);`
`277`	`277`	`oneShot = label.IsConstant;`
`278`	`278`	`}`
`@@ -284,7 +284,7 @@ public VariableLabelSet(ConfigNode node, Part part)`
`284`	`284`
`285`	`285`	`if (node.HasValue("color"))`
`286`	`286`	`{`
`287`		`- color = JUtil.ParseColor32(node.GetValue("color").Trim(), part, ref rpmComp);`
	`287`	`+ color = JUtil.ParseColor32(node.GetValue("color").Trim(), rpmComp);`
`288`	`288`	`hasColor = true;`
`289`	`289`	`}`
`290`	`290`	`else`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void Start()`
`57`	`57`
`58`	`58`	`try`
`59`	`59`	`{`
`60`		`- rpmComp = RasterPropMonitorComputer.Instantiate(internalProp, true);`
	`60`	`+ rpmComp = RasterPropMonitorComputer.FindFromProp(internalProp);`
`61`	`61`	`useNewMode = RPMGlobals.useNewVariableAnimator;`
`62`	`62`
`63`	`63`	`ConfigNode moduleConfig = null;`
`@@ -387,13 +387,13 @@ public VariableAnimationSet(ConfigNode node, InternalProp thisProp, RasterPropMo`
`387`	`387`
`388`	`388`	`if (reverse)`
`389`	`389`	`{`
`390`		`- activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);`
`391`		`- passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);`
	`390`	`+ activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);`
	`391`	`+ passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);`
`392`	`392`	`}`
`393`	`393`	`else`
`394`	`394`	`{`
`395`		`- passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);`
`396`		`- activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);`
	`395`	`+ passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);`
	`396`	`+ activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);`
`397`	`397`	`}`
`398`	`398`	`Renderer colorShiftRenderer = thisProp.FindModelComponent<Renderer>(node.GetValue("coloredObject"));`
`399`	`399`	`affectedMaterial = colorShiftRenderer.material;`
`@@ -1072,13 +1072,13 @@ public VariableAnimationSet(ConfigNode node, InternalProp thisProp, RasterPropMo`
`1072`	`1072`
`1073`	`1073`	`if (reverse)`
`1074`	`1074`	`{`
`1075`		`- activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);`
`1076`		`- passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);`
	`1075`	`+ activeColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);`
	`1076`	`+ passiveColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);`
`1077`	`1077`	`}`
`1078`	`1078`	`else`
`1079`	`1079`	`{`
`1080`		`- passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), thisProp.part, ref rpmComp);`
`1081`		`- activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), thisProp.part, ref rpmComp);`
	`1080`	`+ passiveColor = JUtil.ParseColor32(node.GetValue("passiveColor"), rpmComp);`
	`1081`	`+ activeColor = JUtil.ParseColor32(node.GetValue("activeColor"), rpmComp);`
`1082`	`1082`	`}`
`1083`	`1083`	`Renderer colorShiftRenderer = thisProp.FindModelComponent<Renderer>(node.GetValue("coloredObject"));`
`1084`	`1084`	`affectedMaterial = colorShiftRenderer.material;`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ internal double GetPersistentVariable(string name, double defaultValue)`
`40`	`40`	`{`
`41`	`41`	`for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)`
`42`	`42`	`{`
`43`		`- RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);`
	`43`	`+ RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();`
`44`	`44`	`if (rpmc != null)`
`45`	`45`	`{`
`46`	`46`	`if (rpmc.HasPersistentVariable(name, false))`
`@@ -67,7 +67,7 @@ internal bool HasPersistentVariable(string name)`
`67`	`67`	`{`
`68`	`68`	`for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)`
`69`	`69`	`{`
`70`		`- RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);`
	`70`	`+ RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();`
`71`	`71`	`if (rpmc != null)`
`72`	`72`	`{`
`73`	`73`	`if (rpmc.HasPersistentVariable(name, false))`
`@@ -93,7 +93,7 @@ internal void SetPersistentVariable(string name, double value)`
`93`	`93`	`{`
`94`	`94`	`for (int partIdx = 0; partIdx < vessel.parts.Count; ++partIdx)`
`95`	`95`	`{`
`96`		`- RasterPropMonitorComputer rpmc = RasterPropMonitorComputer.Instantiate(vessel.parts[partIdx], false);`
	`96`	`+ RasterPropMonitorComputer rpmc = vessel.parts[partIdx].FindModuleImplementing<RasterPropMonitorComputer>();`
`97`	`97`	`if (rpmc != null)`
`98`	`98`	`{`
`99`	`99`	`rpmc.SetPersistentVariable(name, value, false);`