Merge pull request #41 from qqrz997/master

Changes for Beat Saber 1.40.0
kinsi55 · Dec 20, 2024 · 1c208f7 · 1c208f7
2 parents fb67ba8 + e57644c
commit 1c208f7
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ HarmonyPatches/RemoveSplashscreen.cs
 HarmonyPatchHelper.cs
 Screenshots/SocialPreview.jpg
 /.vs
+/.idea
diff --git a/BetterSongList.csproj b/BetterSongList.csproj
@@ -114,6 +114,9 @@
     <Reference Include="IPA.Loader">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\IPA.Loader.dll</HintPath>
     </Reference>
+    <Reference Include="SegmentedControl">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\SegmentedControl.dll</HintPath>
+    </Reference>
     <Reference Include="Unity.TextMeshPro">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.TextMeshPro.dll</HintPath>
     </Reference>

diff --git a/Filters/Models/RequirementsFilter.cs b/Filters/Models/RequirementsFilter.cs
@@ -26,7 +26,7 @@ public bool GetValueFor(BeatmapLevel level) {
 			if(mid == null)
 				return false;
 
-			return SongCore.Collections.RetrieveExtraSongData(mid)?
+			return SongCore.Collections.GetCustomLevelSongData(mid)?
 				._difficulties?.Any(x => x.additionalDifficultyData._requirements.Any(x => x.Length != 0)) == true;
 		}
 	}

diff --git a/HarmonyPatches/UI/ExtraLevelParams.cs b/HarmonyPatches/UI/ExtraLevelParams.cs
@@ -141,7 +141,7 @@ void wrapper() {
 				var basicData = __instance._beatmapLevel.GetDifficultyBeatmapData(beatmapKey.beatmapCharacteristic, beatmapKey.difficulty);
 				var njs = basicData?.noteJumpMovementSpeed ?? 0;
 				if(njs == 0)
-					njs = BeatmapDifficultyMethods.NoteJumpMovementSpeed(beatmapKey.difficulty);
+					njs = beatmapKey.difficulty.DefaultNoteJumpMovementSpeed();
 
 				fields[2].text = njs.ToString("0.0#");
 

diff --git a/manifest.json b/manifest.json
@@ -7,7 +7,7 @@
     "gameVersion": "1.37.4",
     "dependsOn": {
         "BSIPA": "^4.3.5",
-        "SongCore": "^3.14.13",
+        "SongCore": "^3.15.1",
         "BeatSaberMarkupLanguage": "^1.12.0"
     },
     "loadBefore": [
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,3 +7,4 @@ HarmonyPatches/RemoveSplashscreen.cs @@
     HarmonyPatchHelper.cs
     Screenshots/SocialPreview.jpg
     /.vs
+    /.idea