Completely fix dropdowns and sliders again

SpaceWarpDev · Jan 4, 2024 · 99b2e46 · 99b2e46
1 parent 26df719
commit 99b2e46
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/SpaceWarp.Core/API/Configuration/BepInExConfigFile.cs b/src/SpaceWarp.Core/API/Configuration/BepInExConfigFile.cs
@@ -61,8 +61,8 @@ public IConfigEntry Bind<T>(
         IValueConstraint valueConstraint
     )
     {
-        return new BepInExConfigEntry(AdaptedConfigFile.Bind(new ConfigDefinition(section, key), defaultValue,
-            new ConfigDescription(description, valueConstraint.ToAcceptableValueBase())));
+        return _storedEntries[(section, key)] = new BepInExConfigEntry(AdaptedConfigFile.Bind(new ConfigDefinition(section, key), defaultValue,
+            new ConfigDescription(description, valueConstraint.ToAcceptableValueBase())),valueConstraint);
     }
 
     /// <inheritdoc />

diff --git a/src/SpaceWarp.Core/API/Configuration/IValueConstraint.cs b/src/SpaceWarp.Core/API/Configuration/IValueConstraint.cs
@@ -36,7 +36,7 @@ public static IValueConstraint FromAcceptableValueBase(AcceptableValueBase accep
                 .GetProperty("AcceptableValues", BindingFlags.Instance | BindingFlags.Public)
                 ?.GetMethod;
             var values = valuesMethod?.Invoke(acceptableValueBase,[]);
-            return Activator.CreateInstance(typeof(ListConstraint<>).MakeGenericType(type), [values]) as IValueConstraint;
+            return (IValueConstraint)Activator.CreateInstance(typeof(ListConstraint<>).MakeGenericType(type), [values]);
         }
 
         if (acceptableValueBase.GetType().GetGenericTypeDefinition() == typeof(AcceptableValueRange<>))
@@ -48,7 +48,7 @@ public static IValueConstraint FromAcceptableValueBase(AcceptableValueBase accep
                 .GetProperty("MaxValue", BindingFlags.Instance | BindingFlags.Public)?.GetMethod;
             var min = minMethod?.Invoke(acceptableValueBase, []);
             var max = maxMethod?.Invoke(acceptableValueBase, []);
-            return Activator.CreateInstance(typeof(RangeConstraint<>).MakeGenericType(type),[min,max]) as IValueConstraint;
+            return (IValueConstraint)Activator.CreateInstance(typeof(RangeConstraint<>).MakeGenericType(type),[min,max]);
         }
 
         return null;

diff --git a/src/SpaceWarp.UI/API/UI/Settings/ModsPropertyDrawers.cs b/src/SpaceWarp.UI/API/UI/Settings/ModsPropertyDrawers.cs
@@ -383,15 +383,15 @@ private static Func<string, IConfigEntry, GameObject> GenerateAbstractGenericDra
                 t.GenericTypeArguments[0] == entrySettingType)
             {
                 if (valueListMethod != null)
-                    return (GameObject)valueListMethod.Invoke(null, new object[] { name, entry, entry.Constraint });
+                    return (GameObject)valueListMethod.Invoke(null, [name, entry, entry.Constraint]);
             }
 
             if (t?.GetGenericTypeDefinition() == typeof(RangeConstraint<>) &&
                 t.GenericTypeArguments[0] == entrySettingType)
             {
                 if (valueRangeMethod != null)
                 {
-                    return (GameObject)valueRangeMethod.Invoke(null, new object[] { name, entry, entry.Constraint });
+                    return (GameObject)valueRangeMethod.Invoke(null, [name, entry, entry.Constraint]);
                 }
             }
             var inputFieldCopy = UnityObject.Instantiate(InputFieldPrefab);
@@ -753,6 +753,10 @@ private static GameObject CreateStringConfig(ConfigEntryBase entryBase)
 
     private static GameObject CreateStringConfigAbstracted(string name, IConfigEntry entry)
     {
+        if (entry.Constraint is ListConstraint<string> constraint)
+        {
+            return CreateFromListConstraint(name, entry, constraint);
+        }
         var inputFieldCopy = UnityObject.Instantiate(InputFieldPrefab);
         var lab = inputFieldCopy.GetChild("Label");
         lab.GetComponent<Localize>().SetTerm(name);