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

Remove nullable disable annotation in mods for catch ruleset. #19249

Merged
merged 7 commits into from
Jul 26, 2022
Merged

Remove nullable disable annotation in mods for catch ruleset. #19249

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
53e61c5
Remove the nullable annotation in the catch ruleset.
andy840119 Jul 3, 2022
91bc7b9
Mark the class as non-nullable.
andy840119 Jul 10, 2022
6a096cf
Remove nullable disable annotation in the Catch test case.
andy840119 Jul 20, 2022
9c2f610
Following the suggestion to mark the property as nullable.
andy840119 Jul 21, 2022
046a28f
Merge branch 'master' into remove-nullable-disable-in-the-mods-for-ca…
frenzibyte Jul 22, 2022
f366b8e
Merge branch 'master' into remove-nullable-disable-in-the-mods-for-ca…
frenzibyte Jul 22, 2022
88db835
Merge branch 'master' into remove-nullable-disable-in-the-mods-for-ca…
andy840119 Jul 26, 2022
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
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch.Tests/Mods/CatchModMirrorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Utils;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Utils;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using NUnit.Framework;
using osu.Game.Rulesets.Catch.Mods;
using osu.Game.Rulesets.Catch.Objects;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModAutoplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Replays;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModCinema.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Objects;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModClassic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModDaycore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModDifficultyAdjust.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Linq;
using osu.Framework.Bindables;
using osu.Game.Beatmaps;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModDoubleTime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModEasy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
7 changes: 3 additions & 4 deletions osu.Game.Rulesets.Catch/Mods/CatchModFlashlight.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Framework.Bindables;
using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics;
using osu.Game.Configuration;
using osu.Game.Rulesets.Catch.Objects;
Expand Down Expand Up @@ -37,9 +36,9 @@ public class CatchModFlashlight : ModFlashlight<CatchHitObject>

public override float DefaultFlashlightSize => 350;

protected override Flashlight CreateFlashlight() => new CatchFlashlight(this, playfield);
protected override Flashlight CreateFlashlight() => new CatchFlashlight(this, playfield.AsNonNull());

private CatchPlayfield playfield;
private CatchPlayfield? playfield;

public override void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
{
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModFloatingFruits.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Game.Rulesets.Catch.Objects;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModHalfTime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModHardRock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Beatmaps;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModHidden.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Linq;
using osu.Framework.Graphics;
using osu.Game.Rulesets.Catch.Objects;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModMirror.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Linq;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Catch.Beatmaps;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModMuted.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Mods;

Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModNightcore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Catch.Objects;
using osu.Game.Rulesets.Mods;

Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModNoFail.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModNoScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System;
using osu.Framework.Bindables;
using osu.Game.Rulesets.Mods;
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModPerfect.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down
7 changes: 4 additions & 3 deletions osu.Game.Rulesets.Catch/Mods/CatchModRelax.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using System.Diagnostics;
using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Framework.Input.Bindings;
Expand All @@ -20,7 +19,7 @@ public class CatchModRelax : ModRelax, IApplicableToDrawableRuleset<CatchHitObje
{
public override string Description => @"Use the mouse to control the catcher.";

private DrawableRuleset<CatchHitObject> drawableRuleset;
private DrawableRuleset<CatchHitObject>? drawableRuleset;

public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRuleset)
{
Expand All @@ -29,6 +28,8 @@ public void ApplyToDrawableRuleset(DrawableRuleset<CatchHitObject> drawableRules

public void ApplyToPlayer(Player player)
{
Debug.Assert(drawableRuleset != null);

if (!drawableRuleset.HasReplayLoaded.Value)
drawableRuleset.Cursor.Add(new MouseInputHelper((CatchPlayfield)drawableRuleset.Playfield));
}
Expand Down
2 changes: 0 additions & 2 deletions osu.Game.Rulesets.Catch/Mods/CatchModSuddenDeath.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

#nullable disable

using osu.Game.Rulesets.Mods;

namespace osu.Game.Rulesets.Catch.Mods
Expand Down