From d8305cd5a1777cc6a2190668de3935dd984bf26e Mon Sep 17 00:00:00 2001
From: Throckmorpheus <finnorelsemccormick@gmail.com>
Date: Fri, 16 Aug 2024 23:15:09 +0100
Subject: [PATCH 01/22] Fix off-centre subtab buttons New buttons were being
 placed after the spacers instead of between them

---
 src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index b3191800..853a7c9c 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -169,7 +169,7 @@ public void RemoveTab(Menu tab)
 			newSubMenuTabButton.transform.localScale = Vector3.one;
 			newSubMenuTabButton.transform.localPosition = Vector3.zero;
 			newSubMenuTabButton.transform.localRotation = Quaternion.identity;
-			newSubMenuTabButton.transform.SetSiblingIndex(newSubMenuTabButton.transform.parent.childCount - 2);
+			newSubMenuTabButton.transform.SetSiblingIndex(newSubMenuTabButton.transform.parent.childCount - 3);
 			newSubMenuTabButton.name = $"Button-{name}Tab";
 			Object.Destroy(newSubMenuTabButton.GetComponentInChildren<LocalizedText>());
 			newSubMenuTabButton.GetComponentInChildren<Text>().text = name;

From 501eb16f69fb7524afe524ef1032ebaf0c236477 Mon Sep 17 00:00:00 2001
From: Throckmorpheus <finnorelsemccormick@gmail.com>
Date: Fri, 16 Aug 2024 23:42:26 +0100
Subject: [PATCH 02/22] Set names of main tab objects

---
 src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 853a7c9c..e6499343 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -31,6 +31,7 @@ public OptionsMenuManager(IModConsole console, IModUnityEvents unityEvents, IPop
 			newMenu.transform.localScale = Vector3.one;
 			newMenu.transform.localPosition = Vector3.zero;
 			newMenu.transform.localRotation = Quaternion.identity;
+			newMenu.name = $"Menu-{name}";
 			var rt = newMenu.GetComponent<RectTransform>();
 			var ert = existingMenu.GetComponent<RectTransform>();
 			rt.anchorMin = ert.anchorMin;
@@ -84,6 +85,7 @@ public OptionsMenuManager(IModConsole console, IModUnityEvents unityEvents, IPop
 			newSubMenu.transform.localScale = Vector3.one;
 			newSubMenu.transform.localPosition = Vector3.zero;
 			newSubMenu.transform.localRotation = Quaternion.identity;
+			newSubMenu.name = $"Menu-{name}";
 			var rectTransform = newSubMenu.GetComponent<RectTransform>();
 			rectTransform.anchorMin = existingTabbedSubMenu.GetComponent<RectTransform>().anchorMin;
 			rectTransform.anchorMax = existingTabbedSubMenu.GetComponent<RectTransform>().anchorMax;

From 190a3645e69b28d20dd076c9cbf03a1218a836a4 Mon Sep 17 00:00:00 2001
From: Throckmorpheus <finnorelsemccormick@gmail.com>
Date: Sat, 17 Aug 2024 02:10:37 +0100
Subject: [PATCH 03/22] Fix off-centre scroll viewport in sub-tabs

---
 src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index e6499343..078bfab4 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -192,6 +192,9 @@ public void RemoveTab(Menu tab)
 			rt.offsetMax = ert.offsetMax;
 			rt.sizeDelta = ert.sizeDelta;
 
+			var viewportRect = newSubMenu.GetComponentInChildren<ScrollRectFixedSizeHandle>().GetComponent<RectTransform>();
+			viewportRect.anchoredPosition3D = Vector3.zero;
+
 			if (menu._selectOnActivate == null)
 			{
 				menu._selectOnActivate = newSubMenuTabButton.GetComponent<Button>();

From 8d5463265b4871f7289f299ede619c86d6b610dc Mon Sep 17 00:00:00 2001
From: Throckmorpheus <finnorelsemccormick@gmail.com>
Date: Mon, 19 Aug 2024 20:56:16 +0100
Subject: [PATCH 04/22] Add very slight margin to tab buttons so 'AUDIO &
 LANGUAGES' text doesn't appear to overlap dividing lines

---
 src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index b95bc799..c15878f9 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -387,6 +387,12 @@ private void EditExistingMenus()
 			{
 				var text = item.GetComponent<UIStyleApplier>()._textItems[0];
 				text.horizontalOverflow = HorizontalWrapMode.Wrap;
+				
+				// Give a little bit of margin to account for the dividing lines
+				// (as otherwise it can look like the text is on top of them when in mouse mode)
+				float margin = 0.03f;
+				text.rectTransform.anchorMin = new Vector2(margin, 0.0f);
+				text.rectTransform.anchorMax = new Vector2(1f - margin, 1.0f);
 			}
 		}
 

From b7c7e9260cbed68372b97905b2cad9622e3c9958 Mon Sep 17 00:00:00 2001
From: Throckmorpheus <finnorelsemccormick@gmail.com>
Date: Wed, 21 Aug 2024 18:08:18 +0100
Subject: [PATCH 05/22] Fixed option menu buttons not responding to controller
 input for navigation

---
 .../NewMenuSystem/OptionsMenuManager.cs                   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 078bfab4..5205498d 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -497,7 +497,13 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 
 			Object.Destroy(newButtonObj.gameObject.GetComponentInChildren<LocalizedText>());
 
-			newButtonObj.GetComponentInChildren<Text>().text = buttonLabel;
+			var menuOption = newButtonObj.gameObject.GetAddComponent<MenuOption>();
+			menuOption._tooltipTextType = UITextType.None;
+			menuOption._overrideTooltipText = tooltip;
+			menuOption._label = newButtonObj.GetComponentInChildren<Text>();
+			menuOption._label.text = buttonLabel;
+
+			menu._menuOptions = menu._menuOptions.Add(menuOption);
 
 			if (menu._selectOnActivate == null)
 			{

From f375f3d3e34a4ffb000f05d1e3a581de208a85db Mon Sep 17 00:00:00 2001
From: Throckmorpheus <finnorelsemccormick@gmail.com>
Date: Wed, 21 Aug 2024 20:18:48 +0100
Subject: [PATCH 06/22] Fix up options menu button styling

---
 .../NewMenuSystem/OptionsMenuManager.cs       | 84 +++++++++++++++----
 1 file changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 5205498d..2384ec23 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -467,30 +467,80 @@ public GameObject AddSeparator(Menu menu, bool dots)
 
 		public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip, MenuSide side)
 		{
+			var rootObj = new GameObject($"UIElement-{buttonLabel}");
+			rootObj.transform.parent = GetParentForAddedElements(menu);
+			rootObj.transform.localScale = Vector3.one;
+			rootObj.transform.localRotation = Quaternion.identity;
+			rootObj.transform.localPosition = Vector3.zero;
+
+			var layoutElement = rootObj.AddComponent<LayoutElement>();
+			layoutElement.minHeight = 70;
+			layoutElement.flexibleWidth = 1;
+
+			var existingHorizLayout = Resources.FindObjectsOfTypeAll<Menu>()
+				.Single(x => x.name == "GraphicsMenu").transform
+				.Find("Scroll View")
+				.Find("Viewport")
+				.Find("Content")
+				.Find("UIElement-ResolutionSelect")
+				.Find("HorizontalLayoutGroup").gameObject;
+
+			var newHorizLayout = Object.Instantiate(existingHorizLayout);
+			newHorizLayout.transform.parent = rootObj.transform;
+			newHorizLayout.transform.localPosition = Vector3.zero;
+			newHorizLayout.transform.localScale = Vector3.one;
+			newHorizLayout.transform.localRotation = Quaternion.identity;
+
+			var hrt = newHorizLayout.GetComponent<RectTransform>();
+			var ohrt = existingHorizLayout.GetComponent<RectTransform>();
+			//hrt.anchorMin = ohrt.anchorMin;
+			//hrt.anchorMax = ohrt.anchorMax;
+			hrt.offsetMin = ohrt.offsetMin;
+			hrt.offsetMax = ohrt.offsetMax;
+			hrt.anchoredPosition3D = ohrt.anchoredPosition3D;
+			hrt.sizeDelta = ohrt.sizeDelta;
+
+			hrt.anchorMax = new Vector2(0.5f, 1f);
+			switch (side)
+			{
+				case MenuSide.LEFT:
+					hrt.anchorMin = new Vector2(0f, 1f);
+					break;
+				case MenuSide.CENTER:
+					hrt.anchorMin = new Vector2(0.25f, 1f);
+					break;
+				case MenuSide.RIGHT:
+					hrt.anchorMin = new Vector2(0.5f, 1f);
+					break;
+			}
+
+			Object.Destroy(newHorizLayout.GetComponentInChildren<LocalizedText>());
+			
+			var oldLabelComponent = newHorizLayout.transform
+				.Find("LabelBlock")
+				.Find("HorizontalLayoutGroup")
+				.Find("Label")
+				.GetComponent<Text>();
+			var labelFont = oldLabelComponent.font;
+			var labelFontSize = oldLabelComponent.fontSize;
+			
+			Object.Destroy(newHorizLayout.transform.Find("LabelBlock").gameObject);
+
+			var controlBlock = newHorizLayout.transform.Find("ControlBlock");
+			Object.Destroy(controlBlock.Find("OptionSelectorBG").gameObject);
+			Object.Destroy(controlBlock.Find("HorizontalLayoutGroup").gameObject);
+
 			var existingButton = Resources.FindObjectsOfTypeAll<Button>().First(x => x.name == "UIElement-ButtonContinue");
 
 			var newButtonObj = Object.Instantiate(existingButton);
-			newButtonObj.transform.parent = GetParentForAddedElements(menu);
+			newButtonObj.transform.parent = controlBlock;
 			newButtonObj.transform.localPosition = Vector3.zero;
 			newButtonObj.transform.localScale = Vector3.one;
 			newButtonObj.name = $"UIElement-Button-{buttonLabel}";
 			newButtonObj.transform.localRotation = Quaternion.identity;
 
-			if (side == MenuSide.LEFT)
-			{
-				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").gameObject);
-				newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").SetAsFirstSibling();
-			}
-			else if (side == MenuSide.CENTER)
-			{
-				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").gameObject);
-				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").gameObject);
-			}
-			else if (side == MenuSide.RIGHT)
-			{
-				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").gameObject);
-				newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").SetAsFirstSibling();
-			}
+			Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").gameObject);
+			Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").gameObject);
 
 			Object.Destroy(newButtonObj.GetComponent<SubmitAction>());
 			var submitAction = newButtonObj.gameObject.AddComponent<SubmitAction>();
@@ -502,6 +552,8 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 			menuOption._overrideTooltipText = tooltip;
 			menuOption._label = newButtonObj.GetComponentInChildren<Text>();
 			menuOption._label.text = buttonLabel;
+			menuOption._label.font = labelFont;
+			menuOption._label.fontSize = labelFontSize;
 
 			menu._menuOptions = menu._menuOptions.Add(menuOption);
 

From 3014ea4b61f47b02819560fce5e77ed515fc5b0f Mon Sep 17 00:00:00 2001
From: Noah Pilarski <megapiggy@outerwildsmods.com>
Date: Thu, 26 Sep 2024 14:49:44 -0400
Subject: [PATCH 07/22] Remove (Clone) from name

---
 src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 2384ec23..ac0d7beb 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -486,6 +486,7 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 				.Find("HorizontalLayoutGroup").gameObject;
 
 			var newHorizLayout = Object.Instantiate(existingHorizLayout);
+			newHorizLayout.name = "HorizontalLayoutGroup";
 			newHorizLayout.transform.parent = rootObj.transform;
 			newHorizLayout.transform.localPosition = Vector3.zero;
 			newHorizLayout.transform.localScale = Vector3.one;
@@ -586,6 +587,7 @@ public SubmitAction CreateButtonWithLabel(Menu menu, string label, string button
 				.Find("HorizontalLayoutGroup").gameObject;
 
 			var newHorizLayout = Object.Instantiate(existingHorizLayout);
+			newHorizLayout.name = "HorizontalLayoutGroup";
 			newHorizLayout.transform.parent = newButtonObj.transform;
 			newHorizLayout.transform.localPosition = Vector3.zero;
 			newHorizLayout.transform.localScale = Vector3.one;

From 17accd7e0f5bfbf1581fe818c35570a9e7c11a00 Mon Sep 17 00:00:00 2001
From: Noah Pilarski <megapiggy@outerwildsmods.com>
Date: Thu, 26 Sep 2024 14:55:21 -0400
Subject: [PATCH 08/22] update upload-artifact

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 90e0373e..76038ec2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,7 +55,7 @@ jobs:
       - name: pack
         run: dotnet pack -o . src\OWML.ModHelper\OWML.ModHelper.csproj -p:NuspecFile=OWML.ModHelper.nuspec -p:NuspecProperties="version=${{ steps.version.outputs.prop }};"
       - name: upload nuget
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: owml-nuget
           path: OWML.*.nupkg
@@ -67,7 +67,7 @@ jobs:
           mkdir Mods
           7z a OWML.zip *
       - name: upload zip
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: owml-zip
           path: src\OWML.Launcher\bin\Debug\net48\OWML.zip

From f41f3a633e63ebc8ec8ac1cd707350a457b92301 Mon Sep 17 00:00:00 2001
From: Noah Pilarski <megapiggy@outerwildsmods.com>
Date: Thu, 26 Sep 2024 15:07:59 -0400
Subject: [PATCH 09/22] better font and size

---
 src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index ac0d7beb..847f7014 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -522,8 +522,8 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 				.Find("HorizontalLayoutGroup")
 				.Find("Label")
 				.GetComponent<Text>();
-			var labelFont = oldLabelComponent.font;
-			var labelFontSize = oldLabelComponent.fontSize;
+			var labelFont = Resources.FindObjectsOfTypeAll<Font>().First(x => x.name == "Adobe - SerifGothicStd-ExtraBold");
+			var labelFontSize = 28;
 			
 			Object.Destroy(newHorizLayout.transform.Find("LabelBlock").gameObject);
 

From 4238d94080db20678e7e555907b81963f142209f Mon Sep 17 00:00:00 2001
From: Noah Pilarski <megapiggy@outerwildsmods.com>
Date: Thu, 26 Sep 2024 15:35:37 -0400
Subject: [PATCH 10/22] default to type name if not given

---
 src/OWML.Abstractions/GameObjectHelper.cs | 2 +-
 src/OWML.ModLoader/ModLoader.cs           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OWML.Abstractions/GameObjectHelper.cs b/src/OWML.Abstractions/GameObjectHelper.cs
index 95c40065..e59bfc98 100644
--- a/src/OWML.Abstractions/GameObjectHelper.cs
+++ b/src/OWML.Abstractions/GameObjectHelper.cs
@@ -13,6 +13,6 @@ public TBehaviour CreateAndAdd<TBehaviour>(string name = null) =>
 			CreateAndAdd<TBehaviour>(typeof(TBehaviour), name);
 
 		public TBehaviour CreateAndAdd<TBehaviour>(Type type, string name = null) =>
-			(TBehaviour)(object)new GameObject(name).AddComponent(type);
+			(TBehaviour)(object)new GameObject(name ?? type.Name).AddComponent(type);
 	}
 }
diff --git a/src/OWML.ModLoader/ModLoader.cs b/src/OWML.ModLoader/ModLoader.cs
index d9e62129..9125f706 100644
--- a/src/OWML.ModLoader/ModLoader.cs
+++ b/src/OWML.ModLoader/ModLoader.cs
@@ -42,7 +42,7 @@ public static Container CreateContainer(IApplicationHelper appHelper, IGameObjec
 				throw new UnityException($"Can't load OWML manifest: {manifestPath}");
 			}
 
-			var unityEvents = goHelper.CreateAndAdd<IModUnityEvents, ModUnityEvents>();
+			var unityEvents = goHelper.CreateAndAdd<IModUnityEvents, ModUnityEvents>("UnityEvents");
 
 			return new Container()
 				.Add(appHelper)

From 42b30936175b8170332dec42437e92453813becb Mon Sep 17 00:00:00 2001
From: Noah Pilarski <megapiggy@outerwildsmods.com>
Date: Thu, 26 Sep 2024 15:35:48 -0400
Subject: [PATCH 11/22] Allow for negative numbers

---
 src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs     | 4 +++-
 src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs | 4 ++--
 src/OWML.ModHelper.Menus/ModInputMenu.cs                    | 2 +-
 .../NewMenuSystem/OptionsMenuManager.cs                     | 6 +++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs b/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
index dc27beb3..1115e085 100644
--- a/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
+++ b/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
@@ -4,7 +4,9 @@ namespace OWML.Common.Interfaces.Menus
 {
 	public interface IOWMLPopupInputMenu
 	{
-		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public delegate bool InputPopupValidateCharEvent(string input, int charIndex, char addedChar);
+
+		public event InputPopupValidateCharEvent OnInputPopupValidateChar;
 
 		public void EnableMenu(bool value);
 
diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
index 09f77af3..65f9b74a 100644
--- a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
+++ b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
@@ -15,7 +15,7 @@ public class OWMLPopupInputMenu : PopupMenu, IOWMLPopupInputMenu
 		protected bool _virtualKeyboardOpen;
 
 		public event PopupInputMenu.InputPopupTextChangedEvent OnInputPopupTextChanged;
-		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public event IOWMLPopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
 
 		public override void Awake()
 		{
@@ -158,7 +158,7 @@ private char OnValidateInput(string input, int charIndex, char addedChar)
 				Delegate[] invocationList = this.OnInputPopupValidateChar.GetInvocationList();
 				for (int i = 0; i < invocationList.Length; i++)
 				{
-					bool flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { addedChar });
+					bool flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { input, charIndex, addedChar });
 					flag = flag && flag2;
 				}
 			}
diff --git a/src/OWML.ModHelper.Menus/ModInputMenu.cs b/src/OWML.ModHelper.Menus/ModInputMenu.cs
index 5bff2816..8ed10e15 100644
--- a/src/OWML.ModHelper.Menus/ModInputMenu.cs
+++ b/src/OWML.ModHelper.Menus/ModInputMenu.cs
@@ -75,7 +75,7 @@ private bool OnValidateNumber() =>
 			float.TryParse(_inputMenu.GetInputText(), out _);
 
 		private bool OnValidateCharNumber(char c) =>
-			"0123456789.".Contains("" + c);
+			"0123456789.-".Contains(c.ToString());
 
 		protected override void OnPopupConfirm()
 		{
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 847f7014..1c2fb2be 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -706,10 +706,10 @@ public IOWMLTextEntryElement AddTextEntryInput(Menu menu, string label, string i
 
 			if (isNumeric)
 			{
-				textInputPopup.OnInputPopupValidateChar += c =>
+				textInputPopup.OnInputPopupValidateChar += (string input, int charIndex, char addedChar) =>
 				{
-					var text = textInputPopup.GetInputText() + c;
-					return Regex.IsMatch(text, @"^\d*[,.]?\d*$");
+					var text = input.Insert(charIndex, addedChar.ToString());
+					return Regex.IsMatch(text, @"^-?\d*[,.]?\d*$");
 				};
 			}
 

From 48a14d465ad4f9aaed2d89746239c3aaafa33e34 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:49:06 +0100
Subject: [PATCH 12/22] Highlight "MODS" tab instead of "OWML" by default

---
 src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index c15878f9..730ad828 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -103,8 +103,8 @@ void SaveConfig()
 
 			// Create menus and submenus
 			var (modsMenu, modsMenuButton) = OptionsMenuManager.CreateTabWithSubTabs("MODS");
-			var (owmlSubTab, owmlSubTabButton) = OptionsMenuManager.AddSubTab(modsMenu, "OWML");
 			var (modsSubTab, modsSubTabButton) = OptionsMenuManager.AddSubTab(modsMenu, "MODS");
+			var (owmlSubTab, owmlSubTabButton) = OptionsMenuManager.AddSubTab(modsMenu, "OWML");
 
 			OWMLSettingsMenu = owmlSubTab;
 

From 0a4e76bd6db2e8a5397aacd4320d190b3dc84335 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 16:54:46 +0100
Subject: [PATCH 13/22] Fix #592 (MOD OPTIONS closes when clicked on)

---
 src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index 730ad828..92cd6f85 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -210,7 +210,15 @@ void SaveConfig()
 
 					newModTab.OnDeactivateMenu += () =>
 					{
-						OptionsMenuManager.RemoveTab(newModTab);
+						// Fixes tab dissapearing when you click on it again
+						// Clicking on a tab closes and opens it again
+						_unityEvents.FireOnNextUpdate(() =>
+						{
+							if (!newModTab._isActivated)
+							{
+								OptionsMenuManager.RemoveTab(newModTab);
+							}
+						});
 					};
 
 					foreach (var (name, setting) in mod.ModHelper.Config.Settings)

From a5d1301132ce039a737f9b9ded295fef2874b9e1 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:02:09 +0100
Subject: [PATCH 14/22] Revert "Fix #592 (MOD OPTIONS closes when clicked on)"

This reverts commit 0a4e76bd6db2e8a5397aacd4320d190b3dc84335.
---
 src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index 92cd6f85..730ad828 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -210,15 +210,7 @@ void SaveConfig()
 
 					newModTab.OnDeactivateMenu += () =>
 					{
-						// Fixes tab dissapearing when you click on it again
-						// Clicking on a tab closes and opens it again
-						_unityEvents.FireOnNextUpdate(() =>
-						{
-							if (!newModTab._isActivated)
-							{
-								OptionsMenuManager.RemoveTab(newModTab);
-							}
-						});
+						OptionsMenuManager.RemoveTab(newModTab);
 					};
 
 					foreach (var (name, setting) in mod.ModHelper.Config.Settings)

From 6392f7d00c02f61a47ff2cd2ff22d0865d711005 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:03:13 +0100
Subject: [PATCH 15/22] Fix #585

---
 src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index 730ad828..92cd6f85 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -210,7 +210,15 @@ void SaveConfig()
 
 					newModTab.OnDeactivateMenu += () =>
 					{
-						OptionsMenuManager.RemoveTab(newModTab);
+						// Fixes tab dissapearing when you click on it again
+						// Clicking on a tab closes and opens it again
+						_unityEvents.FireOnNextUpdate(() =>
+						{
+							if (!newModTab._isActivated)
+							{
+								OptionsMenuManager.RemoveTab(newModTab);
+							}
+						});
 					};
 
 					foreach (var (name, setting) in mod.ModHelper.Config.Settings)

From 7d2f7517d118851a04bad83701b0e0f35c25cfa3 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:16:08 +0100
Subject: [PATCH 16/22] fix #592

---
 src/OWML.Common/Interfaces/Menus/IMenuManager.cs  |  6 ++++++
 .../NewMenuSystem/MenuManager.cs                  | 13 ++++++++++++-
 .../NewMenuSystem/OptionsMenuManager.cs           | 15 +++++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/OWML.Common/Interfaces/Menus/IMenuManager.cs b/src/OWML.Common/Interfaces/Menus/IMenuManager.cs
index 0899dfcd..14cd46b4 100644
--- a/src/OWML.Common/Interfaces/Menus/IMenuManager.cs
+++ b/src/OWML.Common/Interfaces/Menus/IMenuManager.cs
@@ -10,5 +10,11 @@ public interface IMenuManager
 		public IPopupMenuManager PopupMenuManager { get; }
 
 		internal IList<IModBehaviour> ModList { get; set; }
+
+		/// <summary>
+		/// Keeps the Mod Options tab open, since it is ephemeral.
+		/// Otherwise, a popup opening in the tab would close it.
+		/// </summary>
+		public void ForceModOptionsOpen(bool force);
 	}
 }
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index 92cd6f85..982a3c0a 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -39,6 +39,7 @@ enum SettingType
 		internal static List<(IModBehaviour behaviour, Menu modMenu)> ModSettingsMenus = new();
 
 		private bool _hasSetupMenusThisScene = false;
+		private bool _forceModOptionsOpen;
 
 		public MenuManager(
 			IModConsole console,
@@ -52,7 +53,7 @@ public MenuManager(
 			_unityEvents = unityEvents;
 			TitleMenuManager = new TitleMenuManager();
 			PopupMenuManager = new PopupMenuManager(console, harmony, this);
-			OptionsMenuManager = new OptionsMenuManager(console, unityEvents, PopupMenuManager);
+			OptionsMenuManager = new OptionsMenuManager(console, unityEvents, PopupMenuManager, this);
 			PauseMenuManager = new PauseMenuManager(console);
 
 			var harmonyInstance = harmony.GetValue<Harmony>("_harmony");
@@ -85,6 +86,11 @@ public MenuManager(
 			};
 		}
 
+		public void ForceModOptionsOpen(bool force)
+		{
+			_forceModOptionsOpen = force;
+		}
+
 		internal void SetupMenus(IList<IModBehaviour> modList)
 		{
 			if (_hasSetupMenusThisScene)
@@ -210,6 +216,11 @@ void SaveConfig()
 
 					newModTab.OnDeactivateMenu += () =>
 					{
+						if (_forceModOptionsOpen)
+						{
+							return;
+						}
+
 						// Fixes tab dissapearing when you click on it again
 						// Clicking on a tab closes and opens it again
 						_unityEvents.FireOnNextUpdate(() =>
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 1c2fb2be..688573c7 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -14,12 +14,14 @@ internal class OptionsMenuManager : IOptionsMenuManager
 		private readonly IModConsole _console;
 		private readonly IModUnityEvents _unityEvents;
 		private readonly IPopupMenuManager _popupMenuManager;
+		private readonly IMenuManager _menuManager;
 
-		public OptionsMenuManager(IModConsole console, IModUnityEvents unityEvents, IPopupMenuManager popupMenuManager)
+		public OptionsMenuManager(IModConsole console, IModUnityEvents unityEvents, IPopupMenuManager popupMenuManager, IMenuManager menuManager)
 		{
 			_console = console;
 			_unityEvents = unityEvents;
 			_popupMenuManager = popupMenuManager;
+			_menuManager = menuManager;
 		}
 
 		public (Menu menu, TabButton button) CreateStandardTab(string name)
@@ -697,13 +699,22 @@ public IOWMLTextEntryElement AddTextEntryInput(Menu menu, string label, string i
 		{
 			var submitAction = CreateButtonWithLabel(menu, label, initialValue, tooltip);
 			var textInputPopup = _popupMenuManager.CreateInputFieldPopup($"Enter the new value for \"{label}\".", initialValue, "Confirm", "Cancel");
-			submitAction.OnSubmitAction += () => textInputPopup.EnableMenu(true);
+			submitAction.OnSubmitAction += () =>
+			{
+				_menuManager.ForceModOptionsOpen(true);
+				textInputPopup.EnableMenu(true);
+			};
 
 			var textEntry = submitAction.gameObject.AddComponent<OWMLTextEntryElement>();
 			textEntry._overrideTooltipText = tooltip;
 			textEntry.RegisterPopup(textInputPopup);
 			textEntry.IsNumeric = isNumeric;
 
+			textEntry.OnConfirmEntry += () =>
+			{
+				_menuManager.ForceModOptionsOpen(false);
+			};
+
 			if (isNumeric)
 			{
 				textInputPopup.OnInputPopupValidateChar += (string input, int charIndex, char addedChar) =>

From 5d8c06fc53ed55aa048aab77ad3874df15284bdc Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:28:48 +0100
Subject: [PATCH 17/22] update text entry buttons to have new value

---
 .../Interfaces/Menus/IOWMLTextEntryElement.cs          | 10 ++++++++++
 .../CustomInputs/OWMLTextEntryElement.cs               |  7 ++++++-
 src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs  |  2 ++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs b/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
index 3764ce25..3bb3492b 100644
--- a/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
+++ b/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
@@ -7,5 +7,15 @@ public interface IOWMLTextEntryElement : IOWMLMenuValueOption
 		public event TextEntryConfirmEvent OnConfirmEntry;
 
 		public string GetInputText();
+
+		/// <summary>
+		/// Sets the text that is displayed without updating the underlying option value.
+		/// </summary>
+		public void SetText(string text);
+
+		/// <summary>
+		/// Sets the underlying option value to the text, and updates the displayed text.
+		/// </summary>
+		public void SetCurrentValue(string text);
 	}
 }
diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
index ecc06789..3e2ceb6f 100644
--- a/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
+++ b/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
@@ -23,9 +23,14 @@ public string GetInputText()
 			return _popup.GetInputText();
 		}
 
-		public void SetCurrentValue(string text)
+		public void SetText(string text)
 		{
 			gameObject.GetComponentsInChildren<MenuOption>().First(x => x != this)._label.text = text;
+		}
+
+		public void SetCurrentValue(string text)
+		{
+			SetText(text);
 			_popup.GetInputField().text = text;
 			OnConfirmEntry();
 		}
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
index 982a3c0a..5b058d07 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/MenuManager.cs
@@ -326,6 +326,7 @@ void SaveConfig()
 									mod.ModHelper.Config.SetSettingsValue(name, newValue);
 									mod.ModHelper.Storage.Save(mod.ModHelper.Config, Constants.ModConfigFileName);
 									mod.Configure(mod.ModHelper.Config);
+									textInput.SetText(newValue);
 								};
 								break;
 							case SettingType.NUMBER:
@@ -338,6 +339,7 @@ void SaveConfig()
 									mod.ModHelper.Config.SetSettingsValue(name, newValue);
 									mod.ModHelper.Storage.Save(mod.ModHelper.Config, Constants.ModConfigFileName);
 									mod.Configure(mod.ModHelper.Config);
+									numberInput.SetText(newValue.ToString());
 								};
 								break;
 							default:

From d1563e13e5cf39eead6401658342e1d69c0969ce Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:30:26 +0100
Subject: [PATCH 18/22] rename SetCurrentValue to SetValue

---
 src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs     | 2 +-
 src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs | 2 +-
 src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs b/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
index 3bb3492b..73d6275d 100644
--- a/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
+++ b/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
@@ -16,6 +16,6 @@ public interface IOWMLTextEntryElement : IOWMLMenuValueOption
 		/// <summary>
 		/// Sets the underlying option value to the text, and updates the displayed text.
 		/// </summary>
-		public void SetCurrentValue(string text);
+		public void SetValue(string text);
 	}
 }
diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
index 3e2ceb6f..058cb75c 100644
--- a/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
+++ b/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
@@ -28,7 +28,7 @@ public void SetText(string text)
 			gameObject.GetComponentsInChildren<MenuOption>().First(x => x != this)._label.text = text;
 		}
 
-		public void SetCurrentValue(string text)
+		public void SetValue(string text)
 		{
 			SetText(text);
 			_popup.GetInputField().text = text;
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs
index d9b08560..917f82b5 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs
@@ -74,12 +74,12 @@ public static void ResetToDefaultSettings(SettingsMenuView __instance)
 					{
 						if (textEntry.IsNumeric)
 						{
-							textEntry.SetCurrentValue(defaultSettings.GetSettingsValue<double>(textEntry.ModSettingKey).ToString(CultureInfo.InvariantCulture));
+							textEntry.SetValue(defaultSettings.GetSettingsValue<double>(textEntry.ModSettingKey).ToString(CultureInfo.InvariantCulture));
 						}
 						else
 						{
 							var defaultValue = defaultSettings.GetSettingsValue<string>(textEntry.ModSettingKey);
-							textEntry.SetCurrentValue(defaultValue);
+							textEntry.SetValue(defaultValue);
 						}
 					}
 				}

From 87f747db36dca0240f8449dd4f22e32d4bbf6a32 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Thu, 10 Oct 2024 17:32:53 +0100
Subject: [PATCH 19/22] Update OWML.Manifest.json

---
 src/OWML.Launcher/OWML.Manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OWML.Launcher/OWML.Manifest.json b/src/OWML.Launcher/OWML.Manifest.json
index 181e6519..2884e88a 100644
--- a/src/OWML.Launcher/OWML.Manifest.json
+++ b/src/OWML.Launcher/OWML.Manifest.json
@@ -3,7 +3,7 @@
   "author": "Alek",
   "name": "OWML",
   "uniqueName": "Alek.OWML",
-  "version": "2.13.0",
+  "version": "2.14.0",
   "minGameVersion": "1.1.15.1018",
   "maxGameVersion": "1.1.15.1018"
 }

From 866e5c701c85728a4cca077e85dccc6fa74e866d Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:49:04 +0100
Subject: [PATCH 20/22] Revert "rename SetCurrentValue to SetValue"

This reverts commit d1563e13e5cf39eead6401658342e1d69c0969ce.
---
 src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs     | 2 +-
 src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs | 2 +-
 src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs             | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs b/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
index 73d6275d..3bb3492b 100644
--- a/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
+++ b/src/OWML.Common/Interfaces/Menus/IOWMLTextEntryElement.cs
@@ -16,6 +16,6 @@ public interface IOWMLTextEntryElement : IOWMLMenuValueOption
 		/// <summary>
 		/// Sets the underlying option value to the text, and updates the displayed text.
 		/// </summary>
-		public void SetValue(string text);
+		public void SetCurrentValue(string text);
 	}
 }
diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
index 058cb75c..3e2ceb6f 100644
--- a/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
+++ b/src/OWML.ModHelper.Menus/CustomInputs/OWMLTextEntryElement.cs
@@ -28,7 +28,7 @@ public void SetText(string text)
 			gameObject.GetComponentsInChildren<MenuOption>().First(x => x != this)._label.text = text;
 		}
 
-		public void SetValue(string text)
+		public void SetCurrentValue(string text)
 		{
 			SetText(text);
 			_popup.GetInputField().text = text;
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs
index 917f82b5..d9b08560 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/Patches.cs
@@ -74,12 +74,12 @@ public static void ResetToDefaultSettings(SettingsMenuView __instance)
 					{
 						if (textEntry.IsNumeric)
 						{
-							textEntry.SetValue(defaultSettings.GetSettingsValue<double>(textEntry.ModSettingKey).ToString(CultureInfo.InvariantCulture));
+							textEntry.SetCurrentValue(defaultSettings.GetSettingsValue<double>(textEntry.ModSettingKey).ToString(CultureInfo.InvariantCulture));
 						}
 						else
 						{
 							var defaultValue = defaultSettings.GetSettingsValue<string>(textEntry.ModSettingKey);
-							textEntry.SetValue(defaultValue);
+							textEntry.SetCurrentValue(defaultValue);
 						}
 					}
 				}

From 09af8a9bf9ded2416d7d79096674899dfabe1da7 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Fri, 11 Oct 2024 22:59:58 +0100
Subject: [PATCH 21/22] add in backwards compat for OnInputPopupValidateChar

---
 .../Interfaces/Menus/IOWMLPopupInputMenu.cs   |  9 ++++--
 .../CustomInputs/OWMLPopupInputMenu.cs        | 31 ++++++++++++++-----
 .../NewMenuSystem/OptionsMenuManager.cs       |  8 ++++-
 3 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs b/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
index 1115e085..4ba6edf9 100644
--- a/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
+++ b/src/OWML.Common/Interfaces/Menus/IOWMLPopupInputMenu.cs
@@ -1,12 +1,15 @@
-using UnityEngine.UI;
+using System;
+using UnityEngine.UI;
 
 namespace OWML.Common.Interfaces.Menus
 {
 	public interface IOWMLPopupInputMenu
 	{
-		public delegate bool InputPopupValidateCharEvent(string input, int charIndex, char addedChar);
+		[Obsolete("Use OnValidateChar instead.")]
+		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
 
-		public event InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public delegate bool InputPopupValidateCharEvent(string input, int charIndex, char addedChar);
+		public event InputPopupValidateCharEvent OnValidateChar;
 
 		public void EnableMenu(bool value);
 
diff --git a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
index 65f9b74a..8a58beb1 100644
--- a/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
+++ b/src/OWML.ModHelper.Menus/CustomInputs/OWMLPopupInputMenu.cs
@@ -15,7 +15,10 @@ public class OWMLPopupInputMenu : PopupMenu, IOWMLPopupInputMenu
 		protected bool _virtualKeyboardOpen;
 
 		public event PopupInputMenu.InputPopupTextChangedEvent OnInputPopupTextChanged;
-		public event IOWMLPopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
+		public event IOWMLPopupInputMenu.InputPopupValidateCharEvent OnValidateChar;
+
+		[Obsolete("Use OnValidateChar instead.")]
+		public event PopupInputMenu.InputPopupValidateCharEvent OnInputPopupValidateChar;
 
 		public override void Awake()
 		{
@@ -152,20 +155,32 @@ private void OnTextFieldChanged()
 
 		private char OnValidateInput(string input, int charIndex, char addedChar)
 		{
-			bool flag = true;
-			if (this.OnInputPopupValidateChar != null)
+			var isValidCharacter = true;
+			if (OnInputPopupValidateChar != null)
+			{
+				var invocationList = OnInputPopupValidateChar.GetInvocationList();
+				for (var i = 0; i < invocationList.Length; i++)
+				{
+					var flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { addedChar });
+					isValidCharacter = isValidCharacter && flag2;
+				}
+			}
+
+			if (OnValidateChar != null && isValidCharacter)
 			{
-				Delegate[] invocationList = this.OnInputPopupValidateChar.GetInvocationList();
-				for (int i = 0; i < invocationList.Length; i++)
+				var invocationList = OnValidateChar.GetInvocationList();
+				for (var i = 0; i < invocationList.Length; i++)
 				{
-					bool flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { input, charIndex, addedChar });
-					flag = flag && flag2;
+					var flag2 = (bool)invocationList[i].DynamicInvoke(new object[] { input, charIndex, addedChar });
+					isValidCharacter = isValidCharacter && flag2;
 				}
 			}
-			if (flag)
+
+			if (isValidCharacter)
 			{
 				return addedChar;
 			}
+
 			return '\0';
 		}
 
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 688573c7..d4e3315b 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -717,7 +717,13 @@ public IOWMLTextEntryElement AddTextEntryInput(Menu menu, string label, string i
 
 			if (isNumeric)
 			{
-				textInputPopup.OnInputPopupValidateChar += (string input, int charIndex, char addedChar) =>
+				textInputPopup.OnInputPopupValidateChar += c =>
+				{
+					var text = textInputPopup.GetInputText() + c;
+					return Regex.IsMatch(text, @"^\d*[,.]?\d*$");
+				};
+
+				textInputPopup.OnValidateChar += (string input, int charIndex, char addedChar) =>
 				{
 					var text = input.Insert(charIndex, addedChar.ToString());
 					return Regex.IsMatch(text, @"^-?\d*[,.]?\d*$");

From 78f39b50ab2e527f061572a331b6f6932f559fb4 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Fri, 11 Oct 2024 23:07:01 +0100
Subject: [PATCH 22/22] Remove broken code I accidentally added back in whoops

---
 .../NewMenuSystem/OptionsMenuManager.cs                     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index d4e3315b..f1d3c762 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -717,12 +717,6 @@ public IOWMLTextEntryElement AddTextEntryInput(Menu menu, string label, string i
 
 			if (isNumeric)
 			{
-				textInputPopup.OnInputPopupValidateChar += c =>
-				{
-					var text = textInputPopup.GetInputText() + c;
-					return Regex.IsMatch(text, @"^\d*[,.]?\d*$");
-				};
-
 				textInputPopup.OnValidateChar += (string input, int charIndex, char addedChar) =>
 				{
 					var text = input.Insert(charIndex, addedChar.ToString());