Merge pull request #147 from Artemis-chan/osu-bump

Update to osu!
Artemis-chan · Feb 20, 2024 · d2624c9 · d2624c9
2 parents d6aa9a1 + eb1ff95
commit d2624c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.Diva.Tests/osu.Game.Rulesets.Diva.Tests.csproj b/osu.Game.Rulesets.Diva.Tests/osu.Game.Rulesets.Diva.Tests.csproj
@@ -20,7 +20,7 @@
     </ItemGroup>
     <PropertyGroup Label="Project">
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>osu.Game.Rulesets.Diva.Tests</RootNamespace>
     </PropertyGroup>
 </Project>
diff --git a/osu.Game.Rulesets.Diva/Objects/Drawables/DrawableDivaHitObject.cs b/osu.Game.Rulesets.Diva/Objects/Drawables/DrawableDivaHitObject.cs
@@ -20,6 +20,7 @@
 using osu.Game.Rulesets.Diva.Judgements;
 using osu.Game.Rulesets.Judgements;
 using osu.Framework.Input.Events;
+using osu.Game.Rulesets.Objects;
 
 namespace osu.Game.Rulesets.Diva.Objects.Drawables
 {
@@ -129,6 +130,8 @@ public override void PlaySamples()
         {
         }
 
+        protected static void ApplyMiss(JudgementResult r, DrawableHitObject s) => r.Type = HitResult.Miss;
+
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (Judged)
@@ -139,7 +142,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
 
             if (!HitObject.HitWindows.CanBeHit(timeOffset) && base.Time.Current > HitObject.StartTime)
             {
-                ApplyResult(r => r.Type = HitResult.Miss);
+                ApplyResult(ApplyMiss);
                 return;
             }
 
@@ -150,9 +153,9 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             if (pressed && timeOffset > (-time_action))
             {
                 if (validPress)
-                    ApplyResult(r => r.Type = result);
+                    ApplyResult((r, s) => r.Type = result);
                 else
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(ApplyMiss);
                 pressed = false;
             }
         }

diff --git a/osu.Game.Rulesets.Diva/osu.Game.Rulesets.Diva.csproj b/osu.Game.Rulesets.Diva/osu.Game.Rulesets.Diva.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyTitle>osu.Game.Rulesets.Sample</AssemblyTitle>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -13,7 +13,7 @@
     <Folder Include="Resources\Textures" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.131.0" />
-    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.131.0" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.219.0" />
+    <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2024.219.0" />
   </ItemGroup>
 </Project>