ratijas
/
muzika-gromche
forked from nikita/muzika-gromche
1
0
Fork 0
Code Pull Requests Activity

Auto format code

This commit is contained in:
ivan tkachenko 2025-07-05 01:44:56 +03:00
parent b9f6bcce9d
commit eea59ca19f
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MuzikaGromche/Plugin.cs
View File

@ -63,7 +63,8 @@ namespace MuzikaGromche
public static void StopLightSwitching(MonoBehaviour __instance) public static void StopLightSwitching(MonoBehaviour __instance)
{ {
if (JesterLightSwitching != null) { if (JesterLightSwitching != null)
{
__instance.StopCoroutine(JesterLightSwitching); __instance.StopCoroutine(JesterLightSwitching);
JesterLightSwitching = null; JesterLightSwitching = null;
} }
@ -95,9 +96,12 @@ namespace MuzikaGromche
Debug.Log("Chose color " + color); Debug.Log("Chose color " + color);
SetLightColor(color); SetLightColor(color);
i = (i + 1) % colors.Count; i = (i + 1) % colors.Count;
if (CurrentTrack != null) { if (CurrentTrack != null)
{
yield return new WaitForSeconds(60f / CurrentTrack.Bpm); yield return new WaitForSeconds(60f / CurrentTrack.Bpm);
} else { }
else
{
yield break; yield break;
} }
} }
@ -107,7 +111,8 @@ namespace MuzikaGromche
{ {
string text = Info.Location.TrimEnd((PluginInfo.PLUGIN_NAME + ".dll").ToCharArray()); string text = Info.Location.TrimEnd((PluginInfo.PLUGIN_NAME + ".dll").ToCharArray());
UnityWebRequest[] requests = new UnityWebRequest[Tracks.Length * 2]; UnityWebRequest[] requests = new UnityWebRequest[Tracks.Length * 2];
for (int i = 0; i < Tracks.Length; i++) { for (int i = 0; i < Tracks.Length; i++)
{
Track track = Tracks[i]; Track track = Tracks[i];
requests[i * 2] = UnityWebRequestMultimedia.GetAudioClip($"File://{text}{track.FileNameStart}", track.AudioType); requests[i * 2] = UnityWebRequestMultimedia.GetAudioClip($"File://{text}{track.FileNameStart}", track.AudioType);
requests[i * 2 + 1] = UnityWebRequestMultimedia.GetAudioClip($"File://{text}{track.FileNameLoop}", track.AudioType); requests[i * 2 + 1] = UnityWebRequestMultimedia.GetAudioClip($"File://{text}{track.FileNameLoop}", track.AudioType);
@ -117,14 +122,18 @@ namespace MuzikaGromche
while (!requests.All(request => request.isDone)) { } while (!requests.All(request => request.isDone)) { }
if (requests.All(request => request.result == UnityWebRequest.Result.Success)) { if (requests.All(request => request.result == UnityWebRequest.Result.Success))
for (int i = 0; i < Tracks.Length; i++) { {
for (int i = 0; i < Tracks.Length; i++)
{
Track track = Tracks[i]; Track track = Tracks[i];
track.LoadedStart = DownloadHandlerAudioClip.GetContent(requests[i * 2]); track.LoadedStart = DownloadHandlerAudioClip.GetContent(requests[i * 2]);
track.LoadedLoop = DownloadHandlerAudioClip.GetContent(requests[i * 2 + 1]); track.LoadedLoop = DownloadHandlerAudioClip.GetContent(requests[i * 2 + 1]);
} }
new Harmony(PluginInfo.PLUGIN_NAME).PatchAll(typeof(JesterPatch)); new Harmony(PluginInfo.PLUGIN_NAME).PatchAll(typeof(JesterPatch));
} else { }
else
{
Logger.LogError("Could not load audio file"); Logger.LogError("Could not load audio file");
} }
} }
@ -177,7 +186,8 @@ namespace MuzikaGromche
{ {
__state = new State(); __state = new State();
__state.prevStateindex = __instance.previousState; __state.prevStateindex = __instance.previousState;
if (__instance.currentBehaviourStateIndex == 2 && __instance.previousBehaviourStateIndex != 2) { if (__instance.currentBehaviourStateIndex == 2 && __instance.previousBehaviourStateIndex != 2)
{
// if just popped out // if just popped out
// then override farAudio so that vanilla logic does not stop the music // then override farAudio so that vanilla logic does not stop the music
__state.farAudio = __instance.farAudio; __state.farAudio = __instance.farAudio;