Merge branch 'dev'

Author: hedgehog1029

.github/workflows/publish.yml

@@ -0,0 +1,19 @@
+name: Publish to NuGet & Thunderstore
+
+on:
+  push:
+    branches:
+      - 'master'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '6.0'
+      - run: dotnet tool install -g tcli
+      - run: dotnet build -c Release
+      - run: dotnet nuget push bin/Release/*.nupkg -k ${{ secrets.NUGET_KEY }} -s https://api.nuget.org/v3/index.json
+      - run: tcli publish --file bin/Release/net472/BaboonAPI-thunderstore.zip --token ${{ secrets.THUNDERSTORE_TOKEN }}

BaboonAPI/BaboonAPI.fsproj

@@ -24,7 +24,7 @@
     <PropertyGroup>
         <PackageId>TromboneChamp.BaboonAPI</PackageId>
         <Title>BaboonAPI</Title>
-        <Version>2.5.0</Version>
+        <Version>2.6.0-pre</Version>
         <Authors>offbeatwitch</Authors>
         <Company>TromboneChamps</Company>
         <PackageTags>Trombone Champ</PackageTags>
@@ -57,6 +57,7 @@
         <Compile Include="internal\ScoreStorage.fs" />
         <Compile Include="internal\EntryPointLoader.fs" />
         <Compile Include="internal\Debug.fs" />
+        <Compile Include="internal\BaseGame.fs" />
         <Compile Include="patch\TrackCountPatches.fs" />
         <Compile Include="patch\TrackrefPatches.fs" />
         <Compile Include="patch\BaseTracksLoaderPatch.fs" />
@@ -74,7 +75,7 @@
     <ItemGroup>
         <PackageReference Include="BepInEx.Core" Version="5.*" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="TromboneChamp.GameLibs" Version="1.13.0-beta" />
+        <PackageReference Include="TromboneChamp.GameLibs" Version="1.18.0" />
     </ItemGroup>
 
     <ItemGroup>

BaboonAPI/Library.fs

@@ -7,7 +7,7 @@ open BaboonAPI.Patch
 open BepInEx
 open HarmonyLib
 
-[<BepInPlugin("ch.offbeatwit.baboonapi.plugin", "BaboonAPI", "2.5.0.0")>]
+[<BepInPlugin("ch.offbeatwit.baboonapi.plugin", "BaboonAPI", "2.6.0.0")>]
 type BaboonPlugin() =
     inherit BaseUnityPlugin()
 
@@ -21,6 +21,10 @@ type BaboonPlugin() =
         // Apply the initializer patchset
         harmony.PatchAll(typeof<BrandingPatch>)
 
+    member this.TestReload () =
+        TrackAccessor.loadAsync()
+        |> this.StartCoroutine
+
     member this.TryLoadTracks() =
         try
             TrackAccessor.load()

BaboonAPI/api-post/TrackLookup.fs

@@ -27,6 +27,11 @@ let public allTracks (): TromboneTrack list =
 let public reload () =
     TrackAccessor.load()
 
+/// <summary>Reload the list of tracks asynchronously.</summary>
+/// <returns>A Unity coroutine that must be started using StartCoroutine.</returns>
+let public reloadAsync () =
+    TrackAccessor.loadAsync()
+
 /// Highest rank & most recent 5 high scores for a track
 type public SavedTrackScore =
     { highestRank: string

BaboonAPI/internal/BaseGame.fs

@@ -0,0 +1,93 @@
+namespace BaboonAPI.Internal.BaseGame
+
+open System.IO
+open System.Runtime.Serialization.Formatters.Binary
+open BaboonAPI.Hooks.Tracks
+open BaboonAPI.Utility
+open BaboonAPI.Utility.Unity
+open UnityEngine
+
+/// Base game loaded track, emulates base game behaviour for charts
+type public BaseGameLoadedTrack internal (trackref: string, bundle: AssetBundle) =
+    interface LoadedTromboneTrack with
+        member this.LoadAudio() =
+            let obj = bundle.LoadAsset<GameObject>($"music_{trackref}")
+            let src = obj.GetComponent<AudioSource>()
+            { Clip = src.clip; Volume = src.volume }
+
+        member this.LoadBackground _ctx =
+            bundle.LoadAsset<GameObject> $"BGCam_{trackref}"
+
+        member this.Dispose() =
+            bundle.Unload true
+
+        member this.SetUpBackgroundDelayed _ _ =
+            ()
+
+        member this.trackref = trackref
+
+    interface PauseAware with
+        member this.CanResume = true
+
+        member this.OnPause _ = ()
+
+        member this.OnResume _ = ()
+
+/// Base game TromboneTrack
+type public BaseGameTrack internal (data: string[]) =
+    interface TromboneTrack with
+        member _.trackname_long = data[0]
+        member _.trackname_short = data[1]
+        member _.trackref = data[2]
+        member _.year = data[3]
+        member _.artist = data[4]
+        member _.genre = data[5]
+        member _.desc = data[6]
+        member _.difficulty = int data[7]
+        member _.length = int data[8]
+        member _.tempo = int data[9]
+
+        member this.LoadTrack() =
+            let trackref = (this :> TromboneTrack).trackref
+            let bundle = AssetBundle.LoadFromFile $"{Application.streamingAssetsPath}/trackassets/{trackref}"
+            new BaseGameLoadedTrack (trackref, bundle)
+
+        member this.IsVisible() =
+            let trackref = (this :> TromboneTrack).trackref
+            match trackref with
+            | "einefinal" -> GlobalVariables.localsave.progression_trombone_champ
+            | _ -> true
+
+        member this.LoadChart() =
+            let trackref = (this :> TromboneTrack).trackref
+            let path = $"{Application.streamingAssetsPath}/leveldata/{trackref}.tmb"
+            use stream = File.Open(path, FileMode.Open)
+            BinaryFormatter().Deserialize(stream) :?> SavedLevel
+
+    interface Previewable with
+        member this.LoadClip() =
+            let trackref = (this :> TromboneTrack).trackref
+            let path = $"{Application.streamingAssetsPath}/trackclips/{trackref}-sample.ogg"
+
+            loadAudioClip (path, AudioType.OGGVORBIS)
+            |> Coroutines.map (Result.map (fun audioClip -> { Clip = audioClip; Volume = 0.9f }))
+
+    interface Graphable with
+        member this.CreateGraph() =
+            match (this :> TromboneTrack).trackref with
+            | "warmup" -> Some (SongGraph.all 10)
+            | "einefinal" -> Some (SongGraph.all 104)
+            | _ -> None
+
+type internal BaseGameTrackRegistry(songs: SongData) =
+    /// List of base game trackrefs
+    member _.trackrefs =
+        songs.data_tracktitles
+        |> Seq.map (fun data -> data[2])
+        |> Seq.toList
+
+    interface TrackRegistrationEvent.Listener with
+        override this.OnRegisterTracks () = seq {
+            for array in songs.data_tracktitles do
+                yield BaseGameTrack array
+        }

BaboonAPI/internal/EntryPointLoader.fs

@@ -44,8 +44,15 @@ let scan<'t> (plugin: PluginInfo): 't EntryPointContainer list =
     let pluginType = plugin.Instance.GetType()
     let assembly = pluginType.Assembly
 
+    let types =
+        try
+            assembly.GetTypes()
+        with
+        | :? ReflectionTypeLoadException as exc ->
+            exc.Types |> Array.filter (isNull >> not)
+
     let candidates =
-        assembly.GetTypes()
+        types
         |> Seq.filter target.IsAssignableFrom
         |> Seq.filter (getCustomAttribute<BaboonEntryPointAttribute> >> Option.isSome)
 

BaboonAPI/internal/TrackAccessor.fs

@@ -2,6 +2,7 @@
 
 open System.Collections.Generic
 open BaboonAPI.Hooks.Tracks
+open BaboonAPI.Utility.Coroutines
 
 exception DuplicateTrackrefException of string
 
@@ -36,22 +37,40 @@ let private checkForDuplicates (tracks: seq<string * RegisteredTrack>): seq<stri
 
 type TrackLoader() =
     let mutable tracks = Map.empty
-    let mutable tracksByIndex = []
+    let mutable tracksByIndex = Array.empty
 
-    member _.LoadTracks() =
-        tracks <-
-            TrackRegistrationEvent.EVENT.invoker.OnRegisterTracks()
+    let makeTrackLoader () =
+        TrackRegistrationEvent.EVENT.invoker.OnRegisterTracks()
             |> Seq.indexed
             |> Seq.map (fun (i, track) -> track.trackref, { track = track; trackIndex = i })
             |> checkForDuplicates
-            |> Map.ofSeq
 
-        let unsorted = tracks.Values |> List.ofSeq
-        tracksByIndex <- unsorted |> List.permute (fun i -> unsorted[i].trackIndex)
+    let onTracksLoaded (loaded: seq<string * RegisteredTrack>) =
+        // Our track sequence is already sorted - trackIndex is set above ^
+        let sortedTracks = loaded |> Seq.toArray
+        tracks <- Map.ofArray sortedTracks
+        tracksByIndex <- sortedTracks |> Array.map snd
 
-        let allTracks = tracks.Values |> Seq.map (fun rt -> rt.track) |> Seq.toList
+        let allTracks = tracksByIndex |> Seq.map (fun rt -> rt.track) |> Seq.toList
         TracksLoadedEvent.EVENT.invoker.OnTracksLoaded allTracks
 
+    member _.LoadTracks() =
+        makeTrackLoader() |> onTracksLoaded
+
+    member _.LoadTracksAsync () =
+        coroutine {
+            let task = Async.StartAsTask (async {
+                return makeTrackLoader()
+            })
+
+            yield WaitForTask(task)
+
+            if task.IsCompletedSuccessfully then
+                onTracksLoaded task.Result
+            else if task.IsFaulted then
+                raise task.Exception
+        }
+
     member _.Tracks = tracks
     member _.TracksByIndex = tracksByIndex
 
@@ -73,9 +92,12 @@ let fetchTrackIndex (ref: string) = trackLoader.lookup(ref).trackIndex
 
 let trackCount () = trackLoader.Tracks.Count
 
-let allTracks () = trackLoader.TracksByIndex |> Seq.ofList
+let allTracks () = trackLoader.TracksByIndex |> Seq.ofArray
 
 let toTrackData (track: TromboneTrack) = makeTrackData track (fetchTrackIndex track.trackref)
 
 let load () =
     trackLoader.LoadTracks()
+
+let loadAsync () =
+    trackLoader.LoadTracksAsync()

BaboonAPI/patch/BaseTracksLoaderPatch.fs

@@ -4,95 +4,11 @@ open System.IO
 open System.Runtime.Serialization.Formatters.Binary
 open BaboonAPI.Hooks.Tracks
 open BaboonAPI.Internal
-open BaboonAPI.Utility
-open BaboonAPI.Utility.Unity
+open BaboonAPI.Internal.BaseGame
 open BepInEx.Logging
 open HarmonyLib
 open UnityEngine
 
-type internal BaseGameLoadedTrack(trackref: string, bundle: AssetBundle) =
-    interface LoadedTromboneTrack with
-        member this.LoadAudio() =
-            let obj = bundle.LoadAsset<GameObject>($"music_{trackref}")
-            let src = obj.GetComponent<AudioSource>()
-            { Clip = src.clip; Volume = src.volume }
-
-        member this.LoadBackground _ctx =
-            bundle.LoadAsset<GameObject> $"BGCam_{trackref}"
-
-        member this.Dispose() =
-            bundle.Unload true
-
-        member this.SetUpBackgroundDelayed _ _ =
-            ()
-
-        member this.trackref = trackref
-
-    interface PauseAware with
-        member this.CanResume = true
-
-        member this.OnPause _ = ()
-
-        member this.OnResume _ = ()
-
-type internal BaseGameTrack(data: string[]) =
-    interface TromboneTrack with
-        member _.trackname_long = data[0]
-        member _.trackname_short = data[1]
-        member _.trackref = data[2]
-        member _.year = data[3]
-        member _.artist = data[4]
-        member _.genre = data[5]
-        member _.desc = data[6]
-        member _.difficulty = int data[7]
-        member _.length = int data[8]
-        member _.tempo = int data[9]
-
-        member this.LoadTrack() =
-            let trackref = (this :> TromboneTrack).trackref
-            let bundle = AssetBundle.LoadFromFile $"{Application.streamingAssetsPath}/trackassets/{trackref}"
-            new BaseGameLoadedTrack (trackref, bundle)
-
-        member this.IsVisible() =
-            let trackref = (this :> TromboneTrack).trackref
-            match trackref with
-            | "einefinal" -> GlobalVariables.localsave.progression_trombone_champ
-            | _ -> true
-
-        member this.LoadChart() =
-            let trackref = (this :> TromboneTrack).trackref
-            let path = $"{Application.streamingAssetsPath}/leveldata/{trackref}.tmb"
-            use stream = File.Open(path, FileMode.Open)
-            BinaryFormatter().Deserialize(stream) :?> SavedLevel
-
-    interface Previewable with
-        member this.LoadClip() =
-            let trackref = (this :> TromboneTrack).trackref
-            let path = $"{Application.streamingAssetsPath}/trackclips/{trackref}-sample.ogg"
-
-            loadAudioClip (path, AudioType.OGGVORBIS)
-            |> Coroutines.map (Result.map (fun audioClip -> { Clip = audioClip; Volume = 0.9f }))
-
-    interface Graphable with
-        member this.CreateGraph() =
-            match (this :> TromboneTrack).trackref with
-            | "warmup" -> Some (SongGraph.all 10)
-            | "einefinal" -> Some (SongGraph.all 104)
-            | _ -> None
-
-type internal BaseGameTrackRegistry(songs: SongData) =
-    /// List of base game trackrefs
-    member _.trackrefs =
-        songs.data_tracktitles
-        |> Seq.map (fun data -> data[2])
-        |> Seq.toList
-
-    interface TrackRegistrationEvent.Listener with
-        override this.OnRegisterTracks () = seq {
-            for array in songs.data_tracktitles do
-                yield BaseGameTrack array
-        }
-
 [<HarmonyPatch(typeof<SaverLoader>, "loadLevelData")>]
 type LoaderPatch() =
     static let logger = Logger.CreateLogSource "BaboonAPI.BaseTracksLoader"

BaboonAPI/patch/GameControllerPatch.fs

@@ -41,7 +41,7 @@ type private GameControllerExtension() =
         if not instance.freeplay then
             let audio = l.LoadAudio()
             instance.musictrack.clip <- audio.Clip
-            instance.musictrack.volume <- audio.Volume
+            instance.musictrack.volume <- audio.Volume * GlobalVariables.localsettings.maxvolume_music
 
         let context = BackgroundContext instance
         let bgObj = Object.Instantiate<GameObject>(