Update Commons, add Comparers, version 0.1.9

techno-dwarf-works · May 26, 2024 · 7c56294 · 7c56294
1 parent 5d96c71
commit 7c56294
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef b/Assets/BetterLocators/Runtime/BetterLocators.Runtime.asmdef
@@ -16,7 +16,7 @@
     "versionDefines": [
         {
             "name": "com.tdw.better.services",
-            "expression": "0.1.0",
+            "expression": "0.1.1",
             "define": "BETTER_SERVICES"
         }
     ],

diff --git a/Assets/BetterLocators/Runtime/Implementations/Locator.cs b/Assets/BetterLocators/Runtime/Implementations/Locator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Better.Commons.Runtime.Extensions;
 using Better.Commons.Runtime.Utility;
 
 namespace Better.Locators.Runtime
@@ -15,9 +16,13 @@ public class Locator<TKey, TElement> : ILocator<TKey, TElement>
 
         public int Count => _sourceMap.Count;
 
-        public Locator()
+        public Locator(IEqualityComparer<TKey> comparer)
+        {
+            _sourceMap = new(comparer);
+        }
+
+        public Locator() : this(EqualityComparer<TKey>.Default)
         {
-            _sourceMap = new();
         }
 
         public delegate void OnElementChanged(TKey key, TElement element);
@@ -114,13 +119,13 @@ public bool Remove(TElement element)
                 return false;
             }
 
-            var removed = true; TKey key = default; //_sourceMap.Remove(element, out var key); TODO: Commons DictionaryExtensions dependency
-            if (removed)
+            if (_sourceMap.Remove(element, out var key))
             {
                 OnRemoved(key, element);
+                return true;
             }
 
-            return removed;
+            return false;
         }
 
         protected virtual void OnRemoved(TKey key, TElement element)

diff --git a/Assets/BetterLocators/package.json b/Assets/BetterLocators/package.json
@@ -1,12 +1,12 @@
 {
   "name": "com.tdw.better.locators",
   "displayName": "Better Locators",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {
     "com.tdw.better.internal.core": "0.0.2",
-    "com.tdw.better.commons": "0.0.4",
+    "com.tdw.better.commons": "0.0.7",
     "com.uurha.betterattributes": "3.1.3"
   },
   "author": {

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -1,7 +1,8 @@
 {
   "dependencies": {
+    "com.tdw.better.commons": "0.0.7",
     "com.tdw.better.internal.core": "0.0.2",
-    "com.tdw.better.services": "0.1.0",
+    "com.tdw.better.services": "0.1.1",
     "com.unity.collab-proxy": "2.0.1",
     "com.unity.feature.development": "1.0.1",
     "com.unity.ide.rider": "3.0.18",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
     "com.tdw.better.commons": {
-      "version": "0.0.4",
-      "depth": 1,
+      "version": "0.0.7",
+      "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.tdw.better.internal.core": "0.0.2"
@@ -17,7 +17,7 @@
       "url": "https://package.openupm.com"
     },
     "com.tdw.better.services": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "depth": 0,
       "source": "registry",
       "dependencies": {