Merge pull request #33 from Timberborn-Modding-Central/0.5.0.1

0.5.0.0-rc.2

Core/TimberApi.Common/Extensions/AssemblyExtensions.cs

@@ -11,5 +11,10 @@ public static IEnumerable<Type> GetTypesWithInterface<TInterface>(this Assembly
         {
             return assembly.GetTypes().Where(x => typeof(TInterface).IsAssignableFrom(x) && !x.IsInterface && !x.IsAbstract);
         }
+
+        public static IEnumerable<Type> GetTypesByAttribute<TAttribute>(this Assembly assembly) where TAttribute : class
+        {
+            return assembly.GetTypes().Where(type => type.IsDefined(typeof(TAttribute)));
+        }
     }
 }

Core/TimberApi.Common/SingletonSystem/ITimberApiLoadableSingleton.cs

@@ -0,0 +1,10 @@
+using Timberborn.SingletonSystem;
+
+namespace TimberApi.Common.SingletonSystem
+{
+    [Singleton]
+    public interface ITimberApiLoadableSingleton
+    {
+        void Load();
+    }
+}

Core/TimberApi.Common/SingletonSystem/ITimberApiPostLoadableSingleton.cs

@@ -0,0 +1,10 @@
+using Timberborn.SingletonSystem;
+
+namespace TimberApi.Common.SingletonSystem
+{
+    [Singleton]
+    public interface ITimberApiPostLoadableSingleton
+    {
+        void PostLoad();
+    }
+}

Core/TimberApi.Common/SingletonSystem/ITimberApiPreLoadableSingleton.cs

@@ -0,0 +1,10 @@
+using Timberborn.SingletonSystem;
+
+namespace TimberApi.Common.SingletonSystem
+{
+    [Singleton]
+    public interface ITimberApiPreLoadableSingleton
+    {
+        void PreLoad();
+    }
+}

Core/TimberApi.Core/BootstrapSystem/BootstrapPatch.cs → Core/TimberApi.Core/BootstrapSystem/BootstrapPatcher.cs

@@ -7,15 +7,16 @@
 
 namespace TimberApi.Core.BootstrapSystem
 {
-    internal static class BootstrapPatch
+    internal static class BootstrapPatcher
     {
-        public static void Apply()
+        public static void Patch()
         {
             try
             {
                 var harmony = new Harmony("TimberApi.bootstrapper");
 
-                harmony.Patch(AccessTools.Method(typeof(BootstrapperConfigurator), "Configure"), new HarmonyMethod(AccessTools.Method(typeof(BootstrapPatch), nameof(BootstrapperConfiguratorPatch))));
+                harmony.Patch(AccessTools.Method(typeof(BootstrapperConfigurator), "Configure"),
+                    new HarmonyMethod(AccessTools.Method(typeof(BootstrapPatcher), nameof(BootstrapperConfiguratorPatch))));
             }
             catch (Exception e)
             {

Core/TimberApi.Core/BootstrapSystem/TimberApiBootstrapSystemConfigurator.cs

@@ -3,11 +3,14 @@
 using Bindito.Core;
 using Bindito.Unity;
 using TimberApi.Common;
-using TimberApi.Common.SingletonSystem;
 using TimberApi.Core.ConfigSystem;
+using TimberApi.Core.ConfiguratorSystem;
 using TimberApi.Core.ConsoleSystem;
 using TimberApi.Core.LoggingSystem;
 using TimberApi.Core.ModLoaderSystem;
+using TimberApi.Core.SingletonSystem;
+using TimberApi.LocalizationSystem;
+using TimberApi.SpecificationSystem;
 
 namespace TimberApi.Core.BootstrapSystem
 {
@@ -21,7 +24,11 @@ private void Awake()
             {
                 Instance = this;
                 AddPrefabConfigurators();
-                BootstrapPatch.Apply();
+                BootstrapPatcher.Patch();
+                ConfiguratorPatcher.Patch();
+                LocalizationPatcher.Patch();
+                SpecificationPatcher.Patch();
+                SingletonSystemPatcher.Patch();
             }
             catch (Exception e)
             {
@@ -37,20 +44,13 @@ public override void Configure(IContainerDefinition containerDefinition)
             containerDefinition.Install(GetInstanceFromPrefab<ConsoleSystemConfigurator>());
             containerDefinition.Install(GetInstanceFromPrefab<ModLoaderSystemConfigurator>());
             containerDefinition.Install(new ConfigSystemConfigurator());
+            containerDefinition.Install(new ConfiguratorSystemConfigurator());
 
             // Start runner
             containerDefinition.Bind<TimberApiCoreRunner>().AsSingleton();
 
             // TimberAPI Initialization
-            containerDefinition.Bind<ISingletonRepository>().To<SingletonRepository>().AsSingleton();
-            var instance = new SingletonListener();
-            containerDefinition.Bind<SingletonListener>().ToInstance(instance);
-            containerDefinition.AddInjectionListener(instance);
-            containerDefinition.AddProvisionListener(instance);
-
             containerDefinition.Install(new BootstrapConfigurator());
-
-            containerDefinition.Bind<SingletonRunner>().AsSingleton();
         }
 
         private void AddPrefabConfigurators()