WIP

AutoSceneChanger.cs

@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace NEG.Utils
 {
@@ -8,4 +9,5 @@ namespace NEG.Utils
     private void Start() => SceneManager.LoadScene(1);
 #endif
     }
-}
+}
+

Collections/DictionaryExtensions.cs

@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-
-namespace NEG.Utils.Collections
-{
-    public static class DictionaryExtensions
-    {
-        /// <summary>
-        ///     Adds given value to a dictionary if there was no element at given <paramref name="key" />, replaces element with
-        ///     <paramref name="value"> otherwise.
-        /// </summary>
-        /// <returns>true if element was added, false if it was replaced</returns>
-        public static bool AddOrUpdate<K, V>(this Dictionary<K, V> dict, K key, V value)
-        {
-            if (dict.ContainsKey(key))
-            {
-                dict[key] = value;
-                return false;
-            }
-
-            dict.Add(key, value);
-            return true;
-        }
-
-
-        /// <summary>
-        ///     Gets a value from the dictionary under a specified key or adds it if did not exist and returns
-        ///     <paramref name="defaultValue" />.
-        /// </summary>
-        /// <returns>value under a given <paramref name="key" /> if it exists, <paramref name="defaultValue" /> otherwise</returns>
-        public static V GetOrSetToDefault<K, V>(this Dictionary<K, V> dict, K key, V defaultValue)
-        {
-            if (dict.TryGetValue(key, out var value)) return value;
-            dict.Add(key, defaultValue);
-
-            return defaultValue;
-        }
-    }
-}

CoroutineUtils.cs

@@ -6,42 +6,40 @@ namespace NEG.Utils
 {
     public static class CoroutineUtils
     {
-        private static readonly WaitForEndOfFrame WaitForEndOfFrame = new();
+        private static readonly WaitForEndOfFrame WaitForEndOfFrame = new WaitForEndOfFrame();
 
         public static IEnumerator WaitForFrames(int count)
         {
-            for (int i = 0; i < count; i++) yield return null;
+            for (int i = 0; i < count; i++)
+            {
+                yield return null;
+            }
         }
 
-        public static void ActionAfterFrames(this MonoBehaviour mono, int count, Action action) =>
+        public static void ActionAfterFrames(this MonoBehaviour mono, int count, Action action)
+        {
             mono.StartCoroutine(ActionAfterFrames(count, action));
-
+        }
+        
         public static IEnumerator ActionAfterFrames(int count, Action action)
         {
             yield return WaitForFrames(count);
             action?.Invoke();
         }
-
-        public static void ActionAfterEndOfFrame(this MonoBehaviour mono, Action action) =>
-            mono.StartCoroutine(ActionAtNextFrame(action));
-
+        
         public static IEnumerator ActionAfterEndOfFrame(Action action)
         {
             yield return WaitForEndOfFrame;
             action?.Invoke();
         }
-
-        public static void ActionAtNextFrame(this MonoBehaviour mono, Action action) =>
-            mono.StartCoroutine(ActionAtNextFrame(action));
-
+        public static void ActionAtNextFrame(this MonoBehaviour mono, Action action) => mono.StartCoroutine(ActionAtNextFrame(action));
         public static IEnumerator ActionAtNextFrame(Action action)
         {
             yield return null;
             action?.Invoke();
         }
 
-        public static void ActionAfterTime(this MonoBehaviour mono, float time, Action action) =>
-            mono.StartCoroutine(ActionAfterTime(time, action));
+        public static void ActionAfterTime(this MonoBehaviour mono, float time, Action action) => mono.StartCoroutine(ActionAfterTime(time, action));
 
         public static IEnumerator ActionAfterTime(float time, Action action)
         {

Editor/BuildingUtils.cs

@@ -1,45 +1,13 @@
 using System.Diagnostics;
-using System.Linq;
-using UnityEditor;
-using UnityEditor.Build;
 using UnityEngine;
+using UnityEditor;
 using Debug = UnityEngine.Debug;
 
 public static class BuildingUtils
 {
-    private const string SteamBuildDefine = "STEAM_BUILD";
-
-    [MenuItem("Tools/PrepareForBuild", priority = -10)]
-    public static void PrepareForBuild()
-    {
-        var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(
-            BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget));
-        string[] args = PlayerSettings.GetAdditionalCompilerArguments(namedBuildTarget);
-        var argsList = args.ToList();
-        argsList.Remove(SteamBuildDefine);
-        PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, argsList.ToArray());
-    }
-
-    [MenuItem("Tools/PlatformDefines/Steam", priority = -1)]
-    public static void SetDefinesForSteam()
-    {
-        PrepareForBuild();
-
-        var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(
-            BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget));
-        string[] args = PlayerSettings.GetAdditionalCompilerArguments(namedBuildTarget);
-        var argsList = args.ToList();
-        argsList.Add(SteamBuildDefine);
-        PlayerSettings.SetScriptingDefineSymbols(namedBuildTarget, argsList.ToArray());
-    }
-
-
     [MenuItem("Tools/Build/Steam/Release")]
     public static void SteamRelease()
     {
-        if (!CanBuild())
-            return;
-
         IncreaseBuildNumber();
         BuildRelease();
         UploadSteam();
@@ -48,102 +16,38 @@ public static class BuildingUtils
     [MenuItem("Tools/Build/Steam/Development")]
     public static void SteamDevelopment()
     {
-        if (!CanBuild())
-            return;
-
         IncreaseBuildNumber();
         BuildDevelopment();
         UploadSteam();
     }
 
 
-    [MenuItem("Tools/Build/Steam/Demo")]
-    public static void SteamDemo()
-    {
-        if (!CanBuild())
-            return;
-
-        IncreaseBuildNumber();
-        BuildDemo();
-        UploadSteam(true);
-    }
-
     [MenuItem("Tools/Build/All Release")]
     public static void BuildRelease()
     {
-        if (!CanBuild())
-            return;
         BuildWindowsRelease();
-        BuildLinuxRelease();
     }
 
     [MenuItem("Tools/Build/All Development")]
     public static void BuildDevelopment()
     {
-        if (!CanBuild())
-            return;
         BuildWindowsDevelopment();
     }
 
-    [MenuItem("Tools/Build/All Demo")]
-    public static void BuildDemo()
-    {
-        if (!CanBuild())
-            return;
-        BuildWindows(true, new[] { "DEMO" });
-        BuildLinux(true, new[] { "DEMO" });
-    }
-
     [MenuItem("Tools/Build/Platform/Windows/x64-Development")]
-    public static void BuildWindowsDevelopment()
-    {
-        if (!CanBuild())
-            return;
-        BuildWindows(false);
-    }
+    public static void BuildWindowsDevelopment() => BuildWindows(false);
 
     [MenuItem("Tools/Build/Platform/Windows/x64-Release")]
-    public static void BuildWindowsRelease()
-    {
-        if (!CanBuild())
-            return;
-        BuildWindows(true);
-    }
-
-    [MenuItem("Tools/Build/Platform/Linux/x64-Release")]
-    public static void BuildLinuxRelease()
-    {
-        if (!CanBuild())
-            return;
-        BuildLinux(true);
-    }
+    public static void BuildWindowsRelease() => BuildWindows(true);
 
 
-    [MenuItem("Tools/Build/Platform/Android/GooglePlay")]
-    public static void BuildGooglePlay()
-    {
-        IncreaseBuildNumber();
-        PlayerSettings.Android.bundleVersionCode++;
-        EditorUserBuildSettings.buildAppBundle = true;
-
-        var buildPlayerOptions = new BuildPlayerOptions { scenes = new string[EditorBuildSettings.scenes.Length] };
-        for (int i = 0; i < EditorBuildSettings.scenes.Length; i++)
-            buildPlayerOptions.scenes[i] = EditorBuildSettings.scenes[i].path;
-
-        buildPlayerOptions.target = BuildTarget.Android;
-        buildPlayerOptions.options = BuildOptions.None;
-        buildPlayerOptions.locationPathName = Application.dataPath +
-                                              $"/../../{Application.productName}-GooglePlay/{Application.productName}.aab";
-        BuildPipeline.BuildPlayer(buildPlayerOptions);
-    }
-
-    private static void BuildWindows(bool release, string[] additionalDefines = default)
+    private static void BuildWindows(bool release)
     {
         var buildPlayerOptions = new BuildPlayerOptions { scenes = new string[EditorBuildSettings.scenes.Length] };
         for (int i = 0; i < EditorBuildSettings.scenes.Length; i++)
+        {
             buildPlayerOptions.scenes[i] = EditorBuildSettings.scenes[i].path;
-
-        buildPlayerOptions.extraScriptingDefines = additionalDefines;
+        }
 
         buildPlayerOptions.target = BuildTarget.StandaloneWindows64;
         buildPlayerOptions.options = release ? BuildOptions.None : BuildOptions.Development;
@@ -152,73 +56,29 @@ public static class BuildingUtils
         BuildPipeline.BuildPlayer(buildPlayerOptions);
     }
 
-    private static void BuildLinux(bool release, string[] additionalDefines = default)
-    {
-        var buildPlayerOptions = new BuildPlayerOptions { scenes = new string[EditorBuildSettings.scenes.Length] };
-        for (int i = 0; i < EditorBuildSettings.scenes.Length; i++)
-            buildPlayerOptions.scenes[i] = EditorBuildSettings.scenes[i].path;
-
-        buildPlayerOptions.extraScriptingDefines = additionalDefines;
-
-        buildPlayerOptions.target = BuildTarget.StandaloneLinux64;
-        buildPlayerOptions.options = release ? BuildOptions.None : BuildOptions.Development;
-        buildPlayerOptions.locationPathName = Application.dataPath +
-                                              $"/../../{Application.productName}-Steam/ContentBuilder/content/linux/{Application.productName}.x86_64";
-        BuildPipeline.BuildPlayer(buildPlayerOptions);
-    }
-
     private static void IncreaseBuildNumber()
     {
-        string[] versionParts = PlayerSettings.bundleVersion.Split('.');
-        if (versionParts.Length != 3 || !int.TryParse(versionParts[2], out int version))
-        {
+        string[] versionParts  = PlayerSettings.bundleVersion.Split('.');
+        if (versionParts.Length != 3 || !int.TryParse(versionParts[2], out int version)) {
             Debug.LogError("IncreaseBuildNumber failed to update version " + PlayerSettings.bundleVersion);
             return;
         }
-
         versionParts[2] = (version + 1).ToString();
         PlayerSettings.bundleVersion = string.Join(".", versionParts);
     }
 
-    private static void UploadSteam(bool demo = false)
+    private static void UploadSteam()
     {
-        string command =
-            $"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && push_build.bat";
-        if (demo)
-        {
-            command =
-                $"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && push_demo.bat";
-        }
+        string command = $"cd {Application.dataPath}/../../{Application.productName}-Steam/ContentBuilder && run_build.bat";
 
         var processInfo = new ProcessStartInfo("cmd.exe", $"/c {command}")
-        {
-            CreateNoWindow = true, UseShellExecute = false
-        };
+            { 
+                CreateNoWindow = true,
+                UseShellExecute = false
+            };
         var process = Process.Start(processInfo);
         process.WaitForExit();
         Debug.Log(process.ExitCode);
         process.Close();
     }
-
-    private static bool CanBuild()
-    {
-        if (CanBuildUtil())
-            return true;
-        Debug.LogError(
-            "Cannot build with defines set in project, please use PrepareForBuild and wait for scripts recompilation");
-        return false;
-    }
-
-    private static bool CanBuildUtil()
-    {
-        var namedBuildTarget = NamedBuildTarget.FromBuildTargetGroup(
-            BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget));
-        string[] args = PlayerSettings.GetAdditionalCompilerArguments(namedBuildTarget);
-        var argsList = args.ToList();
-
-        if (argsList.Contains(SteamBuildDefine))
-            return false;
-
-        return true;
-    }
 }

Editor/ComponentsAdditionalItems/CanvasScalerDefault.cs

@@ -8,19 +8,14 @@ namespace NEG.Utils.Editor.ComponentsAdditionalItems
     {
         [MenuItem("CONTEXT/CanvasScaler/Full HD horizontal", false, 2000)]
         public static void SetFullHdHorizontal(MenuCommand command) => SetComponent(command, 1920, 1080);
-
         [MenuItem("CONTEXT/CanvasScaler/Full HD vertical", false, 2000)]
         public static void SetFullHdVertical(MenuCommand command) => SetComponent(command, 1080, 1920);
-
         [MenuItem("CONTEXT/CanvasScaler/Full 2k horizontal", false, 2000)]
-        public static void Set2KHorizontal(MenuCommand command) => SetComponent(command, 2560, 1440);
-
+        public static void Set2KHorizontal(MenuCommand command) => SetComponent(command, 2560, 1440 );
         [MenuItem("CONTEXT/CanvasScaler/Full 2k vertical", false, 2000)]
         public static void Set2KVertical(MenuCommand command) => SetComponent(command, 1440, 2560);
-
         [MenuItem("CONTEXT/CanvasScaler/Full 4k horizontal", false, 2000)]
         public static void Set4KHorizontal(MenuCommand command) => SetComponent(command, 3840, 2160);
-
         [MenuItem("CONTEXT/CanvasScaler/Full 4k vertical", false, 2000)]
         public static void Set4KVertical(MenuCommand command) => SetComponent(command, 2160, 3840);
 

Editor/EditorMultipleInstances/Editor/EditorInstanceCreator.cs

@@ -11,57 +11,61 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using UnityEditor;
 using UnityEngine;
-using Debug = UnityEngine.Debug;
+using UnityEditor;
 
 namespace TheGamedevGuru
 {
     public class EditorInstanceCreator : EditorWindow
     {
-        private string _extraSubdirectories;
-        private bool _includeProjectSettings = true;
-        private string _projectInstanceName;
+        string _projectInstanceName;
+        string _extraSubdirectories;
+        bool _includeProjectSettings = true;
 
-        private void OnGUI()
+        [MenuItem("Window/The Gamedev Guru/Editor Instance Creator")]
+        static void Init()
+        {
+            ((EditorInstanceCreator)EditorWindow.GetWindow(typeof(EditorInstanceCreator))).Show();
+        }
+
+        void OnGUI()
         {
             if (string.IsNullOrEmpty(_projectInstanceName))
+            {
                 _projectInstanceName = PlayerSettings.productName + "_Slave_1";
-
+            }
+            
             EditorGUILayout.Separator();
             EditorGUILayout.LabelField("The Gamedev Guru - Project Instance Creator");
             EditorGUILayout.Separator();
             EditorGUILayout.LabelField("Slave Project Name");
             _projectInstanceName = EditorGUILayout.TextField("", _projectInstanceName);
             EditorGUILayout.Separator();
-
+            
             EditorGUILayout.LabelField("Include Project Settings? (Recommended)");
             _includeProjectSettings = EditorGUILayout.Toggle("", _includeProjectSettings);
             EditorGUILayout.Separator();
-
+            
             EditorGUILayout.LabelField("Extra Subdirectories? (Separate by comma)");
             _extraSubdirectories = EditorGUILayout.TextField("", _extraSubdirectories);
             EditorGUILayout.Separator();
 
             if (GUILayout.Button("Create"))
+            {
                 CreateProjectInstance(_projectInstanceName, _includeProjectSettings, _extraSubdirectories);
-
+            }
+            
             if (GUILayout.Button("Help"))
+            {
                 Application.OpenURL("https://thegamedev.guru/multiple-unity-editor-instances-within-a-single-project/");
+            }
         }
 
-        [MenuItem("Window/The Gamedev Guru/Editor Instance Creator")]
-        private static void Init() => ((EditorInstanceCreator)GetWindow(typeof(EditorInstanceCreator))).Show();
-
-        private static void CreateProjectInstance(string projectInstanceName, bool includeProjectSettings,
-            string extraSubdirectories)
+        static void CreateProjectInstance(string projectInstanceName, bool includeProjectSettings, string extraSubdirectories)
         {
-            string targetDirectory = Path.Combine(Directory.GetCurrentDirectory(), ".." + Path.DirectorySeparatorChar,
-                projectInstanceName);
+            var targetDirectory = Path.Combine(Directory.GetCurrentDirectory(), ".." + Path.DirectorySeparatorChar, projectInstanceName);
             Debug.Log(targetDirectory);
             if (Directory.Exists(targetDirectory))
             {
@@ -71,21 +75,29 @@ namespace TheGamedevGuru
 
             Directory.CreateDirectory(targetDirectory);
 
-            var subdirectories = new List<string> { "Assets", "Packages" };
-            if (includeProjectSettings) subdirectories.Add("ProjectSettings");
+            List<string> subdirectories = new List<string>{"Assets", "Packages"};
+            if (includeProjectSettings)
+            {
+                subdirectories.Add("ProjectSettings");
+            }
 
-            foreach (string extraSubdirectory in extraSubdirectories.Split(','))
+            foreach (var extraSubdirectory in extraSubdirectories.Split(','))
+            {
                 subdirectories.Add(extraSubdirectory.Trim());
+            }
 
-            foreach (string subdirectory in subdirectories)
-                Process.Start("CMD.exe", GetLinkCommand(subdirectory, targetDirectory));
+            foreach (var subdirectory in subdirectories)
+            {
+                System.Diagnostics.Process.Start("CMD.exe",GetLinkCommand(subdirectory, targetDirectory));
+            }
 
             EditorUtility.RevealInFinder(targetDirectory + Path.DirectorySeparatorChar + "Assets");
-            EditorUtility.DisplayDialog("Done!",
-                $"Done! Feel free to add it as an existing project at: {targetDirectory}", "Ok :)");
+            EditorUtility.DisplayDialog("Done!", $"Done! Feel free to add it as an existing project at: {targetDirectory}", "Ok :)");
         }
 
-        private static string GetLinkCommand(string subdirectory, string targetDirectory) =>
-            $"/c mklink /J \"{targetDirectory}{Path.DirectorySeparatorChar}{subdirectory}\" \"{Directory.GetCurrentDirectory()}{Path.DirectorySeparatorChar}{subdirectory}\"";
+        static string GetLinkCommand(string subdirectory, string targetDirectory)
+        {
+            return $"/c mklink /J \"{targetDirectory}{Path.DirectorySeparatorChar}{subdirectory}\" \"{Directory.GetCurrentDirectory()}{Path.DirectorySeparatorChar}{subdirectory}\"";
+        }
     }
-}
+}

Editor/EditorUtils.cs

@@ -1,42 +0,0 @@
-using System;
-using UnityEditor;
-
-namespace NegUtils.Editor
-{
-    public class EditorUtils
-    {
-    }
-
-    public class AssetPath
-    {
-        private readonly string filter;
-
-        private string path;
-
-
-        public AssetPath(string filter)
-        {
-            this.filter = filter;
-            TryFindPath();
-        }
-
-        public string Path
-        {
-            get
-            {
-                if (path != null)
-                    return path;
-                TryFindPath();
-                return path;
-            }
-        }
-
-        private void TryFindPath()
-        {
-            string[] candidates = AssetDatabase.FindAssets(filter);
-            if (candidates.Length == 0)
-                throw new Exception("Missing layout asset!");
-            path = AssetDatabase.GUIDToAssetPath(candidates[0]);
-        }
-    }
-}

Editor/EditorUtils.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a4848b69c1024df8ad6f76cfd4415d01
-timeCreated: 1698258811

Editor/GUIDToAssetPath.cs

@@ -1,18 +1,23 @@
 using UnityEditor;
 using UnityEngine;
-
+ 
 public class GUIDToAssetPath : EditorWindow
 {
-    private string guid = "";
-    private string path = "";
-
-    private void OnGUI()
+    string guid = "";
+    string path = "";
+    [MenuItem("Tools/GUIDToAssetPath")]
+    static void CreateWindow()
+    {
+        GUIDToAssetPath window = (GUIDToAssetPath)EditorWindow.GetWindowWithRect(typeof(GUIDToAssetPath), new Rect(0, 0, 400, 120));
+    }
+ 
+    void OnGUI()
     {
         GUILayout.Label("Enter guid");
         guid = GUILayout.TextField(guid);
         GUILayout.BeginHorizontal();
         GUILayout.FlexibleSpace();
-        if (GUILayout.Button("Get Asset Path", GUILayout.Width(120)))
+        if (GUILayout.Button("Get Asset Path",GUILayout.Width(120)))
             path = GetAssetPath(guid);
         GUILayout.FlexibleSpace();
         GUILayout.EndHorizontal();
@@ -24,17 +29,10 @@ public class GUIDToAssetPath : EditorWindow
         GUILayout.EndHorizontal();
         GUILayout.Label(path);
     }
-
-    [MenuItem("Tools/GUIDToAssetPath")]
-    private static void CreateWindow()
-    {
-        var window = (GUIDToAssetPath)GetWindowWithRect(typeof(GUIDToAssetPath), new Rect(0, 0, 400, 120));
-    }
-
-    private static string GetAssetPath(string guid)
+    static string GetAssetPath(string guid)
     {
         guid = guid.Replace("-", "");
-
+        
         string p = AssetDatabase.GUIDToAssetPath(guid);
         Debug.Log(p);
         if (p.Length == 0) p = "not found";

Editor/MonoBehaviourExtensions.cs

@@ -1,46 +0,0 @@
-using System.IO;
-using UnityEditor;
-using UnityEngine;
-
-namespace NEG.Utils.Editor
-{
-    public static class MonoBehaviourExtensions
-    {
-        [MenuItem("CONTEXT/MonoBehaviour/Change Script")]
-        public static void ChangeScript(MenuCommand command)
-        {
-            if (command.context == null)
-                return;
-
-            var monoBehaviour = command.context as MonoBehaviour;
-            var monoScript = MonoScript.FromMonoBehaviour(monoBehaviour);
-
-            string scriptPath = AssetDatabase.GetAssetPath(monoScript);
-            string directoryPath = new FileInfo(scriptPath).Directory?.FullName;
-
-            // Allow the user to select which script to replace with
-            string newScriptPath = EditorUtility.OpenFilePanel("Select replacement script", directoryPath, "cs");
-
-            // Don't log anything if they cancelled the window
-            if (string.IsNullOrEmpty(newScriptPath)) return;
-
-            // Load the selected asset
-            string relativePath = "Assets\\" + Path.GetRelativePath(Application.dataPath, newScriptPath);
-            var chosenTextAsset = AssetDatabase.LoadAssetAtPath<TextAsset>(relativePath);
-
-            if (chosenTextAsset == null)
-            {
-                Debug.LogWarning($"Selected script couldn't be loaded ({relativePath})");
-                return;
-            }
-
-            Undo.RegisterCompleteObjectUndo(command.context, "Changing component script");
-
-            var so = new SerializedObject(monoBehaviour);
-            var scriptProperty = so.FindProperty("m_Script");
-            so.Update();
-            scriptProperty.objectReferenceValue = chosenTextAsset;
-            so.ApplyModifiedProperties();
-        }
-    }
-}

Editor/MonoBehaviourExtensions.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 0501eedeaf1d4dcf8c4d0f1b7a0c1761
-timeCreated: 1684519404

Editor/NEG.Utils.Editor.asmdef

@@ -1,18 +1,18 @@
 {
-  "name": "NEG.Utils.Editor",
-  "rootNamespace": "",
-  "references": [
-    "GUID:3c4294719a93e3c4e831a9ff0c261e8a"
-  ],
-  "includePlatforms": [
-    "Editor"
-  ],
-  "excludePlatforms": [],
-  "allowUnsafeCode": false,
-  "overrideReferences": false,
-  "precompiledReferences": [],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
+    "name": "NEG.Utils.Editor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:3c4294719a93e3c4e831a9ff0c261e8a"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

Editor/ReadOnlyAttributeDrawer.cs

@@ -1,19 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-
-namespace NEG.Utils.Editor
-{
-    [CustomPropertyDrawer(typeof(ReadOnlyAttribute))]
-    public class ReadOnlyPropertyDrawer : PropertyDrawer
-    {
-        public override void OnGUI(Rect position, SerializedProperty property, GUIContent label)
-        {
-            GUI.enabled = false;
-            EditorGUI.PropertyField(position, property, label, true);
-            GUI.enabled = true;
-        }
-
-        public override float GetPropertyHeight(SerializedProperty property, GUIContent label) =>
-            EditorGUI.GetPropertyHeight(property, label, true);
-    }
-}

Editor/ReadOnlyAttributeDrawer.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 1f837bac3a7b40528454a9fb9a46d0be
-timeCreated: 1699371332

Editor/RequireInterfaceDrawer.cs

@@ -1,6 +1,5 @@
-using UnityEditor;
 using UnityEngine;
-
+using UnityEditor;
 /// <summary>
 /// Drawer for the RequireInterface attribute.
 /// </summary>
@@ -11,7 +10,7 @@ namespace NEG.Utils
     public class RequireInterfaceDrawer : PropertyDrawer
     {
         /// <summary>
-        ///     Overrides GUI drawing for the attribute.
+        /// Overrides GUI drawing for the attribute.
         /// </summary>
         /// <param name="position">Position.</param>
         /// <param name="property">Property.</param>
@@ -22,12 +21,11 @@ namespace NEG.Utils
             if (property.propertyType == SerializedPropertyType.ObjectReference)
             {
                 // Get attribute parameters.
-                var requiredAttribute = attribute as RequireInterfaceAttribute;
+                var requiredAttribute = this.attribute as RequireInterfaceAttribute;
                 // Begin drawing property field.
                 EditorGUI.BeginProperty(position, label, property);
                 // Draw property field.
-                property.objectReferenceValue = EditorGUI.ObjectField(position, label, property.objectReferenceValue,
-                    requiredAttribute.requiredType, true);
+                property.objectReferenceValue = EditorGUI.ObjectField(position, label, property.objectReferenceValue, requiredAttribute.requiredType, true);
                 // Finish drawing property field.
                 EditorGUI.EndProperty();
             }

Editor/ScreenshotMaker.cs

@@ -1,18 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-
-namespace NEG.Editor
-{
-    public static class ScreenshotMaker
-    {
-        [MenuItem("CONTEXT/Camera/Save view")]
-        public static void Capture(MenuCommand command)
-        {
-            string path = EditorUtility.SaveFilePanel("Save screenshot", "", "screen.png", "png");
-            if (path.Length == 0)
-                return;
-
-            ScreenCapture.CaptureScreenshot(path);
-        }
-    }
-}

Editor/ScreenshotMaker.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 7dba407e8e8740a1bed3ee5fa833b13c
-timeCreated: 1687881092

Editor/SerializationExtentions.cs

@@ -1,16 +1,21 @@
+using System;
 using UnityEditor;
 
 namespace NEG.Utils.Serialization
 {
     public static class SerializationExtentions
     {
-        public static SerializedProperty FindAutoProperty(this SerializedObject @this, string name) =>
-            @this.FindProperty(GetBackingFieldName(name));
+        public static SerializedProperty FindAutoProperty(this SerializedObject @this, string name)
+        {
+            return @this.FindProperty(GetBackingFieldName(name));
+        }
 
-        public static SerializedProperty FindAutoPropertyRelative(this SerializedProperty @this, string name) =>
-            @this.FindPropertyRelative(GetBackingFieldName(name));
+        public static SerializedProperty FindAutoPropertyRelative(this SerializedProperty @this, string name)
+        {
+            return @this.FindPropertyRelative(GetBackingFieldName(name));
+        }
 
-        public static string GetBackingFieldName(string name)
+        private static string GetBackingFieldName(string name)
         {
 #if NET_STANDARD || NET_STANDARD_2_1
         return string.Create(1/*<*/ + name.Length + 16/*>k__BackingField*/, name, static (span, name) =>
@@ -24,4 +29,4 @@ namespace NEG.Utils.Serialization
 #endif
         }
     }
-}
+}

Editor/ToolsWindowBase.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using UnityEditor;
 using UnityEditor.SceneManagement;
 using UnityEngine;
@@ -9,34 +10,11 @@ namespace NegUtils.Editor
     [InitializeOnLoad]
     public class ToolsWindowBase : EditorWindow
     {
-        private const int UnitySceneExtensionLength = 6;
-
         static ToolsWindowBase()
         {
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
         }
 
-        protected virtual void OnGUI()
-        {
-            if (GUILayout.Button("Select Scene"))
-                ShowScenesList(GUILayoutUtility.GetLastRect());
-
-            bool startFromSceneIndex0 = EditorPrefs.GetBool("StartFromSceneIndex0");
-            bool newVal = GUILayout.Toggle(startFromSceneIndex0, "Start from scene with index 0 on start");
-            if (newVal != startFromSceneIndex0) EditorPrefs.SetBool("StartFromSceneIndex0", newVal);
-
-            if (!startFromSceneIndex0)
-                return;
-
-            bool goToCurrentScene = EditorPrefs.GetBool("GoToCurrentSceneAfterPlay");
-            newVal = GUILayout.Toggle(goToCurrentScene, "Go to current scene after play");
-            if (newVal != goToCurrentScene) EditorPrefs.SetBool("GoToCurrentSceneAfterPlay", newVal);
-
-            bool goToFirstScene = EditorPrefs.GetBool("GoToFirstSceneAfterPlay");
-            newVal = GUILayout.Toggle(goToFirstScene, "Go to scene with index 1 after play");
-            if (newVal != goToFirstScene) EditorPrefs.SetBool("GoToFirstSceneAfterPlay", newVal);
-        }
-
         [MenuItem("Tools/Show Tools Window")]
         private static void ShowWindow()
         {
@@ -44,39 +22,47 @@ namespace NegUtils.Editor
             window.Show();
         }
 
+        protected virtual void OnGUI()
+        {
+            if (GUILayout.Button("Select Scene"))
+                ShowScenesList(GUILayoutUtility.GetLastRect());
+            
+            bool startFromSceneIndex0 = EditorPrefs.GetBool("StartFromSceneIndex0");
+            bool newVal = GUILayout.Toggle(startFromSceneIndex0, "Start from scene with index 0 on start");
+            if (newVal != startFromSceneIndex0)
+            {
+                EditorPrefs.SetBool("StartFromSceneIndex0", newVal);
+            }
+
+            if (startFromSceneIndex0)
+            {
+                bool goToCurrentScene = EditorPrefs.GetBool("GoToCurrentSceneAfterPlay");
+                newVal = GUILayout.Toggle(goToCurrentScene, "Go to current scene after play");
+                if (newVal != goToCurrentScene)
+                {
+                    EditorPrefs.SetBool("GoToCurrentSceneAfterPlay", newVal);
+                }
+            }
+        }
+        
         private static void ShowScenesList(Rect position)
         {
             var menu = new GenericMenu();
 
-            string path = Application.dataPath + "/Scenes";
-
-            AddFiles(path, path, menu);
-
-            menu.DropDown(position);
-        }
-
-        private static void AddFiles(string path, string basePath, GenericMenu menu)
-        {
+            string path = Application.dataPath + "/Scenes/Production";
             string[] fileInfo = Directory.GetFiles(path, "*.unity");
-            for (int i = 0; i < fileInfo.Length; i++)
-            {
-                string s = fileInfo[i];
-                menu.AddItem(
-                    new GUIContent(s.Remove(0, basePath.Length + 1)
-                        .Remove(s.Length - basePath.Length - UnitySceneExtensionLength - 1, UnitySceneExtensionLength)
-                        .Replace('\\', '/')), false, () =>
-                    {
-                        LoadScene(s);
-                    });
 
-                if (i == fileInfo.Length) continue;
+            foreach (string item in fileInfo)
+            {
+                string s = item;
+                menu.AddItem(new GUIContent(s.Remove(0, path.Length + 1).Remove(s.Length - path.Length - 7 ,6)), false, () => {
+                    LoadScene(s);
+                });
                 menu.AddSeparator("");
             }
-
-            string[] dirInfo = Directory.GetDirectories(path);
-            foreach (string dir in dirInfo) AddFiles(dir, basePath, menu);
+            menu.DropDown(position);
         }
-
+        
         private static void LoadScene(string path)
         {
             EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
@@ -85,11 +71,11 @@ namespace NegUtils.Editor
 
         private static void OnPlayModeStateChanged(PlayModeStateChange state)
         {
-            switch (state)
+            switch(state)
             {
                 case PlayModeStateChange.ExitingEditMode:
                     {
-                        if (!EditorPrefs.GetBool("StartFromSceneIndex0"))
+                        if(!EditorPrefs.GetBool("StartFromSceneIndex0"))
                             return;
                         EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo();
                         EditorPrefs.SetString("LastOpenedScenePath", EditorSceneManager.GetSceneManagerSetup()[0].path);
@@ -98,26 +84,25 @@ namespace NegUtils.Editor
                     break;
                 case PlayModeStateChange.EnteredPlayMode:
                     {
-                        if (!EditorPrefs.GetBool("StartFromSceneIndex0"))
+                        if(!EditorPrefs.GetBool("StartFromSceneIndex0"))
                             return;
 
                         if (EditorPrefs.GetBool("GoToCurrentSceneAfterPlay"))
-                        {
                             EditorSceneManager.LoadSceneInPlayMode(EditorPrefs.GetString("LastOpenedScenePath"),
                                 new LoadSceneParameters(LoadSceneMode.Single));
-                        }
-                        else if (EditorPrefs.GetBool("GoToFirstSceneAfterPlay"))
+                        else
                             SceneManager.LoadScene(1);
                     }
                     break;
                 case PlayModeStateChange.EnteredEditMode:
                     {
-                        if (!EditorPrefs.GetBool("StartFromSceneIndex0"))
+                        if(!EditorPrefs.GetBool("StartFromSceneIndex0"))
                             return;
                         EditorSceneManager.OpenScene(EditorPrefs.GetString("LastOpenedScenePath"));
                     }
                     break;
             }
+
         }
     }
 }

Editor/TsvImporter.cs

@@ -1,14 +0,0 @@
-using System.IO;
-using UnityEditor.AssetImporters;
-using UnityEngine;
-
-[ScriptedImporter(1, "tsv")]
-public class TsvImporter : ScriptedImporter
-{
-    public override void OnImportAsset(AssetImportContext ctx)
-    {
-        var textAsset = new TextAsset(File.ReadAllText(ctx.assetPath));
-        ctx.AddObjectToAsset(Path.GetFileNameWithoutExtension(ctx.assetPath), textAsset);
-        ctx.SetMainObject(textAsset);
-    }
-}

KeyBasedFactory.cs

@@ -1,50 +0,0 @@
-using JetBrains.Annotations;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace NEG.Utils
-{
-    public class KeyBasedFactory<T1, T2>
-    {
-        [PublicAPI] protected Dictionary<T1, Type> data;
-
-        public KeyBasedFactory()
-        {
-            data = new Dictionary<T1, Type>();
-        }
-
-        public void FireRegistration()
-        {
-            ScanAssembly(typeof(T2).Assembly);
-
-            if (typeof(T2).Assembly.GetType().Assembly == typeof(T2).Assembly)
-                return;
-
-            ScanAssembly(typeof(T2).Assembly.GetType().Assembly);
-        }
-
-        private static void ScanAssembly(Assembly assembly)
-        {
-            foreach (var type in assembly.GetTypes())
-            {
-                var methodFields =
-                    type.GetMethods(BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic);
-                for (int i = 0; i < methodFields.Length; i++)
-                {
-                    if (Attribute.GetCustomAttribute(methodFields[i], typeof(FactoryRegistration)) != null)
-                        methodFields[i].Invoke(null, Array.Empty<object>());
-                }
-            }
-        }
-
-        public void Register(T1 key, Type type) => data.Add(key, type);
-
-        public T2 CreateInstance(T1 key, params object[] args) => (T2)Activator.CreateInstance(data[key], args);
-    }
-
-    [AttributeUsage(AttributeTargets.Method)]
-    public class FactoryRegistration : Attribute
-    {
-    }
-}

KeyBasedFactory.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 2e0d3df1ddd34209bfb7262b4e51abfe
-timeCreated: 1683917310

NEG.Utils.asmdef

@@ -1,16 +1,16 @@
 {
-  "name": "NEG.Utils",
-  "rootNamespace": "",
-  "references": [
-    "GUID:6055be8ebefd69e48b49212b09b47b2f"
-  ],
-  "includePlatforms": [],
-  "excludePlatforms": [],
-  "allowUnsafeCode": false,
-  "overrideReferences": false,
-  "precompiledReferences": [],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
+    "name": "NEG.Utils",
+    "rootNamespace": "",
+    "references": [
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

NEG/Localization.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9b25b74f42726e94585fe6ae4b9dd947
+guid: ae6126b91ed6cf14d98898d4e2cbce75
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

NEG/Localization/Editor.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: caeb30c40f1a46041b0ad218cb94902d
+guid: d0f8fd7f245b23d42af02e65d743ed9c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

NEG/Localization/Editor/LocalizationPreBuild.cs

@@ -0,0 +1,22 @@
+using System.IO;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine;
+
+namespace NEG.Localization.Editor
+{
+    public class LocalizationPreBuild : IPreprocessBuildWithReport
+    {
+        public int callbackOrder => 0;
+
+        public void OnPreprocessBuild(BuildReport report)
+        {
+            if(!Directory.Exists($"{Application.dataPath}/{LocalizationManager.ResourcesFolderPath}/{LocalizationManager.LanguageResourcePath}"))
+            {
+                Debug.LogWarning("No folder for localization, creating");
+                
+            }
+            Debug.Log("test");
+        }
+    }
+}

NEG/Localization/Editor/LocalizationPreBuild.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 7a787e11f9704339b362f95e333b2daf
+timeCreated: 1675691755

NEG/Localization/Editor/NEG.Localization.Editor.asmdef

@@ -0,0 +1,19 @@
+{
+    "name": "NEG.Localization.Editor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:6055be8ebefd69e48b49212b09b47b2f",
+        "GUID:9fb3d516715e5574db1dd1f3d557a8ab"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

NEG/Localization/Editor/NEG.Localization.Editor.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7ff6afcd64a25ab4497e324400b59140
+guid: 733193857df9bde4ba34c6b5715d9519
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

NEG/Localization/LocalizationContext.cs

@@ -0,0 +1,7 @@
+namespace NEG.Localization
+{
+    public class LocalizationContext
+    {
+        
+    }
+}

NEG/Localization/LocalizationContext.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ce1c159bd9384adea90c1a2103a3fb12
+timeCreated: 1675688372

NEG/Localization/LocalizationManager.cs

@@ -0,0 +1,75 @@
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace NEG.Localization
+{
+    [PublicAPI]
+    public class LocalizationManager
+    {
+        private class AvailableLanguages
+        {
+            public List<string> Languages { get; set; }
+        }
+        
+        public const string LanguageResourcePath = "Localization";
+        public const string ResourcesFolderPath = "Data/Resources";
+        public const string AvailableLanguagesFile = "Languages";
+
+        public static LocalizationManager Instance => instance ??= new LocalizationManager();
+        
+        public IEnumerable<string> Languages => languages;
+
+        private static LocalizationManager instance;
+        private List<string> languages;
+        private HashSet<Action<LocalizationProvider>> actions = new();
+        private LocalizationProvider provider;
+        
+        public LocalizationManager()
+        {
+            var file = Resources.Load<TextAsset>($"{LanguageResourcePath}/{AvailableLanguagesFile}");
+            var available = JsonConvert.DeserializeObject<AvailableLanguages>(file.text);
+            languages = available.Languages;
+        }
+
+        public void SelectLanguage(string languageCode)
+        {
+            if (!languages.Contains(languageCode))
+            {
+                Debug.LogError($"Localization {languageCode} not found in files");
+                return;
+            }
+
+            provider = new LocalizationProvider($"{LanguageResourcePath}/{languageCode}");
+            
+            foreach (var item in actions)
+            {
+                item?.Invoke(provider);
+            }
+        }
+
+        /// <summary>
+        /// Register action for localization. Always fire provided action
+        /// </summary>
+        /// <param name="action">action to call on localization change</param>
+        public static void Register(Action<LocalizationProvider> action)
+        {
+            if (!Instance.actions.Contains(action))
+            {
+                Instance.actions.Add(action);
+            }
+
+            action.Invoke(Instance.provider);
+        }
+        
+        /// <summary>
+        /// Unregister action from localization.
+        /// </summary>
+        /// <param name="action">action to unregister</param>
+        public static void Unregister(Action<LocalizationProvider> action) => Instance.actions.Remove(action);
+
+    }
+}

NEG/Localization/LocalizationManager.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b09e744f7ec6704c95ec273584a964f
+guid: 05250c8a035fbdc41a66717ccdd9e694
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

NEG/Localization/LocalizationProvider.cs

@@ -0,0 +1,57 @@
+using Newtonsoft.Json.Linq;
+using System.IO;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace NEG.Localization
+{
+    public class LocalizationProvider
+    {
+        private readonly Dictionary<string, string> texts = new();
+        private readonly Dictionary<int, string> posToString = new();
+
+        public LocalizationProvider(string path)
+        {
+           
+        }
+        
+        public string GetText(string key)
+        {
+            if (texts.TryGetValue(key, out string val))
+            {
+                return val;
+            }
+            
+            return "BAD_" + key;
+        }
+
+        public string GetText(string key, params LocalizationContext[] contexts)
+        {
+            return "BAD_" + key;
+        }
+        
+        internal void RegisterKeys(BinaryReader keysReader)
+        {
+            int i = 0;
+            while (keysReader.BaseStream.Position < keysReader.BaseStream.Length)
+            {
+                string read = keysReader.ReadString();
+                if (texts.ContainsKey(read))
+                    Debug.LogWarning($"{read} is already added to localization");
+                else
+                    texts.Add(read, "");
+                posToString.Add(++i, read);
+            }
+        }
+
+        internal void ChangeLanguage(BinaryReader reader)
+        {
+            int i = 0;
+            while (reader.BaseStream.Position < reader.BaseStream.Length)
+            {
+                texts[posToString[++i]] = reader.ReadString();
+            }
+        }
+    }
+}
+

NEG/Localization/LocalizationProvider.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: b3f8438db4084014bab0a063e4675d3f
+guid: b4d51a82fa182b64db93b7057762f8a2
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

NEG/Localization/LocalizedText.cs

@@ -0,0 +1,46 @@
+using System;
+using UnityEngine;
+using TMPro;
+using UnityEngine.UI;
+
+namespace NEG.Localization
+{
+    public class LocalizedText : MonoBehaviour
+    {
+        [SerializeField] private string key = "";
+        [SerializeField] private TMP_Text tmpText;
+        [SerializeField] private Text text;
+        
+        private void Awake() => LocalizationManager.Register(SetText);
+
+        private void OnDestroy() => LocalizationManager.Unregister(SetText);
+
+        private void OnValidate()
+        {
+            if (tmpText != null || text != null)
+                return;
+            tmpText = GetComponent<TMP_Text>();
+            if (tmpText != null)
+                return;
+            text = GetComponent<Text>();
+        }
+
+        private void SetText(LocalizationProvider ctx)
+        {
+            if (text != null)
+                text.text = ctx.GetText(key);
+            if (tmpText != null)
+                tmpText.text = ctx.GetText(key);
+        }
+
+#if UNITY_EDITOR
+        public void SetTextForEditor()
+        {
+            if (text != null)
+                text.text = "_" + key;
+            if (tmpText != null)
+                tmpText.text = "_" + key;
+        }
+#endif
+    }
+}

NEG/Localization/LocalizedText.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a2c99d7a9a2f8184f8b8e94c01723ec6
+guid: 307c41c8e2487e3488480dd4696efaf6
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

NEG/Localization/NEG.Localization.asmdef

@@ -0,0 +1,16 @@
+{
+    "name": "NEG.Localization",
+    "rootNamespace": "",
+    "references": [
+        "GUID:6055be8ebefd69e48b49212b09b47b2f"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

NEG/Localization/NEG.Localization.asmdef.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f8cf2e6d12f27fb47a577cb5a7537ccf
+guid: 9fb3d516715e5574db1dd1f3d557a8ab
 AssemblyDefinitionImporter:
   externalObjects: {}
   userData: 

NEG/Localization/SteamLocalizationHelper.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+
+namespace NEG.Localization
+{
+    public static class SteamLocalizationHelper
+    {
+        private static readonly Dictionary<string, string> steamLangMapping = new()
+        {
+            { "english", "en" },
+            { "polish", "pl" },
+            { "spanish", "es" },
+            { "german", "de" },
+            { "schinese", "zh" },
+            { "japanese", "ja" },
+            { "french", "fr" },
+            { "russian", "ru" },
+            { "koreana", "ko" },
+            { "italian", "it" },
+            { "portuguese", "pt" },
+            { "ukrainian", "uk" },
+            { "norwegian", "no" },
+            { "czech", "cs" }
+        };
+        
+        public static string MapLanguageFromSteam(string lang) => steamLangMapping.TryGetValue(lang, out string mapped) ? mapped : "en";
+    }
+}

NEG/Localization/SteamLocalizationHelper.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3640a0fcfb0c4ea89159e0c64e5135b0
+timeCreated: 1675474100

NEG/UI/Area/IArea.cs

@@ -1,11 +1,9 @@
 using NEG.UI.WindowSlot;
-using NegUtils.NEG.UI;
 
 namespace NEG.UI.Area
 {
-    public interface IArea : ISlotsHolder, IControllable
+    public interface IArea : ISlotsHolder, IUiElement
     {
-        void Open();
-        void Close();
+        
     }
 }

NEG/UI/IControllable.cs

@@ -1,18 +0,0 @@
-using System;
-
-namespace NegUtils.NEG.UI
-{
-    public interface IControllable
-    {
-        event Action<object> OnOpened;
-        event Action OnClosed;
-        event Action<BackUsed> OnBackUsed;
-
-        public void TryUseBack(ref BackUsed backUsed);
-
-        public class BackUsed
-        {
-            public bool Used { get; set; }
-        }
-    }
-}

NEG/UI/IControllable.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 175798310e4048eda768cf40e6ee6de3
-timeCreated: 1686596400

NEG/UI/IController.cs

@@ -1,7 +0,0 @@
-namespace NegUtils.NEG.UI
-{
-    public interface IController
-    {
-        IControllable Controllable { get; }
-    }
-}

NEG/UI/IController.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b88f4a93020a4bc6bde40e0438d296a9
-timeCreated: 1686595825

NEG/UI/IUiElement.cs

@@ -0,0 +1,11 @@
+namespace NEG.UI
+{
+    public interface IUiElement
+    {
+        /// <summary>
+        /// Sets only visible state of element
+        /// </summary>
+        /// <param name="setEnabled"></param>
+        void SetEnabled(bool setEnabled);
+    }
+}

NEG/UI/IUiElement.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 296bf6969a6347f8aea788a7bdd086af
+timeCreated: 1670693177

NEG/UI/NEG.UI.asmdef

@@ -1,16 +1,14 @@
 {
-  "name": "NEG.UI",
-  "rootNamespace": "",
-  "references": [
-    "GUID:3c4294719a93e3c4e831a9ff0c261e8a"
-  ],
-  "includePlatforms": [],
-  "excludePlatforms": [],
-  "allowUnsafeCode": false,
-  "overrideReferences": false,
-  "precompiledReferences": [],
-  "autoReferenced": true,
-  "defineConstraints": [],
-  "versionDefines": [],
-  "noEngineReferences": false
+    "name": "NEG.UI",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

NEG/UI/Popup/DefaultPopupData.cs

@@ -5,14 +5,13 @@ namespace NEG.UI.Popup
 {
     public class DefaultPopupData : PopupData
     {
-        private readonly string content;
         private readonly IDefaultPopup defaultPopup;
-        private readonly List<(string, Action)> options;
 
         private readonly string title;
+        private readonly string content;
+        private readonly List<(string, Action)> options;
 
-        public DefaultPopupData(IDefaultPopup popup, string title, string content, List<(string, Action)> options) :
-            base(popup)
+        public DefaultPopupData(IDefaultPopup popup, string title, string content, List<(string, Action)> options) : base(popup)
         {
             defaultPopup = popup;
             this.title = title;

NEG/UI/Popup/IDefaultPopup.cs

@@ -6,14 +6,11 @@ namespace NEG.UI.Popup
     public interface IDefaultPopup : IPopup
     {
         /// <summary>
-        ///     Sets content based on provided data.
+        /// Sets content based on provided data.
         /// </summary>
         /// <param name="title">popup title</param>
         /// <param name="content">popup content</param>
-        /// <param name="options">
-        ///     list of tuples (name, action on click), to set buttons. Do not pass here popup closing logic,
-        ///     implementing class should do it
-        /// </param>
+        /// <param name="options">list of tuples (name, action on click), to set buttons. Do not pass here popup closing logic, implementing class should do it</param>
         public void SetContent(string title, string content, List<(string name, Action action)> options);
     }
 }

NEG/UI/Popup/IPopup.cs

@@ -7,20 +7,20 @@ namespace NEG.UI.Popup
     public interface IPopup
     {
         /// <summary>
-        ///     Event to fire when popup is closed
+        /// Event to fire when popup is closed
         /// </summary>
         event Action<PopupData> OnPopupClosed;
 
         /// <summary>
-        ///     Show popup
+        /// Show popup
         /// </summary>
         /// <param name="data">data assigned to popup, used to give info that popup is closed</param>
         public void Show(PopupData data);
 
         /// <summary>
-        ///     Close popup or mark as closed if not visible
+        /// Close popup or mark as closed if not visible
         /// </summary>
-        /// <param name="silent">if true hide visually, without firing callbacks to properly close</param>
-        void Close(bool silent = false);
+        /// <param name="silence">if true hide visually, without firing callbacks to properly close</param>
+        void Close(bool silence = false);
     }
 }

NEG/UI/Popup/PopupData.cs

@@ -6,25 +6,8 @@ namespace NEG.UI.Popup
     [PublicAPI]
     public class PopupData
     {
-        private readonly IPopup popup;
-
         /// <summary>
-        ///     PopupData constructor.
-        /// </summary>
-        /// <param name="popup">attached to this data, can be used by different data instances</param>
-        public PopupData(IPopup popup)
-        {
-            this.popup = popup;
-            IsValid = true;
-        }
-
-        /// <summary>
-        ///     Is this data is still valid. If set to false, popup will not show.
-        /// </summary>
-        public bool IsValid { get; protected set; }
-
-        /// <summary>
-        ///     Event that is fired on closing popup.
+        /// Event that is fired on closing popup.
         /// </summary>
         public event Action<PopupData> PopupClosedEvent
         {
@@ -33,22 +16,35 @@ namespace NEG.UI.Popup
         }
 
         /// <summary>
-        ///     Show popup and pass needed data.
+        /// Is this data is still valid. If set to false, popup will not show.
         /// </summary>
-        public virtual void Show() => popup.Show(this);
+        public bool IsValid { get; protected set; }
+        
+        private readonly IPopup popup;
 
         /// <summary>
-        ///     Hide popup. Close visuals without firing events;
+        /// PopupData constructor.
+        /// </summary>
+        /// <param name="popup">attached to this data, can be used by different data instances</param>
+        public PopupData(IPopup popup)
+        {
+            this.popup = popup;
+            IsValid = true;
+        }
+        
+        /// <summary>
+        /// Show popup and pass needed data.
+        /// </summary>
+        public virtual void Show() => popup.Show(this);
+        
+        /// <summary>
+        /// Hide popup. Close visuals without firing events;
         /// </summary>
         public virtual void Hide() => popup.Close(true);
 
         /// <summary>
-        ///     Invalidate popup, <see cref="UiManager" /> will automatically skip this popup
+        /// Invalidate popup, <see cref="UiManager"/> will automatically skip this popup
         /// </summary>
-        public virtual void Invalidate()
-        {
-            IsValid = false;
-            UiManager.Instance.RefreshPopups();
-        }
+        public virtual void Invalidate() => IsValid = false;
     }
 }

NEG/UI/PriorityQueue.cs

@@ -248,10 +248,8 @@ namespace System.Collections.Generic
         public PriorityQueue(int initialCapacity, IComparer<TPriority>? comparer)
         {
             if (initialCapacity < 0)
-            {
                 throw new ArgumentOutOfRangeException(
                     nameof(initialCapacity), initialCapacity, SR.ArgumentOutOfRange_NeedNonNegNum);
-            }
 
             _nodes = new (TElement, TPriority)[initialCapacity];
             _comparer = InitializeComparer(comparer);
@@ -491,7 +489,7 @@ namespace System.Collections.Generic
                 {
                     int i = 0;
                     (TElement, TPriority)[] nodes = _nodes;
-                    foreach (var (element, priority) in items)
+                    foreach ((var element, var priority) in items)
                     {
                         if (nodes.Length == i)
                         {
@@ -510,8 +508,9 @@ namespace System.Collections.Generic
                 if (_size > 1) Heapify();
             }
             else
-                foreach (var (element, priority) in items)
-                    Enqueue(element, priority);
+            {
+                foreach ((var element, var priority) in items) Enqueue(element, priority);
+            }
         }
 
         /// <summary>
@@ -555,8 +554,9 @@ namespace System.Collections.Generic
                 if (i > 1) Heapify();
             }
             else
-                foreach (var element in elements)
-                    Enqueue(element, priority);
+            {
+                foreach (var element in elements) Enqueue(element, priority);
+            }
         }
 
         /// <summary>
@@ -684,15 +684,11 @@ namespace System.Collections.Generic
             int lastParentWithChildren = GetParentIndex(_size - 1);
 
             if (_comparer == null)
-            {
                 for (int index = lastParentWithChildren; index >= 0; --index)
                     MoveDownDefaultComparer(nodes[index], index);
-            }
             else
-            {
                 for (int index = lastParentWithChildren; index >= 0; --index)
                     MoveDownCustomComparer(nodes[index], index);
-            }
         }
 
         /// <summary>
@@ -719,7 +715,9 @@ namespace System.Collections.Generic
                     nodeIndex = parentIndex;
                 }
                 else
+                {
                     break;
+                }
             }
 
             nodes[nodeIndex] = node;
@@ -750,7 +748,9 @@ namespace System.Collections.Generic
                     nodeIndex = parentIndex;
                 }
                 else
+                {
                     break;
+                }
             }
 
             nodes[nodeIndex] = node;
@@ -894,10 +894,8 @@ namespace System.Collections.Generic
                 if (array.GetLowerBound(0) != 0) throw new ArgumentException(SR.Arg_NonZeroLowerBound, nameof(array));
 
                 if (index < 0 || index > array.Length)
-                {
                     throw new ArgumentOutOfRangeException(nameof(index), index,
                         SR.ArgumentOutOfRange_IndexMustBeLessOrEqual);
-                }
 
                 if (array.Length - index < _queue._size) throw new ArgumentException(SR.Argument_InvalidOffLen);
 

NEG/UI/UiManager.cs

@@ -2,28 +2,47 @@ using JetBrains.Annotations;
 using NEG.UI.Area;
 using NEG.UI.Popup;
 using NEG.UI.Window;
-using NegUtils.NEG.UI;
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 
 namespace NEG.UI
 {
     [PublicAPI]
-    public abstract class UiManager : IDisposable
+    public abstract class UiManager
     {
+        public static UiManager Instance { get; private set; }
+        
+        /// <summary>
+        /// Current area shown on screen.
+        /// </summary>
+        public IArea CurrentArea
+        {
+            get => currentArea;
+            set
+            {
+                currentArea?.SetEnabled(false);
+
+                currentArea = value;
+
+                currentArea?.SetEnabled(true);
+            }
+        }
+        
+        /// <summary>
+        /// Current window that is considered main (focused, lastly opened). Can be null.
+        /// </summary>
+        public IWindow CurrentMainWindow { get; protected set; }
+
         private IArea currentArea;
-        protected IDefaultPopup currentDefaultPopup;
         private (PopupData data, int priority) currentShownPopup;
+        protected IDefaultPopup currentDefaultPopup;
+
+        private PriorityQueue<PopupData, int> popupsToShow = new();
 
         //TODO: localize
         private string localizedYes = "Yes", localizedNo = "No", localizedOk = "Ok";
 
-        private List<IWindow> mainWindows;
-
-        private PriorityQueue<PopupData, int> popupsToShow = new();
-
         protected UiManager(IArea startArea)
         {
             if (Instance != null)
@@ -35,39 +54,10 @@ namespace NEG.UI
             Instance = this;
 
             CurrentArea = startArea;
-            mainWindows = new List<IWindow>();
-        }
-
-        public static UiManager Instance { get; protected set; }
-
-        /// <summary>
-        ///     Current area shown on screen.
-        /// </summary>
-        public IArea CurrentArea
-        {
-            get => currentArea;
-            set
-            {
-                currentArea?.Close();
-
-                currentArea = value;
-
-                currentArea?.Open();
-            }
         }
 
         /// <summary>
-        ///     Current window that is considered main (focused, lastly opened). Can be null.
-        /// </summary>
-        public IWindow CurrentMainWindow => mainWindows.LastOrDefault();
-
-        public PopupData CurrentPopup => currentShownPopup.data;
-
-        public virtual void Dispose() => Instance = null;
-
-        /// <summary>
-        ///     Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later.
-        ///     It will be closed after pressing ok button.
+        /// Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later. It will be closed after pressing ok button.
         /// </summary>
         /// <param name="title">popup title</param>
         /// <param name="content">popup content</param>
@@ -76,18 +66,16 @@ namespace NEG.UI
         /// <param name="priority">priority of popup (lower number -> show first)</param>
         /// <param name="forceShow">force show current popup only if currently shown has lower priority</param>
         /// <returns>data for created popup, can be used to invalidate popup (will not show)</returns>
-        public PopupData ShowOkPopup(string title, string content, string okText = null, Action okPressed = null,
-            int priority = 0, bool forceShow = false)
+        public PopupData ShowOkPopup(string title, string content, string okText = null, Action okPressed = null, int priority = 0, bool forceShow = false)
         {
             var data = new DefaultPopupData(currentDefaultPopup, title, content,
-                new List<(string, Action)> { (okText ?? localizedOk, okPressed) });
+                new List<(string, Action)>() { (okText ?? localizedOk, okPressed) });
             ShowPopup(data, priority, forceShow);
             return data;
         }
-
+        
         /// <summary>
-        ///     Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later.
-        ///     It will be closed after pressing yes or no button.
+        /// Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later. It will be closed after pressing yes or no button.
         /// </summary>
         /// <param name="title">popup title</param>
         /// <param name="content">popup content</param>
@@ -98,21 +86,16 @@ namespace NEG.UI
         /// <param name="priority">priority of popup (lower number -> show first)</param>
         /// <param name="forceShow">force show current popup only if currently shown has lower priority</param>
         /// <returns>data for created popup, can be used to invalidate popup (will not show)</returns>
-        public PopupData ShowYesNoPopup(string title, string content, string yesText = null, string noText = null,
-            Action yesPressed = null, Action noPressed = null, int priority = 0, bool forceShow = false)
+        public PopupData ShowYesNoPopup(string title, string content, string yesText = null, string noText = null, Action yesPressed = null, Action noPressed = null, int priority = 0, bool forceShow = false)
         {
             var data = new DefaultPopupData(currentDefaultPopup, title, content,
-                new List<(string, Action)>
-                {
-                    (yesText ?? localizedYes, yesPressed), (noText ?? localizedNo, noPressed)
-                });
+                new List<(string, Action)>() { (yesText ?? localizedYes, yesPressed), (noText ?? localizedNo, noPressed) });
             ShowPopup(data, priority, forceShow);
             return data;
         }
-
+        
         /// <summary>
-        ///     Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later.
-        ///     It will be closed after pressing any button.
+        /// Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later. It will be closed after pressing any button.
         /// </summary>
         /// <param name="title">popup title</param>
         /// <param name="content">popup content</param>
@@ -120,16 +103,15 @@ namespace NEG.UI
         /// <param name="priority">priority of popup (lower number -> show first)</param>
         /// <param name="forceShow">force show current popup only if currently shown has lower priority</param>
         /// <returns>data for created popup, can be used to invalidate popup (will not show)</returns>
-        public PopupData ShowPopup(string title, string content, List<(string, Action)> actions, int priority = 0,
-            bool forceShow = false)
+        public PopupData ShowPopup(string title, string content, List<(string, Action)> actions, int priority = 0, bool forceShow = false)
         {
             var data = new DefaultPopupData(currentDefaultPopup, title, content, actions);
             ShowPopup(data, priority, forceShow);
             return data;
         }
-
+        
         /// <summary>
-        ///     Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later.
+        /// Show popup if there is non other currently shown. Otherwise add current popup to ordered queue and show it later.
         /// </summary>
         /// <param name="data">popup data object</param>
         /// <param name="priority">priority of popup (lower number -> show first)</param>
@@ -139,72 +121,35 @@ namespace NEG.UI
             popupsToShow.Enqueue(data, priority);
             UpdatePopupsState(forceShow, priority, data);
         }
-
-        public void UseBack()
-        {
-            IControllable.BackUsed backUsed = new();
-
-            CurrentMainWindow?.TryUseBack(ref backUsed);
-            if (backUsed.Used)
-                return;
-            CurrentArea.TryUseBack(ref backUsed);
-        }
-
-
-        public void RefreshPopups()
-        {
-            if (currentShownPopup.data is { IsValid: true })
-                return;
-            UpdatePopupsState(false);
-        }
-
-        public void SetMainWindow(IWindow window) => mainWindows.Add(window);
-
-        public void MainWindowClosed(IWindow window) => mainWindows.Remove(window);
-
-        public void OnWindowClosed(IWindow window) => MainWindowClosed(window);
-
-        //TODO: select new main window
+        
         protected void PopupClosed(PopupData data)
         {
             if (currentShownPopup.data != data)
-                //Debug.LogError("Popup was not shown");
+            {
+                Debug.LogError("Popup was not shown");
                 return;
+            }
             UpdatePopupsState(false);
         }
-
+        
         protected void SetDefaultPopup(IDefaultPopup popup) => currentDefaultPopup = popup;
 
-
-        protected virtual void UpdatePopupsState(bool forceShow, int priority = 0, PopupData data = null)
+        private void UpdatePopupsState(bool forceShow, int priority = 0, PopupData data = null)
         {
             if (forceShow)
             {
-                if (currentShownPopup.data != null && currentShownPopup.priority >= priority)
+                if(currentShownPopup.priority <= priority)
                     return;
-
+                
                 popupsToShow.Enqueue(currentShownPopup.data, currentShownPopup.priority);
                 ShowPopup(data, priority);
                 return;
             }
+            
+            if(!popupsToShow.TryDequeue(out var d, out int p))
+               return;
 
-            while (popupsToShow.TryDequeue(out var d, out int p))
-            {
-                if (d == null)
-                    continue;
-                if (!d.IsValid)
-                    continue;
-                if (d == currentShownPopup.data)
-                    continue;
-                ShowPopup(d, p);
-                return;
-            }
-
-            if (currentShownPopup.data == null)
-                return;
-            currentShownPopup.data.PopupClosedEvent -= PopupClosed;
-            currentShownPopup.data.Hide();
-            currentShownPopup.data = null;
+            ShowPopup(d, p);
         }
 
         private void ShowPopup(PopupData data, int priority)
@@ -214,10 +159,11 @@ namespace NEG.UI
                 currentShownPopup.data.PopupClosedEvent -= PopupClosed;
                 currentShownPopup.data.Hide();
             }
-
             currentShownPopup = (data, priority);
             data.Show();
             data.PopupClosedEvent += PopupClosed;
         }
     }
-}
+}
+
+

NEG/UI/UnityUi/Area/AutoOpenWindowWhenNoOther.cs

@@ -1,17 +0,0 @@
-using NEG.UI.UnityUi.Window;
-using NEG.UI.Window;
-using UnityEngine;
-
-namespace NEG.UI.Area
-{
-    public class AutoOpenWindowWhenNoOther : MonoBehaviour
-    {
-        [SerializeField] private MonoWindow window;
-
-        private void Start()
-        {
-            if (UiManager.Instance.CurrentMainWindow == null)
-                window.Open();
-        }
-    }
-}

NEG/UI/UnityUi/Area/AutoOpenWindowWhenNoOther.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 473c065573984067a824ebf3b605c3ab
-timeCreated: 1695048071

NEG/UI/UnityUi/Area/AutoWindowOpen.cs

@@ -1,14 +1,15 @@
 using NEG.UI.UnityUi.Window;
 using NEG.UI.Window;
+using System;
 using UnityEngine;
 
 namespace NEG.UI.Area
 {
-    [Tooltip("Automatically open attached window on start")]
+    [Tooltip(tooltip: "Automatically open attached window on start")]
     public class AutoWindowOpen : MonoBehaviour
     {
         [SerializeField] private MonoWindow window;
-
+        
         private void Start() => window.Open();
     }
 }

NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs

@@ -1,16 +0,0 @@
-using NEG.UI.UnityUi;
-using NEG.UI.Window;
-using NegUtils.NEG.UI;
-
-namespace NEG.UI.Area
-{
-    public class CloseMainWindowOnBack : MonoController
-    {
-        protected override void OnBackUsed(IControllable.BackUsed backUsed)
-        {
-            base.OnBackUsed(backUsed);
-            UiManager.Instance.CurrentMainWindow?.Close();
-            backUsed.Used = true;
-        }
-    }
-}

NEG/UI/UnityUi/Area/CloseMainWindowOnBack.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 6ec2bf64cda740a1849d024d4f163a01
-timeCreated: 1686598066

NEG/UI/UnityUi/Area/MonoArea.cs

@@ -1,19 +1,30 @@
-using NEG.UI.UnityUi.WindowSlot;
+using System.Collections.Generic;
+using UnityEngine;
+using NEG.UI.Popup;
+using NEG.UI.UnityUi.Window;
+using NEG.UI.UnityUi.WindowSlot;
 using NEG.UI.Window;
 using NEG.UI.WindowSlot;
-using NegUtils.NEG.UI;
 using System;
-using System.Collections.Generic;
-using UnityEngine;
 
 namespace NEG.UI.Area
 {
     public class MonoArea : MonoBehaviour, IArea
     {
+        public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
+        public IWindowSlot DefaultWindowSlot => windowSlots[0];
+        
         [SerializeField] private bool setAsDefaultArea;
 
         [SerializeField] private List<MonoWindowSlot> windowSlots;
-        public IWindowSlot DefaultWindowSlot => windowSlots[0];
+
+        public virtual void SetEnabled(bool setEnabled) => gameObject.SetActive(setEnabled);
+
+        public virtual void OpenWindow(IWindow window, object data = null)
+        {
+            DefaultWindowSlot.AttachWindow(window);
+            window.SetData(data);
+        }
 
         protected virtual void Awake()
         {
@@ -21,40 +32,10 @@ namespace NEG.UI.Area
                 UiManager.Instance.CurrentArea = this;
         }
 
-        private void Start()
+        protected virtual void OnDestroy()
         {
-            if (!setAsDefaultArea)
-                Close();
-        }
-
-        private void OnDestroy()
-        {
-            if (UiManager.Instance == null)
-                return;
             if (ReferenceEquals(UiManager.Instance.CurrentArea, this))
                 UiManager.Instance.CurrentArea = null;
         }
-
-        public event Action<object> OnOpened;
-        public event Action OnClosed;
-        public event Action<IControllable.BackUsed> OnBackUsed;
-
-        public IEnumerable<IWindowSlot> AvailableSlots => windowSlots;
-
-        public void Open()
-        {
-            gameObject.SetActive(true);
-            OnOpened?.Invoke(null);
-        }
-
-        public void Close()
-        {
-            gameObject.SetActive(false);
-            OnClosed?.Invoke();
-        }
-
-        public void OpenWindow(IWindow window, object data = null) => DefaultWindowSlot.AttachWindow(window, data);
-
-        public void TryUseBack(ref IControllable.BackUsed backUsed) => OnBackUsed?.Invoke(backUsed);
     }
 }

NEG/UI/UnityUi/Area/MonoArea.cs.meta

@@ -1,11 +1,3 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
 guid: 39eb59ca1ef60934abb3f0c64169be65
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 10
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+timeCreated: 1670707479

NEG/UI/UnityUi/Buttons/BaseButton.cs

@@ -1,104 +1,78 @@
-using KBCore.Refs;
-using NEG.UI.UnityUi.Buttons.Behaviours;
-using NEG.UI.UnityUi.Buttons.Settings;
+using FMOD.Studio;
+using FMODUnity;
 using System;
-using System.Collections.Generic;
-using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 namespace NEG.UI.UnityUi.Buttons
 {
-    [DefaultExecutionOrder(-1)]
-    [RequireComponent(typeof(Button))]
+    [RequireComponent(typeof(ButtonSerializeFields))]
     public class BaseButton : MonoBehaviour, ISelectHandler, IDeselectHandler, IPointerEnterHandler, IPointerExitHandler
     {
-        public delegate void SelectionHandler(bool isSilent);
+        public event Action OnButtonPressed;
+        
+        public bool Interactable { get => serializeFields.Button.interactable; set => serializeFields.Button.interactable = value; }
+        
+        [SerializeField]
+        protected ButtonSerializeFields serializeFields;
 
-        [SerializeField] [Self(Flag.Optional)] private Button button;
+        private bool isHovered;
 
-        [SerializeField] [Child(Flag.Optional)]
-        private TMP_Text text;
-
-        [SerializeField] [Child(Flag.Optional)]
-        private Image icon;
-
-        [SerializeField] private ButtonSettings groupButtonSettings;
-
-        private readonly Dictionary<string, ButtonElementBehaviour> behaviours = new();
-
-        public bool Interactable { get => button.interactable; set => button.interactable = value; }
-
-        public TMP_Text Text => text;
-
-        protected virtual void Awake()
+        public virtual void OnSelect(BaseEventData eventData)
         {
-            button.onClick.AddListener(OnClicked);
-            if (groupButtonSettings == null)
-                MonoUiManager.Instance.DefaultUiSettings.Apply(this);
-            else
-                groupButtonSettings.Apply(this);
+            if (serializeFields.Text)
+                serializeFields.Text.color = serializeFields.SelectedTextColor;
         }
 
-        private void Start() => OnDeselect(null);
+        public void OnDeselect(BaseEventData eventData)
+        {
+            if (serializeFields.Text)
+                serializeFields.Text.color = serializeFields.DeselectedTextColor;
+        }
 
-        private void OnValidate() => this.ValidateRefs();
-
-        public void OnDeselect(BaseEventData eventData) => OnDeselected?.Invoke(eventData is SilentEventData);
-
-        public void OnPointerEnter(PointerEventData eventData) => EventSystem.current.SetSelectedGameObject(gameObject);
+        public void OnPointerEnter(PointerEventData eventData)
+        {
+            isHovered = true;
+            if (serializeFields.Text)
+                serializeFields.Text.color = serializeFields.SelectedTextColor;
+        }
 
         public void OnPointerExit(PointerEventData eventData)
         {
-            if (EventSystem.current.currentSelectedGameObject == gameObject)
-                EventSystem.current.SetSelectedGameObject(null);
+            isHovered = false;
+            if (serializeFields.Text)
+                serializeFields.Text.color = serializeFields.DeselectedTextColor;
         }
 
-        public virtual void OnSelect(BaseEventData eventData) => OnSelected?.Invoke(eventData is SilentEventData);
-
-        /// <summary>
-        ///     is silent
-        /// </summary>
-        public event SelectionHandler OnSelected;
-
-        public event SelectionHandler OnDeselected;
-        public event Action OnButtonPressed;
-
-        public void SetText(string txt)
+        public void SetText(string text)
         {
-            if (text == null)
+            if(serializeFields == null)
                 return;
-            text.text = txt;
+            if(serializeFields.Text == null)
+                return;
+            serializeFields.Text.text = text;
         }
 
-        public void AddOrOverrideSetting(SettingData data)
+        protected virtual void Awake()
         {
-            if (behaviours.TryGetValue(data.Key, out var setting))
-            {
-                setting.ChangeData(data);
-                return;
-            }
-
-            behaviours.Add(data.Key, MonoUiManager.Instance.BehavioursFactory.CreateInstance(data.Key, this, data));
+            if(serializeFields == null)
+                serializeFields = GetComponent<ButtonSerializeFields>();
+            serializeFields.Button.onClick.AddListener(OnClicked);
+            OnDeselect(null);
         }
 
-        public void RemoveSetting(string key)
+        private void OnValidate()
         {
-            if (!behaviours.TryGetValue(key, out var setting))
-            {
-                Debug.LogError($"Behaviour with key {key} was not found");
-                return;
-            }
-
-            setting.Dispose();
-            behaviours.Remove(key);
+            if(serializeFields == null)
+                serializeFields = GetComponent<ButtonSerializeFields>();
         }
 
         protected virtual void OnClicked()
         {
             OnDeselect(null);
+            isHovered = false;
             OnButtonPressed?.Invoke();
         }
     }
-}
+}

NEG/UI/UnityUi/Buttons/BaseButton.cs.meta

@@ -1,11 +1,3 @@
 fileFormatVersion: 2
 guid: 3a250ef2d0c34e7396a16fc5eddbdb01
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: -1
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+timeCreated: 1670777213

NEG/UI/UnityUi/Buttons/Behaviours.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 953c3353e3af44258625fe607ede632b
-timeCreated: 1683915598

NEG/UI/UnityUi/Buttons/Behaviours/ButtonElementBehaviour.cs

@@ -1,21 +0,0 @@
-using NEG.UI.UnityUi.Buttons.Settings;
-using System;
-
-namespace NEG.UI.UnityUi.Buttons.Behaviours
-{
-    public abstract class ButtonElementBehaviour : IDisposable
-    {
-        protected readonly BaseButton button;
-        protected SettingData baseData;
-
-        public ButtonElementBehaviour(BaseButton baseButton, SettingData settingData)
-        {
-            button = baseButton;
-            baseData = settingData;
-        }
-
-        public abstract void Dispose();
-
-        public virtual void ChangeData(SettingData newData) => baseData = newData;
-    }
-}

NEG/UI/UnityUi/Buttons/Behaviours/ButtonElementBehaviour.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a5e3decad6424cb288eff3e6f7e0d28e
-timeCreated: 1683919740

NEG/UI/UnityUi/Buttons/Behaviours/ChangeTextColorBehaviour.cs

@@ -1,41 +0,0 @@
-using NEG.UI.UnityUi.Buttons.Settings;
-using NEG.Utils;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Behaviours
-{
-    public class ChangeTextColorBehaviour : ButtonElementBehaviour
-    {
-        private ColorData data;
-
-        public ChangeTextColorBehaviour(BaseButton baseButton, ColorData data) : base(baseButton, data)
-        {
-            if (baseButton.Text == null)
-                return;
-
-            baseButton.OnSelected += OnButtonSelected;
-            baseButton.OnDeselected += OnButtonDeselected;
-            ChangeData(data);
-        }
-
-        public override void ChangeData(SettingData newData)
-        {
-            base.ChangeData(newData);
-            Debug.Assert(newData is ColorData, "newData is not ColorData");
-            data = (ColorData)newData;
-        }
-
-        public override void Dispose()
-        {
-            button.OnSelected -= OnButtonSelected;
-            button.OnDeselected -= OnButtonDeselected;
-        }
-
-        [FactoryRegistration]
-        private static void RegisterInFactory() =>
-            MonoUiManager.Instance.BehavioursFactory.Register("ChangeTextColor", typeof(ChangeTextColorBehaviour));
-
-        private void OnButtonSelected(bool _) => button.Text.color = data.SelectedColor;
-        private void OnButtonDeselected(bool _) => button.Text.color = data.DeselectedColor;
-    }
-}

NEG/UI/UnityUi/Buttons/Behaviours/ChangeTextColorBehaviour.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f2079225d6e34001ae85f74a0a418d68
-timeCreated: 1683919878

NEG/UI/UnityUi/Buttons/Behaviours/SimpleSoundBehaviour.cs

@@ -1,21 +0,0 @@
-#if FMOD
-namespace NEG.UI.UnityUi.Buttons.Behaviours
-{
-    public class SimpleSoundBehaviour : ButtonElementBehaviour
-    {
-        public SimpleSoundBehaviour(BaseButton baseButton, FmodSoundData data) : base(baseButton, data)
-        {
-            //TODO: use silnet to not play sound
-        }
-
-        [FactoryRegistration]
-        private static void RegisterInFactory() =>
-            MonoUiManager.Instance.BehavioursFactory.Register("SimpleSound", typeof(SimpleSoundBehaviour));
-
-        public override void ChangeData(SettingData newData) => throw new System.NotImplementedException();
-
-        public override void Dispose() => throw new System.NotImplementedException();
-    }
-}
-
-#endif

NEG/UI/UnityUi/Buttons/Behaviours/SimpleSoundBehaviour.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d75c0d86eeab47a1a6340f0b03b83de0
-timeCreated: 1684002680

NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs

@@ -0,0 +1,33 @@
+using FMODUnity;
+using System;
+using TMPro;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace NEG.UI.UnityUi.Buttons
+{
+    public class ButtonSerializeFields : MonoBehaviour
+    {
+        [field: SerializeField]
+        public Button Button { get; private set; }
+        [field: SerializeField]
+        public TMP_Text Text { get; private set; }
+        [field: SerializeField]
+        public Color SelectedTextColor { get; private set; }
+        [field: SerializeField]
+        public Color DeselectedTextColor { get; private set; }
+        [field: SerializeField]
+        public EventReference HoverEventRef { get; private set; }
+        [field: SerializeField]
+        public EventReference ClickEventRef { get; private set; }
+
+        private void OnValidate()
+        {
+            if(Button == null)
+                Button = GetComponent<Button>();
+            if (Text == null)
+                Text = GetComponentInChildren<TMP_Text>();
+        }
+    }
+
+}

NEG/UI/UnityUi/Buttons/ButtonSerializeFields.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3f8c6cf4cf18463c86ec1165c61c79b2
+timeCreated: 1670777232

NEG/UI/UnityUi/Buttons/ChangeSceneButton.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace NEG.UI.UnityUi.Buttons
+{
+    [RequireComponent(typeof(BaseButton))]
+    public class ChangeSceneButton : MonoBehaviour
+    {
+        [Header("Leave empty to use int value")]
+        [SerializeField] private string sceneName;
+
+        [SerializeField] private int sceneIndex;
+        
+        private void Awake() => GetComponent<BaseButton>().OnButtonPressed += OnClicked;
+
+        private void OnClicked()
+        {
+            if (string.IsNullOrEmpty(sceneName))
+                SceneManager.LoadScene(sceneIndex);
+            else
+                SceneManager.LoadScene(sceneName);
+        }
+    }
+}

NEG/UI/UnityUi/Buttons/CloseAllWindows.cs

@@ -0,0 +1,11 @@
+using UnityEngine;
+
+namespace NEG.UI.UnityUi.Buttons
+{
+    [RequireComponent(typeof(BaseButton))]
+    public class CloseAllWindows : MonoBehaviour
+    {
+        private void Awake() => GetComponent<BaseButton>().OnButtonPressed += OnClicked;
+        private void OnClicked() => UiManager.Instance.CurrentArea.CloseAllWindows();
+    }
+}

NEG/UI/UnityUi/Buttons/CloseWindow.cs

@@ -1,21 +1,23 @@
 using NEG.UI.UnityUi.Window;
 using NEG.UI.Window;
+using System;
 using UnityEngine;
 
-namespace NEG.UI.UnityUi.Buttons.Reactions
+namespace NEG.UI.UnityUi.Buttons
 {
     [RequireComponent(typeof(BaseButton))]
-    public class CloseWindow : ButtonReaction
+    public class CloseWindow : MonoBehaviour
     {
         [SerializeField] private MonoWindow windowToClose;
+        
+        private void Awake() => GetComponent<BaseButton>().OnButtonPressed += OnClicked;
+        private void OnClicked() => windowToClose.Close();
 
         private void OnValidate()
         {
-            if (windowToClose != null)
+            if(windowToClose != null)
                 return;
             windowToClose = GetComponentInParent<MonoWindow>();
         }
-
-        protected override void OnClicked() => windowToClose.Close();
     }
 }

NEG/UI/UnityUi/Buttons/CloseWindowOnImageTouch.cs

@@ -8,7 +8,7 @@ namespace NEG.UI.UnityUi.Buttons
     public class CloseWindowOnImageTouch : MonoBehaviour, IPointerDownHandler
     {
         [SerializeField] private MonoWindow windowToClose;
-
+        
         public void OnPointerDown(PointerEventData eventData) => windowToClose.Close();
     }
 }

NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs

@@ -1,64 +0,0 @@
-using System;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-namespace NEG.UI.UnityUi.Buttons
-{
-    public class CustomNavigationButton : Button
-    {
-        [SerializeField] [HideInInspector] private OverridableNavigation upOverride;
-        [SerializeField] private OverridableNavigation downOverride;
-        [SerializeField] private OverridableNavigation leftOverride;
-        [SerializeField] private OverridableNavigation rightOverride;
-
-
-        public override void OnMove(AxisEventData eventData)
-        {
-            switch (eventData.moveDir)
-            {
-                case MoveDirection.Left:
-                    if (TryNavigate(eventData, leftOverride))
-                        return;
-                    break;
-                case MoveDirection.Up:
-                    if (TryNavigate(eventData, upOverride))
-                        return;
-                    break;
-                case MoveDirection.Right:
-                    if (TryNavigate(eventData, rightOverride))
-                        return;
-                    break;
-                case MoveDirection.Down:
-                    if (TryNavigate(eventData, downOverride))
-                        return;
-                    break;
-                case MoveDirection.None:
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-            base.OnMove(eventData);
-        }
-
-        public static bool TryNavigate(BaseEventData eventData, OverridableNavigation overrideNavigation)
-        {
-            if (!overrideNavigation.Override)
-                return false;
-
-            if (overrideNavigation.Selectable == null || !overrideNavigation.Selectable.IsActive())
-                return true;
-
-            eventData.selectedObject = overrideNavigation.Selectable.gameObject;
-            return true;
-        }
-    }
-
-    [Serializable]
-    public class OverridableNavigation
-    {
-        [field: SerializeField] public bool Override { get; private set; }
-        [field: SerializeField] public Selectable Selectable { get; private set; }
-    }
-}

NEG/UI/UnityUi/Buttons/CustomNavigationButton.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d9b5ca8863c240f792232d6e276d8d56
-timeCreated: 1684520970

NEG/UI/UnityUi/Buttons/OpenWindow.cs

@@ -0,0 +1,21 @@
+using NEG.UI.UnityUi.Window;
+using NEG.UI.UnityUi.WindowSlot;
+using System;
+using UnityEngine;
+using NEG.UI.Window;
+using NEG.UI.WindowSlot;
+
+namespace NEG.UI.UnityUi.Buttons
+{
+    [RequireComponent(typeof(BaseButton))]
+    public class OpenWindow : MonoBehaviour
+    {
+        [SerializeField] private MonoWindow window;
+        [Header("Open on default area slot if empty")]
+        [SerializeField] private MonoWindowSlot slot;
+        
+        private void Awake() => GetComponent<BaseButton>().OnButtonPressed += OnClicked;
+
+        private void OnClicked() => window.Open(slot);
+    }
+}

NEG/UI/UnityUi/Buttons/Reactions.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: ccaf0d2f63be41f6956471dcd9c210d9
-timeCreated: 1709465582

NEG/UI/UnityUi/Buttons/Reactions/ButtonReaction.cs

@@ -1,19 +0,0 @@
-using KBCore.Refs;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons
-{
-    [RequireComponent(typeof(BaseButton))]
-    public abstract class ButtonReaction : MonoBehaviour
-    {
-        [SerializeField] [Self(Flag.Optional)] protected BaseButton button;
-
-        protected virtual void Awake() => button.OnButtonPressed += OnClicked;
-
-        protected virtual void OnDestroy() => button.OnButtonPressed -= OnClicked;
-
-        private void OnValidate() => this.ValidateRefs();
-
-        protected abstract void OnClicked();
-    }
-}

NEG/UI/UnityUi/Buttons/Reactions/ButtonReaction.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: a9761128a04b49c2a26eddfabe70331f
-timeCreated: 1675707257

NEG/UI/UnityUi/Buttons/Reactions/ChangeScene.cs

@@ -1,22 +0,0 @@
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-namespace NEG.UI.UnityUi.Buttons.Reactions
-{
-    [RequireComponent(typeof(BaseButton))]
-    public class ChangeScene : ButtonReaction
-    {
-        [Header("Leave empty to use int value")] [SerializeField]
-        private string sceneName;
-
-        [SerializeField] private int sceneIndex;
-
-        protected override void OnClicked()
-        {
-            if (string.IsNullOrEmpty(sceneName))
-                SceneManager.LoadScene(sceneIndex);
-            else
-                SceneManager.LoadScene(sceneName);
-        }
-    }
-}

NEG/UI/UnityUi/Buttons/Reactions/CloseAllWindows.cs

@@ -1,7 +0,0 @@
-namespace NEG.UI.UnityUi.Buttons.Reactions
-{
-    public class CloseAllWindows : ButtonReaction
-    {
-        protected override void OnClicked() => UiManager.Instance.CurrentArea.CloseAllWindows();
-    }
-}

NEG/UI/UnityUi/Buttons/Reactions/ExitGame.cs

@@ -1,16 +0,0 @@
-using UnityEditor;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Reactions
-{
-    public class ExitGame : ButtonReaction
-    {
-        protected override void OnClicked()
-        {
-#if UNITY_EDITOR
-            EditorApplication.isPlaying = false;
-#endif
-            Application.Quit();
-        }
-    }
-}

NEG/UI/UnityUi/Buttons/Reactions/ExitGame.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 185f765a5bf7487ab85a7d95fc0ef2c7
-timeCreated: 1709473462

NEG/UI/UnityUi/Buttons/Reactions/OpenAsCurrentMainChild.cs

@@ -1,13 +0,0 @@
-using NEG.UI.UnityUi.Window;
-using NEG.UI.Window;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Reactions
-{
-    public class OpenAsCurrentMainChild : ButtonReaction
-    {
-        [SerializeField] private MonoWindow windowToOpen;
-
-        protected override void OnClicked() => UiManager.Instance.CurrentMainWindow.OpenAsChild(windowToOpen);
-    }
-}

NEG/UI/UnityUi/Buttons/Reactions/OpenAsCurrentMainChild.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 049e222140c94fc28fb36bca4aaddba4
-timeCreated: 1686595194

NEG/UI/UnityUi/Buttons/Reactions/OpenWindow.cs

@@ -1,18 +0,0 @@
-using NEG.UI.UnityUi.Window;
-using NEG.UI.UnityUi.WindowSlot;
-using NEG.UI.Window;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Reactions
-{
-    [RequireComponent(typeof(BaseButton))]
-    public class OpenWindow : ButtonReaction
-    {
-        [SerializeField] private MonoWindow window;
-
-        [Header("Open on default area slot if empty")] [SerializeField]
-        private MonoWindowSlot slot;
-
-        protected override void OnClicked() => window.Open(slot);
-    }
-}

NEG/UI/UnityUi/Buttons/Settings.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: d25aba738e174616bcab9bf2d52a3ed1
-timeCreated: 1683398272

NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs

@@ -1,23 +0,0 @@
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Settings
-{
-    public class ButtonSettings : MonoBehaviour
-    {
-        [SerializeField] private List<SettingData> settingDatas = new();
-
-        public void Apply(BaseButton button)
-        {
-            foreach (var setting in settingDatas) setting.Apply(button);
-        }
-
-        [ContextMenu("Refresh")]
-        public void Refresh()
-        {
-            settingDatas.Clear();
-            var components = GetComponents<SettingData>();
-            foreach (var data in components) settingDatas.Add(data);
-        }
-    }
-}

NEG/UI/UnityUi/Buttons/Settings/ButtonSettings.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b5292008faae496ab9028ad1faa0a3ba
-timeCreated: 1683398713

NEG/UI/UnityUi/Buttons/Settings/ColorData.cs

@@ -1,10 +0,0 @@
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Settings
-{
-    public class ColorData : SettingData
-    {
-        [field: SerializeField] public Color SelectedColor { get; private set; } = Color.black;
-        [field: SerializeField] public Color DeselectedColor { get; private set; } = Color.black;
-    }
-}

NEG/UI/UnityUi/Buttons/Settings/ColorData.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: cec5286cd31b4819981e244b1adb977e
-timeCreated: 1684001181

NEG/UI/UnityUi/Buttons/Settings/FmodSoundData.cs

@@ -1,14 +0,0 @@
-#if FMOD
-using FMODUnity;
-using UnityEngine;
-
-namespace NEG.UI.UnityUi.Buttons.Settings
-{
-    public class FmodSoundData : SettingData
-    {
-        [field: SerializeField] public EventReference SelectedSound { get; private set; }
-        [field: SerializeField] public EventReference ClickedSound { get; private set; }
-    }
-}
-
-#endif