Merge pull request #16 from MDMods/md-4.8.0

Muse Dash 4.8.0
MDMods · Sep 29, 2024 · c8b17ac · c8b17ac
2 parents 9e44f69 + 97304b1
commit c8b17ac
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 37 deletions.
diff --git a/Data/Album.cs b/Data/Album.cs
@@ -8,7 +8,7 @@ namespace CustomAlbums.Data
 {
     public class Album
     {
-        private readonly Logger _logger = new(nameof(Album));
+        private static readonly Logger Logger = new(nameof(Album));
 
         public Album(string path, int index)
         {
@@ -17,7 +17,7 @@ public Album(string path, int index)
                 // Load album from directory
                 if (!File.Exists($"{path}\\info.json"))
                 {
-                    _logger.Error($"Could not find info.json at: {path}\\info.json");
+                    Logger.Error($"Could not find info.json at: {path}\\info.json");
                     throw new FileNotFoundException();
                 }
 
@@ -31,7 +31,7 @@ public Album(string path, int index)
                 var info = zip.GetEntry("info.json");
                 if (info == null)
                 {
-                    _logger.Error($"Could not find info.json in package: {path}");
+                    Logger.Error($"Could not find info.json in package: {path}");
                     throw new FileNotFoundException();
                 }
 
@@ -41,7 +41,7 @@ public Album(string path, int index)
             }
             else
             {
-                _logger.Error($"Could not find album at: {path}");
+                Logger.Error($"Could not find album at: {path}");
                 throw new FileNotFoundException();
             }
 
@@ -97,18 +97,40 @@ public Stream OpenFileStreamIfPossible(string file)
                     return entry.Open().ToMemoryStream();
                 }
 
-                _logger.Error($"Could not find file in package: {file}");
+                Logger.Error($"Could not find file in package: {file}");
                 throw new FileNotFoundException();
             }
 
             var path = $"{Path}\\{file}";
             if (File.Exists(path))
                 return File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
 
-            _logger.Error($"Could not find file: {path}");
+            Logger.Error($"Could not find file: {path}");
             throw new FileNotFoundException();
         }
 
+        public Stream OpenNullableStream(string file)
+        {
+            if (IsPackaged)
+            {
+                using var zip = ZipFile.OpenRead(Path);
+                var entry = zip.GetEntry(file);
+
+                if (entry != null)
+                {
+                    return entry.Open().ToMemoryStream();
+                }
+
+                return null;
+            }
+
+            var path = $"{Path}\\{file}";
+            if (File.Exists(path))
+                return File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+
+            return null;
+        }
+
         public MemoryStream OpenMemoryStream(string file)
         {
             if (IsPackaged)
@@ -121,15 +143,15 @@ public MemoryStream OpenMemoryStream(string file)
                     return entry.Open().ToMemoryStream();
                 }
 
-                _logger.Error($"Could not find file in package: {file}");
+                Logger.Error($"Could not find file in package: {file}");
                 throw new FileNotFoundException();
             }
 
             var path = $"{Path}\\{file}";
             if (File.Exists(path))
                 return File.Open(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite).ToMemoryStream();
 
-            _logger.Error($"Could not find file: {path}");
+            Logger.Error($"Could not find file: {path}");
             throw new FileNotFoundException();
         }
         private void GetSheets()

diff --git a/Data/Setlist.cs b/Data/Setlist.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CustomAlbums.Data
+{
+    public class Setlist
+    {
+        public string Title { get; set; }
+    }
+}
diff --git a/Data/Sheet.cs b/Data/Sheet.cs
@@ -8,7 +8,7 @@ namespace CustomAlbums.Data
 {
     public class Sheet
     {
-        private readonly Logger _logger = new(nameof(Sheet));
+        private static readonly Logger Logger = new(nameof(Sheet));
 
         public Sheet(Album parentAlbum, int difficulty)
         {
@@ -58,7 +58,7 @@ public StageInfo GetStage()
                     var talkFile = Json.Deserialize<JsonObject>(talkStream);
                     if (talkFile.TryGetPropertyValue("version", out var node) && node?.GetValue<int>() == 2)
                     {
-                        _logger.Msg("Version 2 talk file!");
+                        Logger.Msg("Version 2 talk file!");
                         TalkFileVersion2 = true;
                     }
 

diff --git a/Main.cs b/Main.cs
@@ -49,5 +49,11 @@ public override void OnFixedUpdate()
             // TODO: Actually write HotReload
             // HotReloadManager.FixedUpdate();
         }
+
+        public override void OnSceneWasLoaded(int buildIndex, string sceneName)
+        {
+            base.OnSceneWasLoaded(buildIndex, sceneName);
+            MusicStageCellPatch.CurrentScene = sceneName;
+        }
     }
 }
diff --git a/Managers/AlbumManager.cs b/Managers/AlbumManager.cs
@@ -1,4 +1,5 @@
 using CustomAlbums.Data;
+using CustomAlbums.ModExtensions;
 using CustomAlbums.Utilities;
 using Il2CppPeroTools2.Resources;
 using UnityEngine;
@@ -25,6 +26,7 @@ public static class AlbumManager
 
         private static readonly Logger Logger = new(nameof(AlbumManager));
         internal static readonly FileSystemWatcher AlbumWatcher = new();
+        internal static Events.LoadAlbumEvent OnAlbumLoaded;
 
         private static int MaxCount { get; set; }
         public static Dictionary<string, Album> LoadedAlbums { get; } = new();
@@ -48,6 +50,7 @@ public static Album LoadOne(string path)
                         HideFlags.DontUnloadUnusedAsset;
 
                 Logger.Msg($"Loaded {albumName}: {album.Info.Name}");
+                OnAlbumLoaded?.Invoke(typeof(AlbumManager), new AlbumEventArgs(album));
                 return album;
             }
             catch (Exception ex)

diff --git a/Managers/SaveManager.cs b/Managers/SaveManager.cs
@@ -193,14 +193,12 @@ internal static void SaveScore(string uid, int musicDifficulty, int score, float
             var albumName = album.AlbumName;
 
             // Create new album save 
-            if (!SaveData.Highest.ContainsKey(albumName))
-                SaveData.Highest.Add(albumName, new Dictionary<int, CustomChartSave>());
+            SaveData.Highest.TryAdd(albumName, new Dictionary<int, CustomChartSave>());
 
             var currChartScore = SaveData.Highest[albumName];
 
             // Create new save data if the difficulty doesn't exist
-            if (!currChartScore.ContainsKey(musicDifficulty))
-                currChartScore.Add(musicDifficulty, new CustomChartSave());
+            currChartScore.TryAdd(musicDifficulty, new CustomChartSave());
 
             // Set previous score for PnlVictory logic
             var newScore = currChartScore[musicDifficulty];
@@ -221,8 +219,7 @@ internal static void SaveScore(string uid, int musicDifficulty, int score, float
             if (miss != 0) return;
 
             // If there were no misses then add the chart/difficulty to the FullCombo list
-            if (!SaveData.FullCombo.ContainsKey(albumName))
-                SaveData.FullCombo.Add(albumName, new List<int>());
+            SaveData.FullCombo.TryAdd(albumName, new List<int>());
 
             if (!SaveData.FullCombo[albumName].Contains(musicDifficulty))
                 SaveData.FullCombo[albumName].Add(musicDifficulty);

diff --git a/ModExtensions/AlbumEventArgs.cs b/ModExtensions/AlbumEventArgs.cs
@@ -0,0 +1,14 @@
+using CustomAlbums.Data;
+
+namespace CustomAlbums.ModExtensions
+{
+    public class AlbumEventArgs : EventArgs
+    {
+        public Album Album;
+
+        public AlbumEventArgs(Album album)
+        {
+            Album = album;
+        }
+    }
+}
diff --git a/ModExtensions/AssetEventArgs.cs b/ModExtensions/AssetEventArgs.cs
@@ -0,0 +1,14 @@
+namespace CustomAlbums.ModExtensions
+{ 
+    public class AssetEventArgs : EventArgs
+    {
+        public string AssetName;
+        public IntPtr AssetPtr;
+
+        public AssetEventArgs(string assetName, IntPtr assetPtr)
+        {
+            AssetName = assetName;
+            AssetPtr = assetPtr;
+        }
+    }
+}
diff --git a/ModExtensions/Events.cs b/ModExtensions/Events.cs
@@ -0,0 +1,25 @@
+using CustomAlbums.Managers;
+using CustomAlbums.Patches;
+
+namespace CustomAlbums.ModExtensions
+{
+    public static class Events
+    {
+        public delegate void LoadAssetEvent(object s, AssetEventArgs e);
+
+        public static event LoadAssetEvent OnAssetLoaded
+        {
+            add => AssetPatch.OnAssetLoaded += value;
+            remove => AssetPatch.OnAssetLoaded -= value;
+        }
+
+        public delegate void LoadAlbumEvent(object s, AlbumEventArgs e);
+
+        public static event LoadAlbumEvent OnAlbumLoaded
+        {
+            add => AlbumManager.OnAlbumLoaded += value;
+            remove => AlbumManager.OnAlbumLoaded -= value;
+        }
+
+    }
+}
diff --git a/Patches/AnalyticsPatch.cs b/Patches/AnalyticsPatch.cs
@@ -1,7 +1,6 @@
 using CustomAlbums.Managers;
 using HarmonyLib;
 using Il2CppAssets.Scripts.Database;
-using Il2CppAssets.Scripts.Structs.Modules;
 using Il2CppPeroPeroGames.DataStatistics;
 using System.Reflection;
 using UnityEngine;
@@ -102,10 +101,8 @@ internal class GetSearchResultInfoPatch
             private static bool Prefix(MusicInfo musicInfo)
             {
                 var runCond = !musicInfo.uid.StartsWith($"{AlbumManager.Uid}-");
-                if (runCond) return true;
-
-                Logger.Msg("Blocking custom album from being added to search analytics.");
-                return false;
+                if (!runCond) Logger.Msg("Blocking custom album from being added to search analytics.");
+                return runCond;
             }    
         }
     }

diff --git a/Patches/AnimatedCoverPatch.cs b/Patches/AnimatedCoverPatch.cs
@@ -18,9 +18,11 @@ internal static class MusicStageCellPatch
         {
             private static readonly Logger Logger = new(nameof(MusicStageCellPatch));
             private static readonly LinkedList<MusicStageCell> Cells = new();
+            internal static string CurrentScene { get; set; }
 
             public static void AnimateCoversUpdate()
             {
+                if (CurrentScene is not "UISystem_PC") return;
                 var dbMusicTag = GlobalDataBase.dbMusicTag;
 
                 if (dbMusicTag == null) return;

diff --git a/Patches/AssetPatch.cs b/Patches/AssetPatch.cs
@@ -4,6 +4,7 @@
 using System.Text.Json.Nodes;
 using CustomAlbums.Data;
 using CustomAlbums.Managers;
+using CustomAlbums.ModExtensions;
 using CustomAlbums.Utilities;
 using HarmonyLib;
 using Il2CppAssets.Scripts.Database;
@@ -31,6 +32,7 @@ internal class AssetPatch
 
         private static int _latestAlbumNum;
         private static bool _doneLoadingAlbumsFlag;
+        internal static Events.LoadAssetEvent OnAssetLoaded;
 
         /// <summary>
         ///     Binds the asset to a new key, while removing the old asset.
@@ -291,6 +293,8 @@ private static IntPtr LoadFromNamePatch(IntPtr instance, IntPtr assetNamePtr, In
 
             Logger.Msg($"Loading {assetName}!");
 
+            OnAssetLoaded?.Invoke(typeof(AssetPatch), new AssetEventArgs(assetName, assetPtr));
+
             if (assetName.StartsWith("ALBUM") && assetName[5..].TryParseAsInt(out var albumNum) &&
                 albumNum != AlbumManager.Uid + 1)
             {