Merge pull request #1813 from andy840119/upgrade-package-to-the-latest

Upgrade package to the latest.
karaoke-dev · Dec 27, 2022 · 1a32c11 · 1a32c11
2 parents 21be8ec + 48be664
commit 1a32c11
Show file tree

Hide file tree

Showing 32 changed files with 100 additions and 38 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapDecoder.cs
@@ -230,7 +230,7 @@ private void processTranslate(Beatmap beatmap, IEnumerable<string> translateLine
             var translations = translateLines.Select(translate => new
             {
                 key = translate.Split('=').FirstOrDefault()?.Split('[').LastOrDefault()?.Split(']').FirstOrDefault(),
-                value = translate.Split('=').LastOrDefault()
+                value = translate.Split('=').LastOrDefault() ?? string.Empty
             }).GroupBy(x => x.key, y => y.value).ToList();
 
             foreach (var translation in translations)

diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapEncoder.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Formats/KaraokeLegacyBeatmapEncoder.cs
@@ -32,7 +32,7 @@ private IEnumerable<string> encodeNote(Beatmap output)
             {
                 var lyric = g.Key;
                 if (lyric == null)
-                    throw new NullReferenceException();
+                    throw new ArgumentNullException();
 
                 // Get note group
                 var noteGroup = g.ToList().GroupBy(n => n.ReferenceTimeTagIndex);
@@ -75,7 +75,7 @@ private IEnumerable<string> encodeTranslate(Beatmap output)
             {
                 foreach (var lyric in lyrics)
                 {
-                    string translateString = lyric.Translates.TryGetValue(translate, out string value) ? value : string.Empty;
+                    string translateString = lyric.Translates.TryGetValue(translate, out string? value) ? value : string.Empty;
                     yield return $"@tr[{translate.Name}]={translateString}";
                 }
             }

diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapResourcesProvider.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/KaraokeBeatmapResourcesProvider.cs
@@ -45,7 +45,7 @@ private IBeatmapResourceProvider getBeatmapResourceProvider()
             // todo : use better way to get the resource provider.
             var prop = typeof(BeatmapManager).GetField("workingBeatmapCache", BindingFlags.Instance | BindingFlags.NonPublic);
             if (prop == null)
-                throw new NullReferenceException();
+                throw new ArgumentNullException();
 
             return prop.GetValue(beatmapManager) as WorkingBeatmapCache;
         }

diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Page.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/Page.cs
@@ -27,7 +27,7 @@ public Page DeepClone()
         };
     }
 
-    public int CompareTo(Page other) => Time.CompareTo(other.Time);
+    public int CompareTo(Page? other) => Time.CompareTo(other?.Time);
 
     public override int GetHashCode() => Time.GetHashCode();
 }
diff --git a/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/PageInfo.cs b/osu.Game.Rulesets.Karaoke/Beatmaps/Metadatas/PageInfo.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using Newtonsoft.Json;
 using osu.Framework.Bindables;
@@ -30,12 +31,16 @@ public PageInfo()
             switch (args.Action)
             {
                 case NotifyCollectionChangedAction.Add:
+                    Debug.Assert(args.NewItems != null);
+
                     foreach (var c in args.NewItems.Cast<Page>())
                         c.TimeBindable.ValueChanged += timeValueChanged;
                     break;
 
                 case NotifyCollectionChangedAction.Reset:
                 case NotifyCollectionChangedAction.Remove:
+                    Debug.Assert(args.OldItems != null);
+
                     foreach (var c in args.OldItems.Cast<Page>())
                         c.TimeBindable.ValueChanged -= timeValueChanged;
                     break;
@@ -85,7 +90,7 @@ void onPageChanged()
 
     public PageInfo DeepClone()
     {
-        var controlPointInfo = (PageInfo)Activator.CreateInstance(GetType());
+        var controlPointInfo = (PageInfo)Activator.CreateInstance(GetType())!;
 
         return controlPointInfo;
     }

diff --git a/osu.Game.Rulesets.Karaoke/Bindables/BindableCultureInfo.cs b/osu.Game.Rulesets.Karaoke/Bindables/BindableCultureInfo.cs
@@ -26,11 +26,11 @@ public override void Parse(object? input)
             switch (input)
             {
                 case string str:
-                    Value = new CultureInfo(str);
+                    Value = CultureInfoUtils.CreateLoadCultureInfoByCode(str);
                     break;
 
                 case int lcid:
-                    Value = new CultureInfo(lcid);
+                    Value = CultureInfoUtils.CreateLoadCultureInfoById(lcid);
                     break;
 
                 case CultureInfo cultureInfo:
@@ -46,6 +46,6 @@ public override void Parse(object? input)
         protected override Bindable<CultureInfo?> CreateInstance() => new BindableCultureInfo();
 
         public override string ToString(string format, IFormatProvider formatProvider)
-            => CultureInfoUtils.GetLanguageDisplayText(Value);
+            => Value != null ? CultureInfoUtils.GetSaveCultureInfoCode(Value) : string.Empty;
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandler.cs b/osu.Game.Rulesets.Karaoke/Edit/ChangeHandlers/Lyrics/LyricTimeTagsChangeHandler.cs
@@ -149,7 +149,8 @@ public void RemoveByPosition(TextIndex index)
                     return;
 
                 var removedTimeTag = matchedTimeTags.OrderBy(x => x.Time).FirstOrDefault();
-                lyric.TimeTags.Remove(removedTimeTag);
+                if (removedTimeTag != null)
+                    lyric.TimeTags.Remove(removedTimeTag);
             });
         }
 

diff --git a/osu.Game.Rulesets.Karaoke/Extensions/TrickyCompositeDrawableExtension.cs b/osu.Game.Rulesets.Karaoke/Extensions/TrickyCompositeDrawableExtension.cs
@@ -24,7 +24,7 @@ public static class TrickyCompositeDrawableExtension
             if (prop == null)
                 return null;
 
-            return (IReadOnlyList<Drawable>)prop.GetValue(compositeDrawable);
+            return (IReadOnlyList<Drawable>)prop.GetValue(compositeDrawable)!;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/DictionaryConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/DictionaryConverter.cs
@@ -9,7 +9,7 @@
 
 namespace osu.Game.Rulesets.Karaoke.IO.Serialization.Converters
 {
-    public abstract class DictionaryConverter<TKey, TValue> : JsonConverter<IDictionary<TKey, TValue>>
+    public abstract class DictionaryConverter<TKey, TValue> : JsonConverter<IDictionary<TKey, TValue>> where TKey : notnull
     {
         public sealed override IDictionary<TKey, TValue> ReadJson(JsonReader reader, Type objectType, IDictionary<TKey, TValue>? existingValue, bool hasExistingValue, JsonSerializer serializer)
         {

diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/GenericTypeConvertor.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/GenericTypeConvertor.cs
@@ -24,7 +24,7 @@ public sealed override TType ReadJson(JsonReader reader, Type objectType, TType?
 
             var newReader = jObject.CreateReader();
 
-            var instance = (TType)Activator.CreateInstance(type);
+            var instance = (TType)Activator.CreateInstance(type)!;
             serializer.Populate(newReader, instance);
             PostProcessValue(instance, jObject, serializer);
             return instance;

diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinGroupConvertor.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinGroupConvertor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using osu.Game.Rulesets.Karaoke.Skinning.Groups;
 
@@ -13,7 +14,9 @@ protected override Type GetTypeByName(string name)
         {
             // only get name from font
             var assembly = Assembly.GetExecutingAssembly();
-            return assembly.GetType($"osu.Game.Rulesets.Karaoke.Skinning.Groups.{name}");
+            var type = assembly.GetType($"osu.Game.Rulesets.Karaoke.Skinning.Groups.{name}");
+            Debug.Assert(type != null);
+            return type;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinMappingRoleConvertor.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinMappingRoleConvertor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using osu.Game.Rulesets.Karaoke.Skinning.MappingRoles;
 
@@ -13,7 +14,9 @@ protected override Type GetTypeByName(string name)
         {
             // only get name from font
             var assembly = Assembly.GetExecutingAssembly();
-            return assembly.GetType($"osu.Game.Rulesets.Karaoke.Skinning.MappingRoles.{name}");
+            var type = assembly.GetType($"osu.Game.Rulesets.Karaoke.Skinning.MappingRoles.{name}");
+            Debug.Assert(type != null);
+            return type;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/LyricConvertor.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/LyricConvertor.cs
@@ -21,7 +21,7 @@ public override Lyric ReadJson(JsonReader reader, Type objectType, Lyric? existi
 
             var newReader = jObject.CreateReader();
 
-            var instance = (Lyric)Activator.CreateInstance(objectType);
+            var instance = (Lyric)Activator.CreateInstance(objectType)!;
             serializer.Populate(newReader, instance);
             return instance;
         }

diff --git a/...ame.Rulesets.Karaoke/IO/Serialization/Converters/ReferenceLyricPropertyConfigConvertor.cs b/...ame.Rulesets.Karaoke/IO/Serialization/Converters/ReferenceLyricPropertyConfigConvertor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using osu.Game.Rulesets.Karaoke.Objects.Properties;
 
@@ -12,7 +13,9 @@ public class ReferenceLyricPropertyConfigConvertor : GenericTypeConvertor<IRefer
         protected override Type GetTypeByName(string name)
         {
             var assembly = Assembly.GetExecutingAssembly();
-            return assembly.GetType($"osu.Game.Rulesets.Karaoke.Objects.Properties.{name}");
+            var type = assembly.GetType($"osu.Game.Rulesets.Karaoke.Objects.Properties.{name}");
+            Debug.Assert(type != null);
+            return type;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ShaderConvertor.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/ShaderConvertor.cs
@@ -36,7 +36,10 @@ protected override Type GetTypeByName(string name)
             // only get name from font
             var assembly = AssemblyUtils.GetAssemblyByName("osu.Framework.KaraokeFont");
             Debug.Assert(assembly != null);
-            return assembly.GetType($"osu.Framework.Graphics.Shaders.{name}");
+
+            var type = assembly.GetType($"osu.Framework.Graphics.Shaders.{name}");
+            Debug.Assert(type != null);
+            return type;
         }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/SingerConvertor.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/SingerConvertor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using System.Diagnostics;
 using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -47,6 +48,8 @@ protected override void PostProcessJObject(JObject jObject, ISinger value, JsonS
     protected override Type GetTypeByName(string name)
     {
         var assembly = Assembly.GetExecutingAssembly();
-        return assembly.GetType($"osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas.{name}");
+        var type = assembly.GetType($"osu.Game.Rulesets.Karaoke.Beatmaps.Metadatas.{name}");
+        Debug.Assert(type != null);
+        return type;
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs b/osu.Game.Rulesets.Karaoke/Objects/Lyric_Binding.cs
@@ -24,12 +24,16 @@ private void initInternalBindingEvent()
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null);
+
                         foreach (var c in args.NewItems.Cast<TimeTag>())
                             c.Changed += invalidate;
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null);
+
                         foreach (var c in args.OldItems.Cast<TimeTag>())
                             c.Changed -= invalidate;
                         break;
@@ -50,12 +54,16 @@ private void initInternalBindingEvent()
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null);
+
                         foreach (var c in args.NewItems.Cast<RubyTag>())
                             c.Changed += invalidate;
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null);
+
                         foreach (var c in args.OldItems.Cast<RubyTag>())
                             c.Changed -= invalidate;
                         break;
@@ -69,12 +77,16 @@ private void initInternalBindingEvent()
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null);
+
                         foreach (var c in args.NewItems.Cast<RomajiTag>())
                             c.Changed += invalidate;
                         break;
 
                     case NotifyCollectionChangedAction.Reset:
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null);
+
                         foreach (var c in args.OldItems.Cast<RomajiTag>())
                             c.Changed -= invalidate;
                         break;
@@ -281,7 +293,7 @@ private void bindListValueChange<T>(ValueChangedEvent<Lyric?> e, Func<Lyric, IBi
                     triggerPropertyChanged();
             }
 
-            void propertyChanged(object sender, NotifyCollectionChangedEventArgs _) => triggerPropertyChanged();
+            void propertyChanged(object? sender, NotifyCollectionChangedEventArgs _) => triggerPropertyChanged();
 
             void triggerPropertyChanged()
             {

diff --git a/osu.Game.Rulesets.Karaoke/Objects/Tone.cs b/osu.Game.Rulesets.Karaoke/Objects/Tone.cs
@@ -49,7 +49,7 @@ public int CompareTo(int other)
 
         public bool Equals(int other) => Scale == other && Half == false;
 
-        public override bool Equals(object obj)
+        public override bool Equals(object? obj)
         {
             return obj switch
             {

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSubsection.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/AutoGenerateSubsection.cs
@@ -132,7 +132,7 @@ private Popover createSelectionPopover()
                     Children = AvailableSettings.Select(x =>
                     {
                         string name = GetDisplayName(x);
-                        return new OsuButton
+                        return new AutoGenerateButton
                         {
                             Text = name,
                             Width = 150,
@@ -148,5 +148,9 @@ private Popover createSelectionPopover()
                     }).ToList()
                 }
             };
+
+        private partial class AutoGenerateButton : EditorSectionButton
+        {
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/BindableBlueprintContainer.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/BindableBlueprintContainer.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Linq;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -20,7 +21,7 @@ public abstract partial class BindableBlueprintContainer<T> : BlueprintContainer
         protected void RegisterBindable(BindableList<T> bindable)
         {
             if (bindableList != null)
-                throw new Exception();
+                throw new InvalidOperationException("Already have bindable.");
 
             bindableList = bindable;
 
@@ -30,12 +31,16 @@ protected void RegisterBindable(BindableList<T> bindable)
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null);
+
                         foreach (var obj in args.NewItems.OfType<T>())
                             AddBlueprintFor(obj);
 
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null);
+
                         foreach (var obj in args.OldItems.OfType<T>())
                             RemoveBlueprintFor(obj);
 

diff --git a/...me.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditor.cs b/...me.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/Compose/BottomEditor/Notes/NoteEditor.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using osu.Framework.Allocation;
@@ -83,12 +84,16 @@ public NoteEditor()
                 switch (args.Action)
                 {
                     case NotifyCollectionChangedAction.Add:
+                        Debug.Assert(args.NewItems != null);
+
                         foreach (var obj in args.NewItems.OfType<Note>())
                             Playfield.Add(obj);
 
                         break;
 
                     case NotifyCollectionChangedAction.Remove:
+                        Debug.Assert(args.OldItems != null);
+
                         foreach (var obj in args.OldItems.OfType<Note>())
                             Playfield.Remove(obj);
 

diff --git a/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs b/osu.Game.Rulesets.Karaoke/Screens/Edit/Beatmaps/Lyrics/LyricEditor.cs
@@ -184,7 +184,7 @@ private void initialSubModeChanged<TSubMode>() where TSubMode : Enum
         {
             var editModeState = getEditModeState<TSubMode>();
             if (editModeState == null)
-                throw new NullReferenceException("Unknows sub mode.");
+                throw new ArgumentNullException();
 
             editModeState.BindableEditMode.BindValueChanged(e =>
             {
@@ -448,7 +448,7 @@ public void SwitchSubMode<TSubMode>(TSubMode subMode) where TSubMode : Enum
         {
             var editModeState = getEditModeState<TSubMode>();
             if (editModeState == null)
-                throw new NullReferenceException("Unknows sub mode.");
+                throw new ArgumentNullException();
 
             editModeState.ChangeEditMode(subMode);
         }