From a83c4cfb3b6e8273a74c439d128bed68d1f16d8b Mon Sep 17 00:00:00 2001
From: Hubert Mattusch <mattusch.hubert@gmail.com>
Date: Thu, 17 Aug 2023 10:47:21 +0200
Subject: [PATCH] Cleanup

---
 .../MultiSelectChips/MultiSelectChipItem.cs   |  8 +--
 .../MultiSelectChips/MultiSelectChips.cs      | 53 +++----------------
 UiToolkit/MultiSelectChips/Resources.meta     |  8 +++
 .../{ => Resources}/MultiSelectChipItem.uxml  |  0
 .../MultiSelectChipItem.uxml.meta             |  0
 .../{ => Resources}/MultiSelectChips.uxml     |  0
 .../MultiSelectChips.uxml.meta                |  0
 7 files changed, 17 insertions(+), 52 deletions(-)
 create mode 100644 UiToolkit/MultiSelectChips/Resources.meta
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChipItem.uxml (100%)
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChipItem.uxml.meta (100%)
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChips.uxml (100%)
 rename UiToolkit/MultiSelectChips/{ => Resources}/MultiSelectChips.uxml.meta (100%)

diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
index a5b6c96..74dd601 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChipItem.cs
@@ -1,7 +1,4 @@
-#if ADDRESSABLES && UI_ELEMENTS
-using System.Collections;
-using UnityEngine;
-using UnityEngine.UIElements;
+using UnityEngine.UIElements;
 
 namespace NEG.Utils.UiToolkits
 {
@@ -22,5 +19,4 @@ namespace NEG.Utils.UiToolkits
             visualElement.Q<Button>("RemoveBtn").clicked += () => parent.TryRemoveItem(element);
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.cs b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
index 6d63099..245d9bf 100644
--- a/UiToolkit/MultiSelectChips/MultiSelectChips.cs
+++ b/UiToolkit/MultiSelectChips/MultiSelectChips.cs
@@ -1,8 +1,5 @@
-#if ADDRESSABLES && UI_ELEMENTS
 using UnityEngine;
 using UnityEngine.UIElements;
-using UnityEngine.AddressableAssets;
-using UnityEngine.ResourceManagement.AsyncOperations;
 using System.Collections.Generic;
 using System;
 using System.IO;
@@ -51,7 +48,6 @@ namespace NEG.Utils.UiToolkits
         }
 
         private Label label;
-        private AsyncOperationHandle<VisualTreeAsset> uxmlHandle, itemUxmlHandle;
 
         private VisualTreeAsset itemPrefab;
 
@@ -91,13 +87,11 @@ namespace NEG.Utils.UiToolkits
             string path = AssetDatabase.GUIDToAssetPath(AssetDatabase.FindAssets($"t:Script {nameof(MultiSelectChips)}")[0]);
             path = path.Remove(path.LastIndexOf('/'));
 
-            SetVisuals(AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/MultiSelectChips.uxml"));
-            itemPrefab = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/MultiSelectChipItem.uxml");
+            SetVisuals(AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/Resources/MultiSelectChips.uxml"));
+            itemPrefab = AssetDatabase.LoadAssetAtPath<VisualTreeAsset>($"{path}/Resources/MultiSelectChipItem.uxml");
 #else
-            uxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChips.uxml");
-            itemUxmlHandle = Addressables.LoadAssetAsync<VisualTreeAsset>("NegUiToolkits/MultiSelectChipItem.uxml");
-            uxmlHandle.Completed += OnUxmlLoaded;
-            itemUxmlHandle.Completed += OnItemUxmlLoaded;
+            SetVisuals(Resources.Load<VisualTreeAsset>("MultiSelectChips.uxml"));
+            itemPrefab = Resources.Load<VisualTreeAsset>("MultiSelectChipItem.uxml");
 #endif
         }
 
@@ -106,7 +100,7 @@ namespace NEG.Utils.UiToolkits
             if (itemPrefab == null || itemsSource == null || realItemsParent == null)
                 return;
 
-            List<MultiSelectChipItem> itemsToDestroy = new List<MultiSelectChipItem>(spawnedItems);
+            var itemsToDestroy = new List<MultiSelectChipItem>(spawnedItems);
 
             itemsToDestroy.RemoveAll((x) => itemsSource.Contains(x.ChipItem));
 
@@ -132,10 +126,7 @@ namespace NEG.Utils.UiToolkits
             }
         }
 
-        public void TryRemoveItem(IMultiSelectChipItem item)
-        {
-            OnTryingToRemoveItem?.Invoke(item);
-        }
+        public void TryRemoveItem(IMultiSelectChipItem item) => OnTryingToRemoveItem?.Invoke(item);
 
         private void InitLabel()
         {
@@ -146,35 +137,6 @@ namespace NEG.Utils.UiToolkits
             Insert(0, label);
         }
 
-        private void OnUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
-        {
-            if (operation.Status == AsyncOperationStatus.Succeeded)
-            {
-                SetVisuals(operation.Result);
-                Addressables.Release(uxmlHandle);
-                UpdateItems();
-            }
-            else
-            {
-                Debug.LogError($"Asset failed to load.");
-            }
-        }
-
-        private void OnItemUxmlLoaded(AsyncOperationHandle<VisualTreeAsset> operation)
-        {
-
-            if (operation.Status == AsyncOperationStatus.Succeeded)
-            {
-                itemPrefab = operation.Result;
-                Addressables.Release(itemUxmlHandle);
-                UpdateItems();
-            }
-            else
-            {
-                Debug.LogError($"Asset failed to load.");
-            }
-        }
-
         private void SetVisuals(VisualTreeAsset treeAsset)
         {
             realItemsParent = treeAsset.Instantiate();
@@ -187,5 +149,4 @@ namespace NEG.Utils.UiToolkits
             realItemsParent = button.parent;
         }
     }
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/UiToolkit/MultiSelectChips/Resources.meta b/UiToolkit/MultiSelectChips/Resources.meta
new file mode 100644
index 0000000..97a9dd6
--- /dev/null
+++ b/UiToolkit/MultiSelectChips/Resources.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5a807a09d7c00be478bf44636c2cc89f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml b/UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta b/UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml.meta
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChipItem.uxml.meta
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChipItem.uxml.meta
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.uxml b/UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChips.uxml
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml
diff --git a/UiToolkit/MultiSelectChips/MultiSelectChips.uxml.meta b/UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml.meta
similarity index 100%
rename from UiToolkit/MultiSelectChips/MultiSelectChips.uxml.meta
rename to UiToolkit/MultiSelectChips/Resources/MultiSelectChips.uxml.meta