Stable 0 5 7 0 fixes (#98)

* Added missing tools

* Updated gamelibs

* Fixed bottom bar scrolling

* Removed unused imports

Author: KYPremco

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
 {

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
 {

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

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
 {

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
 {

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;
         }
 

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);
+        }
+    }
+}

Core/TimberApi/LocalizationSystem/LocalizationFetcher.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;

Core/TimberApi/SpecificationSystem/SpecificationTypes/FileSpecification.cs

@@ -1,5 +1,4 @@
 using System.IO;
-using UnityEngine;
 
 namespace TimberApi.SpecificationSystem.SpecificationTypes
 {

Core/TimberApi/ToolGroupSystem/ToolGroupService.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;