Merge remote-tracking branch 'origin/main'

Timberborn-Modding-Central · Jan 21, 2024 · 4ca2a85 · 4ca2a85
2 parents 456db2f + 260755b
commit 4ca2a85
Show file tree

Hide file tree

Showing 27 changed files with 189 additions and 50 deletions.
diff --git a/Core/TimberApi.Core/BootstrapSystem/TimberApiBootstrapSystemConfigurator.cs b/Core/TimberApi.Core/BootstrapSystem/TimberApiBootstrapSystemConfigurator.cs
@@ -9,7 +9,6 @@
 using TimberApi.Core.LoggingSystem;
 using TimberApi.Core.ModLoaderSystem;
 using TimberApi.HarmonyPatcherSystem;
-using TimberApi.SceneSystem;
 
 namespace TimberApi.Core.BootstrapSystem
 {

diff --git a/Core/TimberApi.Core/ConsoleSystem/ConsoleSystemConfigurator.cs b/Core/TimberApi.Core/ConsoleSystem/ConsoleSystemConfigurator.cs
@@ -2,11 +2,8 @@
 using Bindito.Unity;
 using TimberApi.Common.ConsoleSystem;
 using TimberApi.Common.Helpers;
-using TimberApi.Common.LoggingSystem;
 using TimberApi.ConsoleSystem;
-using Timberborn.InputSystem;
 using UnityEngine;
-using UnityEngine.UIElements;
 
 namespace TimberApi.Core.ConsoleSystem
 {

diff --git a/Core/TimberApi/AssetSystem/AssetLoader.cs b/Core/TimberApi/AssetSystem/AssetLoader.cs
@@ -1,12 +1,10 @@
 using System;
-using System.Diagnostics;
 using System.Linq;
 using TimberApi.AssetSystem.Exceptions;
 using TimberApi.ShaderSystem;
 using Timberborn.Persistence;
 using Timberborn.SingletonSystem;
 using UnityEngine;
-using Debug = UnityEngine.Debug;
 using Object = UnityEngine.Object;
 
 namespace TimberApi.AssetSystem

diff --git a/Core/TimberApi/BottomBarSystem/BottomBarService.cs b/Core/TimberApi/BottomBarSystem/BottomBarService.cs
@@ -4,7 +4,6 @@
 using TimberApi.Common.SingletonSystem;
 using TimberApi.ToolGroupSystem;
 using TimberApi.ToolSystem;
-using Timberborn.SingletonSystem;
 
 namespace TimberApi.BottomBarSystem
 {

diff --git a/Core/TimberApi/BottomBarSystem/Patchers/ToolButtonPatcher.cs b/Core/TimberApi/BottomBarSystem/Patchers/ToolButtonPatcher.cs
@@ -1,9 +1,7 @@
 using HarmonyLib;
 using TimberApi.HarmonyPatcherSystem;
 using TimberApi.SceneSystem;
-using Timberborn.BuilderPrioritySystemUI;
 using Timberborn.ToolSystem;
-using UnityEngine;
 
 namespace TimberApi.BottomBarSystem.Patchers
 {

diff --git a/Core/TimberApi/BottomBarSystem/Patchers/ToolGroupButtonPatcher.cs b/Core/TimberApi/BottomBarSystem/Patchers/ToolGroupButtonPatcher.cs
@@ -7,9 +7,13 @@
 using TimberApi.HarmonyPatcherSystem;
 using TimberApi.SceneSystem;
 using TimberApi.ToolGroupSystem;
+using TimberApi.ToolSystem;
+using Timberborn.Common;
 using Timberborn.CoreUI;
+using Timberborn.CursorToolSystem;
 using Timberborn.Debugging;
 using Timberborn.ToolSystem;
+using UnityEngine;
 using UnityEngine.UIElements;
 
 namespace TimberApi.BottomBarSystem.Patchers
@@ -20,26 +24,22 @@ public class ToolGroupButtonPatcher : BaseHarmonyPatcher, ITimberApiLoadableSing
 
         private static BottomBarService _bottomBarService = null!;
 
-        private static DevModeManager _devModeManager = null!;
-
         private static readonly string ActiveClassName = "button--active";
 
         public override string UniqueId => "TimberApi.ToolGroupButton";
 
         public void Load()
         {
             _bottomBarService = DependencyContainer.GetInstance<BottomBarService>();
-            _devModeManager = DependencyContainer.GetInstance<DevModeManager>();
             _toolGroupService = DependencyContainer.GetInstance<ToolGroupService>();
         }
 
         public override void Apply(Harmony harmony)
         {
-
             harmony.Patch(
                 GetMethodInfo<ToolButtonService>(nameof(ToolButtonService.Add), new Type[] { typeof(ToolButton) }),
                 GetHarmonyMethod(nameof(AddPatch)));
-
+            
             harmony.Patch(
                 AccessTools.PropertyGetter(typeof(ToolGroupButton), nameof(ToolGroupButton.IsVisible)),
                 GetHarmonyMethod(nameof(ContainsToolPatch))
@@ -55,31 +55,21 @@ public override void Apply(Harmony harmony)
                 GetHarmonyMethod(nameof(OnToolGroupExited))
             );
         }
-        
+
         public static bool AddPatch(ToolButton toolButton, ToolButtonService __instance)
         {
-            if(toolButton.Tool?.Default == true)
+            __instance._toolButtons.Add(toolButton);
+
+            if (toolButton.Tool.ToolGroup != null)
             {
-                __instance._toolButtons.Insert(0, toolButton);
-            }
-            else
-            {
-                __instance._toolButtons.Insert(__instance._toolButtons.Count > 0 ? 1 : 0, toolButton);
+                return false;
             }
-            if (toolButton.Tool?.ToolGroup == null)
+
+            if (toolButton.Tool is not IUnselectableTool && toolButton.Tool is not CursorTool)
             {
-                if (toolButton.Root.Q<VisualElement>("ToolImage")?.style.backgroundImage.ToString() != "Options (UnityEngine.Sprite)")
-                {
-                    if (toolButton.Tool?.Default == true)
-                    {
-                        __instance._rootButtons.Insert(0, toolButton);
-                    }
-                    else
-                    {
-                        __instance._rootButtons.Insert(1, toolButton);
-                    }
-                }
+                __instance._rootButtons.Add(toolButton);
             }
+
             return false;
         }
 

diff --git a/Core/TimberApi/BottomBarSystem/Patchers/ToolbarButtonRetrieverPatcher.cs b/Core/TimberApi/BottomBarSystem/Patchers/ToolbarButtonRetrieverPatcher.cs
@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Linq;
+using HarmonyLib;
+using TimberApi.HarmonyPatcherSystem;
+using Timberborn.ToolSystem;
+
+namespace TimberApi.BottomBarSystem.Patchers
+{
+    public class ToolbarButtonRetrieverPatcher : BaseHarmonyPatcher
+    {
+        public override string UniqueId => "TimberApi.ToolButtonRetriever";
+
+        public override void Apply(Harmony harmony)
+        {
+            harmony.Patch(
+                GetMethodInfo<ToolbarButtonRetriever>(nameof(ToolbarButtonRetriever.TryGetPreviousVisibleButton)),
+                GetHarmonyMethod(nameof(TryGetPreviousVisibleButtonPatch))
+            );
+        }
+
+        public static bool TryGetPreviousVisibleButtonPatch(IEnumerable<IToolbarButton> buttons, out IToolbarButton? previousButton)
+        {
+            previousButton = null;
+            return buttons.Any(button => button.IsVisible);
+        }
+    }
+}
diff --git a/Core/TimberApi/LocalizationSystem/LocalizationFetcher.cs b/Core/TimberApi/LocalizationSystem/LocalizationFetcher.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

diff --git a/Core/TimberApi/SpecificationSystem/SpecificationTypes/FileSpecification.cs b/Core/TimberApi/SpecificationSystem/SpecificationTypes/FileSpecification.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using UnityEngine;
 
 namespace TimberApi.SpecificationSystem.SpecificationTypes
 {

diff --git a/Core/TimberApi/ToolGroupSystem/ToolGroupService.cs b/Core/TimberApi/ToolGroupSystem/ToolGroupService.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;

diff --git a/Core/TimberApi/ToolGroupSystem/ToolGroupSpecificationService.cs b/Core/TimberApi/ToolGroupSystem/ToolGroupSpecificationService.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using TimberApi.Common.SingletonSystem;
 using Timberborn.Persistence;
-using UnityEngine;
 
 namespace TimberApi.ToolGroupSystem
 {

diff --git a/Core/TimberApi/ToolGroupUISystem/ToolGroupButtonFactory.cs b/Core/TimberApi/ToolGroupUISystem/ToolGroupButtonFactory.cs
@@ -1,4 +1,5 @@
 using System;
+using TimberApi.ToolGroupSystem;
 using Timberborn.AssetSystem;
 using Timberborn.CoreUI;
 using Timberborn.Localization;
@@ -56,7 +57,7 @@ public ToolGroupButton Create(ToolGroup toolGroup, Sprite toolGroupImage, Sprite
                                                       visualElement.Q<VisualElement>("ToolButtons"), 
                                                       visualElement.Q<VisualElement>("ToolGroupButtonWrapper"));
             _eventBus.Register(toolGroupButton);
-            _toolButtonService.Add(toolGroupButton);
+            Add((IToolGroup)toolGroup, toolGroupButton);
             return toolGroupButton;
         }
 
@@ -84,5 +85,15 @@ private void OnButtonClick(VisualElement tooltip, ToolGroup toolGroup)
                 tooltip.parent.ToggleDisplayStyle(false);
             }
         }
+
+        private void Add(IToolGroup toolGroup, ToolGroupButton toolButton)
+        {
+            _toolButtonService._toolGroupButtons.Add(toolButton);
+
+            if (toolGroup.GroupId == null)
+            {
+                _toolButtonService._rootButtons.Add(toolButton);
+            }
+        }
     }
 }
diff --git a/Core/TimberApi/ToolSystem/IUnselectableTool.cs b/Core/TimberApi/ToolSystem/IUnselectableTool.cs
@@ -0,0 +1,7 @@
+namespace TimberApi.ToolSystem
+{
+    public interface IUnselectableTool
+    {
+
+    }
+}
diff --git a/Core/TimberApi/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolFactory.cs b/Core/TimberApi/ToolSystem/Tools/BuilderPriority/BuilderPriorityToolFactory.cs
@@ -17,7 +17,10 @@ public BuilderPriorityToolFactory(TimberbornBuilderPriorityToolFactory builderPr
 
         protected override Tool CreateTool(ToolSpecification toolSpecification, BuilderPriorityToolToolInformation toolInformation, ToolGroup? toolGroup)
         {
-            return _builderPriorityToolFactory.Create(toolInformation.Priority);
+            var priorityTool = _builderPriorityToolFactory.Create(toolInformation.Priority);
+            priorityTool.ToolGroup = toolGroup;
+
+            return priorityTool;
         }
 
         protected override BuilderPriorityToolToolInformation DeserializeToolInformation(IObjectLoader objectLoader)

diff --git a/Core/TimberApi/ToolSystem/Tools/Demolishing/DeleteRubbleToolFactory.cs b/Core/TimberApi/ToolSystem/Tools/Demolishing/DeleteRubbleToolFactory.cs
@@ -0,0 +1,23 @@
+using Timberborn.RecoveredGoodSystemUI;
+using Timberborn.ToolSystem;
+
+namespace TimberApi.ToolSystem.Tools.Demolishing
+{
+    public class DeleteRubbleToolFactory : IToolFactory
+    {
+        public string Id => "DeleteRecoveredGoodStackTool";
+
+        private readonly RecoveredGoodStackDeletionTool _recoveredGoodStackDeletionTool;
+
+        public DeleteRubbleToolFactory(RecoveredGoodStackDeletionTool recoveredGoodStackDeletionTool)
+        {
+            _recoveredGoodStackDeletionTool = recoveredGoodStackDeletionTool;
+        }
+
+        public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+        {
+            _recoveredGoodStackDeletionTool.Initialize(toolGroup);
+            return _recoveredGoodStackDeletionTool;
+        }
+    }
+}
diff --git a/Core/TimberApi/ToolSystem/Tools/Demolishing/DemolishingToolConfigurator.cs b/Core/TimberApi/ToolSystem/Tools/Demolishing/DemolishingToolConfigurator.cs
@@ -14,6 +14,7 @@ public void Configure(IContainerDefinition containerDefinition)
             containerDefinition.MultiBind<IToolFactory>().To<DemolishableSelectionToolFactory>().AsSingleton();
             containerDefinition.MultiBind<IToolFactory>().To<EntityBlockObjectDeletionToolFactory>().AsSingleton();
             containerDefinition.MultiBind<IToolFactory>().To<BuildingDeconstructionToolFactory>().AsSingleton();
+            containerDefinition.MultiBind<IToolFactory>().To<DeleteRubbleToolFactory>().AsSingleton();
             containerDefinition.MultiBind<ISpecificationGenerator>().To<DemolishingToolGenerator>().AsSingleton();
         }
     }

diff --git a/Core/TimberApi/ToolSystem/Tools/Demolishing/DemolishingToolGenerator.cs b/Core/TimberApi/ToolSystem/Tools/Demolishing/DemolishingToolGenerator.cs
@@ -11,6 +11,7 @@ public IEnumerable<ISpecification> Generate()
         {
             yield return CreateDemolishingToolGroup();
             yield return DemolishableSelectionTool();
+            yield return DeleteRecoveredGoodStackTool();
             yield return DemolishableUnselectionTool();
             yield return BuildingDeconstructionTool();
             yield return EntityBlockObjectDeletionTool();
@@ -24,7 +25,7 @@ private static GeneratedSpecification EntityBlockObjectDeletionTool()
                 GroupId = "Demolishing",
                 Type = "EntityBlockObjectDeletionTool",
                 Layout = "Default",
-                Order = 20,
+                Order = 30,
                 NameLocKey = "CAN NOT BE MODIFIED",
                 DescriptionLocKey = "CAN NOT BE MODIFIED",
                 Icon = "Sprites/BottomBar/DeleteObjectIcon",
@@ -34,6 +35,25 @@ private static GeneratedSpecification EntityBlockObjectDeletionTool()
 
             return new GeneratedSpecification(json, "EntityBlockObjectDeletion", "ToolSpecification");
         }
+
+        private static GeneratedSpecification DeleteRecoveredGoodStackTool()
+        {
+            var json = JsonConvert.SerializeObject(new
+            {
+                Id = "DeleteRecoveredGoodStack",
+                GroupId = "Demolishing",
+                Type = "DeleteRecoveredGoodStackTool",
+                Layout = "Default",
+                Order = 10,
+                NameLocKey = "CAN NOT BE MODIFIED",
+                DescriptionLocKey = "CAN NOT BE MODIFIED",
+                Icon = "Sprites/BottomBar/DeleteRecoveredGoodStackToolIcon",
+                DevMode = false,
+                Hidden = false,
+            });
+
+            return new GeneratedSpecification(json, "EntityBlockObjectDeletion", "ToolSpecification");
+        }
 
         private static GeneratedSpecification BuildingDeconstructionTool()
         {
@@ -62,7 +82,7 @@ private static GeneratedSpecification DemolishableSelectionTool()
                 GroupId = "Demolishing",
                 Type = "DemolishableSelectionTool",
                 Layout = "Default",
-                Order = 10,
+                Order = 20,
                 NameLocKey = "CAN NOT BE MODIFIED",
                 DescriptionLocKey = "CAN NOT BE MODIFIED",
                 Icon = "Sprites/BottomBar/DemolishResourcesTool",

diff --git a/Core/TimberApi/ToolSystem/Tools/SettingBox/SettingBoxTool.cs b/Core/TimberApi/ToolSystem/Tools/SettingBox/SettingBoxTool.cs
@@ -4,7 +4,7 @@
 
 namespace TimberApi.ToolSystem.Tools.SettingBox
 {
-    public class SettingBoxTool : Tool
+    public class SettingBoxTool : Tool, IUnselectableTool
     {
         private readonly ToolGroupManager _toolGroupManager;
 

diff --git a/Core/TimberApi/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaSelectionToolFactory.cs b/Core/TimberApi/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaSelectionToolFactory.cs
@@ -16,6 +16,8 @@ public TreeCuttingAreaSelectionToolFactory(TreeCuttingAreaSelectionTool treeCutt
 
         public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
         {
+            _treeCuttingAreaSelectionTool.ToolGroup = toolGroup;
+
             return _treeCuttingAreaSelectionTool;
         }
     }

diff --git a/Core/TimberApi/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaUnselectionToolFactory.cs b/Core/TimberApi/ToolSystem/Tools/TreeCuttingArea/TreeCuttingAreaUnselectionToolFactory.cs
@@ -17,6 +17,8 @@ public TreeCuttingAreaUnselectionToolFactory(TreeCuttingAreaUnselectionTool tree
 
         public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
         {
+            _treeCuttingAreaUnselectionTool.ToolGroup = toolGroup;
+
             return _treeCuttingAreaUnselectionTool;
         }
     }

diff --git a/Core/TimberApi/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolConfigurator.cs b/Core/TimberApi/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolConfigurator.cs
@@ -0,0 +1,17 @@
+using Bindito.Core;
+using TimberApi.ConfiguratorSystem;
+using TimberApi.SceneSystem;
+using TimberApi.SpecificationSystem;
+
+namespace TimberApi.ToolSystem.Tools.WaterGenerator
+{
+    [Configurator(SceneEntrypoint.InGame)]
+    public class WaterGeneratorToolConfigurator : IConfigurator
+    {
+        public void Configure(IContainerDefinition containerDefinition)
+        {
+            containerDefinition.MultiBind<IToolFactory>().To<WaterGeneratorToolFactory>().AsSingleton();
+            containerDefinition.MultiBind<ISpecificationGenerator>().To<WaterGeneratorToolGenerator>().AsSingleton();
+        }
+    }
+}
diff --git a/Core/TimberApi/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolFactory.cs b/Core/TimberApi/ToolSystem/Tools/WaterGenerator/WaterGeneratorToolFactory.cs
@@ -0,0 +1,23 @@
+using Timberborn.ToolSystem;
+using Timberborn.WaterBrushesUI;
+
+namespace TimberApi.ToolSystem.Tools.WaterGenerator
+{
+    public class WaterGeneratorToolFactory : IToolFactory
+    {
+        public string Id => "WaterGeneratorTool";
+
+        private readonly WaterHeightBrushTool _waterHeightBrushTool;
+
+        public WaterGeneratorToolFactory(WaterHeightBrushTool waterHeightBrushTool)
+        {
+            _waterHeightBrushTool = waterHeightBrushTool;
+        }
+
+        public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
+        {
+            _waterHeightBrushTool.ToolGroup = toolGroup;
+            return _waterHeightBrushTool;
+        }
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up @@
             public Tool Create(ToolSpecification toolSpecification, ToolGroup? toolGroup = null)
             {
+                _treeCuttingAreaSelectionTool.ToolGroup = toolGroup;
                 return _treeCuttingAreaSelectionTool;
             }
         }
@@ Expand Down @@