From f4765825bebf4f2c672b86a04c145c38937deafa Mon Sep 17 00:00:00 2001 From: nnra6864 Date: Tue, 31 Mar 2026 02:57:39 +0200 Subject: [PATCH 1/6] 6.5 Fixes --- .../Editor/ToolboxEditorHandler.cs | 20 ++++++++++++++++++- .../Editor/ToolboxEditorHierarchy.cs | 9 +++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs index ab5a9414..a446a8b7 100644 --- a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs +++ b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs @@ -1,6 +1,11 @@ using System; using System.Collections.Generic; +// NOTE: Needed for EntityId +#if UNITY_6000_5_OR_NEWER +using UnityEngine; +#endif + namespace Toolbox.Editor { using Editor = UnityEditor.Editor; @@ -8,17 +13,30 @@ namespace Toolbox.Editor public static class ToolboxEditorHandler { +#if UNITY_6000_5_OR_NEWER + private static EntityId lastCachedEditorId; +#else private static int lastCachedEditorId; +#endif private static Editor lastCachedEditor; private static readonly Stack cachedEditors = new Stack(); private static void OnBeginEditor(Editor editor) { //NOTE: it means that last Editor was null or disposed, anyway we probably want to reload drawers-related cache - if (lastCachedEditor == null || lastCachedEditorId != lastCachedEditor.GetInstanceID()) +#if UNITY_6000_5_OR_NEWER + var lastId = lastCachedEditor.GetEntityId(); +#else + var lastId = lastCachedEditor.GetInstanceID(); +#endif + if (lastCachedEditor == null || lastCachedEditorId != lastId) { lastCachedEditor = editor; +#if UNITY_6000_5_OR_NEWER + lastCachedEditorId = editor.GetEntityId(); +#else lastCachedEditorId = editor.GetInstanceID(); +#endif OnEditorReload?.Invoke(); } diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs index 5f947558..278966a7 100644 --- a/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs +++ b/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs @@ -26,8 +26,13 @@ internal enum LabelType static ToolboxEditorHierarchy() { +#if UNITY_6000_5_OR_NEWER + EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= OnItemCallback; + EditorApplication.hierarchyWindowItemByEntityIdOnGUI += OnItemCallback; +#else EditorApplication.hierarchyWindowItemOnGUI -= OnItemCallback; EditorApplication.hierarchyWindowItemOnGUI += OnItemCallback; +#endif } /// @@ -38,7 +43,11 @@ static ToolboxEditorHierarchy() /// /// Tries to display item label in the Hierarchy Window. /// +#if UNITY_6000_5_OR_NEWER + private static void OnItemCallback(EntityId instanceId, Rect rect) +#else private static void OnItemCallback(int instanceId, Rect rect) +#endif { if (!IsOverlayAllowed) { From b479ab8e0fd8367c2b87dc3056230e3eb0b54cce Mon Sep 17 00:00:00 2001 From: nnra6864 Date: Wed, 1 Apr 2026 01:41:47 +0200 Subject: [PATCH 2/6] Lowered min ver for entity id to 6.4 --- Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs | 8 ++++---- Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs index a446a8b7..2b3b447e 100644 --- a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs +++ b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; // NOTE: Needed for EntityId -#if UNITY_6000_5_OR_NEWER +#if UNITY_6000_4_OR_NEWER using UnityEngine; #endif @@ -13,7 +13,7 @@ namespace Toolbox.Editor public static class ToolboxEditorHandler { -#if UNITY_6000_5_OR_NEWER +#if UNITY_6000_4_OR_NEWER private static EntityId lastCachedEditorId; #else private static int lastCachedEditorId; @@ -24,7 +24,7 @@ public static class ToolboxEditorHandler private static void OnBeginEditor(Editor editor) { //NOTE: it means that last Editor was null or disposed, anyway we probably want to reload drawers-related cache -#if UNITY_6000_5_OR_NEWER +#if UNITY_6000_4_OR_NEWER var lastId = lastCachedEditor.GetEntityId(); #else var lastId = lastCachedEditor.GetInstanceID(); @@ -32,7 +32,7 @@ private static void OnBeginEditor(Editor editor) if (lastCachedEditor == null || lastCachedEditorId != lastId) { lastCachedEditor = editor; -#if UNITY_6000_5_OR_NEWER +#if UNITY_6000_4_OR_NEWER lastCachedEditorId = editor.GetEntityId(); #else lastCachedEditorId = editor.GetInstanceID(); diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs index 278966a7..a11f4294 100644 --- a/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs +++ b/Assets/Editor Toolbox/Editor/ToolboxEditorHierarchy.cs @@ -26,7 +26,7 @@ internal enum LabelType static ToolboxEditorHierarchy() { -#if UNITY_6000_5_OR_NEWER +#if UNITY_6000_4_OR_NEWER EditorApplication.hierarchyWindowItemByEntityIdOnGUI -= OnItemCallback; EditorApplication.hierarchyWindowItemByEntityIdOnGUI += OnItemCallback; #else @@ -43,7 +43,7 @@ static ToolboxEditorHierarchy() /// /// Tries to display item label in the Hierarchy Window. /// -#if UNITY_6000_5_OR_NEWER +#if UNITY_6000_4_OR_NEWER private static void OnItemCallback(EntityId instanceId, Rect rect) #else private static void OnItemCallback(int instanceId, Rect rect) From 9cf6f908f4c2af61b9f2cd81fb53a4e7e23bc1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Matkowski?= Date: Sat, 11 Apr 2026 17:12:25 +0200 Subject: [PATCH 3/6] Fix NRE when checking lastCachedEditor in the ToolboxEditorHandler --- Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs index 2b3b447e..35abd164 100644 --- a/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs +++ b/Assets/Editor Toolbox/Editor/ToolboxEditorHandler.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; - // NOTE: Needed for EntityId #if UNITY_6000_4_OR_NEWER using UnityEngine; @@ -23,12 +22,12 @@ public static class ToolboxEditorHandler private static void OnBeginEditor(Editor editor) { - //NOTE: it means that last Editor was null or disposed, anyway we probably want to reload drawers-related cache #if UNITY_6000_4_OR_NEWER - var lastId = lastCachedEditor.GetEntityId(); + var lastId = lastCachedEditor != null ? lastCachedEditor.GetEntityId() : default; #else - var lastId = lastCachedEditor.GetInstanceID(); + var lastId = lastCachedEditor != null ? lastCachedEditor.GetInstanceID() : default; #endif + //NOTE: it means that last Editor was null or disposed, anyway we probably want to reload drawers-related cache if (lastCachedEditor == null || lastCachedEditorId != lastId) { lastCachedEditor = editor; From eeb43d95739d7e8b1599927bf7d1192bbd9aa1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Matkowski?= Date: Sat, 11 Apr 2026 17:12:55 +0200 Subject: [PATCH 4/6] Change test Project version to Unity 2022.3.62f2 --- Packages/manifest.json | 19 +++---- Packages/packages-lock.json | 85 ++++++++++++++++++++---------- ProjectSettings/ProjectVersion.txt | 4 +- ProjectSettings/boot.config | 0 4 files changed, 70 insertions(+), 38 deletions(-) delete mode 100644 ProjectSettings/boot.config diff --git a/Packages/manifest.json b/Packages/manifest.json index 794f1ad1..6ac3ddc0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,17 +2,18 @@ "dependencies": { "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.analytics": "3.6.12", - "com.unity.collab-proxy": "2.0.0", + "com.unity.ai.navigation": "1.1.6", + "com.unity.analytics": "3.8.1", + "com.unity.collab-proxy": "2.7.1", "com.unity.editorcoroutines": "1.0.0", - "com.unity.ide.rider": "3.0.18", - "com.unity.ide.visualstudio": "2.0.17", - "com.unity.test-framework": "1.1.31", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.6.4", - "com.unity.toolchain.win-x86_64-linux-x86_64": "1.0.0", + "com.unity.ide.rider": "3.0.36", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.7", + "com.unity.timeline": "1.7.7", + "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.4", "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.10", + "com.unity.xr.legacyinputhelpers": "2.1.12", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 12bc5cc1..37acd3a5 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -10,19 +10,32 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.ai.navigation": { + "version": "1.1.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" }, "com.unity.analytics": { - "version": "3.6.12", + "version": "3.8.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" }, "url": "https://packages.unity.com" }, "com.unity.collab-proxy": { - "version": "2.0.0", + "version": "2.7.1", "depth": 0, "source": "registry", "dependencies": {}, @@ -43,7 +56,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.18", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -52,7 +65,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.17", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -60,24 +73,53 @@ }, "url": "https://packages.unity.com" }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 3, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "6.0.3", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.12.4", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.14.0", + "depth": 2, + "source": "registry", + "dependencies": { + "com.unity.modules.androidjni": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.sysroot": { - "version": "1.0.0", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.sysroot.linux-x86_64": { - "version": "1.0.0", + "version": "2.0.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.sysroot": "1.0.0" + "com.unity.sysroot": "2.0.5" }, "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.31", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { @@ -88,7 +130,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.6", + "version": "3.0.7", "depth": 0, "source": "registry", "dependencies": { @@ -97,7 +139,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.6.4", + "version": "1.7.7", "depth": 0, "source": "registry", "dependencies": { @@ -109,12 +151,12 @@ "url": "https://packages.unity.com" }, "com.unity.toolchain.win-x86_64-linux-x86_64": { - "version": "1.0.0", + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.sysroot": "1.0.0", - "com.unity.sysroot.linux-x86_64": "1.0.0" + "com.unity.sysroot": "2.0.5", + "com.unity.sysroot.linux-x86_64": "2.0.4" }, "url": "https://packages.unity.com" }, @@ -128,7 +170,7 @@ } }, "com.unity.xr.legacyinputhelpers": { - "version": "2.1.10", + "version": "2.1.12", "depth": 0, "source": "registry", "dependencies": { @@ -269,17 +311,6 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 8e3af85c..b8523623 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.19f1 -m_EditorVersionWithRevision: 2021.3.19f1 (c9714fde33b6) +m_EditorVersion: 2022.3.62f2 +m_EditorVersionWithRevision: 2022.3.62f2 (7670c08855a9) diff --git a/ProjectSettings/boot.config b/ProjectSettings/boot.config deleted file mode 100644 index e69de29b..00000000 From a6b849cb896a955ecdabaa038d16e185bf01e3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Matkowski?= Date: Sat, 11 Apr 2026 17:18:06 +0200 Subject: [PATCH 5/6] Update: package.json --- Assets/Editor Toolbox/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Editor Toolbox/package.json b/Assets/Editor Toolbox/package.json index 737b33e0..915507c9 100644 --- a/Assets/Editor Toolbox/package.json +++ b/Assets/Editor Toolbox/package.json @@ -1,7 +1,7 @@ { "name": "com.browar.editor-toolbox", "displayName": "Editor Toolbox", - "version": "0.14.3", + "version": "0.14.4", "unity": "2018.1", "description": "Tools, custom attributes, drawers, hierarchy overlay, and other extensions for the Unity Editor.", "keywords": [ From f2dff7ca548e63fe35bc8d5872ae5d413e71515a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Matkowski?= Date: Sat, 11 Apr 2026 17:21:34 +0200 Subject: [PATCH 6/6] Update: CHANGELOG.md --- Assets/Editor Toolbox/CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/Editor Toolbox/CHANGELOG.md b/Assets/Editor Toolbox/CHANGELOG.md index a6a47413..2ea309a9 100644 --- a/Assets/Editor Toolbox/CHANGELOG.md +++ b/Assets/Editor Toolbox/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.14.4 [11.04.2026] + +### Changed: +- Package support for Unity 6.4+ + ## 0.14.3 [29.12.2025] ### Added: