Merge pull request #21450 from Feodor0090/comments-btns-loc

Add missing localization in `DrawableComment`

.git-blame-ignore-revs

@@ -1,2 +1,8 @@
 # Normalize all the line endings
 32a74f95a5c80a0ed18e693f13a47522099df5c3
+# Partial everything
+7bc8908ca9c026fed1d831eb6e58df7624a8d614
+# Add a few more missing partial specs
+212d78865a6b5f091173a347bad5686834d1d5fe
+# Add partial specs in mobile projects too
+00c11b2b4e389e48f3995d63484a6bc66a7afbdb

Gemfile.lock

@@ -3,25 +3,25 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.601.0)
-    aws-sdk-core (3.131.2)
+    aws-partitions (1.653.0)
+    aws-sdk-core (3.166.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.117.1)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.1.0)
@@ -34,10 +34,10 @@ GEM
       rake (>= 12.0.0, < 14.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     emoji_regex (3.2.3)
-    excon (0.92.3)
-    faraday (1.10.0)
+    excon (0.93.1)
+    faraday (1.10.2)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -66,7 +66,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.6)
-    fastlane (2.206.2)
+    fastlane (2.210.1)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -110,9 +110,9 @@ GEM
       souyuz (= 0.11.1)
     fastlane-plugin-xamarin (0.6.3)
     gh_inspector (1.1.3)
-    google-apis-androidpublisher_v3 (0.23.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-core (0.6.0)
+    google-apis-androidpublisher_v3 (0.29.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-core (0.9.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -121,27 +121,27 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.12.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-playcustomapp_v1 (0.9.0)
-      google-apis-core (>= 0.6, < 2.a)
-    google-apis-storage_v1 (0.16.0)
-      google-apis-core (>= 0.6, < 2.a)
+    google-apis-iamcredentials_v1 (0.15.0)
+      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.12.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-storage_v1 (0.19.0)
+      google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.2.0)
-    google-cloud-storage (1.36.2)
+    google-cloud-errors (1.3.0)
+    google-cloud-storage (1.43.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
-      google-apis-storage_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.19.0)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.2.0)
+    googleauth (1.3.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -154,22 +154,22 @@ GEM
     httpclient (2.8.3)
     jmespath (1.6.1)
     json (2.6.2)
-    jwt (2.4.1)
+    jwt (2.5.0)
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.7.1)
+    mini_portile2 (2.8.0)
     multi_json (1.15.0)
     multipart-post (2.0.0)
     nanaimo (0.3.0)
     naturally (2.2.1)
-    nokogiri (1.13.1)
-      mini_portile2 (~> 2.7.0)
+    nokogiri (1.13.9)
+      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     optparse (0.1.1)
     os (1.1.4)
     plist (3.6.0)
-    public_suffix (4.0.7)
+    public_suffix (5.0.0)
     racc (1.6.0)
     rake (13.0.6)
     representable (3.2.0)

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuGame.cs

@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/TestSceneOsuPlayer.cs

@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.EmptyFreeform.Tests
 {
     [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new EmptyFreeformRuleset();
     }

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform.Tests/osu.Game.Rulesets.EmptyFreeform.Tests.csproj

@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj" />

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformInputManager.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.EmptyFreeform
 {
-    public class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
+    public partial class EmptyFreeformInputManager : RulesetInputManager<EmptyFreeformAction>
     {
         public EmptyFreeformInputManager(RulesetInfo ruleset)
             : base(ruleset, 0, SimultaneousBindingMode.Unique)

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/EmptyFreeformRuleset.cs

@@ -21,7 +21,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.EmptyFreeform
 {
-    public class EmptyFreeformRuleset : Ruleset
+    public partial class EmptyFreeformRuleset : Ruleset
     {
         public override string Description => "a very emptyfreeformruleset ruleset";
 
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.EmptyFreeform
 
         public override Drawable CreateIcon() => new Icon(ShortName[0]);
 
-        public class Icon : CompositeDrawable
+        public partial class Icon : CompositeDrawable
         {
             public Icon(char c)
             {

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/Objects/Drawables/DrawableEmptyFreeformHitObject.cs

@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.EmptyFreeform.Objects.Drawables
 {
-    public class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
+    public partial class DrawableEmptyFreeformHitObject : DrawableHitObject<EmptyFreeformHitObject>
     {
         public DrawableEmptyFreeformHitObject(EmptyFreeformHitObject hitObject)
             : base(hitObject)

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/DrawableEmptyFreeformRuleset.cs

@@ -17,7 +17,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.EmptyFreeform.UI
 {
     [Cached]
-    public class DrawableEmptyFreeformRuleset : DrawableRuleset<EmptyFreeformHitObject>
+    public partial class DrawableEmptyFreeformRuleset : DrawableRuleset<EmptyFreeformHitObject>
     {
         public DrawableEmptyFreeformRuleset(EmptyFreeformRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)

Templates/Rulesets/ruleset-empty/osu.Game.Rulesets.EmptyFreeform/UI/EmptyFreeformPlayfield.cs

@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.EmptyFreeform.UI
 {
     [Cached]
-    public class EmptyFreeformPlayfield : Playfield
+    public partial class EmptyFreeformPlayfield : Playfield
     {
         [BackgroundDependencyLoader]
         private void load()

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs

@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Pippidon.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs

@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Pippidon.Tests
 {
     [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
     }

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj

@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs

@@ -16,7 +16,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
 {
-    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    public partial class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
     {
         private const double time_preempt = 600;
         private const double time_fadein = 400;

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Pippidon
 {
-    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    public partial class PippidonInputManager : RulesetInputManager<PippidonAction>
     {
         public PippidonInputManager(RulesetInfo ruleset)
             : base(ruleset, 0, SimultaneousBindingMode.Unique)

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/PippidonRulesetIcon.cs

@@ -8,7 +8,7 @@ using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Rulesets.Pippidon
 {
-    public class PippidonRulesetIcon : Sprite
+    public partial class PippidonRulesetIcon : Sprite
     {
         private readonly Ruleset ruleset;
 

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs

@@ -17,7 +17,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
     [Cached]
-    public class DrawablePippidonRuleset : DrawableRuleset<PippidonHitObject>
+    public partial class DrawablePippidonRuleset : DrawableRuleset<PippidonHitObject>
     {
         public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonCursorContainer.cs

@@ -10,7 +10,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Pippidon.UI
 {
-    public class PippidonCursorContainer : GameplayCursorContainer
+    public partial class PippidonCursorContainer : GameplayCursorContainer
     {
         private Sprite cursorSprite;
         private Texture cursorTexture;

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs

@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
     [Cached]
-    public class PippidonPlayfield : Playfield
+    public partial class PippidonPlayfield : Playfield
     {
         protected override GameplayCursorContainer CreateCursor() => new PippidonCursorContainer();
 

Templates/Rulesets/ruleset-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfieldAdjustmentContainer.cs

@@ -7,7 +7,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Pippidon.UI
 {
-    public class PippidonPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
+    public partial class PippidonPlayfieldAdjustmentContainer : PlayfieldAdjustmentContainer
     {
         public PippidonPlayfieldAdjustmentContainer()
         {

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuGame.cs

@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.EmptyScrolling.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/TestSceneOsuPlayer.cs

@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.EmptyScrolling.Tests
 {
     [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new EmptyScrollingRuleset();
     }

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling.Tests/osu.Game.Rulesets.EmptyScrolling.Tests.csproj

@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj" />

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/EmptyScrollingInputManager.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.EmptyScrolling
 {
-    public class EmptyScrollingInputManager : RulesetInputManager<EmptyScrollingAction>
+    public partial class EmptyScrollingInputManager : RulesetInputManager<EmptyScrollingAction>
     {
         public EmptyScrollingInputManager(RulesetInfo ruleset)
             : base(ruleset, 0, SimultaneousBindingMode.Unique)

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/Objects/Drawables/DrawableEmptyScrollingHitObject.cs

@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.EmptyScrolling.Objects.Drawables
 {
-    public class DrawableEmptyScrollingHitObject : DrawableHitObject<EmptyScrollingHitObject>
+    public partial class DrawableEmptyScrollingHitObject : DrawableHitObject<EmptyScrollingHitObject>
     {
         public DrawableEmptyScrollingHitObject(EmptyScrollingHitObject hitObject)
             : base(hitObject)

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/DrawableEmptyScrollingRuleset.cs

@@ -18,7 +18,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 namespace osu.Game.Rulesets.EmptyScrolling.UI
 {
     [Cached]
-    public class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset<EmptyScrollingHitObject>
+    public partial class DrawableEmptyScrollingRuleset : DrawableScrollingRuleset<EmptyScrollingHitObject>
     {
         public DrawableEmptyScrollingRuleset(EmptyScrollingRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)

Templates/Rulesets/ruleset-scrolling-empty/osu.Game.Rulesets.EmptyScrolling/UI/EmptyScrollingPlayfield.cs

@@ -8,7 +8,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 namespace osu.Game.Rulesets.EmptyScrolling.UI
 {
     [Cached]
-    public class EmptyScrollingPlayfield : ScrollingPlayfield
+    public partial class EmptyScrollingPlayfield : ScrollingPlayfield
     {
         [BackgroundDependencyLoader]
         private void load()

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuGame.cs

@@ -9,7 +9,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Pippidon.Tests
 {
-    public class TestSceneOsuGame : OsuTestScene
+    public partial class TestSceneOsuGame : OsuTestScene
     {
         [BackgroundDependencyLoader]
         private void load()

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/TestSceneOsuPlayer.cs

@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Pippidon.Tests
 {
     [TestFixture]
-    public class TestSceneOsuPlayer : PlayerTestScene
+    public partial class TestSceneOsuPlayer : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new PippidonRuleset();
     }

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon.Tests/osu.Game.Rulesets.Pippidon.Tests.csproj

@@ -11,7 +11,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj" />

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/Objects/Drawables/DrawablePippidonHitObject.cs

@@ -17,7 +17,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Pippidon.Objects.Drawables
 {
-    public class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
+    public partial class DrawablePippidonHitObject : DrawableHitObject<PippidonHitObject>
     {
         private BindableNumber<int> currentLane;
 

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonInputManager.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.UI;
 
 namespace osu.Game.Rulesets.Pippidon
 {
-    public class PippidonInputManager : RulesetInputManager<PippidonAction>
+    public partial class PippidonInputManager : RulesetInputManager<PippidonAction>
     {
         public PippidonInputManager(RulesetInfo ruleset)
             : base(ruleset, 0, SimultaneousBindingMode.Unique)

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/PippidonRulesetIcon.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics.Textures;
 
 namespace osu.Game.Rulesets.Pippidon
 {
-    public class PippidonRulesetIcon : Sprite
+    public partial class PippidonRulesetIcon : Sprite
     {
         private readonly Ruleset ruleset;
 

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/DrawablePippidonRuleset.cs

@@ -18,7 +18,7 @@ using osu.Game.Rulesets.UI.Scrolling;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
     [Cached]
-    public class DrawablePippidonRuleset : DrawableScrollingRuleset<PippidonHitObject>
+    public partial class DrawablePippidonRuleset : DrawableScrollingRuleset<PippidonHitObject>
     {
         public DrawablePippidonRuleset(PippidonRuleset ruleset, IBeatmap beatmap, IReadOnlyList<Mod> mods = null)
             : base(ruleset, beatmap, mods)

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonCharacter.cs

@@ -15,7 +15,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Pippidon.UI
 {
-    public class PippidonCharacter : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
+    public partial class PippidonCharacter : BeatSyncedContainer, IKeyBindingHandler<PippidonAction>
     {
         public readonly BindableInt LanePosition = new BindableInt
         {

Templates/Rulesets/ruleset-scrolling-example/osu.Game.Rulesets.Pippidon/UI/PippidonPlayfield.cs

@@ -16,7 +16,7 @@ using osuTK.Graphics;
 namespace osu.Game.Rulesets.Pippidon.UI
 {
     [Cached]
-    public class PippidonPlayfield : ScrollingPlayfield
+    public partial class PippidonPlayfield : ScrollingPlayfield
     {
         public const float LANE_HEIGHT = 70;
 
@@ -60,7 +60,7 @@ namespace osu.Game.Rulesets.Pippidon.UI
             });
         }
 
-        private class LaneContainer : BeatSyncedContainer
+        private partial class LaneContainer : BeatSyncedContainer
         {
             private OsuColour colours;
             private FillFlowContainer fill;
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Pippidon.UI
                 }
             }
 
-            private class Lane : CompositeDrawable
+            private partial class Lane : CompositeDrawable
             {
                 public Lane()
                 {

UseLocalFramework.ps1

@@ -0,0 +1,17 @@
+# Run this script to use a local copy of osu-framework rather than fetching it from nuget.
+# It expects the osu-framework directory to be at the same level as the osu directory
+#
+# https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects
+
+$CSPROJ="osu.Game/osu.Game.csproj"
+$SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Framework;
+dotnet sln $SLN add ../osu-framework/osu.Framework/osu.Framework.csproj ../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj;
+dotnet add $CSPROJ reference ../osu-framework/osu.Framework/osu.Framework.csproj
+
+$SLNF=Get-Content "osu.Desktop.slnf" | ConvertFrom-Json
+$TMP=New-TemporaryFile
+$SLNF.solution.projects += ("../osu-framework/osu.Framework/osu.Framework.csproj", "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj")
+ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8
+Move-Item -Path $TMP -Destination "osu.Desktop.slnf" -Force

UseLocalFramework.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Run this script to use a local copy of osu-framework rather than fetching it from nuget.
+# It expects the osu-framework directory to be at the same level as the osu directory
+#
+# https://github.com/ppy/osu-framework/wiki/Testing-local-framework-checkout-with-other-projects
+
+CSPROJ="osu.Game/osu.Game.csproj"
+SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Framework
+dotnet sln $SLN add ../osu-framework/osu.Framework/osu.Framework.csproj ../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj
+dotnet add $CSPROJ reference ../osu-framework/osu.Framework/osu.Framework.csproj
+
+SLNF="osu.Desktop.slnf"
+tmp=$(mktemp)
+jq '.solution.projects += ["../osu-framework/osu.Framework/osu.Framework.csproj", "../osu-framework/osu.Framework.NativeLibs/osu.Framework.NativeLibs.csproj"]' osu.Desktop.slnf > $tmp
+mv -f $tmp $SLNF

UseLocalResources.ps1

@@ -0,0 +1,12 @@
+$CSPROJ="osu.Game/osu.Game.csproj"
+$SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Game.Resources;
+dotnet sln $SLN add ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+dotnet add $CSPROJ reference ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+
+$SLNF=Get-Content "osu.Desktop.slnf" | ConvertFrom-Json
+$TMP=New-TemporaryFile
+$SLNF.solution.projects += ("../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj")
+ConvertTo-Json $SLNF | Out-File $TMP -Encoding UTF8
+Move-Item -Path $TMP -Destination "osu.Desktop.slnf" -Force

UseLocalResources.sh

@@ -0,0 +1,11 @@
+CSPROJ="osu.Game/osu.Game.csproj"
+SLN="osu.sln"
+
+dotnet remove $CSPROJ package ppy.osu.Game.Resources;
+dotnet sln $SLN add ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+dotnet add $CSPROJ reference ../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj
+
+SLNF="osu.Desktop.slnf"
+TMP=$(mktemp)
+jq '.solution.projects += ["../osu-resources/osu.Game.Resources/osu.Game.Resources.csproj"]' $SLNF > $TMP
+mv -f $TMP $SLNF

fastlane/Fastfile

@@ -138,10 +138,10 @@ platform :ios do
   end
 
   lane :testflight_prune_dry do
-    clean_testflight_testers(days_of_inactivity:45, dry_run: true)
+    clean_testflight_testers(days_of_inactivity:30, dry_run: true)
   end
 
   lane :testflight_prune do
-    clean_testflight_testers(days_of_inactivity: 45)
+    clean_testflight_testers(days_of_inactivity: 30)
   end
 end

osu.Android.props

@@ -51,11 +51,11 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1021.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1022.1" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.1127.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2022.1126.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">
     <!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->
-    <PackageReference Include="Realm" Version="10.17.0" />
+    <PackageReference Include="Realm" Version="10.18.0" />
   </ItemGroup>
 </Project>

osu.Android/AndroidJoystickSettings.cs

@@ -11,7 +11,7 @@ using osu.Game.Overlays.Settings;
 
 namespace osu.Android
 {
-    public class AndroidJoystickSettings : SettingsSubsection
+    public partial class AndroidJoystickSettings : SettingsSubsection
     {
         protected override LocalisableString Header => JoystickSettingsStrings.JoystickGamepad;
 

osu.Android/AndroidMouseSettings.cs

@@ -14,7 +14,7 @@ using osu.Game.Overlays.Settings.Sections.Input;
 
 namespace osu.Android
 {
-    public class AndroidMouseSettings : SettingsSubsection
+    public partial class AndroidMouseSettings : SettingsSubsection
     {
         private readonly AndroidMouseHandler mouseHandler;
 

osu.Android/GameplayScreenRotationLocker.cs

@@ -11,7 +11,7 @@ using osu.Game;
 
 namespace osu.Android
 {
-    public class GameplayScreenRotationLocker : Component
+    public partial class GameplayScreenRotationLocker : Component
     {
         private Bindable<bool> localUserPlaying;
 

osu.Android/OsuGameAndroid.cs

@@ -18,7 +18,7 @@ using Xamarin.Essentials;
 
 namespace osu.Android
 {
-    public class OsuGameAndroid : OsuGame
+    public partial class OsuGameAndroid : OsuGame
     {
         [Cached]
         private readonly OsuGameActivity gameActivity;

osu.Desktop/DiscordRichPresence.cs

@@ -20,7 +20,7 @@ using LogLevel = osu.Framework.Logging.LogLevel;
 
 namespace osu.Desktop
 {
-    internal class DiscordRichPresence : Component
+    internal partial class DiscordRichPresence : Component
     {
         private const string client_id = "367827983903490050";
 

osu.Desktop/OsuGameDesktop.cs

@@ -18,23 +18,15 @@ using osu.Framework;
 using osu.Framework.Logging;
 using osu.Game.Updater;
 using osu.Desktop.Windows;
-using osu.Framework.Input.Handlers;
-using osu.Framework.Input.Handlers.Joystick;
-using osu.Framework.Input.Handlers.Mouse;
-using osu.Framework.Input.Handlers.Tablet;
-using osu.Framework.Input.Handlers.Touch;
 using osu.Framework.Threading;
 using osu.Game.IO;
 using osu.Game.IPC;
-using osu.Game.Overlays.Settings;
-using osu.Game.Overlays.Settings.Sections;
-using osu.Game.Overlays.Settings.Sections.Input;
 using osu.Game.Utils;
 using SDL2;
 
 namespace osu.Desktop
 {
-    internal class OsuGameDesktop : OsuGame
+    internal partial class OsuGameDesktop : OsuGame
     {
         private OsuSchemeLinkIPCChannel? osuSchemeLinkIPCChannel;
 
@@ -148,27 +140,6 @@ namespace osu.Desktop
             desktopWindow.DragDrop += f => fileDrop(new[] { f });
         }
 
-        public override SettingsSubsection CreateSettingsSubsectionFor(InputHandler handler)
-        {
-            switch (handler)
-            {
-                case ITabletHandler th:
-                    return new TabletSettings(th);
-
-                case MouseHandler mh:
-                    return new MouseSettings(mh);
-
-                case JoystickHandler jh:
-                    return new JoystickSettings(jh);
-
-                case TouchHandler th:
-                    return new InputSection.HandlerSection(th);
-
-                default:
-                    return base.CreateSettingsSubsectionFor(handler);
-            }
-        }
-
         protected override BatteryInfo CreateBatteryInfo() => new SDL2BatteryInfo();
 
         private readonly List<string> importableFiles = new List<string>();

osu.Desktop/Security/ElevatedPrivilegesChecker.cs

@@ -16,7 +16,7 @@ namespace osu.Desktop.Security
     /// <summary>
     /// Checks if the game is running with elevated privileges (as admin in Windows, root in Unix) and displays a warning notification if so.
     /// </summary>
-    public class ElevatedPrivilegesChecker : Component
+    public partial class ElevatedPrivilegesChecker : Component
     {
         [Resolved]
         private INotificationOverlay notifications { get; set; } = null!;
@@ -63,7 +63,7 @@ namespace osu.Desktop.Security
             return false;
         }
 
-        private class ElevatedPrivilegesNotification : SimpleNotification
+        private partial class ElevatedPrivilegesNotification : SimpleNotification
         {
             public override bool IsImportant => true;
 

osu.Desktop/Updater/SquirrelUpdateManager.cs

@@ -17,7 +17,7 @@ using UpdateManager = osu.Game.Updater.UpdateManager;
 namespace osu.Desktop.Updater
 {
     [SupportedOSPlatform("windows")]
-    public class SquirrelUpdateManager : UpdateManager
+    public partial class SquirrelUpdateManager : UpdateManager
     {
         private Squirrel.UpdateManager? updateManager;
         private INotificationOverlay notificationOverlay = null!;

osu.Desktop/Windows/GameplayWinKeyBlocker.cs

@@ -10,7 +10,7 @@ using osu.Game.Screens.Play;
 
 namespace osu.Desktop.Windows
 {
-    public class GameplayWinKeyBlocker : Component
+    public partial class GameplayWinKeyBlocker : Component
     {
         private Bindable<bool> disableWinKey = null!;
         private IBindable<bool> localUserPlaying = null!;

osu.Desktop/osu.Desktop.csproj

@@ -27,7 +27,7 @@
     <PackageReference Include="Clowd.Squirrel" Version="2.9.42" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
-    <PackageReference Include="DiscordRichPresence" Version="1.0.175" />
+    <PackageReference Include="DiscordRichPresence" Version="1.1.1.14" />
   </ItemGroup>
   <ItemGroup Label="Resources">
     <EmbeddedResource Include="lazer.ico" />

osu.Game.Benchmarks/osu.Game.Benchmarks.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <PackageReference Include="nunit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>

osu.Game.Rulesets.Catch.Tests/CatchSkinnableTestScene.cs

@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public abstract class CatchSkinnableTestScene : SkinnableTestScene
+    public abstract partial class CatchSkinnableTestScene : SkinnableTestScene
     {
         protected override Ruleset CreateRulesetForSkinProvider() => new CatchRuleset();
     }

osu.Game.Rulesets.Catch.Tests/Editor/CatchEditorTestSceneContainer.cs

@@ -16,7 +16,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class CatchEditorTestSceneContainer : Container
+    public partial class CatchEditorTestSceneContainer : Container
     {
         [Cached(typeof(Playfield))]
         public readonly ScrollingPlayfield Playfield;
@@ -57,7 +57,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             };
         }
 
-        private class TestCatchPlayfield : CatchEditorPlayfield
+        private partial class TestCatchPlayfield : CatchEditorPlayfield
         {
             public TestCatchPlayfield()
                 : base(new BeatmapDifficulty { CircleSize = 0 })

osu.Game.Rulesets.Catch.Tests/Editor/CatchPlacementBlueprintTestScene.cs

@@ -21,7 +21,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public abstract class CatchPlacementBlueprintTestScene : PlacementBlueprintTestScene
+    public abstract partial class CatchPlacementBlueprintTestScene : PlacementBlueprintTestScene
     {
         protected const double TIME_SNAP = 100;
 

osu.Game.Rulesets.Catch.Tests/Editor/CatchSelectionBlueprintTestScene.cs

@@ -17,7 +17,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public abstract class CatchSelectionBlueprintTestScene : SelectionBlueprintTestScene
+    public abstract partial class CatchSelectionBlueprintTestScene : SelectionBlueprintTestScene
     {
         protected ScrollingHitObjectContainer HitObjectContainer => contentContainer.Playfield.HitObjectContainer;
 
@@ -62,7 +62,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor
             InputManager.MoveMouseTo(pos);
         });
 
-        private class EditorBeatmapDependencyContainer : Container
+        private partial class EditorBeatmapDependencyContainer : Container
         {
             [Cached]
             private readonly EditorClock editorClock;

osu.Game.Rulesets.Catch.Tests/Editor/Checks/TestCheckBananaShowerGap.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -18,7 +16,7 @@ namespace osu.Game.Rulesets.Catch.Tests.Editor.Checks
     [TestFixture]
     public class TestCheckBananaShowerGap
     {
-        private CheckBananaShowerGap check;
+        private CheckBananaShowerGap check = null!;
 
         [SetUp]
         public void Setup()

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneBananaShowerPlacementBlueprint.cs

@@ -20,7 +20,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class TestSceneBananaShowerPlacementBlueprint : CatchPlacementBlueprintTestScene
+    public partial class TestSceneBananaShowerPlacementBlueprint : CatchPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableBananaShower((BananaShower)hitObject);
 

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneCatchDistanceSnapGrid.cs

@@ -20,7 +20,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class TestSceneCatchDistanceSnapGrid : OsuManualInputManagerTestScene
+    public partial class TestSceneCatchDistanceSnapGrid : OsuManualInputManagerTestScene
     {
         private readonly ManualClock manualClock = new ManualClock();
 

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneEditor.cs

@@ -9,7 +9,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
     [TestFixture]
-    public class TestSceneEditor : EditorTestScene
+    public partial class TestSceneEditor : EditorTestScene
     {
         protected override Ruleset CreateEditorRuleset() => new CatchRuleset();
     }

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneFruitPlacementBlueprint.cs

@@ -17,7 +17,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class TestSceneFruitPlacementBlueprint : CatchPlacementBlueprintTestScene
+    public partial class TestSceneFruitPlacementBlueprint : CatchPlacementBlueprintTestScene
     {
         protected override DrawableHitObject CreateHitObject(HitObject hitObject) => new DrawableFruit((Fruit)hitObject);
 

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamPlacementBlueprint.cs

@@ -19,7 +19,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class TestSceneJuiceStreamPlacementBlueprint : CatchPlacementBlueprintTestScene
+    public partial class TestSceneJuiceStreamPlacementBlueprint : CatchPlacementBlueprintTestScene
     {
         private const double velocity_factor = 0.5;
 

osu.Game.Rulesets.Catch.Tests/Editor/TestSceneJuiceStreamSelectionBlueprint.cs

@@ -19,7 +19,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Tests.Editor
 {
-    public class TestSceneJuiceStreamSelectionBlueprint : CatchSelectionBlueprintTestScene
+    public partial class TestSceneJuiceStreamSelectionBlueprint : CatchSelectionBlueprintTestScene
     {
         private JuiceStream hitObject;
 

osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModFlashlight.cs

@@ -7,7 +7,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
-    public class TestSceneCatchModFlashlight : ModTestScene
+    public partial class TestSceneCatchModFlashlight : ModTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 

osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModNoScope.cs

@@ -14,7 +14,7 @@ using osu.Game.Tests.Visual;
 
 namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
-    public class TestSceneCatchModNoScope : ModTestScene
+    public partial class TestSceneCatchModNoScope : ModTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 

osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModPerfect.cs

@@ -11,7 +11,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
-    public class TestSceneCatchModPerfect : ModPerfectTestScene
+    public partial class TestSceneCatchModPerfect : ModPerfectTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 

osu.Game.Rulesets.Catch.Tests/Mods/TestSceneCatchModRelax.cs

@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests.Mods
 {
-    public class TestSceneCatchModRelax : ModTestScene
+    public partial class TestSceneCatchModRelax : ModTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 

osu.Game.Rulesets.Catch.Tests/TestSceneAutoJuiceStream.cs

@@ -16,7 +16,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneAutoJuiceStream : TestSceneCatchPlayer
+    public partial class TestSceneAutoJuiceStream : TestSceneCatchPlayer
     {
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {

osu.Game.Rulesets.Catch.Tests/TestSceneBananaShower.cs

@@ -10,7 +10,7 @@ using osu.Game.Rulesets.Catch.Objects;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneBananaShower : TestSceneCatchPlayer
+    public partial class TestSceneBananaShower : TestSceneCatchPlayer
     {
         [Test]
         public void TestBananaShower()

osu.Game.Rulesets.Catch.Tests/TestSceneCatchModHidden.cs

@@ -19,7 +19,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneCatchModHidden : ModTestScene
+    public partial class TestSceneCatchModHidden : ModTestScene
     {
         [Test]
         public void TestJuiceStream()

osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayer.cs

@@ -9,7 +9,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchPlayer : PlayerTestScene
+    public partial class TestSceneCatchPlayer : PlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
     }

osu.Game.Rulesets.Catch.Tests/TestSceneCatchPlayerLegacySkin.cs

@@ -16,7 +16,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchPlayerLegacySkin : LegacySkinPlayerTestScene
+    public partial class TestSceneCatchPlayerLegacySkin : LegacySkinPlayerTestScene
     {
         protected override Ruleset CreatePlayerRuleset() => new CatchRuleset();
 

osu.Game.Rulesets.Catch.Tests/TestSceneCatchReplay.cs

@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Catch.UI;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneCatchReplay : TestSceneCatchPlayer
+    public partial class TestSceneCatchReplay : TestSceneCatchPlayer
     {
         protected override bool Autoplay => true;
 

osu.Game.Rulesets.Catch.Tests/TestSceneCatchSkinConfiguration.cs

@@ -23,7 +23,7 @@ using Direction = osu.Game.Rulesets.Catch.UI.Direction;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneCatchSkinConfiguration : OsuTestScene
+    public partial class TestSceneCatchSkinConfiguration : OsuTestScene
     {
         private Catcher catcher;
 
@@ -92,7 +92,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             public bool FlipCatcherPlate { get; set; }
 
             public TestSkin()
-                : base(null)
+                : base(null!)
             {
             }
 

osu.Game.Rulesets.Catch.Tests/TestSceneCatchStacker.cs

@@ -11,7 +11,7 @@ using osu.Game.Rulesets.Catch.UI;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchStacker : TestSceneCatchPlayer
+    public partial class TestSceneCatchStacker : TestSceneCatchPlayer
     {
         protected override IBeatmap CreateBeatmap(RulesetInfo ruleset)
         {

osu.Game.Rulesets.Catch.Tests/TestSceneCatchTouchInput.cs

@@ -15,7 +15,7 @@ using osu.Game.Tests.Visual;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatchTouchInput : OsuTestScene
+    public partial class TestSceneCatchTouchInput : OsuTestScene
     {
         [Test]
         public void TestBasic()

osu.Game.Rulesets.Catch.Tests/TestSceneCatcher.cs

@@ -27,7 +27,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatcher : OsuTestScene
+    public partial class TestSceneCatcher : OsuTestScene
     {
         [Resolved]
         private OsuConfigManager config { get; set; }
@@ -324,7 +324,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             }
         }
 
-        public class TestCatcher : Catcher
+        public partial class TestCatcher : Catcher
         {
             public IEnumerable<CaughtObject> CaughtObjects => this.ChildrenOfType<CaughtObject>();
 

osu.Game.Rulesets.Catch.Tests/TestSceneCatcherArea.cs

@@ -23,7 +23,7 @@ using osu.Game.Rulesets.Scoring;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneCatcherArea : CatchSkinnableTestScene
+    public partial class TestSceneCatcherArea : CatchSkinnableTestScene
     {
         private RulesetInfo catchRuleset;
 
@@ -120,7 +120,7 @@ namespace osu.Game.Rulesets.Catch.Tests
             catchRuleset = rulesets.GetRuleset(2);
         }
 
-        private class TestCatcherArea : CatcherArea
+        private partial class TestCatcherArea : CatcherArea
         {
             public TestCatcherArea(IBeatmapDifficultyInfo beatmapDifficulty)
             {

osu.Game.Rulesets.Catch.Tests/TestSceneComboCounter.cs

@@ -19,7 +19,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneComboCounter : CatchSkinnableTestScene
+    public partial class TestSceneComboCounter : CatchSkinnableTestScene
     {
         private ScoreProcessor scoreProcessor = null!;
 

osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjects.cs

@@ -21,7 +21,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneDrawableHitObjects : OsuTestScene
+    public partial class TestSceneDrawableHitObjects : OsuTestScene
     {
         private DrawableCatchRuleset drawableRuleset;
         private double playfieldTime => drawableRuleset.Playfield.Time.Current;

osu.Game.Rulesets.Catch.Tests/TestSceneDrawableHitObjectsHidden.cs

@@ -8,7 +8,7 @@ using osu.Game.Rulesets.Catch.Mods;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneDrawableHitObjectsHidden : TestSceneDrawableHitObjects
+    public partial class TestSceneDrawableHitObjectsHidden : TestSceneDrawableHitObjects
     {
         [SetUp]
         public void SetUp() => Schedule(() =>

osu.Game.Rulesets.Catch.Tests/TestSceneFruitObjects.cs

@@ -15,7 +15,7 @@ using osu.Game.Rulesets.Catch.Objects.Drawables;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneFruitObjects : CatchSkinnableTestScene
+    public partial class TestSceneFruitObjects : CatchSkinnableTestScene
     {
         protected override void LoadComplete()
         {
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Catch.Tests
         private Drawable createDrawableTinyDroplet() => new TestDrawableCatchHitObjectSpecimen(new DrawableTinyDroplet(new TinyDroplet()));
     }
 
-    public class TestDrawableCatchHitObjectSpecimen : CompositeDrawable
+    public partial class TestDrawableCatchHitObjectSpecimen : CompositeDrawable
     {
         public readonly ManualClock ManualClock;
 

osu.Game.Rulesets.Catch.Tests/TestSceneFruitRandomness.cs

@@ -12,7 +12,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneFruitRandomness : OsuTestScene
+    public partial class TestSceneFruitRandomness : OsuTestScene
     {
         private readonly DrawableFruit drawableFruit;
         private readonly DrawableBanana drawableBanana;

osu.Game.Rulesets.Catch.Tests/TestSceneFruitVisualChange.cs

@@ -9,7 +9,7 @@ using osu.Game.Rulesets.Catch.Objects.Drawables;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneFruitVisualChange : TestSceneFruitObjects
+    public partial class TestSceneFruitVisualChange : TestSceneFruitObjects
     {
         private readonly Bindable<int> indexInBeatmap = new Bindable<int>();
         private readonly Bindable<bool> hyperDash = new Bindable<bool>();

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDash.cs

@@ -17,7 +17,7 @@ using osuTK;
 namespace osu.Game.Rulesets.Catch.Tests
 {
     [TestFixture]
-    public class TestSceneHyperDash : TestSceneCatchPlayer
+    public partial class TestSceneHyperDash : TestSceneCatchPlayer
     {
         protected override bool Autoplay => true;
 

osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs

@@ -24,7 +24,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneHyperDashColouring : OsuTestScene
+    public partial class TestSceneHyperDashColouring : OsuTestScene
     {
         [Resolved]
         private SkinManager skins { get; set; }

osu.Game.Rulesets.Catch.Tests/TestSceneJuiceStream.cs

@@ -14,7 +14,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneJuiceStream : TestSceneCatchPlayer
+    public partial class TestSceneJuiceStream : TestSceneCatchPlayer
     {
         [Test]
         public void TestJuiceStreamEndingCombo()

osu.Game.Rulesets.Catch.Tests/TestSceneLegacyBeatmapSkin.cs

@@ -18,7 +18,7 @@ using osuTK.Graphics;
 
 namespace osu.Game.Rulesets.Catch.Tests
 {
-    public class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
+    public partial class TestSceneLegacyBeatmapSkin : LegacyBeatmapSkinColourTest
     {
         [Resolved]
         private AudioManager audio { get; set; }
@@ -105,7 +105,7 @@ namespace osu.Game.Rulesets.Catch.Tests
 
         protected override ExposedPlayer CreateTestPlayer(bool userHasCustomColours) => new CatchExposedPlayer(userHasCustomColours);
 
-        private class CatchExposedPlayer : ExposedPlayer
+        private partial class CatchExposedPlayer : ExposedPlayer
         {
             public CatchExposedPlayer(bool userHasCustomColours)
                 : base(userHasCustomColours)

osu.Game.Rulesets.Catch.Tests/osu.Game.Rulesets.Catch.Tests.csproj

@@ -3,7 +3,7 @@
   <ItemGroup Label="Package References">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
   </ItemGroup>
   <PropertyGroup Label="Project">
     <OutputType>WinExe</OutputType>

osu.Game.Rulesets.Catch/CatchInputManager.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using System.ComponentModel;
 using osu.Framework.Allocation;
 using osu.Framework.Input.Bindings;
@@ -11,7 +9,7 @@ using osu.Game.Rulesets.UI;
 namespace osu.Game.Rulesets.Catch
 {
     [Cached]
-    public class CatchInputManager : RulesetInputManager<CatchAction>
+    public partial class CatchInputManager : RulesetInputManager<CatchAction>
     {
         public CatchInputManager(RulesetInfo ruleset)
             : base(ruleset, 0, SimultaneousBindingMode.Unique)

osu.Game.Rulesets.Catch/CatchRuleset.cs

@@ -17,6 +17,7 @@ using osu.Game.Rulesets.Catch.Edit;
 using osu.Game.Rulesets.Catch.Mods;
 using osu.Game.Rulesets.Catch.Replays;
 using osu.Game.Rulesets.Catch.Scoring;
+using osu.Game.Rulesets.Catch.Skinning.Argon;
 using osu.Game.Rulesets.Catch.Skinning.Legacy;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Difficulty;
@@ -188,6 +189,9 @@ namespace osu.Game.Rulesets.Catch
             {
                 case LegacySkin:
                     return new CatchLegacySkinTransformer(skin);
+
+                case ArgonSkin:
+                    return new CatchArgonSkinTransformer(skin);
             }
 
             return null;

osu.Game.Rulesets.Catch/CatchSkinComponentLookup.cs

@@ -1,15 +1,13 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 using osu.Game.Skinning;
 
 namespace osu.Game.Rulesets.Catch
 {
-    public class CatchSkinComponent : GameplaySkinComponent<CatchSkinComponents>
+    public class CatchSkinComponentLookup : GameplaySkinComponentLookup<CatchSkinComponents>
     {
-        public CatchSkinComponent(CatchSkinComponents component)
+        public CatchSkinComponentLookup(CatchSkinComponents component)
             : base(component)
         {
         }

osu.Game.Rulesets.Catch/CatchSkinComponents.cs

@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
 namespace osu.Game.Rulesets.Catch
 {
     public enum CatchSkinComponents

osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerPlacementBlueprint.cs

@@ -12,7 +12,7 @@ using osuTK.Input;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
-    public class BananaShowerPlacementBlueprint : CatchPlacementBlueprint<BananaShower>
+    public partial class BananaShowerPlacementBlueprint : CatchPlacementBlueprint<BananaShower>
     {
         private readonly TimeSpanOutline outline;
 

osu.Game.Rulesets.Catch/Edit/Blueprints/BananaShowerSelectionBlueprint.cs

@@ -7,7 +7,7 @@ using osu.Game.Rulesets.Catch.Objects;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
-    public class BananaShowerSelectionBlueprint : CatchSelectionBlueprint<BananaShower>
+    public partial class BananaShowerSelectionBlueprint : CatchSelectionBlueprint<BananaShower>
     {
         public BananaShowerSelectionBlueprint(BananaShower hitObject)
             : base(hitObject)

osu.Game.Rulesets.Catch/Edit/Blueprints/CatchPlacementBlueprint.cs

@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
-    public class CatchPlacementBlueprint<THitObject> : PlacementBlueprint
+    public partial class CatchPlacementBlueprint<THitObject> : PlacementBlueprint
         where THitObject : CatchHitObject, new()
     {
         protected new THitObject HitObject => (THitObject)base.HitObject;

osu.Game.Rulesets.Catch/Edit/Blueprints/CatchSelectionBlueprint.cs

@@ -12,7 +12,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints
 {
-    public abstract class CatchSelectionBlueprint<THitObject> : HitObjectSelectionBlueprint<THitObject>
+    public abstract partial class CatchSelectionBlueprint<THitObject> : HitObjectSelectionBlueprint<THitObject>
         where THitObject : CatchHitObject
     {
         protected override bool AlwaysShowWhenSelected => true;

osu.Game.Rulesets.Catch/Edit/Blueprints/Components/EditablePath.cs

@@ -20,7 +20,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
 {
-    public abstract class EditablePath : CompositeDrawable
+    public abstract partial class EditablePath : CompositeDrawable
     {
         public int PathId => path.InvalidationID;
 

osu.Game.Rulesets.Catch/Edit/Blueprints/Components/FruitOutline.cs

@@ -13,7 +13,7 @@ using osuTK;
 
 namespace osu.Game.Rulesets.Catch.Edit.Blueprints.Components
 {
-    public class FruitOutline : CompositeDrawable
+    public partial class FruitOutline : CompositeDrawable
     {
         public FruitOutline()
         {