From c975b5ae862ca7acd4250df5f1c8084844e0ffee Mon Sep 17 00:00:00 2001
From: iisaev <vpcoder@ya.ru>
Date: Thu, 29 Oct 2026 13:21:39 +0100
Subject: [PATCH] Build on tools_base and open only from the in-game toolbar

The provider no longer adds a main menu button; the edit suite quits through
ApplicationExit.
---
 manifest.json                                     | 2 +-
 src/CharacterEditorToolProvider.cs                | 9 ++-------
 test_suites/edit/src/CharacterEditorTestDriver.cs | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2071d96..147338b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
     "src/**/*.cs"
   ],
   "depends": [
-    "editor_tools>=1",
+    "tools_base>=1",
     "characters_base>=1",
     "ui_base>=1"
   ],
diff --git a/src/CharacterEditorToolProvider.cs b/src/CharacterEditorToolProvider.cs
index d1c30bc..0934c33 100644
--- a/src/CharacterEditorToolProvider.cs
+++ b/src/CharacterEditorToolProvider.cs
@@ -1,13 +1,11 @@
 using Cthangover.Core.UI.Tool;
-using Cthangover.Mods.Interface.Tool;
 using Godot;
 
 namespace Cthangover.Tools.CharactersEditor
 {
     /// <summary>
-    /// Registers the character editor as a tool: it appears in the main menu's tool
-    /// block and (with <see cref="CharacterEditorToolBoxButton"/>)
-    /// the in-game toolbar.
+    /// Registers the character editor window opened from the in-game toolbar
+    /// through <see cref="CharacterEditorToolBoxButton"/>.
     /// </summary>
     public class CharacterEditorToolProvider : IToolProvider
     {
@@ -19,8 +17,5 @@ namespace Cthangover.Tools.CharactersEditor
 
         /// <summary>Creates the window.</summary>
         public Window CreateWindow() => new CharacterEditorWindow();
-
-        /// <summary>Adds the launcher button to the main menu's tool block.</summary>
-        public void AddMenuButton(Container container) => ToolMenuButton.Attach(container, this);
     }
 }
diff --git a/test_suites/edit/src/CharacterEditorTestDriver.cs b/test_suites/edit/src/CharacterEditorTestDriver.cs
index 1e56e85..06f2ffe 100644
--- a/test_suites/edit/src/CharacterEditorTestDriver.cs
+++ b/test_suites/edit/src/CharacterEditorTestDriver.cs
@@ -215,7 +215,7 @@ namespace Cthangover.Tools.CharactersEditor.Tests
         {
             step = -1;
             GameLogger.Log("TEST", $"[TEST_RESULT] name=characters_editor_edit passed={passed} failed={failures.Count}");
-            GetTree().Quit(failures.Count == 0 ? 0 : 1);
+            Cthangover.Core.Bootstrap.ApplicationExit.Quit(GetTree(), failures.Count == 0 ? 0 : 1);
         }
     }
 }