Plugins - Removed plugin info from constructor

src/Artemis.Core/Plugins/Abstract/DataModelExpansion.cs

@@ -1,6 +1,4 @@
-using Artemis.Core.Plugins.Models;
-
-namespace Artemis.Core.Plugins.Abstract
+namespace Artemis.Core.Plugins.Abstract
 {
     /// <inheritdoc />
     /// <summary>
@@ -8,10 +6,6 @@ namespace Artemis.Core.Plugins.Abstract
     /// </summary>
     public abstract class DataModelExpansion : Plugin
     {
-        protected DataModelExpansion(PluginInfo pluginInfo) : base(pluginInfo)
-        {
-        }
-
         public abstract void Update(double deltaTime);
     }
 }

src/Artemis.Core/Plugins/Abstract/DataModels/Attributes/DataModelProperty.cs

@@ -2,7 +2,7 @@
 
 namespace Artemis.Core.Plugins.Abstract.DataModels.Attributes
 {
-    [AttributeUsage(System.AttributeTargets.Property)]
+    [AttributeUsage(AttributeTargets.Property)]
     public class DataModelPropertyAttribute : Attribute
     {
         /// <summary>

src/Artemis.Core/Plugins/Abstract/DeviceProvider.cs

@@ -1,7 +1,6 @@
 using System;
 using System.IO;
 using Artemis.Core.Extensions;
-using Artemis.Core.Plugins.Models;
 using Ninject;
 using RGB.NET.Core;
 using Serilog;
@@ -14,7 +13,7 @@ namespace Artemis.Core.Plugins.Abstract
     /// </summary>
     public abstract class DeviceProvider : Plugin
     {
-        protected DeviceProvider(PluginInfo pluginInfo, IRGBDeviceProvider rgbDeviceProvider) : base(pluginInfo)
+        protected DeviceProvider(IRGBDeviceProvider rgbDeviceProvider)
         {
             RgbDeviceProvider = rgbDeviceProvider ?? throw new ArgumentNullException(nameof(rgbDeviceProvider));
         }
@@ -24,6 +23,11 @@ namespace Artemis.Core.Plugins.Abstract
         [Inject]
         public ILogger Logger { get; set; }
 
+        public override void DisablePlugin()
+        {
+            // Does not happen with device providers, they require Artemis to restart
+        }
+
         protected void ResolveAbsolutePath(Type type, object sender, ResolvePathEventArgs e)
         {
             if (sender.GetType().IsGenericType(type))
@@ -42,10 +46,5 @@ namespace Artemis.Core.Plugins.Abstract
                 }
             }
         }
-
-        public override void DisablePlugin()
-        {
-            // Does not happen with device providers, they require Artemis to restart
-        }
     }
 }

src/Artemis.Core/Plugins/Abstract/LayerBrushProvider.cs

@@ -1,7 +1,8 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using Artemis.Core.Plugins.Exceptions;
 using Artemis.Core.Plugins.LayerBrush;
-using Artemis.Core.Plugins.Models;
+using Artemis.Core.Plugins.LayerBrush.Abstract;
 
 namespace Artemis.Core.Plugins.Abstract
 {
@@ -13,15 +14,32 @@ namespace Artemis.Core.Plugins.Abstract
     {
         private readonly List<LayerBrushDescriptor> _layerBrushDescriptors;
 
-        protected LayerBrushProvider(PluginInfo pluginInfo) : base(pluginInfo)
+        protected LayerBrushProvider()
         {
             _layerBrushDescriptors = new List<LayerBrushDescriptor>();
         }
 
+        /// <summary>
+        ///     A read-only collection of all layer brushes added with <see cref="AddLayerBrushDescriptor{T}" />
+        /// </summary>
         public ReadOnlyCollection<LayerBrushDescriptor> LayerBrushDescriptors => _layerBrushDescriptors.AsReadOnly();
 
+        /// <summary>
+        ///     Adds a layer brush descriptor for a given layer brush, so that it appears in the UI.
+        ///     <para>Note: You do not need to manually remove these on disable</para>
+        /// </summary>
+        /// <typeparam name="T">The type of the layer brush you wish to register</typeparam>
+        /// <param name="displayName">The name to display in the UI</param>
+        /// <param name="description">The description to display in the UI</param>
+        /// <param name="icon">
+        ///     The Material icon to display in the UI, a full reference can be found
+        ///     <see href="https://materialdesignicons.com">here</see>
+        /// </param>
         protected void AddLayerBrushDescriptor<T>(string displayName, string description, string icon) where T : BaseLayerBrush
         {
+            if (!Enabled)
+                throw new ArtemisPluginException(PluginInfo, "Can only add a layer brush descriptor when the plugin is enabled");
+
             _layerBrushDescriptors.Add(new LayerBrushDescriptor(displayName, description, icon, typeof(T), this));
         }
     }

src/Artemis.Core/Plugins/Abstract/LayerEffectProvider.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
-using Artemis.Core.Plugins.Models;
 
 namespace Artemis.Core.Plugins.Abstract
 {
@@ -11,10 +8,6 @@ namespace Artemis.Core.Plugins.Abstract
     /// </summary>
     public class LayerEffectProvider : Plugin
     {
-        public LayerEffectProvider(PluginInfo pluginInfo) : base(pluginInfo)
-        {
-        }
-
         public override void EnablePlugin()
         {
             throw new NotImplementedException();
@@ -25,4 +18,4 @@ namespace Artemis.Core.Plugins.Abstract
             throw new NotImplementedException();
         }
     }
-}
+}

src/Artemis.Core/Plugins/Abstract/Module.cs

@@ -2,7 +2,6 @@
 using Artemis.Core.Models.Surface;
 using Artemis.Core.Plugins.Abstract.DataModels;
 using Artemis.Core.Plugins.Abstract.ViewModels;
-using Artemis.Core.Plugins.Models;
 using SkiaSharp;
 
 namespace Artemis.Core.Plugins.Abstract
@@ -13,10 +12,6 @@ namespace Artemis.Core.Plugins.Abstract
     /// </summary>
     public abstract class Module : Plugin
     {
-        protected Module(PluginInfo pluginInfo) : base(pluginInfo)
-        {
-        }
-
         /// <summary>
         ///     The modules display name that's shown in the menu
         /// </summary>

src/Artemis.Core/Plugins/Abstract/Plugin.cs

@@ -10,11 +10,6 @@ namespace Artemis.Core.Plugins.Abstract
     /// </summary>
     public abstract class Plugin : IDisposable
     {
-        internal Plugin(PluginInfo pluginInfo)
-        {
-            PluginInfo = pluginInfo ?? throw new ArgumentNullException(nameof(pluginInfo));
-        }
-
         public PluginInfo PluginInfo { get; internal set; }
 
         /// <summary>
@@ -28,11 +23,6 @@ namespace Artemis.Core.Plugins.Abstract
         /// </summary>
         public bool HasConfigurationViewModel { get; protected set; }
 
-        public void Dispose()
-        {
-            DisablePlugin();
-        }
-
         /// <summary>
         ///     Called when the plugin is activated
         /// </summary>
@@ -52,21 +42,26 @@ namespace Artemis.Core.Plugins.Abstract
         {
             return null;
         }
-        
+
         internal void SetEnabled(bool enable)
         {
             if (enable && !Enabled)
             {
+                Enabled = true;
                 EnablePlugin();
                 OnPluginEnabled();
             }
             else if (!enable && Enabled)
             {
+                Enabled = false;
                 DisablePlugin();
                 OnPluginDisabled();
             }
+        }
 
-            Enabled = enable;
+        public void Dispose()
+        {
+            DisablePlugin();
         }
 
         #region Events

src/Artemis.Core/Plugins/Abstract/ProfileModule.cs

@@ -2,17 +2,12 @@
 using Artemis.Core.Exceptions;
 using Artemis.Core.Models.Profile;
 using Artemis.Core.Models.Surface;
-using Artemis.Core.Plugins.Models;
 using SkiaSharp;
 
 namespace Artemis.Core.Plugins.Abstract
 {
     public abstract class ProfileModule : Module
     {
-        protected ProfileModule(PluginInfo pluginInfo) : base(pluginInfo)
-        {
-        }
-
         public Profile ActiveProfile { get; private set; }
 
         /// <inheritdoc />