diff --git a/osu-framework b/osu-framework index a50dd75b11..e52af1e5ad 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a50dd75b114da963c75e6a5314099d99140035b8 +Subproject commit e52af1e5ada07468512e19c86b6dcd5a23fe3707 diff --git a/osu-resources b/osu-resources index 39657fc606..4f9ed4e703 160000 --- a/osu-resources +++ b/osu-resources @@ -1 +1 @@ -Subproject commit 39657fc6066ea3a141ac71cabf67ec9ebf24975c +Subproject commit 4f9ed4e703777ede98737c7e2af31efa4694c395 diff --git a/osu.Desktop.Deploy/App.config b/osu.Desktop.Deploy/App.config index bd464a0453..d1da144f50 100644 --- a/osu.Desktop.Deploy/App.config +++ b/osu.Desktop.Deploy/App.config @@ -21,16 +21,4 @@ Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/maste - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.Tests/app.config b/osu.Desktop.Tests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Desktop.Tests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.Tests/osu.Desktop.Tests.csproj b/osu.Desktop.Tests/osu.Desktop.Tests.csproj index 07495311e0..e89308bbb9 100644 --- a/osu.Desktop.Tests/osu.Desktop.Tests.csproj +++ b/osu.Desktop.Tests/osu.Desktop.Tests.csproj @@ -100,7 +100,6 @@ osu.licenseheader - diff --git a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs index ede430478e..767fb0dffb 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs @@ -8,6 +8,8 @@ using osu.Framework.MathUtils; using osu.Framework.Screens.Testing; using osu.Framework.Timing; using osu.Game.Beatmaps; +using osu.Game.Beatmaps.IO; +using osu.Game.Database; using osu.Game.Modes.Catch.UI; using osu.Game.Modes.Mania.UI; using osu.Game.Modes.Objects; @@ -41,10 +43,19 @@ namespace osu.Desktop.VisualTests.Tests time += RNG.Next(50, 500); } - Beatmap beatmap = new Beatmap + WorkingBeatmap beatmap = new TestWorkingBeatmap(new Beatmap { - HitObjects = objects - }; + HitObjects = objects, + BeatmapInfo = new BeatmapInfo + { + Metadata = new BeatmapMetadata + { + Artist = @"Unknown", + Title = @"Sample Beatmap", + Author = @"peppy", + } + } + }); Add(new Drawable[] { @@ -83,5 +94,16 @@ namespace osu.Desktop.VisualTests.Tests } }); } + + private class TestWorkingBeatmap : WorkingBeatmap + { + public TestWorkingBeatmap(Beatmap beatmap) + : base(beatmap.BeatmapInfo, beatmap.BeatmapInfo.BeatmapSet) + { + Beatmap = beatmap; + } + + protected override ArchiveReader GetReader() => null; + } } } diff --git a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs index f39da70a16..c36fc0a47d 100644 --- a/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs +++ b/osu.Desktop.VisualTests/Tests/TestCaseReplay.cs @@ -1,12 +1,13 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.IO; using osu.Framework.Input.Handlers; using osu.Game.Beatmaps; -using osu.Game.Modes; +using osu.Game.Modes.Mods; +using osu.Game.Modes.Osu.Mods; using osu.Game.Screens.Play; +using System; +using System.IO; namespace osu.Desktop.VisualTests.Tests { @@ -22,9 +23,9 @@ namespace osu.Desktop.VisualTests.Tests protected override Player CreatePlayer(WorkingBeatmap beatmap) { - var player = base.CreatePlayer(beatmap); - player.ReplayInputHandler = Ruleset.GetRuleset(beatmap.PlayMode).CreateAutoplayScore(beatmap.Beatmap)?.Replay?.GetInputHandler(); - return player; + beatmap.Mods.Value = new Mod[] { new OsuModAutoplay() }; + + return base.CreatePlayer(beatmap); } } } diff --git a/osu.Desktop.VisualTests/app.config b/osu.Desktop.VisualTests/app.config deleted file mode 100644 index b9af3fdc80..0000000000 --- a/osu.Desktop.VisualTests/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj index bea56b5cd0..81ee7185bb 100644 --- a/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj +++ b/osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj @@ -23,6 +23,7 @@ false LocalIntranet v4.5 + true publish\ true Disk @@ -114,7 +115,6 @@ osu.licenseheader - diff --git a/osu.Desktop/OsuGameDesktop.cs b/osu.Desktop/OsuGameDesktop.cs index 3b827f2809..27f58c27e1 100644 --- a/osu.Desktop/OsuGameDesktop.cs +++ b/osu.Desktop/OsuGameDesktop.cs @@ -30,9 +30,9 @@ namespace osu.Desktop base.LoadComplete(); versionManager.LoadAsync(this); - ModeChanged += m => + ScreenChanged += s => { - if (!versionManager.IsAlive && m is Intro) + if (!versionManager.IsAlive && s is Intro) Add(versionManager); }; } diff --git a/osu.Desktop/app.config b/osu.Desktop/app.config deleted file mode 100644 index 1ff0a7f133..0000000000 --- a/osu.Desktop/app.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Desktop/osu.Desktop.csproj b/osu.Desktop/osu.Desktop.csproj index 7e85f09d8c..48e0db1d99 100644 --- a/osu.Desktop/osu.Desktop.csproj +++ b/osu.Desktop/osu.Desktop.csproj @@ -23,6 +23,7 @@ false LocalIntranet v4.5 + true publish\ true Disk @@ -153,7 +154,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Catch/CatchRuleset.cs b/osu.Game.Modes.Catch/CatchRuleset.cs index 4ea1d4e6c1..cb695aaabe 100644 --- a/osu.Game.Modes.Catch/CatchRuleset.cs +++ b/osu.Game.Modes.Catch/CatchRuleset.cs @@ -4,7 +4,9 @@ using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Catch.Mods; using osu.Game.Modes.Catch.UI; +using osu.Game.Modes.Mods; using osu.Game.Modes.UI; using osu.Game.Screens.Play; using System.Collections.Generic; @@ -13,7 +15,7 @@ namespace osu.Game.Modes.Catch { public class CatchRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new CatchHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new CatchHitRenderer(beatmap); public override IEnumerable GetModsFor(ModType type) { diff --git a/osu.Game.Modes.Catch/CatchMod.cs b/osu.Game.Modes.Catch/Mods/CatchMod.cs similarity index 91% rename from osu.Game.Modes.Catch/CatchMod.cs rename to osu.Game.Modes.Catch/Mods/CatchMod.cs index 07d6d3469e..97e4e58a5d 100644 --- a/osu.Game.Modes.Catch/CatchMod.cs +++ b/osu.Game.Modes.Catch/Mods/CatchMod.cs @@ -1,7 +1,9 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Catch +using osu.Game.Modes.Mods; + +namespace osu.Game.Modes.Catch.Mods { public class CatchModNoFail : ModNoFail { diff --git a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs index 1537227d8f..a8b2d48760 100644 --- a/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs +++ b/osu.Game.Modes.Catch/UI/CatchHitRenderer.cs @@ -11,7 +11,7 @@ namespace osu.Game.Modes.Catch.UI { public class CatchHitRenderer : HitRenderer { - public CatchHitRenderer(Beatmap beatmap) + public CatchHitRenderer(WorkingBeatmap beatmap) : base(beatmap) { } diff --git a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj index 4646d0cd6c..4908bcd0d0 100644 --- a/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj +++ b/osu.Game.Modes.Catch/osu.Game.Modes.Catch.csproj @@ -57,7 +57,7 @@ - + diff --git a/osu.Game.Modes.Mania/ManiaRuleset.cs b/osu.Game.Modes.Mania/ManiaRuleset.cs index 6851c883b4..5b12e621d2 100644 --- a/osu.Game.Modes.Mania/ManiaRuleset.cs +++ b/osu.Game.Modes.Mania/ManiaRuleset.cs @@ -3,7 +3,9 @@ using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mania.Mods; using osu.Game.Modes.Mania.UI; +using osu.Game.Modes.Mods; using osu.Game.Modes.UI; using osu.Game.Screens.Play; using System.Collections.Generic; @@ -12,7 +14,7 @@ namespace osu.Game.Modes.Mania { public class ManiaRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new ManiaHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new ManiaHitRenderer(beatmap); public override IEnumerable GetModsFor(ModType type) { diff --git a/osu.Game.Modes.Mania/ManiaMod.cs b/osu.Game.Modes.Mania/Mods/ManiaMod.cs similarity index 94% rename from osu.Game.Modes.Mania/ManiaMod.cs rename to osu.Game.Modes.Mania/Mods/ManiaMod.cs index d52db2977c..b330680550 100644 --- a/osu.Game.Modes.Mania/ManiaMod.cs +++ b/osu.Game.Modes.Mania/Mods/ManiaMod.cs @@ -1,10 +1,11 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using osu.Game.Graphics; +using osu.Game.Modes.Mods; +using System; -namespace osu.Game.Modes.Mania +namespace osu.Game.Modes.Mania.Mods { public class ManiaModNoFail : ModNoFail { diff --git a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs index 911742b222..d29a088225 100644 --- a/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs +++ b/osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs @@ -13,7 +13,7 @@ namespace osu.Game.Modes.Mania.UI { private readonly int columns; - public ManiaHitRenderer(Beatmap beatmap, int columns = 5) + public ManiaHitRenderer(WorkingBeatmap beatmap, int columns = 5) : base(beatmap) { this.columns = columns; diff --git a/osu.Game.Modes.Mania/app.config b/osu.Game.Modes.Mania/app.config deleted file mode 100644 index b9af3fdc80..0000000000 --- a/osu.Game.Modes.Mania/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj index 88bf879bcc..48f8d23a07 100644 --- a/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj +++ b/osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj @@ -57,7 +57,7 @@ - + @@ -81,7 +81,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Osu/OsuMod.cs b/osu.Game.Modes.Osu/Mods/OsuMod.cs similarity index 88% rename from osu.Game.Modes.Osu/OsuMod.cs rename to osu.Game.Modes.Osu/Mods/OsuMod.cs index 3290eed61a..e80975aed1 100644 --- a/osu.Game.Modes.Osu/OsuMod.cs +++ b/osu.Game.Modes.Osu/Mods/OsuMod.cs @@ -1,11 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using osu.Game.Beatmaps; +using osu.Game.Graphics; +using osu.Game.Modes.Mods; +using osu.Game.Modes.Osu.Objects; using System; using System.Linq; -using osu.Game.Graphics; -namespace osu.Game.Modes.Osu +namespace osu.Game.Modes.Osu.Mods { public class OsuModNoFail : ModNoFail { @@ -85,9 +88,14 @@ namespace osu.Game.Modes.Osu public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail), typeof(ModAutoplay) }; } - public class OsuModAutoplay : ModAutoplay + public class OsuModAutoplay : ModAutoplay { public override Type[] IncompatibleMods => base.IncompatibleMods.Concat(new[] { typeof(OsuModAutopilot) }).ToArray(); + + protected override Score CreateReplayScore(Beatmap beatmap) => new Score + { + Replay = new OsuAutoReplay(beatmap) + }; } public class OsuModTarget : Mod diff --git a/osu.Game.Modes.Osu/OsuAutoReplay.cs b/osu.Game.Modes.Osu/OsuAutoReplay.cs index 2b541f49d9..6b543cb98f 100644 --- a/osu.Game.Modes.Osu/OsuAutoReplay.cs +++ b/osu.Game.Modes.Osu/OsuAutoReplay.cs @@ -1,14 +1,14 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System.Collections.Generic; +using OpenTK; +using osu.Framework.Graphics.Transforms; +using osu.Framework.MathUtils; using osu.Game.Beatmaps; using osu.Game.Modes.Osu.Objects; -using OpenTK; -using System; -using osu.Framework.Graphics.Transforms; using osu.Game.Modes.Osu.Objects.Drawables; -using osu.Framework.MathUtils; +using System; +using System.Collections.Generic; using System.Diagnostics; using osu.Game.Modes.Objects.Types; @@ -20,9 +20,9 @@ namespace osu.Game.Modes.Osu private const float spin_radius = 50; - private Beatmap beatmap; + private Beatmap beatmap; - public OsuAutoReplay(Beatmap beatmap) + public OsuAutoReplay(Beatmap beatmap) { this.beatmap = beatmap; @@ -87,7 +87,7 @@ namespace osu.Game.Modes.Osu for (int i = 0; i < beatmap.HitObjects.Count; i++) { - OsuHitObject h = (OsuHitObject)beatmap.HitObjects[i]; + OsuHitObject h = beatmap.HitObjects[i]; //if (h.EndTime < InputManager.ReplayStartTime) //{ @@ -99,7 +99,7 @@ namespace osu.Game.Modes.Osu if (DelayedMovements && i > 0) { - OsuHitObject last = (OsuHitObject)beatmap.HitObjects[i - 1]; + OsuHitObject last = beatmap.HitObjects[i - 1]; double endTime = (last as IHasEndTime)?.EndTime ?? last.StartTime; diff --git a/osu.Game.Modes.Osu/OsuRuleset.cs b/osu.Game.Modes.Osu/OsuRuleset.cs index 206bd9dddf..370cd53aa2 100644 --- a/osu.Game.Modes.Osu/OsuRuleset.cs +++ b/osu.Game.Modes.Osu/OsuRuleset.cs @@ -4,6 +4,8 @@ using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mods; +using osu.Game.Modes.Osu.Mods; using osu.Game.Modes.Osu.Objects; using osu.Game.Modes.Osu.UI; using osu.Game.Modes.UI; @@ -15,7 +17,7 @@ namespace osu.Game.Modes.Osu { public class OsuRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new OsuHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new OsuHitRenderer(beatmap); public override IEnumerable GetBeatmapStatistics(WorkingBeatmap beatmap) => new[] { @@ -97,13 +99,6 @@ namespace osu.Game.Modes.Osu public override DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap) => new OsuDifficultyCalculator(beatmap); - public override Score CreateAutoplayScore(Beatmap beatmap) - { - var score = CreateScoreProcessor().GetScore(); - score.Replay = new OsuAutoReplay(beatmap); - return score; - } - protected override PlayMode PlayMode => PlayMode.Osu; public override string Description => "osu!"; diff --git a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs index 8b7606e61e..414bfd2afa 100644 --- a/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs +++ b/osu.Game.Modes.Osu/UI/OsuHitRenderer.cs @@ -12,7 +12,7 @@ namespace osu.Game.Modes.Osu.UI { public class OsuHitRenderer : HitRenderer { - public OsuHitRenderer(Beatmap beatmap) + public OsuHitRenderer(WorkingBeatmap beatmap) : base(beatmap) { } diff --git a/osu.Game.Modes.Osu/app.config b/osu.Game.Modes.Osu/app.config deleted file mode 100644 index f77f36199c..0000000000 --- a/osu.Game.Modes.Osu/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj index 31a210fd3b..ec43a3379a 100644 --- a/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj +++ b/osu.Game.Modes.Osu/osu.Game.Modes.Osu.csproj @@ -84,7 +84,7 @@ - + @@ -100,7 +100,6 @@ osu.licenseheader - diff --git a/osu.Game.Modes.Taiko/TaikoMod.cs b/osu.Game.Modes.Taiko/Mods/TaikoMod.cs similarity index 91% rename from osu.Game.Modes.Taiko/TaikoMod.cs rename to osu.Game.Modes.Taiko/Mods/TaikoMod.cs index 62db875991..c929ebffdd 100644 --- a/osu.Game.Modes.Taiko/TaikoMod.cs +++ b/osu.Game.Modes.Taiko/Mods/TaikoMod.cs @@ -1,7 +1,9 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -namespace osu.Game.Modes.Taiko +using osu.Game.Modes.Mods; + +namespace osu.Game.Modes.Taiko.Mods { public class TaikoModNoFail : ModNoFail { diff --git a/osu.Game.Modes.Taiko/TaikoRuleset.cs b/osu.Game.Modes.Taiko/TaikoRuleset.cs index 43312161b0..9782606a69 100644 --- a/osu.Game.Modes.Taiko/TaikoRuleset.cs +++ b/osu.Game.Modes.Taiko/TaikoRuleset.cs @@ -4,6 +4,8 @@ using OpenTK.Input; using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mods; +using osu.Game.Modes.Taiko.Mods; using osu.Game.Modes.Taiko.UI; using osu.Game.Modes.UI; using osu.Game.Screens.Play; @@ -13,7 +15,7 @@ namespace osu.Game.Modes.Taiko { public class TaikoRuleset : Ruleset { - public override HitRenderer CreateHitRendererWith(Beatmap beatmap) => new TaikoHitRenderer(beatmap); + public override HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap) => new TaikoHitRenderer(beatmap); public override IEnumerable GetModsFor(ModType type) { diff --git a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs index dc0276aacc..fb5e38d4dc 100644 --- a/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs +++ b/osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs @@ -11,7 +11,7 @@ namespace osu.Game.Modes.Taiko.UI { public class TaikoHitRenderer : HitRenderer { - public TaikoHitRenderer(Beatmap beatmap) + public TaikoHitRenderer(WorkingBeatmap beatmap) : base(beatmap) { } diff --git a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj index 2cc45682ef..7d6bcf4853 100644 --- a/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj +++ b/osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj @@ -55,7 +55,7 @@ - + diff --git a/osu.Game.Tests/app.config b/osu.Game.Tests/app.config deleted file mode 100644 index 855da39b10..0000000000 --- a/osu.Game.Tests/app.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game.Tests/osu.Game.Tests.csproj b/osu.Game.Tests/osu.Game.Tests.csproj index 96682dd1ce..d01aa77e02 100644 --- a/osu.Game.Tests/osu.Game.Tests.csproj +++ b/osu.Game.Tests/osu.Game.Tests.csproj @@ -52,7 +52,6 @@ osu.licenseheader - diff --git a/osu.Game/Beatmaps/WorkingBeatmap.cs b/osu.Game/Beatmaps/WorkingBeatmap.cs index 1d4047ea45..16db4fc2a6 100644 --- a/osu.Game/Beatmaps/WorkingBeatmap.cs +++ b/osu.Game/Beatmaps/WorkingBeatmap.cs @@ -1,9 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.IO; using osu.Framework.Audio.Track; using osu.Framework.Configuration; using osu.Framework.Graphics.Textures; @@ -11,6 +8,10 @@ using osu.Game.Beatmaps.Formats; using osu.Game.Beatmaps.IO; using osu.Game.Database; using osu.Game.Modes; +using osu.Game.Modes.Mods; +using System; +using System.Collections.Generic; +using System.IO; namespace osu.Game.Beatmaps { diff --git a/osu.Game/Modes/LegacyReplay.cs b/osu.Game/Modes/LegacyReplay.cs index 9ab6c587a9..4b77550cbc 100644 --- a/osu.Game/Modes/LegacyReplay.cs +++ b/osu.Game/Modes/LegacyReplay.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.IO; +using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Input; using osu.Framework.MathUtils; using osu.Game.Input.Handlers; @@ -95,24 +96,17 @@ namespace osu.Game.Modes public override List GetPendingStates() { + var buttons = new HashSet(); + if (CurrentFrame?.MouseLeft ?? false) + buttons.Add(MouseButton.Left); + if (CurrentFrame?.MouseRight ?? false) + buttons.Add(MouseButton.Right); + return new List { new InputState { - Mouse = new ReplayMouseState( - ToScreenSpace(position ?? Vector2.Zero), - new List - { - new MouseState.ButtonState(MouseButton.Left) - { - State = CurrentFrame?.MouseLeft ?? false - }, - new MouseState.ButtonState(MouseButton.Right) - { - State = CurrentFrame?.MouseRight ?? false - }, - } - ), + Mouse = new ReplayMouseState(ToScreenSpace(position ?? Vector2.Zero), buttons), Keyboard = new ReplayKeyboardState(new List()) } }; @@ -171,10 +165,10 @@ namespace osu.Game.Modes private class ReplayMouseState : MouseState { - public ReplayMouseState(Vector2 position, List list) + public ReplayMouseState(Vector2 position, IEnumerable list) { Position = position; - ButtonStates = list; + list.ForEach(b => PressedButtons.Add(b)); } } diff --git a/osu.Game/Modes/Mods/IApplicableMod.cs b/osu.Game/Modes/Mods/IApplicableMod.cs new file mode 100644 index 0000000000..25d0f8d701 --- /dev/null +++ b/osu.Game/Modes/Mods/IApplicableMod.cs @@ -0,0 +1,23 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + + +using osu.Game.Modes.Objects; +using osu.Game.Modes.UI; + +namespace osu.Game.Modes.Mods +{ + /// + /// An interface for mods that are applied to a HitRenderer. + /// + /// The type of HitObject the HitRenderer contains. + public interface IApplicableMod + where TObject : HitObject + { + /// + /// Applies the mod to a HitRenderer. + /// + /// The HitRenderer to apply the mod to. + void Apply(HitRenderer hitRenderer); + } +} diff --git a/osu.Game/Modes/Mod.cs b/osu.Game/Modes/Mods/Mod.cs similarity index 88% rename from osu.Game/Modes/Mod.cs rename to osu.Game/Modes/Mods/Mod.cs index 167421c23d..6a720a3574 100644 --- a/osu.Game/Modes/Mod.cs +++ b/osu.Game/Modes/Mods/Mod.cs @@ -1,11 +1,13 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; +using osu.Game.Beatmaps; using osu.Game.Graphics; -using osu.Game.Screens.Play; +using osu.Game.Modes.Objects; +using osu.Game.Modes.UI; +using System; -namespace osu.Game.Modes +namespace osu.Game.Modes.Mods { /// /// The base class for gameplay modifiers. @@ -41,12 +43,6 @@ namespace osu.Game.Modes /// The mods this mod cannot be enabled with. /// public virtual Type[] IncompatibleMods => new Type[] { }; - - /// - /// Direct access to the Player before load has run. - /// - /// - public virtual void PlayerLoading(Player player) { } } public class MultiMod : Mod @@ -151,11 +147,16 @@ namespace osu.Game.Modes public override string Description => "Watch a perfect automated play through the song"; public override double ScoreMultiplier => 0; public override Type[] IncompatibleMods => new[] { typeof(ModRelax), typeof(ModSuddenDeath), typeof(ModNoFail) }; + } - public override void PlayerLoading(Player player) + public abstract class ModAutoplay : ModAutoplay, IApplicableMod + where T : HitObject + { + protected abstract Score CreateReplayScore(Beatmap beatmap); + + public void Apply(HitRenderer hitRenderer) { - base.PlayerLoading(player); - player.ReplayInputHandler = Ruleset.GetRuleset(player.Beatmap.PlayMode).CreateAutoplayScore(player.Beatmap.Beatmap)?.Replay?.GetInputHandler(); + hitRenderer.InputManager.ReplayInputHandler = CreateReplayScore(hitRenderer.Beatmap)?.Replay?.GetInputHandler(); } } @@ -170,11 +171,4 @@ namespace osu.Game.Modes public override string Name => "Cinema"; public override FontAwesome Icon => FontAwesome.fa_osu_mod_cinema; } - - public enum ModType - { - DifficultyReduction, - DifficultyIncrease, - Special, - } } diff --git a/osu.Game/Modes/Mods/ModType.cs b/osu.Game/Modes/Mods/ModType.cs new file mode 100644 index 0000000000..b1d0e781e1 --- /dev/null +++ b/osu.Game/Modes/Mods/ModType.cs @@ -0,0 +1,12 @@ +// Copyright (c) 2007-2017 ppy Pty Ltd . +// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE + +namespace osu.Game.Modes.Mods +{ + public enum ModType + { + DifficultyReduction, + DifficultyIncrease, + Special, + } +} diff --git a/osu.Game/Modes/Ruleset.cs b/osu.Game/Modes/Ruleset.cs index 55b670cc56..8cbfa3fa46 100644 --- a/osu.Game/Modes/Ruleset.cs +++ b/osu.Game/Modes/Ruleset.cs @@ -3,6 +3,7 @@ using osu.Game.Beatmaps; using osu.Game.Graphics; +using osu.Game.Modes.Mods; using osu.Game.Modes.UI; using osu.Game.Screens.Play; using System; @@ -30,7 +31,7 @@ namespace osu.Game.Modes public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount = 0); - public abstract HitRenderer CreateHitRendererWith(Beatmap beatmap); + public abstract HitRenderer CreateHitRendererWith(WorkingBeatmap beatmap); public abstract DifficultyCalculator CreateDifficultyCalculator(Beatmap beatmap); @@ -44,8 +45,6 @@ namespace osu.Game.Modes public abstract IEnumerable CreateGameplayKeys(); - public virtual Score CreateAutoplayScore(Beatmap beatmap) => null; - public static Ruleset GetRuleset(PlayMode mode) { Type type; diff --git a/osu.Game/Modes/UI/HitRenderer.cs b/osu.Game/Modes/UI/HitRenderer.cs index e08570522f..e466dd2b8c 100644 --- a/osu.Game/Modes/UI/HitRenderer.cs +++ b/osu.Game/Modes/UI/HitRenderer.cs @@ -1,11 +1,11 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using OpenTK; using osu.Framework.Allocation; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Game.Beatmaps; +using osu.Game.Modes.Mods; using osu.Game.Modes.Objects; using osu.Game.Modes.Objects.Drawables; using osu.Game.Screens.Play; @@ -22,11 +22,6 @@ namespace osu.Game.Modes.UI internal readonly PlayerInputManager InputManager = new PlayerInputManager(); - /// - /// A function to convert coordinates from gamefield to screen space. - /// - public abstract Func MapPlayfieldToScreenSpace { get; } - /// /// Whether all the HitObjects have been judged. /// @@ -44,20 +39,22 @@ namespace osu.Game.Modes.UI public abstract class HitRenderer : HitRenderer where TObject : HitObject { - public override Func MapPlayfieldToScreenSpace => Playfield.ScaledContent.ToScreenSpace; + public Beatmap Beatmap; + public IEnumerable DrawableObjects => Playfield.HitObjects.Children; protected override Container Content => content; protected override bool AllObjectsJudged => Playfield.HitObjects.Children.All(h => h.Judgement.Result.HasValue); protected Playfield Playfield; - protected Beatmap Beatmap; private Container content; - protected HitRenderer(Beatmap beatmap) + protected HitRenderer(WorkingBeatmap beatmap) { - Beatmap = CreateBeatmapConverter().Convert(beatmap); + Beatmap = CreateBeatmapConverter().Convert(beatmap.Beatmap); + + applyMods(beatmap.Mods.Value); RelativeSizeAxes = Axes.Both; @@ -78,6 +75,9 @@ namespace osu.Game.Modes.UI private void load() { loadObjects(); + + if (InputManager?.ReplayInputHandler != null) + InputManager.ReplayInputHandler.ToScreenSpace = Playfield.ScaledContent.ToScreenSpace; } private void loadObjects() @@ -97,6 +97,15 @@ namespace osu.Game.Modes.UI Playfield.PostProcess(); } + private void applyMods(IEnumerable mods) + { + if (mods == null) + return; + + foreach (var mod in mods.OfType>()) + mod.Apply(this); + } + private void onJudgement(DrawableHitObject o, JudgementInfo j) => TriggerOnJudgement(j); protected abstract DrawableHitObject GetVisualRepresentation(TObject h); diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs index 79ffcfcadf..8aa3a63d26 100644 --- a/osu.Game/OsuGame.cs +++ b/osu.Game/OsuGame.cs @@ -258,13 +258,13 @@ namespace osu.Game return false; } - public event Action ModeChanged; + public event Action ScreenChanged; private Container mainContent; private Container overlayContent; - private void modeChanged(Screen newScreen) + private void screenChanged(Screen newScreen) { //central game mode change logic. if ((newScreen as OsuScreen)?.ShowOverlays != true) @@ -281,7 +281,7 @@ namespace osu.Game if (newScreen is MainMenu) Cursor.FadeIn(100); - ModeChanged?.Invoke(newScreen); + ScreenChanged?.Invoke(newScreen); if (newScreen == null) Exit(); @@ -315,12 +315,12 @@ namespace osu.Game newScreen.ModePushed += screenAdded; newScreen.Exited += screenRemoved; - modeChanged(newScreen); + screenChanged(newScreen); } private void screenRemoved(Screen newScreen) { - modeChanged(newScreen); + screenChanged(newScreen); } } } diff --git a/osu.Game/Overlays/Mods/AssistedSection.cs b/osu.Game/Overlays/Mods/AssistedSection.cs index 0bb1bc9dff..a1ec7a3fdc 100644 --- a/osu.Game/Overlays/Mods/AssistedSection.cs +++ b/osu.Game/Overlays/Mods/AssistedSection.cs @@ -4,7 +4,7 @@ using OpenTK.Input; using osu.Framework.Allocation; using osu.Game.Graphics; -using osu.Game.Modes; +using osu.Game.Modes.Mods; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs index 4dfb0ba6c2..13df5aabfb 100644 --- a/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs +++ b/osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs @@ -4,7 +4,7 @@ using OpenTK.Input; using osu.Framework.Allocation; using osu.Game.Graphics; -using osu.Game.Modes; +using osu.Game.Modes.Mods; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs index d92fb541c3..f8ac4551ef 100644 --- a/osu.Game/Overlays/Mods/DifficultyReductionSection.cs +++ b/osu.Game/Overlays/Mods/DifficultyReductionSection.cs @@ -4,7 +4,7 @@ using OpenTK.Input; using osu.Framework.Allocation; using osu.Game.Graphics; -using osu.Game.Modes; +using osu.Game.Modes.Mods; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs index 6e3bafbada..acd5f37092 100644 --- a/osu.Game/Overlays/Mods/ModButton.cs +++ b/osu.Game/Overlays/Mods/ModButton.cs @@ -1,8 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Linq; using OpenTK; using OpenTK.Graphics; using OpenTK.Input; @@ -15,8 +13,10 @@ using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transforms; using osu.Framework.Input; using osu.Game.Graphics.Sprites; -using osu.Game.Modes; +using osu.Game.Modes.Mods; using osu.Game.Modes.UI; +using System; +using System.Linq; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/ModSection.cs b/osu.Game/Overlays/Mods/ModSection.cs index c07114919e..489af21ef4 100644 --- a/osu.Game/Overlays/Mods/ModSection.cs +++ b/osu.Game/Overlays/Mods/ModSection.cs @@ -1,7 +1,6 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; using OpenTK; using OpenTK.Graphics; using OpenTK.Input; @@ -10,7 +9,8 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; using osu.Framework.Input; using osu.Game.Graphics.Sprites; -using osu.Game.Modes; +using osu.Game.Modes.Mods; +using System; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/Mods/ModSelectOverlay.cs b/osu.Game/Overlays/Mods/ModSelectOverlay.cs index 1be1b9a351..3a685be7fa 100644 --- a/osu.Game/Overlays/Mods/ModSelectOverlay.cs +++ b/osu.Game/Overlays/Mods/ModSelectOverlay.cs @@ -1,11 +1,9 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; using OpenTK; using OpenTK.Graphics; +using osu.Framework.Allocation; using osu.Framework.Configuration; using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Graphics; @@ -13,11 +11,14 @@ using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Primitives; using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Transforms; -using osu.Framework.Allocation; using osu.Game.Graphics; using osu.Game.Graphics.Backgrounds; using osu.Game.Graphics.Sprites; using osu.Game.Modes; +using osu.Game.Modes.Mods; +using System; +using System.Collections.Generic; +using System.Linq; namespace osu.Game.Overlays.Mods { diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 1b4692f50e..5c9adb6b20 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -210,7 +210,7 @@ namespace osu.Game.Overlays } } }; - + this.beatmaps = beatmaps; trackManager = osuGame.Audio.Track; preferUnicode = config.GetBindable(OsuConfig.ShowUnicode); @@ -247,6 +247,8 @@ namespace osu.Game.Overlays if (current.Track.HasCompleted && !current.Track.Looping) next(); } + else + playButton.Icon = FontAwesome.fa_play_circle_o; } private void preferUnicode_changed(object sender, EventArgs e) @@ -337,12 +339,16 @@ namespace osu.Game.Overlays Task.Run(() => { if (beatmap?.Beatmap == null) - //todo: we may need to display some default text here (currently in the constructor). - return; - - BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; - title.Text = unicodeString(metadata.Title, metadata.TitleUnicode); - artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode); + { + title.Text = @"Nothing to play"; + artist.Text = @"Nothing to play"; + } + else + { + BeatmapMetadata metadata = beatmap.Beatmap.BeatmapInfo.Metadata; + title.Text = unicodeString(metadata.Title, metadata.TitleUnicode); + artist.Text = unicodeString(metadata.Artist, metadata.ArtistUnicode); + } }); MusicControllerBackground newBackground; diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs index 1a71543786..1a3a5b7036 100644 --- a/osu.Game/Screens/Play/Player.cs +++ b/osu.Game/Screens/Play/Player.cs @@ -7,7 +7,6 @@ using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Track; using osu.Framework.Configuration; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Transforms; @@ -69,8 +68,6 @@ namespace osu.Game.Screens.Play return; } - Beatmap.Mods.Value.ForEach(m => m.PlayerLoading(this)); - dimLevel = config.GetBindable(OsuConfig.DimLevel); mouseWheelDisabled = config.GetBindable(OsuConfig.MouseDisableWheel); @@ -128,13 +125,10 @@ namespace osu.Game.Screens.Play OnQuit = Exit }; - hitRenderer = ruleset.CreateHitRendererWith(beatmap); + hitRenderer = ruleset.CreateHitRendererWith(Beatmap); if (ReplayInputHandler != null) - { - ReplayInputHandler.ToScreenSpace = hitRenderer.MapPlayfieldToScreenSpace; hitRenderer.InputManager.ReplayInputHandler = ReplayInputHandler; - } hudOverlay.BindHitRenderer(hitRenderer); @@ -305,7 +299,8 @@ namespace osu.Game.Screens.Play { if (pauseOverlay == null) return false; - if (ReplayInputHandler != null) return false; + if (hitRenderer.InputManager.ReplayInputHandler != null) + return false; if (pauseOverlay.State != Visibility.Visible && !canPause) return true; diff --git a/osu.Game/Screens/Play/PlayerInputManager.cs b/osu.Game/Screens/Play/PlayerInputManager.cs index a16c1ba9c6..3eab30c50d 100644 --- a/osu.Game/Screens/Play/PlayerInputManager.cs +++ b/osu.Game/Screens/Play/PlayerInputManager.cs @@ -70,14 +70,14 @@ namespace osu.Game.Screens.Play { if (mouseDisabled.Value) { - mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = false; - mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = false; + mouse.PressedButtons.Remove(MouseButton.Left); + mouse.PressedButtons.Remove(MouseButton.Right); } if (leftViaKeyboard) - mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = true; + mouse.PressedButtons.Add(MouseButton.Left); if (rightViaKeyboard) - mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = true; + mouse.PressedButtons.Add(MouseButton.Right); } } diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs index 03722e4c58..2461e80ab7 100644 --- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs +++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs @@ -16,7 +16,6 @@ using osu.Game.Database; using osu.Framework.Graphics.Colour; using osu.Game.Beatmaps.Drawables; using System.Linq; -using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.MathUtils; using osu.Game.Graphics; using osu.Game.Graphics.Sprites; @@ -58,8 +57,15 @@ namespace osu.Game.Screens.Select public void UpdateBeatmap(WorkingBeatmap beatmap) { if (beatmap?.BeatmapInfo == null) + { + FadeOut(250); + beatmapInfoContainer?.FadeOut(250); + beatmapInfoContainer?.Expire(); + beatmapInfoContainer = null; return; + } + FadeIn(250); var lastContainer = beatmapInfoContainer; float newDepth = lastContainer?.Depth + 1 ?? 0; @@ -89,7 +95,7 @@ namespace osu.Game.Screens.Select })); //get statistics fromt he current ruleset. - Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).ForEach(s => labels.Add(new InfoLabel(s))); + labels.AddRange(Ruleset.GetRuleset(beatmap.BeatmapInfo.Mode).GetBeatmapStatistics(beatmap).Select(s => new InfoLabel(s))); } (beatmapInfoContainer = new BufferedContainer @@ -196,7 +202,7 @@ namespace osu.Game.Screens.Select private string getBPMRange(Beatmap beatmap) { - double bpmMax = beatmap.BPMMaximum; + double bpmMax = beatmap.BPMMaximum; double bpmMin = beatmap.BPMMinimum; if (Precision.AlmostEquals(bpmMin, bpmMax)) return Math.Round(bpmMin) + "bpm"; diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs index e7fba05036..6a5bb2dc94 100644 --- a/osu.Game/Screens/Select/CarouselContainer.cs +++ b/osu.Game/Screens/Select/CarouselContainer.cs @@ -57,6 +57,7 @@ namespace osu.Game.Screens.Select public void RemoveGroup(BeatmapGroup group) { groups.Remove(group); + panels.Remove(group.Header); foreach (var p in group.BeatmapPanels) panels.Remove(p); diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs index 86f9bc30cf..09ba794122 100644 --- a/osu.Game/Screens/Select/PlaySongSelect.cs +++ b/osu.Game/Screens/Select/PlaySongSelect.cs @@ -326,8 +326,7 @@ namespace osu.Game.Screens.Select backgroundModeBeatmap.FadeTo(1, 250); } - if (beatmap != null) - beatmapInfoWedge.UpdateBeatmap(beatmap); + beatmapInfoWedge.UpdateBeatmap(beatmap); } /// @@ -337,11 +336,11 @@ namespace osu.Game.Screens.Select { base.OnBeatmapChanged(beatmap); - beatmap.Mods.BindTo(modSelect.SelectedMods); + beatmap?.Mods.BindTo(modSelect.SelectedMods); //todo: change background in selectionChanged instead; support per-difficulty backgrounds. changeBackground(beatmap); - carousel.SelectBeatmap(beatmap.BeatmapInfo); + carousel.SelectBeatmap(beatmap?.BeatmapInfo); } /// diff --git a/osu.Game/app.config b/osu.Game/app.config deleted file mode 100644 index b9af3fdc80..0000000000 --- a/osu.Game/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj index fac1154804..1beae1c475 100644 --- a/osu.Game/osu.Game.csproj +++ b/osu.Game/osu.Game.csproj @@ -91,6 +91,8 @@ + + @@ -317,7 +319,7 @@ - + @@ -353,7 +355,6 @@ osu.licenseheader -