Merge pull request #147 from andy840119/update-package

Update ppy.game
karaoke-dev · Jul 26, 2020 · 8fe4077 · 8fe4077
2 parents 1cd3fce + b7bf0ea
commit 8fe4077
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 16 deletions.
diff --git a/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj b/osu.Game.Rulesets.Karaoke.Tests/osu.Game.Rulesets.Karaoke.Tests.csproj
@@ -14,9 +14,9 @@
   </PropertyGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Update="Microsoft.EntityFrameworkCore.Sqlite" Version="2.1.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs b/osu.Game.Rulesets.Karaoke/Replays/KaraokeFramedReplayInputHandler.cs
@@ -17,10 +17,9 @@ public KaraokeFramedReplayInputHandler(Replay replay)
 
         protected override bool IsImportant(KaraokeReplayFrame frame) => frame.Sound;
 
-        public override List<IInput> GetPendingInputs() => new List<IInput>
+        public override void CollectPendingInputs(List<IInput> inputs)
         {
-            new ReplayState<KaraokeSaitenAction>
-            {
+            inputs.Add(new ReplayState<KaraokeSaitenAction> {
                 PressedActions = CurrentFrame?.Sound ?? false
                     ? new List<KaraokeSaitenAction>
                     {
@@ -30,7 +29,7 @@ public KaraokeFramedReplayInputHandler(Replay replay)
                         }
                     }
                     : new List<KaraokeSaitenAction>()
-            }
-        };
+            });
+        }
     }
 }
diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeInternalSkin.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeInternalSkin.cs
@@ -7,6 +7,7 @@
 using osu.Framework.Audio.Sample;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
+using osu.Framework.Graphics.OpenGL.Textures;
 using osu.Framework.Graphics.Textures;
 using osu.Game.Audio;
 using osu.Game.IO;
@@ -45,7 +46,7 @@ public KaraokeInternalSkin()
 
         public SampleChannel GetSample(ISampleInfo sampleInfo) => null;
 
-        public Texture GetTexture(string componentName) => null;
+        public Texture GetTexture(string componentName, WrapMode wrapModeS, WrapMode wrapModeT) => null;
 
         public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {

diff --git a/osu.Game.Rulesets.Karaoke/Skinning/KaraokeLegacySkinTransformer.cs b/osu.Game.Rulesets.Karaoke/Skinning/KaraokeLegacySkinTransformer.cs
@@ -17,7 +17,7 @@
 
 namespace osu.Game.Rulesets.Karaoke.Skinning
 {
-    public class KaraokeLegacySkinTransformer : ISkin
+    public class KaraokeLegacySkinTransformer : LegacySkinTransformer
     {
         private readonly ISkin source;
 
@@ -34,6 +34,7 @@ public class KaraokeLegacySkinTransformer : ISkin
         private Lazy<bool> isLegacySkin;
 
         public KaraokeLegacySkinTransformer(ISkinSource source)
+            : base(source)
         {
             this.source = source;
 
@@ -73,7 +74,7 @@ private void sourceChanged()
             isLegacySkin = new Lazy<bool>(() => source?.GetConfig<LegacySkinConfiguration.LegacySetting, decimal>(LegacySkinConfiguration.LegacySetting.Version) != null);
         }
 
-        public Drawable GetDrawableComponent(ISkinComponent component)
+        public override Drawable GetDrawableComponent(ISkinComponent component)
         {
             if (!(component is KaraokeSkinComponent karaokeComponent))
                 return null;
@@ -126,11 +127,7 @@ private bool textureExist(params string[] textureNames)
         private bool animationExist(params string[] textureNames)
             => textureNames.All(x => source.GetAnimation(x, true, false) != null);
 
-        public Texture GetTexture(string componentName) => source.GetTexture(componentName);
-
-        public SampleChannel GetSample(ISampleInfo sample) => source.GetSample(sample);
-
-        public IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
+        public override IBindable<TValue> GetConfig<TLookup, TValue>(TLookup lookup)
         {
             switch (lookup)
             {

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="1.0.10" />
-    <PackageReference Include="ppy.osu.Game" Version="2020.710.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2020.725.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="osu.KaraokeFramework" Version="1.2.1" />