small UI updates, fix for menu button disappearing after soft restart

TheBlackParrot · TheBlackParrot · commit af22159cd20c · 2024-11-27T11:05:25.000-06:00
diff --git a/CustomMenuText/DefaultTextFile.txt b/CustomMenuText/DefaultTextFile.txt
@@ -229,4 +229,61 @@ CUTE
 
 # Just Shapes & Beats
 <size=80%><#FFFFFF>Just <size=100%>sh<#FD479E>a<#FFFFFF>pes
-<size=130%><#81D9E5>&beats
+<size=130%><#81D9E5>&beats
+
+# skissue
+SKILL
+ISSUE
+
+# rank schmank
+RANK
+SCHMANK
+
+# i lov pp
+<size=75%><#777777>I LOVE
+<size=0%>
+<size=140%><#6772E5>PP
+
+# :3
+COLON
+THREE
+
+# :3333
+<size=333%><#FF55DD>:3
+
+# :3333c
+<size=666%><#FF55DD>:3c
+
+# slice for 115!
+<size=75%><#FF0000>SLICE FOR
+<size=0%>
+<size=150%><#0099FF>115!
+
+# accn't
+<size=175%><#FF0000>ACCN'T
+
+# yippee!
+YIPP
+EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+
+# !bsr 25f
+<size=75%><#777777>!bsr
+<size=0%>
+<size=150%><#0099FF>25f
+
+# Wanna break from the ads?
+Wanna break
+from the ads?
+
+# funny meme
+<size=75%><#FF0077>30-50 FERAL HOGS
+<size=75%><#FF0000>RUNNING <size=50%><#777777>INTO MY <size=75%><#33FF66>YARD
+<size=50%><#333333>(<size=33%>WITHIN 3-5 MINUTES<size=50%>)
+<size=75%><#0099FF>WHILE MY SMALL KIDS PLAY
+
+# 1.29.1 moment
+OFFICIAL
+<size=50%>1.29.1 REFUGEE CLUB MEMBER
+
+# Blank (i use this mod to hide the text actually)
+
diff --git a/CustomMenuText/Plugin.cs b/CustomMenuText/Plugin.cs
@@ -14,6 +14,7 @@
 using IPA.Utilities;
 using System.Reflection;
 using System.Threading.Tasks;
+using BeatSaberMarkupLanguage.Util;
 using HarmonyLib;
 using IPA.Loader;
 
@@ -151,7 +152,7 @@ public void OnDisable()
         }
 
         [OnStart]
-        public void OnApplicationStart()
+        async public void OnApplicationStart()
         {
             if (!Directory.Exists(Path.Combine(UnityGame.UserDataPath, "CustomMenuText", "Cache")))
                 Directory.CreateDirectory(Path.Combine(UnityGame.UserDataPath, "CustomMenuText", "Cache"));
@@ -168,7 +169,8 @@ public void OnApplicationStart()
             
             FontManager.FirstTimeFontLoad();
             
-            //BeatSaberMarkupLanguage.Settings.BSMLSettings.instance.AddSettingsMenu("Menu Text", "CustomMenuText.Configuration.settings.bsml", Configuration.CustomMenuTextSettingsUI.instance);
+            await MainMenuAwaiter.WaitForMainMenuAsync();
+            MainMenuAwaiter.MainMenuInitializing += Views.UICreator.CreateMenu;
             Views.UICreator.CreateMenu();
             reloadFile();
         }
@@ -425,13 +427,6 @@ public void OnApplicationQuit()
                 }
                 Directory.Delete(cachePath);
             }
-                
         }
-
-        
-
-
-        
-
     }
 }
diff --git a/CustomMenuText/Properties/AssemblyInfo.cs b/CustomMenuText/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.0.2")]
-[assembly: AssemblyFileVersion("4.0.2")]
+[assembly: AssemblyVersion("4.0.3")]
+[assembly: AssemblyFileVersion("4.0.3")]
diff --git a/CustomMenuText/Views/MenuTextFlowCoordinator.cs b/CustomMenuText/Views/MenuTextFlowCoordinator.cs
@@ -26,7 +26,7 @@ protected override void DidActivate(bool firstActivation, bool addedToHierarchy,
             {
                 if (firstActivation)
                 {
-                    SetTitle("Menu Text");
+                    SetTitle("Custom Menu Text");
                     showBackButton = true;
                     ProvideInitialViewControllers(_textSelectorViewController);
                 }
diff --git a/CustomMenuText/Views/TextSelector/TextSelector.bsml b/CustomMenuText/Views/TextSelector/TextSelector.bsml
@@ -1,24 +1,18 @@
 ﻿<vertical xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='https://monkeymanboy.github.io/BSML-Docs/ https://monkeymanboy.github.io/BSML-Docs/BSMLSchema.xsd'>
-	<!--<horizontal pref-width="100" horizontal-fit="PreferredSize">
-		<text text="s" align="Center" font-size="7" />
-		<tab-selector tab-tag="yo" />
-	</horizontal>-->
 	<horizontal>
 		<vertical>
 			<page-button event-click='TextList#PageUp' direction='Up'/>
 			<custom-list id='TextList' select-cell='textSelect' contents='contents' vertical-fit='PreferredSize' list-width='45'>
-				<stack vertical-fit='PreferredSize' child-expand-height='false' >
+				<stack vertical-fit='PreferredSize' child-expand-height='false'>
 					<vertical pref-height='14' min-height='14' vertical-fit='PreferredSize'>
 						<horizontal horizontal-fit='PreferredSize'>
-							<vertical background='round-rect-panel' vertical-fit='PreferredSize' min-height='9' pref-height='9' padding='5' bg-color='#FFFFFF60'>
+							<vertical background='round-rect-panel' vertical-fit='PreferredSize' min-height='9' pref-height='9' pad-top='5' pad-bottom='5' pad-left='2' pad-right='2' bg-color='#FFFFFFB0'>
 								<horizontal>
-									<!--<background background='round-rect-panel' tags='hovered' pref-width='9' pref-height='9' min-width='9' pad-right='10'/>!-->
-								<vertical child-expand-width='false' spacing='-1' vertical-fit='Unconstrained'>
+								<vertical child-expand-width='false' spacing='-2' vertical-fit='Unconstrained'>
 									<text text='~text-top' id='topText' align='Center' word-wrapping="true"/>
 									<text text='~text-bottom' id='bottomText' align='Center' word-wrapping="true"/>
 								</vertical>
 								</horizontal>
-								<!--<background background='round-rect-panel' tags='hovered' pref-width='9' pref-height='9' min-width='9' pad-right='10'/>!-->
 							</vertical>
 						</horizontal>
 					</vertical>
diff --git a/CustomMenuText/Views/UICreator.cs b/CustomMenuText/Views/UICreator.cs
@@ -9,18 +9,12 @@ namespace CustomMenuText.Views
     internal class UICreator
     {
         public static MenuTextFlowCoordinator MenuTextFlowCoordinator;
-        public static bool Created;
 
         async public static void CreateMenu()
         {
-            await MainMenuAwaiter.WaitForMainMenuAsync();
-            
-            if (!Created)
-            {
-                MenuButton menuButton = new MenuButton("Custom Menu Text", "Manage Custom Menu Text", ShowFlow);
-                MenuButtons.Instance.RegisterButton(menuButton);
-                Created = true;
-            }
+			await MainMenuAwaiter.WaitForMainMenuAsync();
+            MenuButton menuButton = new MenuButton("Custom Menu Text", "Manage Custom Menu Text", ShowFlow);
+            MenuButtons.Instance.RegisterButton(menuButton);
         }
 
 
diff --git a/CustomMenuText/manifest.json b/CustomMenuText/manifest.json
@@ -4,7 +4,7 @@
   "name": "CustomMenuText",
   "author": "TheBlackParrot",
   "version": "4.0.3",
-  "description": "Replalces the ingame Beat Saber logo with custom text.",
+  "description": "Replaces the in-game Beat Saber logo with custom text.",
   "gameVersion": "1.39.1",
   "dependsOn": {
     "BSIPA": "^4.3.4",

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`using IPA.Utilities;`
`15`	`15`	`using System.Reflection;`
`16`	`16`	`using System.Threading.Tasks;`
	`17`	`+using BeatSaberMarkupLanguage.Util;`
`17`	`18`	`using HarmonyLib;`
`18`	`19`	`using IPA.Loader;`
`19`	`20`
`@@ -151,7 +152,7 @@ public void OnDisable()`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`[OnStart]`
`154`		`- public void OnApplicationStart()`
	`155`	`+ async public void OnApplicationStart()`
`155`	`156`	`{`
`156`	`157`	`if (!Directory.Exists(Path.Combine(UnityGame.UserDataPath, "CustomMenuText", "Cache")))`
`157`	`158`	`Directory.CreateDirectory(Path.Combine(UnityGame.UserDataPath, "CustomMenuText", "Cache"));`
`@@ -168,7 +169,8 @@ public void OnApplicationStart()`
`168`	`169`
`169`	`170`	`FontManager.FirstTimeFontLoad();`
`170`	`171`
`171`		`- //BeatSaberMarkupLanguage.Settings.BSMLSettings.instance.AddSettingsMenu("Menu Text", "CustomMenuText.Configuration.settings.bsml", Configuration.CustomMenuTextSettingsUI.instance);`
	`172`	`+ await MainMenuAwaiter.WaitForMainMenuAsync();`
	`173`	`+ MainMenuAwaiter.MainMenuInitializing += Views.UICreator.CreateMenu;`
`172`	`174`	`Views.UICreator.CreateMenu();`
`173`	`175`	`reloadFile();`
`174`	`176`	`}`
`@@ -425,13 +427,6 @@ public void OnApplicationQuit()`
`425`	`427`	`}`
`426`	`428`	`Directory.Delete(cachePath);`
`427`	`429`	`}`
`428`		`-`
`429`	`430`	`}`
`430`		`-`
`431`		`-`
`432`		`-`
`433`		`-`
`434`		`-`
`435`		`-`
`436`	`431`	`}`
`437`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ protected override void DidActivate(bool firstActivation, bool addedToHierarchy,`
`26`	`26`	`{`
`27`	`27`	`if (firstActivation)`
`28`	`28`	`{`
`29`		`- SetTitle("Menu Text");`
	`29`	`+ SetTitle("Custom Menu Text");`
`30`	`30`	`showBackButton = true;`
`31`	`31`	`ProvideInitialViewControllers(_textSelectorViewController);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,12 @@ namespace CustomMenuText.Views`
`9`	`9`	`internal class UICreator`
`10`	`10`	`{`
`11`	`11`	`public static MenuTextFlowCoordinator MenuTextFlowCoordinator;`
`12`		`- public static bool Created;`
`13`	`12`
`14`	`13`	`async public static void CreateMenu()`
`15`	`14`	`{`
`16`		`- await MainMenuAwaiter.WaitForMainMenuAsync();`
`17`		`-`
`18`		`- if (!Created)`
`19`		`- {`
`20`		`- MenuButton menuButton = new MenuButton("Custom Menu Text", "Manage Custom Menu Text", ShowFlow);`
`21`		`- MenuButtons.Instance.RegisterButton(menuButton);`
`22`		`- Created = true;`
`23`		`- }`
	`15`	`+ await MainMenuAwaiter.WaitForMainMenuAsync();`
	`16`	`+ MenuButton menuButton = new MenuButton("Custom Menu Text", "Manage Custom Menu Text", ShowFlow);`
	`17`	`+ MenuButtons.Instance.RegisterButton(menuButton);`
`24`	`18`	`}`
`25`	`19`
`26`	`20`