Remove redundant MOD in names, update class name to be more descriptive

drojf · drojf · commit 0e3411c2a863 · 2021-03-17T20:36:13.000+11:00
diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
@@ -71,7 +71,7 @@
     <Compile Include="Assets.Scripts.Core.Audio\AudioInfo.cs" />
     <Compile Include="Assets.Scripts.Core.Audio\AudioLayerUnity.cs" />
     <Compile Include="Assets.Scripts.Core.Audio\AudioType.cs" />
-    <Compile Include="MOD.Scripts.Core.Audio\MODAudio.cs" />
+    <Compile Include="MOD.Scripts.Core.Audio\MODAudioTracking.cs" />
     <Compile Include="Assets.Scripts.Core.Audio\OnFinishLoad.cs" />
     <Compile Include="Assets.Scripts.Core.Buriko.Util\BurikoObjectConverter.cs" />
     <Compile Include="Assets.Scripts.Core.Buriko.Util\BurikoReference.cs" />
diff --git a/Assets.Scripts.Core.Audio/AudioController.cs b/Assets.Scripts.Core.Audio/AudioController.cs
@@ -223,7 +223,7 @@ public void FadeOutBGM(int channel, int time, bool waitForFade, bool noBGMTracki
 		{
 			if (!noBGMTracking)
 			{
-				MODAudio.Instance.MODForgetLastBGM(channel);
+				MODAudioTracking.Instance.ForgetLastBGM(channel);
 			}
 			float num = (float)time / 1000f;
 			int channelByTypeChannel = GetChannelByTypeChannel(AudioType.BGM, channel);
@@ -243,7 +243,7 @@ public void StopBGM(int channel, bool noBGMTracking = false)
 		{
 			if (!noBGMTracking)
 			{
-				MODAudio.Instance.MODForgetLastBGM(channel);
+				MODAudioTracking.Instance.ForgetLastBGM(channel);
 			}
 			AudioLayerUnity audioLayerUnity = channelDictionary[channel];
 			audioLayerUnity.StopAudio();
@@ -257,7 +257,7 @@ public void FadeOutMultiBGM(int channelstart, int channelend, int time, bool wai
 		{
 			for (int i = channelstart; i <= channelend; i++)
 			{
-				MODAudio.Instance.MODForgetLastBGM(i);
+				MODAudioTracking.Instance.ForgetLastBGM(i);
 				FadeOutBGM(i, time, waitForFade);
 			}
 		}
@@ -389,7 +389,7 @@ public void StopAllAudio()
 		{
 			for (int i = 0; i < 6; i++)
 			{
-				MODAudio.Instance.MODForgetLastBGM(i);
+				MODAudioTracking.Instance.ForgetLastBGM(i);
 				AudioLayerUnity audioLayerUnity = channelDictionary[GetChannelByTypeChannel(AudioType.BGM, i)];
 				if (audioLayerUnity.IsPlaying())
 				{
@@ -432,7 +432,7 @@ public void PlayAudio(string filename, AudioType type, int channel, float volume
 			{
 				if (!noBGMTracking)
 				{
-					MODAudio.Instance.MODSaveLastBGM(new AudioInfo(volume, filename, channel));
+					MODAudioTracking.Instance.SaveLastBGM(new AudioInfo(volume, filename, channel));
 				}
 
 				if (currentAudio[AudioType.BGM].ContainsKey(channel))
diff --git a/Assets.Scripts.Core.Buriko/BurikoScriptFile.cs b/Assets.Scripts.Core.Buriko/BurikoScriptFile.cs
@@ -466,7 +466,7 @@ private BurikoVariable OperationMODPlayBGM()
 			// OperationMODPlayBGM accepts one extra argument - the GAltBGMflow setting where this bgm should be played
 			int targetBGMFlow = ReadVariable().IntValue();
 
-			MODAudio.Instance.MODSaveLastAltBGM(targetBGMFlow, new AudioInfo(volume, filename, channel));
+			MODAudioTracking.Instance.SaveLastAltBGM(targetBGMFlow, new AudioInfo(volume, filename, channel));
 
 			if(BurikoMemory.Instance.GetGlobalFlag("GAltBGMflow").IntValue() == targetBGMFlow)
 			{
@@ -521,7 +521,7 @@ private BurikoVariable OperationMODFadeOutBGM()
 			FadeBGMCommon(out int channel, out int time, out bool waitForFade);
 			int targetBGMFlow = ReadVariable().IntValue();
 
-			MODAudio.Instance.MODForgetLastAltBGM(targetBGMFlow, channel);
+			MODAudioTracking.Instance.ForgetLastAltBGM(targetBGMFlow, channel);
 
 			if (BurikoMemory.Instance.GetGlobalFlag("GAltBGMflow").IntValue() == targetBGMFlow)
 			{
diff --git a/MOD.Scripts.Core.Audio/MODAudioTracking.cs b/MOD.Scripts.Core.Audio/MODAudioTracking.cs
@@ -6,10 +6,10 @@
 
 namespace MOD.Scripts.Core.Audio
 {
-	public class MODAudio
+	public class MODAudioTracking
 	{
-		private static MODAudio _instance;
-		public static MODAudio Instance => _instance ?? (_instance = new MODAudio());
+		private static MODAudioTracking _instance;
+		public static MODAudioTracking Instance => _instance ?? (_instance = new MODAudioTracking());
 
 		// Dictionary of BGMFlow setting -> (Dictionary of channel -> last audio played on that channel by  MODPlayBGM functions))
 		private Dictionary<int, AudioInfo>[] lastAltBGM;
@@ -24,7 +24,7 @@ private void Log(string text)
 			}
 		}
 
-		public MODAudio()
+		public MODAudioTracking()
 		{
 			lastAltBGM = new Dictionary<int, AudioInfo>[8];
 			for (int i = 0; i < lastAltBGM.Length; i++)
@@ -35,7 +35,7 @@ public MODAudio()
 
 		private bool flowInRange(int flow) => flow < lastAltBGM.Length;
 
-		public void MODSaveLastBGM(AudioInfo info)
+		public void SaveLastBGM(AudioInfo info)
 		{
 			Log($"Saving bgm {info.Filename} channel {info.Channel} all flows");
 			foreach (Dictionary<int, AudioInfo> channelDict in lastAltBGM)
@@ -44,7 +44,7 @@ public void MODSaveLastBGM(AudioInfo info)
 			}
 		}
 
-		public void MODForgetLastBGM(int channel)
+		public void ForgetLastBGM(int channel)
 		{
 			Log($"Forgetting channel {channel} all flows");
 			foreach (Dictionary<int, AudioInfo> channelDict in lastAltBGM)
@@ -53,7 +53,7 @@ public void MODForgetLastBGM(int channel)
 			}
 		}
 
-		public void MODSaveLastAltBGM(int altBGMFlow, AudioInfo info)
+		public void SaveLastAltBGM(int altBGMFlow, AudioInfo info)
 		{
 			Log($"Saving bgm {info.Filename} channel {info.Channel} flow {altBGMFlow}");
 			if (flowInRange(altBGMFlow))
@@ -62,7 +62,7 @@ public void MODSaveLastAltBGM(int altBGMFlow, AudioInfo info)
 			}
 		}
 
-		public void MODForgetLastAltBGM(int altBGMFlow, int channel)
+		public void ForgetLastAltBGM(int altBGMFlow, int channel)
 		{
 			Log($"Forgetting channel {channel} flow {altBGMFlow}");
 			if (flowInRange(altBGMFlow))
@@ -71,7 +71,7 @@ public void MODForgetLastAltBGM(int altBGMFlow, int channel)
 			}
 		}
 
-		public void MODRestoreBGM(int oldBGMFlow, int newBGMFlow)
+		public void RestoreBGM(int oldBGMFlow, int newBGMFlow)
 		{
 			Log($"Begin BGM restore...");
 			if (!flowInRange(oldBGMFlow) || !flowInRange(newBGMFlow))
diff --git a/MOD.Scripts.UI/MODMenu.cs b/MOD.Scripts.UI/MODMenu.cs
@@ -449,7 +449,7 @@ public void OnGUIFragment()
 							SetGlobal("GAltBGMflow", newBGMSEValue);
 							SetGlobal("GAltSEflow", newBGMSEValue);
 
-							MODAudio.Instance.MODRestoreBGM(oldBGMSEValue, newBGMSEValue);
+							MODAudioTracking.Instance.RestoreBGM(oldBGMSEValue, newBGMSEValue);
 						}
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ public void FadeOutBGM(int channel, int time, bool waitForFade, bool noBGMTracki`
`223`	`223`	`{`
`224`	`224`	`if (!noBGMTracking)`
`225`	`225`	`{`
`226`		`- MODAudio.Instance.MODForgetLastBGM(channel);`
	`226`	`+ MODAudioTracking.Instance.ForgetLastBGM(channel);`
`227`	`227`	`}`
`228`	`228`	`float num = (float)time / 1000f;`
`229`	`229`	`int channelByTypeChannel = GetChannelByTypeChannel(AudioType.BGM, channel);`
`@@ -243,7 +243,7 @@ public void StopBGM(int channel, bool noBGMTracking = false)`
`243`	`243`	`{`
`244`	`244`	`if (!noBGMTracking)`
`245`	`245`	`{`
`246`		`- MODAudio.Instance.MODForgetLastBGM(channel);`
	`246`	`+ MODAudioTracking.Instance.ForgetLastBGM(channel);`
`247`	`247`	`}`
`248`	`248`	`AudioLayerUnity audioLayerUnity = channelDictionary[channel];`
`249`	`249`	`audioLayerUnity.StopAudio();`
`@@ -257,7 +257,7 @@ public void FadeOutMultiBGM(int channelstart, int channelend, int time, bool wai`
`257`	`257`	`{`
`258`	`258`	`for (int i = channelstart; i <= channelend; i++)`
`259`	`259`	`{`
`260`		`- MODAudio.Instance.MODForgetLastBGM(i);`
	`260`	`+ MODAudioTracking.Instance.ForgetLastBGM(i);`
`261`	`261`	`FadeOutBGM(i, time, waitForFade);`
`262`	`262`	`}`
`263`	`263`	`}`
`@@ -389,7 +389,7 @@ public void StopAllAudio()`
`389`	`389`	`{`
`390`	`390`	`for (int i = 0; i < 6; i++)`
`391`	`391`	`{`
`392`		`- MODAudio.Instance.MODForgetLastBGM(i);`
	`392`	`+ MODAudioTracking.Instance.ForgetLastBGM(i);`
`393`	`393`	`AudioLayerUnity audioLayerUnity = channelDictionary[GetChannelByTypeChannel(AudioType.BGM, i)];`
`394`	`394`	`if (audioLayerUnity.IsPlaying())`
`395`	`395`	`{`
`@@ -432,7 +432,7 @@ public void PlayAudio(string filename, AudioType type, int channel, float volume`
`432`	`432`	`{`
`433`	`433`	`if (!noBGMTracking)`
`434`	`434`	`{`
`435`		`- MODAudio.Instance.MODSaveLastBGM(new AudioInfo(volume, filename, channel));`
	`435`	`+ MODAudioTracking.Instance.SaveLastBGM(new AudioInfo(volume, filename, channel));`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`if (currentAudio[AudioType.BGM].ContainsKey(channel))`
Original file line number	Diff line number	Diff line change
`@@ -466,7 +466,7 @@ private BurikoVariable OperationMODPlayBGM()`
`466`	`466`	`// OperationMODPlayBGM accepts one extra argument - the GAltBGMflow setting where this bgm should be played`
`467`	`467`	`int targetBGMFlow = ReadVariable().IntValue();`
`468`	`468`
`469`		`- MODAudio.Instance.MODSaveLastAltBGM(targetBGMFlow, new AudioInfo(volume, filename, channel));`
	`469`	`+ MODAudioTracking.Instance.SaveLastAltBGM(targetBGMFlow, new AudioInfo(volume, filename, channel));`
`470`	`470`
`471`	`471`	`if(BurikoMemory.Instance.GetGlobalFlag("GAltBGMflow").IntValue() == targetBGMFlow)`
`472`	`472`	`{`
`@@ -521,7 +521,7 @@ private BurikoVariable OperationMODFadeOutBGM()`
`521`	`521`	`FadeBGMCommon(out int channel, out int time, out bool waitForFade);`
`522`	`522`	`int targetBGMFlow = ReadVariable().IntValue();`
`523`	`523`
`524`		`- MODAudio.Instance.MODForgetLastAltBGM(targetBGMFlow, channel);`
	`524`	`+ MODAudioTracking.Instance.ForgetLastAltBGM(targetBGMFlow, channel);`
`525`	`525`
`526`	`526`	`if (BurikoMemory.Instance.GetGlobalFlag("GAltBGMflow").IntValue() == targetBGMFlow)`
`527`	`527`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`
`7`	`7`	`namespace MOD.Scripts.Core.Audio`
`8`	`8`	`{`
`9`		`- public class MODAudio`
	`9`	`+ public class MODAudioTracking`
`10`	`10`	`{`
`11`		`- private static MODAudio _instance;`
`12`		`- public static MODAudio Instance => _instance ?? (_instance = new MODAudio());`
	`11`	`+ private static MODAudioTracking _instance;`
	`12`	`+ public static MODAudioTracking Instance => _instance ?? (_instance = new MODAudioTracking());`
`13`	`13`
`14`	`14`	`// Dictionary of BGMFlow setting -> (Dictionary of channel -> last audio played on that channel by MODPlayBGM functions))`
`15`	`15`	`private Dictionary<int, AudioInfo>[] lastAltBGM;`
`@@ -24,7 +24,7 @@ private void Log(string text)`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
`27`		`- public MODAudio()`
	`27`	`+ public MODAudioTracking()`
`28`	`28`	`{`
`29`	`29`	`lastAltBGM = new Dictionary<int, AudioInfo>[8];`
`30`	`30`	`for (int i = 0; i < lastAltBGM.Length; i++)`
`@@ -35,7 +35,7 @@ public MODAudio()`
`35`	`35`
`36`	`36`	`private bool flowInRange(int flow) => flow < lastAltBGM.Length;`
`37`	`37`
`38`		`- public void MODSaveLastBGM(AudioInfo info)`
	`38`	`+ public void SaveLastBGM(AudioInfo info)`
`39`	`39`	`{`
`40`	`40`	`Log($"Saving bgm {info.Filename} channel {info.Channel} all flows");`
`41`	`41`	`foreach (Dictionary<int, AudioInfo> channelDict in lastAltBGM)`
`@@ -44,7 +44,7 @@ public void MODSaveLastBGM(AudioInfo info)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`- public void MODForgetLastBGM(int channel)`
	`47`	`+ public void ForgetLastBGM(int channel)`
`48`	`48`	`{`
`49`	`49`	`Log($"Forgetting channel {channel} all flows");`
`50`	`50`	`foreach (Dictionary<int, AudioInfo> channelDict in lastAltBGM)`
`@@ -53,7 +53,7 @@ public void MODForgetLastBGM(int channel)`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- public void MODSaveLastAltBGM(int altBGMFlow, AudioInfo info)`
	`56`	`+ public void SaveLastAltBGM(int altBGMFlow, AudioInfo info)`
`57`	`57`	`{`
`58`	`58`	`Log($"Saving bgm {info.Filename} channel {info.Channel} flow {altBGMFlow}");`
`59`	`59`	`if (flowInRange(altBGMFlow))`
`@@ -62,7 +62,7 @@ public void MODSaveLastAltBGM(int altBGMFlow, AudioInfo info)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- public void MODForgetLastAltBGM(int altBGMFlow, int channel)`
	`65`	`+ public void ForgetLastAltBGM(int altBGMFlow, int channel)`
`66`	`66`	`{`
`67`	`67`	`Log($"Forgetting channel {channel} flow {altBGMFlow}");`
`68`	`68`	`if (flowInRange(altBGMFlow))`
`@@ -71,7 +71,7 @@ public void MODForgetLastAltBGM(int altBGMFlow, int channel)`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`		`- public void MODRestoreBGM(int oldBGMFlow, int newBGMFlow)`
	`74`	`+ public void RestoreBGM(int oldBGMFlow, int newBGMFlow)`
`75`	`75`	`{`
`76`	`76`	`Log($"Begin BGM restore...");`
`77`	`77`	`if (!flowInRange(oldBGMFlow) \|\| !flowInRange(newBGMFlow))`
Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ public void OnGUIFragment()`
`449`	`449`	`SetGlobal("GAltBGMflow", newBGMSEValue);`
`450`	`450`	`SetGlobal("GAltSEflow", newBGMSEValue);`
`451`	`451`
`452`		`- MODAudio.Instance.MODRestoreBGM(oldBGMSEValue, newBGMSEValue);`
	`452`	`+ MODAudioTracking.Instance.RestoreBGM(oldBGMSEValue, newBGMSEValue);`
`453`	`453`	`}`
`454`	`454`	`}`
`455`	`455`