From 707198eabf2a4ca814758be374e5043a99bb38b1 Mon Sep 17 00:00:00 2001 From: _nebula <41904486+misternebula@users.noreply.github.com> Date: Wed, 28 Feb 2024 16:49:15 +0000 Subject: [PATCH] remove scene load button --- .../Interfaces/Menus/IPauseMenuManager.cs | 1 - .../OWMLSubmitActionLoadScene.cs | 100 ------------------ .../NewMenuSystem/PauseMenuManager.cs | 20 ---- 3 files changed, 121 deletions(-) delete mode 100644 src/OWML.ModHelper.Menus/NewMenuSystem/OWMLSubmitActionLoadScene.cs diff --git a/src/OWML.Common/Interfaces/Menus/IPauseMenuManager.cs b/src/OWML.Common/Interfaces/Menus/IPauseMenuManager.cs index e2926dbff..84d8e911b 100644 --- a/src/OWML.Common/Interfaces/Menus/IPauseMenuManager.cs +++ b/src/OWML.Common/Interfaces/Menus/IPauseMenuManager.cs @@ -16,6 +16,5 @@ public interface IPauseMenuManager public GameObject MakeMenuOpenButton(string name, Menu menuToOpen, Menu customMenu = null); - public GameObject MakeSceneLoadButton(string name, SubmitActionLoadScene.LoadableScenes sceneToLoad, PopupMenu confirmPopup = null, Menu customMenu = null); } } diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/OWMLSubmitActionLoadScene.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/OWMLSubmitActionLoadScene.cs deleted file mode 100644 index 745d24ac5..000000000 --- a/src/OWML.ModHelper.Menus/NewMenuSystem/OWMLSubmitActionLoadScene.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System.Text; -using UnityEngine; -using UnityEngine.UI; - -namespace OWML.ModHelper.Menus.NewMenuSystem -{ - internal class OWMLSubmitActionLoadScene : SubmitActionConfirm - { - public Text _loadingText; - - private SubmitActionLoadScene.LoadableScenes _sceneToLoad; - private StringBuilder _nowLoadingSB; - private bool _receivedSubmitAction; - private bool _waitingOnStreaming; - - public void SetSceneToLoad(SubmitActionLoadScene.LoadableScenes scene) - => _sceneToLoad = scene; - - private void Update() - { - if (!_receivedSubmitAction - || (LoadManager.GetLoadingScene() != OWScene.SolarSystem && LoadManager.GetLoadingScene() != OWScene.EyeOfTheUniverse) - || _loadingText == null) - { - return; - } - - var loadProgress = LoadManager.GetAsyncLoadProgress(); - loadProgress = loadProgress < 0.1f - ? Mathf.InverseLerp(0f, 0.1f, loadProgress) * 0.9f - : 0.9f + (Mathf.InverseLerp(0.1f, 1f, loadProgress) * 0.1f); - - ResetStringBuilder(); - _nowLoadingSB.Append(UITextLibrary.GetString(UITextType.LoadingMessage)); - _nowLoadingSB.Append(loadProgress.ToString("P0")); - _loadingText.text = _nowLoadingSB.ToString(); - - if (_waitingOnStreaming && LoadManager.IsAsyncLoadComplete()) - { - LoadManager.EnableAsyncLoadTransition(); - _waitingOnStreaming = false; - } - } - - private void ResetStringBuilder() - { - if (_nowLoadingSB == null) - { - _nowLoadingSB = new StringBuilder(); - } - else - { - _nowLoadingSB.Length = 0; - } - } - - public override void ConfirmSubmit() - { - base.ConfirmSubmit(); - switch (_sceneToLoad) - { - case SubmitActionLoadScene.LoadableScenes.GAME: - LoadManager.LoadSceneAsync(OWScene.SolarSystem, false, LoadManager.FadeType.ToBlack, 1f, false); - ResetStringBuilder(); - _waitingOnStreaming = true; - break; - case SubmitActionLoadScene.LoadableScenes.EYE: - LoadManager.LoadSceneAsync(OWScene.EyeOfTheUniverse, true, LoadManager.FadeType.ToBlack, 1f, false); - ResetStringBuilder(); - break; - case SubmitActionLoadScene.LoadableScenes.TITLE: - LoadManager.LoadScene(OWScene.TitleScreen, LoadManager.FadeType.ToBlack, 2f, true); - break; - case SubmitActionLoadScene.LoadableScenes.CREDITS: - LoadManager.LoadScene(OWScene.Credits_Fast, LoadManager.FadeType.ToBlack, 1f, false); - break; - } - - _receivedSubmitAction = true; - Locator.GetMenuInputModule().DisableInputs(); - } - - public override void SetUpPopupMenu() - { - _receivedSubmitAction = true; - base.SetUpPopupMenu(); - } - - public override void CleanupPopup() - { - if (_listenersAttached) - { - _listenersAttached = false; - _confirmPopup.OnPopupCancel -= CancelSubmit; - _confirmPopup.OnPopupConfirm -= ConfirmSubmit; - _confirmPopup.OnForceClosed -= OnPopupForceClosed; - } - } - } -} diff --git a/src/OWML.ModHelper.Menus/NewMenuSystem/PauseMenuManager.cs b/src/OWML.ModHelper.Menus/NewMenuSystem/PauseMenuManager.cs index 5249601c7..4b7e1290d 100644 --- a/src/OWML.ModHelper.Menus/NewMenuSystem/PauseMenuManager.cs +++ b/src/OWML.ModHelper.Menus/NewMenuSystem/PauseMenuManager.cs @@ -103,26 +103,6 @@ public GameObject MakeMenuOpenButton(string name, Menu menuToOpen, Menu customMe return menuRootObject; } - public GameObject MakeSceneLoadButton(string name, SubmitActionLoadScene.LoadableScenes sceneToLoad, PopupMenu confirmPopup = null, Menu customMenu = null) - { - if (LoadManager.GetCurrentScene() != OWScene.SolarSystem && LoadManager.GetCurrentScene() != OWScene.EyeOfTheUniverse) - { - _console.WriteLine("Error - Cannot create pause button in this scene!", OWML.Common.MessageType.Error); - return null; - } - - var menuRootObject = CreateBase(name, customMenu); - - var submitActionLoadScene = menuRootObject.AddComponent(); - submitActionLoadScene.SetSceneToLoad(sceneToLoad); - submitActionLoadScene.EnableConfirm(confirmPopup != null); - submitActionLoadScene._confirmPopup = confirmPopup; - submitActionLoadScene._loadingText = menuRootObject.GetComponentInChildren(); - - menuRootObject.SetActive(true); - return menuRootObject; - } - private GameObject CreateBase(string name, Menu customMenu = null) { if (_pauseMenuItemsTemplate == null)