Merge branch 'master' into dependabot/nuget/Microsoft.NET.Test.Sdk-17…

….9.0
taulazer · Mar 10, 2024 · 3a74349 · 3a74349
2 parents c939882 + 93cb2bb
commit 3a74349
Show file tree

Hide file tree

Showing 20 changed files with 52 additions and 92 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2023.3.2",
+      "version": "2023.3.3",
       "commands": [
         "jb"
       ]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,11 @@ jobs:
         with:
           dotnet-version: "6.0.x"
 
+      - name: Install .NET 8.0.x
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: "8.0.x"
+
       - name: Restore Tools
         run: dotnet tool restore
 
@@ -46,7 +51,7 @@ jobs:
         uses: actions/[email protected]
         with:
           name: osu.Game.Rulesets.Tau.dll
-          path: "osu.Game.Rulesets.Tau/bin/Debug/net6.0"
+          path: "osu.Game.Rulesets.Tau/bin/Debug/net8.0"
           retention-days: 90
 
   test:
@@ -67,10 +72,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install .NET 6.0.x
+      - name: Install .NET 8.0.x
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "8.0.x"
 
       # FIXME: libavformat is not included in Ubuntu. Let's fix that.
       # https://github.com/ppy/osu-framework/issues/4349

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -56,6 +56,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./osu.Game.Rulesets.Tau/bin/Release/net6.0/osu.Game.Rulesets.Tau.dll
+        asset_path: ./osu.Game.Rulesets.Tau/bin/Release/net8.0/osu.Game.Rulesets.Tau.dll
         asset_name: osu.Game.Rulesets.Tau.dll
         asset_content_type: application/vnd.microsoft.portable-executable
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -7,23 +7,11 @@
             "request": "launch",
             "program": "dotnet",
             "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Tau.Tests/bin/Debug/net6.0/osu.Game.Rulesets.Tau.Tests.dll"
+                "${workspaceRoot}/osu.Game.Rulesets.Tau.Tests/bin/Debug/net8.0/osu.Game.Rulesets.Tau.Tests.dll"
             ],
             "cwd": "${workspaceRoot}",
             "preLaunchTask": "Build tests (Debug)",
             "console": "internalConsole"
-        },
-        {
-            "name": "Tau for osu! (Tests, Release)",
-            "type": "coreclr",
-            "request": "launch",
-            "program": "dotnet",
-            "args": [
-                "${workspaceRoot}/osu.Game.Rulesets.Tau.Tests/bin/Release/net6.0/osu.Game.Rulesets.Tau.Tests.dll"
-            ],
-            "cwd": "${workspaceRoot}",
-            "preLaunchTask": "Build tests (Release)",
-            "console": "internalConsole"
-        },
+        }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -16,22 +16,6 @@
             "group": "build",
             "problemMatcher": "$msCompile"
         },
-        {
-            "label": "Build tests (Release)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "build",
-                "--no-restore",
-                "osu.Game.Rulesets.Tau.Tests",
-                "/p:Configuration=Release",
-                "/p:GenerateFullPaths=true",
-                "/m",
-                "/verbosity:m"
-            ],
-            "group": "build",
-            "problemMatcher": "$msCompile"
-        },
         // Test Tasks
         {
             "label": "Run tests (Debug)",
@@ -44,16 +28,5 @@
             "group": "test",
             "problemMatcher": "$msCompile"
         },
-        {
-            "label": "Run tests (Release)",
-            "type": "shell",
-            "command": "dotnet",
-            "args": [
-                "test",
-                "/p:Configuration=Release",
-            ],
-            "group": "test",
-            "problemMatcher": "$msCompile"
-        }
     ]
-}
+}
diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneBeat.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneBeat.cs
@@ -71,10 +71,10 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
                 if (auto && !userTriggered && timeOffset > 0)
                     // Force success.
-                    ApplyResult(r => r.Type = HitResult.Great);
+                    ApplyResult(HitResult.Great);
                 else if (timeOffset > 0)
                     // We'll have to manually apply the result anyways because we have no way of checking if the paddle is in the correct spot.
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(HitResult.Miss);
             }
         }
     }

diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneHardBeat.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneHardBeat.cs
@@ -57,7 +57,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 if (auto && !userTriggered && timeOffset > 0)
                 {
                     // force success
-                    ApplyResult(r => r.Type = HitResult.Great);
+                    ApplyResult(HitResult.Great);
                 }
                 else
                     base.CheckForResult(userTriggered, timeOffset);

diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneSlider.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneSlider.cs
@@ -87,7 +87,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 if (auto && !userTriggered && timeOffset > 0)
                 {
                     // force success
-                    ApplyResult(r => r.Type = HitResult.Great);
+                    ApplyResult(HitResult.Great);
                 }
                 else
                     base.CheckForResult(userTriggered, timeOffset);

diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneSliderHardBeat.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneSliderHardBeat.cs
@@ -84,7 +84,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 if (auto && !userTriggered && timeOffset > 0)
                 {
                     // force success
-                    ApplyResult(r => r.Type = HitResult.Great);
+                    ApplyResult(HitResult.Great);
                 }
                 else
                     base.CheckForResult(userTriggered, timeOffset);

diff --git a/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneStrictHardBeat.cs b/osu.Game.Rulesets.Tau.Tests/Objects/TestSceneStrictHardBeat.cs
@@ -71,10 +71,10 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             {
                 if (auto && !userTriggered && timeOffset > 0)
                     // Force success.
-                    ApplyResult(r => r.Type = HitResult.Great);
+                    ApplyResult(HitResult.Great);
                 else if (timeOffset > 0)
                     // We'll have to manually apply the result anyways because we have no way of checking if the paddle is in the correct spot.
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(HitResult.Miss);
             }
         }
     }

diff --git a/osu.Game.Rulesets.Tau.Tests/osu.Game.Rulesets.Tau.Tests.csproj b/osu.Game.Rulesets.Tau.Tests/osu.Game.Rulesets.Tau.Tests.csproj
@@ -13,15 +13,15 @@
     <ItemGroup Label="Package References">
         <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-        <PackageReference Include="NUnit" Version="4.0.1" />
+        <PackageReference Include="NUnit" Version="4.1.0" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\osu.Game.Rulesets.Tau\osu.Game.Rulesets.Tau.csproj" />
     </ItemGroup>
     <PropertyGroup Label="Project">
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <RootNamespace>osu.Game.Rulesets.Tau.Tests</RootNamespace>
     </PropertyGroup>
     <ItemGroup>

diff --git a/osu.Game.Rulesets.Tau/Mods/TauModLenience.cs b/osu.Game.Rulesets.Tau/Mods/TauModLenience.cs
@@ -79,7 +79,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                 if (!userTriggered)
                 {
                     if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                        ApplyResult(r => r.Type = HitResult.Miss);
+                        ApplyResult(HitResult.Miss);
 
                     return;
                 }
@@ -98,11 +98,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
                         result = HitResult.Ok;
                 }
 
-                ApplyResult(r =>
-                {
-                    r.Type = result;
-                    ApplyCustomResult(r);
-                });
+                ApplyResult(result);
             }
 
             public override bool OnPressed(KeyBindingPressEvent<TauAction> e)

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableAngledTauHitObject.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableAngledTauHitObject.cs
@@ -52,12 +52,12 @@ protected override JudgementResult CreateResult(Judgement judgement)
 
         public virtual bool IsWithinPaddle() => CheckValidation != null && CheckValidation((HitObject.Angle + GetCurrentOffset()).Normalize()).IsValid;
 
-        protected override void ApplyCustomResult(JudgementResult result)
+        public override void ApplyCustomResult(JudgementResult result)
         {
             if (CheckValidation == null)
                 return;
 
-            var delta = CheckValidation((HitObject.Angle + GetCurrentOffset()).Normalize()).DeltaFromPaddleCenter;
+            float delta = CheckValidation((HitObject.Angle + GetCurrentOffset()).Normalize()).DeltaFromPaddleCenter;
             var beatResult = (TauJudgementResult)result;
 
             if (result.IsHit)

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.Calculations.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.Calculations.cs
@@ -34,7 +34,7 @@ float distanceAt(double t) => inversed
             void addVertex(double t, double angle)
             {
                 var p = Extensions.FromPolarCoordinates(distanceAt(t), (float)angle);
-                int index = (int)(t / trackingCheckpointInterval);
+                int index = (int)(t / tracking_checkpoint_interval);
 
                 path.AddVertex(new Vector3(p.X, p.Y, trackingCheckpoints.ValueAtOrLastOr(index, true) ? 1 : 0));
             }

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSlider.cs
@@ -201,7 +201,7 @@ private void updateSlidingSample(ValueChangedEvent<bool> tracking)
         }
 
         public BindableBool Tracking = new();
-        private const double trackingCheckpointInterval = 5;
+        private const double tracking_checkpoint_interval = 5;
         private readonly List<bool> trackingCheckpoints = new();
 
         protected override void Update()
@@ -225,7 +225,7 @@ protected override void Update()
                 totalTimeHeld += Time.Elapsed;
             }
 
-            var trackingCheckpointIndex = (int)((Time.Current - HitObject.StartTime) / trackingCheckpointInterval);
+            int trackingCheckpointIndex = (int)((Time.Current - HitObject.StartTime) / tracking_checkpoint_interval);
 
             if (trackingCheckpointIndex >= 0)
             {
@@ -262,14 +262,10 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             foreach (var nested in NestedHitObjects.Where(n => !n.AllJudged))
             {
                 if (nested is ICanApplyResult res)
-                    res.ForcefullyApplyResult(r => r.Type = result);
+                    res.ForcefullyApplyResult(result);
             }
 
-            ApplyResult(r =>
-            {
-                r.Type = result;
-                ApplyCustomResult(r);
-            });
+            ApplyResult(result);
         }
 
         protected override JudgementResult CreateResult(Judgement judgement)

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSliderRepeat.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSliderRepeat.cs
@@ -94,7 +94,7 @@ protected override void UpdateAfterChildren()
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (HitObject.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = DrawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
+                ApplyResult(DrawableSlider.Tracking.Value ? HitResult.Great : HitResult.Miss);
         }
 
         protected override void OnApply()
@@ -117,8 +117,8 @@ protected override void UpdateInitialTransforms()
 
         protected override void UpdateHitStateTransforms(ArmedState state)
         {
-            var velocity = -0.5f / (float)HitObject.TimePreempt;
-            var timeFadeHit = DrawableSlider.FADE_RANGE / Math.Abs(velocity);
+            float velocity = -0.5f / (float)HitObject.TimePreempt;
+            float timeFadeHit = DrawableSlider.FADE_RANGE / Math.Abs(velocity);
 
             if (Properties?.InverseModEnabled.Value == true)
                 velocity *= -1;

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSliderTick.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableSliderTick.cs
@@ -21,7 +21,7 @@ public DrawableSliderTick(SliderTick hitObject)
         protected override void CheckForResult(bool userTriggered, double timeOffset)
         {
             if (HitObject.StartTime <= Time.Current)
-                ApplyResult(r => r.Type = DrawableSlider.Tracking.Value ? HitResult.SmallTickHit : HitResult.SmallTickMiss);
+                ApplyResult(DrawableSlider.Tracking.Value ? HitResult.SmallTickHit : HitResult.SmallTickMiss);
         }
     }
 }
diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableTauHitObject.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/DrawableTauHitObject.cs
@@ -48,7 +48,7 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             if (!userTriggered)
             {
                 if (!HitObject.HitWindows.CanBeHit(timeOffset))
-                    ApplyResult(r => r.Type = HitResult.Miss);
+                    ApplyResult(HitResult.Miss);
 
                 return;
             }
@@ -61,19 +61,22 @@ protected override void CheckForResult(bool userTriggered, double timeOffset)
             if (result == HitResult.None)
                 return;
 
-            ApplyResult(r =>
-            {
-                r.Type = result;
-                ApplyCustomResult(r);
-            });
+            ApplyResult(result);
         }
 
         /// <summary>
         /// Should return whether or not a <see cref="DrawableHitObject"/> has the correct set of parameters for it to be hit.
         /// </summary>
         protected virtual bool CheckForValidation() => true;
 
-        protected virtual void ApplyCustomResult(JudgementResult result) { }
+        protected new void ApplyResult(HitResult result)
+        {
+            ApplyCustomResult(Result);
+
+            base.ApplyResult(result);
+        }
+
+        public virtual void ApplyCustomResult(JudgementResult result) { }
 
         public virtual bool OnPressed(KeyBindingPressEvent<TauAction> e)
         {
@@ -87,8 +90,8 @@ public virtual void OnReleased(KeyBindingReleaseEvent<TauAction> e)
         {
         }
 
-        public void ForcefullyApplyResult(Action<JudgementResult> application)
-            => ApplyResult(application);
+        public void ForcefullyApplyResult(HitResult result)
+            => ApplyResult(result);
     }
 
     public struct ValidationResult

diff --git a/osu.Game.Rulesets.Tau/Objects/Drawables/ICanApplyResult.cs b/osu.Game.Rulesets.Tau/Objects/Drawables/ICanApplyResult.cs
@@ -1,6 +1,5 @@
-using System;
-using osu.Game.Rulesets.Judgements;
-using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Objects.Drawables;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Rulesets.Tau.Objects.Drawables
 {
@@ -10,6 +9,6 @@ public interface ICanApplyResult
         /// Forces a result to the <see cref="DrawableHitObject{TObject}"/>.
         /// </summary>
         /// <param name="application">The adjustment to be made to the result.</param>
-        public void ForcefullyApplyResult(Action<JudgementResult> application);
+        public void ForcefullyApplyResult(HitResult result);
     }
 }
diff --git a/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.csproj b/osu.Game.Rulesets.Tau/osu.Game.Rulesets.Tau.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.Tau</AssemblyTitle>
     <OutputType>Library</OutputType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,7 +35,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game" Version="2024.130.2" />
+    <PackageReference Include="ppy.osu.Game" Version="2024.302.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Objects\Drawables\DrawableSlider.Calculations.cs">