Merge pull request #1993 from andy840119/adjust-permit-null-in-depend…

…ency-injection Adjust permit null in dependency injection
karaoke-dev · May 9, 2023 · d619041 · d619041
2 parents 8eac5ff + df0c361
commit d619041
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 25 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Edit/Components/UserInterfaceV2/NoteEditPopover.cs b/osu.Game.Rulesets.Karaoke/Edit/Components/UserInterfaceV2/NoteEditPopover.cs
@@ -103,7 +103,7 @@ public NoteSection(Note note)
             });
         }
 
-        [BackgroundDependencyLoader(true)]
+        [BackgroundDependencyLoader]
         private void load(HitObjectComposer composer)
         {
             // todo: not a good way to get change handler, might remove or found another way eventually.

diff --git a/osu.Game.Rulesets.Karaoke/Edit/EditorNotePlayfield.cs b/osu.Game.Rulesets.Karaoke/Edit/EditorNotePlayfield.cs
@@ -40,7 +40,7 @@ public EditorNotePlayfield(int columns)
         });
     }
 
-    [BackgroundDependencyLoader(true)]
+    [BackgroundDependencyLoader]
     private void load()
     {
         // todo : load data from scoring manager.

diff --git a/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs b/osu.Game.Rulesets.Karaoke/KaraokeInputManager.cs
@@ -1,8 +1,6 @@
 // Copyright (c) andy840119 <[email protected]>. Licensed under the GPL Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34,10 +32,10 @@ public KaraokeInputManager(RulesetInfo ruleset)
         UseParentInput = false;
     }
 
-    private IBeatmap beatmap;
+    private IBeatmap beatmap = null!;
 
-    [BackgroundDependencyLoader(true)]
-    private void load(KaraokeRulesetConfigManager config, IBindable<IReadOnlyList<Mod>> mods, IBindable<WorkingBeatmap> beatmap, KaraokeSessionStatics session, EditorBeatmap editorBeatmap)
+    [BackgroundDependencyLoader]
+    private void load(KaraokeRulesetConfigManager config, IBindable<IReadOnlyList<Mod>> mods, IBindable<WorkingBeatmap> beatmap, KaraokeSessionStatics session, EditorBeatmap? editorBeatmap)
     {
         if (editorBeatmap != null)
         {

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableKaraokeScrollingHitObject.cs b/osu.Game.Rulesets.Karaoke/Objects/Drawables/DrawableKaraokeScrollingHitObject.cs
@@ -3,7 +3,6 @@
 
 #nullable disable
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -23,8 +22,8 @@ protected DrawableKaraokeScrollingHitObject(KaraokeHitObject hitObject)
     {
     }
 
-    [BackgroundDependencyLoader(true)]
-    private void load([NotNull] IScrollingInfo scrollingInfo)
+    [BackgroundDependencyLoader]
+    private void load(IScrollingInfo scrollingInfo)
     {
         Direction.BindTo(scrollingInfo.Direction);
         Direction.BindValueChanged(OnDirectionChanged, true);

diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSection.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/Sidebar/ChangelogSection.cs
@@ -11,7 +11,6 @@
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Framework.Platform;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/LyricComposer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/LyricComposer.cs
@@ -152,8 +152,8 @@ public LyricComposer()
         }
     }
 
-    [BackgroundDependencyLoader(true)]
-    private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManager, ILyricEditorState state, ITimeTagModeState timeTagModeState)
+    [BackgroundDependencyLoader]
+    private void load(KaraokeRulesetLyricEditorConfigManager lyricEditorConfigManager, ILyricEditorState state)
     {
         lyricEditorConfigManager.BindWith(KaraokeRulesetLyricEditorSetting.ShowPropertyPanelInComposer, panelStatus[PanelType.Property]);
         lyricEditorConfigManager.BindWith(KaraokeRulesetLyricEditorSetting.ShowInvalidInfoInComposer, panelStatus[PanelType.InvalidInfo]);

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panel.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Panel.cs
@@ -57,7 +57,7 @@ protected Panel()
 
     protected abstract IReadOnlyList<Drawable> CreateSections();
 
-    [BackgroundDependencyLoader(true)]
+    [BackgroundDependencyLoader]
     private void load(ILyricEditorState state, LyricEditorColourProvider colourProvider, AudioManager audio)
     {
         bindableMode.BindTo(state.BindableMode);

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/SpecialActionToolbar.cs
@@ -54,7 +54,7 @@ public SpecialActionToolbar()
         };
     }
 
-    [BackgroundDependencyLoader(true)]
+    [BackgroundDependencyLoader]
     private void load(ILyricEditorState state, LyricEditorColourProvider colourProvider)
     {
         bindableModeAndSubMode.BindTo(state.BindableModeAndSubMode);

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Separator.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/Toolbar/Separator.cs
@@ -25,7 +25,7 @@ public Separator()
         };
     }
 
-    [BackgroundDependencyLoader(true)]
+    [BackgroundDependencyLoader]
     private void load(ILyricEditorState state, LyricEditorColourProvider colourProvider)
     {
         bindableMode.BindValueChanged(x =>

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditorVerifier.cs
@@ -72,7 +72,7 @@ protected override void LoadComplete()
         recalculateIssues();
     }
 
-    [BackgroundDependencyLoader(true)]
+    [BackgroundDependencyLoader]
     private void load(KaraokeRulesetEditCheckerConfigManager? rulesetEditCheckerConfigManager)
     {
         // todo: adjust the config in the config.

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/LyricPlacementRow.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Singers/Rows/LyricPlacementRow.cs
@@ -3,14 +3,12 @@
 
 #nullable disable
 
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Game.Overlays;
 using osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas;
-using osu.Game.Rulesets.Karaoke.Edit;
 
 namespace osu.Game.Rulesets.Karaoke.Screens.Edit.Beatmaps.Singers.Rows;
 
@@ -25,8 +23,8 @@ protected LyricPlacementColumn(Singer singer)
         this.singer = singer;
     }
 
-    [BackgroundDependencyLoader(true)]
-    private void load(OverlayColourProvider colourProvider, [CanBeNull] KaraokeHitObjectComposer composer)
+    [BackgroundDependencyLoader]
+    private void load(OverlayColourProvider colourProvider)
     {
         InternalChildren = new Drawable[]
         {

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/Components/DrawableDragFile.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Import/Lyrics/DragFile/Components/DrawableDragFile.cs
@@ -26,7 +26,7 @@ public partial class DrawableDragFile : Container
 
     private RoundedButton importButton;
 
-    [BackgroundDependencyLoader(true)]
+    [BackgroundDependencyLoader]
     private void load(OsuColour colours)
     {
         Masking = true;

diff --git a/osu.Game.Rulesets.Karaoke/UI/NotePlayfield.cs b/osu.Game.Rulesets.Karaoke/UI/NotePlayfield.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -211,8 +210,8 @@ internal void OnNewResult(DrawableHitObject judgedObject, JudgementResult result
         explosion.Delay(200).Expire(true);
     }
 
-    [BackgroundDependencyLoader(true)]
-    private void load([CanBeNull] KaraokeSessionStatics session)
+    [BackgroundDependencyLoader]
+    private void load(KaraokeSessionStatics? session)
     {
         session?.BindWith(KaraokeRulesetSession.ScoringPitch, scoringPitch);