Scripting - Enabled scripting (#638)

* Scripting - Simplified view model structure
* Scripting - Removed Layer and LayerProperty scripts

src/Artemis.Core/Models/Profile/Layer.cs

@@ -38,8 +38,6 @@ namespace Artemis.Core
             Profile = Parent.Profile;
             Name = name;
             Suspended = false;
-            Scripts = new List<LayerScript>();
-            ScriptConfigurations = new List<ScriptConfiguration>();
 
             _general = new LayerGeneralProperties();
             _transform = new LayerTransformProperties();
@@ -64,8 +62,6 @@ namespace Artemis.Core
 
             Profile = profile;
             Parent = parent;
-            Scripts = new List<LayerScript>();
-            ScriptConfigurations = new List<ScriptConfiguration>();
 
             _general = new LayerGeneralProperties();
             _transform = new LayerTransformProperties();
@@ -82,16 +78,6 @@ namespace Artemis.Core
         /// </summary>
         public ReadOnlyCollection<ArtemisLed> Leds => _leds.AsReadOnly();
 
-        /// <summary>
-        ///     Gets a collection of all active scripts assigned to this layer
-        /// </summary>
-        public List<LayerScript> Scripts { get; }
-
-        /// <summary>
-        /// Gets a collection of all script configurations assigned to this layer
-        /// </summary>
-        public List<ScriptConfiguration> ScriptConfigurations { get; }
-
         /// <summary>
         ///     Defines the shape that is rendered by the <see cref="LayerBrush" />.
         /// </summary>
@@ -190,9 +176,6 @@ namespace Artemis.Core
 
             Disposed = true;
 
-            while (Scripts.Count > 1)
-                Scripts[0].Dispose();
-
             LayerBrushStore.LayerBrushAdded -= LayerBrushStoreOnLayerBrushAdded;
             LayerBrushStore.LayerBrushRemoved -= LayerBrushStoreOnLayerBrushRemoved;
 
@@ -269,11 +252,6 @@ namespace Artemis.Core
             ExpandedPropertyGroups.AddRange(LayerEntity.ExpandedPropertyGroups);
             LoadRenderElement();
             Adapter.Load();
-
-            foreach (ScriptConfiguration scriptConfiguration in ScriptConfigurations)
-                scriptConfiguration.Script?.Dispose();
-            ScriptConfigurations.Clear();
-            ScriptConfigurations.AddRange(LayerEntity.ScriptConfigurations.Select(e => new ScriptConfiguration(e)));
         }
 
         internal override void Save()
@@ -310,14 +288,7 @@ namespace Artemis.Core
 
             // Adaption hints
             Adapter.Save();
-
-            LayerEntity.ScriptConfigurations.Clear();
-            foreach (ScriptConfiguration scriptConfiguration in ScriptConfigurations)
-            {
-                scriptConfiguration.Save();
-                LayerEntity.ScriptConfigurations.Add(scriptConfiguration.Entity);
-            }
-
+            
             SaveRenderElement();
         }
 
@@ -349,10 +320,7 @@ namespace Artemis.Core
         {
             if (Disposed)
                 throw new ObjectDisposedException("Layer");
-
-            foreach (LayerScript layerScript in Scripts)
-                layerScript.OnLayerUpdating(deltaTime);
-
+            
             UpdateDisplayCondition();
             UpdateTimeline(deltaTime);
 
@@ -360,9 +328,6 @@ namespace Artemis.Core
                 Enable();
             else if (Timeline.IsFinished)
                 Disable();
-
-            foreach (LayerScript layerScript in Scripts)
-                layerScript.OnLayerUpdated(deltaTime);
         }
 
         /// <inheritdoc />
@@ -512,10 +477,7 @@ namespace Artemis.Core
         {
             if (LayerBrush == null)
                 throw new ArtemisCoreException("The layer is not yet ready for rendering");
-
-            foreach (LayerScript layerScript in Scripts)
-                layerScript.OnLayerRendering(canvas, bounds, layerPaint);
-
+            
             foreach (BaseLayerEffect baseLayerEffect in LayerEffects.Where(e => !e.Suspended))
                 baseLayerEffect.PreProcess(canvas, bounds, layerPaint);
 
@@ -531,9 +493,6 @@ namespace Artemis.Core
 
                 foreach (BaseLayerEffect baseLayerEffect in LayerEffects.Where(e => !e.Suspended))
                     baseLayerEffect.PostProcess(canvas, bounds, layerPaint);
-
-                foreach (LayerScript layerScript in Scripts)
-                    layerScript.OnLayerRendered(canvas, bounds, layerPaint);
             }
 
             finally

src/Artemis.Core/Models/Profile/LayerProperties/ILayerProperty.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using Artemis.Core.ScriptingProviders;
 using Artemis.Storage.Entities.Profile;
 
 namespace Artemis.Core
@@ -24,16 +23,6 @@ namespace Artemis.Core
         /// </summary>
         LayerPropertyGroup LayerPropertyGroup { get; }
 
-        /// <summary>
-        ///     Gets a collection of all active scripts assigned to this layer property
-        /// </summary>
-        List<PropertyScript> Scripts { get; }
-
-        /// <summary>
-        /// Gets a collection of all script configurations assigned to this layer property
-        /// </summary>
-        public List<ScriptConfiguration> ScriptConfigurations { get; }
-
         /// <summary>
         ///     Gets the unique path of the property on the layer
         /// </summary>
@@ -81,8 +70,6 @@ namespace Artemis.Core
         /// <param name="timeline">The timeline to apply to the property</param>
         void Update(Timeline timeline);
 
-        #region Events
-
         /// <summary>
         ///     Occurs when the layer property is disposed
         /// </summary>
@@ -137,7 +124,5 @@ namespace Artemis.Core
         ///     Occurs when a data binding has been disabled
         /// </summary>
         public event EventHandler<LayerPropertyEventArgs>? DataBindingDisabled;
-
-        #endregion
     }
 }

src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using Artemis.Core.ScriptingProviders;
 using Artemis.Storage.Entities.Profile;
 using Newtonsoft.Json;
 
@@ -31,8 +30,6 @@ namespace Artemis.Core
             Path = null!;
             Entity = null!;
             PropertyDescription = null!;
-            Scripts = new List<PropertyScript>();
-            ScriptConfigurations = new List<ScriptConfiguration>();
 
             CurrentValue = default!;
             DefaultValue = default!;
@@ -60,9 +57,6 @@ namespace Artemis.Core
         {
             _disposed = true;
 
-            while (Scripts.Count > 1)
-                Scripts[0].Dispose();
-
             foreach (IDataBinding dataBinding in _dataBindings)
                 dataBinding.Dispose();
 
@@ -153,12 +147,6 @@ namespace Artemis.Core
         /// <inheritdoc />
         public PropertyDescriptionAttribute PropertyDescription { get; internal set; }
 
-        /// <inheritdoc />
-        public List<PropertyScript> Scripts { get; }
-
-        /// <inheritdoc />
-        public List<ScriptConfiguration> ScriptConfigurations { get; }
-
         /// <inheritdoc />
         public string Path { get; private set; }
 
@@ -171,18 +159,12 @@ namespace Artemis.Core
             if (_disposed)
                 throw new ObjectDisposedException("LayerProperty");
 
-            foreach (PropertyScript propertyScript in Scripts)
-                propertyScript.OnPropertyUpdating(timeline.Delta.TotalSeconds);
-
             CurrentValue = BaseValue;
 
             UpdateKeyframes(timeline);
             UpdateDataBindings(timeline);
 
             OnUpdated();
-
-            foreach (PropertyScript propertyScript in Scripts)
-                propertyScript.OnPropertyUpdated(timeline.Delta.TotalSeconds);
         }
 
         /// <inheritdoc />
@@ -762,11 +744,6 @@ namespace Artemis.Core
                 if (dataBinding != null)
                     _dataBindings.Add(dataBinding);
             }
-
-            foreach (ScriptConfiguration scriptConfiguration in ScriptConfigurations)
-                scriptConfiguration.Script?.Dispose();
-            ScriptConfigurations.Clear();
-            ScriptConfigurations.AddRange(Entity.ScriptConfigurations.Select(e => new ScriptConfiguration(e)));
         }
 
         /// <summary>
@@ -788,13 +765,6 @@ namespace Artemis.Core
             Entity.DataBindingEntities.Clear();
             foreach (IDataBinding dataBinding in _dataBindings)
                 dataBinding.Save();
-
-            Entity.ScriptConfigurations.Clear();
-            foreach (ScriptConfiguration scriptConfiguration in ScriptConfigurations)
-            {
-                scriptConfiguration.Save();
-                Entity.ScriptConfigurations.Add(scriptConfiguration.Entity);
-            }
         }
 
         /// <summary>

src/Artemis.Core/Plugins/ScriptingProviders/IScriptEditorViewModel.cs

@@ -0,0 +1,24 @@
+namespace Artemis.Core.ScriptingProviders
+{
+    /// <summary>
+    ///     Represents a view model containing a script editor
+    /// </summary>
+    public interface IScriptEditorViewModel
+    {
+        /// <summary>
+        ///     Gets the script type this view model was created for
+        /// </summary>
+        ScriptType ScriptType { get; }
+
+        /// <summary>
+        ///     Gets the script this editor is editing
+        /// </summary>
+        Script? Script { get; }
+
+        /// <summary>
+        ///     Called whenever the view model must display a different script
+        /// </summary>
+        /// <param name="script">The script to display or <see langword="null" /> if no script is to be displayed</param>
+        void ChangeScript(Script? script);
+    }
+}

src/Artemis.Core/Plugins/ScriptingProviders/ScriptConfiguration.cs

@@ -9,6 +9,7 @@ namespace Artemis.Core.ScriptingProviders
     public class ScriptConfiguration : CorePropertyChanged, IStorageModel
     {
         private bool _hasChanges;
+        private bool _isSuspended;
         private string _name;
         private string? _pendingScriptContent;
         private string? _scriptContent;
@@ -79,6 +80,16 @@ namespace Artemis.Core.ScriptingProviders
             }
         }
 
+        // TODO: Implement suspension
+        /// <summary>
+        ///     [NYI] Gets or sets a boolean indicating whether this configuration is suspended
+        /// </summary>
+        public bool IsSuspended
+        {
+            get => _isSuspended;
+            set => SetAndNotify(ref _isSuspended, value);
+        }
+
         /// <summary>
         ///     Gets or sets a boolean indicating whether this configuration has pending changes to it's
         ///     <see cref="ScriptContent" />

src/Artemis.Core/Plugins/ScriptingProviders/ScriptingProvider.cs

@@ -7,36 +7,10 @@ namespace Artemis.Core.ScriptingProviders
     /// <summary>
     ///     Allows you to implement and register your own scripting provider.
     /// </summary>
-    public abstract class ScriptingProvider<TGlobalScript, TProfileScript, TLayerScript, TPropertyScript> : ScriptingProvider
+    public abstract class ScriptingProvider<TGlobalScript, TProfileScript> : ScriptingProvider
         where TGlobalScript : GlobalScript
         where TProfileScript : ProfileScript
-        where TLayerScript : LayerScript
-        where TPropertyScript : PropertyScript
     {
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="GlobalScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreateGlobalScriptEditor(TGlobalScript script);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="ProfileScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreateProfileScriptEditor(TProfileScript script);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="LayerScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreateLayerScriptScriptEditor(TLayerScript script);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="PropertyScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreatePropertyScriptEditor(TPropertyScript script);
-
         #region Overrides of PluginFeature
 
         /// <inheritdoc />
@@ -52,69 +26,11 @@ namespace Artemis.Core.ScriptingProviders
 
         #region Overrides of ScriptingProvider
 
-        /// <inheritdoc />
-        internal override Type GlobalScriptType => typeof(TGlobalScript);
-
         /// <inheritdoc />
         internal override Type ProfileScriptType => typeof(TProfileScript);
 
         /// <inheritdoc />
-        internal override Type LayerScriptType => typeof(TLayerScript);
-
-        /// <inheritdoc />
-        internal override Type PropertyScriptType => typeof(TPropertyScript);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="GlobalScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public override IScriptEditorViewModel CreateGlobalScriptEditor(GlobalScript script)
-        {
-            if (script == null) throw new ArgumentNullException(nameof(script));
-            if (script.GetType() != GlobalScriptType)
-                throw new ArtemisCoreException($"This scripting provider only supports global scripts of type {GlobalScriptType.Name}");
-
-            return CreateGlobalScriptEditor((TGlobalScript) script);
-        }
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="ProfileScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public override IScriptEditorViewModel CreateProfileScriptEditor(ProfileScript script)
-        {
-            if (script == null) throw new ArgumentNullException(nameof(script));
-            if (script.GetType() != ProfileScriptType)
-                throw new ArtemisCoreException($"This scripting provider only supports profile scripts of type {ProfileScriptType.Name}");
-
-            return CreateProfileScriptEditor((TProfileScript) script);
-        }
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="LayerScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public override IScriptEditorViewModel CreateLayerScriptScriptEditor(LayerScript script)
-        {
-            if (script == null) throw new ArgumentNullException(nameof(script));
-            if (script.GetType() != LayerScriptType)
-                throw new ArtemisCoreException($"This scripting provider only supports layer scripts of type {LayerScriptType.Name}");
-
-            return CreateLayerScriptScriptEditor((TLayerScript) script);
-        }
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="PropertyScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public override IScriptEditorViewModel CreatePropertyScriptEditor(PropertyScript script)
-        {
-            if (script == null) throw new ArgumentNullException(nameof(script));
-            if (script.GetType() != PropertyScriptType)
-                throw new ArtemisCoreException($"This scripting provider only supports property scripts of type {PropertyScriptType.Name}");
-
-            return CreatePropertyScriptEditor((TPropertyScript) script);
-        }
+        internal override Type GlobalScriptType => typeof(TGlobalScript);
 
         #endregion
     }
@@ -123,7 +39,7 @@ namespace Artemis.Core.ScriptingProviders
     ///     Allows you to implement and register your own scripting provider.
     ///     <para>
     ///         Note: You can't implement this, implement
-    ///         <see cref="ScriptingProvider{TProfileScript,TLayerScript,TPropertyScript,TGlobalScript}" /> instead.
+    ///         <see cref="ScriptingProvider{TGlobalScript, TProfileScript}" /> instead.
     ///     </para>
     /// </summary>
     public abstract class ScriptingProvider : PluginFeature
@@ -139,44 +55,13 @@ namespace Artemis.Core.ScriptingProviders
         public ReadOnlyCollection<Script> Scripts => InternalScripts.AsReadOnly();
 
         internal abstract Type GlobalScriptType { get; }
-        internal abstract Type PropertyScriptType { get; }
-        internal abstract Type LayerScriptType { get; }
         internal abstract Type ProfileScriptType { get; }
         internal List<Script> InternalScripts { get; } = new();
 
         /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="GlobalScript" />
+        ///     Called when the UI needs a script editor for the specified <paramref name="scriptType" />
         /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreateGlobalScriptEditor(GlobalScript script);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="ProfileScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreateProfileScriptEditor(ProfileScript script);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="LayerScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreateLayerScriptScriptEditor(LayerScript script);
-
-        /// <summary>
-        ///     Called when the UI needs a script editor for a <see cref="PropertyScript" />
-        /// </summary>
-        /// <param name="script">The script the editor must edit</param>
-        public abstract IScriptEditorViewModel CreatePropertyScriptEditor(PropertyScript script);
-    }
-
-    /// <summary>
-    ///     Represents a view model containing a script editor
-    /// </summary>
-    public interface IScriptEditorViewModel
-    {
-        /// <summary>
-        ///     Gets the script this editor is editing
-        /// </summary>
-        Script Script { get; }
+        /// <param name="scriptType">The type of script the editor will host</param>
+        public abstract IScriptEditorViewModel CreateScriptEditor(ScriptType scriptType);
     }
 }

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/GlobalScript.cs

@@ -32,6 +32,9 @@ namespace Artemis.Core.ScriptingProviders
 
         #region Overrides of Script
 
+        /// <inheritdoc />
+        public override ScriptType ScriptType => ScriptType.Global;
+
         /// <inheritdoc />
         internal override void InternalCleanup()
         {

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/LayerScript.cs

@@ -1,74 +0,0 @@
-using SkiaSharp;
-
-namespace Artemis.Core.ScriptingProviders
-{
-    /// <summary>
-    ///     Represents a script bound to a specific <see cref="Layer" /> processed by a <see cref="ScriptingProvider" />.
-    /// </summary>
-    public abstract class LayerScript : Script
-    {
-        /// <inheritdoc />
-        protected LayerScript(Layer layer, ScriptConfiguration configuration) : base(configuration)
-        {
-            Layer = layer;
-            lock (Layer.Scripts)
-            {
-                Layer.Scripts.Add(this);
-            }
-        }
-
-        /// <summary>
-        ///     Gets the layer this script is bound to
-        /// </summary>
-        public Layer Layer { get; internal set; }
-
-        /// <summary>
-        ///     Called whenever the layer is about to update
-        /// </summary>
-        /// <param name="deltaTime">Seconds passed since last update</param>
-        public virtual void OnLayerUpdating(double deltaTime)
-        {
-        }
-
-        /// <summary>
-        ///     Called whenever the layer has been updated
-        /// </summary>
-        /// <param name="deltaTime">Seconds passed since last update</param>
-        public virtual void OnLayerUpdated(double deltaTime)
-        {
-        }
-
-        /// <summary>
-        ///     Called whenever the layer is about to render
-        /// </summary>
-        /// <param name="canvas">The layer canvas</param>
-        /// <param name="bounds">The area to be filled, covers the shape</param>
-        /// <param name="paint">The paint to be used to fill the shape</param>
-        public virtual void OnLayerRendering(SKCanvas canvas, SKRect bounds, SKPaint paint)
-        {
-        }
-
-        /// <summary>
-        ///     Called whenever the layer has been rendered
-        /// </summary>
-        /// <param name="canvas">The layer canvas</param>
-        /// <param name="bounds">The area to be filled, covers the shape</param>
-        /// <param name="paint">The paint to be used to fill the shape</param>
-        public virtual void OnLayerRendered(SKCanvas canvas, SKRect bounds, SKPaint paint)
-        {
-        }
-
-        #region Overrides of Script
-
-        /// <inheritdoc />
-        internal override void InternalCleanup()
-        {
-            lock (Layer.Scripts)
-            {
-                Layer.Scripts.Remove(this);
-            }
-        }
-
-        #endregion
-    }
-}

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/ProfileScript.cs

@@ -58,6 +58,9 @@ namespace Artemis.Core.ScriptingProviders
 
         #region Overrides of Script
 
+        /// <inheritdoc />
+        public override ScriptType ScriptType => ScriptType.Profile;
+
         /// <inheritdoc />
         internal override void InternalCleanup()
         {

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/PropertyScript.cs

@@ -1,53 +0,0 @@
-namespace Artemis.Core.ScriptingProviders
-{
-    /// <summary>
-    ///     Represents a script bound to a specific <see cref="LayerProperty{T}" /> processed by a
-    ///     <see cref="ScriptingProvider" />.
-    /// </summary>
-    public abstract class PropertyScript : Script
-    {
-        /// <inheritdoc />
-        protected PropertyScript(ILayerProperty layerProperty, ScriptConfiguration configuration) : base(configuration)
-        {
-            LayerProperty = layerProperty;
-            lock (LayerProperty.Scripts)
-            {
-                LayerProperty.Scripts.Add(this);
-            }
-        }
-
-        /// <summary>
-        ///     Gets the layer property this script is bound to
-        /// </summary>
-        public ILayerProperty LayerProperty { get; }
-
-        /// <summary>
-        ///     Called whenever the property is about to update
-        /// </summary>
-        /// <param name="deltaTime">Seconds passed since last update</param>
-        public virtual void OnPropertyUpdating(double deltaTime)
-        {
-        }
-
-        /// <summary>
-        ///     Called whenever the property has been updated
-        /// </summary>
-        /// <param name="deltaTime">Seconds passed since last update</param>
-        public virtual void OnPropertyUpdated(double deltaTime)
-        {
-        }
-
-        #region Overrides of Script
-
-        /// <inheritdoc />
-        internal override void InternalCleanup()
-        {
-            lock (LayerProperty.Scripts)
-            {
-                LayerProperty.Scripts.Remove(this);    
-            }
-        }
-
-        #endregion
-    }
-}

src/Artemis.Core/Plugins/ScriptingProviders/Scripts/Script.cs

@@ -39,6 +39,11 @@ namespace Artemis.Core.ScriptingProviders
         /// </summary>
         public ScriptConfiguration ScriptConfiguration { get; }
 
+        /// <summary>
+        ///     Gets the script type of this script
+        /// </summary>
+        public abstract ScriptType ScriptType { get; }
+
         #region Event handlers
 
         private void ScriptConfigurationOnPropertyChanged(object? sender, PropertyChangedEventArgs e)
@@ -71,7 +76,7 @@ namespace Artemis.Core.ScriptingProviders
             ScriptConfiguration.PropertyChanged -= ScriptConfigurationOnPropertyChanged;
             ScriptConfiguration.Script = null;
             ScriptingProvider.InternalScripts.Remove(this);
-            
+
             // Can't trust those pesky plugin devs!
             InternalCleanup();
 
@@ -100,4 +105,20 @@ namespace Artemis.Core.ScriptingProviders
 
         #endregion
     }
+
+    /// <summary>
+    ///     Represents a type of script
+    /// </summary>
+    public enum ScriptType
+    {
+        /// <summary>
+        ///     A global script that's always active
+        /// </summary>
+        Global,
+
+        /// <summary>
+        ///     A script tied to a <see cref="Profile" />
+        /// </summary>
+        Profile,
+    }
 }

src/Artemis.Core/Services/Interfaces/IScriptingService.cs

@@ -18,8 +18,7 @@ namespace Artemis.Core.Services
         /// </summary>
         /// <param name="scriptConfiguration">The script configuration of the script</param>
         /// <returns>
-        ///     If the <see cref="ScriptingProvider" /> was found an instance of the script; otherwise <see langword="null" />
-        ///     .
+        ///     If the <see cref="ScriptingProvider" /> was found an instance of the script; otherwise <see langword="null" />.
         /// </returns>
         GlobalScript? CreateScriptInstance(ScriptConfiguration scriptConfiguration);
 
@@ -29,33 +28,10 @@ namespace Artemis.Core.Services
         /// <param name="profile">The profile the script configuration is configured for</param>
         /// <param name="scriptConfiguration">The script configuration of the script</param>
         /// <returns>
-        ///     If the <see cref="ScriptingProvider" /> was found an instance of the script; otherwise <see langword="null" />
-        ///     .
+        ///     If the <see cref="ScriptingProvider" /> was found an instance of the script; otherwise <see langword="null" />.
         /// </returns>
         ProfileScript? CreateScriptInstance(Profile profile, ScriptConfiguration scriptConfiguration);
-
-        /// <summary>
-        ///     Creates a <see cref="LayerScript" /> instance for the given <paramref name="scriptConfiguration" />
-        /// </summary>
-        /// <param name="layer">The layer the script configuration is configured fo</param>
-        /// <param name="scriptConfiguration">The script configuration of the script</param>
-        /// <returns>
-        ///     If the <see cref="ScriptingProvider" /> was found an instance of the script; otherwise <see langword="null" />
-        ///     .
-        /// </returns>
-        LayerScript? CreateScriptInstance(Layer layer, ScriptConfiguration scriptConfiguration);
-
-        /// <summary>
-        ///     Creates a <see cref="PropertyScript" /> instance for the given <paramref name="scriptConfiguration" />
-        /// </summary>
-        /// <param name="layerProperty">The layer property the script configuration is configured fo</param>
-        /// <param name="scriptConfiguration">The script configuration of the script</param>
-        /// <returns>
-        ///     If the <see cref="ScriptingProvider" /> was found an instance of the script; otherwise <see langword="null" />
-        ///     .
-        /// </returns>
-        PropertyScript? CreateScriptInstance(ILayerProperty layerProperty, ScriptConfiguration scriptConfiguration);
-
+        
         /// <summary>
         ///     Deletes the provided global script by it's configuration
         /// </summary>

src/Artemis.Core/Services/ScriptingService.cs

@@ -12,11 +12,13 @@ namespace Artemis.Core.Services
     internal class ScriptingService : IScriptingService
     {
         private readonly IPluginManagementService _pluginManagementService;
+        private readonly IProfileService _profileService;
         private List<ScriptingProvider> _scriptingProviders;
 
         public ScriptingService(IPluginManagementService pluginManagementService, IProfileService profileService)
         {
             _pluginManagementService = pluginManagementService;
+            _profileService = profileService;
 
             InternalGlobalScripts = new List<GlobalScript>();
 
@@ -27,7 +29,7 @@ namespace Artemis.Core.Services
             // No need to sub to Deactivated, scripts will deactivate themselves
             profileService.ProfileActivated += ProfileServiceOnProfileActivated;
 
-            foreach (ProfileConfiguration profileConfiguration in profileService.ProfileConfigurations)
+            foreach (ProfileConfiguration profileConfiguration in _profileService.ProfileConfigurations)
             {
                 if (profileConfiguration.Profile != null)
                     InitializeProfileScripts(profileConfiguration.Profile);
@@ -54,6 +56,12 @@ namespace Artemis.Core.Services
         private void PluginManagementServiceOnPluginFeatureToggled(object? sender, PluginFeatureEventArgs e)
         {
             _scriptingProviders = _pluginManagementService.GetFeaturesOfType<ScriptingProvider>();
+
+            foreach (ProfileConfiguration profileConfiguration in _profileService.ProfileConfigurations)
+            {
+                if (profileConfiguration.Profile != null)
+                    InitializeProfileScripts(profileConfiguration.Profile);
+            }
         }
 
         private void ProfileServiceOnProfileActivated(object? sender, ProfileConfigurationEventArgs e)
@@ -67,30 +75,6 @@ namespace Artemis.Core.Services
             // Initialize the scripts on the profile
             foreach (ScriptConfiguration scriptConfiguration in profile.ScriptConfigurations.Where(c => c.Script == null))
                 CreateScriptInstance(profile, scriptConfiguration);
-
-            foreach (Layer layer in profile.GetAllLayers())
-            {
-                // Initialize the scripts on the layers
-                foreach (ScriptConfiguration scriptConfiguration in layer.ScriptConfigurations.Where(c => c.Script == null))
-                    CreateScriptInstance(layer, scriptConfiguration);
-
-                // Initialize the scripts on the layer properties of layers
-                foreach (ILayerProperty layerProperty in layer.GetAllLayerProperties())
-                {
-                    foreach (ScriptConfiguration scriptConfiguration in layerProperty.ScriptConfigurations.Where(c => c.Script == null))
-                        CreateScriptInstance(layerProperty, scriptConfiguration);
-                }
-            }
-
-            foreach (Folder folder in profile.GetAllFolders())
-            {
-                // Initialize the scripts on the layer properties of folders
-                foreach (ILayerProperty layerProperty in folder.GetAllLayerProperties())
-                {
-                    foreach (ScriptConfiguration scriptConfiguration in layerProperty.ScriptConfigurations.Where(c => c.Script == null))
-                        CreateScriptInstance(layerProperty, scriptConfiguration);
-                }
-            }
         }
 
         public ReadOnlyCollection<GlobalScript> GlobalScripts => InternalGlobalScripts.AsReadOnly();
@@ -136,46 +120,6 @@ namespace Artemis.Core.Services
             return script;
         }
 
-        public LayerScript? CreateScriptInstance(Layer layer, ScriptConfiguration scriptConfiguration)
-        {
-            if (scriptConfiguration.Script != null)
-                throw new ArtemisCoreException("The provided script configuration already has an active script");
-
-            ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
-            if (provider == null)
-                return null;
-
-            LayerScript script = (LayerScript) provider.Plugin.Kernel!.Get(
-                provider.LayerScriptType,
-                CreateScriptConstructorArgument(provider.LayerScriptType, layer),
-                CreateScriptConstructorArgument(provider.LayerScriptType, scriptConfiguration)
-            );
-
-            script.ScriptingProvider = provider;
-            provider.InternalScripts.Add(script);
-            return script;
-        }
-
-        public PropertyScript? CreateScriptInstance(ILayerProperty layerProperty, ScriptConfiguration scriptConfiguration)
-        {
-            if (scriptConfiguration.Script != null)
-                throw new ArtemisCoreException("The provided script configuration already has an active script");
-
-            ScriptingProvider? provider = _scriptingProviders.FirstOrDefault(p => p.Id == scriptConfiguration.ScriptingProviderId);
-            if (provider == null)
-                return null;
-
-            PropertyScript script = (PropertyScript) provider.Plugin.Kernel!.Get(
-                provider.PropertyScriptType,
-                CreateScriptConstructorArgument(provider.PropertyScriptType, layerProperty),
-                CreateScriptConstructorArgument(provider.PropertyScriptType, scriptConfiguration)
-            );
-
-            script.ScriptingProvider = provider;
-            provider.InternalScripts.Add(script);
-            return script;
-        }
-
         /// <inheritdoc />
         public void DeleteScript(ScriptConfiguration scriptConfiguration)
         {