Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade osu.game to the latest. #2313

Merged
merged 4 commits into from
Dec 8, 2024
Merged

Upgrade osu.game to the latest. #2313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5166c02
Upgrade osu.game to the latest.
andy840119 Dec 8, 2024
cbcd71e
Fix API breaking change.
andy840119 Dec 8, 2024
2a45783
Fix the interface change in the mod test.
andy840119 Dec 8, 2024
b165c40
Fix the test broken in the previous PR.
andy840119 Dec 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/StageInfoConverterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public void TestClassicStageInfoSerializer()
var stageInfo = new ClassicStageInfo();

const string expected =
"{\"$type\":\"classic\",\"style_category\":{},\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
"{\"$type\":\"classic\",\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"style_category\":{},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
string actual = JsonConvert.SerializeObject(stageInfo, CreateSettings());
Assert.AreEqual(expected, actual);
}
Expand All @@ -29,7 +29,7 @@ public void TestClassicStageInfoSerializer()
public void TestClassicStageInfoDeserializer()
{
const string json =
"{\"$type\":\"classic\",\"style_category\":{},\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";
"{\"$type\":\"classic\",\"stage_definition\":{\"border_width\":25.0,\"border_height\":25.0,\"fade_in_time\":150.0,\"fade_out_time\":150.0,\"fade_in_easing\":22,\"fade_out_easing\":22,\"lyric_scale\":2.0,\"line_height\":72.0,\"first_lyric_start_time_offset\":1000.0,\"lyric_end_time_offset\":300.0,\"last_lyric_end_time_offset\":10000.0},\"style_category\":{},\"lyric_layout_category\":{},\"lyric_timing_info\":{\"timings\":[],\"mappings\":{}}}";

var expected = new ClassicStageInfo();
var actual = (ClassicStageInfo)JsonConvert.DeserializeObject<StageInfo>(json, CreateSettings())!;
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Karaoke.Tests/Mods/KaraokeModStageTestScene.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void TestCreateModWithStage()
CreateModTest(new ModTestData
{
Mod = new TModStage(),
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () => true,
});
}
Expand All @@ -33,7 +33,7 @@ public void TestCreateModWithoutStage()
{
Mod = new TModStage(),
// todo: add the stage info to beatmap.
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () => true,
});
}
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void TestMod() => CreateModTest(new ModTestData
{
Mod = new KaraokeModAutoplay(),
Autoplay = true,
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () => true,
});
}
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModAutoplayBySinger.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void TestMod() => CreateModTest(new ModTestData
{
Mod = new KaraokeModAutoplayBySinger(),
Autoplay = true,
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () => true,
});
}
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModDisableNote.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public void TestCheckNoteExistInPlayfield() => CreateModTest(new ModTestData
{
Mod = new KaraokeModDisableNote(),
Autoplay = true,
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () =>
{
var lyricPlayfield = Player.GetLyricPlayfield();
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFlashlight.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void TestFlashlightExist() => CreateModTest(new ModTestData
{
Mod = new KaraokeModFlashlight(),
Autoplay = true,
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () =>
{
var drawableRuleset = Player.GetDrawableRuleset();
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModFun.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void TestSnowMod() => CreateModTest(new ModTestData
{
Mod = new KaraokeModSnow(),
Autoplay = false,
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () => true,
});

Expand All @@ -23,7 +23,7 @@ public void TestWindowsUpdateMod() => CreateModTest(new ModTestData
{
Mod = new KaraokeModWindowsUpdate(),
Autoplay = false,
Beatmap = new TestKaraokeBeatmap(Ruleset.Value),
CreateBeatmap = () => new TestKaraokeBeatmap(Ruleset.Value),
PassCondition = () => true,
});
}
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModLyricConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData
{
Mod = new KaraokeModLyricConfiguration(),
Autoplay = false,
Beatmap = new TestKaraokeBeatmap(new RulesetInfo()),
CreateBeatmap = () => new TestKaraokeBeatmap(new RulesetInfo()),
PassCondition = () => true,
});
}
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModPractice.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData
{
Mod = new KaraokeModPractice(),
Autoplay = false,
Beatmap = new TestKaraokeBeatmap(new RulesetInfo()),
CreateBeatmap = () => new TestKaraokeBeatmap(new RulesetInfo()),
PassCondition = () =>
{
// just need to check has setting button display area.
Expand Down
4 changes: 2 additions & 2 deletions osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModSuddenDeath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void TestGreatHit() => CreateModTest(new ModTestData
Mod = new KaraokeModSuddenDeath(),
PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(false),
Autoplay = false,
Beatmap = new Beatmap
CreateBeatmap = () => new Beatmap
{
HitObjects = new List<HitObject>
{
Expand All @@ -57,7 +57,7 @@ public void TestBreakOnHoldNote() => CreateModTest(new ModTestData
Mod = new KaraokeModSuddenDeath(),
PassCondition = () => ((ModFailConditionTestPlayer)Player).CheckFailed(true) && Player.Results.Count == 2,
Autoplay = false,
Beatmap = new Beatmap
CreateBeatmap = () => new Beatmap
{
HitObjects = new List<HitObject>
{
Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke.Tests/Mods/TestSceneKaraokeModTranslation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public void TestAllPanelExist() => CreateModTest(new ModTestData
{
Mod = new KaraokeModTranslation(),
Autoplay = false,
Beatmap = new TestKaraokeBeatmap(new RulesetInfo()),
CreateBeatmap = () => new TestKaraokeBeatmap(new RulesetInfo()),
PassCondition = () => true,
});
}
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke/Screens/Edit/GenericEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public abstract partial class GenericEditor<TScreenMode> : ScreenWithBeatmapBack
{
public override float BackgroundParallaxAmount => 0.1f;

public override bool AllowBackButton => false;
public override bool AllowUserExit => false;

public override bool HideOverlaysOnEnter => true;

Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/LyricImporter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class LyricImporter : ScreenWithBeatmapBackground
{
private readonly ImportLyricOverlay importLyricOverlay;

public override bool AllowBackButton => false;
public override bool AllowUserExit => false;

public override bool HideOverlaysOnEnter => true;

Expand Down
2 changes: 1 addition & 1 deletion osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ppy.osu.Game" Version="2024.1115.3" />
<PackageReference Include="ppy.osu.Game" Version="2024.1205.0" />
<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
<PackageReference Include="Lucene.Net.Analysis.Kuromoji" Version="4.8.0-beta00016" />
<PackageReference Include="SixLabors.Fonts" Version="2.0.6" />
Expand Down
Loading