diff --git a/BeatSaberMarkupLanguage/BeatSaberMarkupLanguage.csproj b/BeatSaberMarkupLanguage/BeatSaberMarkupLanguage.csproj index 8903f302..179c4321 100644 --- a/BeatSaberMarkupLanguage/BeatSaberMarkupLanguage.csproj +++ b/BeatSaberMarkupLanguage/BeatSaberMarkupLanguage.csproj @@ -15,8 +15,8 @@ BeatSaberMarkupLanguage.Resources.icon.png Copyright © monkeymanboy 2019-2024 An XML-based UI system. - 1.37.4 - 1.12.4 + 1.40.0 + 1.12.5 https://github.com/monkeymanboy/BeatSaberMarkupLanguage { @@ -37,70 +37,58 @@ - + + False + $(BeatSaberDir)\Libs\0Harmony.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.Init.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\BeatSaber.ViewSystem.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.AppFlow.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.Polyglot.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\BGLib.UnityExtension.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\GameInit.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\GameplayCore.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\HMLib.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\HMUI.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\Interactable.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\Main.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\Menu.ColorSettings.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\Menu.CommonLib.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\MenuSystem.dll False @@ -108,84 +96,67 @@ False - $(BeatSaberDir)\Beat Saber_Data\Managed\SegmentedControl.dll False + - $(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.AssetBundleModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.ImageConversionModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.InputLegacyModule.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.PhysicsModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.TextCoreFontEngineModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.TextRenderingModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UI.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UIModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UnityWebRequestModule.dll False - $(BeatSaberDir)\Beat Saber_Data\Managed\Unity.Addressables.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\Unity.ResourceManager.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\VRUI.dll False True - $(BeatSaberDir)\Beat Saber_Data\Managed\Zenject.dll - false + False True - $(BeatSaberDir)\Beat Saber_Data\Managed\Zenject-usage.dll - false + False diff --git a/BeatSaberMarkupLanguage/Components/Settings/GenericSliderSetting.cs b/BeatSaberMarkupLanguage/Components/Settings/GenericSliderSetting.cs index f3a31b77..63304261 100644 --- a/BeatSaberMarkupLanguage/Components/Settings/GenericSliderSetting.cs +++ b/BeatSaberMarkupLanguage/Components/Settings/GenericSliderSetting.cs @@ -33,7 +33,7 @@ public bool ShowButtons public override bool Interactable { - get => slider != null && slider.interactable; + get => slider != null && ((TextSlider)slider).interactable; set { if (slider != null) diff --git a/BeatSaberMarkupLanguage/Directory.Build.props b/BeatSaberMarkupLanguage/Directory.Build.props index 5fe10a98..3ba6cf3f 100644 --- a/BeatSaberMarkupLanguage/Directory.Build.props +++ b/BeatSaberMarkupLanguage/Directory.Build.props @@ -26,7 +26,7 @@ - $(BeatSaberDir)Beat Saber_Data\Managed\IPA.Loader.dll + $(BeatSaberDir)IPA\IPA.Loader.dll False diff --git a/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs b/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs index c09ba1fd..4c4d4a47 100644 --- a/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs +++ b/BeatSaberMarkupLanguage/Tags/Settings/GenericSliderSettingTag.cs @@ -1,5 +1,6 @@ using System.Collections.Generic; using System.Linq; +using BeatSaber.GameSettings; using BeatSaberMarkupLanguage.Components; using BeatSaberMarkupLanguage.Components.Settings; using BGLib.Polyglot; @@ -19,12 +20,18 @@ public override GameObject CreateObject(Transform parent) { if (controllersTransformTemplate == null) { - controllersTransformTemplate = DiContainer.Resolve()._settingsSubMenuInfos.First(m => m.viewController is ControllersTransformSettingsViewController).viewController.transform.Find("Content/PositionX").GetComponent(); + controllersTransformTemplate = DiContainer.Resolve()._settingsSubMenuInfos.First(m => m.viewController is ControllerProfilesSettingsViewController).viewController.transform.Find("Content/MainContent/Sliders/PositionX").GetComponent(); } LayoutElement baseSetting = Object.Instantiate(controllersTransformTemplate, parent, false); baseSetting.name = "BSMLSliderSetting"; + RectTransform rectTransform = (RectTransform)baseSetting.transform; + rectTransform.anchoredPosition = Vector3.zero; + + Object.Destroy(rectTransform.Find("SliderLeft").gameObject); + Object.Destroy(baseSetting.GetComponent()); + GameObject gameObject = baseSetting.gameObject; T sliderSetting = gameObject.AddComponent(); @@ -34,22 +41,29 @@ public override GameObject CreateObject(Transform parent) sliderSetting.Slider.GetComponentInChildren().enableWordWrapping = false; sliderSetting.Slider._enableDragging = true; - RectTransform rectTransform = (RectTransform)sliderSetting.Slider.transform; - rectTransform.anchorMin = new Vector2(1, 0); - rectTransform.anchorMax = new Vector2(1, 1); - rectTransform.sizeDelta = new Vector2(52, 0); - rectTransform.pivot = new Vector2(1, 0.5f); - rectTransform.anchoredPosition = new Vector2(0, 0); + RectTransform sliderTransform = (RectTransform)sliderSetting.Slider.transform; + sliderTransform.anchorMin = new Vector2(1, 0); + sliderTransform.anchorMax = new Vector2(1, 1); + sliderTransform.sizeDelta = new Vector2(52, 0); + sliderTransform.pivot = new Vector2(1, 0.5f); + sliderTransform.anchoredPosition = new Vector2(0, 0); + + GameObject titleObject = gameObject.transform.Find("Title").gameObject; + LocalizedTextMeshProUGUI localizedText = ConfigureLocalizedText(titleObject); - GameObject nameText = gameObject.transform.Find("Title").gameObject; - LocalizedTextMeshProUGUI localizedText = ConfigureLocalizedText(nameText); + RectTransform titleTransform = (RectTransform)titleObject.transform; + titleTransform.anchorMin = Vector3.zero; + titleTransform.anchorMax = Vector3.zero; + titleTransform.offsetMin = Vector3.zero; + titleTransform.offsetMax = new Vector2(-52, 0); - TextMeshProUGUI text = nameText.GetComponent(); - text.text = "Default Text"; - text.rectTransform.anchorMax = Vector2.one; + TextMeshProUGUI titleTextMesh = titleObject.GetComponent(); + titleTextMesh.text = "Default Text"; + titleTextMesh.rectTransform.anchorMax = Vector2.one; + titleTextMesh.alignment = TextAlignmentOptions.CaplineLeft; List externalComponents = gameObject.AddComponent().Components; - externalComponents.Add(text); + externalComponents.Add(titleTextMesh); externalComponents.Add(localizedText); baseSetting.preferredWidth = 90;