Fixed BuildingSpecification (#77)

Timberborn-Modding-Central · Jul 9, 2023 · aab1f68 · aab1f68
1 parent 0336960
commit aab1f68
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 35 deletions.
diff --git a/Core/TimberApi/BottomBarSystem/BottomBarPanel.cs b/Core/TimberApi/BottomBarSystem/BottomBarPanel.cs
@@ -2,18 +2,18 @@
 using System.Linq;
 using TimberApi.BottomBarUISystem;
 using TimberApi.Common.Extensions;
+using TimberApi.Common.SingletonSystem;
 using TimberApi.ToolGroupSystem;
 using TimberApi.ToolSystem;
 using Timberborn.BottomBarSystem;
 using Timberborn.Persistence;
-using Timberborn.SingletonSystem;
 using Timberborn.ToolSystem;
 using Timberborn.UILayoutSystem;
 using UnityEngine.UIElements;
 
 namespace TimberApi.BottomBarSystem
 {
-    public class BottomBarPanel : ILoadableSingleton
+    public class BottomBarPanel : ILateLoadableSingleton
     {
         private readonly SortedDictionary<int, VisualElement> _bottomBarPanels = new();
 
@@ -44,7 +44,7 @@ public BottomBarPanel(IEnumerable<BottomBarModule> bottomBarModules,
             _bottomBarService = bottomBarService;
         }
 
-        public void Load()
+        public void LateLoad()
         {
             SetupBottomBar();
             InitializeButtons();

diff --git a/Core/TimberApi/BottomBarSystem/BottomBarService.cs b/Core/TimberApi/BottomBarSystem/BottomBarService.cs
@@ -1,13 +1,14 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using TimberApi.Common.SingletonSystem;
 using TimberApi.ToolGroupSystem;
 using TimberApi.ToolSystem;
 using Timberborn.SingletonSystem;
 
 namespace TimberApi.BottomBarSystem
 {
-    public class BottomBarService : ILoadableSingleton
+    public class BottomBarService : ILateLoadableSingleton
     {
         private static readonly string BottomBarSection = "BottomBar";
 
@@ -31,7 +32,7 @@ public BottomBarService(
 
         public IEnumerable<BottomBarButton> ToolItemButtons => _toolItemButtons;
 
-        public void Load()
+        public void LateLoad()
         {
             _toolGroupSpecifications = _toolGroupSpecificationService
                 .GetBySection(BottomBarSection)

diff --git a/Core/TimberApi/SpecificationSystem/CustomSpecifications/Buildings/BuildingChangeApplier.cs b/Core/TimberApi/SpecificationSystem/CustomSpecifications/Buildings/BuildingChangeApplier.cs
@@ -9,17 +9,17 @@
 
 namespace TimberApi.SpecificationSystem.CustomSpecifications.Buildings
 {
-    internal class BuildingChanger : ILoadableSingleton
+    internal class BuildingChangeApplier : ILoadableSingleton
     {
         private readonly BuildingSpecificationService _buildingSpecificationService;
         private readonly ObjectCollectionService _objectCollectionService;
 
-        public BuildingChanger(ObjectCollectionService objectCollectionService, BuildingSpecificationService buildingSpecificationService)
+        public BuildingChangeApplier(ObjectCollectionService objectCollectionService, BuildingSpecificationService buildingSpecificationService)
         {
             _objectCollectionService = objectCollectionService;
             _buildingSpecificationService = buildingSpecificationService;
         }
-
+        
         public void Load()
         {
             foreach (var building in _objectCollectionService.GetAllMonoBehaviours<Building>())

diff --git a/Core/TimberApi/SpecificationSystem/CustomSpecifications/Buildings/BuildingSpecification.cs b/Core/TimberApi/SpecificationSystem/CustomSpecifications/Buildings/BuildingSpecification.cs
@@ -7,7 +7,7 @@ namespace TimberApi.SpecificationSystem.CustomSpecifications.Buildings
     ///     Represents the various settings that can be changed
     ///     on Buildings using TimberAPI
     /// </summary>
-    internal class BuildingSpecification
+    public class BuildingSpecification
     {
         public string BuildingId;
 

diff --git a/...i/SpecificationSystem/CustomSpecifications/Buildings/BuildingSpecificationConfigurator.cs b/...i/SpecificationSystem/CustomSpecifications/Buildings/BuildingSpecificationConfigurator.cs
@@ -13,7 +13,7 @@ public void Configure(IContainerDefinition containerDefinition)
             containerDefinition.Bind<BuildingSpecificationObjectDeserializer>().AsSingleton();
             containerDefinition.Bind<BuildingCostObjectDeserializer>().AsSingleton();
             containerDefinition.MultiBind<IObjectSpecificationGenerator>().To<BuildingSpecificationGenerator>().AsSingleton();
-            containerDefinition.Bind<BuildingChanger>().AsSingleton();
+            containerDefinition.Bind<BuildingChangeApplier>().AsSingleton();
         }
     }
 }
diff --git a/...berApi/SpecificationSystem/CustomSpecifications/Buildings/BuildingSpecificationService.cs b/...berApi/SpecificationSystem/CustomSpecifications/Buildings/BuildingSpecificationService.cs
@@ -35,7 +35,7 @@ public void Load()
         public BuildingSpecification? GetBuildingSpecificationByBuilding(Building building)
         {
             var prefab = building.GetComponentFast<Prefab>();
-            string prefabName = prefab.PrefabName.ToLower();
+            var prefabName = prefab.PrefabName.ToLower();
             return _buildingSpecifications.FirstOrDefault(x => x?.BuildingId.ToLower() == prefabName);
         }
     }

diff --git a/Core/TimberApi/SpecificationSystem/ObjectSpecificationGenerator.cs b/Core/TimberApi/SpecificationSystem/ObjectSpecificationGenerator.cs
@@ -14,9 +14,10 @@ public class ObjectSpecificationGenerator : ILoadableSingleton
 
         private readonly ObjectSpecificationCacheService _objectSpecificationCacheService;
 
-        public ObjectSpecificationGenerator(ObjectCollectionService objectCollectionService,
+        public ObjectSpecificationGenerator(
+            ObjectCollectionService objectCollectionService,
             IEnumerable<IObjectSpecificationGenerator> objectSpecificationGenerators,
-            SpecificationRepository specificationRepository, 
+            SpecificationRepository specificationRepository,
             ObjectSpecificationCacheService objectSpecificationCacheService)
         {
             _objectCollectionService = objectCollectionService;

diff --git a/Core/TimberApi/ToolGroupSystem/ToolGroupService.cs b/Core/TimberApi/ToolGroupSystem/ToolGroupService.cs
@@ -1,13 +1,13 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using TimberApi.Common.SingletonSystem;
 using TimberApi.ToolGroupUISystem;
-using Timberborn.SingletonSystem;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.ToolGroupSystem
 {
-    public class ToolGroupService : ILoadableSingleton
+    public class ToolGroupService : ILateLoadableSingleton
     {
         private readonly ToolGroupButtonFactoryService _toolGroupButtonFactoryService;
 
@@ -33,7 +33,7 @@ public ToolGroupService(
 
         public IEnumerable<ToolGroupButton> ToolGroupButtons => _toolGroupButtons.Select(pair => pair.Value).ToImmutableArray();
 
-        public void Load()
+        public void LateLoad()
         {
             var toolGroups = new Dictionary<string, IToolGroup>();
 

diff --git a/Core/TimberApi/ToolGroupSystem/ToolGroupSpecificationService.cs b/Core/TimberApi/ToolGroupSystem/ToolGroupSpecificationService.cs
@@ -1,24 +1,21 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using TimberApi.SpecificationSystem;
+using TimberApi.Common.SingletonSystem;
 using Timberborn.Persistence;
-using Timberborn.SingletonSystem;
+using UnityEngine;
 
 namespace TimberApi.ToolGroupSystem
 {
-    public class ToolGroupSpecificationService : ILoadableSingleton
+    public class ToolGroupSpecificationService : ILateLoadableSingleton
     {
         private readonly ISpecificationService _specificationService;
 
         private readonly ToolGroupSpecificationDeserializer _toolGroupSpecificationDeserializer;
 
         private ImmutableDictionary<string, ToolGroupSpecification> _toolGroupSpecifications = null!;
-
+        
         public ToolGroupSpecificationService(
-            // ReSharper disable once InconsistentNaming
-            // Required to prevent dependency loop or accessing before specifications are generated
-            ObjectSpecificationGenerator DEPENDENCY_ORDER_FIX,
             ISpecificationService specificationService,
             ToolGroupSpecificationDeserializer toolGroupSpecificationDeserializer)
         {
@@ -28,7 +25,7 @@ public ToolGroupSpecificationService(
 
         public ImmutableArray<ToolGroupSpecification> ToolGroupSpecifications => _toolGroupSpecifications.Select(pair => pair.Value).ToImmutableArray();
 
-        public void Load()
+        public void LateLoad()
         {
             _toolGroupSpecifications = _specificationService.GetSpecifications(_toolGroupSpecificationDeserializer).ToImmutableDictionary(specification => specification.Id.ToLower());
         }

diff --git a/Core/TimberApi/ToolSystem/ToolService.cs b/Core/TimberApi/ToolSystem/ToolService.cs
@@ -1,14 +1,14 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
+using TimberApi.Common.SingletonSystem;
 using TimberApi.ToolGroupSystem;
 using TimberApi.ToolUISystem;
-using Timberborn.SingletonSystem;
 using Timberborn.ToolSystem;
 
 namespace TimberApi.ToolSystem
 {
-    public class ToolService : ILoadableSingleton
+    public class ToolService : ILateLoadableSingleton
     {
         private readonly ToolButtonFactoryService _toolButtonFactoryService;
 
@@ -34,12 +34,12 @@ public ToolService(ToolSpecificationService toolSpecificationService, ToolFactor
 
         public IEnumerable<ToolButton> ToolButtons => _toolButtons.Select(pair => pair.Value).ToImmutableArray();
 
-        public void Load()
+        public void LateLoad()
         {
             var tools = new Dictionary<string, Tool>();
 
             var toolButtons = new Dictionary<string, ToolButton>();
-
+            
             foreach (var specification in _toolSpecificationService.ToolSpecifications)
             {
                 var toolFactory = _toolFactoryService.Get(specification.Type);

diff --git a/Core/TimberApi/ToolSystem/ToolSpecificationService.cs b/Core/TimberApi/ToolSystem/ToolSpecificationService.cs
@@ -2,13 +2,12 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
-using TimberApi.SpecificationSystem;
+using TimberApi.Common.SingletonSystem;
 using Timberborn.Persistence;
-using Timberborn.SingletonSystem;
 
 namespace TimberApi.ToolSystem
 {
-    public class ToolSpecificationService : ILoadableSingleton
+    public class ToolSpecificationService : ILateLoadableSingleton
     {
         private readonly ISpecificationService _specificationService;
 
@@ -17,9 +16,6 @@ public class ToolSpecificationService : ILoadableSingleton
         private ImmutableDictionary<string, ToolSpecification> _toolSpecifications = null!;
 
         public ToolSpecificationService(
-            // ReSharper disable once InconsistentNaming
-            // Required to prevent dependency loop or accessing before specifications are generated
-            ObjectSpecificationGenerator DEPENDENCY_ORDER_FIX,
             ISpecificationService specificationService,
             ToolSpecificationDeserializer toolSpecificationDeserializer)
         {
@@ -29,7 +25,7 @@ public ToolSpecificationService(
 
         public ImmutableArray<ToolSpecification> ToolSpecifications => _toolSpecifications.Select(pair => pair.Value).ToImmutableArray();
 
-        public void Load()
+        public void LateLoad()
         {
             _toolSpecifications = _specificationService.GetSpecifications(_toolSpecificationDeserializer).ToImmutableDictionary(specification => specification.Id.ToLower());
         }

diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,8 @@
 ## Unreleased
 
 ### Changes
+- Fixed BuildingSpecifications
+- Fixed dependency order in a correct way
 
 ## TimberAPI v0.5.5.5