From d03fa51010f819a53e2a53b9e9bc9b6ef085c0e9 Mon Sep 17 00:00:00 2001
From: Syntriax <syntriax@gmail.com>
Date: Mon, 21 Nov 2022 21:51:27 +0300
Subject: [PATCH] Factory Update

---
 Config/MovementDefinitionFactory.cs | 21 ++++++++++-----------
 Config/MovementFactory.cs           |  6 ++----
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Config/MovementDefinitionFactory.cs b/Config/MovementDefinitionFactory.cs
index a67afc5..9ac619d 100644
--- a/Config/MovementDefinitionFactory.cs
+++ b/Config/MovementDefinitionFactory.cs
@@ -28,6 +28,7 @@ namespace Syntriax.Modules.Movement.Config
             }
         }
 
+
         private void Start()
         {
             if (FactorySingleton<MovementDefinitionFactory>.Instance == this)
@@ -43,17 +44,23 @@ namespace Syntriax.Modules.Movement.Config
         /// <para> Automatically loads the definition files specificed path <see cref="ResourceDirectoryToDefinitions"/></para>
         /// <para> The default is "Resources/Modules/Syntriax/Movement/Definitions/"</para>
         /// </remarks>
-        public override void Initialize()
+        protected override void OnFactoryInitialize()
         {
             if (_definitions == null)
                 _definitions = new Dictionary<string, MovementDefinition>(InitialCapacity);
 
-            Reset();
-
             foreach (TextAsset definitionTextAsset in UnityEngine.Resources.LoadAll<TextAsset>(ResourceDirectoryToDefinitions))
                 AddToFactoryWithJSON(definitionTextAsset.text);
         }
 
+        /// <summary>
+        /// Clears all the definitions in the factory
+        /// </summary>
+        /// <remarks>
+        /// Does not reinitialize, please call <see cref="Initialize"/> to initialize it back
+        /// </remarks>
+        protected override void OnFactoryReset() => _definitions?.Clear();
+
         /// <summary>
         /// Manually registers a <see cref="MovementDefinition"/> to the factory with a JSON <see cref="string"/>
         /// </summary>
@@ -64,14 +71,6 @@ namespace Syntriax.Modules.Movement.Config
             AddDefinitionToFactory(movementDefinition);
         }
 
-        /// <summary>
-        /// Clears all the definitions in the factory
-        /// </summary>
-        /// <remarks>
-        /// Does not reinitialize, please call <see cref="Initialize"/> to initialize it back
-        /// </remarks>
-        public override void Reset() => _definitions?.Clear();
-
         /// <summary>
         /// Registers a list of <see cref="MovementDefinition"/>s to the factory
         /// </summary>
diff --git a/Config/MovementFactory.cs b/Config/MovementFactory.cs
index 8e94ccd..0faf474 100644
--- a/Config/MovementFactory.cs
+++ b/Config/MovementFactory.cs
@@ -33,18 +33,16 @@ namespace Syntriax.Modules.Movement.Config
             Destroy(this);
         }
 
-        public override void Initialize()
+        protected override void OnFactoryInitialize()
         {
             if (_types == null)
                 _types = new Dictionary<string, Type>(InitialCapacity);
 
-            Reset();
-
             foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
                 AddAssemblyToFactory(assembly);
         }
 
-        public override void Reset() => _types?.Clear();
+        protected override void OnFactoryReset() => _types?.Clear();
 
         public void AddAssemblyToFactory(Assembly assembly)
         {