Plugins - Separated plugins and implementations as different principles

src/Artemis.Core/Plugins/DataModelExpansions/DataModel.cs

@@ -14,10 +14,10 @@ namespace Artemis.Core.DataModelExpansions
         private readonly Dictionary<string, DataModel> _dynamicDataModels = new Dictionary<string, DataModel>();
 
         /// <summary>
-        ///     Gets the plugin info this data model belongs to
+        ///     Gets the plugin implementation this data model belongs to
         /// </summary>
         [DataModelIgnore]
-        public PluginInfo PluginInfo { get; internal set; }
+        public DataModelPluginImplementation Implementation { get; internal set; }
 
         /// <summary>
         ///     Gets the <see cref="DataModelPropertyAttribute" /> describing this data model
@@ -43,9 +43,9 @@ namespace Artemis.Core.DataModelExpansions
         /// <returns></returns>
         public ReadOnlyCollection<PropertyInfo> GetHiddenProperties()
         {
-            if (PluginInfo.Instance is ProfileModule profileModule)
+            if (Implementation is ProfileModule profileModule)
                 return profileModule.HiddenProperties;
-            if (PluginInfo.Instance is BaseDataModelExpansion dataModelExpansion)
+            if (Implementation is BaseDataModelExpansion dataModelExpansion)
                 return dataModelExpansion.HiddenProperties;
 
             return new List<PropertyInfo>().AsReadOnly();
@@ -81,7 +81,7 @@ namespace Artemis.Core.DataModelExpansions
                 throw new ArtemisCoreException($"Cannot add a dynamic data model with key '{key}' " +
                                                "because the key is already in use by a static property on this data model.");
 
-            dynamicDataModel.PluginInfo = PluginInfo;
+            dynamicDataModel.Implementation = Implementation;
             dynamicDataModel.DataModelDescription = new DataModelPropertyAttribute
             {
                 Name = string.IsNullOrWhiteSpace(name) ? key.Humanize() : name,

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

@@ -42,18 +42,18 @@ namespace Artemis.Core.DataModelExpansions
             HiddenPropertiesList.RemoveAll(p => p.Equals(propertyInfo));
         }
 
-        internal override void InternalEnablePlugin()
+        internal override void InternalEnable()
         {
             DataModel = Activator.CreateInstance<T>();
-            DataModel.PluginInfo = PluginInfo;
+            DataModel.Implementation = PluginInfo;
             DataModel.DataModelDescription = GetDataModelDescription();
-            base.InternalEnablePlugin();
+            base.InternalEnable();
         }
 
-        internal override void InternalDisablePlugin()
+        internal override void InternalDisable()
         {
             DataModel = null;
-            base.InternalDisablePlugin();
+            base.InternalDisable();
         }
     }
 }

src/Artemis.Core/Plugins/DataModelExpansions/Internal/BaseDataModelExpansion.cs

@@ -8,7 +8,7 @@ namespace Artemis.Core.DataModelExpansions
     ///     For internal use only, to implement your own layer property type, extend <see cref="DataModelExpansion{T}" />
     ///     instead.
     /// </summary>
-    public abstract class BaseDataModelExpansion : Plugin
+    public abstract class BaseDataModelExpansion : DataModelPluginImplementation
     {
         /// <summary>
         ///     Gets a list of all properties ignored at runtime using <c>IgnoreProperty(x => x.y)</c>