Merge pull request #1966 from andy840119/made-some-cleanup

Made some cleanup
karaoke-dev · Apr 29, 2023 · 086eddb · 086eddb
2 parents a0f98d0 + c8384a5
commit 086eddb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Preview/PreviewLyricLayoutCategory.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Stages/Preview/PreviewLyricLayoutCategory.cs
@@ -8,9 +8,4 @@ namespace osu.Game.Rulesets.Karaoke.Beatmaps.Stages.Preview;
 public class PreviewLyricLayoutCategory : StageElementCategory<PreviewLyricLayout, Lyric>
 {
     protected override PreviewLyricLayout CreateElement(int id) => new(id);
-
-    public void ReCalculate()
-    {
-        // todo: do something.
-    }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs b/osu.Game.Rulesets.Karaoke/Configuration/KaraokeRulesetConfigManager.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Karaoke.Configuration
 {
     public class KaraokeRulesetConfigManager : RulesetConfigManager<KaraokeRulesetSetting>
     {
-        public KaraokeRulesetConfigManager(SettingsStore settings, RulesetInfo ruleset, int? variant = null)
+        public KaraokeRulesetConfigManager(SettingsStore? settings, RulesetInfo ruleset, int? variant = null)
             : base(settings, ruleset, variant)
         {
         }

diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.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 osu.Framework.Allocation;
@@ -51,7 +49,7 @@ namespace osu.Game.Rulesets.Karaoke
     [ExcludeFromDynamicCompile]
     public partial class KaraokeRuleset : Ruleset
     {
-        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod> mods = null) => new DrawableKaraokeRuleset(this, beatmap, mods);
+        public override DrawableRuleset CreateDrawableRulesetWith(IBeatmap beatmap, IReadOnlyList<Mod>? mods = null) => new DrawableKaraokeRuleset(this, beatmap, mods);
         public override ScoreProcessor CreateScoreProcessor() => new KaraokeScoreProcessor();
         public override IBeatmapConverter CreateBeatmapConverter(IBeatmap beatmap) => new KaraokeBeatmapConverter(beatmap, this);
         public override IBeatmapProcessor CreateBeatmapProcessor(IBeatmap beatmap) => new KaraokeBeatmapProcessor(beatmap);
@@ -208,13 +206,13 @@ public override ISkin CreateSkinTransformer(ISkin skin, IBeatmap beatmap)
                 ArgonSkin => new KaraokeArgonSkinTransformer(skin, beatmap),
                 DefaultLegacySkin => new KaraokeClassicSkinTransformer(skin, beatmap),
                 LegacySkin => new KaraokeLegacySkinTransformer(skin, beatmap),
-                _ => null
+                _ => throw new InvalidOperationException(),
             };
         }
 
         public override IConvertibleReplayFrame CreateConvertibleReplayFrame() => new KaraokeReplayFrame();
 
-        public override IRulesetConfigManager CreateConfig(SettingsStore settings) => new KaraokeRulesetConfigManager(settings, RulesetInfo);
+        public override IRulesetConfigManager CreateConfig(SettingsStore? settings) => new KaraokeRulesetConfigManager(settings, RulesetInfo);
 
         public override RulesetSettingsSubsection CreateSettings() => new KaraokeSettingsSubsection(this);