Reverted some types from nullable to not change the api contract. Whoops.

AinaVT · AinaVT · commit 2cb50dbe6588 · 2024-01-08T14:22:29.000-03:00
diff --git a/Assets/LethalConfigManifest.asset b/Assets/LethalConfigManifest.asset
@@ -70,7 +70,7 @@ MonoBehaviour:
   Name: LethalConfig
   Description: Provides an in-game config menu for players to edit their configs,
     and an API for other mods to use and customize their entries.
-  Version: 1.3.1
+  Version: 1.3.2
   Dependencies:
   - {fileID: 11400000, guid: 93f32f19b4b23484b83d50013fee18e8, type: 2}
 --- !u!114 &4587465158208312100
diff --git a/Assets/Scripts/ConfigItems/FloatInputFieldConfigItem.cs b/Assets/Scripts/ConfigItems/FloatInputFieldConfigItem.cs
@@ -16,8 +16,8 @@ public FloatInputFieldConfigItem(ConfigEntry<float> configEntry, FloatInputField
         {
             var acceptableValues = configEntry.Description.AcceptableValues;
 
-            MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? float.MinValue;
-            MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? float.MaxValue;
+            MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;
+            MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 1;
         }
 
         internal override GameObject CreateGameObjectForConfig()
diff --git a/Assets/Scripts/ConfigItems/FloatSliderConfigItem.cs b/Assets/Scripts/ConfigItems/FloatSliderConfigItem.cs
@@ -16,8 +16,8 @@ public FloatSliderConfigItem(ConfigEntry<float> configEntry, FloatSliderOptions
         {
             var acceptableValues = configEntry.Description.AcceptableValues;
 
-            MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? 0;
-            MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? 1;
+            MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;
+            MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 1;
         }
 
         internal override GameObject CreateGameObjectForConfig()
diff --git a/Assets/Scripts/ConfigItems/FloatStepSliderConfigItem.cs b/Assets/Scripts/ConfigItems/FloatStepSliderConfigItem.cs
@@ -17,8 +17,8 @@ public FloatStepSliderConfigItem(ConfigEntry<float> configEntry, FloatStepSlider
         {
             var acceptableValues = configEntry.Description.AcceptableValues;
 
-            MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? 0;
-            MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? 1;
+            MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? 0;
+            MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? 1;
             Step = options.Step;
         }
 
diff --git a/Assets/Scripts/ConfigItems/IntInputFieldConfigItem.cs b/Assets/Scripts/ConfigItems/IntInputFieldConfigItem.cs
@@ -16,8 +16,8 @@ public IntInputFieldConfigItem(ConfigEntry<int> configEntry, IntInputFieldOption
         {
             var acceptableValues = configEntry.Description.AcceptableValues;
 
-            MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? int.MinValue;
-            MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? int.MaxValue;
+            MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;
+            MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 100;
         }
 
         internal override GameObject CreateGameObjectForConfig()
diff --git a/Assets/Scripts/ConfigItems/IntSliderConfigItem.cs b/Assets/Scripts/ConfigItems/IntSliderConfigItem.cs
@@ -17,8 +17,8 @@ public IntSliderConfigItem(ConfigEntry<int> configEntry, IntSliderOptions option
         {
             var acceptableValues = configEntry.Description.AcceptableValues;
 
-            MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;
-            MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 100;
+            MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0; 
+            MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 100;
         }
 
         internal override GameObject CreateGameObjectForConfig()
diff --git a/Assets/Scripts/ConfigItems/Options/BaseOptions.cs b/Assets/Scripts/ConfigItems/Options/BaseOptions.cs
@@ -3,11 +3,6 @@ namespace LethalConfig.ConfigItems.Options
 {
     public class BaseOptions
     {
-        public static BaseOptions Default { get; } = new()
-        {
-            RequiresRestart = true
-        };
-
         /// <summary>
         /// Overrides the name of the item displayed in the UI.
         /// Visual change only.
diff --git a/Assets/Scripts/ConfigItems/Options/FloatInputFieldOptions.cs b/Assets/Scripts/ConfigItems/Options/FloatInputFieldOptions.cs
@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options
 {
     public sealed class FloatInputFieldOptions: BaseOptions
     {
-        public float? Min { get; set; } = null;
-        public float? Max { get; set; } = null;
+        private float _min;
+        internal bool WasMinSet;
+        public float Min { get => _min; set { WasMinSet = true; _min = value; } }
+
+        private float _max;
+        internal bool WasMaxSet;
+        public float Max { get => _max; set { WasMaxSet = true; _max = value; } }
     }
 }
diff --git a/Assets/Scripts/ConfigItems/Options/FloatSliderOptions.cs b/Assets/Scripts/ConfigItems/Options/FloatSliderOptions.cs
@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options
 {
     public class FloatSliderOptions: BaseOptions
     {
-        public float? Min { get; set; } = null;
-        public float? Max { get; set; } = null;
+        private float _min;
+        internal bool WasMinSet;
+        public float Min { get => _min; set { WasMinSet = true; _min = value; } }
+
+        private float _max;
+        internal bool WasMaxSet;
+        public float Max { get => _max; set { WasMaxSet = true; _max = value; } }
     }
 }
diff --git a/Assets/Scripts/ConfigItems/Options/IntInputFieldOptions.cs b/Assets/Scripts/ConfigItems/Options/IntInputFieldOptions.cs
@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options
 {
     public sealed class IntInputFieldOptions: BaseOptions
     {
-        public int? Min { get; set; } = null;
-        public int? Max { get; set; } = null;
+        private int _min;
+        internal bool WasMinSet;
+        public int Min { get => _min; set { WasMinSet = true; _min = value; } }
+
+        private int _max;
+        internal bool WasMaxSet;
+        public int Max { get => _max; set { WasMaxSet = true; _max = value; } }
     }
 }
diff --git a/Assets/Scripts/ConfigItems/Options/IntSliderOptions.cs b/Assets/Scripts/ConfigItems/Options/IntSliderOptions.cs
@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options
 {
     public sealed class IntSliderOptions: BaseOptions
     {
-        public int? Min { get; set; } = null;
-        public int? Max { get; set; } = null;
+        private int _min;
+        internal bool WasMinSet;
+        public int Min { get => _min; set { WasMinSet = true; _min = value; } }
+
+        private int _max;
+        internal bool WasMaxSet;
+        public int Max { get => _max; set { WasMaxSet = true; _max = value; } }
     }
 }
diff --git a/Assets/Scripts/LethalConfigPlugin.cs b/Assets/Scripts/LethalConfigPlugin.cs
@@ -15,7 +15,7 @@ internal static class PluginInfo
     {
         public const string Guid = "ainavt.lc.lethalconfig";
         public const string Name = "LethalConfig";
-        public const string Version = "1.3.1";
+        public const string Version = "1.3.2";
     }
 
     [BepInPlugin(PluginInfo.Guid, PluginInfo.Name, PluginInfo.Version)]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Version 1.3.2
+- Reverted type for slider and numeric input options from nullable.
+
 ## Version 1.3.1
 - Fixed issue where duplicated fields were autogenerated when the section or name of the item was overriden
 - Fixed issue where providing an options objects to sliders without setting their min/max values would not fallback into the `AcceptableValueRange` of the entry if one was present.

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public FloatInputFieldConfigItem(ConfigEntry<float> configEntry, FloatInputField`
`16`	`16`	`{`
`17`	`17`	`var acceptableValues = configEntry.Description.AcceptableValues;`
`18`	`18`
`19`		`- MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? float.MinValue;`
`20`		`- MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? float.MaxValue;`
	`19`	`+ MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;`
	`20`	`+ MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 1;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`internal override GameObject CreateGameObjectForConfig()`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public FloatSliderConfigItem(ConfigEntry<float> configEntry, FloatSliderOptions`
`16`	`16`	`{`
`17`	`17`	`var acceptableValues = configEntry.Description.AcceptableValues;`
`18`	`18`
`19`		`- MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? 0;`
`20`		`- MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? 1;`
	`19`	`+ MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;`
	`20`	`+ MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 1;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`internal override GameObject CreateGameObjectForConfig()`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public FloatStepSliderConfigItem(ConfigEntry<float> configEntry, FloatStepSlider`
`17`	`17`	`{`
`18`	`18`	`var acceptableValues = configEntry.Description.AcceptableValues;`
`19`	`19`
`20`		`- MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? 0;`
`21`		`- MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? 1;`
	`20`	`+ MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<float>)?.MinValue ?? 0;`
	`21`	`+ MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<float>)?.MaxValue ?? 1;`
`22`	`22`	`Step = options.Step;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ public IntInputFieldConfigItem(ConfigEntry<int> configEntry, IntInputFieldOption`
`16`	`16`	`{`
`17`	`17`	`var acceptableValues = configEntry.Description.AcceptableValues;`
`18`	`18`
`19`		`- MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? int.MinValue;`
`20`		`- MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? int.MaxValue;`
	`19`	`+ MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;`
	`20`	`+ MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 100;`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`internal override GameObject CreateGameObjectForConfig()`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ public IntSliderConfigItem(ConfigEntry<int> configEntry, IntSliderOptions option`
`17`	`17`	`{`
`18`	`18`	`var acceptableValues = configEntry.Description.AcceptableValues;`
`19`	`19`
`20`		`- MinValue = options.Min ?? (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;`
`21`		`- MaxValue = options.Max ?? (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 100;`
	`20`	`+ MinValue = options.WasMinSet ? options.Min : (acceptableValues as AcceptableValueRange<int>)?.MinValue ?? 0;`
	`21`	`+ MaxValue = options.WasMaxSet ? options.Max : (acceptableValues as AcceptableValueRange<int>)?.MaxValue ?? 100;`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`internal override GameObject CreateGameObjectForConfig()`
Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,6 @@ namespace LethalConfig.ConfigItems.Options`
`3`	`3`	`{`
`4`	`4`	`public class BaseOptions`
`5`	`5`	`{`
`6`		`- public static BaseOptions Default { get; } = new()`
`7`		`- {`
`8`		`- RequiresRestart = true`
`9`		`- };`
`10`		`-`
`11`	`6`	`/// <summary>`
`12`	`7`	`/// Overrides the name of the item displayed in the UI.`
`13`	`8`	`/// Visual change only.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options`
`3`	`3`	`{`
`4`	`4`	`public sealed class FloatInputFieldOptions: BaseOptions`
`5`	`5`	`{`
`6`		`- public float? Min { get; set; } = null;`
`7`		`- public float? Max { get; set; } = null;`
	`6`	`+ private float _min;`
	`7`	`+ internal bool WasMinSet;`
	`8`	`+ public float Min { get => _min; set { WasMinSet = true; _min = value; } }`
	`9`	`+`
	`10`	`+ private float _max;`
	`11`	`+ internal bool WasMaxSet;`
	`12`	`+ public float Max { get => _max; set { WasMaxSet = true; _max = value; } }`
`8`	`13`	`}`
`9`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options`
`3`	`3`	`{`
`4`	`4`	`public class FloatSliderOptions: BaseOptions`
`5`	`5`	`{`
`6`		`- public float? Min { get; set; } = null;`
`7`		`- public float? Max { get; set; } = null;`
	`6`	`+ private float _min;`
	`7`	`+ internal bool WasMinSet;`
	`8`	`+ public float Min { get => _min; set { WasMinSet = true; _min = value; } }`
	`9`	`+`
	`10`	`+ private float _max;`
	`11`	`+ internal bool WasMaxSet;`
	`12`	`+ public float Max { get => _max; set { WasMaxSet = true; _max = value; } }`
`8`	`13`	`}`
`9`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,12 @@ namespace LethalConfig.ConfigItems.Options`
`3`	`3`	`{`
`4`	`4`	`public sealed class IntInputFieldOptions: BaseOptions`
`5`	`5`	`{`
`6`		`- public int? Min { get; set; } = null;`
`7`		`- public int? Max { get; set; } = null;`
	`6`	`+ private int _min;`
	`7`	`+ internal bool WasMinSet;`
	`8`	`+ public int Min { get => _min; set { WasMinSet = true; _min = value; } }`
	`9`	`+`
	`10`	`+ private int _max;`
	`11`	`+ internal bool WasMaxSet;`
	`12`	`+ public int Max { get => _max; set { WasMaxSet = true; _max = value; } }`
`8`	`13`	`}`
`9`	`14`	`}`