Merge pull request #566 from LumpBloom7/dependabot/nuget/ppy.osu.Game…

…-2024.312.0 Bump ppy.osu.Game from 2024.302.0 to 2024.312.0
LumpBloom7 · Mar 11, 2024 · 1d06b48 · 1d06b48
2 parents 1e80c58 + 6ac7a48
commit 1d06b48
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldCentrePiece.cs
@@ -44,7 +44,7 @@ public TouchHoldCentrePiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = 1 },
+                            Progress = 1,
                             Colour = colours.Blue
                         },
                         new CircularProgress
@@ -54,7 +54,7 @@ public TouchHoldCentrePiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = .75 },
+                            Progress = 0.75 ,
                             Colour = colours.Green
                         },
                         new CircularProgress
@@ -64,7 +64,7 @@ public TouchHoldCentrePiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = .5 },
+                            Progress = 0.5 ,
                             Colour = colours.Yellow,
                         },
                         new CircularProgress
@@ -74,7 +74,7 @@ public TouchHoldCentrePiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = .25 },
+                            Progress = 0.25 ,
                             Colour = colours.Red,
                         },
                     }

diff --git a/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs b/osu.Game.Rulesets.Sentakki/Objects/Drawables/Pieces/TouchHolds/TouchHoldProgressPiece.cs
@@ -48,7 +48,7 @@ public TouchHoldProgressPiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = 0 },
+                            Progress = 0,
                             Colour = colours.Blue
                         },
                         greenProgress = new CircularProgress
@@ -58,7 +58,7 @@ public TouchHoldProgressPiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = 0 },
+                            Progress = 0,
                             Colour = colours.Green
                         },
                         yellowProgress = new CircularProgress
@@ -68,7 +68,7 @@ public TouchHoldProgressPiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = 0 },
+                            Progress = 0,
                             Colour = colours.Yellow,
                         },
                         redProgress = new CircularProgress
@@ -78,7 +78,7 @@ public TouchHoldProgressPiece()
                             InnerRadius = 1,
                             Size = Vector2.One,
                             RelativeSizeAxes = Axes.Both,
-                            Current = { Value = 0 },
+                            Progress = 0,
                             Colour = colours.Red,
                         },
                     }
@@ -87,10 +87,10 @@ public TouchHoldProgressPiece()
 
             ProgressBindable.BindValueChanged(p =>
             {
-                redProgress.Current.Value = Math.Min(p.NewValue, .25);
-                yellowProgress.Current.Value = Math.Min(p.NewValue, .50);
-                greenProgress.Current.Value = Math.Min(p.NewValue, .75);
-                blueProgress.Current.Value = p.NewValue;
+                redProgress.Progress = Math.Min(p.NewValue, .25);
+                yellowProgress.Progress = Math.Min(p.NewValue, .50);
+                greenProgress.Progress = Math.Min(p.NewValue, .75);
+                blueProgress.Progress = p.NewValue;
             });
         }
     }

diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/DrawableLine.cs b/osu.Game.Rulesets.Sentakki/UI/Components/HitObjectLine/DrawableLine.cs
@@ -50,7 +50,7 @@ protected override void PrepareForUse()
 
             Colour = Entry.Colour;
             Rotation = Entry.Rotation;
-            line.Current.Value = Entry.AngleRange;
+            line.Progress = Entry.AngleRange;
             resetAnimation();
         }
 

diff --git a/osu.Game.Rulesets.Sentakki/UI/Components/PlayfieldVisualization.cs b/osu.Game.Rulesets.Sentakki/UI/Components/PlayfieldVisualization.cs
@@ -225,13 +225,13 @@ protected override void Draw(IRenderer renderer)
                             if (audioData[i] < amplitude_dead_zone)
                                 continue;
 
-                            float rotation = MathUtils.DegreesToRadians((i / (float)bars_per_visualiser * 360) + (j * 360 / visualiser_rounds));
+                            float rotation = float.DegreesToRadians((i / (float)bars_per_visualiser * 360) + (j * 360 / visualiser_rounds));
                             float rotationCos = MathF.Cos(rotation);
                             float rotationSin = MathF.Sin(rotation);
                             // taking the cos and sin to the 0..1 range
                             var barPosition = new Vector2((rotationCos / 2) + 0.5f, (rotationSin / 2) + 0.5f) * size;
 
-                            var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(MathUtils.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
+                            var barSize = new Vector2(size * MathF.Sqrt(2 * (1 - MathF.Cos(float.DegreesToRadians(360f / bars_per_visualiser)))) / 2f, bar_length * audioData[i]);
                             // The distance between the position and the sides of the bar.
                             var bottomOffset = new Vector2(-rotationSin * barSize.X / 2, rotationCos * barSize.X / 2);
                             // The distance between the bottom side of the bar and the top side.

diff --git a/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj b/osu.Game.Rulesets.Sentakki/osu.Game.Rulesets.Sentakki.csproj
@@ -9,7 +9,7 @@
         <AssemblyName>osu.Game.Rulesets.Sentakki</AssemblyName>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="ppy.osu.Game" Version="2024.302.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2024.312.0"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->