load bg as cover image

Author: ArjixWasTaken

.github/workflows/release.yml

@@ -38,16 +38,12 @@ jobs:
                   architecture: "x64"
 
             - name: Build
-              run: dotnet publish -c=Debug
+              run: dotnet publish -c=Release
 
             - name: Set-tag-env
               run: |
                   "RE_TAG_NAME=$(python .github/scripts/get_version_tag.py)" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
 
-            # - name: Rename dll
-            #   run: |
-            #       Copy-Item -Force Server\bin\Debug\net35\ServerEmulatorFinal.dll Server\bin\Debug\net35\ServerEmulator.dll
-
             - name: Publish the build
               uses: "marvinpinto/action-automatic-releases@latest"
               with:

Server/OsuManiaLoader/DataStructures.cs

@@ -60,6 +60,7 @@ public class OsuMania
     public int BeatmapSetId;
     public string StageBg;
     public int BeatDivisor;
+    public string BackgroundImage;
 
     public int KeyCount;
     public int OverallDifficulty;

Server/OsuManiaLoader/Injector.cs

@@ -6,13 +6,15 @@
 using System.Threading;
 using Aquatrax;
 using HarmonyLib;
+using LitJson;
 using Server.Emulator.Tools;
 using SharpCompress.Archive.Zip;
 using UnityEngine;
 using Path = System.IO.Path;
 
 namespace Server.OsuManiaLoader;
 
+// Partially stolen from: https://github.com/MoeGrid/InvaxionCustomBeatmap/tree/9c90c9937c5c940b4a5f981aecf6ea20f0ba0ff7/Plugin
 // ReSharper disable once InconsistentNaming
 public static class SongPatches
 {
@@ -31,25 +33,73 @@ public static void classifyMusicInfoList_Patch(ref GlobalConfig __instance)
     // ReSharper disable once InconsistentNaming
     public static bool GetCoverSprite_Patch(string path, ref Sprite __result)
     {
-        var paths = path.Split(' ');
-        if (paths.Length <= 1) return true;
+        var paths = path.Split('_');
         var songId = int.Parse(paths[0]);
-        if (Server.ManiaBeatmapsLoader.BeatmapPacks.Any(pack => pack.PackId + Salt == songId))
+        var pack = Server.ManiaBeatmapsLoader.BeatmapPacks.FirstOrDefault(pack => pack.PackId + Salt == songId);
+        if (pack == null) return true;
+
+        var bgDir = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("osu!mania_beatmaps", "Backgrounds!"));
+        if (!Directory.Exists(bgDir)) Directory.CreateDirectory(bgDir);
+        var bgPath = Path.Combine(bgDir, $"{pack.PackId}_{pack.PackName}_bg.jpg");
+
+        var found = File.Exists(bgPath);
+
+        if (!found)
         {
-            // TODO: See if cropping the bg image is worthwhile
-            __result = new Sprite();
-            return false;
+            var backupImg = "";
+            if (pack.BackgroundImages.Length != 0)
+                backupImg = pack.BackgroundImages.OrderBy(n => Guid.NewGuid()).ToArray()[0];
+
+            var archive = ZipArchive.Open(new MemoryStream(File.ReadAllBytes(pack.PackFile)));
+            foreach (var entry in archive.Entries)
+            {
+                var name = Path.GetFileNameWithoutExtension(entry.FilePath.Replace('\\', '/').Split('/').Last())
+                    .ToLower();
+                if (entry.IsDirectory || name != "background" && name != "bg") continue;
+
+                var bytes = new byte[entry.Size];
+                var _ = entry.OpenEntryStream().Read(bytes, 0, (int)entry.Size);
+
+                File.WriteAllBytes(bgPath, bytes);
+                found = true;
+                break;
+            }
+
+            if (!found && backupImg != "")
+            {
+                foreach (var entry in archive.Entries)
+                {
+                    var name = entry.FilePath.Replace('\\', '/').Split('/').Last();
+                    if (name != backupImg) continue;
+
+                    var bytes = new byte[entry.Size];
+                    var _ = entry.OpenEntryStream().Read(bytes, 0, (int)entry.Size);
+
+                    File.WriteAllBytes(bgPath, bytes);
+                    found = true;
+                    break;
+                }
+            }
         }
 
-        return true;
+        if (!found) return true;
+
+        var www = new WWW("file:///" + bgPath);
+        while (!www.isDone && www.error == null)
+            Thread.Sleep(10);
+
+        var texture = www.GetTexture(true);
+        __result = Sprite.Create(texture, new Rect(0, 0, texture.width, texture.height), new Vector2(.5f, .5f),
+            texture.width / 3.333f);
+        return false;
     }
 
     class PlayDataHook
     {
         public static IEnumerable<CodeInstruction> LoadPlayMusicTranspiler(ILGenerator il,
             IEnumerable<CodeInstruction> instructions)
         {
-            List<CodeInstruction> tmp = new List<CodeInstruction>();
+            var tmp = new List<CodeInstruction>();
             foreach (var i in instructions)
             {
                 tmp.Add(i);
@@ -74,51 +124,42 @@ public static AudioClip LoadPlayMusicHook(AudioClip audioClip, string id)
 
             var audioDir = Path.Combine(Directory.GetCurrentDirectory(), Path.Combine("osu!mania_beatmaps", "Audio!"));
             if (!Directory.Exists(audioDir)) Directory.CreateDirectory(audioDir);
-            
+
             var songPath = Path.Combine(audioDir, $"{pack.PackId}_{pack.PackName}_{pack.Beatmaps[0].AudioFilename}");
-            if (File.Exists(songPath))
+            var audioType = pack.Beatmaps[0].AudioFilename.Split('.').Last().ToLower() switch
             {
-                var www = new WWW("file:///" + songPath);
-                while (!www.isDone && www.error == null)
-                    Thread.Sleep(10);
-                
-                return www.GetAudioClip(true, true,
-                    pack.Beatmaps[0].AudioFilename.Split('.').Last().ToLower() switch
-                    {
-                        "mp3" => AudioType.MPEG,
-                        "wav" => AudioType.WAV,
-                        "ogg" => AudioType.OGGVORBIS
-                    }
-                );
-            }
+                "mp3" => AudioType.MPEG,
+                "wav" => AudioType.WAV,
+                "ogg" => AudioType.OGGVORBIS
+            };
 
-            var archive = ZipArchive.Open(new MemoryStream(File.ReadAllBytes(pack.PackFile)));
-            foreach (var entry in archive.Entries)
+            var found = File.Exists(songPath);
+
+            if (!found)
             {
-                if (entry.IsDirectory || !entry.FilePath.EndsWith(pack.Beatmaps[0].AudioFilename)) continue;
-                var bytes = new byte[entry.Size];
-                var _ = entry.OpenEntryStream().Read(bytes, 0, (int)entry.Size);
-                
-                File.WriteAllBytes(songPath, bytes);
-
-                var www = new WWW("file:///" + songPath);
-                while (!www.isDone && www.error == null)
-                    Thread.Sleep(10);
-
-                return www.GetAudioClip(true, true,
-                    pack.Beatmaps[0].AudioFilename.Split('.').Last().ToLower() switch
-                    {
-                        "mp3" => AudioType.MPEG,
-                        "wav" => AudioType.WAV,
-                        "ogg" => AudioType.OGGVORBIS
-                    }
-                );
+                var archive = ZipArchive.Open(new MemoryStream(File.ReadAllBytes(pack.PackFile)));
+                foreach (var entry in archive.Entries)
+                {
+                    if (entry.IsDirectory || !entry.FilePath.EndsWith(pack.Beatmaps[0].AudioFilename)) continue;
+                    var bytes = new byte[entry.Size];
+                    var _ = entry.OpenEntryStream().Read(bytes, 0, (int)entry.Size);
+                    File.WriteAllBytes(songPath, bytes);
+
+                    found = true;
+                }
             }
 
-            return audioClip;
+            if (!found) return audioClip;
+
+            var www = new WWW("file:///" + songPath);
+            while (!www.isDone && www.error == null)
+                Thread.Sleep(10);
+
+            return www.GetAudioClip(true, true, audioType);
         }
     }
 
+    // ReSharper disable once InconsistentNaming
     public static bool ReadOneMusicMap_Patch(string musicMap, int flag, ref MazicData __instance)
     {
         try
@@ -132,7 +173,7 @@ public static bool ReadOneMusicMap_Patch(string musicMap, int flag, ref MazicDat
                 {
                     if (beatmap.Difficulty.KeyMode != strs[1] ||
                         beatmap.Difficulty.Diff != strs[2]) continue;
-                    
+
                     __instance.ParseText(0, beatmap.INVAXION);
                     return false;
                 }
@@ -143,12 +184,14 @@ public static bool ReadOneMusicMap_Patch(string musicMap, int flag, ref MazicDat
             Logger.LogInfo("ERROR " + e.Message);
             Logger.LogInfo(e.StackTrace);
         }
+
         return true;
     }
 
     public static void Inject()
     {
-        var classifyMusicInfoList = AccessTools.Method(typeof(GlobalConfig), nameof(GlobalConfig.classifyMusicInfoList));
+        var classifyMusicInfoList =
+            AccessTools.Method(typeof(GlobalConfig), nameof(GlobalConfig.classifyMusicInfoList));
         var classifyMusicInfoListPatch = AccessTools.Method(typeof(SongPatches), nameof(classifyMusicInfoList_Patch));
         _harmony.Patch(classifyMusicInfoList, prefix: new HarmonyMethod(classifyMusicInfoListPatch));
 
@@ -157,7 +200,8 @@ public static void Inject()
         _harmony.Patch(getCoverSprite, prefix: new HarmonyMethod(getCoverSpritePatch));
 
         var loadPlayMusic = AccessTools.Method(typeof(PlayData), nameof(PlayData.LoadPlayMusic));
-        var loadPlayMusicTranspiler = AccessTools.Method(typeof(PlayDataHook), nameof(PlayDataHook.LoadPlayMusicTranspiler));
+        var loadPlayMusicTranspiler =
+            AccessTools.Method(typeof(PlayDataHook), nameof(PlayDataHook.LoadPlayMusicTranspiler));
         _harmony.Patch(loadPlayMusic, transpiler: new HarmonyMethod(loadPlayMusicTranspiler));
 
         var readOneMusicMap = AccessTools.Method(typeof(MazicData), nameof(MazicData.ReadOneMusicMap));

Server/OsuManiaLoader/Loader.cs

@@ -10,10 +10,11 @@ namespace Server.OsuManiaLoader;
 
 public class OsuManiaBeatmapPack
 {
+    public int PackId;
     public string PackName;
     public string PackFile;
     public List<OsuMania> Beatmaps = new();
-    public int PackId;
+    public string[] BackgroundImages;
 
     public int MinBpm;
     public int MaxBpm;
@@ -62,7 +63,9 @@ public Loader()
 
                 BeatmapPacks.Add(pack);
                 pack.PackId = pack.Beatmaps.Select(btm => btm.BeatmapSetId).First();
-
+                pack.BackgroundImages =
+                    pack.Beatmaps.Select(btm => btm.BackgroundImage).Where(i => i != null).ToArray();
+                
                 var BPMs = pack.Beatmaps.Select(btm => (int)Stuff.CalculateBpm(btm.TimingPoints[0])).ToArray();
                 pack.MaxBpm = BPMs.Max();
                 pack.MinBpm = BPMs.Min();
@@ -97,7 +100,7 @@ public Loader()
                     new ManiaToInvaxion(beatmap).Convert(out var map, out var audioFill);
                     beatmap.INVAXION = map;
 
-                    var diff = (int)beatmap.OverallDifficulty;
+                    var diff = beatmap.OverallDifficulty;
                     var notes = beatmap.HitObjects.Count;
 
                     switch (beatmap.KeyCount)

Server/OsuManiaLoader/ManiaToInvaxion.cs

@@ -6,6 +6,7 @@
 
 namespace Server.OsuManiaLoader;
 
+// Stolen from: https://github.com/MoeGrid/InvaxionCustomBeatmap/blob/9c90c9937c5c940b4a5f981aecf6ea20f0ba0ff7/Osu2Invaxion/MapConverter.cs
 public class ManiaToInvaxion
 {
     private static readonly int[,] KeyMap = {

Server/OsuManiaLoader/Osu.cs

@@ -205,6 +205,15 @@ void HeaderGeneral(string line)
             }
         }
 
+        void HeaderEvents(string line)
+        {
+            var lineProperty = line.Split(',');
+            if (lineProperty[0] != "0") return;
+            
+            if (lineProperty.Length != 5) return;
+            beatmap.BackgroundImage = lineProperty[2].Replace("\"", "");
+        }
+
         void HeaderMetadata(string line)
         {
             var lineProperty = line.Split(':');
@@ -311,6 +320,10 @@ void HeaderMetadata(string line)
                     break;
                 }
                 case "Events":
+                {
+                    HeaderEvents(line);
+                    break;
+                }
                 case "FileFormat":
                 case "Colours":
                 {