Merge branch '1.37.1'

BeatLeader · Jul 19, 2024 · 8e4e7fe · 8e4e7fe
2 parents ee9fe40 + 6c2a2c0
commit 8e4e7fe
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,7 +2,7 @@ name: Build
 
 on:
     push:
-        branches: [master]
+        branches: [master, 1.37.1]
         tags: v*
     pull_request:
         branches: [master]

diff --git a/Source/0_Harmony/InstallersPatches/LevelDataEnhancerPatch.cs b/Source/0_Harmony/InstallersPatches/LevelDataEnhancerPatch.cs
@@ -5,16 +5,16 @@
 using IPA.Utilities;
 using JetBrains.Annotations;
 using System;
+using System.Linq;
+using System.Reflection;
 
 namespace BeatLeader
 {
-    [HarmonyPatch(
-        typeof(StandardLevelScenesTransitionSetupDataSO),
-        nameof(StandardLevelScenesTransitionSetupDataSO.Init),
-        new Type[] { typeof(string), typeof(IBeatmapLevelData), typeof(BeatmapKey), typeof(BeatmapLevel), typeof(OverrideEnvironmentSettings), typeof(ColorScheme), typeof(ColorScheme), typeof(GameplayModifiers), typeof(PlayerSpecificSettings), typeof(PracticeSettings), typeof(EnvironmentsListModel), typeof(AudioClipAsyncLoader), typeof(PerformancePreset), typeof(BeatmapDataLoader), typeof(string), typeof(bool), typeof(bool), typeof(RecordingToolManager.SetupData?) },
-        new ArgumentType[] { ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Ref, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal }
-        )]
+    [HarmonyPatch]
     class LevelDataEnhancerPatch {
+        static MethodInfo TargetMethod() => AccessTools.FirstMethod(typeof(StandardLevelScenesTransitionSetupDataSO),
+            m => m.Name == nameof(StandardLevelScenesTransitionSetupDataSO.Init) &&
+                 m.GetParameters().All(p => p.ParameterType != typeof(IBeatmapLevelData)));
         public static void Postfix(in BeatmapKey beatmapKey, BeatmapLevel beatmapLevel, OverrideEnvironmentSettings overrideEnvironmentSettings, ColorScheme overrideColorScheme, GameplayModifiers gameplayModifiers, PlayerSpecificSettings playerSpecificSettings, PracticeSettings practiceSettings, EnvironmentsListModel environmentsListModel) {
             Plugin.Log.Debug($"LevelDataEnhancerPatch.postfix {beatmapKey.levelId} {beatmapLevel.songName}");
             string environmentName = beatmapLevel.GetEnvironmentName(beatmapKey.beatmapCharacteristic, beatmapKey.difficulty);
@@ -32,13 +32,12 @@ public static void Postfix(in BeatmapKey beatmapKey, BeatmapLevel beatmapLevel,
         }
     }
 
-    [HarmonyPatch(
-        typeof(StandardLevelScenesTransitionSetupDataSO),
-        nameof(StandardLevelScenesTransitionSetupDataSO.Init),
-        new Type[] { typeof(string), typeof(BeatmapKey), typeof(BeatmapLevel), typeof(OverrideEnvironmentSettings), typeof(ColorScheme), typeof(ColorScheme), typeof(GameplayModifiers), typeof(PlayerSpecificSettings), typeof(PracticeSettings), typeof(EnvironmentsListModel), typeof(AudioClipAsyncLoader), typeof(BeatmapDataLoader), typeof(PerformancePreset), typeof(string), typeof(BeatmapLevelsModel), typeof(bool), typeof(bool), typeof(RecordingToolManager.SetupData?) },
-        new ArgumentType[] { ArgumentType.Normal, ArgumentType.Ref, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal, ArgumentType.Normal }
-        )]
+    [HarmonyPatch]
     class LevelDataEnhancerPatch2 {
+
+        static MethodInfo TargetMethod() => AccessTools.FirstMethod(typeof(StandardLevelScenesTransitionSetupDataSO),
+            m => m.Name == nameof(StandardLevelScenesTransitionSetupDataSO.Init) &&
+                 m.GetParameters().Any(p => p.ParameterType == typeof(IBeatmapLevelData)));
         static void Postfix(in BeatmapKey beatmapKey, BeatmapLevel beatmapLevel, OverrideEnvironmentSettings overrideEnvironmentSettings, ColorScheme overrideColorScheme, GameplayModifiers gameplayModifiers, PlayerSpecificSettings playerSpecificSettings, PracticeSettings practiceSettings, EnvironmentsListModel environmentsListModel) {
             LevelDataEnhancerPatch.Postfix(beatmapKey, beatmapLevel, overrideEnvironmentSettings, overrideColorScheme, gameplayModifiers, playerSpecificSettings, practiceSettings, environmentsListModel);
         }

diff --git a/Source/2_Core/Replayer/ReplayerLauncher.cs b/Source/2_Core/Replayer/ReplayerLauncher.cs
@@ -19,7 +19,7 @@ public class ReplayerLauncher : MonoBehaviour {
         [Inject] private readonly BeatmapDataLoader _beatmapDataLoader = null!;
         [Inject] private readonly AudioClipAsyncLoader _audioClipAsyncLoader = null!;
         [InjectOptional] private readonly BeatmapLevelsModel _beatmapLevelsModel = null!;
-
+        [InjectOptional] private readonly BeatmapLevelsEntitlementModel _beatmapLevelsEntitlementModel = null!;
         #endregion
 
         #region StartReplay
@@ -117,6 +117,7 @@ private void Awake() {
                     _graphicSettingsHandler.instance.customPreset,
                     "Menu",
                     _beatmapLevelsModel,
+                    _beatmapLevelsEntitlementModel,
                     false,
                     false,
                     null

diff --git a/Source/2_Core/Replayer/ReplayerMenuLoader.cs b/Source/2_Core/Replayer/ReplayerMenuLoader.cs
@@ -206,9 +206,9 @@ CancellationToken token
                 hash = fixedHash;
             }
 
-            if (await _levelsModel.CheckBeatmapLevelDataExistsAsync(hash, token)) {
+            if (await _levelsModel.CheckBeatmapLevelDataExistsAsync(hash, BeatmapLevelDataVersion.Original, token)) {
                 return _levelsModel.GetBeatmapLevel(hash);
-            } else if (await _levelsModel.CheckBeatmapLevelDataExistsAsync(CustomLevelLoader.kCustomLevelPrefixId + hash, token)) {
+            } else if (await _levelsModel.CheckBeatmapLevelDataExistsAsync(CustomLevelLoader.kCustomLevelPrefixId + hash, BeatmapLevelDataVersion.Original, token)) {
                 return _levelsModel.GetBeatmapLevel(CustomLevelLoader.kCustomLevelPrefixId + hash);
             }
 

diff --git a/Source/BeatLeader.csproj b/Source/BeatLeader.csproj
@@ -15,6 +15,11 @@
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="AdditionalContentModel.Interfaces">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\AdditionalContentModel.Interfaces.dll</HintPath>
+      <Private>False</Private>
+      <SpecificVersion>False</SpecificVersion>
+    </Reference>
     <Reference Include="BeatmapCore">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\BeatmapCore.dll</HintPath>
       <Private>False</Private>
@@ -250,7 +255,7 @@
     <None Include="Directory.Build.targets" Condition="Exists('Directory.Build.targets')" />
   </ItemGroup>
   <ItemGroup>
-        <PackageReference Include="BeatSaberModdingTools.Tasks" Version="2.0.0-beta7" PrivateAssets="all" />
-        <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
-    </ItemGroup>
+    <PackageReference Include="BeatSaberModdingTools.Tasks" Version="2.0.0-beta7" PrivateAssets="all" />
+    <PackageReference Include="BepInEx.AssemblyPublicizer.MSBuild" Version="0.4.1" PrivateAssets="all" />
+  </ItemGroup>
 </Project>
diff --git a/Source/manifest.json b/Source/manifest.json
@@ -5,9 +5,9 @@
   "author": "",
   "version": "0.9.19",
   "description": "beatleader.xyz | In-game leaderboards for custom and OST maps | Score replays | Clans, events, playlists and much more",
-  "gameVersion": "1.37.0",
+  "gameVersion": "1.37.1",
   "dependsOn": {
-    "SongCore": "^3.14.0",
+    "SongCore": "^3.14.11",
     "LeaderboardCore": "^1.6.0",
     "BeatSaberMarkupLanguage": "^1.6.6",
     "BSIPA": "^4.2.2",