From a385f3b59f299891144d2e4cadaf608a0e1a99ce Mon Sep 17 00:00:00 2001
From: Nick <nicholasconnors@hotmail.ca>
Date: Mon, 10 Jun 2024 16:24:44 -0400
Subject: [PATCH 1/8] Update game libs and bring back some buttons

---
 src/OWML.Common/OWML.Common.csproj                 |  2 +-
 .../NewMenuSystem/OptionsMenuManager.cs            | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/OWML.Common/OWML.Common.csproj b/src/OWML.Common/OWML.Common.csproj
index 992eb9d23..da3d44cff 100644
--- a/src/OWML.Common/OWML.Common.csproj
+++ b/src/OWML.Common/OWML.Common.csproj
@@ -6,7 +6,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="OuterWildsGameLibs" Version="1.1.14.768" />
+	  <PackageReference Include="OuterWildsGameLibs" Version="1.1.15.1018" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 62065d755..a4e8ac50e 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -231,8 +231,7 @@ public IOWMLToggleElement AddCheckboxInput(Menu menu, string label, string toolt
 		{
 			var existingCheckbox = Resources.FindObjectsOfTypeAll<TabbedSubMenu>()
 				.Single(x => x.name == "GameplayMenu").transform
-				.Find("MenuGameplayBasic")
-				.Find("UIElement-InvertPlayerLook").gameObject;
+				.Find("MenuGameplayBasic/Scroll View/Viewport/Content/UIElement-InvertPlayerLook").gameObject;
 
 			var newCheckbox = Object.Instantiate(existingCheckbox);
 			newCheckbox.transform.parent = GetParentForAddedElements(menu);
@@ -276,8 +275,7 @@ public IOWMLTwoButtonToggleElement AddToggleInput(Menu menu, string label, strin
 		{
 			var existingToggle = Resources.FindObjectsOfTypeAll<TabbedSubMenu>()
 				.Single(x => x.name == "InputMenu").transform
-				.Find("MenuGeneral")
-				.Find("UIElement-ConfirmToggle").gameObject;
+				.Find("MenuGeneral/UIElement-ConfirmToggle").gameObject;
 
 			var script = existingToggle.GetComponent<TwoButtonToggleElement>();
 			var text = script._buttonTrue.GetComponent<UIStyleApplier>()._textItems[0];
@@ -330,8 +328,7 @@ public IOWMLOptionsSelectorElement AddSelectorInput(Menu menu, string label, str
 		{
 			var existingSelector = Resources.FindObjectsOfTypeAll<TabbedSubMenu>()
 				.Single(x => x.name == "GameplayMenu").transform
-				.Find("MenuGameplayBasic")
-				.Find("UIElement-ControllerProfile").gameObject;
+				.Find("MenuGameplayBasic/Scroll View/Viewport/Content/UIElement-ControllerProfile").gameObject;
 
 			var newSelector = Object.Instantiate(existingSelector);
 			newSelector.transform.parent = GetParentForAddedElements(menu);
@@ -379,8 +376,7 @@ public IOWMLSliderElement AddSliderInput(Menu menu, string label, float lower, f
 		{
 			var existingSlider = Resources.FindObjectsOfTypeAll<TabbedSubMenu>()
 				.Single(x => x.name == "GameplayMenu").transform
-				.Find("MenuGameplayBasic")
-				.Find("UIElement-LookSensitivity").gameObject;
+				.Find("MenuGameplayBasic/Scroll View/Viewport/Content/UIElement-LookSensitivity").gameObject;
 
 			var newSlider = Object.Instantiate(existingSlider);
 			newSlider.transform.parent = GetParentForAddedElements(menu);
@@ -432,7 +428,7 @@ public GameObject AddSeparator(Menu menu, bool dots)
 
 			var dotsSprite = Resources.FindObjectsOfTypeAll<TabbedSubMenu>()
 				.Single(x => x.name == "GameplayMenu").transform
-				.Find("MenuGameplayBasic")
+				.Find("MenuGameplayBasic/Scroll View/Viewport/Content")
 				.Find("UIElement-ControllerProfile")
 				.Find("HorizontalLayoutGroup")
 				.Find("LabelBlock")

From a8ed9a47d9c72192fc5572d7fa77ae09a78db011 Mon Sep 17 00:00:00 2001
From: Nick <nicholasconnors@hotmail.ca>
Date: Mon, 10 Jun 2024 17:33:57 -0400
Subject: [PATCH 2/8] Use a different load bearing button

---
 .../NewMenuSystem/OptionsMenuManager.cs       | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index a4e8ac50e..85dabe3c4 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -462,12 +462,7 @@ public GameObject AddSeparator(Menu menu, bool dots)
 
 		public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip, MenuSide side)
 		{
-			var existingButton = Resources.FindObjectsOfTypeAll<Menu>()
-				.Single(x => x.name == "GraphicsMenu").transform
-				.Find("Scroll View")
-				.Find("Viewport")
-				.Find("Content")
-				.Find("GammaButtonPanel").gameObject;
+			var existingButton = Resources.FindObjectsOfTypeAll<Button>().First(x => x.name == "UIElement-ButtonContinue");
 
 			var newButtonObj = Object.Instantiate(existingButton);
 			newButtonObj.transform.parent = GetParentForAddedElements(menu);
@@ -476,37 +471,34 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 			newButtonObj.name = $"UIElement-Button-{buttonLabel}";
 			newButtonObj.transform.localRotation = Quaternion.identity;
 
-			// the thing we're copying is already LEFT, so dont need to handle it
-			if (side == MenuSide.CENTER)
+			if (side == MenuSide.LEFT)
+			{
+				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").gameObject);
+				newButtonObj.transform.Find("HorizontalLayoutGroup/LeftSpacer").SetAsFirstSibling();
+			}
+			else if (side == MenuSide.CENTER)
 			{
-				Object.Destroy(newButtonObj.transform.Find("RightSpacer").gameObject);
+				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").gameObject);
+				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").gameObject);
 			}
 			else if (side == MenuSide.RIGHT)
 			{
-				newButtonObj.transform.Find("RightSpacer").SetAsFirstSibling();
+				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").gameObject);
+				newButtonObj.transform.Find("HorizontalLayoutGroup/RightSpacer").SetAsFirstSibling();
 			}
 
-			var uielement = newButtonObj.transform.Find("UIElement-GammaButton").gameObject;
+			Object.Destroy(newButtonObj.GetComponent<SubmitAction>());
+			var submitAction = newButtonObj.gameObject.AddComponent<SubmitAction>();
 
-			Object.Destroy(uielement.GetComponent<SubmitActionMenu>());
-			var submitAction = uielement.AddComponent<SubmitAction>();
+			Object.Destroy(newButtonObj.gameObject.GetComponentInChildren<LocalizedText>());
 
-			Object.Destroy(uielement.GetComponentInChildren<LocalizedText>());
-
-			var menuOption = uielement.GetComponent<MenuOption>();
-			menuOption._tooltipTextType = UITextType.None;
-			menuOption._overrideTooltipText = tooltip;
-			menuOption._label.text = buttonLabel;
-
-			menu._menuOptions = menu._menuOptions.Add(menuOption);
+			newButtonObj.GetComponentInChildren<Text>().text = buttonLabel;
 
 			if (menu._selectOnActivate == null)
 			{
 				menu._selectOnActivate = newButtonObj.GetComponent<Selectable>();
 			}
 
-			uielement.AddComponent<SelectableAudioPlayer>();
-
 			return submitAction;
 		}
 

From 410ecd5530ebd8fc8c832cf2e47eba03077bcb19 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:35:44 +0100
Subject: [PATCH 3/8] Update game-versions.json

---
 src/OWML.Launcher/game-versions.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/OWML.Launcher/game-versions.json b/src/OWML.Launcher/game-versions.json
index a4f781146..a0a5ee3a3 100644
--- a/src/OWML.Launcher/game-versions.json
+++ b/src/OWML.Launcher/game-versions.json
@@ -1,5 +1,5 @@
 {
-  "steam": "1.1.14.768",
-  "epic": "1.1.14.768",
-  "gamepass": "1.1.14.768"
+  "steam": "1.1.15.1018",
+  "epic": "1.1.15.1018",
+  "gamepass": "1.1.15.1018"
 }

From e2696ff4432e97e56f494309d095f08a7d00ef9f Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:48:05 +0100
Subject: [PATCH 4/8] fix spacing stuff

---
 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 85dabe3c4..771583a81 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -474,7 +474,7 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 			if (side == MenuSide.LEFT)
 			{
 				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").gameObject);
-				newButtonObj.transform.Find("HorizontalLayoutGroup/LeftSpacer").SetAsFirstSibling();
+				newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").SetAsFirstSibling();
 			}
 			else if (side == MenuSide.CENTER)
 			{
@@ -484,7 +484,7 @@ public SubmitAction CreateButton(Menu menu, string buttonLabel, string tooltip,
 			else if (side == MenuSide.RIGHT)
 			{
 				Object.Destroy(newButtonObj.transform.Find("ForegroundLayoutGroup/LeftSpacer").gameObject);
-				newButtonObj.transform.Find("HorizontalLayoutGroup/RightSpacer").SetAsFirstSibling();
+				newButtonObj.transform.Find("ForegroundLayoutGroup/RightSpacer").SetAsFirstSibling();
 			}
 
 			Object.Destroy(newButtonObj.GetComponent<SubmitAction>());

From 20cf1d67664a86ee12b8e3f32a524f6185f175d4 Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:53:19 +0100
Subject: [PATCH 5/8] Update OWML.Manifest.json

---
 src/OWML.Launcher/OWML.Manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/OWML.Launcher/OWML.Manifest.json b/src/OWML.Launcher/OWML.Manifest.json
index ed46c39b5..efa47fbf8 100644
--- a/src/OWML.Launcher/OWML.Manifest.json
+++ b/src/OWML.Launcher/OWML.Manifest.json
@@ -4,6 +4,6 @@
   "name": "OWML",
   "uniqueName": "Alek.OWML",
   "version": "2.12.1",
-  "minGameVersion": "1.1.14.768",
-  "maxGameVersion": "1.1.14.768"
+  "minGameVersion": "1.1.15.1018",
+  "maxGameVersion": "1.1.15.1018"
 }

From 792ebe63738fca2bd73aaa4132328744620a9b6b Mon Sep 17 00:00:00 2001
From: _nebula <41904486+misternebula@users.noreply.github.com>
Date: Mon, 10 Jun 2024 22:53:36 +0100
Subject: [PATCH 6/8] 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 efa47fbf8..181e65195 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.12.1",
+  "version": "2.13.0",
   "minGameVersion": "1.1.15.1018",
   "maxGameVersion": "1.1.15.1018"
 }

From b2ebce23443118ede52b7f4cee85d0cbd331d32a Mon Sep 17 00:00:00 2001
From: Nick <nicholasconnors@hotmail.ca>
Date: Mon, 10 Jun 2024 18:25:53 -0400
Subject: [PATCH 7/8] Try and use a different button idk

---
 .../NewMenuSystem/OptionsMenuManager.cs                | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index 85dabe3c4..a4b1aeffd 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -550,13 +550,7 @@ public SubmitAction CreateButtonWithLabel(Menu menu, string label, string button
 			Object.Destroy(controlBlock.Find("OptionSelectorBG").gameObject);
 			Object.Destroy(controlBlock.Find("HorizontalLayoutGroup").gameObject);
 
-			var existingButton = Resources.FindObjectsOfTypeAll<Menu>()
-				.Single(x => x.name == "GraphicsMenu").transform
-				.Find("Scroll View")
-				.Find("Viewport")
-				.Find("Content")
-				.Find("GammaButtonPanel")
-				.Find("UIElement-GammaButton").gameObject;
+			var existingButton = Resources.FindObjectsOfTypeAll<Button>().First(x => x.name == "UIElement-ButtonContinue").gameObject;
 
 			var newButton = Object.Instantiate(existingButton);
 			newButton.transform.parent = controlBlock;
@@ -619,7 +613,7 @@ public SubmitAction CreateButtonWithLabel(Menu menu, string label, string button
 
 			newButton.GetAddComponent<SelectableAudioPlayer>();
 
-			var menuOption = newButton.GetComponent<MenuOption>();
+			var menuOption = newButton.GetAddComponent<MenuOption>();
 			menuOption._tooltipTextType = UITextType.None;
 			menuOption._overrideTooltipText = tooltip;
 			menuOption._label.text = buttonLabel;

From 6fbc4e3362bdac5e3d36b9ab647bd09cfd258d44 Mon Sep 17 00:00:00 2001
From: Nick <nicholasconnors@hotmail.ca>
Date: Mon, 10 Jun 2024 18:52:22 -0400
Subject: [PATCH 8/8] Fix button with label

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

diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
index e769a37d8..b3191800e 100644
--- a/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
+++ b/src/OWML.ModHelper.Menus/NewMenuSystem/OptionsMenuManager.cs
@@ -568,8 +568,7 @@ public SubmitAction CreateButtonWithLabel(Menu menu, string label, string button
 			rt.anchoredPosition3D = ort.anchoredPosition3D;
 			rt.sizeDelta = ort.sizeDelta;
 
-			Object.Destroy(newButton.GetComponent<SubmitActionMenu>());
-			var submitAction = newButton.AddComponent<SubmitAction>();
+			var submitAction = newButton.GetComponent<SubmitAction>();
 
 			Object.Destroy(newButton.GetComponentInChildren<LocalizedText>());
 
@@ -616,13 +615,14 @@ public SubmitAction CreateButtonWithLabel(Menu menu, string label, string button
 			var menuOption = newButton.GetAddComponent<MenuOption>();
 			menuOption._tooltipTextType = UITextType.None;
 			menuOption._overrideTooltipText = tooltip;
+			menuOption._label = newButton.GetComponentInChildren<Text>();
 			menuOption._label.text = buttonLabel;
 
 			menu._menuOptions = menu._menuOptions.Add(menuOption);
 
 			if (menu._selectOnActivate == null)
 			{
-				menu._selectOnActivate = newButtonObj.GetComponent<Selectable>();
+				menu._selectOnActivate = newButtonObj.GetComponent<Button>();
 			}
 
 			return submitAction;