Remove many MonoBehaviour inheritances

Author: arthurkehrwald

Editor/Inspector/MpfMonitorInspector.cs

@@ -9,17 +9,19 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-using System;
 using System.Linq;
 using UnityEditor;
 using UnityEditor.UIElements;
 using UnityEngine;
 using UnityEngine.UIElements;
-using VisualPinball.Engine.Mpf.Unity.MediaController.Messages;
+using VisualPinball.Engine.Mpf.Unity.MediaController.Ui;
 
 namespace VisualPinball.Engine.Mpf.Unity.Editor
 {
-    [CustomEditor(typeof(MonitorBase), editorForChildClasses: true), CanEditMultipleObjects]
+    [
+        CustomEditor(typeof(MonitoredVariableTextBase), editorForChildClasses: true),
+        CanEditMultipleObjects
+    ]
     public class MpfMonitorInspector : UnityEditor.Editor
     {
         private HelpBox _missingGleHelpBox;

Runtime/MediaController/Core/BcpMessageHandlers.cs

@@ -15,7 +15,7 @@
 using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Error;
 using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Goodbye;
 using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Hello;
-using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.MachineVar;
+using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.MachineVariable;
 using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Mode;
 using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.PlayerAdded;
 using VisualPinball.Engine.Mpf.Unity.MediaController.Messages.PlayerTurnStart;

Runtime/MediaController/Messages/Device/Autofire/AutofireDeviceMonitor.cs

@@ -20,6 +20,9 @@ public class AutofireDeviceMonitor
         protected override ParseStateDelegate ParseState => AutofireDeviceMessage.FromStateJson;
         public event EventHandler<DeviceAttributeChangeEventArgs<bool>> EnabledChanged;
 
+        public AutofireDeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface, deviceName) { }
+
         protected override void HandleAttributeChange(DeviceAttributeChange change)
         {
             if (change.AttributeName == nameof(AutofireDeviceMessage.StateJson.enabled))

Runtime/MediaController/Messages/Device/BallDevice/BallDeviceMonitor.cs

@@ -13,8 +13,7 @@
 
 namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Device.BallDevice
 {
-    public class BallDeviceMonitor
-        : DeviceMonitor<BallDeviceMessage, BallDeviceMessage.StateJson>
+    public class BallDeviceMonitor : DeviceMonitor<BallDeviceMessage, BallDeviceMessage.StateJson>
     {
         protected override string Type => "ball_device";
         protected override ParseStateDelegate ParseState => BallDeviceMessage.FromStateJson;
@@ -23,6 +22,9 @@ public class BallDeviceMonitor
         public event EventHandler<DeviceAttributeChangeEventArgs<BallDeviceStatus>> StatusChanged;
         public event EventHandler<DeviceAttributeChangeEventArgs<int>> BallsChanged;
 
+        public BallDeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface, deviceName) { }
+
         protected override void HandleAttributeChange(DeviceAttributeChange change)
         {
             switch (change.AttributeName)

Runtime/MediaController/Messages/Device/ComboSwitch/ComboSwitchDeviceMonitor.cs

@@ -20,6 +20,9 @@ public class ComboSwitchDeviceMonitor
         protected override ParseStateDelegate ParseState => ComboSwitchDeviceMessage.FromStateJson;
         public event EventHandler<DeviceAttributeChangeEventArgs<ComboSwitchStatus>> StatusChanged;
 
+        public ComboSwitchDeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface, deviceName) { }
+
         protected override void HandleAttributeChange(DeviceAttributeChange change)
         {
             if (change.AttributeName == nameof(ComboSwitchDeviceMessage.StateJson.state))

Runtime/MediaController/Messages/Device/SpecificDeviceMonitor.cs renamed to Runtime/MediaController/Messages/Device/DeviceMonitor.cs

@@ -19,9 +19,14 @@ public abstract class DeviceMonitor<TMessage, TDeviceState>
         : MonitorBase<TMessage, DeviceMessage>
         where TMessage : SpecificDeviceMessageBase, IEquatable<TMessage>
     {
-        [SerializeField]
         private string _deviceName;
 
+        protected DeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface)
+        {
+            _deviceName = deviceName;
+        }
+
         protected override string BcpCommand => DeviceMessage.Command;
         protected abstract string Type { get; }
         protected delegate TMessage ParseStateDelegate(

Runtime/MediaController/Messages/Device/SpecificDeviceMonitor.cs.meta renamed to Runtime/MediaController/Messages/Device/DeviceMonitor.cs.meta

@@ -20,6 +20,9 @@ public class FlipperDeviceMonitor
         protected override ParseStateDelegate ParseState => FlipperDeviceMessage.FromStateJson;
         public event EventHandler<DeviceAttributeChangeEventArgs<bool>> EnabledChanged;
 
+        public FlipperDeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface, deviceName) { }
+
         protected override void HandleAttributeChange(DeviceAttributeChange change)
         {
             if (change.AttributeName == nameof(FlipperDeviceMessage.StateJson.enabled))

Runtime/MediaController/Messages/Device/Flipper/FlipperDeviceMonitor.cs

@@ -21,6 +21,9 @@ public class LightDeviceMonitor
         protected override ParseStateDelegate ParseState => LightDeviceMessage.FromStateJson;
         public event EventHandler<DeviceAttributeChangeEventArgs<Color>> ColorChanged;
 
+        public LightDeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface, deviceName) { }
+
         protected override void HandleAttributeChange(DeviceAttributeChange change)
         {
             if (change.AttributeName == nameof(LightDeviceMessage.StateJson.color))

Runtime/MediaController/Messages/Device/Light/LightDeviceMonitor.cs

@@ -13,7 +13,7 @@
 
 namespace VisualPinball.Engine.Mpf.Unity.MediaController.Messages.Device.Playfield
 {
-    public class PlayfieldDeviceMessageHandler
+    public class PlayfieldDeviceMonitor
         : DeviceMonitor<PlayfieldDeviceMessage, PlayfieldDeviceMessage.StateJson>
     {
         protected override string Type => "playfield";
@@ -23,6 +23,9 @@ public class PlayfieldDeviceMessageHandler
         public event EventHandler<DeviceAttributeChangeEventArgs<int>> BallsRequestedChanged;
         public event EventHandler<DeviceAttributeChangeEventArgs<int>> BallsChanged;
 
+        public PlayfieldDeviceMonitor(BcpInterface bcpInterface, string deviceName)
+            : base(bcpInterface, deviceName) { }
+
         protected override void HandleAttributeChange(DeviceAttributeChange change)
         {
             switch (change.AttributeName)