From 40734435a991ff4beca2372ff195307ba3e0fd32 Mon Sep 17 00:00:00 2001
From: SabreML <57483089+SabreML@users.noreply.github.com>
Date: Thu, 16 Feb 2023 16:01:27 +0000
Subject: [PATCH] Fussy nitpicks

- Slightly reworded the `ingameText` config option.
- Flipped the order of the two config options.
- Fixed a typo I made in the the review. (inGameText -> ingameText) (whoops)
---
 MusicAnnouncements.sln          |  5 +++++
 MusicAnnouncements/modinfo.json |  2 +-
 src/MusicAnnouncementsConfig.cs | 14 +++++++-------
 src/MusicAnnouncementsMod.cs    |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/MusicAnnouncements.sln b/MusicAnnouncements.sln
index b3ccc0d..38ead41 100644
--- a/MusicAnnouncements.sln
+++ b/MusicAnnouncements.sln
@@ -5,6 +5,11 @@ VisualStudioVersion = 17.4.33213.308
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MusicAnnouncements", "MusicAnnouncements.csproj", "{B5F19BC8-AABD-4BB8-8B8B-F244DFE27D1B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5D40386E-2500-41C1-837D-44229A67E2F1}"
+	ProjectSection(SolutionItems) = preProject
+		MusicAnnouncements\modinfo.json = MusicAnnouncements\modinfo.json
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/MusicAnnouncements/modinfo.json b/MusicAnnouncements/modinfo.json
index 02ae941..c2044f8 100644
--- a/MusicAnnouncements/modinfo.json
+++ b/MusicAnnouncements/modinfo.json
@@ -1,7 +1,7 @@
 {
     "id": "sabreml.musicannouncements",
     "name": "Music Announcements",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "target_game_version": "v1.9.05",
     "authors": "SabreML",
     "description": "Shows the name of the currently playing music track in-game."
diff --git a/src/MusicAnnouncementsConfig.cs b/src/MusicAnnouncementsConfig.cs
index 99b45f4..1eb9247 100644
--- a/src/MusicAnnouncementsConfig.cs
+++ b/src/MusicAnnouncementsConfig.cs
@@ -5,18 +5,18 @@ namespace MusicAnnouncements
 {
 	public class MusicAnnouncementsConfig : OptionInterface
 	{
-		public static Configurable<bool> pauseMenuText;
 		public static Configurable<bool> ingameText;
+		public static Configurable<bool> pauseMenuText;
 
 		public MusicAnnouncementsConfig()
 		{
-			pauseMenuText = config.Bind("pauseMenuText", true, new ConfigurableInfo("Show the name of the currently playing song in the top right of the pause menu.", tags: new object[]
+			ingameText = config.Bind("ingameText", true, new ConfigurableInfo("Announce newly playing songs at the bottom left of the screen in-game.", tags: new object[]
 			{
-				"Show currently playing song in the pause menu"
+				"Announce new songs in-game"
 			}));
-			ingameText = config.Bind("ingameText", true, new ConfigurableInfo("Announce the name of the currently playing song in the bottom left of the screen.", tags: new object[]
+			pauseMenuText = config.Bind("pauseMenuText", true, new ConfigurableInfo("Show the name of the currently playing song in the top right of the pause menu.", tags: new object[]
 			{
-				"Announce currently playing song in the bottom left"
+				"Show currently playing song in the pause menu"
 			}));
 		}
 
@@ -32,8 +32,8 @@ public override void Initialize()
 			AddDivider(593f);
 			AddTitle();
 			AddDivider(540f);
-			AddCheckbox(pauseMenuText, 500f);
-			AddCheckbox(ingameText, 460f);
+			AddCheckbox(ingameText, 500f);
+			AddCheckbox(pauseMenuText, 460f);
 		}
 
 		private void AddDivider(float y)
diff --git a/src/MusicAnnouncementsMod.cs b/src/MusicAnnouncementsMod.cs
index bcadf2b..e99df60 100644
--- a/src/MusicAnnouncementsMod.cs
+++ b/src/MusicAnnouncementsMod.cs
@@ -10,7 +10,7 @@
 
 namespace MusicAnnouncements
 {
-	[BepInPlugin("sabreml.musicannouncements", "MusicAnnouncements", "1.1.1")]
+	[BepInPlugin("sabreml.musicannouncements", "MusicAnnouncements", "1.2.0")]
 	public partial class MusicAnnouncementsMod : BaseUnityPlugin
 	{
 		// The current mod version. (Stored here as a variable so that I don't have to update it in as many places.)
@@ -66,7 +66,7 @@ private void SongHK(On.Music.Song.orig_ctor orig, Song self, MusicPlayer musicPl
 			// The full `name` will be something like "RW_24 - Kayava". We only want to announce the part after the dash.
 			songToAnnounce = Regex.Split(name, " - ")[1];
 			
-			if (MusicAnnouncementsConfig.inGameText.Value) // Gameplay announcements are enabled.
+			if (MusicAnnouncementsConfig.ingameText.Value) // Gameplay announcements are enabled.
 			{
 				announceAttempts = 500; // 500 attempts
 			}