update to 1.19 and add custom sounds

.github/workflows/master.yml

@@ -18,20 +18,19 @@ jobs:
               uses: actions/setup-dotnet@v1
               with:
                   dotnet-version: 5.0.x
-            - name: GetStrippedRefs
-              env:
-                  FILES_URL: ${{ secrets.BSFILES_URL }}
-              run: wget --no-check-certificate "$FILES_URL" -q -O bsfiles.zip
-            - name: ExtractRefs
-              run: unzip -q -n bsfiles.zip -d ${{github.workspace}}/Refs
+            - name: Download SIRA References
+              uses: ProjectSIRA/[email protected]
+              with:
+                  manifest: ${{github.workspace}}/OCanada/manifest.json
+                  sira-server-code: ${{ secrets.SIRA_SERVER_CODE }}
             - name: Download Mod Dependencies
               uses: Goobwabber/[email protected]
               with:
                   manifest: ${{github.workspace}}/OCanada/manifest.json
             - name: Build
-              id: Build
               env:
                   FrameworkPathOverride: /usr/lib/mono/4.7.2-api
+              id: Build
               run: dotnet build --configuration Release
             - name: GitStatus
               run: git status
@@ -43,5 +42,5 @@ jobs:
             - name: Upload Artifact
               uses: actions/upload-artifact@v1
               with:
-                  name: ${{ steps.Build.outputs.filename }}
+                  name: "OCanada"
                   path: ${{ steps.Build.outputs.artifactpath }}

.github/workflows/pr.yml

@@ -16,20 +16,19 @@ jobs:
               uses: actions/setup-dotnet@v1
               with:
                   dotnet-version: 5.0.x
-            - name: GetStrippedRefs
-              env:
-                  FILES_URL: ${{ secrets.BSFILES_URL }}
-              run: wget --no-check-certificate "$FILES_URL" -q -O bsfiles.zip
-            - name: ExtractRefs
-              run: unzip -q -n bsfiles.zip -d ${{github.workspace}}/Refs
+            - name: Download SIRA References
+              uses: ProjectSIRA/[email protected]
+              with:
+                  manifest: ${{github.workspace}}/OCanada/manifest.json
+                  sira-server-code: ${{ secrets.SIRA_SERVER_CODE }}
             - name: Download Mod Dependencies
               uses: Goobwabber/[email protected]
               with:
                   manifest: ${{github.workspace}}/OCanada/manifest.json
             - name: Build
-              id: Build
               env:
                   FrameworkPathOverride: /usr/lib/mono/4.7.2-api
+              id: Build
               run: dotnet build --configuration Release
             - name: GitStatus
               run: git status
@@ -41,5 +40,5 @@ jobs:
             - name: Upload Artifact
               uses: actions/upload-artifact@v1
               with:
-                  name: ${{ steps.Build.outputs.filename }}
+                  name: "OCanada"
                   path: ${{ steps.Build.outputs.artifactpath }}

OCanada/Flag/FlagLoader.cs

@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace OCanada.Flag
+{
+    public class FlagLoader
+    {
+        private static readonly Dictionary<string, Sprite> cachedSprites = new Dictionary<string, Sprite>();
+
+        public static Sprite GetSprite(string name)
+        {
+            if (cachedSprites.TryGetValue(name, out var cachedSprite))
+            {
+                return cachedSprite;
+            }
+
+            var sprite = BeatSaberMarkupLanguage.Utilities.FindSpriteInAssembly($"OCanada.Images.{name}.png");
+            cachedSprites.Add(name, sprite);
+            return sprite;
+        }
+    }
+}

OCanada/Flag/Flags.cs

@@ -0,0 +1,27 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OCanada.Flag
+{
+    internal class Flags
+    {
+        public static readonly Dictionary<string, int> Points = new Dictionary<string, int>()
+        {
+            {"Canada", -10},
+            {"Australia", 1},
+            {"Austria", 1},
+            {"Belgium", 1},
+            {"Denmark", 1},
+            {"Finland", 1},
+            {"France", 1},
+            {"Sweden", 1},
+            {"Germany", 2},
+            {"Netherlands", 2},
+            {"South Korea", 2},
+            {"United Kingdom", 3},
+            {"USA", 3},
+            {"BSWC Logo no Text RGB", 5},
+            {"Staff", 5}
+        };
+    }
+}

OCanada/Installers/OCanadaMenuInstaller.cs

@@ -1,4 +1,5 @@
-using OCanada.UI;
+using OCanada.GameplaySetupScene;
+using OCanada.UI;
 using SiraUtil;
 using Zenject;
 
@@ -8,6 +9,7 @@ class OCanadaMenuInstaller : Installer
     {
         public override void InstallBindings()
         {
+            Container.Bind<AudioPlayer>().AsSingle();
             Container.BindInterfacesTo<OCanadaMenuController>().AsSingle();
             Container.BindInterfacesAndSelfTo<OCanadaDetailsController>().AsSingle();
             Container.BindInterfacesAndSelfTo<OCanadaGameController>().FromNewComponentOnNewGameObject().AsSingle();

OCanada/MenuScene/AudioPlayer.cs

@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
+using IPA.Utilities;
+using JetBrains.Annotations;
+using UnityEngine;
+
+namespace OCanada.GameplaySetupScene
+{
+    internal class AudioPlayer
+    {
+        private readonly AudioClipAsyncLoader audioClipAsyncLoader;
+        private readonly SongPreviewPlayer songPreviewPlayer;
+        private AudioSource audioSource;
+        private readonly FileInfo noteAudioFile;
+
+        private static readonly DirectoryInfo RootDir = new DirectoryInfo(UnityGame.UserDataPath);
+
+        private static readonly string FileName = "OCanadaHitSound.ogg";
+        public event Action ClipFinishedEvent;
+
+        public AudioPlayer(AudioClipAsyncLoader audioClipAsyncLoader, SongPreviewPlayer songPreviewPlayer)
+        {
+            this.audioClipAsyncLoader = audioClipAsyncLoader;
+            this.songPreviewPlayer = songPreviewPlayer;
+
+            Initialize();
+            noteAudioFile = RootDir.GetFiles(FileName)[0];
+        }
+
+        public void PlayNote(string note) => PlayClip(noteAudioFile, Notes.NotePitches[note]/440f);
+
+        private async void PlayClip(FileInfo audioFile, float pitch = 1f, bool notifyFinished = false)
+        {
+            var audioClip = await audioClipAsyncLoader.Load(audioFile.FullName);
+            if (audioClip == null) return;
+
+            if (audioSource == null)
+            {
+                audioSource = new GameObject("Test AudioSource").AddComponent<AudioSource>();
+                audioSource.outputAudioMixerGroup = songPreviewPlayer
+                    .GetField<AudioSource, SongPreviewPlayer>("_audioSourcePrefab").outputAudioMixerGroup;
+            }
+
+            audioSource.pitch = pitch;
+            audioSource.PlayOneShot(audioClip, 5f);
+
+            if (!notifyFinished) return;
+            await Task.Delay(audioClip.length.TotalSeconds() * 1000 + audioClip.length.Milliseconds() + 125);
+            ClipFinishedEvent?.Invoke();
+        }
+
+        private void Initialize()
+        {
+            if (RootDir.GetFiles(FileName).Length > 0) return;
+
+            var manifestStream = Assembly.
+                GetExecutingAssembly()
+                .GetManifestResourceStream("OCanada.CustomSounds.a4.ogg");
+            if (manifestStream != null)
+            {
+                var fs = File.Create(Path.Combine(RootDir.ToString(), FileName));
+                manifestStream.CopyTo(fs);
+            }
+            RootDir.Refresh();
+        }
+    }
+}
+