Merge pull request #1964 from andy840119/remove-group-from-the-skin

Remove group from the skin.
karaoke-dev · Apr 29, 2023 · 99e576a · 99e576a
2 parents 70c6120 + c42b9c3
commit 99e576a
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 395 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/KaraokeSkinGroupConverterTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/Converters/KaraokeSkinGroupConverterTest.cs
diff --git a/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/SkinJsonSerializableExtensionsTest.cs b/osu.Game.Rulesets.Karaoke.Tests/IO/Serialization/SkinJsonSerializableExtensionsTest.cs
@@ -6,7 +6,7 @@
 
 namespace osu.Game.Rulesets.Karaoke.Tests.IO.Serialization;
 
-[Ignore($"Test case already in the {nameof(KaraokeSkinElementConverterTest)} and {nameof(KaraokeSkinGroupConverterTest)}")]
+[Ignore($"Test case already in the {nameof(KaraokeSkinElementConverterTest)}")]
 public class SkinJsonSerializableExtensionsTest
 {
 }
diff --git a/osu.Game.Rulesets.Karaoke.Tests/Resources/special-skin/groups.json b/osu.Game.Rulesets.Karaoke.Tests/Resources/special-skin/groups.json
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinGroupConverter.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/Converters/KaraokeSkinGroupConverter.cs
diff --git a/osu.Game.Rulesets.Karaoke/IO/Serialization/SkinJsonSerializableExtensions.cs b/osu.Game.Rulesets.Karaoke/IO/Serialization/SkinJsonSerializableExtensions.cs
@@ -21,13 +21,5 @@ public static JsonSerializerSettings CreateSkinElementGlobalSettings()
             globalSetting.Converters.Add(new FontUsageConverter());
             return globalSetting;
         }
-
-        public static JsonSerializerSettings CreateSkinGroupGlobalSettings()
-        {
-            var globalSetting = JsonSerializableExtensions.CreateGlobalSettings();
-            globalSetting.ContractResolver = new SnakeCaseKeyContractResolver();
-            globalSetting.Converters.Add(new KaraokeSkinGroupConverter());
-            return globalSetting;
-        }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Resources/Skin/Default/groups.json b/osu.Game.Rulesets.Karaoke/Resources/Skin/Default/groups.json
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Groups/BaseGroup.cs b/osu.Game.Rulesets.Karaoke/Skinning/Groups/BaseGroup.cs
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Groups/GroupByLyricIds.cs b/osu.Game.Rulesets.Karaoke/Skinning/Groups/GroupByLyricIds.cs
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Groups/GroupBySingerIds.cs b/osu.Game.Rulesets.Karaoke/Skinning/Groups/GroupBySingerIds.cs
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Groups/GroupBySingerNumber.cs b/osu.Game.Rulesets.Karaoke/Skinning/Groups/GroupBySingerNumber.cs
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/Groups/IGroup.cs b/osu.Game.Rulesets.Karaoke/Skinning/Groups/IGroup.cs