Merge branch 'master' into editor-2

LumpBloom7 · Jan 21, 2025 · 42a4bb0 · 42a4bb0
2 parents b3b2e00 + 0447f48
commit 42a4bb0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.Sentakki/Edit/SentakkiHitObjectComposer.cs b/osu.Game.Rulesets.Sentakki/Edit/SentakkiHitObjectComposer.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
+using osu.Framework.Graphics;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Rulesets.Edit.Tools;
 using osu.Game.Rulesets.Objects;
@@ -40,7 +41,7 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
             new SlideCompositionTool(),
         ];
 
-        protected override IEnumerable<TernaryButton> CreateTernaryButtons()
+        protected override IEnumerable<Drawable> CreateTernaryButtons()
             => base.CreateTernaryButtons()
                     .Skip(1)
                     .Concat(snapProvider.CreateTernaryButtons());

diff --git a/osu.Game.Rulesets.Sentakki/Edit/SentakkiLanedSnapGrid.cs b/osu.Game.Rulesets.Sentakki/Edit/SentakkiLanedSnapGrid.cs
@@ -46,7 +46,12 @@ public partial class SentakkiSnapGrid : CompositeDrawable
     [Resolved]
     private OsuColour colours { get; set; } = null!;
 
-    public TernaryButton CreateTernaryButton() => new TernaryButton(enabled, "Lane beat snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler });
+    public DrawableTernaryButton CreateTernaryButton() => new DrawableTernaryButton
+    {
+        Current = enabled,
+        Description = "Lane beat snap",
+        CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.Ruler }
+    };
 
     [BackgroundDependencyLoader]
     private void load(SentakkiRulesetConfigManager configManager)

diff --git a/osu.Game.Rulesets.Sentakki/Edit/SentakkiSnapProvider.cs b/osu.Game.Rulesets.Sentakki/Edit/SentakkiSnapProvider.cs
@@ -21,7 +21,7 @@ public enum SnapMode
     private SentakkiSnapGrid lanedSnapGrid = null!;
     private SentakkiTouchSnapGrid touchSnapGrid = null!;
 
-    public IEnumerable<TernaryButton> CreateTernaryButtons()
+    public IEnumerable<DrawableTernaryButton> CreateTernaryButtons()
     {
         yield return lanedSnapGrid.CreateTernaryButton();
         yield return touchSnapGrid.CreateTernaryButton();

diff --git a/osu.Game.Rulesets.Sentakki/Edit/SentakkiTouchSnapGrid.cs b/osu.Game.Rulesets.Sentakki/Edit/SentakkiTouchSnapGrid.cs
@@ -17,7 +17,12 @@ public partial class SentakkiTouchSnapGrid : CompositeDrawable
 {
     private Bindable<TernaryState> enabled = new Bindable<TernaryState>(TernaryState.True);
 
-    public TernaryButton CreateTernaryButton() => new TernaryButton(enabled, "Touch Snap", () => new SpriteIcon { Icon = FontAwesome.Solid.Thumbtack });
+    public DrawableTernaryButton CreateTernaryButton() => new DrawableTernaryButton
+    {
+        Current = enabled,
+        Description = "Touch Snap",
+        CreateIcon = () => new SpriteIcon { Icon = FontAwesome.Solid.Thumbtack }
+    };
 
     private Container dotContainer = null!;
 

diff --git a/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs b/osu.Game.Rulesets.Sentakki/Objects/SentakkiHitObject.cs
@@ -22,8 +22,8 @@ public abstract class SentakkiHitObject : HitObject, IHasPosition, IHasDisplayCo
         // No-op IHasPosition properties are added to allow work on editor. Remove ASAP
 
         public virtual Vector2 Position { get; set; }
-        public float X => Position.X;
-        public float Y => Position.Y;
+        public float X { get => Position.X; set { } }
+        public float Y { get => Position.Y; set { } }
 
         protected SentakkiHitObject()
         {

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="2025.101.0"/>
+        <PackageReference Include="ppy.osu.Game" Version="2025.118.2"/>
     </ItemGroup>
 
     <!--Since we aren't changing the assembly name, we use the assembly title to indicate whether it is a dev build-->