Merge pull request #158 from LumpBloom7/Update-osu

Update osu and fix things that broke
karaoke-dev · Sep 4, 2020 · 2f8769a · 2f8769a
2 parents f50bae7 + bd42c00
commit 2f8769a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogHeader.cs b/osu.Game.Rulesets.Karaoke/Overlays/Changelog/ChangelogHeader.cs
@@ -53,7 +53,7 @@ private class ChangelogHeaderTitle : OverlayTitle
             public ChangelogHeaderTitle()
             {
                 Title = "changelog";
-                IconTexture = "Icons/changelog";
+                IconTexture = "Icons/Hexacons/devtools";
             }
         }
     }

diff --git a/osu.Game.Rulesets.Karaoke/Overlays/KaraokeChangelogOverlay.cs b/osu.Game.Rulesets.Karaoke/Overlays/KaraokeChangelogOverlay.cs
@@ -24,12 +24,10 @@
 
 namespace osu.Game.Rulesets.Karaoke.Overlays
 {
-    public class KaraokeChangelogOverlay : FullscreenOverlay
+    public class KaraokeChangelogOverlay : FullscreenOverlay<ChangelogHeader>
     {
         public readonly Bindable<KaraokeChangelogBuild> Current = new Bindable<KaraokeChangelogBuild>();
 
-        protected ChangelogHeader Header;
-
         private Container<ChangelogContent> content;
 
         private SampleChannel sampleBack;
@@ -42,7 +40,7 @@ public class KaraokeChangelogOverlay : FullscreenOverlay
         private string projectName => $"{organizationName}.github.io";
 
         public KaraokeChangelogOverlay(string organization, string branch = "master")
-            : base(OverlayColourScheme.Purple)
+            : base(OverlayColourScheme.Purple, new ChangelogHeader())
         {
             organizationName = organization;
             branchName = branch;
@@ -69,10 +67,10 @@ private void load(AudioManager audio)
                         Direction = FillDirection.Vertical,
                         Children = new Drawable[]
                         {
-                            Header = new ChangelogHeader
+                            Header.With(h =>
                             {
-                                ListingSelected = ShowListing,
-                            },
+                                h.ListingSelected = ShowListing;
+                            }),
                             content = new Container<ChangelogContent>
                             {
                                 RelativeSizeAxes = Axes.X,

diff --git a/osu.Game.Rulesets.Karaoke/UI/LyricPlayfield.cs b/osu.Game.Rulesets.Karaoke/UI/LyricPlayfield.cs
@@ -29,7 +29,7 @@ public class LyricPlayfield : Playfield
 
         public new IEnumerable<DrawableLyricLine> AllHitObjects => base.AllHitObjects.OfType<DrawableLyricLine>();
 
-        protected IWorkingBeatmap WorkingBeatmap => beatmap.Value;
+        protected WorkingBeatmap WorkingBeatmap => beatmap.Value;
 
         private readonly BindableBool translate = new BindableBool();
         private readonly Bindable<string> translateLanguage = new Bindable<string>();

diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
     <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="osu.Framework.Microphone" Version="1.0.10" />
-    <PackageReference Include="ppy.osu.Game" Version="2020.801.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2020.903.0" />
     <PackageReference Include="LyricMaker" Version="1.1.1" />
     <PackageReference Include="NicoKaraParser" Version="1.1.0" />
     <PackageReference Include="osu.KaraokeFramework" Version="1.2.1" />